Merge pull request #4577 from nocodb/develop

Author: github-actions[bot]

package-lock.json

@@ -287,7 +287,10 @@ a {
   @apply !top-[50px];
 }
 
-
 .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
   @apply bg-primary bg-opacity-20;
 }
+
+.ant-select-selection-search-input:focus {
+  @apply !ring-0;
+}

packages/nc-cli/package-lock.json

@@ -8,6 +8,7 @@ import {
   IsPublicInj,
   computed,
   inject,
+  isDrawerExist,
   ref,
   useLTARStoreOrThrow,
   useSelectedCellKeyupListener,
@@ -145,7 +146,7 @@ useSelectedCellKeyupListener(vModel, (e: KeyboardEvent) => {
       break
     default: {
       const el = filterQueryRef.value?.$el
-      if (el) {
+      if (el && !isDrawerExist()) {
         filterQueryRef.value.$el.focus()
       }
     }

packages/nc-gui/assets/style.scss

@@ -10,6 +10,7 @@ import {
   extractPkFromRow,
   extractSdkResponseErrorMsg,
   isMac,
+  isTypableInputColumn,
   message,
   reactive,
   ref,
@@ -248,22 +249,7 @@ export function useMultiSelect(
 
           const columnObj = unref(fields)[selectedCell.col]
 
-          if (
-            (!unref(editEnabled) ||
-              [
-                UITypes.DateTime,
-                UITypes.Date,
-                UITypes.Year,
-                UITypes.Time,
-                UITypes.Lookup,
-                UITypes.Rollup,
-                UITypes.Formula,
-                UITypes.Attachment,
-                UITypes.Checkbox,
-                UITypes.Rating,
-              ].includes(columnObj.uidt as UITypes)) &&
-            (isMac() ? e.metaKey : e.ctrlKey)
-          ) {
+          if ((!unref(editEnabled) || !isTypableInputColumn(columnObj)) && (isMac() ? e.metaKey : e.ctrlKey)) {
             switch (e.keyCode) {
               // copy - ctrl/cmd +c
               case 67:
@@ -350,7 +336,7 @@ export function useMultiSelect(
               // Update not allowed for table which doesn't have primary Key
               return message.info(t('msg.info.updateNotAllowedWithoutPK'))
             }
-            if (makeEditable(rowObj, columnObj) && columnObj.title) {
+            if (isTypableInputColumn(columnObj) && makeEditable(rowObj, columnObj) && columnObj.title) {
               rowObj.row[columnObj.title] = ''
             }
             // editEnabled = true

packages/nc-gui/components/virtual-cell/components/ListItems.vue

@@ -69,7 +69,12 @@
     "betaNote": "هذه الميزة حاليا في بيتا.",
     "moreInfo": "المزيد من المعلومات تجدها هنا",
     "logs": "السجلات",
-    "groupingField": "Grouping Field"
+    "groupingField": "Grouping Field",
+    "insertAfter": "Insert After",
+    "insertBefore": "Insert Before",
+    "hideField": "Hide Field",
+    "sortAsc": "Sort Ascending",
+    "sortDesc": "Sort Descending"
   },
   "objects": {
     "project": "مشروع",
@@ -199,7 +204,8 @@
     "quickImportFrom": "استيراد سريع من",
     "quickImport": "استيراد سريع",
     "advancedSettings": "الإعدادات المتقدمة",
-    "codeSnippet": "كتلة برمجية"
+    "codeSnippet": "كتلة برمجية",
+    "keyboardShortcut": "Keyboard Shortcuts"
   },
   "labels": {
     "createdBy": "Created By",
@@ -496,6 +502,7 @@
       }
     },
     "info": {
+      "pasteNotSupported": "Paste operation is not supported on the active cell",
       "roles": {
         "orgCreator": "Creator can create new projects and access any invited project.",
         "orgViewer": "Viewer is not allowed to create new projects but they can access any invited project."
@@ -613,7 +620,9 @@
       "deleteViewConfirmation": "هل أنت متأكد من أنك تريد حذف هذا العرض؟",
       "deleteTableConfirmation": "هل تريد حذف الجدول",
       "showM2mTables": "إظهار جداول M2M",
-      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack."
+      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
+      "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
     },
     "error": {
       "searchProject": "البحث عن {بحث} لم يتم العثور على نتائج",

packages/nc-gui/composables/useMultiSelect/index.ts

@@ -69,7 +69,12 @@
     "betaNote": "This feature is currently in beta.",
     "moreInfo": "More information can be found here",
     "logs": "Logs",
-    "groupingField": "Grouping Field"
+    "groupingField": "Grouping Field",
+    "insertAfter": "Insert After",
+    "insertBefore": "Insert Before",
+    "hideField": "Hide Field",
+    "sortAsc": "Sort Ascending",
+    "sortDesc": "Sort Descending"
   },
   "objects": {
     "project": "প্রকল্প",
@@ -199,7 +204,8 @@
     "quickImportFrom": "Quick Import From",
     "quickImport": "Quick Import",
     "advancedSettings": "Advanced Settings",
-    "codeSnippet": "Code Snippet"
+    "codeSnippet": "Code Snippet",
+    "keyboardShortcut": "Keyboard Shortcuts"
   },
   "labels": {
     "createdBy": "Created By",
@@ -496,6 +502,7 @@
       }
     },
     "info": {
+      "pasteNotSupported": "Paste operation is not supported on the active cell",
       "roles": {
         "orgCreator": "Creator can create new projects and access any invited project.",
         "orgViewer": "Viewer is not allowed to create new projects but they can access any invited project."
@@ -613,7 +620,9 @@
       "deleteViewConfirmation": "Are you sure you want to delete this view?",
       "deleteTableConfirmation": "Do you want to delete the table",
       "showM2mTables": "Show M2M Tables",
-      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack."
+      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
+      "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
     },
     "error": {
       "searchProject": "আপনার অনুসন্ধান {search} এর জন্য কোনও ফলাফল পাওয়া যায় নি",

packages/nc-gui/lang/ar.json

@@ -69,7 +69,12 @@
     "betaNote": "This feature is currently in beta.",
     "moreInfo": "More information can be found here",
     "logs": "Logs",
-    "groupingField": "Grouping Field"
+    "groupingField": "Grouping Field",
+    "insertAfter": "Insert After",
+    "insertBefore": "Insert Before",
+    "hideField": "Hide Field",
+    "sortAsc": "Sort Ascending",
+    "sortDesc": "Sort Descending"
   },
   "objects": {
     "project": "Projekt",
@@ -199,7 +204,8 @@
     "quickImportFrom": "Quick Import From",
     "quickImport": "Quick Import",
     "advancedSettings": "Advanced Settings",
-    "codeSnippet": "Code Snippet"
+    "codeSnippet": "Code Snippet",
+    "keyboardShortcut": "Keyboard Shortcuts"
   },
   "labels": {
     "createdBy": "Created By",
@@ -496,6 +502,7 @@
       }
     },
     "info": {
+      "pasteNotSupported": "Paste operation is not supported on the active cell",
       "roles": {
         "orgCreator": "Creator can create new projects and access any invited project.",
         "orgViewer": "Viewer is not allowed to create new projects but they can access any invited project."
@@ -613,7 +620,9 @@
       "deleteViewConfirmation": "Are you sure you want to delete this view?",
       "deleteTableConfirmation": "Do you want to delete the table",
       "showM2mTables": "Show M2M Tables",
-      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack."
+      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
+      "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
     },
     "error": {
       "searchProject": "Din søgning efter {Søg} viste ingen resultater",

packages/nc-gui/lang/bn_IN.json

@@ -69,7 +69,12 @@
     "betaNote": "Diese Funktion befindet sich derzeit in der Beta.",
     "moreInfo": "Mehr Informationen können hier gefunden werden",
     "logs": "Protokolle",
-    "groupingField": "Grouping Field"
+    "groupingField": "Grouping Field",
+    "insertAfter": "Insert After",
+    "insertBefore": "Insert Before",
+    "hideField": "Hide Field",
+    "sortAsc": "Sort Ascending",
+    "sortDesc": "Sort Descending"
   },
   "objects": {
     "project": "Projekt",
@@ -199,7 +204,8 @@
     "quickImportFrom": "Schnell importieren von",
     "quickImport": "Schnell Importieren",
     "advancedSettings": "Erweiterte Einstellungen",
-    "codeSnippet": "Code Ausschnitt"
+    "codeSnippet": "Code Ausschnitt",
+    "keyboardShortcut": "Keyboard Shortcuts"
   },
   "labels": {
     "createdBy": "Created By",
@@ -496,6 +502,7 @@
       }
     },
     "info": {
+      "pasteNotSupported": "Paste operation is not supported on the active cell",
       "roles": {
         "orgCreator": "Creator can create new projects and access any invited project.",
         "orgViewer": "Viewer is not allowed to create new projects but they can access any invited project."
@@ -613,7 +620,9 @@
       "deleteViewConfirmation": "Sind Sie sicher, dass Sie diese Ansicht löschen möchten?",
       "deleteTableConfirmation": "Möchten Sie die Tabelle löschen",
       "showM2mTables": "M2M Tabellen anzeigen",
-      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack."
+      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
+      "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
     },
     "error": {
       "searchProject": "Ihre Suche nach {search} fand keine Ergebnisse",

packages/nc-gui/lang/da.json

@@ -70,7 +70,6 @@
     "moreInfo": "More information can be found here",
     "logs": "Logs",
     "groupingField": "Grouping Field",
-    "duplicate": "Duplicate",
     "insertAfter": "Insert After",
     "insertBefore": "Insert Before",
     "hideField": "Hide Field",

packages/nc-gui/lang/de.json

@@ -69,7 +69,12 @@
     "betaNote": "This feature is currently in beta.",
     "moreInfo": "More information can be found here",
     "logs": "Logs",
-    "groupingField": "Grouping Field"
+    "groupingField": "Grouping Field",
+    "insertAfter": "Insert After",
+    "insertBefore": "Insert Before",
+    "hideField": "Hide Field",
+    "sortAsc": "Sort Ascending",
+    "sortDesc": "Sort Descending"
   },
   "objects": {
     "project": "Proyecto",
@@ -199,7 +204,8 @@
     "quickImportFrom": "Quick Import From",
     "quickImport": "Quick Import",
     "advancedSettings": "Advanced Settings",
-    "codeSnippet": "Code Snippet"
+    "codeSnippet": "Code Snippet",
+    "keyboardShortcut": "Keyboard Shortcuts"
   },
   "labels": {
     "createdBy": "Created By",
@@ -496,6 +502,7 @@
       }
     },
     "info": {
+      "pasteNotSupported": "Paste operation is not supported on the active cell",
       "roles": {
         "orgCreator": "Creator can create new projects and access any invited project.",
         "orgViewer": "Viewer is not allowed to create new projects but they can access any invited project."
@@ -613,7 +620,9 @@
       "deleteViewConfirmation": "Are you sure you want to delete this view?",
       "deleteTableConfirmation": "Do you want to delete the table",
       "showM2mTables": "Show M2M Tables",
-      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack."
+      "deleteKanbanStackConfirmation": "Deleting this stack will also remove the select option `{stackToBeDeleted}` from the `{groupingField}`. The records will move to the uncategorized stack.",
+      "computedFieldEditWarning": "Computed field: contents are read-only. Use column edit menu to reconfigure",
+      "computedFieldDeleteWarning": "Computed field: contents are read-only. Unable to clear content."
     },
     "error": {
       "searchProject": "Tu búsqueda de {search} no encontró resultados",