From 7c76a264673c1df545ff65ae51fa98508584db20 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 1 Apr 2021 18:00:46 +0100
Subject: [PATCH] Update to support new backend table structure

---
 .../EventsEditor/actions/DeleteRow.svelte          |  5 +++--
 .../EventsEditor/actions/SaveRow.svelte            |  5 +++--
 .../src/components/start/CreateAppModal.svelte     |  8 +-------
 packages/standard-components/yarn.lock             | 14 +-------------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
index 9b6136ae1f..0895c78331 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
@@ -1,12 +1,13 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { store, currentAsset, backendUiStore } from "builderStore"
+  import { store, currentAsset } from "builderStore"
+  import { tables } from "stores/backend"
   import { getBindableProperties } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/DrawerBindableInput.svelte"
 
   export let parameters
 
-  $: tableOptions = $backendUiStore.tables || []
+  $: tableOptions = $tables || []
   $: bindings = getBindableProperties($currentAsset, $store.selectedComponentId)
 </script>
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
index b367b17484..a94a5e3002 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
@@ -1,6 +1,7 @@
 <script>
   import { Select, Label, Body } from "@budibase/bbui"
-  import { store, currentAsset, backendUiStore } from "builderStore"
+  import { store, currentAsset } from "builderStore"
+  import { tables } from "stores/backend"
   import {
     getDataProviderComponents,
     getSchemaForDatasource,
@@ -14,7 +15,7 @@
     $store.selectedComponentId
   )
   $: schemaFields = getSchemaFields(parameters?.tableId)
-  $: tableOptions = $backendUiStore.tables || []
+  $: tableOptions = $tables || []
 
   const getSchemaFields = tableId => {
     const { schema } = getSchemaForDatasource({ type: "table", tableId })
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 77513efe58..421c42851e 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -1,11 +1,7 @@
 <script>
   import { writable, get as svelteGet } from "svelte/store"
   import { notifier } from "builderStore/store/notifications"
-  import {
-    store,
-    automationStore,
-    hostingStore,
-  } from "builderStore"
+  import { store, automationStore, hostingStore } from "builderStore"
   import { string, object } from "yup"
   import api, { get } from "builderStore/api"
   import Form from "@svelteschool/svelte-forms"
@@ -24,7 +20,6 @@
 
   export let template
 
-
   const infoValidation = {
     applicationName: string().required("Your application must have a name."),
   }
@@ -149,7 +144,6 @@
       )
       const pkg = await applicationPkg.json()
       if (applicationPkg.ok) {
-        // backendUiStore.actions.reset()
         await store.actions.initialise(pkg)
         await automationStore.actions.fetch()
       } else {
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock
index 236a7104b0..f6a65cec64 100644
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@@ -56,13 +56,6 @@
     svelte-portal "^1.0.0"
     turndown "^7.0.0"
 
-"@budibase/svelte-ag-grid@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/svelte-ag-grid/-/svelte-ag-grid-1.0.4.tgz#41cceec4bde2c4aea8b9da8f610fe36055c7709f"
-  integrity sha512-JZm6qujxnZpqw7Twbegr6se4sHhyWzN0Cibrk5bVBH32hBgzD6dd33fxwrjHKkWFxjys9wRT+cqYgYVlSt9E3w==
-  dependencies:
-    ag-grid-community "^24.0.0"
-
 "@polka/url@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-0.5.0.tgz#b21510597fd601e5d7c95008b76bf0d254ebfd31"
@@ -179,7 +172,7 @@
   dependencies:
     "@spectrum-css/vars" "^3.0.1"
 
-"@spectrum-css/picker@^1.0.1":
+"@spectrum-css/picker@^1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b"
   integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA==
@@ -248,11 +241,6 @@ abstract-leveldown@~0.12.0, abstract-leveldown@~0.12.1:
   dependencies:
     xtend "~3.0.0"
 
-ag-grid-community@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-24.0.0.tgz#793a3c4a28e5148c5c8c8c6ff68e8f3c4ee6ca3d"
-  integrity sha512-TNNqTp918PCRicH/vE8fs1pu/hbWMc9Iem7gCjGsjlabBrGhMxCq7tYiBtguERuxdszbSImznjampnc0NvOoFg==
-
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"