From ae904c79d06b28159c0fccd240da07a69c9b9fcc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 Feb 2021 17:55:21 +0000
Subject: [PATCH] Fixing an issue with Cypress tests.

---
 .../src/components/backend/DataTable/Table.svelte  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 702a1d80dc..51dedf1a4d 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -91,7 +91,7 @@
       if (hideAutocolumns && value.autocolumn) {
         continue
       }
-      result.push({
+      let config = {
         headerCheckboxSelection: false,
         headerComponent: TableHeader,
         headerComponentParams: {
@@ -100,7 +100,6 @@
         },
         headerName: value.displayFieldName || key,
         field: key,
-        autocolumn: !!value.autocolumn,
         sortable: true,
         cellRenderer: getRenderer({
           schema: schema[key],
@@ -113,12 +112,15 @@
         autoHeight: true,
         resizable: true,
         minWidth: 200,
-      })
+      }
+      // sort auto-columns to the end if they are present
+      if (value.autocolumn) {
+        result.push(config)
+      } else {
+        result.unshift(config)
+      }
     }
-    // sort auto-columns to the end if they are present
     columnDefs = result
-      .filter(col => !col.autocolumn)
-      .concat(result.filter(col => col.autocolumn))
   }
 
   function selectRelationship(row, fieldName) {