From ab350057b62cc6d0d7e12a6f3bab72ea00b10f58 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 12:23:41 +0100 Subject: [PATCH 01/45] Add seachbox to sources (not functional) --- .../src/components/common/SearchBox.svelte | 162 ++++++++++++++++++ .../app/[application]/data/_layout.svelte | 10 +- 2 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 packages/builder/src/components/common/SearchBox.svelte diff --git a/packages/builder/src/components/common/SearchBox.svelte b/packages/builder/src/components/common/SearchBox.svelte new file mode 100644 index 0000000000..d37bcab2a0 --- /dev/null +++ b/packages/builder/src/components/common/SearchBox.svelte @@ -0,0 +1,162 @@ + + + + +
+ +
+ {title} +
+
+ +
+
+ + 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 d89f09fc08..80f3f22497 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -4,6 +4,7 @@ import Panel from "components/design/Panel.svelte" import { isActive, redirect, goto, params } from "@roxi/routify" import { datasources } from "stores/backend" + import SearchBox from "components/common/SearchBox.svelte" $: { // If we ever don't have any data other than the users table, prompt the @@ -18,7 +19,10 @@
{#if !$isActive("./new")} - + + + + @@ -51,4 +55,8 @@ flex: 1 1 auto; z-index: 1; } + + .panel-title-content { + display: contents; + } From 04f67f3199a3511fac67b291fa63218bdd008dab Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 12:53:47 +0100 Subject: [PATCH 02/45] Add close functionallity --- .../src/components/common/SearchBox.svelte | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/SearchBox.svelte b/packages/builder/src/components/common/SearchBox.svelte index d37bcab2a0..079ac7e37b 100644 --- a/packages/builder/src/components/common/SearchBox.svelte +++ b/packages/builder/src/components/common/SearchBox.svelte @@ -1,7 +1,6 @@ @@ -39,15 +47,16 @@ {placeholder} /> -
- -
{title}
+ +
+ +
From 24bef1ee9df868ed21bdc5c04ef295646281e7e3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 15:38:08 +0100 Subject: [PATCH 09/45] Rename --- .../components/common/{SearchBox.svelte => NavHeader.svelte} | 0 .../src/pages/builder/app/[application]/data/_layout.svelte | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename packages/builder/src/components/common/{SearchBox.svelte => NavHeader.svelte} (100%) diff --git a/packages/builder/src/components/common/SearchBox.svelte b/packages/builder/src/components/common/NavHeader.svelte similarity index 100% rename from packages/builder/src/components/common/SearchBox.svelte rename to packages/builder/src/components/common/NavHeader.svelte 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 7d05b68ec8..268cce2930 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -4,7 +4,7 @@ import Panel from "components/design/Panel.svelte" import { isActive, redirect, goto, params } from "@roxi/routify" import { datasources } from "stores/backend" - import SearchBox from "components/common/SearchBox.svelte" + import NavHeader from "components/common/NavHeader.svelte" let searchValue @@ -23,7 +23,7 @@ {#if !$isActive("./new")} - Date: Thu, 9 Nov 2023 15:44:34 +0100 Subject: [PATCH 10/45] Handle enters --- .../src/components/common/NavHeader.svelte | 15 +++++++++++++-- packages/builder/src/helpers/keyUtils.js | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 packages/builder/src/helpers/keyUtils.js diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte index 3131f06ea6..5e401cf3c8 100644 --- a/packages/builder/src/components/common/NavHeader.svelte +++ b/packages/builder/src/components/common/NavHeader.svelte @@ -1,6 +1,7 @@ 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 268cce2930..90f9fb6be2 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -27,10 +27,10 @@ title="Sources" placeholder="Search for sources" bind:value={searchValue} + onAdd={() => $goto("./new")} /> - From b908287223d150d0e93f9cf0ea35678078a99da9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 16:09:45 +0100 Subject: [PATCH 14/45] Animate chevron --- packages/builder/src/components/common/NavItem.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte index 2c8a862535..1c9267ca18 100644 --- a/packages/builder/src/components/common/NavItem.svelte +++ b/packages/builder/src/components/common/NavItem.svelte @@ -189,6 +189,7 @@ flex: 0 0 20px; pointer-events: all; order: 0; + transition: transform 100ms linear; } .icon.arrow.absolute { position: absolute; From 72c415e72c61c18e01e76cbc53b92fbbf1e92a16 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 16:31:10 +0100 Subject: [PATCH 15/45] Filter tables --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 2 +- .../components/backend/TableNavigator/TableNavigator.svelte | 6 ++++++ .../src/pages/builder/app/[application]/data/_layout.svelte | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 5f914f545a..86cea3b3b9 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -206,7 +206,7 @@ {#if datasource.open} - + {#each $queries.list.filter(query => query.datasourceId === datasource._id && (!searchTerm || query.name ?.toLowerCase() ?.indexOf(searchTerm.toLowerCase()) > -1)) as query} diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte index 712d74889c..3f0538ceb3 100644 --- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte +++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte @@ -7,6 +7,7 @@ import { goto, isActive } from "@roxi/routify" import { userSelectedResourceMap } from "builderStore" + export let searchTerm export let sourceId export let selectTable @@ -14,6 +15,11 @@ .filter( table => table.sourceId === sourceId && table._id !== TableNames.USERS ) + .filter( + table => + !searchTerm || + table.name.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 + ) .sort(alphabetical) const alphabetical = (a, b) => { 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 90f9fb6be2..3fbf18eac5 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -1,5 +1,5 @@
- {#if searching} - - {:else} - Apps - - {/if} -
- $goto("./create")} - /> -
+ $goto("./create")} + />
From 699d4e07935b8a7cf91ffb1826c7f023a5b0d5dd Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 16:58:49 +0100 Subject: [PATCH 17/45] Filter at datasource navigator level --- .../DatasourceNavigator.svelte | 22 ++++++++++++++---- .../TableNavigator/TableNavigator.svelte | 23 ++++++++----------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 86cea3b3b9..0f68221ba1 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -66,11 +66,27 @@ views, viewsV2 ) + + const dsTables = tables.list.filter( + table => + table.sourceId === datasource._id && + table._id !== TableNames.USERS && + (!searchTerm || + table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + ) + const dsQueries = queries.list.filter( + query => + query.datasourceId === datasource._id && + (!searchTerm || + query.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + ) return { ...datasource, selected, containsSelected, open: open || onlySource || !!searchTerm, + queries: dsQueries, + tables: dsTables, } }) } @@ -206,10 +222,8 @@ {#if datasource.open} - - {#each $queries.list.filter(query => query.datasourceId === datasource._id && (!searchTerm || query.name - ?.toLowerCase() - ?.indexOf(searchTerm.toLowerCase()) > -1)) as query} + + {#each datasource.queries as query} - import { tables, views, viewsV2, database } from "stores/backend" + import { + tables as tablesStore, + views, + viewsV2, + database, + } from "stores/backend" import { TableNames } from "constants" import EditTablePopover from "./popovers/EditTablePopover.svelte" import EditViewPopover from "./popovers/EditViewPopover.svelte" @@ -7,20 +12,10 @@ import { goto, isActive } from "@roxi/routify" import { userSelectedResourceMap } from "builderStore" - export let searchTerm - export let sourceId + export let tables export let selectTable - $: sortedTables = $tables.list - .filter( - table => table.sourceId === sourceId && table._id !== TableNames.USERS - ) - .filter( - table => - !searchTerm || - table.name.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 - ) - .sort(alphabetical) + $: sortedTables = tables.sort(alphabetical) const alphabetical = (a, b) => { return a.name?.toLowerCase() > b.name?.toLowerCase() ? 1 : -1 @@ -43,7 +38,7 @@ icon={table._id === TableNames.USERS ? "UserGroup" : "Table"} text={table.name} selected={$isActive("./table/:tableId") && - $tables.selected?._id === table._id} + $tablesStore.selected?._id === table._id} on:click={() => selectTable(table._id)} selectedBy={$userSelectedResourceMap[table._id]} > From 226d287584541e957ef8b754a5e23d5b7520c1d5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 10 Nov 2023 10:19:14 +0100 Subject: [PATCH 18/45] Fix initial load --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 0f68221ba1..7e98861b8a 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -84,7 +84,7 @@ ...datasource, selected, containsSelected, - open: open || onlySource || !!searchTerm, + open: containsSelected || open || onlySource || !!searchTerm, queries: dsQueries, tables: dsTables, } From 3f814c6a9bc28c7a70d4f0add9ff2e64a4546365 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 10 Nov 2023 10:39:48 +0100 Subject: [PATCH 19/45] Handle open/close correctly --- .../DatasourceNavigator.svelte | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 7e98861b8a..c8eb946dd3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -23,7 +23,7 @@ import { userSelectedResourceMap } from "builderStore" export let searchTerm - let openDataSources = [] + let dataSourcesVisibility = {} $: enrichedDataSources = enrichDatasources( $datasources, @@ -33,10 +33,27 @@ $queries, $views, $viewsV2, - openDataSources, + dataSourcesVisibility, searchTerm ) + const showDatasourceOpen = ({ + selected, + containsSelected, + dataSourceVisibility, + searchTerm, + }) => { + if (searchTerm) { + return true + } + + if (dataSourceVisibility !== undefined) { + return dataSourceVisibility + } + + return selected || containsSelected + } + const enrichDatasources = ( datasources, params, @@ -45,7 +62,7 @@ queries, views, viewsV2, - openDataSources, + dataSourcesVisibility, searchTerm ) => { if (!datasources?.list?.length) { @@ -56,7 +73,6 @@ const selected = isActive("./datasource") && datasources.selectedDatasourceId === datasource._id - const open = openDataSources.includes(datasource._id) const containsSelected = containsActiveEntity( datasource, params, @@ -80,11 +96,18 @@ (!searchTerm || query.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) ) + + const open = showDatasourceOpen({ + selected, + containsSelected, + dataSourceVisibility: dataSourcesVisibility[datasource._id], + searchTerm, + }) return { ...datasource, selected, containsSelected, - open: containsSelected || open || onlySource || !!searchTerm, + open, queries: dsQueries, tables: dsTables, } @@ -103,23 +126,13 @@ } } - function closeNode(datasource) { - openDataSources = openDataSources.filter(id => datasource._id !== id) - } - function openNode(datasource) { - if (!openDataSources.includes(datasource._id)) { - openDataSources = [...openDataSources, datasource._id] - } + dataSourcesVisibility[datasource._id] = true } function toggleNode(datasource) { - const isOpen = openDataSources.includes(datasource._id) - if (isOpen) { - closeNode(datasource) - } else { - openNode(datasource) - } + dataSourcesVisibility[datasource._id] = + !dataSourcesVisibility[datasource._id] } const containsActiveEntity = ( From 64c63e9e7f0766b9df7710f178a41e58c5141381 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 10 Nov 2023 10:44:33 +0100 Subject: [PATCH 20/45] Fix toggle bug --- .../DatasourceNavigator/DatasourceNavigator.svelte | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index c8eb946dd3..660710f0f1 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -42,6 +42,7 @@ containsSelected, dataSourceVisibility, searchTerm, + onlyOneSource, }) => { if (searchTerm) { return true @@ -51,6 +52,10 @@ return dataSourceVisibility } + if (onlyOneSource) { + return true + } + return selected || containsSelected } @@ -102,6 +107,7 @@ containsSelected, dataSourceVisibility: dataSourcesVisibility[datasource._id], searchTerm, + onlyOneSource: onlySource, }) return { ...datasource, @@ -131,8 +137,7 @@ } function toggleNode(datasource) { - dataSourcesVisibility[datasource._id] = - !dataSourcesVisibility[datasource._id] + dataSourcesVisibility[datasource._id] = !datasource.open } const containsActiveEntity = ( From 977f81c412f50b80740f7e4c414dbd87fd2ee5c4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 10 Nov 2023 10:49:55 +0100 Subject: [PATCH 21/45] Add comments --- .../DatasourceNavigator.svelte | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 660710f0f1..542a9ca74f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -23,7 +23,7 @@ import { userSelectedResourceMap } from "builderStore" export let searchTerm - let dataSourcesVisibility = {} + let toggledDatasources = {} $: enrichedDataSources = enrichDatasources( $datasources, @@ -33,23 +33,25 @@ $queries, $views, $viewsV2, - dataSourcesVisibility, + toggledDatasources, searchTerm ) const showDatasourceOpen = ({ selected, containsSelected, - dataSourceVisibility, + dsToggledStatus, searchTerm, onlyOneSource, }) => { + // We want to display all the ds expanded while filtering ds if (searchTerm) { return true } - if (dataSourceVisibility !== undefined) { - return dataSourceVisibility + // If the toggle status has been a value + if (dsToggledStatus !== undefined) { + return dsToggledStatus } if (onlyOneSource) { @@ -67,7 +69,7 @@ queries, views, viewsV2, - dataSourcesVisibility, + toggledDatasources, searchTerm ) => { if (!datasources?.list?.length) { @@ -105,7 +107,7 @@ const open = showDatasourceOpen({ selected, containsSelected, - dataSourceVisibility: dataSourcesVisibility[datasource._id], + dsToggledStatus: toggledDatasources[datasource._id], searchTerm, onlyOneSource: onlySource, }) @@ -133,11 +135,11 @@ } function openNode(datasource) { - dataSourcesVisibility[datasource._id] = true + toggledDatasources[datasource._id] = true } function toggleNode(datasource) { - dataSourcesVisibility[datasource._id] = !datasource.open + toggledDatasources[datasource._id] = !datasource.open } const containsActiveEntity = ( From 3829797e3c94b003c36ef59a6a8e431be715c2e3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 10 Nov 2023 10:52:06 +0100 Subject: [PATCH 22/45] Display only if there are search results --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 542a9ca74f..8ba131cd84 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -111,6 +111,8 @@ searchTerm, onlyOneSource: onlySource, }) + + const show = dsQueries.length || dsTables.length return { ...datasource, selected, @@ -118,6 +120,7 @@ open, queries: dsQueries, tables: dsTables, + show, } }) } @@ -218,7 +221,7 @@ on:click={() => selectTable(TableNames.USERS)} selectedBy={$userSelectedResourceMap[TableNames.USERS]} /> - {#each enrichedDataSources as datasource} + {#each enrichedDataSources.filter(ds => ds.show) as datasource} Date: Fri, 10 Nov 2023 10:56:15 +0100 Subject: [PATCH 23/45] Hide/show app users on search --- .../DatasourceNavigator.svelte | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 8ba131cd84..e30483d8eb 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -209,18 +209,25 @@ const viewV2Table = options.find(x => x._id === viewsV2.selected?.tableId) return viewV2Table != null } + + const appUsersTableName = "App users" + $: showAppUsersTable = + !searchTerm || + appUsersTableName.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 {#if $database?._id}
- selectTable(TableNames.USERS)} - selectedBy={$userSelectedResourceMap[TableNames.USERS]} - /> + {#if showAppUsersTable} + selectTable(TableNames.USERS)} + selectedBy={$userSelectedResourceMap[TableNames.USERS]} + /> + {/if} {#each enrichedDataSources.filter(ds => ds.show) as datasource} Date: Fri, 10 Nov 2023 11:22:52 +0100 Subject: [PATCH 24/45] Hide only when searching --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index e30483d8eb..999903f034 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -112,7 +112,7 @@ onlyOneSource: onlySource, }) - const show = dsQueries.length || dsTables.length + const show = !searchTerm || dsQueries.length || dsTables.length return { ...datasource, selected, From 25aef7b2c157711e3ed823a649883c385252dd63 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 11:46:31 +0100 Subject: [PATCH 25/45] Extract complex enrichDatasources into its own file --- .../DatasourceNavigator.svelte | 154 +----------------- .../DatasourceNavigator/datasourceUtils.js | 154 ++++++++++++++++++ 2 files changed, 155 insertions(+), 153 deletions(-) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 999903f034..ec57d526e6 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -21,6 +21,7 @@ import IntegrationIcon from "./IntegrationIcon.svelte" import { TableNames } from "constants" import { userSelectedResourceMap } from "builderStore" + import { enrichDatasources } from "./datasourceUtils" export let searchTerm let toggledDatasources = {} @@ -37,94 +38,6 @@ searchTerm ) - const showDatasourceOpen = ({ - selected, - containsSelected, - dsToggledStatus, - searchTerm, - onlyOneSource, - }) => { - // We want to display all the ds expanded while filtering ds - if (searchTerm) { - return true - } - - // If the toggle status has been a value - if (dsToggledStatus !== undefined) { - return dsToggledStatus - } - - if (onlyOneSource) { - return true - } - - return selected || containsSelected - } - - const enrichDatasources = ( - datasources, - params, - isActive, - tables, - queries, - views, - viewsV2, - toggledDatasources, - searchTerm - ) => { - if (!datasources?.list?.length) { - return [] - } - const onlySource = datasources.list.length === 1 - return datasources.list.map(datasource => { - const selected = - isActive("./datasource") && - datasources.selectedDatasourceId === datasource._id - const containsSelected = containsActiveEntity( - datasource, - params, - isActive, - tables, - queries, - views, - viewsV2 - ) - - const dsTables = tables.list.filter( - table => - table.sourceId === datasource._id && - table._id !== TableNames.USERS && - (!searchTerm || - table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) - ) - const dsQueries = queries.list.filter( - query => - query.datasourceId === datasource._id && - (!searchTerm || - query.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) - ) - - const open = showDatasourceOpen({ - selected, - containsSelected, - dsToggledStatus: toggledDatasources[datasource._id], - searchTerm, - onlyOneSource: onlySource, - }) - - const show = !searchTerm || dsQueries.length || dsTables.length - return { - ...datasource, - selected, - containsSelected, - open, - queries: dsQueries, - tables: dsTables, - show, - } - }) - } - function selectDatasource(datasource) { openNode(datasource) $goto(`./datasource/${datasource._id}`) @@ -145,71 +58,6 @@ toggledDatasources[datasource._id] = !datasource.open } - const containsActiveEntity = ( - datasource, - params, - isActive, - tables, - queries, - views, - viewsV2 - ) => { - // Check for being on a datasource page - if (params.datasourceId === datasource._id) { - return true - } - - // Check for hardcoded datasource edge cases - if ( - isActive("./datasource/bb_internal") && - datasource._id === "bb_internal" - ) { - return true - } - if ( - isActive("./datasource/datasource_internal_bb_default") && - datasource._id === "datasource_internal_bb_default" - ) { - return true - } - - // Check for a matching query - if (params.queryId) { - const query = queries.list?.find(q => q._id === params.queryId) - return datasource._id === query?.datasourceId - } - - // If there are no entities it can't contain anything - if (!datasource.entities) { - return false - } - - // Get a list of table options - let options = datasource.entities - if (!Array.isArray(options)) { - options = Object.values(options) - } - - // Check for a matching table - if (params.tableId) { - const selectedTable = tables.selected?._id - return options.find(x => x._id === selectedTable) != null - } - - // Check for a matching view - const selectedView = views.selected?.name - const viewTable = options.find(table => { - return table.views?.[selectedView] != null - }) - if (viewTable) { - return true - } - - // Check for a matching viewV2 - const viewV2Table = options.find(x => x._id === viewsV2.selected?.tableId) - return viewV2Table != null - } - const appUsersTableName = "App users" $: showAppUsersTable = !searchTerm || diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js new file mode 100644 index 0000000000..d3fc4138cd --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -0,0 +1,154 @@ +import { TableNames } from "constants" + +const showDatasourceOpen = ({ + selected, + containsSelected, + dsToggledStatus, + searchTerm, + onlyOneSource, +}) => { + // We want to display all the ds expanded while filtering ds + if (searchTerm) { + return true + } + + // If the toggle status has been a value + if (dsToggledStatus !== undefined) { + return dsToggledStatus + } + + if (onlyOneSource) { + return true + } + + return selected || containsSelected +} + +const containsActiveEntity = ( + datasource, + params, + isActive, + tables, + queries, + views, + viewsV2 +) => { + // Check for being on a datasource page + if (params.datasourceId === datasource._id) { + return true + } + + // Check for hardcoded datasource edge cases + if ( + isActive("./datasource/bb_internal") && + datasource._id === "bb_internal" + ) { + return true + } + if ( + isActive("./datasource/datasource_internal_bb_default") && + datasource._id === "datasource_internal_bb_default" + ) { + return true + } + + // Check for a matching query + if (params.queryId) { + const query = queries.list?.find(q => q._id === params.queryId) + return datasource._id === query?.datasourceId + } + + // If there are no entities it can't contain anything + if (!datasource.entities) { + return false + } + + // Get a list of table options + let options = datasource.entities + if (!Array.isArray(options)) { + options = Object.values(options) + } + + // Check for a matching table + if (params.tableId) { + const selectedTable = tables.selected?._id + return options.find(x => x._id === selectedTable) != null + } + + // Check for a matching view + const selectedView = views.selected?.name + const viewTable = options.find(table => { + return table.views?.[selectedView] != null + }) + if (viewTable) { + return true + } + + // Check for a matching viewV2 + const viewV2Table = options.find(x => x._id === viewsV2.selected?.tableId) + return viewV2Table != null +} + +export const enrichDatasources = ( + datasources, + params, + isActive, + tables, + queries, + views, + viewsV2, + toggledDatasources, + searchTerm +) => { + if (!datasources?.list?.length) { + return [] + } + const onlySource = datasources.list.length === 1 + return datasources.list.map(datasource => { + const selected = + isActive("./datasource") && + datasources.selectedDatasourceId === datasource._id + const containsSelected = containsActiveEntity( + datasource, + params, + isActive, + tables, + queries, + views, + viewsV2 + ) + + const dsTables = tables.list.filter( + table => + table.sourceId === datasource._id && + table._id !== TableNames.USERS && + (!searchTerm || + table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + ) + const dsQueries = queries.list.filter( + query => + query.datasourceId === datasource._id && + (!searchTerm || + query.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + ) + + const open = showDatasourceOpen({ + selected, + containsSelected, + dsToggledStatus: toggledDatasources[datasource._id], + searchTerm, + onlyOneSource: onlySource, + }) + + const show = !searchTerm || dsQueries.length || dsTables.length + return { + ...datasource, + selected, + containsSelected, + open, + queries: dsQueries, + tables: dsTables, + show, + } + }) +} From 9506e55e6bc50a9ce97a007cf6db0d10b45be218 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 11:53:13 +0100 Subject: [PATCH 26/45] Add basic test --- .../tests/datasourceUtils.spec.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js new file mode 100644 index 0000000000..aabe9a48cc --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -0,0 +1,15 @@ +import { enrichDatasources } from "../datasourceUtils" + +describe("datasourceUtils", () => { + describe("enrichDatasources", () => { + it.each([ + ["undefined", undefined], + ["undefined list", {}], + ["empty list", { list: [] }], + ])("%s datasources will return an empty list", datasources => { + const result = enrichDatasources(datasources) + + expect(result).toEqual([]) + }) + }) +}) From 4a1a87d12d2ee44fde3329a0086e45c988e9a26b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:05:01 +0100 Subject: [PATCH 27/45] Remove table store dependency --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index ec57d526e6..74f0046053 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -30,7 +30,7 @@ $datasources, $params, $isActive, - $tables, + $tables.selected?._id, $queries, $views, $viewsV2, From 2381bbd80c408d7abc0b5dc330fa32dd84250874 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:09:43 +0100 Subject: [PATCH 28/45] Prevent flashes --- .../DatasourceNavigator.svelte | 7 ++++++ .../DatasourceNavigator/datasourceUtils.js | 25 +++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 74f0046053..826f499263 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -22,6 +22,7 @@ import { TableNames } from "constants" import { userSelectedResourceMap } from "builderStore" import { enrichDatasources } from "./datasourceUtils" + import { onMount } from "svelte" export let searchTerm let toggledDatasources = {} @@ -62,6 +63,12 @@ $: showAppUsersTable = !searchTerm || appUsersTableName.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 + + onMount(() => { + if ($tables.selected) { + toggledDatasources[$tables.selected.sourceId] = true + } + }) {#if $database?._id} diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js index d3fc4138cd..249ea749c6 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -1,5 +1,3 @@ -import { TableNames } from "constants" - const showDatasourceOpen = ({ selected, containsSelected, @@ -28,7 +26,7 @@ const containsActiveEntity = ( datasource, params, isActive, - tables, + selectedTableId, queries, views, viewsV2 @@ -71,8 +69,7 @@ const containsActiveEntity = ( // Check for a matching table if (params.tableId) { - const selectedTable = tables.selected?._id - return options.find(x => x._id === selectedTable) != null + return options.find(x => x._id === selectedTableId) != null } // Check for a matching view @@ -93,7 +90,7 @@ export const enrichDatasources = ( datasources, params, isActive, - tables, + selectedTableId, queries, views, viewsV2, @@ -103,6 +100,7 @@ export const enrichDatasources = ( if (!datasources?.list?.length) { return [] } + const onlySource = datasources.list.length === 1 return datasources.list.map(datasource => { const selected = @@ -112,18 +110,19 @@ export const enrichDatasources = ( datasource, params, isActive, - tables, + selectedTableId, queries, views, viewsV2 ) - const dsTables = tables.list.filter( + const entities = Array.isArray(datasource.entities) + ? datasource.entities + : Object.values(datasource.entities) + const dsTables = entities.filter( table => - table.sourceId === datasource._id && - table._id !== TableNames.USERS && - (!searchTerm || - table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + !searchTerm || + table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 ) const dsQueries = queries.list.filter( query => @@ -140,7 +139,7 @@ export const enrichDatasources = ( onlyOneSource: onlySource, }) - const show = !searchTerm || dsQueries.length || dsTables.length + const show = !searchTerm || dsQueries.length || dsTables.length || false return { ...datasource, selected, From fbadd55cbf4b134e95916ea9181cb29ccfe57848 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:13:19 +0100 Subject: [PATCH 29/45] Fix undefined --- .../components/backend/DatasourceNavigator/datasourceUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js index 249ea749c6..f65e22f01f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -118,7 +118,7 @@ export const enrichDatasources = ( const entities = Array.isArray(datasource.entities) ? datasource.entities - : Object.values(datasource.entities) + : Object.values(datasource.entities || {}) const dsTables = entities.filter( table => !searchTerm || From 1449560ab3074b3e1fa4145a795dab5ffac85878 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:16:17 +0100 Subject: [PATCH 30/45] Add initial filtering tests --- .../DatasourceNavigator/datasourceUtils.js | 2 +- .../tests/datasourceUtils.spec.js | 200 ++++++++++++++++++ 2 files changed, 201 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js index f65e22f01f..0feeb8525a 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -139,7 +139,7 @@ export const enrichDatasources = ( onlyOneSource: onlySource, }) - const show = !searchTerm || dsQueries.length || dsTables.length || false + const show = !!(!searchTerm || dsQueries.length || dsTables.length) return { ...datasource, selected, diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index aabe9a48cc..08e4bcd4f3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -11,5 +11,205 @@ describe("datasourceUtils", () => { expect(result).toEqual([]) }) + + describe("filtering", () => { + const internalTables = { + _id: "datasource_internal_bb_default", + type: "budibase", + name: "Sample Data", + source: "BUDIBASE", + config: {}, + entities: [ + { + _id: "ta_bb_employee", + type: "table", + name: "Employees", + sourceId: "datasource_internal_bb_default", + sourceType: "internal", + }, + { + _id: "ta_bb_expenses", + type: "table", + views: {}, + name: "Expenses", + sourceId: "datasource_internal_bb_default", + sourceType: "internal", + }, + { + _id: "ta_bb_inventory", + type: "table", + views: {}, + sourceId: "datasource_internal_bb_default", + sourceType: "internal", + primaryDisplay: "Item Name", + name: "Inventory", + }, + { + _id: "ta_bb_jobs", + type: "table", + name: "Jobs", + sourceId: "datasource_internal_bb_default", + sourceType: "internal", + primaryDisplay: "Job ID", + }, + ], + } + + const pgDatasource = { + _id: "pg_ds", + name: "PostgreSQL local", + plus: true, + entities: { + "mic moc": { + type: "table", + _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc", + primary: ["id"], + name: "mic moc", + sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", + sourceType: "external", + primaryDisplay: "Column 01", + views: { + "mic view": { + name: "mic view", + tableId: + "datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc", + query: null, + sort: { field: null, order: "ascending" }, + schema: { + "Column 01": { visible: true }, + "Column 02": { visible: true }, + id: { visible: true }, + }, + primaryDisplay: "Column 01", + id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc_201b0c7a6766423a8abab64fd31bc9dc", + version: 2, + }, + }, + }, + "table 1": { + type: "table", + _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201", + primary: ["id"], + name: "table 1", + sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", + sourceType: "external", + primaryDisplay: "Column 01", + views: { + fr: { + id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201_f8a0299dfb9b4423b2a88809c2ee0bcb", + name: "fr", + version: 2, + tableId: + "datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201", + query: null, + sort: { field: null, order: "ascending" }, + schema: { + "Column 01": { width: 200, visible: true }, + id: { order: 1, width: 200, visible: true }, + }, + primaryDisplay: "Column 01", + }, + }, + }, + test2: { + type: "table", + _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", + primary: ["id"], + name: "test2", + sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", + sourceType: "external", + sql: true, + views: { + "new 2": { + name: "new 2", + tableId: + "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", + query: null, + sort: { field: null, order: "ascending" }, + schema: { + id: { visible: true }, + "Column 01": { visible: true }, + }, + primaryDisplay: "id", + id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2_cdb7ea28c0104dfb93309c54276d28cd", + version: 2, + }, + new: { + id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2_b7848afdbca54cd488f3eabf8be56e07", + name: "new", + version: 2, + tableId: + "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", + query: null, + sort: { field: null, order: "ascending" }, + schema: { id: { width: 200, visible: true } }, + primaryDisplay: "id", + }, + }, + primaryDisplay: "id", + indexes: [], + }, + }, + } + + const datasources = { + list: [internalTables, pgDatasource], + } + const isActive = vi.fn().mockReturnValue(true) + + it("without a search term, all datasources are returned", () => { + const searchTerm = "" + + const result = enrichDatasources( + datasources, + {}, + isActive, + { list: [] }, + { list: [] }, + { list: [] }, + { list: [] }, + {}, + searchTerm + ) + + expect(result).toEqual( + datasources.list.map(d => + expect.objectContaining({ + _id: d._id, + show: true, + }) + ) + ) + }) + + it("given a valid search term, all entities are correctly filtered", () => { + const searchTerm = "ex" + + const result = enrichDatasources( + datasources, + {}, + isActive, + "", + { list: [] }, + { list: [] }, + { list: [] }, + {}, + searchTerm + ) + + expect(result).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + _id: internalTables._id, + show: true, + }), + expect.objectContaining({ + _id: pgDatasource._id, + show: false, + }), + ]) + ) + }) + }) }) }) From ab31d90de8b60f83469c95f0bc75aeb98e06fdf2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:26:31 +0100 Subject: [PATCH 31/45] Clean names --- .../tests/datasourceUtils.spec.js | 117 ++++-------------- 1 file changed, 25 insertions(+), 92 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 08e4bcd4f3..465d62270f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -15,42 +15,23 @@ describe("datasourceUtils", () => { describe("filtering", () => { const internalTables = { _id: "datasource_internal_bb_default", - type: "budibase", name: "Sample Data", - source: "BUDIBASE", - config: {}, entities: [ { _id: "ta_bb_employee", - type: "table", name: "Employees", - sourceId: "datasource_internal_bb_default", - sourceType: "internal", }, { _id: "ta_bb_expenses", - type: "table", - views: {}, name: "Expenses", - sourceId: "datasource_internal_bb_default", - sourceType: "internal", }, { _id: "ta_bb_inventory", - type: "table", - views: {}, - sourceId: "datasource_internal_bb_default", - sourceType: "internal", - primaryDisplay: "Item Name", name: "Inventory", }, { _id: "ta_bb_jobs", - type: "table", name: "Jobs", - sourceId: "datasource_internal_bb_default", - sourceType: "internal", - primaryDisplay: "Job ID", }, ], } @@ -58,96 +39,48 @@ describe("datasourceUtils", () => { const pgDatasource = { _id: "pg_ds", name: "PostgreSQL local", - plus: true, entities: { - "mic moc": { - type: "table", - _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc", - primary: ["id"], - name: "mic moc", - sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", - sourceType: "external", - primaryDisplay: "Column 01", + "External Inventory": { + _id: "pg_ds-external_inventory", + name: "External Inventory", views: { - "mic view": { - name: "mic view", - tableId: - "datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc", - query: null, - sort: { field: null, order: "ascending" }, - schema: { - "Column 01": { visible: true }, - "Column 02": { visible: true }, - id: { visible: true }, - }, - primaryDisplay: "Column 01", - id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__mic%20moc_201b0c7a6766423a8abab64fd31bc9dc", - version: 2, + "External Inventory first view": { + name: "External Inventory first view", + id: "pg_ds_view_1", + }, + "External Inventory second view": { + name: "External Inventory second view", + id: "pg_ds_view_2", }, }, }, - "table 1": { - type: "table", - _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201", - primary: ["id"], - name: "table 1", - sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", - sourceType: "external", - primaryDisplay: "Column 01", + "Another table": { + _id: "pg_ds-another_table", + name: "Another table", views: { - fr: { - id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201_f8a0299dfb9b4423b2a88809c2ee0bcb", - name: "fr", - version: 2, - tableId: - "datasource_plus_865bf332f37f454b82e2d371be90a0ef__table%201", - query: null, - sort: { field: null, order: "ascending" }, - schema: { - "Column 01": { width: 200, visible: true }, - id: { order: 1, width: 200, visible: true }, - }, - primaryDisplay: "Column 01", + view1: { + id: "pg_ds-another_table-view1", + name: "view1", + }, + ["View 2"]: { + id: "pg_ds-another_table-view2", + name: "View 2", }, }, }, - test2: { - type: "table", - _id: "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", - primary: ["id"], - name: "test2", - sourceId: "datasource_plus_865bf332f37f454b82e2d371be90a0ef", - sourceType: "external", - sql: true, + table2: { + _id: "pg_ds_table2", + name: "table2", views: { "new 2": { name: "new 2", - tableId: - "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", - query: null, - sort: { field: null, order: "ascending" }, - schema: { - id: { visible: true }, - "Column 01": { visible: true }, - }, - primaryDisplay: "id", - id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2_cdb7ea28c0104dfb93309c54276d28cd", - version: 2, + id: "pg_ds_table2_new_2", }, new: { - id: "view_datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2_b7848afdbca54cd488f3eabf8be56e07", name: "new", - version: 2, - tableId: - "datasource_plus_865bf332f37f454b82e2d371be90a0ef__test2", - query: null, - sort: { field: null, order: "ascending" }, - schema: { id: { width: 200, visible: true } }, - primaryDisplay: "id", + id: "pg_ds_table2_new_", }, }, - primaryDisplay: "id", - indexes: [], }, }, } From afaa0a70a926e493c1597fc463a54746019fea91 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:27:37 +0100 Subject: [PATCH 32/45] Fix --- .../tests/datasourceUtils.spec.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 465d62270f..79774b0dc3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -130,18 +130,16 @@ describe("datasourceUtils", () => { searchTerm ) - expect(result).toEqual( - expect.arrayContaining([ - expect.objectContaining({ - _id: internalTables._id, - show: true, - }), - expect.objectContaining({ - _id: pgDatasource._id, - show: false, - }), - ]) - ) + expect(result).toEqual([ + expect.objectContaining({ + _id: internalTables._id, + show: true, + }), + expect.objectContaining({ + _id: pgDatasource._id, + show: true, + }), + ]) }) }) }) From 2e4cf53d05603e25d46a70e91f69d264f7047e08 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:33:36 +0100 Subject: [PATCH 33/45] Test table filtering --- .../tests/datasourceUtils.spec.js | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 79774b0dc3..8dbbe6c21b 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -25,6 +25,10 @@ describe("datasourceUtils", () => { _id: "ta_bb_expenses", name: "Expenses", }, + { + _id: "ta_bb_expenses_2", + name: "Expenses 2", + }, { _id: "ta_bb_inventory", name: "Inventory", @@ -85,8 +89,19 @@ describe("datasourceUtils", () => { }, } + const mysqlDatasource = { + _id: "mysql_ds", + name: "My SQL local", + entities: { + "MySQL table": { + _id: "mysql_ds-mysql_table", + name: "MySQL table", + }, + }, + } + const datasources = { - list: [internalTables, pgDatasource], + list: [internalTables, pgDatasource, mysqlDatasource], } const isActive = vi.fn().mockReturnValue(true) @@ -134,10 +149,22 @@ describe("datasourceUtils", () => { expect.objectContaining({ _id: internalTables._id, show: true, + tables: [ + expect.objectContaining({ _id: "ta_bb_expenses" }), + expect.objectContaining({ _id: "ta_bb_expenses_2" }), + ], }), expect.objectContaining({ _id: pgDatasource._id, show: true, + tables: [ + expect.objectContaining({ _id: "pg_ds-external_inventory" }), + ], + }), + expect.objectContaining({ + _id: mysqlDatasource._id, + show: false, + tables: [], }), ]) }) From d8590caa241814100cc78976b95587be4032cbb4 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:34:10 +0100 Subject: [PATCH 34/45] Add extra tests --- .../tests/datasourceUtils.spec.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 8dbbe6c21b..1a10b9bf7d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -168,6 +168,40 @@ describe("datasourceUtils", () => { }), ]) }) + + it("given a non matching search term, all entities are empty", () => { + const searchTerm = "non matching" + + const result = enrichDatasources( + datasources, + {}, + isActive, + "", + { list: [] }, + { list: [] }, + { list: [] }, + {}, + searchTerm + ) + + expect(result).toEqual([ + expect.objectContaining({ + _id: internalTables._id, + show: false, + tables: [], + }), + expect.objectContaining({ + _id: pgDatasource._id, + show: false, + tables: [], + }), + expect.objectContaining({ + _id: mysqlDatasource._id, + show: false, + tables: [], + }), + ]) + }) }) }) }) From 0a289f508e1ca8dcf0e276f79b60d6dd9fbe3b74 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:41:48 +0100 Subject: [PATCH 35/45] Undo store usage --- .../DatasourceNavigator.svelte | 2 +- .../DatasourceNavigator/datasourceUtils.js | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 826f499263..8ff8ba0ea2 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -31,7 +31,7 @@ $datasources, $params, $isActive, - $tables.selected?._id, + $tables, $queries, $views, $viewsV2, diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js index 0feeb8525a..543fa1f204 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -1,3 +1,5 @@ +import { TableNames } from "constants" + const showDatasourceOpen = ({ selected, containsSelected, @@ -26,7 +28,7 @@ const containsActiveEntity = ( datasource, params, isActive, - selectedTableId, + tables, queries, views, viewsV2 @@ -69,7 +71,8 @@ const containsActiveEntity = ( // Check for a matching table if (params.tableId) { - return options.find(x => x._id === selectedTableId) != null + const selectedTable = tables.selected?._id + return options.find(x => x._id === selectedTable) != null } // Check for a matching view @@ -90,7 +93,7 @@ export const enrichDatasources = ( datasources, params, isActive, - selectedTableId, + tables, queries, views, viewsV2, @@ -110,19 +113,18 @@ export const enrichDatasources = ( datasource, params, isActive, - selectedTableId, + tables, queries, views, viewsV2 ) - const entities = Array.isArray(datasource.entities) - ? datasource.entities - : Object.values(datasource.entities || {}) - const dsTables = entities.filter( + const dsTables = tables.list.filter( table => - !searchTerm || - table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 + table.sourceId === datasource._id && + table._id !== TableNames.USERS && + (!searchTerm || + table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) ) const dsQueries = queries.list.filter( query => From b121d64b796bee8ca355c2d15babb7a95c962898 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:52:41 +0100 Subject: [PATCH 36/45] Fix tests --- .../tests/datasourceUtils.spec.js | 58 +++++++++++-------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 1a10b9bf7d..7e735b5653 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -16,7 +16,20 @@ describe("datasourceUtils", () => { const internalTables = { _id: "datasource_internal_bb_default", name: "Sample Data", - entities: [ + } + + const pgDatasource = { + _id: "pg_ds", + name: "PostgreSQL local", + } + + const mysqlDatasource = { + _id: "mysql_ds", + name: "My SQL local", + } + + const tables = [ + ...[ { _id: "ta_bb_employee", name: "Employees", @@ -37,14 +50,12 @@ describe("datasourceUtils", () => { _id: "ta_bb_jobs", name: "Jobs", }, - ], - } - - const pgDatasource = { - _id: "pg_ds", - name: "PostgreSQL local", - entities: { - "External Inventory": { + ].map(t => ({ + ...t, + sourceId: internalTables._id, + })), + ...[ + { _id: "pg_ds-external_inventory", name: "External Inventory", views: { @@ -58,7 +69,7 @@ describe("datasourceUtils", () => { }, }, }, - "Another table": { + { _id: "pg_ds-another_table", name: "Another table", views: { @@ -72,7 +83,7 @@ describe("datasourceUtils", () => { }, }, }, - table2: { + { _id: "pg_ds_table2", name: "table2", views: { @@ -86,19 +97,20 @@ describe("datasourceUtils", () => { }, }, }, - }, - } - - const mysqlDatasource = { - _id: "mysql_ds", - name: "My SQL local", - entities: { - "MySQL table": { + ].map(t => ({ + ...t, + sourceId: pgDatasource._id, + })), + ...[ + { _id: "mysql_ds-mysql_table", name: "MySQL table", }, - }, - } + ].map(t => ({ + ...t, + sourceId: mysqlDatasource._id, + })), + ] const datasources = { list: [internalTables, pgDatasource, mysqlDatasource], @@ -137,7 +149,7 @@ describe("datasourceUtils", () => { datasources, {}, isActive, - "", + { list: tables }, { list: [] }, { list: [] }, { list: [] }, @@ -176,7 +188,7 @@ describe("datasourceUtils", () => { datasources, {}, isActive, - "", + { list: tables }, { list: [] }, { list: [] }, { list: [] }, From 93bf76e1fe50c2225997f5d0c24895a7318e9933 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 14:22:39 +0100 Subject: [PATCH 37/45] Filter views --- .../DatasourceNavigator/datasourceUtils.js | 48 ++++++++++++++----- .../tests/datasourceUtils.spec.js | 2 +- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js index 543fa1f204..bc7fa53b49 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js @@ -121,16 +121,10 @@ export const enrichDatasources = ( const dsTables = tables.list.filter( table => - table.sourceId === datasource._id && - table._id !== TableNames.USERS && - (!searchTerm || - table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + table.sourceId === datasource._id && table._id !== TableNames.USERS ) const dsQueries = queries.list.filter( - query => - query.datasourceId === datasource._id && - (!searchTerm || - query.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1) + query => query.datasourceId === datasource._id ) const open = showDatasourceOpen({ @@ -141,14 +135,46 @@ export const enrichDatasources = ( onlyOneSource: onlySource, }) - const show = !!(!searchTerm || dsQueries.length || dsTables.length) + const visibleDsQueries = dsQueries.filter( + q => + !searchTerm || + q.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 + ) + + const visibleDsTables = dsTables + .map(t => ({ + ...t, + views: !searchTerm + ? t.views + : Object.keys(t.views || {}) + .filter( + viewName => + viewName.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 + ) + .reduce( + (acc, viewName) => ({ ...acc, [viewName]: t.views[viewName] }), + {} + ), + })) + .filter( + table => + !searchTerm || + table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 || + Object.keys(table.views).length + ) + + const show = !!( + !searchTerm || + visibleDsQueries.length || + visibleDsTables.length + ) return { ...datasource, selected, containsSelected, open, - queries: dsQueries, - tables: dsTables, + queries: visibleDsQueries, + tables: visibleDsTables, show, } }) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js index 7e735b5653..f71c647490 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -142,7 +142,7 @@ describe("datasourceUtils", () => { ) }) - it("given a valid search term, all entities are correctly filtered", () => { + it("given a valid search term, all tables are correctly filtered", () => { const searchTerm = "ex" const result = enrichDatasources( From a8f572c0e8d22f874db655d69bdbc01d893c0857 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 15:21:37 +0100 Subject: [PATCH 38/45] No results --- .../DatasourceNavigator/DatasourceNavigator.svelte | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 8ff8ba0ea2..0281062ca3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -1,5 +1,6 @@ {#if $database?._id} @@ -125,6 +129,13 @@ {/each} {/if} {/each} + {#if showNoResults} + +
+ There aren't any datasource matching '{searchTerm}' +
+ + {/if}
{/if} From 778104d6e6cf305e51e8834a41d723aa20aaadcc Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:37:40 +0000 Subject: [PATCH 39/45] Fix for Parameters Binding keyword duplicated (repeated) in REST Query URL (#12325) * Dont set breakQs if not url change * Don't replace already readable binding * dataBinding unit tests --- .../builder/src/builderStore/dataBinding.js | 16 ++-- .../builderStore/tests/dataBinding.test.js | 86 +++++++++++++++++++ 2 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 packages/builder/src/builderStore/tests/dataBinding.test.js diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 246590a22e..85ac822006 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -1090,17 +1090,18 @@ export const removeBindings = (obj, replacement = "Invalid binding") => { * When converting from readable to runtime it can sometimes add too many square brackets, * this makes sure that doesn't happen. */ -const shouldReplaceBinding = (currentValue, convertFrom, convertTo) => { - if (!currentValue?.includes(convertFrom)) { +const shouldReplaceBinding = (currentValue, from, convertTo, binding) => { + if (!currentValue?.includes(from)) { return false } if (convertTo === "readableBinding") { - return true + // Dont replace if the value already matches the readable binding + return currentValue.indexOf(binding.readableBinding) === -1 } // remove all the spaces, if the input is surrounded by spaces e.g. [ Auto ID ] then // this makes sure it is detected const noSpaces = currentValue.replace(/\s+/g, "") - const fromNoSpaces = convertFrom.replace(/\s+/g, "") + const fromNoSpaces = from.replace(/\s+/g, "") const invalids = [ `[${fromNoSpaces}]`, `"${fromNoSpaces}"`, @@ -1152,8 +1153,11 @@ const bindingReplacement = ( // in the search, working from longest to shortest so always use best match first let searchString = newBoundValue for (let from of convertFromProps) { - if (isJS || shouldReplaceBinding(newBoundValue, from, convertTo)) { - const binding = bindableProperties.find(el => el[convertFrom] === from) + const binding = bindableProperties.find(el => el[convertFrom] === from) + if ( + isJS || + shouldReplaceBinding(newBoundValue, from, convertTo, binding) + ) { let idx do { // see if any instances of this binding exist in the search string diff --git a/packages/builder/src/builderStore/tests/dataBinding.test.js b/packages/builder/src/builderStore/tests/dataBinding.test.js new file mode 100644 index 0000000000..47f6564749 --- /dev/null +++ b/packages/builder/src/builderStore/tests/dataBinding.test.js @@ -0,0 +1,86 @@ +import { expect, describe, it, vi } from "vitest" +import { + runtimeToReadableBinding, + readableToRuntimeBinding, +} from "../dataBinding" + +vi.mock("@budibase/frontend-core") +vi.mock("builderStore/componentUtils") +vi.mock("builderStore/store") +vi.mock("builderStore/store/theme") +vi.mock("builderStore/store/temporal") + +describe("runtimeToReadableBinding", () => { + const bindableProperties = [ + { + category: "Current User", + icon: "User", + providerId: "user", + readableBinding: "Current User.firstName", + runtimeBinding: "[user].[firstName]", + type: "context", + }, + { + category: "Bindings", + icon: "Brackets", + readableBinding: "Binding.count", + runtimeBinding: "count", + type: "context", + }, + ] + it("should convert a runtime binding to a readable one", () => { + const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ count }}.` + expect( + runtimeToReadableBinding( + bindableProperties, + textWithBindings, + "readableBinding" + ) + ).toEqual( + `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.` + ) + }) + + it("should not convert to readable binding if it is already readable", () => { + const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ Binding.count }}.` + expect( + runtimeToReadableBinding( + bindableProperties, + textWithBindings, + "readableBinding" + ) + ).toEqual( + `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.` + ) + }) +}) + +describe("readableToRuntimeBinding", () => { + const bindableProperties = [ + { + category: "Current User", + icon: "User", + providerId: "user", + readableBinding: "Current User.firstName", + runtimeBinding: "[user].[firstName]", + type: "context", + }, + { + category: "Bindings", + icon: "Brackets", + readableBinding: "Binding.count", + runtimeBinding: "count", + type: "context", + }, + ] + it("should convert a readable binding to a runtime one", () => { + const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.` + expect( + readableToRuntimeBinding( + bindableProperties, + textWithBindings, + "runtimeBinding" + ) + ).toEqual(`Hello {{ [user].[firstName] }}! The count is {{ count }}.`) + }) +}) From 4f544343f3f67f0e663da149baee7a1595420f48 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 23 Nov 2023 09:43:24 +0100 Subject: [PATCH 40/45] No results design changes --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 0281062ca3..4b3bdca10d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -132,7 +132,7 @@ {#if showNoResults}
- There aren't any datasource matching '{searchTerm}' + There aren't any datasource matching that route
{/if} @@ -148,4 +148,8 @@ place-items: center; flex: 0 0 24px; } + + .no-results { + color: var(--spectrum-global-color-gray-600); + } From 54b2fec3c1d424ac31135482ed956b05b01bf73e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 23 Nov 2023 09:59:59 +0100 Subject: [PATCH 41/45] Unify formats --- packages/builder/src/components/design/Panel.svelte | 11 +++++++++-- .../builder/app/[application]/data/_layout.svelte | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte index 3d5938c174..c0b752d013 100644 --- a/packages/builder/src/components/design/Panel.svelte +++ b/packages/builder/src/components/design/Panel.svelte @@ -11,6 +11,7 @@ export let onClickCloseButton export let borderLeft = false export let borderRight = false + export let borderBottomHeader = true export let wide = false export let extraWide = false export let closeButtonIcon = "Close" @@ -26,7 +27,11 @@ class:borderLeft class:borderRight > -
+
{#if showBackButton} {/if} @@ -94,9 +99,11 @@ justify-content: space-between; align-items: center; padding: 0 var(--spacing-l); - border-bottom: var(--border-light); gap: var(--spacing-m); } + .header.borderBottom { + border-bottom: var(--border-light); + } .title { flex: 1 1 auto; width: 0; 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 3fbf18eac5..7dea0078fd 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -21,7 +21,7 @@
{#if !$isActive("./new")} - + $goto("./new")} /> - + From bf4678ad014aa3234e365f91eb0761a37a8a5f85 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 23 Nov 2023 10:38:14 +0100 Subject: [PATCH 42/45] Reuse component on screens --- .../src/components/common/NavHeader.svelte | 2 +- .../_components/ScreenList/index.svelte | 114 ++---------------- 2 files changed, 14 insertions(+), 102 deletions(-) diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte index c38ac33f20..5678884223 100644 --- a/packages/builder/src/components/common/NavHeader.svelte +++ b/packages/builder/src/components/common/NavHeader.svelte @@ -7,9 +7,9 @@ export let placeholder export let value export let onAdd + export let search let searchInput - let search = false const openSearch = async () => { search = true diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte index ef5911c0f8..337b91a033 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte @@ -1,5 +1,5 @@ - +
- $goto("../new")} /> -
- Screens -
-
- -
-
- -
{#if filteredScreens?.length} @@ -177,9 +148,9 @@ min-height: 147px; max-height: calc(100% - 147px); position: relative; + transition: height 300ms ease-out; } .screens.search { - transition: height 300ms ease-out; max-height: none; } .screens.resizing { @@ -202,37 +173,6 @@ border-bottom: var(--border-light); } - .input { - font-family: var(--font-sans); - position: absolute; - color: var(--ink); - background-color: transparent; - border: none; - font-size: var(--spectrum-alias-font-size-default); - width: 260px; - box-sizing: border-box; - display: none; - } - .input:focus { - outline: none; - } - .input::placeholder { - color: var(--spectrum-global-color-gray-600); - } - .screens.search input { - display: block; - } - - .title { - display: flex; - align-items: center; - height: 100%; - box-sizing: border-box; - flex: 1; - opacity: 1; - z-index: 1; - } - .content { overflow: auto; flex-grow: 1; @@ -245,34 +185,6 @@ padding-right: 8px !important; } - .searchButton { - color: var(--grey-7); - cursor: pointer; - margin-right: 10px; - opacity: 1; - } - .searchButton:hover { - color: var(--ink); - } - - .hide { - opacity: 0; - pointer-events: none; - } - - .addButton { - color: var(--grey-7); - cursor: pointer; - transition: transform 300ms ease-out; - } - .addButton:hover { - color: var(--ink); - } - - .closeButton { - transform: rotate(45deg); - } - .icon { margin-left: 4px; margin-right: 4px; From 0e93717f1af18ecf7c1ce3f44eb9d3c903ebf2c0 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 23 Nov 2023 09:53:35 +0000 Subject: [PATCH 43/45] Allow null strings (#12298) * Allow null strings * Don't update null to blank * Save empty as null * Make blank string map to null * Add mappings for BigInt * Fix unit tests --- .../server/src/api/routes/tests/row.spec.ts | 2 +- .../server/src/utilities/rowProcessor/map.ts | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index 060f6e46c1..de49441f3a 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -426,7 +426,7 @@ describe.each([ const saved = (await loadRow(id, table._id!)).body expect(saved.stringUndefined).toBe(undefined) - expect(saved.stringNull).toBe("") + expect(saved.stringNull).toBe(null) expect(saved.stringString).toBe("i am a string") expect(saved.numberEmptyString).toBe(null) expect(saved.numberNull).toBe(null) diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index dd1f9a272a..cbddcaf427 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -46,23 +46,23 @@ export const TYPE_TRANSFORM_MAP: any = { parse: parseArrayString, }, [FieldTypes.STRING]: { - "": "", - [null]: "", + "": null, + [null]: null, [undefined]: undefined, }, [FieldTypes.BARCODEQR]: { - "": "", - [null]: "", + "": null, + [null]: null, [undefined]: undefined, }, [FieldTypes.FORMULA]: { - "": "", - [null]: "", + "": null, + [null]: null, [undefined]: undefined, }, [FieldTypes.LONGFORM]: { - "": "", - [null]: "", + "": null, + [null]: null, [undefined]: undefined, }, [FieldTypes.NUMBER]: { @@ -71,6 +71,11 @@ export const TYPE_TRANSFORM_MAP: any = { [undefined]: undefined, parse: n => parseFloat(n), }, + [FieldTypes.BIGINT]: { + "": null, + [null]: null, + [undefined]: undefined, + }, [FieldTypes.DATETIME]: { "": null, [undefined]: undefined, From df244c68ec7ed77d563bb16a2113a4cd521b6ecc Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 23 Nov 2023 11:05:51 +0100 Subject: [PATCH 44/45] Copy change --- .../backend/DatasourceNavigator/DatasourceNavigator.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 4b3bdca10d..23697bf2c7 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -132,7 +132,7 @@ {#if showNoResults}
- There aren't any datasource matching that route + There aren't any datasources matching that name
{/if} From a5e69e716ecf67be7a32b34efb1d4088f4924dae Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 23 Nov 2023 10:07:15 +0000 Subject: [PATCH 45/45] Bump version to 2.13.15 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c2d038db02..faba64ce90 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.13.14", + "version": "2.13.15", "npmClient": "yarn", "packages": [ "packages/*"