From b4f4b7dde06ef156d1d2e8eaf5467883acbdc504 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 15 Mar 2021 20:38:55 +0000
Subject: [PATCH] fix duplicate column name issue

---
 .../DataTable/modals/CreateEditColumn.svelte  |  6 +++-
 .../PropertyControls/ColorPicker.svelte       | 34 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index ad2371f3ea..d269124219 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -53,7 +53,11 @@
   $: uneditable =
     $backendUiStore.selectedTable?._id === TableNames.USERS &&
     UNEDITABLE_USER_FIELDS.includes(field.name)
-  $: invalid = field.type === LINK_TYPE && !field.tableId
+  $: invalid =
+    (field.type === LINK_TYPE && !field.tableId) ||
+    Object.keys($backendUiStore.draftTable.schema).some(
+      key => key === field.name
+    )
 
   // used to select what different options can be displayed for column type
   $: canBeSearched =
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
index 6235e744f8..c777f79666 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
@@ -1,38 +1,42 @@
 <script>
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher } from "svelte"
   import Colorpicker from "@budibase/colorpicker"
-  
-  const dispatch = createEventDispatcher();
+
+  const dispatch = createEventDispatcher()
 
   export let value
-  
-  const WAIT = 150;
-  
+
+  const WAIT = 150
+
   function throttle(callback, wait, immediate = false) {
-    let timeout = null 
+    let timeout = null
     let initialCall = true
-    
+
     return function() {
       const callNow = immediate && initialCall
       const next = () => {
         callback.apply(this, arguments)
         timeout = null
       }
-      
-      if (callNow) { 
+
+      if (callNow) {
         initialCall = false
         next()
       }
-  
+
       if (!timeout) {
         timeout = setTimeout(next, wait)
       }
     }
   }
-  
-  const onChange = throttle(e => {
-    dispatch('change', e.detail)
-  }, WAIT, true)
+
+  const onChange = throttle(
+    e => {
+      dispatch("change", e.detail)
+    },
+    WAIT,
+    true
+  )
 </script>
 
 <Colorpicker value={value || '#C4C4C4'} on:change={onChange} />