From 489c67511cc1679ae70301ad162e874c431fe0dc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 18 Oct 2023 10:04:26 +0100 Subject: [PATCH] PR comments. --- .../datasource/[datasourceId]/_layout.svelte | 4 +- .../datasource/[datasourceId]/index.svelte | 97 +++++++++---------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte index c9ceb1b657..b45fa78c40 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte @@ -23,5 +23,7 @@ {#key $params.datasourceId} - + {#if $datasources.selected} + + {/if} {/key} diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte index 1a887dd483..3306c3b0b0 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte @@ -12,18 +12,11 @@ import PromptQueryModal from "./_components/PromptQueryModal.svelte" import SettingsPanel from "./_components/panels/Settings.svelte" import { helpers } from "@budibase/shared-core" - import { goto } from "@roxi/routify" let selectedPanel = null let panelOptions = [] - // datasources.selected can return null temporarily on datasource deletion $: datasource = $datasources.selected - $: { - if (!datasource) { - $goto("./datasource") - } - } $: getOptions(datasource) @@ -58,53 +51,51 @@ -{#if datasource} -
- - -
- - {$datasources.selected?.name} -
- - -
- - {#each panelOptions as panelOption} - (selectedPanel = panelOption)} - /> - {/each} - -
- - {#if selectedPanel === null} - loading... - {:else if selectedPanel === "Tables"} - - {:else if selectedPanel === "Relationships"} - - {:else if selectedPanel === "Queries"} - - {:else if selectedPanel === "Headers"} - - {:else if selectedPanel === "Authentication"} - - {:else if selectedPanel === "Variables"} - - {:else if selectedPanel === "Settings"} - - {:else} - Something went wrong - {/if} +
+ + +
+ + {$datasources.selected?.name} +
-
-{/if} + +
+ + {#each panelOptions as panelOption} + (selectedPanel = panelOption)} + /> + {/each} + +
+ + {#if selectedPanel === null} + loading... + {:else if selectedPanel === "Tables"} + + {:else if selectedPanel === "Relationships"} + + {:else if selectedPanel === "Queries"} + + {:else if selectedPanel === "Headers"} + + {:else if selectedPanel === "Authentication"} + + {:else if selectedPanel === "Variables"} + + {:else if selectedPanel === "Settings"} + + {:else} + Something went wrong + {/if} + +