Merge pull request #10745 from Budibase/revert-10234-budi-1855-handli…

…ng-deletion-of-display-columns-use Revert "Assign a new display column when deleting field"
Budibase · May 31, 2023 · 2498e62 · 2498e62
2 parents b42fe0a + b2e7b14
commit 2498e62
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 628 deletions.
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
@@ -79,25 +79,6 @@ export function createTablesStore() {
     replaceTable(table._id, null)
   }
 
-  const assignDisplayColumn = ({
-    primaryDisplay,
-    draft,
-    field,
-    originalName,
-  }) => {
-    if (primaryDisplay) {
-      draft.primaryDisplay = field.name
-    } else if (draft.primaryDisplay === originalName) {
-      const fields = Object.keys(draft.schema)
-      // pick another display column randomly if unselecting
-      draft.primaryDisplay = fields.filter(
-        name =>
-          (name !== originalName || name !== field.name) &&
-          !["attachment", "json", "link"].includes(draft.schema[name].type)
-      )[0]
-    }
-  }
-
   const saveField = async ({
     originalName,
     field,
@@ -117,13 +98,15 @@ export function createTablesStore() {
     }
 
     // Optionally set display column
-    assignDisplayColumn({
-      primaryDisplay,
-      draft,
-      field,
-      originalName,
-    })
-
+    if (primaryDisplay) {
+      draft.primaryDisplay = field.name
+    } else if (draft.primaryDisplay === originalName) {
+      const fields = Object.keys(draft.schema)
+      // pick another display column randomly if unselecting
+      draft.primaryDisplay = fields.filter(
+        name => name !== originalName || name !== field
+      )[0]
+    }
     if (indexes) {
       draft.indexes = indexes
     }
@@ -137,12 +120,6 @@ export function createTablesStore() {
 
   const deleteField = async field => {
     let draft = cloneDeep(get(derivedStore).selected)
-    assignDisplayColumn({
-      primaryDisplay: false,
-      draft,
-      field,
-      originalName: draft.primaryDisplay === field.name ? field.name : false,
-    })
     delete draft.schema[field.name]
     await save(draft)
   }