From 63d9a5977b656323f9c63fd3054a228ee16d621d Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 15 Nov 2022 14:29:58 +0000
Subject: [PATCH 1/4] Default datasource behaviour with order of preference:
 DefaultDB, Internal then External

---
 .../src/builderStore/store/frontend.js        | 43 +++++++++++++++++++
 .../builder/app/[application]/_layout.svelte  |  4 --
 .../builder/src/stores/backend/datasources.js |  1 +
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 1291f81294..9814bcfc74 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -481,6 +481,40 @@ export const getFrontendStore = () => {
           return null
         }
 
+        const dataSourceField = definition.settings.find(
+          setting => setting.type == "dataSource"
+        )
+
+        let defaultDatasource
+        if (dataSourceField) {
+          const _tables = get(tables)
+          const filteredTables = _tables.list.filter(
+            table => table._id != "ta_users"
+          )
+
+          const internalTable = filteredTables.find(
+            table =>
+              table.sourceId === "bb_internal" && table.type == "internal"
+          )
+
+          const defaultSourceTable = filteredTables.find(
+            table =>
+              table.sourceId !== "bb_internal" && table.type == "internal"
+          )
+
+          const defaultExternalTable = filteredTables.find(
+            table => table.type == "external"
+          )
+
+          if (defaultSourceTable) {
+            defaultDatasource = defaultSourceTable
+          } else if (internalTable) {
+            defaultDatasource = internalTable
+          } else if (defaultExternalTable) {
+            defaultDatasource = defaultExternalTable
+          }
+        }
+
         // Generate default props
         const settings = getComponentSettings(componentName)
         let props = { ...presetProps }
@@ -490,6 +524,15 @@ export const getFrontendStore = () => {
           }
         })
 
+        // Set a default datasource
+        if (dataSourceField && defaultDatasource) {
+          props["dataSource"] = {
+            label: defaultDatasource.name,
+            tableId: defaultDatasource._id,
+            type: "table",
+          }
+        }
+
         // Add any extra properties the component needs
         let extras = {}
         if (definition.hasChildren) {
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index a854d09304..5296604dc7 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,7 +1,6 @@
 <script>
   import { store, automationStore } from "builderStore"
   import { roles, flags } from "stores/backend"
-  import { apps } from "stores/portal"
   import {
     ActionMenu,
     MenuItem,
@@ -63,9 +62,6 @@
     })
   }
 
-  $: isPublished =
-    $apps.find(app => app.devId === application)?.status === "published"
-
   onMount(async () => {
     if (!hasSynced && application) {
       try {
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index 07aeab1921..5aa4fb91a5 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -93,6 +93,7 @@ export function createDatasourcesStore() {
         return { list: sources, selected: null }
       })
       await queries.fetch()
+      await tables.fetch()
     },
     removeSchemaError: () => {
       update(state => {

From 7356c8b161f0fe44db3675dcdf0736ed976da6ea Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 16 Nov 2022 15:03:45 +0000
Subject: [PATCH 2/4] Ensure 'table' type sources are updated with a default
 datasource. Search visible settings sections for other elements IF a source
 is not already set.

---
 .../src/builderStore/store/frontend.js        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 9814bcfc74..6c375b871b 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -481,10 +481,27 @@ export const getFrontendStore = () => {
           return null
         }
 
-        const dataSourceField = definition.settings.find(
-          setting => setting.type == "dataSource"
+        let dataSourceField = definition.settings.find(
+          setting => setting.type == "dataSource" || setting.type == "table"
         )
 
+        if (!dataSourceField) {
+          // Check other visible sections for datasource/table elements.
+          const sections = definition.settings.filter(
+            item => item?.section && item.visible
+          )
+
+          for (let section of sections) {
+            let sectionSourceField = section.settings.find(
+              setting => setting.type == "dataSource" || setting.type == "table"
+            )
+            if (sectionSourceField) {
+              dataSourceField = sectionSourceField
+              break
+            }
+          }
+        }
+
         let defaultDatasource
         if (dataSourceField) {
           const _tables = get(tables)

From 68aeb43ea2c0e58b93ecef837330c0ca59cf178e Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 21 Nov 2022 17:07:00 +0000
Subject: [PATCH 3/4] Review updates

---
 .../src/builderStore/store/frontend.js        | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 6c375b871b..dc7264a814 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -481,27 +481,13 @@ export const getFrontendStore = () => {
           return null
         }
 
-        let dataSourceField = definition.settings.find(
+        // Flattened settings
+        const settings = getComponentSettings(componentName)
+
+        let dataSourceField = settings.find(
           setting => setting.type == "dataSource" || setting.type == "table"
         )
 
-        if (!dataSourceField) {
-          // Check other visible sections for datasource/table elements.
-          const sections = definition.settings.filter(
-            item => item?.section && item.visible
-          )
-
-          for (let section of sections) {
-            let sectionSourceField = section.settings.find(
-              setting => setting.type == "dataSource" || setting.type == "table"
-            )
-            if (sectionSourceField) {
-              dataSourceField = sectionSourceField
-              break
-            }
-          }
-        }
-
         let defaultDatasource
         if (dataSourceField) {
           const _tables = get(tables)
@@ -533,7 +519,6 @@ export const getFrontendStore = () => {
         }
 
         // Generate default props
-        const settings = getComponentSettings(componentName)
         let props = { ...presetProps }
         settings.forEach(setting => {
           if (setting.defaultValue !== undefined) {
@@ -543,7 +528,7 @@ export const getFrontendStore = () => {
 
         // Set a default datasource
         if (dataSourceField && defaultDatasource) {
-          props["dataSource"] = {
+          props[dataSourceField.key] = {
             label: defaultDatasource.name,
             tableId: defaultDatasource._id,
             type: "table",

From 05188f058854e4c1ae77449c80f2d2c6d8876ebf Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 23 Nov 2022 17:12:23 +0000
Subject: [PATCH 4/4] Review updates

---
 .../src/builderStore/store/frontend.js        | 22 ++++++++++---------
 .../builder/src/constants/backend/index.js    |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index dc7264a814..fb486c6d27 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -20,6 +20,11 @@ import {
 } from "../componentUtils"
 import { Helpers } from "@budibase/bbui"
 import { Utils } from "@budibase/frontend-core"
+import {
+  BUDIBASE_INTERNAL_DB_ID,
+  DB_TYPE_INTERNAL,
+  DB_TYPE_EXTERNAL,
+} from "constants/backend"
 
 const INITIAL_FRONTEND_STATE = {
   apps: [],
@@ -497,25 +502,22 @@ export const getFrontendStore = () => {
 
           const internalTable = filteredTables.find(
             table =>
-              table.sourceId === "bb_internal" && table.type == "internal"
+              table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
+              table.type == DB_TYPE_INTERNAL
           )
 
           const defaultSourceTable = filteredTables.find(
             table =>
-              table.sourceId !== "bb_internal" && table.type == "internal"
+              table.sourceId !== BUDIBASE_INTERNAL_DB_ID &&
+              table.type == DB_TYPE_INTERNAL
           )
 
           const defaultExternalTable = filteredTables.find(
-            table => table.type == "external"
+            table => table.type == DB_TYPE_EXTERNAL
           )
 
-          if (defaultSourceTable) {
-            defaultDatasource = defaultSourceTable
-          } else if (internalTable) {
-            defaultDatasource = internalTable
-          } else if (defaultExternalTable) {
-            defaultDatasource = defaultExternalTable
-          }
+          defaultDatasource =
+            defaultSourceTable || internalTable || defaultExternalTable
         }
 
         // Generate default props
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 5ecc7bc324..f3898e1d9e 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -175,6 +175,8 @@ export const SWITCHABLE_TYPES = [
 
 export const BUDIBASE_INTERNAL_DB_ID = "bb_internal"
 export const BUDIBASE_DATASOURCE_TYPE = "budibase"
+export const DB_TYPE_INTERNAL = "internal"
+export const DB_TYPE_EXTERNAL = "external"
 
 export const IntegrationTypes = {
   POSTGRES: "POSTGRES",