diff --git a/packages/builder/src/builderStore/datasource.js b/packages/builder/src/builderStore/datasource.js index 6f9bd29fd8..219ff7eb8f 100644 --- 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) } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte index ab5b3ccee0..332101550d 100644 --- 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" > - { - requireSpecificTables = e.detail - specificTables = null - }} - thin - text="Fetch listed tables only (one per line)" - /> - {#if requireSpecificTables} - - {/if} -
If you have fetched tables from this database before, this action may overwrite any changes you made after your initial fetch. +
+
+ +
Tables
- @@ -246,4 +245,8 @@ display: flex; gap: var(--spacing-m); } + + .table-checkboxes { + width: 100%; + } diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index c886e6a15f..028f8e7e93 100644 --- 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 }