From 08920f8015cfe80fc63d32eaee6d9816b12bdc36 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 20 Jul 2023 14:06:31 +0100
Subject: [PATCH] Remove invalid columns from display column selection and fix
 schema failure handling

---
 .../TableNavigator/TableDataImport.svelte     | 25 +++++++++++--------
 packages/server/src/utilities/schema.ts       |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 1191f92b31..6de069bab4 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -4,16 +4,6 @@
   import { API } from "api"
   import { parseFile } from "./utils"
 
-  let fileInput
-  let error = null
-  let fileName = null
-  let fileType = null
-
-  let loading = false
-  let validation = {}
-  let validateHash = ""
-  let errors = {}
-
   export let rows = []
   export let schema = {}
   export let allValid = true
@@ -51,6 +41,19 @@
     },
   ]
 
+  let fileInput
+  let error = null
+  let fileName = null
+  let fileType = null
+  let loading = false
+  let validation = {}
+  let validateHash = ""
+  let errors = {}
+
+  $: displayColumnOptions = Object.keys(schema || {}).filter(column => {
+    return validation[column]
+  })
+
   async function handleFile(e) {
     loading = true
     error = null
@@ -178,7 +181,7 @@
     <Select
       label="Display Column"
       bind:value={displayColumn}
-      options={Object.keys(schema)}
+      options={displayColumnOptions}
       sort
     />
   </div>
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index 785840b23e..5ced82d8cf 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -84,7 +84,7 @@ export function validate(rows: Rows, schema: Schema): ValidationResults {
         results.invalidColumns.push(columnName)
       } else if (!columnName.match(ValidColumnNameRegex)) {
         // Check for special characters in column names
-        results.invalidColumns.push(columnName)
+        results.schemaValidation[columnName] = false
         results.errors[columnName] =
           "Column names can't contain special characters"
       } else if (