From eb04c89182884b260b3322106dd8829696bab391 Mon Sep 17 00:00:00 2001 From: Keith Ellis Date: Tue, 31 Oct 2023 16:34:02 -0400 Subject: [PATCH 001/112] 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 5f585a426dceb922e548b9f5cff43cb0d85b7288 Mon Sep 17 00:00:00 2001 From: kellis5137 Date: Thu, 2 Nov 2023 11:29:30 -0400 Subject: [PATCH 002/112] Update startup.ts to use simpler flag check --- packages/server/src/startup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts index fd07c5f530..82cb3502ef 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 && env.CLUSTER_MODE?.toLowerCase() !== "true") { + if (server && !env.CLUSTER_MODE) { console.log(`Budibase running on ${JSON.stringify(server.address())}`) env._set("PORT", server.address().port) } From 883ac0d008c432fdb36b6d4bc1222050bd8228bf Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 8 Nov 2023 16:27:20 +0000 Subject: [PATCH 003/112] Dedupe and improve logic around selecting available datasources for saving and duplicating rows --- .../actions/DuplicateRow.svelte | 65 +++------------ .../ButtonActionEditor/actions/SaveRow.svelte | 58 ++------------ .../ButtonActionEditor/actions/utils.js | 79 +++++++++++++++++++ 3 files changed, 97 insertions(+), 105 deletions(-) create mode 100644 packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte index 18711497ff..94364367a8 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte @@ -2,27 +2,20 @@ import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui" import { store, currentAsset } from "builderStore" import { tables, viewsV2 } from "stores/backend" - import { - getContextProviderComponents, - getSchemaForDatasourcePlus, - } from "builderStore/dataBinding" + import { getSchemaForDatasourcePlus } from "builderStore/dataBinding" import SaveFields from "./SaveFields.svelte" + import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils" export let parameters export let bindings = [] + export let nested - $: formComponents = getContextProviderComponents( - $currentAsset, - $store.selectedComponentId, - "form" - ) - $: schemaComponents = getContextProviderComponents( - $currentAsset, - $store.selectedComponentId, - "schema" - ) - $: providerOptions = getProviderOptions(formComponents, schemaComponents) - $: schemaFields = getSchemaFields($currentAsset, parameters?.tableId) + $: providerOptions = getDatasourceLikeProviders({ + asset: $currentAsset, + componentId: $store.selectedComponentId, + nested, + }) + $: schemaFields = getSchemaFields(parameters?.tableId) $: tableOptions = $tables.list.map(table => ({ label: table.name, resourceId: table._id, @@ -33,44 +26,8 @@ })) $: options = [...(tableOptions || []), ...(viewOptions || [])] - // Gets a context definition of a certain type from a component definition - const extractComponentContext = (component, contextType) => { - const def = store.actions.components.getDefinition(component?._component) - if (!def) { - return null - } - const contexts = Array.isArray(def.context) ? def.context : [def.context] - return contexts.find(context => context?.type === contextType) - } - - // Gets options for valid context keys which provide valid data to submit - const getProviderOptions = (formComponents, schemaComponents) => { - const formContexts = formComponents.map(component => ({ - component, - context: extractComponentContext(component, "form"), - })) - const schemaContexts = schemaComponents.map(component => ({ - component, - context: extractComponentContext(component, "schema"), - })) - const allContexts = formContexts.concat(schemaContexts) - - return allContexts.map(({ component, context }) => { - let runtimeBinding = component._id - if (context.suffix) { - runtimeBinding += `-${context.suffix}` - } - return { - label: component._instanceName, - value: runtimeBinding, - } - }) - } - - const getSchemaFields = (asset, tableId) => { - const { schema } = getSchemaForDatasourcePlus(tableId) - delete schema._id - delete schema._rev + const getSchemaFields = resourceId => { + const { schema } = getSchemaForDatasourcePlus(resourceId) return Object.values(schema || {}) } diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte index 27b6463ffa..9f70272d78 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte @@ -2,29 +2,19 @@ import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui" import { store, currentAsset } from "builderStore" import { tables, viewsV2 } from "stores/backend" - import { - getContextProviderComponents, - getSchemaForDatasourcePlus, - } from "builderStore/dataBinding" + import { getSchemaForDatasourcePlus } from "builderStore/dataBinding" import SaveFields from "./SaveFields.svelte" + import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils" export let parameters export let bindings = [] export let nested - $: formComponents = getContextProviderComponents( - $currentAsset, - $store.selectedComponentId, - "form", - { includeSelf: nested } - ) - $: schemaComponents = getContextProviderComponents( - $currentAsset, - $store.selectedComponentId, - "schema", - { includeSelf: nested } - ) - $: providerOptions = getProviderOptions(formComponents, schemaComponents) + $: providerOptions = getDatasourceLikeProviders({ + asset: $currentAsset, + componentId: $store.selectedComponentId, + nested, + }) $: schemaFields = getSchemaFields(parameters?.tableId) $: tableOptions = $tables.list.map(table => ({ label: table.name, @@ -36,40 +26,6 @@ })) $: options = [...(tableOptions || []), ...(viewOptions || [])] - // Gets a context definition of a certain type from a component definition - const extractComponentContext = (component, contextType) => { - const def = store.actions.components.getDefinition(component?._component) - if (!def) { - return null - } - const contexts = Array.isArray(def.context) ? def.context : [def.context] - return contexts.find(context => context?.type === contextType) - } - - // Gets options for valid context keys which provide valid data to submit - const getProviderOptions = (formComponents, schemaComponents) => { - const formContexts = formComponents.map(component => ({ - component, - context: extractComponentContext(component, "form"), - })) - const schemaContexts = schemaComponents.map(component => ({ - component, - context: extractComponentContext(component, "schema"), - })) - const allContexts = formContexts.concat(schemaContexts) - - return allContexts.map(({ component, context }) => { - let runtimeBinding = component._id - if (context.suffix) { - runtimeBinding += `-${context.suffix}` - } - return { - label: component._instanceName, - value: runtimeBinding, - } - }) - } - const getSchemaFields = resourceId => { const { schema } = getSchemaForDatasourcePlus(resourceId) return Object.values(schema || {}) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js new file mode 100644 index 0000000000..371671f455 --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js @@ -0,0 +1,79 @@ +import { getContextProviderComponents } from "builderStore/dataBinding" +import { store } from "builderStore" + +// Generates bindings for all components that provider "datasource like" +// contexts. This includes "form" contexts and "schema" contexts. This is used +// by various button actions as candidates for whole "row" objects. +// Some examples are saving rows or duplicating rows. +export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => { + // Get all form context providers + const formComponents = getContextProviderComponents( + asset, + componentId, + "form", + { includeSelf: nested } + ) + + // Get all schema context providers + const schemaComponents = getContextProviderComponents( + asset, + componentId, + "schema", + { includeSelf: nested } + ) + + // Generate contexts for all form providers + const formContexts = formComponents.map(component => ({ + component, + context: extractComponentContext(component, "form"), + })) + + // Generate contexts for all schema providers + const schemaContexts = schemaComponents.map(component => ({ + component, + context: extractComponentContext(component, "schema"), + })) + + // Check for duplicate contexts by the same component. In this case, attempt + // to label contexts with their suffixes + schemaContexts.forEach(schemaContext => { + // Check if we have a form context for this component + const id = schemaContext.component._id + const existing = formContexts.find(x => x.component._id === id) + if (existing) { + if (existing.context.suffix) { + existing.readableSuffix = ` (${existing.context.suffix})` + } + if (schemaContext.context.suffix) { + schemaContext.readableSuffix = ` (${schemaContext.context.suffix})` + } + } + }) + + // Generate bindings for all contexts + const allContexts = formContexts.concat(schemaContexts) + return allContexts.map(({ component, context, readableSuffix }) => { + let readableBinding = component._instanceName + let runtimeBinding = component._id + if (context.suffix) { + runtimeBinding += `-${context.suffix}` + } + if (readableSuffix) { + readableBinding += readableSuffix + } + return { + label: readableBinding, + value: runtimeBinding, + } + }) +} + +// Gets a context definition of a certain type from a component definition +const extractComponentContext = (component, contextType) => { + const def = store.actions.components.getDefinition(component?._component) + if (!def) { + return null + } + const contexts = Array.isArray(def.context) ? def.context : [def.context] + return contexts.find(context => context?.type === contextType) +} From 6b7e410f0d48ee6ba39bffce9db3ec14e3c5cb0a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Nov 2023 09:47:19 +0000 Subject: [PATCH 004/112] Update casing --- .../settings/controls/ButtonActionEditor/actions/utils.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js index 371671f455..aa076fdd3e 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js @@ -1,5 +1,6 @@ import { getContextProviderComponents } from "builderStore/dataBinding" import { store } from "builderStore" +import { capitalise } from "helpers" // Generates bindings for all components that provider "datasource like" // contexts. This includes "form" contexts and "schema" contexts. This is used @@ -42,10 +43,12 @@ export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => { const existing = formContexts.find(x => x.component._id === id) if (existing) { if (existing.context.suffix) { - existing.readableSuffix = ` (${existing.context.suffix})` + const suffix = capitalise(existing.context.suffix) + existing.readableSuffix = ` - ${suffix}` } if (schemaContext.context.suffix) { - schemaContext.readableSuffix = ` (${schemaContext.context.suffix})` + const suffix = capitalise(schemaContext.context.suffix) + schemaContext.readableSuffix = ` - ${suffix}` } } }) From 223a82f71746ada05e186a362f860b2906626b1c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Nov 2023 11:07:32 +0000 Subject: [PATCH 005/112] Ensure metadata is not null before registering datasources for automatic hot reloading --- .../client/src/components/context/Provider.svelte | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/context/Provider.svelte b/packages/client/src/components/context/Provider.svelte index 19a5c3a462..3fffaaf7fa 100644 --- a/packages/client/src/components/context/Provider.svelte +++ b/packages/client/src/components/context/Provider.svelte @@ -45,12 +45,13 @@ // Register any "refresh datasource" actions with a singleton store // so we can easily refresh data at all levels for any datasource if (type === ActionTypes.RefreshDatasource) { - const { dataSource } = metadata || {} - dataSourceStore.actions.registerDataSource( - dataSource, - instanceId, - callback - ) + if (metadata?.dataSource) { + dataSourceStore.actions.registerDataSource( + metadata.dataSource, + instanceId, + callback + ) + } } }) } From 1f3e56fdc152f6768fc26737b4b04f42471bfbcc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Nov 2023 11:10:52 +0000 Subject: [PATCH 006/112] Allow grids to provide a refresh datasource action --- .../src/components/app/GridBlock.svelte | 20 ++++++++++++++----- packages/client/src/sdk.js | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 801e1a4d0a..0b1c12524a 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -27,8 +27,12 @@ builderStore, notificationStore, enrichButtonActions, + ActionTypes, + createContextStore, } = getContext("sdk") + let grid + $: columnWhitelist = columns?.map(col => col.name) $: schemaOverrides = getSchemaOverrides(columns) $: enrichedButtons = enrichButtons(buttons) @@ -53,11 +57,16 @@ text: settings.text, type: settings.type, onClick: async row => { - // We add a fake context binding in here, which allows us to pretend - // that the grid provides a "schema" binding - that lets us use the - // clicked row in things like save row actions - const enrichedContext = { ...get(context), [get(component).id]: row } - const fn = enrichButtonActions(settings.onClick, enrichedContext) + // Create a fake, ephemeral context to run the buttons actions with + const id = get(component).id + const gridContext = createContextStore(context) + gridContext.actions.provideData(id, row) + gridContext.actions.provideAction( + id, + ActionTypes.RefreshDatasource, + () => grid?.getContext()?.rows.actions.refreshData() + ) + const fn = enrichButtonActions(settings.onClick, get(gridContext)) return await fn?.({ row }) }, })) @@ -69,6 +78,7 @@ class:in-builder={$builderStore.inBuilder} > Date: Thu, 9 Nov 2023 11:22:50 +0000 Subject: [PATCH 007/112] Update button actions to support suffixed actions from blocks --- .../builder/src/builderStore/dataBinding.js | 32 ++++++++++++++++--- .../actions/ChangeFormStep.svelte | 12 ++++--- .../actions/ClearForm.svelte | 12 ++++--- .../actions/RefreshDataProvider.svelte | 12 ++++--- .../actions/ScrollTo.svelte | 32 +++++++++++++------ .../actions/UpdateFieldValue.svelte | 32 +++++++++++++------ .../actions/ValidateForm.svelte | 12 ++++--- 7 files changed, 101 insertions(+), 43 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 8445bf9e6d..246590a22e 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -228,7 +228,12 @@ export const getContextProviderComponents = ( /** * Gets all data provider components above a component. */ -export const getActionProviderComponents = (asset, componentId, actionType) => { +export const getActionProviders = ( + asset, + componentId, + actionType, + options = { includeSelf: false } +) => { if (!asset || !componentId) { return [] } @@ -236,13 +241,30 @@ export const getActionProviderComponents = (asset, componentId, actionType) => { // Get the component tree leading up to this component, ignoring the component // itself const path = findComponentPath(asset.props, componentId) - path.pop() + if (!options?.includeSelf) { + path.pop() + } - // Filter by only data provider components - return path.filter(component => { + // Find matching contexts and generate bindings + let providers = [] + path.forEach(component => { const def = store.actions.components.getDefinition(component._component) - return def?.actions?.includes(actionType) + const actions = (def?.actions || []).map(action => { + return typeof action === "string" ? { type: action } : action + }) + const action = actions.find(x => x.type === actionType) + if (action) { + let runtimeBinding = component._id + if (action.suffix) { + runtimeBinding += `-${action.suffix}` + } + providers.push({ + readableBinding: component._instanceName, + runtimeBinding, + }) + } }) + return providers } /** diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte index 81a2119474..5905d240dc 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte @@ -1,17 +1,19 @@ @@ -17,8 +19,8 @@ x._instanceName} - getOptionValue={x => x._id} + getOptionLabel={x => x.readableBinding} + getOptionValue={x => x.runtimeBinding} /> diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte index 49a93d71dd..e73884495d 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte @@ -1,22 +1,36 @@
@@ -24,8 +38,8 @@ x._instanceName} - getOptionValue={x => x._id} + getOptionLabel={x => x.readableBinding} + getOptionValue={x => x.runtimeBinding} /> x._instanceName} - getOptionValue={x => x._id} + getOptionLabel={x => x.readableBinding} + getOptionValue={x => x.runtimeBinding} />
From 8d1bcfd8b529179b9061a0ba489659af3c0823b2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Nov 2023 12:38:31 +0000 Subject: [PATCH 008/112] Expose additional actions and context from blocks to utilise new capabilities --- packages/client/manifest.json | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 378d8c3493..806d1aff44 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -6106,6 +6106,24 @@ "defaultValue": "spectrum--medium" } ], + "actions": [ + { + "type": "ValidateForm", + "suffix": "form" + }, + { + "type": "ClearForm", + "suffix": "form" + }, + { + "type": "UpdateFieldValue", + "suffix": "form" + }, + { + "type": "ScrollTo", + "suffix": "form" + } + ], "context": [ { "type": "form", @@ -6361,7 +6379,8 @@ ], "context": { "type": "schema" - } + }, + "actions": ["RefreshDatasource"] }, "bbreferencefield": { "devComment": "As bb reference is only used for user subtype for now, we are using user for icon and labels", From 103e933df80ff27dae8c430a3a0c61edd361419b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 9 Nov 2023 12:38:40 +0000 Subject: [PATCH 009/112] Ensure button group component has default props --- packages/client/src/components/app/ButtonGroup.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/app/ButtonGroup.svelte b/packages/client/src/components/app/ButtonGroup.svelte index 87b0990701..4954704b1b 100644 --- a/packages/client/src/components/app/ButtonGroup.svelte +++ b/packages/client/src/components/app/ButtonGroup.svelte @@ -3,9 +3,9 @@ import Block from "../Block.svelte" export let buttons = [] - export let direction - export let hAlign - export let vAlign + export let direction = "row" + export let hAlign = "left" + export let vAlign = "top" export let gap = "S" From ab350057b62cc6d0d7e12a6f3bab72ea00b10f58 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 12:23:41 +0100 Subject: [PATCH 010/112] Add seachbox to sources (not functional) --- .../src/components/common/SearchBox.svelte | 162 ++++++++++++++++++ .../app/[application]/data/_layout.svelte | 10 +- 2 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 packages/builder/src/components/common/SearchBox.svelte diff --git a/packages/builder/src/components/common/SearchBox.svelte b/packages/builder/src/components/common/SearchBox.svelte new file mode 100644 index 0000000000..d37bcab2a0 --- /dev/null +++ b/packages/builder/src/components/common/SearchBox.svelte @@ -0,0 +1,162 @@ + + + + +
+ +
+ {title} +
+
+ +
+
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte index d89f09fc08..80f3f22497 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte @@ -4,6 +4,7 @@ import Panel from "components/design/Panel.svelte" import { isActive, redirect, goto, params } from "@roxi/routify" import { datasources } from "stores/backend" + import SearchBox from "components/common/SearchBox.svelte" $: { // If we ever don't have any data other than the users table, prompt the @@ -18,7 +19,10 @@
{#if !$isActive("./new")} - + + + + @@ -51,4 +55,8 @@ flex: 1 1 auto; z-index: 1; } + + .panel-title-content { + display: contents; + } From 04f67f3199a3511fac67b291fa63218bdd008dab Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 9 Nov 2023 12:53:47 +0100 Subject: [PATCH 011/112] 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 018/112] 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 019/112] 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 023/112] 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 024/112] 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 026/112] 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 027/112] 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 028/112] 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 029/112] 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 030/112] 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 031/112] 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 032/112] 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 033/112] 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 034/112] 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 035/112] 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 036/112] Add basic test --- .../tests/datasourceUtils.spec.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js new file mode 100644 index 0000000000..aabe9a48cc --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js @@ -0,0 +1,15 @@ +import { enrichDatasources } from "../datasourceUtils" + +describe("datasourceUtils", () => { + describe("enrichDatasources", () => { + it.each([ + ["undefined", undefined], + ["undefined list", {}], + ["empty list", { list: [] }], + ])("%s datasources will return an empty list", datasources => { + const result = enrichDatasources(datasources) + + expect(result).toEqual([]) + }) + }) +}) From 4a1a87d12d2ee44fde3329a0086e45c988e9a26b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 13:05:01 +0100 Subject: [PATCH 037/112] 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 038/112] 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 039/112] 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 040/112] 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 041/112] 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 042/112] 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 043/112] 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 044/112] 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 045/112] 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 046/112] 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 047/112] 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 048/112] 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 90ae387fbd9d149fda02cadf6524141ca0603f1f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 15:46:16 +0100 Subject: [PATCH 049/112] Fix import/export --- packages/frontend-core/src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.js index f51be616f8..37951dc776 100644 --- a/packages/frontend-core/src/index.js +++ b/packages/frontend-core/src/index.js @@ -1,6 +1,5 @@ export { createAPIClient } from "./api" export { fetchData } from "./fetch" -export { Utils } from "./utils" export * as Constants from "./constants" export * from "./stores" export * from "./utils" From 0874489585a15032dd58e4c76db142cf3d96831b Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 15:46:24 +0100 Subject: [PATCH 050/112] Configure import/export --- .eslintrc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index f6f03c6523..c921f88410 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -57,7 +57,8 @@ "destructuredArrayIgnorePattern": "^_" } ], - "import/no-relative-packages": "error" + "import/no-relative-packages": "error", + "import/export": "error" }, "globals": { "GeolocationPositionError": true From 4d27ff1dc099848a3901a5c5f2a6192863c87fe3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 20 Nov 2023 16:15:43 +0100 Subject: [PATCH 051/112] eslint import/no-duplicates --- .eslintrc.json | 3 ++- packages/backend-core/src/configs/configs.ts | 7 +++---- packages/backend-core/src/installation.ts | 3 +-- packages/backend-core/src/security/roles.ts | 3 +-- packages/backend-core/src/users/db.ts | 3 +-- packages/bbui/src/Drawer/Drawer.svelte | 5 ++--- packages/bbui/src/Popover/Popover.svelte | 5 ++--- packages/builder/src/builderStore/index.js | 3 +-- packages/builder/src/builderStore/websocket.js | 6 ++---- .../AutomationBuilder/FlowChart/FlowChart.svelte | 5 ++--- .../AutomationPanel/CreateAutomationModal.svelte | 5 ++--- .../AutomationPanel/UpdateAutomationModal.svelte | 5 ++--- .../automation/SetupPanel/AutomationBlockSetup.svelte | 5 ++--- .../automation/Shared/CreateWebhookModal.svelte | 5 ++--- .../backend/DataTable/modals/CreateEditUser.svelte | 8 +++----- .../backend/DataTable/modals/EditRoles.svelte | 5 ++--- .../modals/UpdateDatasourceModal.svelte | 5 ++--- .../popovers/EditDatasourcePopover.svelte | 5 ++--- .../backend/Datasources/CreateEditRelationship.svelte | 10 ++++------ .../TableNavigator/modals/CreateTableModal.svelte | 8 +++----- .../components/common/bindings/BindingPanel.svelte | 10 ++++------ .../ButtonActionEditor/ButtonActionEditor.svelte | 5 ++--- .../controls/DataSourceSelect/DataSourceSelect.svelte | 5 ++--- .../controls/DraggableList/DraggableList.svelte | 5 ++--- .../settings/controls/EditComponentPopover.svelte | 5 ++--- .../FieldConfiguration/FieldConfiguration.svelte | 5 ++--- .../builder/src/components/settings/ThemeModal.svelte | 5 ++--- packages/builder/src/pages/builder/admin/index.svelte | 5 ++--- .../app/[application]/automation/_layout.svelte | 5 ++--- .../CreateExternalDatasourceModal/index.svelte | 5 ++--- .../Authentication/RestAuthenticationBuilder.svelte | 5 ++--- .../Component/ComponentSettingsPanel.svelte | 5 ++--- .../_components/Screen/GeneralPanel.svelte | 5 ++--- .../_components/ComponentList/ComponentTree.svelte | 11 +++++------ .../[screenId]/_components/ComponentList/index.svelte | 5 ++--- packages/builder/src/pages/builder/auth/forgot.svelte | 5 ++--- packages/builder/src/pages/builder/auth/login.svelte | 5 ++--- packages/builder/src/pages/builder/auth/reset.svelte | 5 ++--- .../builder/src/pages/builder/invite/index.svelte | 5 ++--- .../users/_components/AppRoleTableRenderer.svelte | 5 ++--- packages/cli/src/plugins/index.ts | 3 +-- packages/cli/src/utils.ts | 3 +-- .../client/src/components/app/DateRangePicker.svelte | 5 ++--- .../src/components/app/forms/CodeScanner.svelte | 5 ++--- packages/client/src/components/app/table/Table.svelte | 5 ++--- .../src/components/grid/cells/AttachmentCell.svelte | 5 ++--- .../src/components/grid/cells/GutterCell.svelte | 5 ++--- .../src/components/grid/layout/NewRow.svelte | 5 ++--- packages/pro | 2 +- packages/server/src/api/controllers/analytics.ts | 3 +-- packages/server/src/api/controllers/automation.ts | 3 +-- packages/server/src/api/controllers/component.ts | 3 +-- packages/server/src/api/controllers/dev.ts | 3 +-- packages/server/src/api/controllers/table/utils.ts | 10 ++++------ .../src/api/routes/tests/utilities/TestFunctions.ts | 3 +-- packages/server/src/automations/triggers.ts | 3 +-- packages/server/src/integrations/base/sql.ts | 3 +-- packages/server/src/koa.ts | 3 +-- .../src/migrations/functions/backfill/global.ts | 3 +-- packages/server/src/sdk/app/backups/imports.ts | 11 +++++------ packages/server/src/threads/query.ts | 3 +-- .../server/src/utilities/fileSystem/filesystem.ts | 6 ++---- packages/server/src/utilities/rowProcessor/index.ts | 3 +-- packages/server/src/websockets/websocket.ts | 3 +-- packages/worker/src/index.ts | 3 +-- .../src/account-api/api/AccountInternalAPIClient.ts | 3 +-- qa-core/src/public-api/api/apis/RowAPI.ts | 3 +-- qa-core/src/types/appPackage.ts | 3 +-- 68 files changed, 128 insertions(+), 200 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index c921f88410..a0111a6322 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -58,7 +58,8 @@ } ], "import/no-relative-packages": "error", - "import/export": "error" + "import/export": "error", + "import/no-duplicates": "error" }, "globals": { "GeolocationPositionError": true diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 0c83ed005d..0d189e3f7d 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -17,7 +17,6 @@ import { DocumentType, SEPARATOR } from "../constants" import { CacheKey, TTL, withCache } from "../cache" import * as context from "../context" import env from "../environment" -import environment from "../environment" // UTILS @@ -181,10 +180,10 @@ export async function getGoogleDatasourceConfig(): Promise< } export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined { - if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) { + if (env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET) { return { - clientID: environment.GOOGLE_CLIENT_ID!, - clientSecret: environment.GOOGLE_CLIENT_SECRET!, + clientID: env.GOOGLE_CLIENT_ID!, + clientSecret: env.GOOGLE_CLIENT_SECRET!, activated: true, } } diff --git a/packages/backend-core/src/installation.ts b/packages/backend-core/src/installation.ts index 17eda2004d..6b79b91a37 100644 --- a/packages/backend-core/src/installation.ts +++ b/packages/backend-core/src/installation.ts @@ -1,7 +1,6 @@ import { newid } from "./utils" import * as events from "./events" -import { StaticDatabases } from "./db" -import { doWithDB } from "./db" +import { StaticDatabases , doWithDB } from "./db" import { Installation, IdentityType, Database } from "@budibase/types" import * as context from "./context" import semver from "semver" diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts index 0d33031de5..f1dc0c7cfd 100644 --- a/packages/backend-core/src/security/roles.ts +++ b/packages/backend-core/src/security/roles.ts @@ -1,7 +1,6 @@ import { BuiltinPermissionID, PermissionLevel } from "./permissions" -import { prefixRoleID, getRoleParams, DocumentType, SEPARATOR } from "../db" +import { prefixRoleID, getRoleParams, DocumentType, SEPARATOR , doWithDB } from "../db" import { getAppDB } from "../context" -import { doWithDB } from "../db" import { Screen, Role as RoleDoc } from "@budibase/types" import cloneDeep from "lodash/fp/cloneDeep" diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts index bd85097bbd..152ff89fdb 100644 --- a/packages/backend-core/src/users/db.ts +++ b/packages/backend-core/src/users/db.ts @@ -1,6 +1,5 @@ import env from "../environment" import * as eventHelpers from "./events" -import * as accounts from "../accounts" import * as accountSdk from "../accounts" import * as cache from "../cache" import { getGlobalDB, getIdentity, getTenantId } from "../context" @@ -467,7 +466,7 @@ export class UserDB { if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) { // root account holder can't be deleted from inside budibase const email = dbUser.email - const account = await accounts.getAccount(email) + const account = await accountSdk.getAccount(email) if (account) { if (dbUser.userId === getIdentity()!._id) { throw new HTTPError('Please visit "Account" to delete this user', 400) diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte index 421d12615f..e2060c9a09 100644 --- a/packages/bbui/src/Drawer/Drawer.svelte +++ b/packages/bbui/src/Drawer/Drawer.svelte @@ -3,9 +3,8 @@ import Button from "../Button/Button.svelte" import Body from "../Typography/Body.svelte" import Heading from "../Typography/Heading.svelte" - import { setContext } from "svelte" - import { createEventDispatcher } from "svelte" - import { generate } from "shortid" + import { setContext , createEventDispatcher } from "svelte" + import { generate } from "shortid" export let title export let fillWidth diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 4c4b818440..58cd92ddaa 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -1,12 +1,11 @@ diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte index ede9d85808..c758f5c7e5 100644 --- a/packages/builder/src/pages/builder/admin/index.svelte +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -1,11 +1,10 @@ diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte index c758f5c7e5..9723c6b621 100644 --- a/packages/builder/src/pages/builder/admin/index.svelte +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -1,10 +1,18 @@ diff --git a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte index 8b13135b33..d4ecda246d 100644 --- a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte +++ b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte @@ -4,6 +4,7 @@ import Icon from "../Icon/Icon.svelte" import Popover from "../Popover/Popover.svelte" import { onMount } from "svelte" + const flipDurationMs = 150 export let constraints diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte index dab88b05bc..40d0af0d6e 100644 --- a/packages/bbui/src/SideNavigation/Item.svelte +++ b/packages/bbui/src/SideNavigation/Item.svelte @@ -1,7 +1,9 @@ diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte index 637454dbca..303397054a 100644 --- a/packages/bbui/src/Table/ArrayRenderer.svelte +++ b/packages/bbui/src/Table/ArrayRenderer.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte index 8bf9499b98..c0fb251dc0 100644 --- a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte +++ b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte index f284e24645..91b70e0c45 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte @@ -2,6 +2,7 @@ import { Select, Body } from "@budibase/bbui" import { onMount } from "svelte" import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte" + export let parameters export let bindings diff --git a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js index 5221ae4ef4..a1903695f4 100644 --- a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js +++ b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js @@ -1,2 +1,3 @@ import FlatButtonGroup from "./FlatButtonGroup.svelte" + export default FlatButtonGroup diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte index 3d74e3f6b6..f8a14a6dd1 100644 --- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte +++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte index f0baf88ffe..cecec0ab53 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte index e73e6d7841..169dfa7934 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte index dac0aaed6e..0db89cfe74 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte index fd289163b4..7dd42ad6a6 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte index b6c0262b47..e1867092c0 100644 --- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/pages/builder/portal/index.svelte b/packages/builder/src/pages/builder/portal/index.svelte index 5426d52fae..8651ae5e08 100644 --- a/packages/builder/src/pages/builder/portal/index.svelte +++ b/packages/builder/src/pages/builder/portal/index.svelte @@ -1,4 +1,5 @@ diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte index 842fe01be8..09ead3e410 100644 --- a/packages/builder/src/pages/builder/portal/settings/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/index.svelte @@ -1,4 +1,5 @@ diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte index 2adc0c82ae..c701f582a2 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/pages/builder/portal/users/index.svelte b/packages/builder/src/pages/builder/portal/users/index.svelte index 4dbb81f7c6..b876b2866c 100644 --- a/packages/builder/src/pages/builder/portal/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/index.svelte @@ -1,4 +1,5 @@ diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte index 7e63045edd..402344dedd 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte @@ -1,5 +1,6 @@ diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 7259e7e402..7d14fd0e87 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -20,7 +20,12 @@ import analytics, { Events, EventSource } from "analytics" import { API } from "api" import { apps } from "stores/portal" - import { deploymentStore, store, isOnlyUser } from "builderStore" + import { + deploymentStore, + store, + isOnlyUser, + sortedScreens, + } from "builderStore" import TourWrap from "components/portal/onboarding/TourWrap.svelte" import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js" import { goto } from "@roxi/routify" @@ -48,7 +53,7 @@ $store.upgradableVersion && $store.version && $store.upgradableVersion !== $store.version - $: canPublish = !publishing && loaded + $: canPublish = !publishing && loaded && $sortedScreens.length > 0 $: lastDeployed = getLastDeployedString($deploymentStore) const initialiseApp = async () => { @@ -175,7 +180,12 @@
- + Preview
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte new file mode 100644 index 0000000000..1366484495 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte index 1458b69aec..e87c1104dd 100644 --- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte @@ -1,8 +1,10 @@
@@ -45,6 +59,7 @@ {/if} window.open(iframeUrl, "_blank")} @@ -52,7 +67,19 @@ Fullscreen
-