From 36909ff7f6dc2ecc1ee00bcb0a03dd10ab5044e4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Oct 2023 15:50:12 +0200
Subject: [PATCH 1/5] Export bannedDisplayColumnTypes

---
 .../components/grid/cells/HeaderCell.svelte   | 16 +++---------
 packages/shared-core/src/table.ts             | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 packages/shared-core/src/table.ts

diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
index 9f58dc9f9f..13fdc602a4 100644
--- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
@@ -1,8 +1,8 @@
 <script>
   import { getContext, onMount, tick } from "svelte"
-  import { FieldType } from "@budibase/types"
-  import GridCell from "./GridCell.svelte"
+  import { canBeDisplayColumn } from "@budibase/shared-core"
   import { Icon, Popover, Menu, MenuItem, clickOutside } from "@budibase/bbui"
+  import GridCell from "./GridCell.svelte"
   import { getColumnIcon } from "../lib/utils"
 
   export let column
@@ -25,15 +25,6 @@
     datasource,
   } = getContext("grid")
 
-  const bannedDisplayColumnTypes = [
-    FieldType.LINK,
-    FieldType.ARRAY,
-    FieldType.ATTACHMENT,
-    FieldType.BOOLEAN,
-    FieldType.JSON,
-    FieldType.BB_REFERENCE,
-  ]
-
   let anchor
   let open = false
   let editIsOpen = false
@@ -233,8 +224,7 @@
       <MenuItem
         icon="Label"
         on:click={makeDisplayColumn}
-        disabled={idx === "sticky" ||
-          bannedDisplayColumnTypes.includes(column.schema.type)}
+        disabled={idx === "sticky" || !canBeDisplayColumn(column.schema.type)}
       >
         Use as display column
       </MenuItem>
diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts
new file mode 100644
index 0000000000..d6af43e0e4
--- /dev/null
+++ b/packages/shared-core/src/table.ts
@@ -0,0 +1,25 @@
+import { FieldType } from "types/dist"
+
+const allowDisplayColumnByType: Record<FieldType, boolean> = {
+  [FieldType.STRING]: true,
+  [FieldType.LONGFORM]: true,
+  [FieldType.OPTIONS]: true,
+  [FieldType.NUMBER]: true,
+  [FieldType.DATETIME]: true,
+  [FieldType.FORMULA]: true,
+  [FieldType.AUTO]: true,
+  [FieldType.INTERNAL]: true,
+  [FieldType.BARCODEQR]: true,
+  [FieldType.BIGINT]: true,
+
+  [FieldType.BOOLEAN]: false,
+  [FieldType.ARRAY]: false,
+  [FieldType.ATTACHMENT]: false,
+  [FieldType.LINK]: false,
+  [FieldType.JSON]: false,
+  [FieldType.BB_REFERENCE]: false,
+}
+
+export function canBeDisplayColumn(type: FieldType): boolean {
+  return !!allowDisplayColumnByType[type]
+}

From e0f51fb7dbaaee1aeb6a3c06f0c18029574faa00 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Oct 2023 15:53:10 +0200
Subject: [PATCH 2/5] Fixes

---
 packages/shared-core/src/index.ts | 1 +
 packages/shared-core/src/table.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/shared-core/src/index.ts b/packages/shared-core/src/index.ts
index 4a47eda898..a26c76cd96 100644
--- a/packages/shared-core/src/index.ts
+++ b/packages/shared-core/src/index.ts
@@ -3,3 +3,4 @@ export * as dataFilters from "./filters"
 export * as helpers from "./helpers"
 export * as utils from "./utils"
 export * as sdk from "./sdk"
+export * from "./table"
diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts
index d6af43e0e4..ffdd9bdd11 100644
--- a/packages/shared-core/src/table.ts
+++ b/packages/shared-core/src/table.ts
@@ -1,4 +1,4 @@
-import { FieldType } from "types/dist"
+import { FieldType } from "@budibase/types"
 
 const allowDisplayColumnByType: Record<FieldType, boolean> = {
   [FieldType.STRING]: true,

From 31469cb2d6038f6bffcdfac89e1973d2d79ca2fc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Oct 2023 16:05:41 +0200
Subject: [PATCH 3/5] Fix rebuilding shared-core

---
 packages/shared-core/tsconfig.build.json | 3 ++-
 packages/shared-core/tsconfig.json       | 3 +--
 packages/types/tsconfig.build.json       | 3 ++-
 packages/types/tsconfig.json             | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json
index 5b356a1f08..1969c286b1 100644
--- a/packages/shared-core/tsconfig.build.json
+++ b/packages/shared-core/tsconfig.build.json
@@ -15,7 +15,8 @@
     "skipLibCheck": true,
     "paths": {
       "@budibase/types": ["../types/src"]
-    }
+    },
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
   },
   "include": ["**/*.js", "**/*.ts"],
   "exclude": [
diff --git a/packages/shared-core/tsconfig.json b/packages/shared-core/tsconfig.json
index 1e7516a1ab..5e3d49c8b9 100644
--- a/packages/shared-core/tsconfig.json
+++ b/packages/shared-core/tsconfig.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": "..",
     "rootDir": "src",
-    "composite": true,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "composite": true
   },
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json
index 8df63fac57..1e289260e4 100644
--- a/packages/types/tsconfig.build.json
+++ b/packages/types/tsconfig.build.json
@@ -11,7 +11,8 @@
     "sourceMap": true,
     "declaration": true,
     "skipLibCheck": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"]
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index 66357a9d71..a2fd5207b4 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "rootDir": "./src",
-    "composite": true,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "composite": true
   },
   "exclude": ["node_modules", "dist"]
 }

From 61241392958abb1e1c40790da6664b246c2dd57a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Oct 2023 16:13:21 +0200
Subject: [PATCH 4/5] Don't allow selecting unvalid display columns

---
 .../components/backend/TableNavigator/TableDataImport.svelte   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 7294a43dd6..c7cbdec9a3 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -3,6 +3,7 @@
   import { FIELDS } from "constants/backend"
   import { API } from "api"
   import { parseFile } from "./utils"
+  import { canBeDisplayColumn } from "@budibase/shared-core"
 
   export let rows = []
   export let schema = {}
@@ -97,7 +98,7 @@
   let selectedColumnTypes = {}
 
   $: displayColumnOptions = Object.keys(schema || {}).filter(column => {
-    return validation[column]
+    return validation[column] && canBeDisplayColumn(schema[column].type)
   })
 
   $: {

From 193b8785ee746a38cbd41a020dd81fffe07eaeb8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 10 Oct 2023 16:17:03 +0200
Subject: [PATCH 5/5] Reset display field if required

---
 .../components/backend/TableNavigator/TableDataImport.svelte  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index c7cbdec9a3..5bc3b9e728 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -101,6 +101,10 @@
     return validation[column] && canBeDisplayColumn(schema[column].type)
   })
 
+  $: if (displayColumn && !canBeDisplayColumn(schema[displayColumn].type)) {
+    displayColumn = null
+  }
+
   $: {
     // binding in consumer is causing double renders here
     const newValidateHash = JSON.stringify(rows) + JSON.stringify(schema)