From 3a5f0343c43e526ee866124cc5683ba4d6039ae5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 9 Sep 2024 15:37:25 +0200
Subject: [PATCH] Undo unnecessary changes

---
 .../GridColumnConfiguration/getColumns.js     | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
index f5ac106162..dcfed9053f 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js
@@ -17,8 +17,7 @@ const modernize = columns => {
 const removeInvalidAddMissing = (
   columns = [],
   defaultColumns,
-  primaryDisplayColumnName,
-  schema
+  primaryDisplayColumnName
 ) => {
   const defaultColumnNames = defaultColumns.map(column => column.field)
   const columnNames = columns.map(column => column.field)
@@ -45,37 +44,18 @@ const removeInvalidAddMissing = (
     combinedColumns[primaryDisplayIndex].active = true
   }
 
-  for (const column of combinedColumns) {
-    if (!column.related) {
-      column.columnType = schema[column.field]?.type
-      continue
-    }
-
-    const { field: relField, subField: relSubField } = column.related
-    column.columnType = schema[relField]?.columns?.[relSubField]?.type
-  }
-
   return combinedColumns
 }
 
 const getDefault = (schema = {}) => {
   const defaultValues = Object.values(schema)
     .filter(column => !column.nestedJSON)
-    .flatMap(column => {
-      const order = column.visible
-        ? column.order ?? -1
-        : Number.MAX_SAFE_INTEGER
-      const columns = [
-        {
-          label: column.name,
-          field: column.name,
-          active: column.visible ?? true,
-          order,
-        },
-      ]
-
-      return columns
-    })
+    .map(column => ({
+      label: column.name,
+      field: column.name,
+      active: column.visible ?? true,
+      order: column.visible ? column.order ?? -1 : Number.MAX_SAFE_INTEGER,
+    }))
 
   defaultValues.sort((a, b) => a.order - b.order)
 
@@ -121,8 +101,7 @@ const getColumns = ({
   const validatedColumns = removeInvalidAddMissing(
     modernize(columns),
     getDefault(schema),
-    primaryDisplayColumnName,
-    schema
+    primaryDisplayColumnName
   )
   const draggableList = toDraggableListFormat(validatedColumns, createComponent)
   const primary = draggableList