From a7f95f8a8791a35b0331906ebc1dd4c0154f2acc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 1 Dec 2021 13:09:16 +0000 Subject: [PATCH] Updating integration config screen. --- .../IntegrationConfigForm.svelte | 2 +- .../PlusConfigForm.svelte | 48 ++++++++++--------- .../RestExtraConfigForm.svelte | 11 +++-- .../integration/KeyValueBuilder.svelte | 20 ++++---- .../[selectedDatasource]/index.svelte | 35 +++++--------- 5 files changed, 56 insertions(+), 60 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 63fe4932f3..e6e9232e52 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -35,7 +35,7 @@
- + {#if !creating}
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte index 0f1e6335dd..01ba071a3f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte @@ -4,7 +4,7 @@ Body, Divider, InlineAlert, - ActionButton, + Button, notifications, Modal, Table, @@ -13,6 +13,7 @@ import CreateEditRelationship from "components/backend/Datasources/CreateEditRelationship.svelte" import CreateExternalTableModal from "./CreateExternalTableModal.svelte" import ArrayRenderer from "components/common/ArrayRenderer.svelte" + import ConfirmDialog from "components/common/ConfirmDialog.svelte" import { goto } from "@roxi/routify" export let datasource @@ -26,10 +27,10 @@ tables: {}, columns: {}, } - let relationshipModal let createExternalTableModal let selectedFromRelationship, selectedToRelationship + let confirmDialog $: integration = datasource && $integrations[datasource.source] $: plusTables = datasource?.plus @@ -137,21 +138,28 @@ - + confirmDialog.hide()} + warning={false} + title="Confirm table fetch" +> + + If you have fetched tables from this database before, this action may + overwrite any changes you made after your initial fetch. + + + +
Tables
- - Fetch tables from database - - - Create new table - + +
@@ -177,16 +185,12 @@ customRenderers={[{ column: "primary", component: ArrayRenderer }]} /> {#if plusTables?.length !== 0} - +
Relationships - - Define existing relationship - +
Tell budibase how your tables are related to get even more smart features. diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/RestExtraConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/RestExtraConfigForm.svelte index 16babac81f..ce3881d82c 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/RestExtraConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/RestExtraConfigForm.svelte @@ -7,15 +7,12 @@ let addHeader - +
Headers Optional
- addHeader.addEntry()} - >Add header
Headers enable you to provide additional information about the request, such @@ -27,6 +24,11 @@ on:change noAddButton /> +
+ addHeader.addEntry()}> + Add header + +