Updating fetch within main datasource UI to mimic that of the onboarding.

2023-06-07 18:34:32 +01:00 · 2023-06-07 18:34:32 +01:00 · 9ee06e8e42
parent dd8f7fdb91
commit 9ee06e8e42
3 changed files with 26 additions and 20 deletions
--- a/packages/builder/src/builderStore/datasource.js
+++ b/packages/builder/src/builderStore/datasource.js
@ -46,7 +46,9 @@ export async function validateDatasourceConfig(config) {
 }

 export async function getDatasourceInfo(config) {
-  const datasource = prepareData(config)
-  const resp = await API.fetchInfoForDatasource(datasource)
-  return resp
+  let datasource = config
+  if (!config._id) {
+    datasource = prepareData(config)
+  }
+  return await API.fetchInfoForDatasource(datasource)
 }
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@ -8,7 +8,7 @@
    notifications,
    Modal,
    Table,
-    Toggle,
+    FancyCheckboxGroup,
  } from "@budibase/bbui"
  import { datasources, integrations, tables } from "stores/backend"
  import CreateEditRelationship from "components/backend/Datasources/CreateEditRelationship.svelte"
@ -16,7 +16,7 @@
  import ArrayRenderer from "components/common/renderers/ArrayRenderer.svelte"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import { goto } from "@roxi/routify"
-  import ValuesList from "components/common/ValuesList.svelte"
+  import { getDatasourceInfo } from "builderStore/datasource"

  export let datasource
  export let save
@ -34,7 +34,7 @@
  let selectedFromRelationship, selectedToRelationship
  let confirmDialog
  let specificTables = null
-  let requireSpecificTables = false
+  let tableList

  $: integration = datasource && $integrations[datasource.source]
  $: plusTables = datasource?.plus
@ -153,30 +153,29 @@
  warning={false}
  title="Confirm table fetch"
 >
-  <Toggle
-    bind:value={requireSpecificTables}
-    on:change={e => {
-      requireSpecificTables = e.detail
-      specificTables = null
-    }}
-    thin
-    text="Fetch listed tables only (one per line)"
-  />
-  {#if requireSpecificTables}
-    <ValuesList label="" bind:values={specificTables} />
-  {/if}
-  <br />
  <Body>
    If you have fetched tables from this database before, this action may
    overwrite any changes you made after your initial fetch.
  </Body>
+  <br />
+  <div class="table-checkboxes">
+    <FancyCheckboxGroup options={tableList} bind:selected={specificTables} />
+  </div>
 </ConfirmDialog>

 <Divider />
 <div class="query-header">
  <Heading size="S">Tables</Heading>
  <div class="table-buttons">
-    <Button secondary on:click={() => confirmDialog.show()}>
+    <Button
+      secondary
+      on:click={async () => {
+        console.log(datasource)
+        const info = await getDatasourceInfo(datasource)
+        tableList = info.tableNames
+        confirmDialog.show()
+      }}
+    >
      Fetch tables
    </Button>
    <Button cta icon="Add" on:click={createNewTable}>New table</Button>
@ -246,4 +245,8 @@
    display: flex;
    gap: var(--spacing-m);
  }
+
+  .table-checkboxes {
+    width: 100%;
+  }
 </style>
--- a/packages/server/src/sdk/app/datasources/datasources.ts
+++ b/packages/server/src/sdk/app/datasources/datasources.ts
@ -164,5 +164,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
      delete update.config[key]
    }
  }
+
  return update
 }