From eb04c89182884b260b3322106dd8829696bab391 Mon Sep 17 00:00:00 2001 From: Keith Ellis Date: Tue, 31 Oct 2023 16:34:02 -0400 Subject: [PATCH 001/150] Add check to fix startup if CLUSTER_MODE is enable --- packages/server/src/environment.ts | 1 + packages/server/src/startup.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index a1701535ce..b0a35eedf5 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -32,6 +32,7 @@ const environment = { REDIS_PASSWORD: process.env.REDIS_PASSWORD, REDIS_CLUSTERED: process.env.REDIS_CLUSTERED, HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS, + CLUSTER_MODE: process.env.CLUSTER_MODE, API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC, GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET, diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts index b4a287d2d4..fd07c5f530 100644 --- a/packages/server/src/startup.ts +++ b/packages/server/src/startup.ts @@ -58,7 +58,7 @@ export async function startup(app?: any, server?: any) { return } STARTUP_RAN = true - if (server) { + if (server && env.CLUSTER_MODE?.toLowerCase() !== "true") { console.log(`Budibase running on ${JSON.stringify(server.address())}`) env._set("PORT", server.address().port) } From 0921bcf3334e6a77a67b8771005587e2f37a3af4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 1 Nov 2023 11:40:27 +0000 Subject: [PATCH 002/150] Add button setting to grid and allow removing all buttons --- .../ButtonConfiguration/ButtonConfiguration.svelte | 13 ++++++++----- packages/client/manifest.json | 10 ++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte index 324418511b..6fed8abdba 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte @@ -19,7 +19,7 @@ componentBindings: componentBindings || [], bindings, removeButton, - canRemove: buttonCount > 1, + canRemove: true, } const sanitizeValue = val => { @@ -86,11 +86,11 @@ focus={focusItem} draggable={buttonCount > 1} /> - -
-
Add button
-
{/if} + +
+
Add button
+
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index e2ecd0f968..285282ddf7 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -48,6 +48,7 @@ export let fixedRowHeight = null export let notifySuccess = null export let notifyError = null + export let buttons = null // Unique identifier for DOM nodes inside this instance const rand = Math.random() @@ -99,6 +100,7 @@ fixedRowHeight, notifySuccess, notifyError, + buttons, }) // Set context for children to consume diff --git a/packages/frontend-core/src/components/grid/layout/GridBody.svelte b/packages/frontend-core/src/components/grid/layout/GridBody.svelte index 0bb2a51fb4..559c465b86 100644 --- a/packages/frontend-core/src/components/grid/layout/GridBody.svelte +++ b/packages/frontend-core/src/components/grid/layout/GridBody.svelte @@ -3,6 +3,7 @@ import GridScrollWrapper from "./GridScrollWrapper.svelte" import GridRow from "./GridRow.svelte" import { BlankRowID } from "../lib/constants" + import ButtonColumn from "./ButtonColumn.svelte" const { bounds, @@ -13,6 +14,7 @@ dispatch, isDragging, config, + props, } = getContext("grid") let body @@ -54,6 +56,9 @@ /> {/if} + {#if $props.buttons?.length} + + {/if} diff --git a/packages/client/manifest.json b/packages/client/manifest.json index d131cda8c3..378d8c3493 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -6348,6 +6348,7 @@ "type": "buttonConfiguration", "key": "buttons", "nested": true, + "max": 3, "context": [ { "label": "Clicked row", From 34693481b13c858b5f8e6e45831ed75d6ad322dc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 7 Nov 2023 15:02:45 +0000 Subject: [PATCH 017/150] Fix bug in SectionSelect --- .../components/design/settings/controls/SectionSelect.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte index 4394f47cef..5b4eb8d2a9 100644 --- a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte @@ -32,7 +32,9 @@ } -{layoutMap[value].name} + + {layoutMap[value || "mainSidebar"].name} + dispatch("change", selected)} From a39accdb42ce6921113506dda9dc0533b76da12f Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 7 Nov 2023 15:07:00 +0000 Subject: [PATCH 018/150] Test coverage added for the component. Minor refactor --- .../DataTable/modals/ExportModal.svelte | 53 ++-- .../DataTable/modals/ExportModal.test.js | 240 ++++++++++++++++++ packages/shared-core/src/utils.ts | 14 + 3 files changed, 281 insertions(+), 26 deletions(-) create mode 100644 packages/builder/src/components/backend/DataTable/modals/ExportModal.test.js diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte index 61c81c86eb..c2a7ec33fe 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte @@ -8,7 +8,8 @@ } from "@budibase/bbui" import download from "downloadjs" import { API } from "api" - import { Constants, LuceneUtils } from "@budibase/frontend-core" + import { LuceneUtils } from "@budibase/frontend-core" + import { utils } from "@budibase/shared-core" import { ROW_EXPORT_FORMATS } from "constants/backend" export let view @@ -17,8 +18,6 @@ export let selectedRows = [] export let formats - $: appliedFilters = filters?.filter(filter => !filter.onEmptyFilter) - const FORMATS = [ { name: "CSV", @@ -34,6 +33,8 @@ }, ] + $: appliedFilters = filters?.filter(filter => !filter.onEmptyFilter) + $: options = FORMATS.filter(format => { if (formats && !formats.includes(format.key)) { return false @@ -55,14 +56,7 @@ appliedFilters ) - const buildFilterLookup = () => { - return Object.keys(Constants.OperatorOptions).reduce((acc, key) => { - const op = Constants.OperatorOptions[key] - acc[op.value] = op.label - return acc - }, {}) - } - filterLookup = buildFilterLookup() + filterLookup = utils.filterValueToLabel() const filterDisplay = () => { if (!appliedFilters) { @@ -173,19 +167,23 @@ > {#if selectedRows?.length} - {selectedRows?.length} - {`row${selectedRows?.length > 1 ? "s" : ""} will be exported`} + + {selectedRows?.length} + {`row${selectedRows?.length > 1 ? "s" : ""} will be exported`} + {:else if appliedFilters?.length || (sorting?.sortOrder && sorting?.sortColumn)} {#if !appliedFilters} - Exporting all rows + + Exporting all rows + {:else} - Filters applied + Filters applied {/if} -
+
{:else} - Exporting all rows + + Exporting all rows + {/if} - - x.name} + getOptionValue={x => x.key} + /> + 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 078/150] 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 085/150] 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 086/150] 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 090/150] 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 091/150] 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 093/150] 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 094/150] 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 095/150] 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 096/150] 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 097/150] 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 098/150] 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 099/150] 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 100/150] 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 5653d78038c6fb62917c1e11171316264d05772d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 20 Nov 2023 10:31:51 +0000 Subject: [PATCH 101/150] Update pro --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index e202f415d9..2cf6f28380 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit e202f415d9fa540d08cc2ba6e27394fbc22f357b +Subproject commit 2cf6f28380d3ab22128b8a889d622fd5adfa31fc From 25aef7b2c157711e3ed823a649883c385252dd63 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 11:46:31 +0100 Subject: [PATCH 102/150] 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 103/150] 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 8297564029e3af7efb186b32424b28806da0ce9c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 20 Nov 2023 11:25:51 +0000 Subject: [PATCH 104/150] Bump version to 2.13.11 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a12b1238b3..64d6b745e5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.13.10", + "version": "2.13.11", "npmClient": "yarn", "packages": [ "packages/*" From 4a1a87d12d2ee44fde3329a0086e45c988e9a26b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:05:01 +0100 Subject: [PATCH 105/150] 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 106/150] 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 107/150] 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 108/150] 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 109/150] 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 110/150] 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 111/150] 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 112/150] 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 113/150] 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 114/150] 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 115/150] 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 116/150] 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 c71644a1e7e8dc81b27618759a975c70c4f7cb94 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 15:36:48 +0100 Subject: [PATCH 117/150] Remove .spec.js from prettier ignore --- .prettierignore | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.prettierignore b/.prettierignore index 64607d74ab..ce7617224b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,13 +1,11 @@ node_modules dist -*.spec.js -packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte packages/server/builder packages/server/coverage -packages/worker/coverage -packages/backend-core/coverage packages/server/client packages/server/src/definitions/openapi.ts +packages/worker/coverage +packages/backend-core/coverage packages/builder/.routify packages/sdk/sdk packages/pro/coverage \ No newline at end of file From 742eb4ff46a37e819fad8185335d2fd0f95dc0d7 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 15:36:55 +0100 Subject: [PATCH 118/150] Lint fix --- .../backend-core/src/db/tests/index.spec.js | 1 - .../tests/core/users/users.spec.js | 19 +- .../import/sources/tests/curl/curl.spec.js | 32 ++- .../sources/tests/openapi2/openapi2.spec.js | 165 +++++------ .../query/import/tests/index.spec.js | 85 +++--- .../view/tests/viewBuilder.spec.js | 98 ++++--- .../api/routes/public/tests/metrics.spec.js | 7 +- .../src/api/routes/tests/analytics.spec.js | 29 +- .../src/api/routes/tests/apikeys.spec.js | 4 +- .../server/src/api/routes/tests/auth.spec.js | 2 +- .../src/api/routes/tests/component.spec.js | 2 +- .../server/src/api/routes/tests/dev.spec.js | 7 +- .../src/api/routes/tests/integration.spec.js | 2 +- .../src/api/routes/tests/layout.spec.js | 2 +- .../src/api/routes/tests/metadata.spec.js | 9 +- .../src/api/routes/tests/query.seq.spec.js | 265 +++++++++++------- .../server/src/api/routes/tests/role.spec.js | 2 +- .../src/api/routes/tests/routing.spec.js | 50 ++-- .../src/api/routes/tests/screen.spec.js | 4 +- .../src/api/routes/tests/templates.spec.js | 2 +- .../server/src/api/routes/tests/view.spec.js | 68 +++-- .../server/src/automations/tests/bash.spec.js | 53 ++-- .../src/automations/tests/delay.spec.js | 2 +- .../src/automations/tests/discord.spec.js | 33 ++- .../automations/tests/executeQuery.spec.js | 75 +++-- .../automations/tests/executeScript.spec.js | 75 +++-- .../automations/tests/outgoingWebhook.spec.js | 8 +- .../src/automations/tests/serverLog.spec.js | 29 +- .../src/db/tests/linkController.spec.js | 83 ++++-- .../server/src/db/tests/linkTests.spec.js | 6 +- .../src/middleware/tests/resourceId.spec.js | 14 +- .../src/middleware/tests/selfhost.spec.js | 4 +- .../functions/tests/appUrls.spec.js | 2 +- .../tests/userEmailViewCasing.spec.js | 30 +- packages/string-templates/test/basic.spec.js | 38 ++- .../string-templates/test/escapes.spec.js | 13 +- .../string-templates/test/hbsToJs.spec.js | 48 ++-- .../string-templates/test/helpers.spec.js | 5 +- .../string-templates/test/javascript.spec.js | 2 +- 39 files changed, 768 insertions(+), 607 deletions(-) diff --git a/packages/backend-core/src/db/tests/index.spec.js b/packages/backend-core/src/db/tests/index.spec.js index 0d257f7ed7..e03c9a5b0e 100644 --- a/packages/backend-core/src/db/tests/index.spec.js +++ b/packages/backend-core/src/db/tests/index.spec.js @@ -5,7 +5,6 @@ const { getDB } = require("../db") describe("db", () => { describe("getDB", () => { it("returns a db", async () => { - const dbName = structures.db.id() const db = getDB(dbName) expect(db).toBeDefined() diff --git a/packages/backend-core/tests/core/users/users.spec.js b/packages/backend-core/tests/core/users/users.spec.js index ae7109344a..f08c435b95 100644 --- a/packages/backend-core/tests/core/users/users.spec.js +++ b/packages/backend-core/tests/core/users/users.spec.js @@ -1,5 +1,5 @@ -const _ = require('lodash/fp') -const {structures} = require("../../../tests") +const _ = require("lodash/fp") +const { structures } = require("../../../tests") jest.mock("../../../src/context") jest.mock("../../../src/db") @@ -7,10 +7,9 @@ jest.mock("../../../src/db") const context = require("../../../src/context") const db = require("../../../src/db") -const {getCreatorCount} = require('../../../src/users/users') +const { getCreatorCount } = require("../../../src/users/users") describe("Users", () => { - let getGlobalDBMock let getGlobalUserParamsMock let paginationMock @@ -26,26 +25,26 @@ describe("Users", () => { it("Retrieves the number of creators", async () => { const getUsers = (offset, limit, creators = false) => { const range = _.range(offset, limit) - const opts = creators ? {builder: {global: true}} : undefined + const opts = creators ? { builder: { global: true } } : undefined return range.map(() => structures.users.user(opts)) } const page1Data = getUsers(0, 8) const page2Data = getUsers(8, 12, true) getGlobalDBMock.mockImplementation(() => ({ - name : "fake-db", + name: "fake-db", allDocs: () => ({ - rows: [...page1Data, ...page2Data] - }) + rows: [...page1Data, ...page2Data], + }), })) paginationMock.mockImplementationOnce(() => ({ data: page1Data, hasNextPage: true, - nextPage: "1" + nextPage: "1", })) paginationMock.mockImplementation(() => ({ data: page2Data, hasNextPage: false, - nextPage: undefined + nextPage: undefined, })) const creatorsCount = await getCreatorCount() expect(creatorsCount).toBe(4) diff --git a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js index 2b17685f24..7ea2f8932b 100644 --- a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js +++ b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js @@ -1,13 +1,13 @@ const { Curl } = require("../../curl") const fs = require("fs") -const path = require('path') +const path = require("path") -const getData = (file) => { +const getData = file => { return fs.readFileSync(path.join(__dirname, `./data/${file}.txt`), "utf8") } describe("Curl Import", () => { - let curl + let curl beforeEach(() => { curl = new Curl() @@ -28,7 +28,7 @@ describe("Curl Import", () => { expect(supported).toBe(false) }) - const init = async (file) => { + const init = async file => { await curl.isSupported(getData(file)) } @@ -37,10 +37,9 @@ describe("Curl Import", () => { const info = await curl.getInfo() expect(info.name).toBe("example.com") }) - + describe("Returns queries", () => { - - const getQueries = async (file) => { + const getQueries = async file => { await init(file) const queries = await curl.getQueries() expect(queries.length).toBe(1) @@ -58,7 +57,7 @@ describe("Curl Import", () => { await testVerb("put", "update") await testVerb("delete", "delete") await testVerb("patch", "patch") - }) + }) const testPath = async (file, urlPath) => { const queries = await getQueries(file) @@ -66,8 +65,8 @@ describe("Curl Import", () => { } it("populates path", async () => { - await testPath("get", "http://example.com/") - await testPath("path", "http://example.com/paths/abc") + await testPath("get", "http://example.com/") + await testPath("path", "http://example.com/paths/abc") }) const testHeaders = async (file, headers) => { @@ -77,7 +76,10 @@ describe("Curl Import", () => { it("populates headers", async () => { await testHeaders("get", {}) - await testHeaders("headers", { "x-bb-header-1" : "123", "x-bb-header-2" : "456"} ) + await testHeaders("headers", { + "x-bb-header-1": "123", + "x-bb-header-2": "456", + }) }) const testQuery = async (file, queryString) => { @@ -91,13 +93,15 @@ describe("Curl Import", () => { const testBody = async (file, body) => { const queries = await getQueries(file) - expect(queries[0].fields.requestBody).toStrictEqual(JSON.stringify(body, null, 2)) + expect(queries[0].fields.requestBody).toStrictEqual( + JSON.stringify(body, null, 2) + ) } it("populates body", async () => { await testBody("get", undefined) - await testBody("post", { "key" : "val" }) + await testBody("post", { key: "val" }) await testBody("empty-body", {}) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js index 3c5aa89e3c..b61991f7d6 100644 --- a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js +++ b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js @@ -1,13 +1,16 @@ const { OpenAPI2 } = require("../../openapi2") const fs = require("fs") -const path = require('path') +const path = require("path") const getData = (file, extension) => { - return fs.readFileSync(path.join(__dirname, `./data/${file}/${file}.${extension}`), "utf8") + return fs.readFileSync( + path.join(__dirname, `./data/${file}/${file}.${extension}`), + "utf8" + ) } describe("OpenAPI2 Import", () => { - let openapi2 + let openapi2 beforeEach(() => { openapi2 = new OpenAPI2() @@ -47,9 +50,9 @@ describe("OpenAPI2 Import", () => { it("returns import info", async () => { await runTests("petstore", testImportInfo) }) - + describe("Returns queries", () => { - const indexQueries = (queries) => { + const indexQueries = queries => { return queries.reduce((acc, query) => { acc[query.name] = query return acc @@ -72,15 +75,15 @@ describe("OpenAPI2 Import", () => { it("populates verb", async () => { const assertions = { - "createEntity" : "create", - "getEntities" : "read", - "getEntity" : "read", - "updateEntity" : "update", - "patchEntity" : "patch", - "deleteEntity" : "delete" + createEntity: "create", + getEntities: "read", + getEntity: "read", + updateEntity: "update", + patchEntity: "patch", + deleteEntity: "delete", } await runTests("crud", testVerb, assertions) - }) + }) const testPath = async (file, extension, assertions) => { const queries = await getQueries(file, extension) @@ -91,12 +94,12 @@ describe("OpenAPI2 Import", () => { it("populates path", async () => { const assertions = { - "createEntity" : "http://example.com/entities", - "getEntities" : "http://example.com/entities", - "getEntity" : "http://example.com/entities/{{entityId}}", - "updateEntity" : "http://example.com/entities/{{entityId}}", - "patchEntity" : "http://example.com/entities/{{entityId}}", - "deleteEntity" : "http://example.com/entities/{{entityId}}" + createEntity: "http://example.com/entities", + getEntities: "http://example.com/entities", + getEntity: "http://example.com/entities/{{entityId}}", + updateEntity: "http://example.com/entities/{{entityId}}", + patchEntity: "http://example.com/entities/{{entityId}}", + deleteEntity: "http://example.com/entities/{{entityId}}", } await runTests("crud", testPath, assertions) }) @@ -109,27 +112,25 @@ describe("OpenAPI2 Import", () => { } const contentTypeHeader = { - "Content-Type" : "application/json", + "Content-Type": "application/json", } it("populates headers", async () => { const assertions = { - "createEntity" : { - ...contentTypeHeader + createEntity: { + ...contentTypeHeader, }, - "getEntities" : { + getEntities: {}, + getEntity: {}, + updateEntity: { + ...contentTypeHeader, }, - "getEntity" : { + patchEntity: { + ...contentTypeHeader, }, - "updateEntity" : { - ...contentTypeHeader + deleteEntity: { + "x-api-key": "{{x-api-key}}", }, - "patchEntity" : { - ...contentTypeHeader - }, - "deleteEntity" : { - "x-api-key" : "{{x-api-key}}", - } } await runTests("crud", testHeaders, assertions) @@ -138,18 +139,20 @@ describe("OpenAPI2 Import", () => { const testQuery = async (file, extension, assertions) => { const queries = await getQueries(file, extension) for (let [operationId, queryString] of Object.entries(assertions)) { - expect(queries[operationId].fields.queryString).toStrictEqual(queryString) + expect(queries[operationId].fields.queryString).toStrictEqual( + queryString + ) } } it("populates query", async () => { const assertions = { - "createEntity" : "", - "getEntities" : "page={{page}}&size={{size}}", - "getEntity" : "", - "updateEntity" : "", - "patchEntity" : "", - "deleteEntity" : "" + createEntity: "", + getEntities: "page={{page}}&size={{size}}", + getEntity: "", + updateEntity: "", + patchEntity: "", + deleteEntity: "", } await runTests("crud", testQuery, assertions) }) @@ -163,45 +166,45 @@ describe("OpenAPI2 Import", () => { it("populates parameters", async () => { const assertions = { - "createEntity" : [], - "getEntities" : [ + createEntity: [], + getEntities: [ { - "name" : "page", - "default" : "", + name: "page", + default: "", }, { - "name" : "size", - "default" : "", - } + name: "size", + default: "", + }, ], - "getEntity" : [ + getEntity: [ { - "name" : "entityId", - "default" : "", - } + name: "entityId", + default: "", + }, ], - "updateEntity" : [ + updateEntity: [ { - "name" : "entityId", - "default" : "", - } + name: "entityId", + default: "", + }, ], - "patchEntity" : [ + patchEntity: [ { - "name" : "entityId", - "default" : "", - } + name: "entityId", + default: "", + }, ], - "deleteEntity" : [ + deleteEntity: [ { - "name" : "entityId", - "default" : "", + name: "entityId", + default: "", }, { - "name" : "x-api-key", - "default" : "", - } - ] + name: "x-api-key", + default: "", + }, + ], } await runTests("crud", testParameters, assertions) }) @@ -209,30 +212,32 @@ describe("OpenAPI2 Import", () => { const testBody = async (file, extension, assertions) => { const queries = await getQueries(file, extension) for (let [operationId, body] of Object.entries(assertions)) { - expect(queries[operationId].fields.requestBody).toStrictEqual(JSON.stringify(body, null, 2)) + expect(queries[operationId].fields.requestBody).toStrictEqual( + JSON.stringify(body, null, 2) + ) } } it("populates body", async () => { const assertions = { - "createEntity" : { - "name" : "name", - "type" : "type", + createEntity: { + name: "name", + type: "type", }, - "getEntities" : undefined, - "getEntity" : undefined, - "updateEntity" : { - "id": 1, - "name" : "name", - "type" : "type", + getEntities: undefined, + getEntity: undefined, + updateEntity: { + id: 1, + name: "name", + type: "type", }, - "patchEntity" : { - "id": 1, - "name" : "name", - "type" : "type", + patchEntity: { + id: 1, + name: "name", + type: "type", }, - "deleteEntity" : undefined + deleteEntity: undefined, } await runTests("crud", testBody, assertions) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/controllers/query/import/tests/index.spec.js b/packages/server/src/api/controllers/query/import/tests/index.spec.js index 60030ae7f3..cef27abb08 100644 --- a/packages/server/src/api/controllers/query/import/tests/index.spec.js +++ b/packages/server/src/api/controllers/query/import/tests/index.spec.js @@ -1,11 +1,14 @@ const TestConfig = require("../../../../../tests/utilities/TestConfiguration") const { RestImporter } = require("../index") const fs = require("fs") -const path = require('path') -const { events} = require("@budibase/backend-core") +const path = require("path") +const { events } = require("@budibase/backend-core") -const getData = (file) => { - return fs.readFileSync(path.join(__dirname, `../sources/tests/${file}`), "utf8") +const getData = file => { + return fs.readFileSync( + path.join(__dirname, `../sources/tests/${file}`), + "utf8" + ) } // openapi2 (swagger) @@ -14,7 +17,7 @@ const oapi2CrudYaml = getData("openapi2/data/crud/crud.json") const oapi2PetstoreJson = getData("openapi2/data/petstore/petstore.json") const oapi2PetstoreYaml = getData("openapi2/data/petstore/petstore.json") -// openapi3 +// openapi3 const oapi3CrudJson = getData("openapi3/data/crud/crud.json") const oapi3CrudYaml = getData("openapi3/data/crud/crud.json") const oapi3PetstoreJson = getData("openapi3/data/petstore/petstore.json") @@ -35,7 +38,7 @@ const datasets = { oapi3PetstoreJson, oapi3PetstoreYaml, // curl - curl + curl, } describe("Rest Importer", () => { @@ -45,9 +48,9 @@ describe("Rest Importer", () => { await config.init() }) - let restImporter + let restImporter - const init = async (data) => { + const init = async data => { restImporter = new RestImporter(data) await restImporter.init() } @@ -69,35 +72,35 @@ describe("Rest Importer", () => { it("gets info", async () => { const assertions = { // openapi2 (swagger) - "oapi2CrudJson" : { + oapi2CrudJson: { name: "CRUD", }, - "oapi2CrudYaml" : { + oapi2CrudYaml: { name: "CRUD", }, - "oapi2PetstoreJson" : { + oapi2PetstoreJson: { name: "Swagger Petstore", }, - "oapi2PetstoreYaml" :{ + oapi2PetstoreYaml: { name: "Swagger Petstore", }, // openapi3 - "oapi3CrudJson" : { + oapi3CrudJson: { name: "CRUD", }, - "oapi3CrudYaml" : { + oapi3CrudYaml: { name: "CRUD", }, - "oapi3PetstoreJson" : { + oapi3PetstoreJson: { name: "Swagger Petstore - OpenAPI 3.0", }, - "oapi3PetstoreYaml" :{ + oapi3PetstoreYaml: { name: "Swagger Petstore - OpenAPI 3.0", }, // curl - "curl": { + curl: { name: "example.com", - } + }, } await runTest(testGetInfo, assertions) }) @@ -109,54 +112,58 @@ describe("Rest Importer", () => { expect(importResult.errorQueries.length).toBe(0) expect(importResult.queries.length).toBe(assertions[key].count) expect(events.query.imported).toBeCalledTimes(1) - expect(events.query.imported).toBeCalledWith(datasource, assertions[key].source, assertions[key].count) + expect(events.query.imported).toBeCalledWith( + datasource, + assertions[key].source, + assertions[key].count + ) jest.clearAllMocks() } it("imports queries", async () => { - // simple sanity assertions that the whole dataset + // simple sanity assertions that the whole dataset // makes it through the importer const assertions = { // openapi2 (swagger) - "oapi2CrudJson" : { + oapi2CrudJson: { count: 6, source: "openapi2.0", }, - "oapi2CrudYaml" :{ + oapi2CrudYaml: { count: 6, - source: "openapi2.0" + source: "openapi2.0", }, - "oapi2PetstoreJson" : { + oapi2PetstoreJson: { count: 20, - source: "openapi2.0" + source: "openapi2.0", }, - "oapi2PetstoreYaml" :{ + oapi2PetstoreYaml: { count: 20, - source: "openapi2.0" + source: "openapi2.0", }, // openapi3 - "oapi3CrudJson" : { + oapi3CrudJson: { count: 6, - source: "openapi3.0" + source: "openapi3.0", }, - "oapi3CrudYaml" :{ + oapi3CrudYaml: { count: 6, - source: "openapi3.0" + source: "openapi3.0", }, - "oapi3PetstoreJson" : { + oapi3PetstoreJson: { count: 19, - source: "openapi3.0" + source: "openapi3.0", }, - "oapi3PetstoreYaml" :{ + oapi3PetstoreYaml: { count: 19, - source: "openapi3.0" + source: "openapi3.0", }, // curl - "curl": { + curl: { count: 1, - source: "curl" - } + source: "curl", + }, } await runTest(testImportQueries, assertions) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js index 303bb09cf6..7f4298b2ff 100644 --- a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js +++ b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js @@ -1,65 +1,75 @@ -const viewTemplate = require("../viewBuilder").default; +const viewTemplate = require("../viewBuilder").default describe("viewBuilder", () => { - describe("Filter", () => { it("creates a view with multiple filters and conjunctions", () => { - expect(viewTemplate({ - "name": "Test View", - "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0", - "filters": [{ - "value": "Test", - "condition": "EQUALS", - "key": "Name" - }, { - "value": "Value", - "condition": "MT", - "key": "Yes", - "conjunction": "OR" - }] - })).toMatchSnapshot() + expect( + viewTemplate({ + name: "Test View", + tableId: "14f1c4e94d6a47b682ce89d35d4c78b0", + filters: [ + { + value: "Test", + condition: "EQUALS", + key: "Name", + }, + { + value: "Value", + condition: "MT", + key: "Yes", + conjunction: "OR", + }, + ], + }) + ).toMatchSnapshot() }) }) describe("Calculate", () => { it("creates a view with the calculation statistics schema", () => { - expect(viewTemplate({ - "name": "Calculate View", - "field": "myField", - "calculation": "stats", - "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0", - "filters": [] - })).toMatchSnapshot() + expect( + viewTemplate({ + name: "Calculate View", + field: "myField", + calculation: "stats", + tableId: "14f1c4e94d6a47b682ce89d35d4c78b0", + filters: [], + }) + ).toMatchSnapshot() }) }) describe("Group By", () => { it("creates a view emitting the group by field", () => { - expect(viewTemplate({ - "name": "Test Scores Grouped By Age", - "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0", - "groupBy": "age", - "field": "score", - "filters": [], - })).toMatchSnapshot() + expect( + viewTemplate({ + name: "Test Scores Grouped By Age", + tableId: "14f1c4e94d6a47b682ce89d35d4c78b0", + groupBy: "age", + field: "score", + filters: [], + }) + ).toMatchSnapshot() }) }) describe("Calculate and filter", () => { it("creates a view with the calculation statistics and filter schema", () => { - expect(viewTemplate({ - "name": "Calculate View", - "field": "myField", - "calculation": "stats", - "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0", - "filters": [ - { - "value": 17, - "condition": "MT", - "key": "age", - } - ] - })).toMatchSnapshot() + expect( + viewTemplate({ + name: "Calculate View", + field: "myField", + calculation: "stats", + tableId: "14f1c4e94d6a47b682ce89d35d4c78b0", + filters: [ + { + value: 17, + condition: "MT", + key: "age", + }, + ], + }) + ).toMatchSnapshot() }) }) -}); \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/public/tests/metrics.spec.js b/packages/server/src/api/routes/public/tests/metrics.spec.js index 8e226ec958..8231596d59 100644 --- a/packages/server/src/api/routes/public/tests/metrics.spec.js +++ b/packages/server/src/api/routes/public/tests/metrics.spec.js @@ -25,10 +25,9 @@ describe("/metrics", () => { it("endpoint should not be publicly exposed", async () => { await request - .get(`/api/public/v1/metrics`) - .set(config.publicHeaders()) - .expect(403) + .get(`/api/public/v1/metrics`) + .set(config.publicHeaders()) + .expect(403) }) }) - }) diff --git a/packages/server/src/api/routes/tests/analytics.spec.js b/packages/server/src/api/routes/tests/analytics.spec.js index 5dfe2ce3e6..c69307656d 100644 --- a/packages/server/src/api/routes/tests/analytics.spec.js +++ b/packages/server/src/api/routes/tests/analytics.spec.js @@ -13,8 +13,8 @@ describe("/static", () => { beforeAll(async () => { app = await config.init() }) - - beforeEach(()=>{ + + beforeEach(() => { jest.clearAllMocks() }) @@ -22,7 +22,7 @@ describe("/static", () => { it("should ping from builder", async () => { await request .post("/api/bbtel/ping") - .send({source: "builder", timezone}) + .send({ source: "builder", timezone }) .set(config.defaultHeaders()) .expect(200) @@ -35,12 +35,15 @@ describe("/static", () => { it("should ping from app preview", async () => { await request .post("/api/bbtel/ping") - .send({source: "app", timezone}) + .send({ source: "app", timezone }) .set(config.defaultHeaders()) .expect(200) expect(events.serve.servedAppPreview).toBeCalledTimes(1) - expect(events.serve.servedAppPreview).toBeCalledWith(config.getApp(), timezone) + expect(events.serve.servedAppPreview).toBeCalledWith( + config.getApp(), + timezone + ) expect(events.serve.servedApp).not.toBeCalled() }) @@ -50,12 +53,16 @@ describe("/static", () => { await request .post("/api/bbtel/ping") - .send({source: "app", timezone}) + .send({ source: "app", timezone }) .set(headers) .expect(200) expect(events.serve.servedApp).toBeCalledTimes(1) - expect(events.serve.servedApp).toBeCalledWith(config.getProdApp(), timezone, undefined) + expect(events.serve.servedApp).toBeCalledWith( + config.getProdApp(), + timezone, + undefined + ) expect(events.serve.servedAppPreview).not.toBeCalled() }) @@ -65,12 +72,16 @@ describe("/static", () => { await request .post("/api/bbtel/ping") - .send({source: "app", timezone, embedded: true}) + .send({ source: "app", timezone, embedded: true }) .set(headers) .expect(200) expect(events.serve.servedApp).toBeCalledTimes(1) - expect(events.serve.servedApp).toBeCalledWith(config.getProdApp(), timezone, true) + expect(events.serve.servedApp).toBeCalledWith( + config.getProdApp(), + timezone, + true + ) expect(events.serve.servedAppPreview).not.toBeCalled() }) }) diff --git a/packages/server/src/api/routes/tests/apikeys.spec.js b/packages/server/src/api/routes/tests/apikeys.spec.js index 4a52ea84b4..eb6933af7d 100644 --- a/packages/server/src/api/routes/tests/apikeys.spec.js +++ b/packages/server/src/api/routes/tests/apikeys.spec.js @@ -38,7 +38,7 @@ describe("/api/keys", () => { const res = await request .put(`/api/keys/TEST`) .send({ - value: "test" + value: "test", }) .set(config.defaultHeaders()) .expect("Content-Type", /json/) @@ -56,4 +56,4 @@ describe("/api/keys", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/auth.spec.js b/packages/server/src/api/routes/tests/auth.spec.js index 9418d44046..5fbead99b7 100644 --- a/packages/server/src/api/routes/tests/auth.spec.js +++ b/packages/server/src/api/routes/tests/auth.spec.js @@ -21,4 +21,4 @@ describe("/authenticate", () => { expect(res.body._id).toEqual(generateUserMetadataID(config.user._id)) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/component.spec.js b/packages/server/src/api/routes/tests/component.spec.js index 160a1ca160..c621afae0a 100644 --- a/packages/server/src/api/routes/tests/component.spec.js +++ b/packages/server/src/api/routes/tests/component.spec.js @@ -29,4 +29,4 @@ describe("/component", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/dev.spec.js b/packages/server/src/api/routes/tests/dev.spec.js index af1dc82a9d..73f506d17f 100644 --- a/packages/server/src/api/routes/tests/dev.spec.js +++ b/packages/server/src/api/routes/tests/dev.spec.js @@ -1,7 +1,6 @@ const setup = require("./utilities") const { events } = require("@budibase/backend-core") - describe("/dev", () => { let request = setup.getRequest() let config = setup.getConfig() @@ -32,9 +31,9 @@ describe("/dev", () => { .expect("Content-Type", /json/) .expect(200) - expect(res.body.version).toBe('0.0.0+jest') + expect(res.body.version).toBe("0.0.0+jest") expect(events.installation.versionChecked).toBeCalledTimes(1) - expect(events.installation.versionChecked).toBeCalledWith('0.0.0+jest') + expect(events.installation.versionChecked).toBeCalledWith("0.0.0+jest") }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/integration.spec.js b/packages/server/src/api/routes/tests/integration.spec.js index dde780681b..798ddcd969 100644 --- a/packages/server/src/api/routes/tests/integration.spec.js +++ b/packages/server/src/api/routes/tests/integration.spec.js @@ -49,4 +49,4 @@ describe("/integrations", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/layout.spec.js b/packages/server/src/api/routes/tests/layout.spec.js index ebd6ab7278..c3a3010e32 100644 --- a/packages/server/src/api/routes/tests/layout.spec.js +++ b/packages/server/src/api/routes/tests/layout.spec.js @@ -56,4 +56,4 @@ describe("/layouts", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/metadata.spec.js b/packages/server/src/api/routes/tests/metadata.spec.js index bb28951ee3..d5563f417e 100644 --- a/packages/server/src/api/routes/tests/metadata.spec.js +++ b/packages/server/src/api/routes/tests/metadata.spec.js @@ -14,7 +14,10 @@ describe("/metadata", () => { automation = await config.createAutomation() }) - async function createMetadata(data, type = MetadataTypes.AUTOMATION_TEST_INPUT) { + async function createMetadata( + data, + type = MetadataTypes.AUTOMATION_TEST_INPUT + ) { const res = await request .post(`/api/metadata/${type}/${automation._id}`) .send(data) @@ -53,7 +56,9 @@ describe("/metadata", () => { describe("destroy", () => { it("should be able to delete some test inputs", async () => { const res = await request - .delete(`/api/metadata/${MetadataTypes.AUTOMATION_TEST_INPUT}/${automation._id}`) + .delete( + `/api/metadata/${MetadataTypes.AUTOMATION_TEST_INPUT}/${automation._id}` + ) .set(config.defaultHeaders()) .expect("Content-Type", /json/) .expect(200) diff --git a/packages/server/src/api/routes/tests/query.seq.spec.js b/packages/server/src/api/routes/tests/query.seq.spec.js index d7481fd224..05ca5f7cbb 100644 --- a/packages/server/src/api/routes/tests/query.seq.spec.js +++ b/packages/server/src/api/routes/tests/query.seq.spec.js @@ -1,4 +1,4 @@ -const tk = require( "timekeeper") +const tk = require("timekeeper") tk.freeze(Date.now()) // Mock out postgres for this @@ -14,7 +14,7 @@ jest.mock("@budibase/backend-core", () => { db: { ...core.db, isProdAppID: jest.fn(), - } + }, } }) const setup = require("./utilities") @@ -30,8 +30,7 @@ describe("/queries", () => { afterAll(setup.afterAll) - const setupTest = async()=>{ - + const setupTest = async () => { await config.init() datasource = await config.createDatasource() query = await config.createQuery() @@ -52,7 +51,7 @@ describe("/queries", () => { return { datasource, query } } - const createQuery = async (query) => { + const createQuery = async query => { return request .post(`/api/queries`) .send(query) @@ -76,7 +75,7 @@ describe("/queries", () => { _id: res.body._id, ...query, createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString() + updatedAt: new Date().toISOString(), }) expect(events.query.created).toBeCalledTimes(1) expect(events.query.updated).not.toBeCalled() @@ -101,7 +100,7 @@ describe("/queries", () => { _id: res.body._id, ...query, createdAt: new Date().toISOString(), - updatedAt: new Date().toISOString() + updatedAt: new Date().toISOString(), }) expect(events.query.created).not.toBeCalled() expect(events.query.updated).toBeCalledTimes(1) @@ -109,7 +108,7 @@ describe("/queries", () => { }) describe("fetch", () => { - beforeEach(async() => { + beforeEach(async () => { await setupTest() }) @@ -190,7 +189,7 @@ describe("/queries", () => { }) describe("destroy", () => { - beforeEach(async() => { + beforeEach(async () => { await setupTest() }) @@ -237,8 +236,8 @@ describe("/queries", () => { .expect(200) // these responses come from the mock expect(res.body.schemaFields).toEqual({ - "a": "string", - "b": "number", + a: "string", + b: "number", }) expect(res.body.rows.length).toEqual(1) expect(events.query.previewed).toBeCalledTimes(1) @@ -256,7 +255,7 @@ describe("/queries", () => { }) describe("execute", () => { - beforeEach(async() => { + beforeEach(async () => { await setupTest() }) @@ -302,9 +301,9 @@ describe("/queries", () => { }) // these responses come from the mock expect(res.body.schemaFields).toEqual({ - "opts": "json", - "url": "string", - "value": "string", + opts: "json", + url: "string", + value: "string", }) expect(res.body.rows[0].url).toEqual("http://www.google.com?test=1") }) @@ -316,9 +315,9 @@ describe("/queries", () => { queryString: "test={{ variable3 }}", }) expect(res.body.schemaFields).toEqual({ - "opts": "json", - "url": "string", - "value": "string" + opts: "json", + url: "string", + value: "string", }) expect(res.body.rows[0].url).toContain("doctype%20html") }) @@ -339,9 +338,9 @@ describe("/queries", () => { queryString: "test={{ variable3 }}", }) expect(res.body.schemaFields).toEqual({ - "fails": "number", - "opts": "json", - "url": "string" + fails: "number", + opts: "json", + url: "string", }) expect(res.body.rows[0].fails).toEqual(1) }) @@ -371,13 +370,19 @@ describe("/queries", () => { }) describe("Current User Request Mapping", () => { - async function previewGet(datasource, fields, params) { return config.previewQuery(request, config, datasource, fields, params) } async function previewPost(datasource, fields, params) { - return config.previewQuery(request, config, datasource, fields, params, "create") + return config.previewQuery( + request, + config, + datasource, + fields, + params, + "create" + ) } it("should parse global and query level header mappings", async () => { @@ -385,120 +390,160 @@ describe("/queries", () => { const datasource = await config.restDatasource({ defaultHeaders: { - "test": "headerVal", - "emailHdr": "{{[user].[email]}}" - } + test: "headerVal", + emailHdr: "{{[user].[email]}}", + }, }) const res = await previewGet(datasource, { path: "www.google.com", queryString: "email={{[user].[email]}}", headers: { - queryHdr : "{{[user].[firstName]}}", - secondHdr : "1234" - } + queryHdr: "{{[user].[firstName]}}", + secondHdr: "1234", + }, }) const parsedRequest = JSON.parse(res.body.extra.raw) expect(parsedRequest.opts.headers).toEqual({ - "test": "headerVal", - "emailHdr": userDetails.email, - "queryHdr": userDetails.firstName, - "secondHdr" : "1234" + test: "headerVal", + emailHdr: userDetails.email, + queryHdr: userDetails.firstName, + secondHdr: "1234", }) - expect(res.body.rows[0].url).toEqual("http://www.google.com?email=" + userDetails.email.replace("@", "%40")) + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?email=" + userDetails.email.replace("@", "%40") + ) }) it("should bind the current user to query parameters", async () => { const userDetails = config.getUserDetails() - + const datasource = await config.restDatasource() - - const res = await previewGet(datasource, { - path: "www.google.com", - queryString: "test={{myEmail}}&testName={{myName}}&testParam={{testParam}}", - }, { - "myEmail" : "{{[user].[email]}}", - "myName" : "{{[user].[firstName]}}", - "testParam" : "1234" - }) - - expect(res.body.rows[0].url).toEqual("http://www.google.com?test=" + userDetails.email.replace("@", "%40") + - "&testName=" + userDetails.firstName + "&testParam=1234") + + const res = await previewGet( + datasource, + { + path: "www.google.com", + queryString: + "test={{myEmail}}&testName={{myName}}&testParam={{testParam}}", + }, + { + myEmail: "{{[user].[email]}}", + myName: "{{[user].[firstName]}}", + testParam: "1234", + } + ) + + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?test=" + + userDetails.email.replace("@", "%40") + + "&testName=" + + userDetails.firstName + + "&testParam=1234" + ) }) it("should bind the current user the request body - plain text", async () => { const userDetails = config.getUserDetails() const datasource = await config.restDatasource() - - const res = await previewPost(datasource, { - path: "www.google.com", - queryString: "testParam={{testParam}}", - requestBody: "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}", - bodyType: "text" - }, { - "testParam" : "1234" - }) + + const res = await previewPost( + datasource, + { + path: "www.google.com", + queryString: "testParam={{testParam}}", + requestBody: + "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}", + bodyType: "text", + }, + { + testParam: "1234", + } + ) const parsedRequest = JSON.parse(res.body.extra.raw) - expect(parsedRequest.opts.body).toEqual(`This is plain text and this is my email: ${userDetails.email}. This is a test param: 1234`) - expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234") + expect(parsedRequest.opts.body).toEqual( + `This is plain text and this is my email: ${userDetails.email}. This is a test param: 1234` + ) + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?testParam=1234" + ) }) it("should bind the current user the request body - json", async () => { const userDetails = config.getUserDetails() const datasource = await config.restDatasource() - - const res = await previewPost(datasource, { - path: "www.google.com", - queryString: "testParam={{testParam}}", - requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}", - bodyType: "json" - }, { - "testParam" : "1234", - "userRef" : "{{[user].[firstName]}}" - }) + + const res = await previewPost( + datasource, + { + path: "www.google.com", + queryString: "testParam={{testParam}}", + requestBody: + '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}', + bodyType: "json", + }, + { + testParam: "1234", + userRef: "{{[user].[firstName]}}", + } + ) const parsedRequest = JSON.parse(res.body.extra.raw) const test = `{"email":"${userDetails.email}","queryCode":1234,"userRef":"${userDetails.firstName}"}` expect(parsedRequest.opts.body).toEqual(test) - expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234") + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?testParam=1234" + ) }) - + it("should bind the current user the request body - xml", async () => { const userDetails = config.getUserDetails() const datasource = await config.restDatasource() - - const res = await previewPost(datasource, { - path: "www.google.com", - queryString: "testParam={{testParam}}", - requestBody: " {{[user].[email]}} {{testParam}} " + - "{{userId}} testing ", - bodyType: "xml" - }, { - "testParam" : "1234", - "userId" : "{{[user].[firstName]}}" - }) + + const res = await previewPost( + datasource, + { + path: "www.google.com", + queryString: "testParam={{testParam}}", + requestBody: + " {{[user].[email]}} {{testParam}} " + + "{{userId}} testing ", + bodyType: "xml", + }, + { + testParam: "1234", + userId: "{{[user].[firstName]}}", + } + ) const parsedRequest = JSON.parse(res.body.extra.raw) const test = ` ${userDetails.email} 1234 ${userDetails.firstName} testing ` - + expect(parsedRequest.opts.body).toEqual(test) - expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234") + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?testParam=1234" + ) }) it("should bind the current user the request body - form-data", async () => { const userDetails = config.getUserDetails() const datasource = await config.restDatasource() - - const res = await previewPost(datasource, { - path: "www.google.com", - queryString: "testParam={{testParam}}", - requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}", - bodyType: "form" - }, { - "testParam" : "1234", - "userRef" : "{{[user].[firstName]}}" - }) + + const res = await previewPost( + datasource, + { + path: "www.google.com", + queryString: "testParam={{testParam}}", + requestBody: + '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}', + bodyType: "form", + }, + { + testParam: "1234", + userRef: "{{[user].[firstName]}}", + } + ) const parsedRequest = JSON.parse(res.body.extra.raw) @@ -511,28 +556,34 @@ describe("/queries", () => { const userRef = parsedRequest.opts.body._streams[7] expect(userRef).toEqual(userDetails.firstName) - expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234") + expect(res.body.rows[0].url).toEqual( + "http://www.google.com?testParam=1234" + ) }) it("should bind the current user the request body - encoded", async () => { const userDetails = config.getUserDetails() const datasource = await config.restDatasource() - - const res = await previewPost(datasource, { - path: "www.google.com", - queryString: "testParam={{testParam}}", - requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}", - bodyType: "encoded" - }, { - "testParam" : "1234", - "userRef" : "{{[user].[firstName]}}" - }) + + const res = await previewPost( + datasource, + { + path: "www.google.com", + queryString: "testParam={{testParam}}", + requestBody: + '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}', + bodyType: "encoded", + }, + { + testParam: "1234", + userRef: "{{[user].[firstName]}}", + } + ) const parsedRequest = JSON.parse(res.body.extra.raw) - + expect(parsedRequest.opts.body.email).toEqual(userDetails.email) expect(parsedRequest.opts.body.queryCode).toEqual("1234") expect(parsedRequest.opts.body.userRef).toEqual(userDetails.firstName) }) - - }); + }) }) diff --git a/packages/server/src/api/routes/tests/role.spec.js b/packages/server/src/api/routes/tests/role.spec.js index d133a69d64..a653b573b2 100644 --- a/packages/server/src/api/routes/tests/role.spec.js +++ b/packages/server/src/api/routes/tests/role.spec.js @@ -170,7 +170,7 @@ describe("/roles", () => { .get("/api/roles/accessible") .set({ ...config.defaultHeaders(), - "x-budibase-role": "CUSTOM_ROLE" + "x-budibase-role": "CUSTOM_ROLE", }) .expect(200) expect(res.body.length).toBe(3) diff --git a/packages/server/src/api/routes/tests/routing.spec.js b/packages/server/src/api/routes/tests/routing.spec.js index 4076f4879c..5bdd4ee852 100644 --- a/packages/server/src/api/routes/tests/routing.spec.js +++ b/packages/server/src/api/routes/tests/routing.spec.js @@ -37,19 +37,23 @@ describe("/routing", () => { await runInProd(async () => { return request .get(`/api/routing/client`) - .set(await config.roleHeaders({ - roleId: BUILTIN_ROLE_IDS.BASIC, - prodApp: false - })) + .set( + await config.roleHeaders({ + roleId: BUILTIN_ROLE_IDS.BASIC, + prodApp: false, + }) + ) .expect(302) }) }) it("returns the correct routing for basic user", async () => { const res = await request .get(`/api/routing/client`) - .set(await config.roleHeaders({ - roleId: BUILTIN_ROLE_IDS.BASIC - })) + .set( + await config.roleHeaders({ + roleId: BUILTIN_ROLE_IDS.BASIC, + }) + ) .expect("Content-Type", /json/) .expect(200) expect(res.body.routes).toBeDefined() @@ -57,18 +61,20 @@ describe("/routing", () => { subpaths: { [route]: { screenId: basic._id, - roleId: basic.routing.roleId - } - } + roleId: basic.routing.roleId, + }, + }, }) }) it("returns the correct routing for power user", async () => { const res = await request .get(`/api/routing/client`) - .set(await config.roleHeaders({ - roleId: BUILTIN_ROLE_IDS.POWER - })) + .set( + await config.roleHeaders({ + roleId: BUILTIN_ROLE_IDS.POWER, + }) + ) .expect("Content-Type", /json/) .expect(200) expect(res.body.routes).toBeDefined() @@ -76,9 +82,9 @@ describe("/routing", () => { subpaths: { [route]: { screenId: power._id, - roleId: power.routing.roleId - } - } + roleId: power.routing.roleId, + }, + }, }) }) }) @@ -87,10 +93,12 @@ describe("/routing", () => { it("should fetch all routes for builder", async () => { const res = await request .get(`/api/routing`) - .set(await config.roleHeaders({ - roleId: BUILTIN_ROLE_IDS.POWER, - builder: true, - })) + .set( + await config.roleHeaders({ + roleId: BUILTIN_ROLE_IDS.POWER, + builder: true, + }) + ) .expect(200) .expect("Content-Type", /json/) expect(res.body.routes).toBeDefined() @@ -108,4 +116,4 @@ describe("/routing", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/screen.spec.js b/packages/server/src/api/routes/tests/screen.spec.js index a3748d6a79..481baac703 100644 --- a/packages/server/src/api/routes/tests/screen.spec.js +++ b/packages/server/src/api/routes/tests/screen.spec.js @@ -36,7 +36,7 @@ describe("/screens", () => { }) describe("save", () => { - const saveScreen = async (screen) => { + const saveScreen = async screen => { const res = await request .post(`/api/screens`) .send(screen) @@ -100,4 +100,4 @@ describe("/screens", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/templates.spec.js b/packages/server/src/api/routes/tests/templates.spec.js index 3cb22fd2d3..1406a75c59 100644 --- a/packages/server/src/api/routes/tests/templates.spec.js +++ b/packages/server/src/api/routes/tests/templates.spec.js @@ -21,4 +21,4 @@ describe("/templates", () => { expect(Array.isArray(res.body)).toEqual(true) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/api/routes/tests/view.spec.js b/packages/server/src/api/routes/tests/view.spec.js index e633279058..92ff097899 100644 --- a/packages/server/src/api/routes/tests/view.spec.js +++ b/packages/server/src/api/routes/tests/view.spec.js @@ -31,18 +31,18 @@ describe("/views", () => { beforeAll(async () => { await config.init() }) - - beforeEach(async() => { + + beforeEach(async () => { table = await config.createTable(priceTable()) }) - const saveView = async (view) => { + const saveView = async view => { const viewToSave = { name: "TestView", field: "Price", calculation: "stats", tableId: table._id, - ...view + ...view, } return request .post(`/api/views`) @@ -53,7 +53,6 @@ describe("/views", () => { } describe("create", () => { - it("returns a success message when the view is successfully created", async () => { const res = await saveView() expect(res.body.tableId).toBe(table._id) @@ -81,11 +80,13 @@ describe("/views", () => { const res = await saveView({ calculation: null, - filters: [{ - value: "1", - condition: "EQUALS", - key: "price" - }], + filters: [ + { + value: "1", + condition: "EQUALS", + key: "price", + }, + ], }) expect(res.body.tableId).toBe(table._id) @@ -199,18 +200,26 @@ describe("/views", () => { }) it("updates a view filter", async () => { - await saveView({ filters: [{ - value: "1", - condition: "EQUALS", - key: "price" - }] }) + await saveView({ + filters: [ + { + value: "1", + condition: "EQUALS", + key: "price", + }, + ], + }) jest.clearAllMocks() - await saveView({ filters: [{ - value: "2", - condition: "EQUALS", - key: "price" - }] }) + await saveView({ + filters: [ + { + value: "2", + condition: "EQUALS", + key: "price", + }, + ], + }) expect(events.view.created).not.toBeCalled() expect(events.view.updated).toBeCalledTimes(1) @@ -223,11 +232,15 @@ describe("/views", () => { }) it("deletes a view filter", async () => { - await saveView({ filters: [{ - value: "1", - condition: "EQUALS", - key: "price" - }] }) + await saveView({ + filters: [ + { + value: "1", + condition: "EQUALS", + key: "price", + }, + ], + }) jest.clearAllMocks() await saveView({ filters: [] }) @@ -344,7 +357,6 @@ describe("/views", () => { }) describe("exportView", () => { - beforeEach(() => { jest.clearAllMocks() }) @@ -362,14 +374,14 @@ describe("/views", () => { .expect(200) } - const assertJsonExport = (res) => { + const assertJsonExport = res => { const rows = JSON.parse(res.text) expect(rows.length).toBe(1) expect(rows[0].name).toBe("test-name") expect(rows[0].description).toBe("ùúûü") } - const assertCSVExport = (res) => { + const assertCSVExport = res => { expect(res.text).toBe(`"name","description"\n"test-name","ùúûü"`) } diff --git a/packages/server/src/automations/tests/bash.spec.js b/packages/server/src/automations/tests/bash.spec.js index a8695c7460..d2f3bb8031 100644 --- a/packages/server/src/automations/tests/bash.spec.js +++ b/packages/server/src/automations/tests/bash.spec.js @@ -1,34 +1,33 @@ const setup = require("./utilities") describe("test the bash action", () => { - let config = setup.getConfig() + let config = setup.getConfig() - beforeAll(async () => { - await config.init() - }) - afterAll(setup.afterAll) + beforeAll(async () => { + await config.init() + }) + afterAll(setup.afterAll) - it("should be able to execute a script", async () => { + it("should be able to execute a script", async () => { + let res = await setup.runStep( + "EXECUTE_BASH", + (inputs = { + code: "echo 'test'", + }) + ) + expect(res.stdout).toEqual("test\n") + expect(res.success).toEqual(true) + }) - let res = await setup.runStep("EXECUTE_BASH", - inputs = { - code: "echo 'test'" - } - - ) - expect(res.stdout).toEqual("test\n") - expect(res.success).toEqual(true) - }) - - it("should handle a null value", async () => { - - let res = await setup.runStep("EXECUTE_BASH", - inputs = { - code: null - } - - - ) - expect(res.stdout).toEqual("Budibase bash automation failed: Invalid inputs") - }) + it("should handle a null value", async () => { + let res = await setup.runStep( + "EXECUTE_BASH", + (inputs = { + code: null, + }) + ) + expect(res.stdout).toEqual( + "Budibase bash automation failed: Invalid inputs" + ) + }) }) diff --git a/packages/server/src/automations/tests/delay.spec.js b/packages/server/src/automations/tests/delay.spec.js index ad67c74606..5f6e0fd164 100644 --- a/packages/server/src/automations/tests/delay.spec.js +++ b/packages/server/src/automations/tests/delay.spec.js @@ -1,7 +1,7 @@ const setup = require("./utilities") // need real Date for this test -const tk = require('timekeeper'); +const tk = require("timekeeper") tk.reset() describe("test the delay logic", () => { diff --git a/packages/server/src/automations/tests/discord.spec.js b/packages/server/src/automations/tests/discord.spec.js index d91c46094a..ccae42d073 100644 --- a/packages/server/src/automations/tests/discord.spec.js +++ b/packages/server/src/automations/tests/discord.spec.js @@ -4,24 +4,23 @@ const fetch = require("node-fetch") jest.mock("node-fetch") describe("test the outgoing webhook action", () => { - let inputs - let config = setup.getConfig() + let inputs + let config = setup.getConfig() - beforeAll(async () => { - await config.init() - inputs = { - username: "joe_bloggs", - url: "http://www.test.com", - } - }) + beforeAll(async () => { + await config.init() + inputs = { + username: "joe_bloggs", + url: "http://www.test.com", + } + }) - afterAll(setup.afterAll) - - it("should be able to run the action", async () => { - const res = await setup.runStep(setup.actions.discord.stepId, inputs) - expect(res.response.url).toEqual("http://www.test.com") - expect(res.response.method).toEqual("post") - expect(res.success).toEqual(true) - }) + afterAll(setup.afterAll) + it("should be able to run the action", async () => { + const res = await setup.runStep(setup.actions.discord.stepId, inputs) + expect(res.response.url).toEqual("http://www.test.com") + expect(res.response.method).toEqual("post") + expect(res.success).toEqual(true) + }) }) diff --git a/packages/server/src/automations/tests/executeQuery.spec.js b/packages/server/src/automations/tests/executeQuery.spec.js index ae2ca1dfd8..3b747f2ba3 100644 --- a/packages/server/src/automations/tests/executeQuery.spec.js +++ b/packages/server/src/automations/tests/executeQuery.spec.js @@ -1,48 +1,47 @@ const setup = require("./utilities") describe("test the execute query action", () => { - let config = setup.getConfig() + let config = setup.getConfig() - beforeAll(async () => { - await config.init() + beforeAll(async () => { + await config.init() - await config.createDatasource() - query = await config.createQuery() + await config.createDatasource() + query = await config.createQuery() + }) - }) + afterAll(setup.afterAll) - afterAll(setup.afterAll) - - it("should be able to execute a query", async () => { - let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, - inputs = { - query: { queryId: query._id } - } - ) - expect(res.response).toEqual([{ a: 'string', b: 1 }]) - expect(res.success).toEqual(true) - }) - - it("should handle a null query value", async () => { - let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, - inputs = { - query: null - } - ) - expect(res.response.message).toEqual("Invalid inputs") - expect(res.success).toEqual(false) - }) - - - it("should handle an error executing a query", async () => { - let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, - inputs = { - query: { queryId: "wrong_id" } - } - ) - expect(res.response).toEqual('Error: missing') - expect(res.success).toEqual(false) - }) + it("should be able to execute a query", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_QUERY.stepId, + (inputs = { + query: { queryId: query._id }, + }) + ) + expect(res.response).toEqual([{ a: "string", b: 1 }]) + expect(res.success).toEqual(true) + }) + it("should handle a null query value", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_QUERY.stepId, + (inputs = { + query: null, + }) + ) + expect(res.response.message).toEqual("Invalid inputs") + expect(res.success).toEqual(false) + }) + it("should handle an error executing a query", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_QUERY.stepId, + (inputs = { + query: { queryId: "wrong_id" }, + }) + ) + expect(res.response).toEqual("Error: missing") + expect(res.success).toEqual(false) + }) }) diff --git a/packages/server/src/automations/tests/executeScript.spec.js b/packages/server/src/automations/tests/executeScript.spec.js index b9aedb8e31..5aac8400cd 100644 --- a/packages/server/src/automations/tests/executeScript.spec.js +++ b/packages/server/src/automations/tests/executeScript.spec.js @@ -1,48 +1,43 @@ const setup = require("./utilities") describe("test the execute script action", () => { - let config = setup.getConfig() + let config = setup.getConfig() - beforeAll(async () => { - await config.init() - }) - afterAll(setup.afterAll) + beforeAll(async () => { + await config.init() + }) + afterAll(setup.afterAll) - it("should be able to execute a script", async () => { + it("should be able to execute a script", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_SCRIPT.stepId, + (inputs = { + code: "return 1 + 1", + }) + ) + expect(res.value).toEqual(2) + expect(res.success).toEqual(true) + }) - let res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, - inputs = { - code: "return 1 + 1" - } - - ) - expect(res.value).toEqual(2) - expect(res.success).toEqual(true) - }) - - it("should handle a null value", async () => { - - let res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, - inputs = { - code: null - } - - - ) - expect(res.response.message).toEqual("Invalid inputs") - expect(res.success).toEqual(false) - }) - - it("should be able to handle an error gracefully", async () => { - - let res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, - inputs = { - code: "return something.map(x => x.name)" - } - - ) - expect(res.response).toEqual("ReferenceError: something is not defined") - expect(res.success).toEqual(false) - }) + it("should handle a null value", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_SCRIPT.stepId, + (inputs = { + code: null, + }) + ) + expect(res.response.message).toEqual("Invalid inputs") + expect(res.success).toEqual(false) + }) + it("should be able to handle an error gracefully", async () => { + let res = await setup.runStep( + setup.actions.EXECUTE_SCRIPT.stepId, + (inputs = { + code: "return something.map(x => x.name)", + }) + ) + expect(res.response).toEqual("ReferenceError: something is not defined") + expect(res.success).toEqual(false) + }) }) diff --git a/packages/server/src/automations/tests/outgoingWebhook.spec.js b/packages/server/src/automations/tests/outgoingWebhook.spec.js index c31ed850e7..4bc51d0989 100644 --- a/packages/server/src/automations/tests/outgoingWebhook.spec.js +++ b/packages/server/src/automations/tests/outgoingWebhook.spec.js @@ -21,7 +21,10 @@ describe("test the outgoing webhook action", () => { afterAll(setup.afterAll) it("should be able to run the action", async () => { - const res = await setup.runStep(setup.actions.OUTGOING_WEBHOOK.stepId, inputs) + const res = await setup.runStep( + setup.actions.OUTGOING_WEBHOOK.stepId, + inputs + ) expect(res.success).toEqual(true) expect(res.response.url).toEqual("http://www.test.com") expect(res.response.method).toEqual("POST") @@ -31,9 +34,8 @@ describe("test the outgoing webhook action", () => { it("should return an error if something goes wrong in fetch", async () => { const res = await setup.runStep(setup.actions.OUTGOING_WEBHOOK.stepId, { requestMethod: "GET", - url: "www.invalid.com" + url: "www.invalid.com", }) expect(res.success).toEqual(false) }) - }) diff --git a/packages/server/src/automations/tests/serverLog.spec.js b/packages/server/src/automations/tests/serverLog.spec.js index 8b5ce2e64f..8869c07a4b 100644 --- a/packages/server/src/automations/tests/serverLog.spec.js +++ b/packages/server/src/automations/tests/serverLog.spec.js @@ -1,22 +1,19 @@ const setup = require("./utilities") describe("test the server log action", () => { - let config = setup.getConfig() + let config = setup.getConfig() - beforeAll(async () => { - await config.init() - inputs = { - text: "log message", - } - }) - afterAll(setup.afterAll) + beforeAll(async () => { + await config.init() + inputs = { + text: "log message", + } + }) + afterAll(setup.afterAll) - it("should be able to log the text", async () => { - - let res = await setup.runStep(setup.actions.SERVER_LOG.stepId, - inputs - ) - expect(res.message).toEqual(`App ${config.getAppId()} - ${inputs.text}`) - expect(res.success).toEqual(true) - }) + it("should be able to log the text", async () => { + let res = await setup.runStep(setup.actions.SERVER_LOG.stepId, inputs) + expect(res.message).toEqual(`App ${config.getAppId()} - ${inputs.text}`) + expect(res.success).toEqual(true) + }) }) diff --git a/packages/server/src/db/tests/linkController.spec.js b/packages/server/src/db/tests/linkController.spec.js index 5caf35f61a..313cfee837 100644 --- a/packages/server/src/db/tests/linkController.spec.js +++ b/packages/server/src/db/tests/linkController.spec.js @@ -1,5 +1,9 @@ const TestConfig = require("../../tests/utilities/TestConfiguration") -const { basicRow, basicLinkedRow, basicTable } = require("../../tests/utilities/structures") +const { + basicRow, + basicLinkedRow, + basicTable, +} = require("../../tests/utilities/structures") const LinkController = require("../linkedRows/LinkController").default const { context } = require("@budibase/backend-core") const { RelationshipType } = require("../../constants") @@ -16,7 +20,10 @@ describe("test the link controller", () => { beforeEach(async () => { const { _id } = await config.createTable() - table2 = await config.createLinkedTable(RelationshipType.MANY_TO_MANY, ["link", "link2"]) + table2 = await config.createLinkedTable(RelationshipType.MANY_TO_MANY, [ + "link", + "link2", + ]) // update table after creating link table1 = await config.getTable(_id) }) @@ -41,15 +48,23 @@ describe("test the link controller", () => { async function createLinkedRow(linkField = "link", t1 = table1, t2 = table2) { const row = await config.createRow(basicRow(t2._id)) - const { _id } = await config.createRow(basicLinkedRow(t1._id, row._id, linkField)) + const { _id } = await config.createRow( + basicLinkedRow(t1._id, row._id, linkField) + ) return config.getRow(t1._id, _id) } it("should be able to confirm if two table schemas are equal", async () => { const controller = await createLinkController(table1) - let equal = controller.areLinkSchemasEqual(table2.schema.link, table2.schema.link) + let equal = controller.areLinkSchemasEqual( + table2.schema.link, + table2.schema.link + ) expect(equal).toEqual(true) - equal = controller.areLinkSchemasEqual(table1.schema.link, table2.schema.link) + equal = controller.areLinkSchemasEqual( + table1.schema.link, + table2.schema.link + ) expect(equal).toEqual(false) }) @@ -57,17 +72,42 @@ describe("test the link controller", () => { const controller = await createLinkController(table1) // empty case let output = controller.handleRelationshipType({}, {}) - expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY) - expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY) - output = controller.handleRelationshipType({ relationshipType: RelationshipType.MANY_TO_MANY }, {}) - expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY) - expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY) - output = controller.handleRelationshipType({ relationshipType: RelationshipType.MANY_TO_ONE }, {}) - expect(output.linkedField.relationshipType).toEqual(RelationshipType.ONE_TO_MANY) - expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_ONE) - output = controller.handleRelationshipType({ relationshipType: RelationshipType.ONE_TO_MANY }, {}) - expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_ONE) - expect(output.linkerField.relationshipType).toEqual(RelationshipType.ONE_TO_MANY) + expect(output.linkedField.relationshipType).toEqual( + RelationshipType.MANY_TO_MANY + ) + expect(output.linkerField.relationshipType).toEqual( + RelationshipType.MANY_TO_MANY + ) + output = controller.handleRelationshipType( + { relationshipType: RelationshipType.MANY_TO_MANY }, + {} + ) + expect(output.linkedField.relationshipType).toEqual( + RelationshipType.MANY_TO_MANY + ) + expect(output.linkerField.relationshipType).toEqual( + RelationshipType.MANY_TO_MANY + ) + output = controller.handleRelationshipType( + { relationshipType: RelationshipType.MANY_TO_ONE }, + {} + ) + expect(output.linkedField.relationshipType).toEqual( + RelationshipType.ONE_TO_MANY + ) + expect(output.linkerField.relationshipType).toEqual( + RelationshipType.MANY_TO_ONE + ) + output = controller.handleRelationshipType( + { relationshipType: RelationshipType.ONE_TO_MANY }, + {} + ) + expect(output.linkedField.relationshipType).toEqual( + RelationshipType.MANY_TO_ONE + ) + expect(output.linkerField.relationshipType).toEqual( + RelationshipType.ONE_TO_MANY + ) }) it("should be able to delete a row", async () => { @@ -100,7 +140,7 @@ describe("test the link controller", () => { it("should throw an error when validating a table which is invalid", async () => { const controller = await createLinkController(table1) const copyTable = { - ...table1 + ...table1, } copyTable.schema.otherTableLink = { type: "link", @@ -114,7 +154,9 @@ describe("test the link controller", () => { error = err } expect(error).toBeDefined() - expect(error.message).toEqual("Cannot re-use the linked column name for a linked table.") + expect(error.message).toEqual( + "Cannot re-use the linked column name for a linked table." + ) }) it("should be able to remove a link when saving/updating the row", async () => { @@ -183,7 +225,10 @@ describe("test the link controller", () => { it("shouldn't allow one to many having many relationships against it", async () => { const firstTable = await config.createTable() - const { _id } = await config.createLinkedTable(RelationshipType.MANY_TO_ONE, ["link"]) + const { _id } = await config.createLinkedTable( + RelationshipType.MANY_TO_ONE, + ["link"] + ) const linkTable = await config.getTable(_id) // an initial row to link around const row = await createLinkedRow("link", linkTable, firstTable) diff --git a/packages/server/src/db/tests/linkTests.spec.js b/packages/server/src/db/tests/linkTests.spec.js index 19a0eb88d3..7b3fedb5a9 100644 --- a/packages/server/src/db/tests/linkTests.spec.js +++ b/packages/server/src/db/tests/linkTests.spec.js @@ -45,7 +45,9 @@ describe("test link functionality", () => { }) it("should get the field from the link", () => { - expect(linkUtils.getRelatedTableForField(link, "otherLink")).toBe("tableID") + expect(linkUtils.getRelatedTableForField(link, "otherLink")).toBe( + "tableID" + ) }) }) @@ -62,4 +64,4 @@ describe("test link functionality", () => { }) }) }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/middleware/tests/resourceId.spec.js b/packages/server/src/middleware/tests/resourceId.spec.js index 56d89cfede..759aa46f00 100644 --- a/packages/server/src/middleware/tests/resourceId.spec.js +++ b/packages/server/src/middleware/tests/resourceId.spec.js @@ -3,7 +3,7 @@ const { paramSubResource, bodyResource, bodySubResource, - ResourceIdGetter + ResourceIdGetter, } = require("../resourceId") class TestConfiguration { @@ -41,7 +41,7 @@ describe("resourceId middleware", () => { it("generates a resourceId middleware for context query parameters", () => { const config = new TestConfiguration(paramResource("main")) config.setParams({ - main: "test" + main: "test", }) config.executeMiddleware() @@ -53,7 +53,7 @@ describe("resourceId middleware", () => { const config = new TestConfiguration(paramSubResource("main", "sub")) config.setParams({ main: "main", - sub: "test" + sub: "test", }) config.executeMiddleware() @@ -65,7 +65,7 @@ describe("resourceId middleware", () => { it("generates a resourceId middleware for context request body", () => { const config = new TestConfiguration(bodyResource("main")) config.setBody({ - main: "test" + main: "test", }) config.executeMiddleware() @@ -77,7 +77,7 @@ describe("resourceId middleware", () => { const config = new TestConfiguration(bodySubResource("main", "sub")) config.setBody({ main: "main", - sub: "test" + sub: "test", }) config.executeMiddleware() @@ -94,7 +94,7 @@ describe("resourceId middleware", () => { let config = new TestConfiguration(middleware) config.setBody({ custom: "test", - customSub: "subtest" + customSub: "subtest", }) config.executeMiddleware() @@ -102,4 +102,4 @@ describe("resourceId middleware", () => { expect(config.ctx.resourceId).toEqual("test") expect(config.ctx.subResourceId).toEqual("subtest") }) -}) \ No newline at end of file +}) diff --git a/packages/server/src/middleware/tests/selfhost.spec.js b/packages/server/src/middleware/tests/selfhost.spec.js index 70ed981ac3..03372e9783 100644 --- a/packages/server/src/middleware/tests/selfhost.spec.js +++ b/packages/server/src/middleware/tests/selfhost.spec.js @@ -10,7 +10,7 @@ class TestConfiguration { this.ctx = { next: this.next, - throw: this.throw + throw: this.throw, } } @@ -35,7 +35,7 @@ describe("Self host middleware", () => { }) it("calls next() when SELF_HOSTED env var is set", async () => { - env.SELF_HOSTED = 1 + env.SELF_HOSTED = 1 await config.executeMiddleware() expect(config.next).toHaveBeenCalled() diff --git a/packages/server/src/migrations/functions/tests/appUrls.spec.js b/packages/server/src/migrations/functions/tests/appUrls.spec.js index f60dff855c..7a2f324552 100644 --- a/packages/server/src/migrations/functions/tests/appUrls.spec.js +++ b/packages/server/src/migrations/functions/tests/appUrls.spec.js @@ -10,7 +10,7 @@ describe("run", () => { await config.init() }) - afterAll(config.end) + afterAll(config.end) it("runs successfully", async () => { const app = await config.createApp("testApp") diff --git a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js index 15ddcfd1ef..f0da25893c 100644 --- a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js +++ b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js @@ -4,8 +4,8 @@ jest.mock("@budibase/backend-core", () => { ...core, db: { ...core.db, - createNewUserEmailView: jest.fn() - } + createNewUserEmailView: jest.fn(), + }, } }) const { context, db: dbCore } = require("@budibase/backend-core") @@ -16,19 +16,19 @@ const TestConfig = require("../../../tests/utilities/TestConfiguration") const migration = require("../userEmailViewCasing") describe("run", () => { - let config = new TestConfig(false) + let config = new TestConfig(false) - beforeAll(async () => { - await config.init() - }) - - afterAll(config.end) - - it("runs successfully", async () => { - await config.doInTenant(async () => { - const globalDb = context.getGlobalDB() - await migration.run(globalDb) - expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1) - }) + beforeAll(async () => { + await config.init() + }) + + afterAll(config.end) + + it("runs successfully", async () => { + await config.doInTenant(async () => { + const globalDb = context.getGlobalDB() + await migration.run(globalDb) + expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1) }) + }) }) diff --git a/packages/string-templates/test/basic.spec.js b/packages/string-templates/test/basic.spec.js index 3346a81ddd..a5054bf489 100644 --- a/packages/string-templates/test/basic.spec.js +++ b/packages/string-templates/test/basic.spec.js @@ -86,11 +86,11 @@ describe("Test that the object processing works correctly", () => { }) it("check objects get converted to string JSON automatically", async () => { - const row = {a: 1} + const row = { a: 1 } const output = await processString("{{ trigger.row }}", { trigger: { row, - } + }, }) expect(JSON.parse(output)).toEqual(row) }) @@ -108,9 +108,9 @@ describe("Test that the object processing works correctly", () => { describe("check returning objects", () => { it("should handle an array of objects", async () => { - const json = [{a: 1},{a: 2}] + const json = [{ a: 1 }, { a: 2 }] const output = await processString("{{ testing }}", { - testing: json + testing: json, }) expect(output).toEqual(JSON.stringify(json)) }) @@ -164,9 +164,12 @@ describe("check manifest", () => { describe("check full stops that are safe", () => { it("should allow using an escaped full stop", async () => { const data = { - "c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI": { "persons.firstname": "1" } + "c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI": { + "persons.firstname": "1", + }, } - const template = "{{ [c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI].[persons.firstname] }}" + const template = + "{{ [c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI].[persons.firstname] }}" const output = await processString(template, data) expect(output).toEqual("1") }) @@ -195,7 +198,9 @@ describe("check that disabling escaping function works", () => { }) it("should work for two statements", () => { - expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual("{{{ name }}} welcome to {{{ platform }}}") + expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual( + "{{{ name }}} welcome to {{{ platform }}}" + ) }) it("shouldn't convert triple braces", () => { @@ -203,11 +208,15 @@ describe("check that disabling escaping function works", () => { }) it("should work with a combination", () => { - expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual("{{{ name }}} welcome to {{{ platform }}}") + expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual( + "{{{ name }}} welcome to {{{ platform }}}" + ) }) it("should work with multiple escaped", () => { - expect(disableEscaping("{{ name }} welcome to {{ name }}")).toEqual("{{{ name }}} welcome to {{{ name }}}") + expect(disableEscaping("{{ name }} welcome to {{ name }}")).toEqual( + "{{{ name }}} welcome to {{{ name }}}" + ) }) }) @@ -217,13 +226,20 @@ describe("check find hbs blocks function", () => { }) it("should find two", () => { - expect(findHBSBlocks("{{ hello }} there {{{ name }}}")).toEqual(["{{ hello }}", "{{{ name }}}"]) + expect(findHBSBlocks("{{ hello }} there {{{ name }}}")).toEqual([ + "{{ hello }}", + "{{{ name }}}", + ]) }) }) describe("should leave HBS blocks if not found using option", () => { it("should replace one, leave one", async () => { - const output = await processString("{{ a }}, {{ b }}", { b: 1 }, { onlyFound: true }) + const output = await processString( + "{{ a }}, {{ b }}", + { b: 1 }, + { onlyFound: true } + ) expect(output).toBe("{{ a }}, 1") }) }) diff --git a/packages/string-templates/test/escapes.spec.js b/packages/string-templates/test/escapes.spec.js index a14e78d2f2..d27ca64240 100644 --- a/packages/string-templates/test/escapes.spec.js +++ b/packages/string-templates/test/escapes.spec.js @@ -68,11 +68,11 @@ describe("attempt some complex problems", () => { describe("check behaviour with newlines", () => { const context = { binding: `Hello - there` + there`, } it("should escape new line to \\n with double brace", async () => { const hbs = JSON.stringify({ - body: "{{ binding }}" + body: "{{ binding }}", }) const output = await processString(hbs, context, { escapeNewlines: true }) expect(JSON.parse(output).body).toBe(context.binding) @@ -80,7 +80,7 @@ describe("check behaviour with newlines", () => { it("should work the same with triple brace", async () => { const hbs = JSON.stringify({ - body: "{{{ binding }}}" + body: "{{{ binding }}}", }) const output = await processString(hbs, context, { escapeNewlines: true }) expect(JSON.parse(output).body).toBe(context.binding) @@ -88,9 +88,12 @@ describe("check behaviour with newlines", () => { it("should still work with helpers disabled", async () => { const hbs = JSON.stringify({ - body: "{{ binding }}" + body: "{{ binding }}", + }) + const output = await processString(hbs, context, { + escapeNewlines: true, + noHelpers: true, }) - const output = await processString(hbs, context, { escapeNewlines: true, noHelpers: true }) expect(JSON.parse(output).body).toBe(context.binding) }) }) diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js index 63bd80db81..8a74cae526 100644 --- a/packages/string-templates/test/hbsToJs.spec.js +++ b/packages/string-templates/test/hbsToJs.spec.js @@ -1,6 +1,4 @@ -const { - convertToJS -} = require("../src/index.cjs") +const { convertToJS } = require("../src/index.cjs") function checkLines(response, lines) { const toCheck = response.split("\n") @@ -18,25 +16,19 @@ describe("Test that the string processing works correctly", () => { it("basic example with square brackets", () => { const response = convertToJS("{{ [query] }}") - checkLines(response, [ - "const var1 = $(\"[query]\");", - "return `${var1}`;", - ]) + checkLines(response, ['const var1 = $("[query]");', "return `${var1}`;"]) }) it("handle properties", () => { const response = convertToJS("{{ [query].id }}") - checkLines(response, [ - "const var1 = $(\"[query].id\");", - "return `${var1}`;", - ]) + checkLines(response, ['const var1 = $("[query].id");', "return `${var1}`;"]) }) it("should convert some basic HBS strings", () => { const response = convertToJS("Hello {{ name }}, welcome to {{ company }}!") checkLines(response, [ - "const var1 = $(\"name\");", - "const var2 = $(\"company\");", + 'const var1 = $("name");', + 'const var2 = $("company");', "return `Hello ${var1}, welcome to ${var2}`;", ]) }) @@ -44,7 +36,7 @@ describe("Test that the string processing works correctly", () => { it("should handle many square brackets in helpers", () => { const response = convertToJS("Hello {{ avg [user].[_id] [user].[_rev] }}") checkLines(response, [ - "const var1 = helpers.avg($(\"[user].[_id]\"), $(\"[user].[_rev]\"));", + 'const var1 = helpers.avg($("[user].[_id]"), $("[user].[_rev]"));', "return `Hello ${var1}`;", ]) }) @@ -61,7 +53,7 @@ describe("Test that the string processing works correctly", () => { const response = convertToJS("{{equalsLength '[1,2,3]' 3}}") checkLines(response, [ "const var1 = helpers.equalsLength('[1,2,3]', 3);", - "return `${var1}`;" + "return `${var1}`;", ]) }) @@ -84,23 +76,27 @@ describe("Test that the string processing works correctly", () => { it("should handle a helper block", () => { const response = convertToJS("This is the average: {{ avg array }}") checkLines(response, [ - "const var1 = helpers.avg($(\"array\"));", + 'const var1 = helpers.avg($("array"));', "return `This is the average: ${var1}`;", ]) }) it("should handle multi-variable helper", () => { - const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) }}") + const response = convertToJS( + "This is the average: {{ join ( avg val1 val2 val3 ) }}" + ) checkLines(response, [ - "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")));", + 'const var1 = helpers.join(helpers.avg($("val1"), $("val2"), $("val3")));', "return `This is the average: ${var1}`;", ]) }) it("should handle a complex statement", () => { - const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) val4 }}") + const response = convertToJS( + "This is the average: {{ join ( avg val1 val2 val3 ) val4 }}" + ) checkLines(response, [ - "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")), $(\"val4\"));", + 'const var1 = helpers.join(helpers.avg($("val1"), $("val2"), $("val3")), $("val4"));', "return `This is the average: ${var1}`;", ]) }) @@ -108,7 +104,7 @@ describe("Test that the string processing works correctly", () => { it("should handle square brackets", () => { const response = convertToJS("This is: {{ [val thing] }}") checkLines(response, [ - "const var1 = $(\"[val thing]\");", + 'const var1 = $("[val thing]");', "return `This is: ${var1}`;", ]) }) @@ -116,17 +112,19 @@ describe("Test that the string processing works correctly", () => { it("should handle square brackets with properties", () => { const response = convertToJS("{{ [user].[_id] }}") checkLines(response, [ - "const var1 = $(\"[user].[_id]\");", + 'const var1 = $("[user].[_id]");', "return `${var1}`;", ]) }) it("should handle multiple complex statements", () => { - const response = convertToJS("average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}") + const response = convertToJS( + "average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}" + ) checkLines(response, [ - "const var1 = helpers.avg(helpers.abs($(\"val1\")), $(\"val2\"));", + 'const var1 = helpers.avg(helpers.abs($("val1")), $("val2"));', "const var2 = helpers.add(1, 2);", "return `average: ${var1} add: ${var2}`;", ]) }) -}) \ No newline at end of file +}) diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js index a587ca60dd..c047947fbf 100644 --- a/packages/string-templates/test/helpers.spec.js +++ b/packages/string-templates/test/helpers.spec.js @@ -266,10 +266,7 @@ describe("test the string helpers", () => { }) it("should allow use of the ellipsis helper", async () => { - const output = await processString( - "{{ ellipsis \"adfasdfasdfasf\" 7 }}", - {}, - ) + const output = await processString('{{ ellipsis "adfasdfasdfasf" 7 }}', {}) expect(output).toBe("adfasdf…") }) }) diff --git a/packages/string-templates/test/javascript.spec.js b/packages/string-templates/test/javascript.spec.js index 4ec7c48b1e..bbc1cce246 100644 --- a/packages/string-templates/test/javascript.spec.js +++ b/packages/string-templates/test/javascript.spec.js @@ -140,4 +140,4 @@ describe("check JS helpers", () => { const output = processJS(`return helpers.toInt(4.3)`) expect(output).toBe(4) }) -}) \ No newline at end of file +}) From 7e037099b4c88607de0830d161c572519d208410 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Mon, 20 Nov 2023 15:05:58 +0000 Subject: [PATCH 119/150] Field help text (#12383) * wip * client finished * add to bbui input * linting * PR Feedback * remove test code * linting * PR feedback --------- Co-authored-by: Martin McKeaveney --- packages/bbui/src/Form/Checkbox.svelte | 3 +- packages/bbui/src/Form/Combobox.svelte | 3 +- packages/bbui/src/Form/Core/Checkbox.svelte | 2 - .../bbui/src/Form/Core/CheckboxGroup.svelte | 2 - packages/bbui/src/Form/Core/Combobox.svelte | 3 - packages/bbui/src/Form/Core/DatePicker.svelte | 13 ---- packages/bbui/src/Form/Core/Dropzone.svelte | 5 -- .../bbui/src/Form/Core/InputDropdown.svelte | 18 +---- .../bbui/src/Form/Core/Multiselect.svelte | 2 - packages/bbui/src/Form/Core/Picker.svelte | 12 ---- .../bbui/src/Form/Core/PickerDropdown.svelte | 8 +-- packages/bbui/src/Form/Core/RadioGroup.svelte | 2 - .../bbui/src/Form/Core/RichTextField.svelte | 17 +---- packages/bbui/src/Form/Core/Select.svelte | 2 - packages/bbui/src/Form/Core/Stepper.svelte | 12 ---- packages/bbui/src/Form/Core/TextArea.svelte | 12 ---- packages/bbui/src/Form/Core/TextField.svelte | 11 ---- packages/bbui/src/Form/DatePicker.svelte | 3 +- packages/bbui/src/Form/Dropzone.svelte | 3 +- packages/bbui/src/Form/EnvDropdown.svelte | 3 +- packages/bbui/src/Form/Field.svelte | 23 +++++++ packages/bbui/src/Form/File.svelte | 3 +- packages/bbui/src/Form/Input.svelte | 3 +- packages/bbui/src/Form/InputDropdown.svelte | 3 +- packages/bbui/src/Form/Multiselect.svelte | 3 +- packages/bbui/src/Form/PickerDropdown.svelte | 3 +- packages/bbui/src/Form/RadioGroup.svelte | 3 +- packages/bbui/src/Form/RichTextField.svelte | 3 +- packages/bbui/src/Form/Search.svelte | 3 +- packages/bbui/src/Form/Select.svelte | 3 +- packages/bbui/src/Form/Slider.svelte | 3 +- packages/bbui/src/Form/Stepper.svelte | 3 +- packages/bbui/src/Form/TextArea.svelte | 3 +- packages/bbui/src/Form/Toggle.svelte | 3 +- packages/client/manifest.json | 65 +++++++++++++++++++ .../app/forms/AttachmentField.svelte | 2 + .../components/app/forms/BooleanField.svelte | 2 + .../app/forms/CodeScannerField.svelte | 2 + .../components/app/forms/DateTimeField.svelte | 2 + .../src/components/app/forms/Field.svelte | 43 +++++++++++- .../src/components/app/forms/JSONField.svelte | 2 + .../components/app/forms/LongFormField.svelte | 2 + .../app/forms/MultiFieldSelect.svelte | 2 + .../components/app/forms/OptionsField.svelte | 2 + .../app/forms/RelationshipField.svelte | 2 + .../components/app/forms/StringField.svelte | 3 +- 46 files changed, 189 insertions(+), 138 deletions(-) diff --git a/packages/bbui/src/Form/Checkbox.svelte b/packages/bbui/src/Form/Checkbox.svelte index 6aa88f6dee..6e6cf0d8e8 100644 --- a/packages/bbui/src/Form/Checkbox.svelte +++ b/packages/bbui/src/Form/Checkbox.svelte @@ -10,6 +10,7 @@ export let disabled = false export let error = null export let size = "M" + export let helpText = null const dispatch = createEventDispatcher() const onChange = e => { @@ -18,6 +19,6 @@ } - + diff --git a/packages/bbui/src/Form/Combobox.svelte b/packages/bbui/src/Form/Combobox.svelte index 343af559cb..44854d949e 100644 --- a/packages/bbui/src/Form/Combobox.svelte +++ b/packages/bbui/src/Form/Combobox.svelte @@ -11,6 +11,7 @@ export let error = null export let placeholder = "Choose an option or type" export let options = [] + export let helpText = null export let getOptionLabel = option => extractProperty(option, "label") export let getOptionValue = option => extractProperty(option, "value") @@ -27,7 +28,7 @@ } - + option @@ -34,7 +33,6 @@