From f73b4f8b01a4a2d4bf2f988003a2a4adb41b1d56 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 15 Nov 2022 17:03:35 +0000
Subject: [PATCH] Review updates

---
 .../DatasourceNavigator/DatasourceNavigator.svelte  |  4 ++--
 .../TableNavigator/modals/CreateTableModal.svelte   |  8 ++++++--
 .../ButtonActionEditor/actions/ExecuteQuery.svelte  |  8 ++++++--
 packages/builder/src/constants/backend/index.js     |  3 ++-
 packages/builder/src/constants/index.js             |  2 --
 .../builder/app/[application]/data/_layout.svelte   |  4 ++--
 .../datasource_internal_bb_default/index.svelte     |  2 +-
 packages/server/src/api/controllers/application.ts  | 11 -----------
 packages/server/src/api/controllers/datasource.js   | 10 +++++++---
 packages/server/src/constants/index.js              |  2 ++
 .../src/db/defaultData/datasource_bb_default.js     | 13 +++----------
 packages/server/src/db/utils.js                     |  4 +++-
 12 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index a3531513fb..c860c7cba3 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -2,7 +2,7 @@
   import { onMount } from "svelte"
   import { get } from "svelte/store"
   import { goto, params } from "@roxi/routify"
-  import { BUDIBASE_INTERNAL_DB } from "constants"
+  import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
   import { database, datasources, queries, tables, views } from "stores/backend"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
@@ -129,7 +129,7 @@
             size="18"
           />
         </div>
-        {#if datasource._id !== BUDIBASE_INTERNAL_DB}
+        {#if datasource._id !== BUDIBASE_INTERNAL_DB_ID}
           <EditDatasourcePopover {datasource} />
         {/if}
       </NavItem>
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 44e592a0b1..1872a308e5 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -12,6 +12,10 @@
   } from "@budibase/bbui"
   import { datasources } from "stores/backend"
   import TableDataImport from "../TableDataImport.svelte"
+  import {
+    BUDIBASE_INTERNAL_DB_ID,
+    BUDIBASE_DATASOURCE_TYPE,
+  } from "constants/backend"
   import { buildAutoColumn, getAutoColumnInformation } from "builderStore/utils"
 
   $: tableNames = $tables.list.map(table => table.name)
@@ -19,10 +23,10 @@
     source => source._id === $datasources.selected
   )
 
-  $: isSelectedInternal = selectedSource?.type === "budibase"
+  $: isSelectedInternal = selectedSource?.type === BUDIBASE_DATASOURCE_TYPE
   $: targetDatasourceId = isSelectedInternal
     ? selectedSource._id
-    : "bb_internal"
+    : BUDIBASE_INTERNAL_DB_ID
 
   export let name
   let dataImport
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 757f65c65f..c74613b649 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -3,7 +3,10 @@
   import { datasources, integrations, queries } from "stores/backend"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
-  import { BUDIBASE_DATASOURCE_ID } from "constants/backend"
+  import {
+    BUDIBASE_INTERNAL_DB_ID,
+    BUDIBASE_DATASOURCE_TYPE,
+  } from "constants/backend"
 
   export let parameters
   export let bindings = []
@@ -14,7 +17,8 @@
   )
   // Executequery must exclude budibase datasource
   $: executeQueryDatasources = $datasources.list.filter(
-    x => x._id !== BUDIBASE_DATASOURCE_ID && x.type !== "budibase"
+    x =>
+      x._id !== BUDIBASE_INTERNAL_DB_ID && x.type !== BUDIBASE_DATASOURCE_TYPE
   )
 
   function fetchQueryDefinition(query) {
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 427e8d80a1..5ecc7bc324 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -173,7 +173,8 @@ export const SWITCHABLE_TYPES = [
   ...ALLOWABLE_NUMBER_TYPES,
 ]
 
-export const BUDIBASE_DATASOURCE_ID = "bb_internal"
+export const BUDIBASE_INTERNAL_DB_ID = "bb_internal"
+export const BUDIBASE_DATASOURCE_TYPE = "budibase"
 
 export const IntegrationTypes = {
   POSTGRES: "POSTGRES",
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index 151a0cdf8d..803cafcffb 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -43,8 +43,6 @@ export const LAYOUT_NAMES = {
   },
 }
 
-export const BUDIBASE_INTERNAL_DB = "bb_internal"
-
 // one or more word characters and whitespace
 export const APP_NAME_REGEX = /^[\w\s]+$/
 // zero or more non-whitespace characters
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 7046614768..14eab7c41b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,7 +1,7 @@
 <script>
   import { redirect, params } from "@roxi/routify"
   import { Icon, Tabs, Tab } from "@budibase/bbui"
-  import { BUDIBASE_INTERNAL_DB } from "constants"
+  import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
   import CreateDatasourceModal from "components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte"
 
@@ -11,7 +11,7 @@
 
   $: isExternal =
     $params.selectedDatasource &&
-    $params.selectedDatasource !== BUDIBASE_INTERNAL_DB
+    $params.selectedDatasource !== BUDIBASE_INTERNAL_DB_ID
 
   function selectFirstDatasource() {
     $redirect("./table")
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
index e6cc0f06a0..699321367b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
@@ -21,7 +21,7 @@
     <Layout gap="XS" noPadding>
       <header>
         <svelte:component this={ICONS.BUDIBASE} height="26" width="26" />
-        <Heading size="M">Budibase Default</Heading>
+        <Heading size="M">Test DB</Heading>
       </header>
       <Body size="M">A little something to get you up and running!</Body>
       <Body size="M"
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 816c1fd76d..d14e6a2f57 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -175,17 +175,6 @@ const addDefaultTables = async (db: any) => {
 
   // add in the default db data docs - tables, datasource, rows and links
   await db.bulkDocs([...defaultDbDocs])
-
-  // Sync Quotas with the imported row count.
-  const metrics = defaultDbDocs.reduce((acc, doc) => {
-    acc[doc.type] = acc[doc.type] ? acc[doc.type] + 1 : 1
-    return acc
-  }, {})
-
-  // Record the row quotas
-  if (metrics.row) {
-    await quotas.addRows(metrics.row)
-  }
 }
 
 export const fetch = async (ctx: any) => {
diff --git a/packages/server/src/api/controllers/datasource.js b/packages/server/src/api/controllers/datasource.js
index ba3dcdcfb7..c6d2cbcbb6 100644
--- a/packages/server/src/api/controllers/datasource.js
+++ b/packages/server/src/api/controllers/datasource.js
@@ -7,7 +7,11 @@ const {
   getTableParams,
 } = require("../../db/utils")
 const { destroy: tableDestroy } = require("./table/internal")
-const { BuildSchemaErrors, InvalidColumns } = require("../../constants")
+const {
+  BuildSchemaErrors,
+  InvalidColumns,
+  BUDIBASE_DATASOURCE_TYPE,
+} = require("../../constants")
 const { getIntegration } = require("../../integrations")
 const { getDatasourceAndQuery } = require("./row/utils")
 const { invalidateDynamicVariables } = require("../../threads/utils")
@@ -51,7 +55,7 @@ exports.fetch = async function (ctx) {
       delete datasource.config.auth
     }
 
-    if (datasource.type === "budibase") {
+    if (datasource.type === BUDIBASE_DATASOURCE_TYPE) {
       datasource.entities = internal[datasource._id]
     }
   }
@@ -243,7 +247,7 @@ exports.destroy = async function (ctx) {
   const datasource = await db.get(datasourceId)
   // Delete all queries for the datasource
 
-  if (datasource.type === "budibase") {
+  if (datasource.type === BUDIBASE_DATASOURCE_TYPE) {
     await destroyInternalTablesBySourceId(datasourceId)
   } else {
     const queries = await db.allDocs(getQueryParams(datasourceId, null))
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
index 6d8fe57baa..588a4a730b 100644
--- a/packages/server/src/constants/index.js
+++ b/packages/server/src/constants/index.js
@@ -89,6 +89,8 @@ exports.DatasourceAuthTypes = {
   GOOGLE: "google",
 }
 
+exports.BUDIBASE_DATASOURCE_TYPE = "budibase"
+
 exports.SortDirection = {
   ASCENDING: "ASCENDING",
   DESCENDING: "DESCENDING",
diff --git a/packages/server/src/db/defaultData/datasource_bb_default.js b/packages/server/src/db/defaultData/datasource_bb_default.js
index 17fbf163a0..2cfb68a67b 100644
--- a/packages/server/src/db/defaultData/datasource_bb_default.js
+++ b/packages/server/src/db/defaultData/datasource_bb_default.js
@@ -10,6 +10,7 @@ const { inventoryImport } = require("./inventoryImport")
 const { employeeImport } = require("./employeeImport")
 const { jobsImport } = require("./jobsImport")
 const { expensesImport } = require("./expensesImport")
+const { BUDIBASE_DATASOURCE_TYPE } = require("../../constants")
 
 exports.DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs"
 exports.DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory"
@@ -18,8 +19,8 @@ exports.DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee"
 exports.DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default"
 exports.DEFAULT_BB_DATASOURCE = {
   _id: this.DEFAULT_BB_DATASOURCE_ID,
-  type: "budibase",
-  name: "BB Default",
+  type: BUDIBASE_DATASOURCE_TYPE,
+  name: "Test DB",
   source: "BUDIBASE",
   config: {},
 }
@@ -290,14 +291,6 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
       name: "Badge Photo",
       sortable: false,
     },
-    // Jobs: {
-    //   name: "Jobs",
-    //   type: FieldTypes.LINK,
-    //   tableId: this.DEFAULT_EMPLOYEE_TABLE_ID,
-    //   fieldName: "Assigned",
-    //   relationshipType: RelationshipTypes.MANY_TO_MANY,
-    //   sortable: false,
-    // },
     Jobs: {
       type: FieldTypes.LINK,
       constraints: {
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index acd72cbf66..8b631c1a05 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -22,6 +22,8 @@ const {
   getGlobalIDFromUserMetadataID,
 } = require("@budibase/backend-core/db")
 
+const { BUDIBASE_DATASOURCE_TYPE } = require("../constants")
+
 const UNICODE_MAX = "\ufff0"
 
 const AppStatus = {
@@ -40,7 +42,7 @@ exports.StaticDatabases = StaticDatabases
 
 const BudibaseInternalDB = {
   _id: "bb_internal",
-  type: "budibase",
+  type: BUDIBASE_DATASOURCE_TYPE,
   name: "Budibase DB",
   source: "BUDIBASE",
   config: {},