From 036e355c9bd37eedd1c83547baae671473bd9ba2 Mon Sep 17 00:00:00 2001 From: gitstart Date: Thu, 18 May 2023 14:05:05 +0000 Subject: [PATCH 001/343] disable duplicate for webhook triggers automation Co-authored-by: Moshood Abidemi --- .../AutomationPanel/EditAutomationPopover.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte index 0ce9c781ac..09b9cf07db 100644 --- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte @@ -32,7 +32,12 @@
- Duplicate + Duplicate Edit Delete From 410d8700e4555c414b50f19b0d626758e030ce2b Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Mon, 5 Jun 2023 18:42:44 +0100 Subject: [PATCH 002/343] Add more tests for user settings --- qa-core/src/internal-api/api/apis/SelfAPI.ts | 18 +++++++++++++++--- .../tests/users/userManagement.spec.ts | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/qa-core/src/internal-api/api/apis/SelfAPI.ts b/qa-core/src/internal-api/api/apis/SelfAPI.ts index cd162053a1..022a438249 100644 --- a/qa-core/src/internal-api/api/apis/SelfAPI.ts +++ b/qa-core/src/internal-api/api/apis/SelfAPI.ts @@ -14,10 +14,11 @@ export default class SelfAPI extends BaseAPI { return [response, json] } - async changeSelfPassword(body: Partial): Promise<[Response, User]> { + async changeSelfPassword(): Promise<[Response, User]> { + const body = { + password: "newPassword", + } const [response, json] = await this.post(`/global/self`, body) - expect(json._id).toEqual(body._id) - expect(json._rev).not.toEqual(body._rev) return [response, json] } @@ -26,4 +27,15 @@ export default class SelfAPI extends BaseAPI { expect(json).toHaveProperty("apiKey") return json } + + async changeUserInfo(body: Partial): Promise<[Response, User]> { + const [response, json] = await this.post(`/global/self`, body) + return [response, json] + } + + async generateApiKey(): Promise<[Response, ApiKeyResponse]> { + const [response, json] = await this.post(`/global/self/api_key`) + expect(json).toHaveProperty("apiKey") + return [response, json] + } } diff --git a/qa-core/src/internal-api/tests/users/userManagement.spec.ts b/qa-core/src/internal-api/tests/users/userManagement.spec.ts index 28096c08c9..d1bada05c0 100644 --- a/qa-core/src/internal-api/tests/users/userManagement.spec.ts +++ b/qa-core/src/internal-api/tests/users/userManagement.spec.ts @@ -87,4 +87,20 @@ describe("Internal API - User Management & Permissions", () => { expect(changedUserInfoJson.builder?.global).toBeDefined() expect(changedUserInfoJson.builder?.global).toEqual(true) }) + + it("Set First and Last Name", async () => { + const body: Partial = { + firstName: "newFirstName", + lastName: "newLastName", + } + await config.api.self.changeUserInfo(body) + }) + + it("Generate API key", async () => { + await config.api.self.generateApiKey() + }) + + it("Change Password", async () => { + await config.api.self.changeSelfPassword() + }) }) From f37c49e8afdbbd3c7df05626d22168d7837560e3 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:16:09 +0100 Subject: [PATCH 003/343] Initial commit --- .../src/components/start/AppRow.svelte | 2 +- .../builder/app/[application]/_layout.svelte | 78 ++++------- .../automate/[automationId]/_layout.svelte | 15 -- .../automate/[automationId]/index.svelte | 5 - .../app/[application]/automate/_layout.svelte | 131 ------------------ .../app/[application]/automate/index.svelte | 10 -- .../pages/builder/portal/apps/index.svelte | 5 +- 7 files changed, 31 insertions(+), 215 deletions(-) delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/index.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/index.svelte diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 142c5c6e31..50e6b8466a 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -22,7 +22,7 @@ } const goToOverview = () => { - $goto(`../overview/${app.devId}`) + $goto(`../../app/${app.devId}/settings`) } diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index f13aa3dab6..d10657bdbe 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -12,6 +12,7 @@ Heading, Modal, notifications, + Button, } from "@budibase/bbui" import AppActions from "components/deploy/AppActions.svelte" import { API } from "api" @@ -144,53 +145,14 @@
{#if $store.initialised}
- -
- -
- $goto("../../portal/apps")}> - Exit to portal - - $goto(`../../portal/overview/${application}`)} - > - Overview - - - $goto(`../../portal/overview/${application}/access`)} - > - Access - - - $goto(`../../portal/overview/${application}/automation-history`)} - > - Automation history - - - $goto(`../../portal/overview/${application}/backups`)} - > - Backups - - - - $goto(`../../portal/overview/${application}/name-and-url`)} - > - Name and URL - - - $goto(`../../portal/overview/${application}/version`)} - > - Version - - - {$store.name} -
-
+ + $goto("../../portal/apps")} + /> + {#if $store.hasLock} {#each $layout.children as { path, title }} @@ -212,6 +174,9 @@
{/if}
+
+ {$store.name} +
@@ -236,6 +201,13 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte deleted file mode 100644 index ea2c853139..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 8b8451f036..f2ea7b3896 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -100,7 +100,10 @@ const params = new URLSearchParams({ open: "error", }) - $goto(`../overview/${appId}/automation-history?${params.toString()}`) + $goto( + `/builder/app/${appId}/settings/automation-history?${params.toString()}` + ) + // $goto(`../overview/${appId}/automation-history?${params.toString()}`) } const errorCount = errors => { From 05851f6b19ad819a9c88b6a43ae8884ba0d18b61 Mon Sep 17 00:00:00 2001 From: gitstart Date: Tue, 6 Jun 2023 15:18:15 +0000 Subject: [PATCH 004/343] Fix CSV encoding issue Co-authored-by: Benjamin Mayanja --- .../components/backend/DataTable/modals/ExportModal.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte index 6cefe244bf..95586a384b 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte @@ -130,7 +130,10 @@ notifications.error("Export Failed") } if (response) { - download(response, `export.${exportFormat}`) + download( + new Blob([response], { type: "text/plain" }), + `export.${exportFormat}` + ) notifications.success("Export Successful") } } else { From e1b63842e5e50be106371fd165b704d2a177f9e0 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:24:30 +0100 Subject: [PATCH 005/343] Adding in relocated screen components --- .../automation/[automationId]/_layout.svelte | 15 + .../automation/[automationId]/index.svelte | 5 + .../[application]/automation/_layout.svelte | 131 +++++++ .../app/[application]/automation/index.svelte | 10 + .../app/[application]/settings/_layout.svelte | 74 ++++ .../_components/HistoryDetailsPanel.svelte | 82 +++++ .../_components/StatusRenderer.svelte | 27 ++ .../settings/automation-history/index.svelte | 262 ++++++++++++++ .../_components/ActionsRenderer.svelte | 87 +++++ .../_components/AppSizeRenderer.svelte | 41 +++ .../_components/CreateRestoreModal.svelte | 27 ++ .../_components/DatasourceRenderer.svelte | 21 ++ .../backups/_components/StatusRenderer.svelte | 15 + .../_components/TimeAgoRenderer.svelte | 10 + .../backups/_components/TypeRenderer.svelte | 36 ++ .../backups/_components/UserRenderer.svelte | 18 + .../settings/backups/index.svelte | 340 ++++++++++++++++++ .../app/[application]/settings/embed.svelte | 23 ++ .../app/[application]/settings/index.svelte | 4 + .../settings/name-and-url.svelte | 79 ++++ .../app/[application]/settings/version.svelte | 39 ++ 21 files changed, 1346 insertions(+) create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/AppSizeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/embed.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/version.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte new file mode 100644 index 0000000000..3be71a1bbe --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte @@ -0,0 +1,15 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte new file mode 100644 index 0000000000..1a15ed48c6 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte new file mode 100644 index 0000000000..79ca5df168 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte @@ -0,0 +1,131 @@ + + + +
+ +
+ {#if $automationStore.automations?.length} + + {:else} +
+
+ + + + + You have no automations + Let's fix that. Call the bots! + + +
+
+ {/if} +
+ + {#if $automationStore.showTestPanel} +
+ +
+ {/if} + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte new file mode 100644 index 0000000000..ea2c853139 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte @@ -0,0 +1,10 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte new file mode 100644 index 0000000000..3c0299d50a --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -0,0 +1,74 @@ + + + +
+ + + + + + + + + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte new file mode 100644 index 0000000000..5b9c925130 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte @@ -0,0 +1,82 @@ + + +{#if history} + +
+ + +
+ + {history.automationName} + + + {#if history.status === STOPPED_ERROR} +
+ +
+ {/if} + {#if exists} +
+ +
+ {/if} + {#key history} +
+ +
+ {/key} + +{:else} + No details found +{/if} + + 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 new file mode 100644 index 0000000000..f041faa349 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte @@ -0,0 +1,27 @@ + + + + {info.message} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte new file mode 100644 index 0000000000..c1c6be997b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte @@ -0,0 +1,262 @@ + + + + + Automation History + View the automations your app has executed + + + +
+
+
+ +
+
+ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte new file mode 100644 index 0000000000..198339dae9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte @@ -0,0 +1,21 @@ + + +
+ {#if value != null} + +
{value || 0}
+ {/if} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte new file mode 100644 index 0000000000..3b3cce731d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte @@ -0,0 +1,15 @@ + + + + {status} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte new file mode 100644 index 0000000000..fd67b4010b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte @@ -0,0 +1,10 @@ + + +{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte new file mode 100644 index 0000000000..86ad0f3d4e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte @@ -0,0 +1,36 @@ + + +
+ {printTrigger(trigger)} + {type} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte new file mode 100644 index 0000000000..399877a801 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte @@ -0,0 +1,18 @@ + + +
+ +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte new file mode 100644 index 0000000000..1d612117e2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte @@ -0,0 +1,340 @@ + + + + +
+ Backups + {#if !$licensing.backupsEnabled} + + Premium + + {/if} +
+ Back up your apps and restore them to their previous state + + + + {#if !$licensing.backupsEnabled} + {#if !$auth.accountPortalAccess && $admin.cloud} + Contact your account holder to upgrade your plan. + {/if} +
+ {#if $auth.accountPortalAccess} + + {/if} + +
+ {:else if !backupData?.length && !loading && !filterOpt && !startDate} +
+ + BackupsDefault + + You have no backups yet + You can manually back up your app any time + +
+ +
+ +
+ {:else} + +
+
+
+ ($validation.touched.name = true)} - on:change={nameToUrl($values.name)} - label="Name" - placeholder={defaultAppName} - /> - - ($validation.touched.url = true)} - on:change={tidyUrl($values.url)} - label="URL" - placeholder={$values.url - ? $values.url - : `/${resolveAppUrl(template, $values.name)}`} - /> - {#if $values.url && $values.url !== "" && !$validation.errors.url} -
- {appUrl} -
+ {#if currentStep === Step.CONFIG} + {#if template && !template?.fromFile} + {/if} - + {#if template?.fromFile} + { + $values.file = e.detail?.[0] + $validation.touched.file = true + }} + /> + {/if} + ($validation.touched.name = true)} + on:change={nameToUrl($values.name)} + label="Name" + placeholder={defaultAppName} + /> + + ($validation.touched.url = true)} + on:change={tidyUrl($values.url)} + label="URL" + placeholder={$values.url + ? $values.url + : `/${resolveAppUrl(template, $values.name)}`} + /> + {#if $values.url && $values.url !== "" && !$validation.errors.url} +
+ {appUrl} +
+ {/if} + + {/if} + {#if currentStep === Step.SET_PASSWORD} + ($encryptionValidation.touched.encryptionPassword = true)} + error={$encryptionValidation.touched.encryptionPassword && + $encryptionValidation.errors.encryptionPassword} + /> + {/if} diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index e33cb65940..e6550fa5a5 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -232,7 +232,7 @@ border-bottom: 2px solid var(--spectrum-global-color-gray-200); padding: var(--cell-padding); gap: var(--cell-spacing); - background: var(--background); + background: var(--spectrum-global-color-gray-100); z-index: 2; } .controls-left, diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 85b430f79b..4581e37746 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -141,6 +141,17 @@ }) + +{#if !visible} +
dispatch("add-row-inline")} + transition:fade|local={{ duration: 130 }} + > + +
+{/if} + {#if visible}
+ /* New row FAB */ + .new-row-fab { + position: absolute; + top: var(--default-row-height); + left: calc(var(--gutter-width) / 2); + transform: translateX(8px) translateY(-50%); + background: var(--cell-background); + padding: 4px; + border-radius: 50%; + border: var(--cell-border); + z-index: 10; + } + .new-row-fab:hover { + background: var(--cell-background-hover); + cursor: pointer; + } + .container { position: absolute; top: var(--default-row-height); From f56bd3ad13257fbede01e1a1d9004941c526da33 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 13 Jun 2023 17:19:12 +0100 Subject: [PATCH 020/343] Fix grid loading overlay color in client apps --- packages/frontend-core/src/components/grid/layout/Grid.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index e6550fa5a5..c4828e2791 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -268,7 +268,7 @@ left: 0; width: 100%; height: 100%; - background: var(--background); + background: var(--spectrum-global-color-gray-100); opacity: 0.6; } From 9991fd9558bbb877525ed8fe69ffce6120dfaca0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:09:59 +0100 Subject: [PATCH 021/343] Add grid block setting for striping row colours --- packages/client/manifest.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 883d6fa0a6..327b05a320 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5261,6 +5261,12 @@ "label": "Delete rows", "key": "allowDeleteRows", "defaultValue": true + }, + { + "type": "boolean", + "label": "Stripe rows", + "key": "stripeRows", + "defaultValue": false } ] } From ed9065aae3c76b33706d62fc84054aef7f9577e6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:10:09 +0100 Subject: [PATCH 022/343] Hide add row FAB when selecting rows --- packages/client/src/components/app/GridBlock.svelte | 8 +++++--- .../components/grid/controls/BulkDeleteHandler.svelte | 10 ++-------- .../src/components/grid/layout/Grid.svelte | 2 ++ .../src/components/grid/layout/NewRow.svelte | 7 +++++-- .../src/components/grid/layout/StickyColumn.svelte | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 7e69fcdcea..6fe436c0e2 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -5,9 +5,10 @@ import { Grid } from "@budibase/frontend-core" export let table - export let allowAddRows - export let allowEditRows - export let allowDeleteRows + export let allowAddRows = true + export let allowEditRows = true + export let allowDeleteRows = true + export let stripeRows = false const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") @@ -23,6 +24,7 @@ {allowAddRows} {allowEditRows} {allowDeleteRows} + {stripeRows} showControls={false} allowExpandRows={false} allowSchemaChanges={false} diff --git a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte index f87b529390..3218ef9ffe 100644 --- a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte +++ b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte @@ -6,15 +6,9 @@ let modal - $: selectedRowCount = Object.values($selectedRows).filter(x => !!x).length + $: selectedRowCount = Object.values($selectedRows).length $: rowsToDelete = Object.entries($selectedRows) - .map(entry => { - if (entry[1] === true) { - return $rows.find(x => x._id === entry[0]) - } else { - return null - } - }) + .map(entry => $rows.find(x => x._id === entry[0])) .filter(x => x != null) // Deletion callback when confirmed diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index c4828e2791..8cf5803f23 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -57,6 +57,7 @@ allowEditRows, allowDeleteRows, stripeRows, + showControls, }) // Build up context @@ -91,6 +92,7 @@ allowEditRows, allowDeleteRows, stripeRows, + showControls, }) // Set context for children to consume diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 4581e37746..06e4f0bfd6 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -26,6 +26,8 @@ maxScrollTop, rowVerticalInversionIndex, columnHorizontalInversionIndex, + config, + selectedRows, } = getContext("grid") let visible = false @@ -37,6 +39,7 @@ $: width = GutterWidth + ($stickyColumn?.width || 0) $: $tableId, (visible = false) $: invertY = shouldInvertY(offset, $rowVerticalInversionIndex, $renderedRows) + $: selectedRowCount = Object.values($selectedRows).length const shouldInvertY = (offset, inversionIndex, rows) => { if (offset === 0) { @@ -142,7 +145,7 @@ -{#if !visible} +{#if !visible && !$config.showControls && !selectedRowCount}
dispatch("add-row-inline")} @@ -243,7 +246,7 @@ position: absolute; top: var(--default-row-height); left: calc(var(--gutter-width) / 2); - transform: translateX(8px) translateY(-50%); + transform: translateX(6px) translateY(-50%); background: var(--cell-background); padding: 4px; border-radius: 50%; diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 801772ed51..f8a65faadb 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -26,7 +26,7 @@ } = getContext("grid") $: rowCount = $rows.length - $: selectedRowCount = Object.values($selectedRows).filter(x => !!x).length + $: selectedRowCount = Object.values($selectedRows).length $: width = GutterWidth + ($stickyColumn?.width || 0) const selectAll = () => { From 328336463c1c47955bc37104e965737f783d08c3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:19:11 +0100 Subject: [PATCH 023/343] Standardise usage of CSS variables to work inside client and builder --- .../grid/cells/AttachmentCell.svelte | 2 +- .../components/grid/cells/HeaderCell.svelte | 2 +- .../components/grid/cells/OptionsCell.svelte | 2 +- .../grid/cells/RelationshipCell.svelte | 2 +- .../src/components/grid/layout/Grid.svelte | 28 ++++++++++--------- .../components/grid/layout/HeaderRow.svelte | 4 +-- .../grid/layout/StickyColumn.svelte | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte index 4d830723c2..c054c57498 100644 --- a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte @@ -138,7 +138,7 @@ top: 100%; left: 0; width: 320px; - background: var(--background); + background: var(--grid-background-alt); border: var(--cell-border); padding: var(--cell-padding); box-shadow: 0 0 20px -4px rgba(0, 0, 0, 0.15); diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index db2e1a729b..e773af9e14 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -218,7 +218,7 @@ .header-cell :global(.cell) { padding: 0 var(--cell-padding); gap: calc(2 * var(--cell-spacing)); - background: var(--spectrum-global-color-gray-100); + background: var(--grid-background-alt); } .name { diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index 9399617eb7..46ad048c20 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -240,7 +240,7 @@ justify-content: space-between; align-items: center; gap: var(--cell-spacing); - background-color: var(--background); + background-color: var(--grid-background-alt); } .option:hover, .option.focused { diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte index 40b6de5eaa..2bd0a17054 100644 --- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte @@ -453,7 +453,7 @@ var(--max-cell-render-height) + var(--row-height) - var(--max-relationship-height) ); - background: var(--background); + background: var(--grid-background-alt); border: var(--cell-border); box-shadow: 0 0 20px -4px rgba(0, 0, 0, 0.15); display: flex; diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 8cf5803f23..39a67d44eb 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -168,6 +168,18 @@ diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte index c22ee511a3..f31cc198fb 100644 --- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte @@ -42,7 +42,7 @@ From 08ea400312a21fcada9621e78e9aa4dddc16b566 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 15 Jun 2023 10:59:24 +0100 Subject: [PATCH 028/343] Merge commit --- .../src/pages/builder/app/[application]/_layout.svelte | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index d10657bdbe..3a6fe11ef0 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -178,7 +178,9 @@ {$store.name}
- + + +
{/if} @@ -226,6 +228,7 @@ flex: 0 0 60px; background: var(--background); padding: 0 var(--spacing-xl); + padding-right: 0px; display: grid; grid-template-columns: 1fr auto 1fr; flex-direction: row; @@ -266,7 +269,10 @@ flex-direction: row; justify-content: flex-end; align-items: center; - gap: var(--spacing-l); + } + + .toprightnav :global(.avatars) { + margin-right: var(--spacing-l); } .secondary-editor { From 6a42d76c62119689f94199035bbb83dc6c9d7a0d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 11:19:46 +0100 Subject: [PATCH 029/343] Add border radius to grid block --- packages/client/src/components/app/GridBlock.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 6fe436c0e2..da9ae74411 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -37,6 +37,8 @@ flex-direction: column; align-items: stretch; border: 1px solid var(--spectrum-global-color-gray-300); + border-radius: 4px; + overflow: hidden; } div.in-builder :global(*) { pointer-events: none; From 73cae6198f23f5d09b2550845d2ca36b3c579e44 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 14:23:33 +0100 Subject: [PATCH 030/343] Improve grid logic around vertically inverting row popovers --- .../frontend-core/src/components/grid/stores/viewport.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/stores/viewport.js b/packages/frontend-core/src/components/grid/stores/viewport.js index bda56dc34f..f258b7daef 100644 --- a/packages/frontend-core/src/components/grid/stores/viewport.js +++ b/packages/frontend-core/src/components/grid/stores/viewport.js @@ -110,9 +110,10 @@ export const deriveStores = context => { const rowVerticalInversionIndex = derived( [visualRowCapacity, rowHeight], ([$visualRowCapacity, $rowHeight]) => { - return ( - $visualRowCapacity - Math.ceil(MaxCellRenderHeight / $rowHeight) - 2 - ) + const maxCellRenderRows = Math.ceil(MaxCellRenderHeight / $rowHeight) + const topIdx = $visualRowCapacity - maxCellRenderRows - 2 + const bottomIdx = maxCellRenderRows + 1 + return Math.max(topIdx, bottomIdx) } ) From dd8e54c5e13fe8de7947afc0c1d748adbffbc603 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 15 Jun 2023 15:20:14 +0100 Subject: [PATCH 031/343] update airgap script and enable support for offline mode --- .../scripts/airgapped/airgappedDockerBuild.js | 21 ++++++++++++------- package.json | 1 + .../pages/builder/portal/apps/_layout.svelte | 21 ++++++++++++------- .../pages/builder/portal/apps/index.svelte | 2 +- packages/builder/src/stores/portal/admin.js | 1 + packages/server/src/environment.ts | 1 + .../src/api/controllers/system/environment.ts | 1 + .../routes/system/tests/environment.spec.ts | 1 + packages/worker/src/environment.ts | 1 + 9 files changed, 34 insertions(+), 16 deletions(-) diff --git a/hosting/scripts/airgapped/airgappedDockerBuild.js b/hosting/scripts/airgapped/airgappedDockerBuild.js index cc0ea48eb3..58bc7c09a9 100755 --- a/hosting/scripts/airgapped/airgappedDockerBuild.js +++ b/hosting/scripts/airgapped/airgappedDockerBuild.js @@ -2,7 +2,9 @@ const fs = require("fs") const { execSync } = require("child_process") const path = require("path") -const IMAGES = { +const IS_SINGLE_IMAGE = process.env.SINGLE_IMAGE + +let IMAGES = { worker: "budibase/worker", apps: "budibase/apps", proxy: "budibase/proxy", @@ -10,7 +12,13 @@ const IMAGES = { couch: "ibmcom/couchdb3", curl: "curlimages/curl", redis: "redis", - watchtower: "containrrr/watchtower" + watchtower: "containrrr/watchtower", +} + +if (IS_SINGLE_IMAGE) { + IMAGES = { + budibase: "budibase/budibase" + } } const FILES = { @@ -39,11 +47,10 @@ for (let image in IMAGES) { } // copy config files -copyFile(FILES.COMPOSE) +if (!IS_SINGLE_IMAGE) { + copyFile(FILES.COMPOSE) +} copyFile(FILES.ENV) // compress -execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`) - -// clean up -fs.rmdirSync(OUTPUT_DIR, { recursive: true }) \ No newline at end of file +execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`) \ No newline at end of file diff --git a/package.json b/package.json index 56f015f8c0..c11ab662a3 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "build:docker:selfhost": "lerna run --stream build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -", "build:docker:develop": "node scripts/pinVersions && lerna run --stream build:docker && yarn build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild", + "build:docker:airgap:single": "SINGLE_IMAGE=1 node hosting/scripts/airgapped/airgappedDockerBuild", "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -", "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte index 8c887da093..e7c0966c91 100644 --- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte @@ -1,6 +1,6 @@ @@ -89,6 +99,7 @@ class="v-scrollbar" style="--size:{ScrollBarSize}px; top:{barTop}px; height:{barHeight}px;" on:mousedown={startVDragging} + class:dragging={isDraggingV} /> {/if} {#if $showHScrollbar} @@ -96,6 +107,7 @@ class="h-scrollbar" style="--size:{ScrollBarSize}px; left:{barLeft}px; width:{barWidth}px;" on:mousedown={startHDragging} + class:dragging={isDraggingH} /> {/if} @@ -103,11 +115,12 @@ div { position: absolute; background: var(--spectrum-global-color-gray-500); - opacity: 0.7; + opacity: 0.5; border-radius: 4px; transition: opacity 130ms ease-out; } - div:hover { + div:hover, + div.dragging { opacity: 1; } .v-scrollbar { diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js index eeea8fff43..f5c0905320 100644 --- a/packages/frontend-core/src/components/grid/stores/ui.js +++ b/packages/frontend-core/src/components/grid/stores/ui.js @@ -16,6 +16,7 @@ export const createStores = () => { const rowHeight = writable(DefaultRowHeight) const previousFocusedRowId = writable(null) const gridFocused = writable(false) + const isDragging = writable(false) // Derive the current focused row ID const focusedRowId = derived( @@ -48,6 +49,7 @@ export const createStores = () => { hoveredRowId, rowHeight, gridFocused, + isDragging, selectedRows: { ...selectedRows, actions: { From 8029e7eb7902baf739bf11b0700b898160b975e3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 16 Jun 2023 09:29:29 +0000 Subject: [PATCH 036/343] Bump version to 2.7.21-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index b25360235f..5c72675fb7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.21-alpha.2", + "version": "2.7.21-alpha.3", "npmClient": "yarn", "packages": [ "packages/backend-core", From 67ef7405327cc08e2210367de770c21801257c8d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 16 Jun 2023 10:34:34 +0100 Subject: [PATCH 037/343] Fix font paths so they work in both dev and prod --- packages/builder/vite.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index bf6b4ce17e..ecaedc3cbe 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -64,11 +64,11 @@ export default defineConfig(({ mode }) => { targets: [ { src: "../../node_modules/@fontsource/source-sans-pro", - dest: "fonts", + dest: isProduction ? "fonts" : "builder/fonts", }, { src: "../../node_modules/remixicon/fonts/*", - dest: "fonts", + dest: isProduction ? "fonts" : "builder/fonts", }, ], }), From a2d2b333a528c89de03c87147e4aa70f9ab50275 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 16 Jun 2023 10:53:29 +0100 Subject: [PATCH 038/343] Remove checkbox transitions in grids to avoid flashing while scrolling --- .../src/components/grid/cells/BooleanCell.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/frontend-core/src/components/grid/cells/BooleanCell.svelte b/packages/frontend-core/src/components/grid/cells/BooleanCell.svelte index c3449c0b39..719fece3df 100644 --- a/packages/frontend-core/src/components/grid/cells/BooleanCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/BooleanCell.svelte @@ -44,4 +44,10 @@ .boolean-cell.editable { pointer-events: all; } + .boolean-cell :global(.spectrum-Checkbox-box:before), + .boolean-cell :global(.spectrum-Checkbox-box:after), + .boolean-cell :global(.spectrum-Checkbox-checkmark), + .boolean-cell :global(.spectrum-Checkbox-partialCheckmark) { + transition: none; + } From 887b980b11c8a6bf87b1da4f155c4cbe40f71e7a Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 16 Jun 2023 11:34:02 +0100 Subject: [PATCH 039/343] Revert "Merge pull request #10927 from Budibase/revert-merge-develop-1" This reverts commit 548b3037e5c3b4428cbc410cf74a54cc66ee59aa, reversing changes made to 179f06f106d7b1dc262cc744c936d3380467e15e. --- lerna.json | 1 - package.json | 4 +- .../middleware/passport/datasource/google.ts | 46 +- .../backend-core/src/security/encryption.ts | 125 +- packages/backend-core/src/security/roles.ts | 9 +- .../bbui/src/FancyForm/FancyCheckbox.svelte | 20 +- .../src/FancyForm/FancyCheckboxGroup.svelte | 68 + packages/bbui/src/FancyForm/FancyField.svelte | 15 +- packages/bbui/src/FancyForm/index.js | 1 + packages/bbui/src/Form/Core/Checkbox.svelte | 2 + packages/bbui/src/Modal/Modal.svelte | 3 +- .../builder/src/builderStore/datasource.js | 16 +- .../src/builderStore/store/frontend.js | 1 + .../SetupPanel/AutomationBlockSetup.svelte | 412 +++--- .../PlusConfigForm.svelte | 36 +- .../_components/GoogleButton.svelte | 14 +- .../DatasourceNavigator/icons/index.js | 3 + .../modals/DatasourceConfigModal.svelte | 94 +- .../modals/GoogleDatasourceConfigModal.svelte | 206 ++- .../commandPalette/CommandPalette.svelte | 2 +- .../src/components/deploy/AppActions.svelte | 5 +- .../components/start/ExportAppModal.svelte | 133 +- .../src/helpers/validation/validation.js | 5 +- .../src/helpers/validation/yup/index.js | 64 + .../_components/PreviewOverlay.svelte | 91 ++ .../builder/app/[application]/_layout.svelte | 11 +- .../datasource/[datasourceId]/index.svelte | 25 +- .../builder/app/[application]/data/new.svelte | 23 +- .../portal/settings/auth/google.svelte | 235 +++ .../builder/portal/settings/auth/index.svelte | 154 +- .../builder/portal/users/users/index.svelte | 2 +- .../builder/src/stores/backend/datasources.js | 6 +- packages/cli/package.json | 2 +- packages/client/src/api/api.js | 10 +- .../client/src/components/ClientApp.svelte | 11 +- .../components/devtools/DevToolsHeader.svelte | 47 +- packages/client/src/index.js | 6 - .../client/src/stores/derived/currentRole.js | 7 +- .../src/stores/derived/devToolsEnabled.js | 10 + packages/client/src/stores/derived/index.js | 1 + packages/client/src/stores/devTools.js | 10 +- packages/frontend-core/src/api/datasources.js | 16 +- packages/server/package.json | 6 +- packages/server/src/api/controllers/backup.ts | 30 +- .../server/src/api/controllers/datasource.ts | 65 +- packages/server/src/api/controllers/role.ts | 10 +- .../server/src/api/controllers/routing.ts | 6 +- packages/server/src/api/routes/backup.ts | 2 +- .../src/api/routes/tests/backup.spec.ts | 20 +- .../src/automations/steps/sendSmtpEmail.ts | 59 +- .../automations/tests/sendSmtpEmail.spec.js | 71 - .../automations/tests/sendSmtpEmail.spec.ts | 74 + .../server/src/events/docUpdates/syncUsers.ts | 4 + .../server/src/integrations/googlesheets.ts | 51 +- packages/server/src/integrations/mongodb.ts | 6 +- packages/server/src/integrations/postgres.ts | 24 +- packages/server/src/middleware/currentapp.ts | 2 +- .../server/src/sdk/app/backups/exports.ts | 38 +- .../server/src/sdk/app/backups/imports.ts | 22 +- .../src/sdk/app/datasources/datasources.ts | 1 + .../server/src/utilities/workerRequests.ts | 29 +- packages/shared-core/src/utils.ts | 39 + packages/types/src/api/web/app/datasource.ts | 1 + .../types/src/documents/app/automation.ts | 30 + packages/worker/package.json | 1 + .../worker/src/api/controllers/global/auth.ts | 1 - .../src/api/controllers/global/email.ts | 2 + packages/worker/src/utilities/email.ts | 41 +- qa-core/package.json | 2 +- qa-core/scripts/testResultsWebhook.js | 10 +- .../src/account-api/api/apis/AccountAPI.ts | 12 +- .../validators/mongo.integration.spec.ts | 2 +- .../validators/postgres.integration.spec.ts | 1 + qa-core/src/jest/globalTeardown.ts | 1 + yarn.lock | 1310 ++++++++--------- 75 files changed, 2501 insertions(+), 1424 deletions(-) create mode 100644 packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte create mode 100644 packages/builder/src/pages/builder/portal/settings/auth/google.svelte create mode 100644 packages/client/src/stores/derived/devToolsEnabled.js delete mode 100644 packages/server/src/automations/tests/sendSmtpEmail.spec.js create mode 100644 packages/server/src/automations/tests/sendSmtpEmail.spec.ts diff --git a/lerna.json b/lerna.json index 86de1e4387..2bded7151f 100644 --- a/lerna.json +++ b/lerna.json @@ -16,7 +16,6 @@ "packages/worker", "packages/pro/packages/pro" ], - "useWorkspaces": true, "command": { "publish": { "ignoreChanges": [ diff --git a/package.json b/package.json index 56f015f8c0..49ffc5fef7 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "husky": "^8.0.3", "js-yaml": "^4.1.0", "kill-port": "^1.6.1", - "lerna": "7.0.0-alpha.0", + "lerna": "^7.0.1", "madge": "^6.0.0", "minimist": "^1.2.8", - "nx": "^16.2.1", + "nx": "^16.3.2", "prettier": "^2.3.1", "prettier-plugin-svelte": "^2.3.0", "rimraf": "^3.0.2", diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts index 6fd4e9ff32..ae6b3b4913 100644 --- a/packages/backend-core/src/middleware/passport/datasource/google.ts +++ b/packages/backend-core/src/middleware/passport/datasource/google.ts @@ -1,10 +1,11 @@ import * as google from "../sso/google" import { Cookie } from "../../../constants" -import { clearCookie, getCookie } from "../../../utils" -import { doWithDB } from "../../../db" import * as configs from "../../../configs" -import { BBContext, Database, SSOProfile } from "@budibase/types" +import * as cache from "../../../cache" +import * as utils from "../../../utils" +import { UserCtx, SSOProfile } from "@budibase/types" import { ssoSaveUserNoOp } from "../sso/sso" + const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy type Passport = { @@ -22,7 +23,7 @@ async function fetchGoogleCreds() { export async function preAuth( passport: Passport, - ctx: BBContext, + ctx: UserCtx, next: Function ) { // get the relevant config @@ -36,8 +37,8 @@ export async function preAuth( ssoSaveUserNoOp ) - if (!ctx.query.appId || !ctx.query.datasourceId) { - ctx.throw(400, "appId and datasourceId query params not present.") + if (!ctx.query.appId) { + ctx.throw(400, "appId query param not present.") } return passport.authenticate(strategy, { @@ -49,7 +50,7 @@ export async function preAuth( export async function postAuth( passport: Passport, - ctx: BBContext, + ctx: UserCtx, next: Function ) { // get the relevant config @@ -57,7 +58,7 @@ export async function postAuth( const platformUrl = await configs.getPlatformUrl({ tenantAware: false }) let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback` - const authStateCookie = getCookie(ctx, Cookie.DatasourceAuth) + const authStateCookie = utils.getCookie(ctx, Cookie.DatasourceAuth) return passport.authenticate( new GoogleStrategy( @@ -69,33 +70,26 @@ export async function postAuth( ( accessToken: string, refreshToken: string, - profile: SSOProfile, + _profile: SSOProfile, done: Function ) => { - clearCookie(ctx, Cookie.DatasourceAuth) + utils.clearCookie(ctx, Cookie.DatasourceAuth) done(null, { accessToken, refreshToken }) } ), { successRedirect: "/", failureRedirect: "/error" }, async (err: any, tokens: string[]) => { const baseUrl = `/builder/app/${authStateCookie.appId}/data` - // update the DB for the datasource with all the user info - await doWithDB(authStateCookie.appId, async (db: Database) => { - let datasource - try { - datasource = await db.get(authStateCookie.datasourceId) - } catch (err: any) { - if (err.status === 404) { - ctx.redirect(baseUrl) - } + + const id = utils.newid() + await cache.store( + `datasource:creation:${authStateCookie.appId}:google:${id}`, + { + tokens, } - if (!datasource.config) { - datasource.config = {} - } - datasource.config.auth = { type: "google", ...tokens } - await db.put(datasource) - ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`) - }) + ) + + ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`) } )(ctx, next) } diff --git a/packages/backend-core/src/security/encryption.ts b/packages/backend-core/src/security/encryption.ts index f9adb68955..7a8cfaf04a 100644 --- a/packages/backend-core/src/security/encryption.ts +++ b/packages/backend-core/src/security/encryption.ts @@ -1,12 +1,17 @@ import crypto from "crypto" +import fs from "fs" +import zlib from "zlib" import env from "../environment" +import { join } from "path" const ALGO = "aes-256-ctr" const SEPARATOR = "-" const ITERATIONS = 10000 -const RANDOM_BYTES = 16 const STRETCH_LENGTH = 32 +const SALT_LENGTH = 16 +const IV_LENGTH = 16 + export enum SecretOption { API = "api", ENCRYPTION = "encryption", @@ -31,15 +36,15 @@ export function getSecret(secretOption: SecretOption): string { return secret } -function stretchString(string: string, salt: Buffer) { - return crypto.pbkdf2Sync(string, salt, ITERATIONS, STRETCH_LENGTH, "sha512") +function stretchString(secret: string, salt: Buffer) { + return crypto.pbkdf2Sync(secret, salt, ITERATIONS, STRETCH_LENGTH, "sha512") } export function encrypt( input: string, secretOption: SecretOption = SecretOption.API ) { - const salt = crypto.randomBytes(RANDOM_BYTES) + const salt = crypto.randomBytes(SALT_LENGTH) const stretched = stretchString(getSecret(secretOption), salt) const cipher = crypto.createCipheriv(ALGO, stretched, salt) const base = cipher.update(input) @@ -60,3 +65,115 @@ export function decrypt( const final = decipher.final() return Buffer.concat([base, final]).toString() } + +export async function encryptFile( + { dir, filename }: { dir: string; filename: string }, + secret: string +) { + const outputFileName = `${filename}.enc` + + const filePath = join(dir, filename) + const inputFile = fs.createReadStream(filePath) + const outputFile = fs.createWriteStream(join(dir, outputFileName)) + + const salt = crypto.randomBytes(SALT_LENGTH) + const iv = crypto.randomBytes(IV_LENGTH) + const stretched = stretchString(secret, salt) + const cipher = crypto.createCipheriv(ALGO, stretched, iv) + + outputFile.write(salt) + outputFile.write(iv) + + inputFile.pipe(zlib.createGzip()).pipe(cipher).pipe(outputFile) + + return new Promise<{ filename: string; dir: string }>(r => { + outputFile.on("finish", () => { + r({ + filename: outputFileName, + dir, + }) + }) + }) +} + +async function getSaltAndIV(path: string) { + const fileStream = fs.createReadStream(path) + + const salt = await readBytes(fileStream, SALT_LENGTH) + const iv = await readBytes(fileStream, IV_LENGTH) + fileStream.close() + return { salt, iv } +} + +export async function decryptFile( + inputPath: string, + outputPath: string, + secret: string +) { + const { salt, iv } = await getSaltAndIV(inputPath) + const inputFile = fs.createReadStream(inputPath, { + start: SALT_LENGTH + IV_LENGTH, + }) + + const outputFile = fs.createWriteStream(outputPath) + + const stretched = stretchString(secret, salt) + const decipher = crypto.createDecipheriv(ALGO, stretched, iv) + + const unzip = zlib.createGunzip() + + inputFile.pipe(decipher).pipe(unzip).pipe(outputFile) + + return new Promise((res, rej) => { + outputFile.on("finish", () => { + outputFile.close() + res() + }) + + inputFile.on("error", e => { + outputFile.close() + rej(e) + }) + + decipher.on("error", e => { + outputFile.close() + rej(e) + }) + + unzip.on("error", e => { + outputFile.close() + rej(e) + }) + + outputFile.on("error", e => { + outputFile.close() + rej(e) + }) + }) +} + +function readBytes(stream: fs.ReadStream, length: number) { + return new Promise((resolve, reject) => { + let bytesRead = 0 + const data: Buffer[] = [] + + stream.on("readable", () => { + let chunk + + while ((chunk = stream.read(length - bytesRead)) !== null) { + data.push(chunk) + bytesRead += chunk.length + } + + resolve(Buffer.concat(data)) + }) + + stream.on("end", () => { + reject(new Error("Insufficient data in the stream.")) + }) + + stream.on("error", error => { + reject(error) + }) + }) +} diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts index bdf7a38726..e8a3c76c0a 100644 --- a/packages/backend-core/src/security/roles.ts +++ b/packages/backend-core/src/security/roles.ts @@ -140,9 +140,13 @@ export function lowerBuiltinRoleID(roleId1?: string, roleId2?: string): string { * Gets the role object, this is mainly useful for two purposes, to check if the level exists and * to check if the role inherits any others. * @param {string|null} roleId The level ID to lookup. + * @param {object|null} opts options for the function, like whether to halt errors, instead return public. * @returns {Promise} The role object, which may contain an "inherits" property. */ -export async function getRole(roleId?: string): Promise { +export async function getRole( + roleId?: string, + opts?: { defaultPublic?: boolean } +): Promise { if (!roleId) { return undefined } @@ -161,6 +165,9 @@ export async function getRole(roleId?: string): Promise { // finalise the ID role._id = getExternalRoleID(role._id) } catch (err) { + if (!isBuiltin(roleId) && opts?.defaultPublic) { + return cloneDeep(BUILTIN_ROLES.PUBLIC) + } // only throw an error if there is no role at all if (Object.keys(role).length === 0) { throw err diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte index 191cc79485..0a2e5ac159 100644 --- a/packages/bbui/src/FancyForm/FancyCheckbox.svelte +++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte @@ -8,6 +8,8 @@ export let disabled = false export let error = null export let validate = null + export let indeterminate = false + export let compact = false const dispatch = createEventDispatcher() @@ -21,11 +23,19 @@ } - + - + -
+
{#if text} {text} {/if} @@ -47,6 +57,10 @@ line-clamp: 2; -webkit-box-orient: vertical; } + .text.compact { + font-size: 13px; + line-height: 15px; + } .text > :global(*) { font-size: inherit !important; } diff --git a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte new file mode 100644 index 0000000000..aaea388c36 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte @@ -0,0 +1,68 @@ + + +{#if options && Array.isArray(options)} +
+ + {#if showSelectAll} + + {/if} + {#each options as option, i} + + {/each} + +
+{/if} + + diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index 0c99394599..455f4b38fb 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -11,6 +11,7 @@ export let value export let ref export let autoHeight + export let compact = false const formContext = getContext("fancy-form") const id = Math.random() @@ -42,6 +43,7 @@ class:disabled class:focused class:clickable + class:compact class:auto-height={autoHeight} >
@@ -61,7 +63,6 @@ diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte index b7d70d88b7..ceb8fd7f4b 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte @@ -3,8 +3,6 @@ import { store } from "builderStore" import { auth } from "stores/portal" - export let preAuthStep - export let datasource export let disabled export let samePage @@ -15,18 +13,8 @@ class:disabled {disabled} on:click={async () => { - let ds = datasource let appId = $store.appId - if (!ds) { - const resp = await preAuthStep() - if (resp.datasource && resp.appId) { - ds = resp.datasource - appId = resp.appId - } else { - ds = resp - } - } - const url = `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}` + const url = `/api/global/auth/${tenantId}/datasource/google?appId=${appId}` if (samePage) { window.location = url } else { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index 18aa361570..2486942dea 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -44,6 +44,9 @@ export default ICONS export function getIcon(integrationType, schema) { const integrationList = get(integrations) + if (!integrationList) { + return + } if (integrationList[integrationType]?.iconUrl) { return { url: integrationList[integrationType].iconUrl } } else if (schema?.custom || !ICONS[integrationType]) { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 31a0d21cd8..1d84dbbe39 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -1,12 +1,19 @@ saveDatasource()} - confirmText={datasource.plus ? "Connect" : "Save and continue to query"} - cancelText="Back" - showSecondaryButton={datasource.plus} + {title} + onConfirm={() => nextStep()} + {confirmText} + cancelText={fetchTableStep ? "Cancel" : "Back"} + showSecondaryButton={datasourcePlus} size="L" disabled={!isValid} > - Connect your database to Budibase using the config below. + + {#if !fetchTableStep} + Connect your database to Budibase using the config below + {:else} + Choose what tables you want to sync with Budibase + {/if} - (isValid = e.detail)} - /> + {#if !fetchTableStep} + (isValid = e.detail)} + /> + {:else} +
+ +
+ {/if} + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 0783a9fe53..14f81f915c 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,43 +1,207 @@ - - {#if isGoogleConfigured === true} - + {#if step === GoogleDatasouceConfigStep.AUTH} + + {#if isGoogleConfigured === true} + + Authenticate with your google account to use the {integrationName} integration. + + + {:else if isGoogleConfigured === false} Authenticate with your google account to use the {IntegrationNames[ - datasource.type - ]} integration.Google authentication is not enabled, please complete Google SSO + configuration. + Configure Google SSO + {/if} + {/if} + {#if step === GoogleDatasouceConfigStep.SET_URL} + + Add the URL of the sheet you want to connect. + + (isValid = e.detail)} + /> + + {/if} + {#if step === GoogleDatasouceConfigStep.SET_SHEETS} + + Select which spreadsheets you want to connect. + + + + {#if setSheetsErrorTitle || setSheetsErrorMessage} + + {/if} - save(datasource, true)} /> - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. - Configure Google SSO {/if} diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte index ae946dc10c..3a369446a3 100644 --- a/packages/builder/src/components/commandPalette/CommandPalette.svelte +++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte @@ -69,7 +69,7 @@ name: "App", description: "", icon: "Play", - action: () => window.open(`/${$store.appId}`), + action: () => store.update(state => ({ ...state, showPreview: true })), }, { type: "Preview", diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 9813237317..a85eb5a154 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -62,7 +62,10 @@ } const previewApp = () => { - window.open(`/${application}`) + store.update(state => ({ + ...state, + showPreview: true, + })) } const viewApp = () => { diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte index 948416b192..4a69aaef74 100644 --- a/packages/builder/src/components/start/ExportAppModal.svelte +++ b/packages/builder/src/components/start/ExportAppModal.svelte @@ -1,27 +1,128 @@ - - - Apps can be exported with or without data that is within internal tables - - select this below. - + + {#if currentStep === Step.CONFIG} + + + + + {#if !encypt} + + {/if} + {/if} + {#if currentStep === Step.SET_PASSWORD} + + {/if} diff --git a/packages/builder/src/helpers/validation/validation.js b/packages/builder/src/helpers/validation/validation.js index db5dfe4430..f64bf56835 100644 --- a/packages/builder/src/helpers/validation/validation.js +++ b/packages/builder/src/helpers/validation/validation.js @@ -6,7 +6,6 @@ export function createValidationStore(initialValue, ...validators) { let touched = false const value = writable(initialValue || "") - const error = derived(value, $v => validate($v, validators)) const touchedStore = derived(value, () => { if (!touched) { touched = true @@ -14,6 +13,10 @@ export function createValidationStore(initialValue, ...validators) { } return touched }) + const error = derived( + [value, touchedStore], + ([$v, $t]) => $t && validate($v, validators) + ) return [value, error, touchedStore] } diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js index 20ddaebb1a..b5bdf030a5 100644 --- a/packages/builder/src/helpers/validation/yup/index.js +++ b/packages/builder/src/helpers/validation/yup/index.js @@ -5,6 +5,7 @@ import { notifications } from "@budibase/bbui" export const createValidationStore = () => { const DEFAULT = { + values: {}, errors: {}, touched: {}, valid: false, @@ -33,6 +34,9 @@ export const createValidationStore = () => { case "email": propertyValidator = string().email().nullable() break + case "password": + propertyValidator = string().nullable() + break default: propertyValidator = string().nullable() } @@ -41,9 +45,68 @@ export const createValidationStore = () => { propertyValidator = propertyValidator.required() } + // We want to do this after the possible required validation, to prioritise the required error + switch (type) { + case "password": + propertyValidator = propertyValidator.min(8) + break + } + validator[propertyName] = propertyValidator } + const observe = async (propertyName, value) => { + const values = get(validation).values + let fieldIsValid + if (!values.hasOwnProperty(propertyName)) { + // Initial setup + values[propertyName] = value + return + } + + if (value === values[propertyName]) { + return + } + + const obj = object().shape(validator) + try { + validation.update(store => { + store.errors[propertyName] = null + return store + }) + await obj.validateAt(propertyName, { [propertyName]: value }) + fieldIsValid = true + } catch (error) { + const [fieldError] = error.errors + if (fieldError) { + validation.update(store => { + store.errors[propertyName] = capitalise(fieldError) + store.valid = false + return store + }) + } + } + + if (fieldIsValid) { + // Validate the rest of the fields + try { + await obj.validate( + { ...values, [propertyName]: value }, + { abortEarly: false } + ) + validation.update(store => { + store.valid = true + return store + }) + } catch { + validation.update(store => { + store.valid = false + return store + }) + } + } + } + const check = async values => { const obj = object().shape(validator) // clear the previous errors @@ -87,5 +150,6 @@ export const createValidationStore = () => { check, addValidator, addValidatorType, + observe, } } diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte new file mode 100644 index 0000000000..d069d1b4c7 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte @@ -0,0 +1,91 @@ + + +
+
+
+
+ +
+ ` + $: embed = `` diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte deleted file mode 100644 index 333a10bef7..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte +++ /dev/null @@ -1,252 +0,0 @@ - - -{#key appId} - - - - - - -
-
- -
-
- - - - - - - - - - - - - View - - - - Edit - - exportApp({ published: false })} - icon="DownloadFromCloud" - > - Export latest - - {#if isPublished} - exportApp({ published: true })} - icon="DownloadFromCloudOutline" - > - Export published - - Copy app ID - {/if} - {#if !isPublished} - - Delete - - {/if} - -
-
- - - - - - - - - - {#if loaded} - - {/if} - - - - - - - - (deletionConfirmationAppName = null)} - disabled={deletionConfirmationAppName !== app?.name} - > - Are you sure you want to delete {app?.name}? -
- Please enter the app name below to confirm. -

- - -{/key} - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte deleted file mode 100644 index b3aed56a48..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte +++ /dev/null @@ -1,211 +0,0 @@ - - - addData(data)} - showCloseIcon={false} - disabled={!valid} -> - {#if data.length} - - {#each data as input, index} -
-
- x._id !== Constants.Roles.PUBLIC - )} - secondaryPlaceholder="Access" - bind:primaryValue={input.id} - bind:secondaryValue={input.role} - bind:searchTerm={search} - getPrimaryOptionLabel={group => group.name} - getPrimaryOptionValue={group => group.name} - getPrimaryOptionIcon={group => group.icon} - getPrimaryOptionColour={group => group.colour} - getSecondaryOptionLabel={role => role.name} - getSecondaryOptionValue={role => role._id} - getSecondaryOptionColour={role => - RoleUtils.getRoleColour(role._id)} - /> -
-
- removeItem(index)} - /> -
-
- {/each} - - {/if} -
- Add more -
- - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte deleted file mode 100644 index d92a522602..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - -
- rolesContext.updateRole(e.detail, row._id)} - on:remove={() => rolesContext.removeRole(row._id)} - /> -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte deleted file mode 100644 index 62c5da12ec..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ /dev/null @@ -1,271 +0,0 @@ - - - - - Access - Assign users to your app and set their access - - - - {#if $usersFetch.loaded} - -
- Users - -
- -
- You have no users assigned yet -
-
- - - {/if} - - {#if $usersFetch.loaded && $licensing.groupsEnabled} - -
- Groups - -
- -
- You have no groups assigned yet -
-
- - {/if} - - - - - - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte deleted file mode 100644 index 565c0d1f2f..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - -{#if history} - -
- - -
- - {history.automationName} - - - {#if history.status === STOPPED_ERROR} -
- -
- {/if} - {#if exists} -
- -
- {/if} - {#key history} -
- -
- {/key} - -{:else} - No details found -{/if} - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte deleted file mode 100644 index f041faa349..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte +++ /dev/null @@ -1,27 +0,0 @@ - - - - {info.message} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte deleted file mode 100644 index 5eb8b9d965..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ /dev/null @@ -1,263 +0,0 @@ - - - - - Automation History - View the automations your app has executed - - - -
-
-
- -
-
- - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte deleted file mode 100644 index 198339dae9..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {#if value != null} - -
{value || 0}
- {/if} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte deleted file mode 100644 index 3b3cce731d..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - - - {status} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte deleted file mode 100644 index fd67b4010b..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte deleted file mode 100644 index 86ad0f3d4e..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -
- {printTrigger(trigger)} - {type} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte deleted file mode 100644 index 399877a801..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - -
- -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte deleted file mode 100644 index 77d76c9609..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ /dev/null @@ -1,344 +0,0 @@ - - - - -
- Backups - {#if !$licensing.backupsEnabled} - - Premium - - {/if} -
- Back up your apps and restore them to their previous state - - - - {#if !$licensing.backupsEnabled} - {#if !$auth.accountPortalAccess && $admin.cloud} - Contact your account holder to upgrade your plan. - {/if} -
- {#if $auth.accountPortalAccess} - - {/if} - -
- {:else if !backupData?.length && !loading && !filterOpt && !startDate} -
- - BackupsDefault - - You have no backups yet - You can manually back up your app any time - -
- -
- -
- {:else} - -
-
-
- import { setContext, onMount } from "svelte" - import { writable } from "svelte/store" import { fade } from "svelte/transition" import { clickOutside, ProgressCircle } from "@budibase/bbui" import { createEventManagers } from "../lib/events" @@ -30,6 +29,7 @@ GutterWidth, DefaultRowHeight, } from "../lib/constants" + import { memo } from "../../../utils" export let API = null export let tableId = null @@ -43,19 +43,29 @@ export let collaboration = true export let showAvatars = true export let showControls = true + export let filter = null + export let sortColumn = null + export let sortOrder = null // Unique identifier for DOM nodes inside this instance const rand = Math.random() - // State stores - const tableIdStore = writable(tableId) - const schemaOverridesStore = writable(schemaOverrides) - const config = writable({ + // Stores derived from props. + // We use memo here to ensure redundant store reactions don't fire and cause + // wasted API calls. + const tableIdStore = memo(tableId) + const schemaOverridesStore = memo(schemaOverrides) + const filterStore = memo(filter) + const sortStore = memo({ + column: sortColumn, + order: sortOrder, + }) + const config = memo({ allowAddRows, - allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, + allowSchemaChanges, stripeRows, showControls, }) @@ -67,6 +77,8 @@ config, tableId: tableIdStore, schemaOverrides: schemaOverridesStore, + filter: filterStore, + sort: sortStore, } context = { ...context, ...createEventManagers() } context = attachStores(context) @@ -83,9 +95,14 @@ gridFocused, } = context - // Keep stores up to date + // Keep prop-derived stores up to date $: tableIdStore.set(tableId) $: schemaOverridesStore.set(schemaOverrides) + $: filterStore.set(filter) + $: sortStore.set({ + column: sortColumn, + order: sortOrder, + }) $: config.set({ allowAddRows, allowSchemaChanges, @@ -115,10 +132,10 @@ id="grid-{rand}" class:is-resizing={$isResizing} class:is-reordering={$isReordering} - class:stripe={$config.stripeRows} - style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" + class:stripe={stripeRows} on:mouseenter={() => gridFocused.set(true)} on:mouseleave={() => gridFocused.set(false)} + style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" > {#if showControls}
@@ -170,6 +187,7 @@
diff --git a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte index 42fb796ac9..33a0a0e2d3 100644 --- a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte @@ -65,6 +65,6 @@ margin-left: -1px; width: 2px; height: 100%; - background: var(--spectrum-global-color-blue-400); + background: var(--accent-color); } From 832ee22c0a416d293d7451cd09ac328b23372281 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 19 Jun 2023 11:43:00 +0100 Subject: [PATCH 052/343] fix issue with adding automation step --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index a8fa700b90..d2e34319da 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -309,7 +309,7 @@ } function canShowField(key, value) { - const dependsOn = value.dependsOn + const dependsOn = value?.dependsOn return !dependsOn || !!inputData[dependsOn] } From d77b2c6ab16d4a9c58e73911717df2be53474dde Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 17:24:40 +0100 Subject: [PATCH 053/343] Refactor how grid settings are used and add option for row height --- packages/client/manifest.json | 36 ++++++++++--- .../src/components/app/GridBlock.svelte | 14 ++--- .../grid/controls/ColumnWidthButton.svelte | 18 +------ .../src/components/grid/layout/Grid.svelte | 54 ++++++------------- .../src/components/grid/stores/columns.js | 18 +++++++ .../src/components/grid/stores/config.js | 23 ++++++++ .../src/components/grid/stores/filter.js | 20 +++++++ .../src/components/grid/stores/index.js | 6 +++ .../src/components/grid/stores/sort.js | 27 ++++++++++ .../src/components/grid/stores/ui.js | 13 +++-- packages/frontend-core/src/utils/index.js | 2 +- packages/frontend-core/src/utils/memo.js | 10 +++- 12 files changed, 168 insertions(+), 73 deletions(-) create mode 100644 packages/frontend-core/src/components/grid/stores/config.js create mode 100644 packages/frontend-core/src/components/grid/stores/filter.js create mode 100644 packages/frontend-core/src/components/grid/stores/sort.js diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 3f36f2f666..3186c40259 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5230,9 +5230,7 @@ "block": true, "name": "Grid block", "icon": "Table", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 600, "height": 400 @@ -5245,23 +5243,49 @@ "key": "table", "required": true }, + { + "type": "columns", + "label": "Columns", + "key": "columns", + "dependsOn": "table" + }, { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "initialFilter" }, { "type": "field/sortable", "label": "Sort column", - "key": "sortColumn" + "key": "initialSortColumn" }, { "type": "select", "label": "Sort order", - "key": "sortOrder", + "key": "initialSortOrder", "options": ["Ascending", "Descending"], "defaultValue": "Ascending" }, + { + "type": "select", + "label": "Row height", + "key": "initialRowHeight", + "placeholder": "Default", + "options": [ + { + "label": "Small", + "value": 36 + }, + { + "label": "Medium", + "value": 64 + }, + { + "label": "Large", + "value": 92 + } + ] + }, { "type": "boolean", "label": "Add rows", diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 5267582bc8..bfc3a15d1c 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -9,9 +9,10 @@ export let allowEditRows = true export let allowDeleteRows = true export let stripeRows = false - export let filter = null - export let sortColumn = null - export let sortOrder = null + export let initialFilter = null + export let initialSortColumn = null + export let initialSortOrder = null + export let initialRowHeight = null const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") @@ -28,9 +29,10 @@ {allowEditRows} {allowDeleteRows} {stripeRows} - {filter} - {sortColumn} - {sortOrder} + {initialFilter} + {initialSortColumn} + {initialSortOrder} + {initialRowHeight} showControls={false} allowExpandRows={false} allowSchemaChanges={false} diff --git a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte index 5ffd968d30..fb20cc50e5 100644 --- a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte @@ -33,22 +33,6 @@ selected: allLarge, }, ] - - const changeColumnWidth = async width => { - columns.update(state => { - state.forEach(column => { - column.width = width - }) - return state - }) - if ($stickyColumn) { - stickyColumn.update(state => ({ - ...state, - width, - })) - } - await columns.actions.saveChanges() - }
@@ -70,7 +54,7 @@ {#each sizeOptions as option} changeColumnWidth(option.size)} + on:click={() => columns.actions.changeAllColumnWidths(option.size)} selected={option.selected} > {option.label} diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 9edd69d09d..211bb15917 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -29,7 +29,6 @@ GutterWidth, DefaultRowHeight, } from "../lib/constants" - import { memo } from "../../../utils" export let API = null export let tableId = null @@ -43,48 +42,26 @@ export let collaboration = true export let showAvatars = true export let showControls = true - export let filter = null - export let sortColumn = null - export let sortOrder = null + export let initialFilter = null + export let initialSortColumn = null + export let initialSortOrder = null + export let initialRowHeight = null // Unique identifier for DOM nodes inside this instance const rand = Math.random() - // Stores derived from props. - // We use memo here to ensure redundant store reactions don't fire and cause - // wasted API calls. - const tableIdStore = memo(tableId) - const schemaOverridesStore = memo(schemaOverrides) - const filterStore = memo(filter) - const sortStore = memo({ - column: sortColumn, - order: sortOrder, - }) - const config = memo({ - allowAddRows, - allowExpandRows, - allowEditRows, - allowDeleteRows, - allowSchemaChanges, - stripeRows, - showControls, - }) - // Build up context let context = { API: API || createAPIClient(), rand, - config, - tableId: tableIdStore, - schemaOverrides: schemaOverridesStore, - filter: filterStore, - sort: sortStore, + props: $$props, } context = { ...context, ...createEventManagers() } context = attachStores(context) // Reference some stores for local use const { + config, isResizing, isReordering, ui, @@ -95,22 +72,23 @@ gridFocused, } = context - // Keep prop-derived stores up to date - $: tableIdStore.set(tableId) - $: schemaOverridesStore.set(schemaOverrides) - $: filterStore.set(filter) - $: sortStore.set({ - column: sortColumn, - order: sortOrder, - }) + // Keep config store up to date with props $: config.set({ + tableId, + schemaOverrides, allowAddRows, - allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, + allowSchemaChanges, stripeRows, + collaboration, + showAvatars, showControls, + initialFilter, + initialSortColumn, + initialSortOrder, + initialRowHeight, }) // Set context for children to consume diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js index a0820e77bb..5f34de1434 100644 --- a/packages/frontend-core/src/components/grid/stores/columns.js +++ b/packages/frontend-core/src/components/grid/stores/columns.js @@ -56,6 +56,23 @@ export const deriveStores = context => { }) } + // Updates the width of all columns + const changeAllColumnWidths = async width => { + columns.update(state => { + return state.map(col => ({ + ...col, + width, + })) + }) + if (get(stickyColumn)) { + stickyColumn.update(state => ({ + ...state, + width, + })) + } + await saveChanges() + } + // Persists column changes by saving metadata against table schema const saveChanges = async () => { const $columns = get(columns) @@ -107,6 +124,7 @@ export const deriveStores = context => { saveChanges, saveTable, changePrimaryDisplay, + changeAllColumnWidths, }, }, } diff --git a/packages/frontend-core/src/components/grid/stores/config.js b/packages/frontend-core/src/components/grid/stores/config.js new file mode 100644 index 0000000000..3e8da81e2e --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/config.js @@ -0,0 +1,23 @@ +import { writable } from "svelte/store" +import { derivedMemo } from "../../../utils" + +export const createStores = context => { + const config = writable(context.props) + const getProp = prop => derivedMemo(config, $config => $config[prop]) + + // Derive and memoize some props so that we can react to them in isolation + const tableId = getProp("tableId") + const initialSortColumn = getProp("initialSortColumn") + const initialSortOrder = getProp("initialSortOrder") + const initialFilter = getProp("initialFilter") + const initialRowHeight = getProp("initialRowHeight") + + return { + config, + tableId, + initialSortColumn, + initialSortOrder, + initialFilter, + initialRowHeight, + } +} diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.js new file mode 100644 index 0000000000..1f01aaec40 --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/filter.js @@ -0,0 +1,20 @@ +import { writable } from "svelte/store" +import { derivedMemo } from "../../../utils" + +export const createStores = context => { + const { props } = context + + // Initialise to default props + const filter = writable(props.initialFilter) + + return { + filter, + } +} + +export const initialise = context => { + const { filter, initialFilter } = context + + // Reset filter when initial filter prop changes + initialFilter.subscribe(filter.set) +} diff --git a/packages/frontend-core/src/components/grid/stores/index.js b/packages/frontend-core/src/components/grid/stores/index.js index aa552a9ffe..588b568c8e 100644 --- a/packages/frontend-core/src/components/grid/stores/index.js +++ b/packages/frontend-core/src/components/grid/stores/index.js @@ -11,8 +11,14 @@ import * as Users from "./users" import * as Validation from "./validation" import * as Viewport from "./viewport" import * as Clipboard from "./clipboard" +import * as Config from "./config" +import * as Sort from "./sort" +import * as Filter from "./filter" const DependencyOrderedStores = [ + Config, + Sort, + Filter, Bounds, Scroll, Rows, diff --git a/packages/frontend-core/src/components/grid/stores/sort.js b/packages/frontend-core/src/components/grid/stores/sort.js new file mode 100644 index 0000000000..211124f640 --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/sort.js @@ -0,0 +1,27 @@ +import { writable } from "svelte/store" + +export const createStores = context => { + const { props } = context + + // Initialise to default props + const sort = writable({ + column: props.initialSortColumn, + order: props.initialSortOrder || "ascending", + }) + + return { + sort, + } +} + +export const initialise = context => { + const { sort, initialSortColumn, initialSortOrder } = context + + // Reset sort when initial sort props change + initialSortColumn.subscribe(newSortColumn => { + sort.update(state => ({ ...state, column: newSortColumn })) + }) + initialSortOrder.subscribe(newSortOrder => { + sort.update(state => ({ ...state, order: newSortOrder })) + }) +} diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js index f5c0905320..168b0c8184 100644 --- a/packages/frontend-core/src/components/grid/stores/ui.js +++ b/packages/frontend-core/src/components/grid/stores/ui.js @@ -8,12 +8,13 @@ import { NewRowID, } from "../lib/constants" -export const createStores = () => { +export const createStores = context => { + const { props } = context const focusedCellId = writable(null) const focusedCellAPI = writable(null) const selectedRows = writable({}) const hoveredRowId = writable(null) - const rowHeight = writable(DefaultRowHeight) + const rowHeight = writable(props.initialRowHeight || DefaultRowHeight) const previousFocusedRowId = writable(null) const gridFocused = writable(false) const isDragging = writable(false) @@ -98,9 +99,9 @@ export const deriveStores = context => { // Derive the amount of content lines to show in cells depending on row height const contentLines = derived(rowHeight, $rowHeight => { - if ($rowHeight === LargeRowHeight) { + if ($rowHeight >= LargeRowHeight) { return 3 - } else if ($rowHeight === MediumRowHeight) { + } else if ($rowHeight >= MediumRowHeight) { return 2 } return 1 @@ -133,6 +134,7 @@ export const initialise = context => { hoveredRowId, table, rowHeight, + initialRowHeight, } = context // Ensure we clear invalid rows from state if they disappear @@ -189,4 +191,7 @@ export const initialise = context => { table.subscribe($table => { rowHeight.set($table?.rowHeight || DefaultRowHeight) }) + + // Reset row height when initial row height prop changes + initialRowHeight.subscribe(rowHeight.set) } diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js index e3ec87a5e9..26e44410ba 100644 --- a/packages/frontend-core/src/utils/index.js +++ b/packages/frontend-core/src/utils/index.js @@ -3,5 +3,5 @@ export * as JSONUtils from "./json" export * as CookieUtils from "./cookies" export * as RoleUtils from "./roles" export * as Utils from "./utils" -export { memo } from "./memo" +export { memo, derivedMemo } from "./memo" export { createWebsocket } from "./websocket" diff --git a/packages/frontend-core/src/utils/memo.js b/packages/frontend-core/src/utils/memo.js index d46b264d1b..ba0e3f3490 100644 --- a/packages/frontend-core/src/utils/memo.js +++ b/packages/frontend-core/src/utils/memo.js @@ -1,4 +1,4 @@ -import { writable, get } from "svelte/store" +import { writable, get, derived } from "svelte/store" // A simple svelte store which deeply compares all changes and ensures that // subscribed children will only fire when a new value is actually set @@ -33,3 +33,11 @@ export const memo = initialValue => { }, } } + +// Enriched version of svelte's derived store which returns a memo +export const derivedMemo = (store, derivation) => { + const derivedStore = derived(store, derivation) + const memoStore = memo(get(derivedStore)) + derivedStore.subscribe(memoStore.set) + return memoStore +} From fe2d63f741383d1ebf088554d0e3b331f9dd2e6f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 19 Jun 2023 17:33:10 +0100 Subject: [PATCH 054/343] Fix lint --- .../builder/src/components/start/CreateAppModal.svelte | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index f6051f54e9..cf42668add 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -1,12 +1,6 @@ -
+
Date: Mon, 19 Jun 2023 17:16:30 +0000 Subject: [PATCH 088/343] Bump version to 2.7.25-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 22be73c393..26b1168353 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.4", + "version": "2.7.25-alpha.5", "npmClient": "yarn", "packages": [ "packages/backend-core", From 757d2d11eff6f558e7bfaa6ea5b6e75432106cf9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:21:14 +0100 Subject: [PATCH 089/343] Add functionality to suppress errors to avoid spam in grids in client apps --- packages/client/src/api/api.js | 5 +++-- packages/frontend-core/src/api/index.js | 10 ++++++++-- packages/frontend-core/src/api/rows.js | 4 +++- .../frontend-core/src/components/grid/stores/rows.js | 12 ++++++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js index b4a137f85d..4062bd3b73 100644 --- a/packages/client/src/api/api.js +++ b/packages/client/src/api/api.js @@ -35,7 +35,8 @@ export const API = createAPIClient({ // We could also log these to sentry. // Or we could check error.status and redirect to login on a 403 etc. onError: error => { - const { status, method, url, message, handled } = error || {} + const { status, method, url, message, handled, suppressErrors } = + error || {} const ignoreErrorUrls = [ "bbtel", "/api/global/self", @@ -49,7 +50,7 @@ export const API = createAPIClient({ } // Notify all errors - if (message) { + if (message && !suppressErrors) { // Don't notify if the URL contains the word analytics as it may be // blocked by browser extensions let ignore = false diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index 739e0fe711..05abded61c 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -75,7 +75,11 @@ export const createAPIClient = config => { let cache = {} // Generates an error object from an API response - const makeErrorFromResponse = async (response, method) => { + const makeErrorFromResponse = async ( + response, + method, + suppressErrors = false + ) => { // Try to read a message from the error let message = response.statusText let json = null @@ -96,6 +100,7 @@ export const createAPIClient = config => { url: response.url, method, handled: true, + suppressErrors, } } @@ -119,6 +124,7 @@ export const createAPIClient = config => { json = true, external = false, parseResponse, + suppressErrors = false, }) => { // Ensure we don't do JSON processing if sending a GET request json = json && method !== "GET" @@ -174,7 +180,7 @@ export const createAPIClient = config => { } } else { delete cache[url] - throw await makeErrorFromResponse(response, method) + throw await makeErrorFromResponse(response, method, suppressErrors) } } diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js index 41ba505d81..8e8570ea2a 100644 --- a/packages/frontend-core/src/api/rows.js +++ b/packages/frontend-core/src/api/rows.js @@ -16,14 +16,16 @@ export const buildRowEndpoints = API => ({ /** * Creates or updates a row in a table. * @param row the row to save + * @param suppressErrors whether or not to suppress error notifications */ - saveRow: async row => { + saveRow: async (row, suppressErrors = false) => { if (!row?.tableId) { return } return await API.post({ url: `/api/${row.tableId}/rows`, body: row, + suppressErrors, }) }, diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js index 9e12e16eb1..d7e623692e 100644 --- a/packages/frontend-core/src/components/grid/stores/rows.js +++ b/packages/frontend-core/src/components/grid/stores/rows.js @@ -4,6 +4,8 @@ import { notifications } from "@budibase/bbui" import { NewRowID, RowPageSize } from "../lib/constants" import { tick } from "svelte" +const SuppressErrors = true + export const createStores = () => { const rows = writable([]) const table = writable(null) @@ -209,7 +211,10 @@ export const deriveStores = context => { const addRow = async (row, idx, bubble = false) => { try { // Create row - const newRow = await API.saveRow({ ...row, tableId: get(tableId) }) + const newRow = await API.saveRow( + { ...row, tableId: get(tableId) }, + SuppressErrors + ) // Update state if (idx != null) { @@ -336,7 +341,10 @@ export const deriveStores = context => { ...state, [rowId]: true, })) - const saved = await API.saveRow({ ...row, ...get(rowChangeCache)[rowId] }) + const saved = await API.saveRow( + { ...row, ...get(rowChangeCache)[rowId] }, + SuppressErrors + ) // Update state after a successful change if (saved?._id) { From 289a75fc9a8e869e5a8cec2bade95ef04d3d033e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 19 Jun 2023 18:28:38 +0100 Subject: [PATCH 090/343] Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. --- packages/backend-core/jest.config.ts | 2 + packages/server/src/integrations/mongodb.ts | 6 ++- .../src/api/controllers/global/users.ts | 2 +- qa-core/package.json | 1 + qa-core/scripts/createUser.js | 49 +++++++++++++++++++ .../api/AccountInternalAPIClient.ts | 3 +- .../api/BudibaseInternalAPIClient.ts | 3 +- .../dataSources/mongoDB.integration.spec.ts | 2 +- qa-core/src/jest/globalSetup.ts | 1 + .../public-api/api/BudibasePublicAPIClient.ts | 3 +- yarn.lock | 19 ++++++- 11 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 qa-core/scripts/createUser.js diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts index 1e69797e71..8d64b24a2f 100644 --- a/packages/backend-core/jest.config.ts +++ b/packages/backend-core/jest.config.ts @@ -31,4 +31,6 @@ const config: Config.InitialOptions = { coverageReporters: ["lcov", "json", "clover"], } +process.env.DISABLE_PINO_LOGGER = "1" + export default config diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index f076536344..0a2dfd856c 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -489,7 +489,11 @@ class MongoIntegration implements IntegrationBase { switch (query.extra.actionType) { case "find": { - return await collection.find(json).toArray() + if (json) { + return await collection.find(json).toArray() + } else { + return await collection.find().toArray() + } } case "findOne": { return await collection.findOne(json) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 33335379c0..320f7be01a 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -38,7 +38,7 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: UserCtx) => { try { - const currentUserId = ctx.user._id + const currentUserId = ctx.user?._id const requestUser = ctx.request.body const user = await userSdk.save(requestUser, { currentUserId }) diff --git a/qa-core/package.json b/qa-core/package.json index 1d36d179ee..13f2e80332 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -10,6 +10,7 @@ }, "scripts": { "setup": "yarn && node scripts/createEnv.js", + "user": "yarn && node scripts/createEnv.js && node scripts/createUser.js", "test": "jest --runInBand --json --outputFile=testResults.json --forceExit", "test:watch": "yarn run test --watch", "test:debug": "DEBUG=1 yarn run test", diff --git a/qa-core/scripts/createUser.js b/qa-core/scripts/createUser.js new file mode 100644 index 0000000000..200bf91fc4 --- /dev/null +++ b/qa-core/scripts/createUser.js @@ -0,0 +1,49 @@ +const dotenv = require("dotenv") +const { join } = require("path") +const fs = require("fs") +const fetch = require("node-fetch") + +function getVarFromDotEnv(path, varName) { + const parsed = dotenv.parse(fs.readFileSync(path)) + return parsed[varName] +} + +async function createUser() { + const serverPath = join(__dirname, "..", "..", "packages", "server", ".env") + const qaCorePath = join(__dirname, "..", ".env") + const apiKey = getVarFromDotEnv(serverPath, "INTERNAL_API_KEY") + const username = getVarFromDotEnv(qaCorePath, "BB_ADMIN_USER_EMAIL") + const password = getVarFromDotEnv(qaCorePath, "BB_ADMIN_USER_PASSWORD") + const url = getVarFromDotEnv(qaCorePath, "BUDIBASE_URL") + const resp = await fetch(`${url}/api/public/v1/users`, { + method: "POST", + headers: { + "Content-Type": "application/json", + "x-budibase-api-key": apiKey, + }, + body: JSON.stringify({ + email: username, + password, + builder: { + global: true, + }, + admin: { + global: true, + }, + roles: {}, + }), + }) + if (resp.status !== 200) { + throw new Error(await resp.text()) + } else { + return await resp.json() + } +} + +createUser() + .then(() => { + console.log("User created - ready to use") + }) + .catch(err => { + console.error("Failed to create user - ", err) + }) diff --git a/qa-core/src/account-api/api/AccountInternalAPIClient.ts b/qa-core/src/account-api/api/AccountInternalAPIClient.ts index df58ab0ce3..85807fd87a 100644 --- a/qa-core/src/account-api/api/AccountInternalAPIClient.ts +++ b/qa-core/src/account-api/api/AccountInternalAPIClient.ts @@ -67,11 +67,12 @@ export default class AccountInternalAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts b/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts index a6921a75b2..ba70bb5ce0 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts @@ -58,11 +58,12 @@ class BudibaseInternalAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts index 27fc143554..ace9ef32c5 100644 --- a/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts @@ -2,7 +2,7 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" import { Query } from "@budibase/types" -describe("Internal API - Data Sources: MongoDB", () => { +xdescribe("Internal API - Data Sources: MongoDB", () => { const config = new TestConfiguration() beforeAll(async () => { diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts index 12d227df02..040a65ecef 100644 --- a/qa-core/src/jest/globalSetup.ts +++ b/qa-core/src/jest/globalSetup.ts @@ -1,3 +1,4 @@ +process.env.DISABLE_PINO_LOGGER = "1" import { DEFAULT_TENANT_ID, logging } from "@budibase/backend-core" import { AccountInternalAPI } from "../account-api" import * as fixtures from "../internal-api/fixtures" diff --git a/qa-core/src/public-api/api/BudibasePublicAPIClient.ts b/qa-core/src/public-api/api/BudibasePublicAPIClient.ts index f4fe978812..b75393bdaa 100644 --- a/qa-core/src/public-api/api/BudibasePublicAPIClient.ts +++ b/qa-core/src/public-api/api/BudibasePublicAPIClient.ts @@ -57,11 +57,12 @@ class BudibasePublicAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/yarn.lock b/yarn.lock index b15c549640..de64f7d4bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,6 +2489,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/source-sans-pro@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855" + integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ== + "@fortawesome/fontawesome-common-types@6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b" @@ -8406,7 +8411,7 @@ chmodr@1.2.0: resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== -chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -11850,7 +11855,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3: +fast-glob@^3.0.3, fast-glob@^3.2.11: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -25423,6 +25428,16 @@ vite-node@0.29.8: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" +vite-plugin-static-copy@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e" + integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw== + dependencies: + chokidar "^3.5.3" + fast-glob "^3.2.11" + fs-extra "^11.1.0" + picocolors "^1.0.0" + "vite@^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6" From 7b75d7f13de8bb0d955ee407190afb7a9956792c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:32:03 +0100 Subject: [PATCH 091/343] Update column editor and filter editor to make action buttons full width --- .../controls/ColumnEditor/ColumnEditor.svelte | 10 +++++++++- .../controls/FilterEditor/FilterEditor.svelte | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte index 59340d4898..fcad4be180 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte @@ -75,7 +75,9 @@ } -Configure columns +
+ Configure columns +
Configure the columns in your {subject.toLowerCase()}. @@ -89,3 +91,9 @@ {allowCellEditing} /> + + diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte index 1d4b629f2e..9d48789947 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -20,15 +20,26 @@ $: datasource = getDatasourceForProvider($currentAsset, componentInstance) $: schema = getSchemaForDatasource($currentAsset, datasource)?.schema $: schemaFields = Object.values(schema || {}) + $: text = getText(value) async function saveFilter() { dispatch("change", tempValue) notifications.success("Filters saved") drawer.hide() } + + const getText = filters => { + if (!filters?.length) { + return "No filters set" + } else { + return `${filters.length} filter${filters.length === 1 ? "" : "s"} set` + } + } -Define filters +
+ {text} +
(tempValue = e.detail)} /> + + From e436c1da1c8266c612751b6f55394a727f30f59c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:32:13 +0100 Subject: [PATCH 092/343] Use old icon for grids --- packages/client/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index e425edc1b1..73ab2ee3ee 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5228,13 +5228,13 @@ }, "gridblock": { "name": "Grid block", - "icon": "ViewTable", + "icon": "Table", "styles": ["size"], "size": { "width": 600, "height": 400 }, - "info": "Grid Block is only compatible with internal or SQL tables", + "info": "Grid Blocks are only compatible with internal or SQL tables", "settings": [ { "type": "table", @@ -5306,7 +5306,7 @@ }, { "type": "boolean", - "label": "Stripe rows", + "label": "High contrast", "key": "stripeRows", "defaultValue": false } From acfe69a3d51e08cf9c548bc18203014255102967 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 19 Jun 2023 18:34:51 +0100 Subject: [PATCH 093/343] Remove the doble deep format references --- lerna.json | 18 ++---------------- package.json | 14 +------------- packages/pro | 2 +- packages/server/jest.config.ts | 5 ++--- packages/server/nodemon.json | 2 +- packages/server/tsconfig.build.json | 2 +- packages/worker/jest.config.ts | 8 +++----- packages/worker/nodemon.json | 2 +- packages/worker/tsconfig.build.json | 2 +- scripts/bootstrap.sh | 2 +- scripts/link-dependencies.sh | 4 ++-- scripts/syncProPackage.js | 2 +- yarn.lock | 24 ++++++++++++++++++++++-- 13 files changed, 39 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index 2739b40732..547f5d382e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,21 +1,7 @@ { "version": "2.7.25-alpha.3", "npmClient": "yarn", - "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" - ], + "packages": ["packages/*"], "useWorkspaces": true, "command": { "publish": { @@ -31,4 +17,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 56f015f8c0..d097474309 100644 --- a/package.json +++ b/package.json @@ -95,19 +95,7 @@ }, "workspaces": { "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" + "packages/*" ] }, "resolutions": { diff --git a/packages/pro b/packages/pro index f4b8449aac..d89fb653d6 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34 +Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989 diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index a7710d1e33..7458420643 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -21,9 +21,8 @@ const baseConfig: Config.InitialProjectOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - baseConfig.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + baseConfig.moduleNameMapper!["@budibase/pro"] = "/../pro" } const config: Config.InitialOptions = { diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index 77375546e1..47c60d0966 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 355b7ed6da..4e509bd14e 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -17,7 +17,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 49b6c5d425..1cbf22c22a 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -21,11 +21,9 @@ const config: Config.InitialOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - config.moduleNameMapper!["@budibase/pro/(.*)"] = - "/../pro/packages/pro/$1" - config.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + config.moduleNameMapper!["@budibase/pro/(.*)"] = "/../pro/$1" + config.moduleNameMapper!["@budibase/pro"] = "/../pro/src" } export default config diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json index d92cfe22b5..9585d85af5 100644 --- a/packages/worker/nodemon.json +++ b/packages/worker/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index 59e4bf7d8a..bc477abe4d 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -16,7 +16,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9a0bc18a28..a5a4fc0108 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,4 +1,4 @@ -if [ -d "packages/pro/packages" ]; then +if [ -d "packages/pro/src" ]; then cd packages/pro yarn diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 9b85f9895d..ed42f29b4a 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -34,7 +34,7 @@ yarn unlink yarn link cd - -if [ -d packages/pro/packages ]; then +if [ -d packages/pro/src ]; then pro_loaded_locally=true else pro_loaded_locally=false @@ -42,7 +42,7 @@ fi if [ $pro_loaded_locally = true ]; then echo "Linking pro" - cd packages/pro/packages/pro + cd packages/pro yarn unlink yarn link cd - diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index bbbe33f44b..5ea49142ee 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -3,7 +3,7 @@ const path = require("path") const { execSync } = require("child_process") let version = "0.0.0" -const localPro = fs.existsSync("packages/pro/packages") +const localPro = fs.existsSync("packages/pro/src") if (!localPro) { const branchName = execSync("git rev-parse --abbrev-ref HEAD") .toString() diff --git a/yarn.lock b/yarn.lock index b15c549640..ec4a060f15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,6 +2489,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/source-sans-pro@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855" + integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ== + "@fortawesome/fontawesome-common-types@6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b" @@ -8406,7 +8411,7 @@ chmodr@1.2.0: resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== -chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -11850,7 +11855,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3: +fast-glob@^3.0.3, fast-glob@^3.2.11: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -13661,6 +13666,11 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +husky@^7.0.1: + version "7.0.4" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" + integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== + husky@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" @@ -25423,6 +25433,16 @@ vite-node@0.29.8: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" +vite-plugin-static-copy@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e" + integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw== + dependencies: + chokidar "^3.5.3" + fast-glob "^3.2.11" + fs-extra "^11.1.0" + picocolors "^1.0.0" + "vite@^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6" From 9fd04cc2c7c82f8fe5a6f3c0efd86fd05edce36d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:49:57 +0100 Subject: [PATCH 094/343] Update multiple settings components to enable more generic usage of column selectors and remove some bespoke copy from generic components. Enable display names for grid columns --- .../ColumnEditor/BasicColumnEditor.svelte | 7 +------ .../controls/ColumnEditor/ColumnDrawer.svelte | 6 +++--- .../controls/ColumnEditor/ColumnEditor.svelte | 6 +----- .../settings/controls/FieldConfiguration.svelte | 2 +- packages/client/manifest.json | 7 +++---- .../client/src/components/app/GridBlock.svelte | 16 +++++++++++++++- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte index 053735cc6d..f051d68a48 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte @@ -2,9 +2,4 @@ import ColumnEditor from "./ColumnEditor.svelte" - + diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte index 87fbba3b52..6e57d20751 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte @@ -142,10 +142,10 @@
- By default, all table columns will automatically be shown. + By default, all columns will automatically be shown.
- You can manually control which columns are included in your table, - and their appearance, by adding them below. + You can manually control which columns are included by adding them + below.
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte index fcad4be180..b34edd880a 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte @@ -13,7 +13,6 @@ export let componentInstance export let value = [] export let allowCellEditing = true - export let subject = "Table" const dispatch = createEventDispatcher() @@ -78,10 +77,7 @@
Configure columns
- - - Configure the columns in your {subject.toLowerCase()}. - + import { Button, ActionButton, Drawer } from "@budibase/bbui" import { createEventDispatcher } from "svelte" - import ColumnDrawer from "./ColumnDrawer.svelte" + import ColumnDrawer from "./ColumnEditor/ColumnDrawer.svelte" import { cloneDeep } from "lodash/fp" import { getDatasourceForProvider, diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 73ab2ee3ee..568c17d034 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5243,11 +5243,10 @@ "required": true }, { - "type": "multifield", + "type": "columns/basic", "label": "Columns", - "key": "columnWhitelist", - "dependsOn": "table", - "placeholder": "All columns" + "key": "columns", + "dependsOn": "table" }, { "type": "filter", diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index ee663ebd6b..4314f6e99c 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -13,10 +13,23 @@ export let initialSortColumn = null export let initialSortOrder = null export let initialRowHeight = null - export let columnWhitelist = null + export let columns = null const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") + + $: columnWhitelist = columns?.map(col => col.name) + $: schemaOverrides = getSchemaOverrides(columns) + + const getSchemaOverrides = columns => { + let overrides = {} + columns?.forEach(column => { + overrides[column.name] = { + displayName: column.displayName || column.name, + } + }) + return overrides + }
Date: Mon, 19 Jun 2023 18:51:29 +0100 Subject: [PATCH 095/343] Update placeholder text for grid block settings --- packages/client/manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 568c17d034..eb9a45dda1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5256,7 +5256,8 @@ { "type": "field/sortable", "label": "Sort column", - "key": "initialSortColumn" + "key": "initialSortColumn", + "placeholder": "Default" }, { "type": "select", From 16280421a446f9c68efc987d56331bc250c84964 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Jun 2023 17:55:35 +0000 Subject: [PATCH 096/343] Bump version to 2.7.25-alpha.6 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 26b1168353..00e9063cfe 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.5", + "version": "2.7.25-alpha.6", "npmClient": "yarn", "packages": [ "packages/backend-core", From 82bafacd72500428cb2580b5c7a8f0454caefad3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Jun 2023 18:40:22 +0000 Subject: [PATCH 097/343] Bump version to 2.7.25-alpha.7 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index eb66b64978..c228cfe62e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.6", + "version": "2.7.25-alpha.7", "npmClient": "yarn", "useNx": true, "packages": [ @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 164bacf783444b46ea81139adcc3eb87acda28b8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 07:42:26 +0100 Subject: [PATCH 098/343] Lint --- packages/frontend-core/src/components/grid/stores/filter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.js index 1f01aaec40..76c6a86c21 100644 --- a/packages/frontend-core/src/components/grid/stores/filter.js +++ b/packages/frontend-core/src/components/grid/stores/filter.js @@ -1,5 +1,4 @@ import { writable } from "svelte/store" -import { derivedMemo } from "../../../utils" export const createStores = context => { const { props } = context From 901ba5363036c93cc5d039d3fb200948ddb6ced4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 07:55:46 +0100 Subject: [PATCH 099/343] Respect the allowExpandRows flag in when considering if rows can be edited in modals --- .../src/components/grid/overlays/MenuOverlay.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte index 15ca08dbdf..36ea977913 100644 --- a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte @@ -72,7 +72,9 @@ dispatch("edit-row", $focusedRow)} on:click={menu.actions.close} > From 7486d3dde05c5edc3ce25a67cdad2f2c70cab1f3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 08:01:41 +0100 Subject: [PATCH 100/343] Close context menu when using mouse wheel or menu touching scrollbars --- .../components/grid/layout/GridScrollWrapper.svelte | 6 ++++++ .../src/components/grid/overlays/ScrollOverlay.svelte | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte b/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte index 04f0960057..7599135c63 100644 --- a/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte +++ b/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte @@ -12,6 +12,7 @@ bounds, hoveredRowId, hiddenColumnsWidth, + menu, } = getContext("grid") export let scrollVertically = false @@ -30,6 +31,11 @@ const handleWheel = e => { e.preventDefault() debouncedHandleWheel(e.deltaX, e.deltaY, e.clientY) + + // If a context menu was visible, hide it + if ($menu.visible) { + menu.actions.close() + } } const debouncedHandleWheel = domDebounce((deltaX, deltaY, clientY) => { const { top, left } = $scroll diff --git a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte index 654a7529b5..315c3d21e5 100644 --- a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte @@ -16,6 +16,7 @@ scrollTop, height, isDragging, + menu, } = getContext("grid") // State for dragging bars @@ -45,6 +46,13 @@ $: availWidth = renderWidth - barWidth $: barLeft = ScrollBarSize + availWidth * ($scrollLeft / $maxScrollLeft) + // Helper to close the context menu if it's open + const closeMenu = () => { + if ($menu.visible) { + menu.actions.close() + } + } + // V scrollbar drag handlers const startVDragging = e => { e.preventDefault() @@ -53,6 +61,7 @@ document.addEventListener("mousemove", moveVDragging) document.addEventListener("mouseup", stopVDragging) isDraggingV = true + closeMenu() } const moveVDragging = domDebounce(e => { const delta = e.clientY - initialMouse @@ -77,6 +86,7 @@ document.addEventListener("mousemove", moveHDragging) document.addEventListener("mouseup", stopHDragging) isDraggingH = true + closeMenu() } const moveHDragging = domDebounce(e => { const delta = e.clientX - initialMouse From 2df810c59b1520096d33a3db70d36ba67e120b84 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 09:34:27 +0100 Subject: [PATCH 101/343] Update grid context menu position determination to work regardless of page scroll offsets --- .../src/components/grid/cells/GridCell.svelte | 5 ++++ .../src/components/grid/stores/menu.js | 25 ++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index fe4bd70ba4..ac2a4da5a0 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -82,6 +82,11 @@ align-items: center; } + /* Disable pointer events for non-focused cells */ + .cell:not(.focused) :global(*) { + pointer-events: none; + } + /* Cell border */ .cell.focused:after, .cell.error:after, diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.js index 3f34c0a266..db56f57ce9 100644 --- a/packages/frontend-core/src/components/grid/stores/menu.js +++ b/packages/frontend-core/src/components/grid/stores/menu.js @@ -1,5 +1,5 @@ -import { writable, get } from "svelte/store" -import { GutterWidth } from "../lib/constants" +import { writable } from "svelte/store" +import { tick } from "svelte" export const createStores = () => { const menu = writable({ @@ -14,18 +14,25 @@ export const createStores = () => { } export const deriveStores = context => { - const { menu, bounds, focusedCellId, stickyColumn, rowHeight } = context + const { menu, focusedCellId, rand } = context const open = (cellId, e) => { - const $bounds = get(bounds) - const $stickyColumn = get(stickyColumn) - const $rowHeight = get(rowHeight) e.preventDefault() + + // Get DOM node for grid data wrapper to compute relative position to + const gridNode = document.getElementById(`grid-${rand}`) + const dataNode = gridNode?.getElementsByClassName("grid-data-outer")?.[0] + if (!dataNode) { + return + } + + // Compute bounds of cell relative to outer data node + const targetBounds = e.target.getBoundingClientRect() + const dataBounds = dataNode.getBoundingClientRect() focusedCellId.set(cellId) menu.set({ - left: - e.clientX - $bounds.left + GutterWidth + ($stickyColumn?.width || 0), - top: e.clientY - $bounds.top + $rowHeight, + left: targetBounds.left - dataBounds.left + e.offsetX, + top: targetBounds.top - dataBounds.top + e.offsetY, visible: true, }) } From c1f7774602126beab8ef381082f626f71c119e49 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 09:34:56 +0100 Subject: [PATCH 102/343] Lint --- packages/frontend-core/src/components/grid/stores/menu.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.js index db56f57ce9..f1d822aeaf 100644 --- a/packages/frontend-core/src/components/grid/stores/menu.js +++ b/packages/frontend-core/src/components/grid/stores/menu.js @@ -1,5 +1,4 @@ import { writable } from "svelte/store" -import { tick } from "svelte" export const createStores = () => { const menu = writable({ From b712136a6b6f0d181341684b0791936f668a86cb Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 20 Jun 2023 09:56:58 +0100 Subject: [PATCH 103/343] There was a chance or URL overlap - removing this chance. --- qa-core/src/internal-api/fixtures/applications.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qa-core/src/internal-api/fixtures/applications.ts b/qa-core/src/internal-api/fixtures/applications.ts index 542d4345dc..01dd18fc6a 100644 --- a/qa-core/src/internal-api/fixtures/applications.ts +++ b/qa-core/src/internal-api/fixtures/applications.ts @@ -1,19 +1,23 @@ import { generator } from "../../shared" import { CreateAppRequest } from "../../types" +function uniqueWord() { + return generator.word() + generator.hash() +} + export const generateApp = ( overrides: Partial = {} ): CreateAppRequest => ({ - name: generator.word() + generator.hash(), - url: `/${generator.word() + generator.hash()}`, + name: uniqueWord(), + url: `/${uniqueWord()}`, ...overrides, }) // Applications type doesn't work here, save to add useTemplate parameter? export const appFromTemplate = (): CreateAppRequest => { return { - name: generator.word(), - url: `/${generator.word()}`, + name: uniqueWord(), + url: `/${uniqueWord()}`, // @ts-ignore useTemplate: "true", templateName: "Near Miss Register", From bbc21c7c19d30400214cd1ffd24aec9ab2a66b1a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Jun 2023 09:48:10 +0000 Subject: [PATCH 104/343] Bump version to 2.7.25-alpha.8 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c228cfe62e..eab4d03540 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.7", + "version": "2.7.25-alpha.8", "npmClient": "yarn", "useNx": true, "packages": [ From 9d6fbf067f52c1e87d31e18ae81c4d443eb444d7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 11:10:23 +0100 Subject: [PATCH 105/343] Restore pointer events for unfocused cells --- .../frontend-core/src/components/grid/cells/GridCell.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index ac2a4da5a0..fe4bd70ba4 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -82,11 +82,6 @@ align-items: center; } - /* Disable pointer events for non-focused cells */ - .cell:not(.focused) :global(*) { - pointer-events: none; - } - /* Cell border */ .cell.focused:after, .cell.error:after, From 6ed5894441ff370cbc6ae0bf893b895b1fdb6132 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:14:23 +0100 Subject: [PATCH 106/343] Type --- packages/server/src/api/controllers/datasource.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 1d7643dd7b..86669845e6 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -26,7 +26,6 @@ import { IntegrationBase, DatasourcePlus, SourceName, - Ctx, } from "@budibase/types" import sdk from "../../sdk" import { builderSocket } from "../../websockets" @@ -443,7 +442,7 @@ export async function query(ctx: UserCtx) { } } -export async function getExternalSchema(ctx: Ctx) { +export async function getExternalSchema(ctx: UserCtx) { const { datasource } = ctx.request.body const enrichedDatasource = await getAndMergeDatasource(datasource) const connector = await getConnector(enrichedDatasource) From 94b159b331563eb9566d1d2502105792b8793355 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:24:21 +0100 Subject: [PATCH 107/343] Fix merge --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0ac33d1a32..b7d13b4ece 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,6 @@ "version": "2.7.25-alpha.8", "npmClient": "yarn", "packages": ["packages/*"], - "useWorkspaces": true, "useNx": true, "command": { "publish": { From 8ab5913eb9a7bbd0bbbcc3529a9ffdf4c05129b3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:33:38 +0100 Subject: [PATCH 108/343] Change url --- packages/server/src/api/routes/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index c05d1753a2..7b4945806a 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -67,7 +67,7 @@ router datasourceController.destroy ) .get( - "/api/datasources/:datasourceId/external-schema", + "/api/datasources/:datasourceId/schema/external", authorized(permissions.BUILDER), datasourceController.getExternalSchema ) From c0f95b8929eb6d287b7556bcd08211a73a7632d1 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:45:37 +0100 Subject: [PATCH 109/343] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index d89fb653d6..1ec833d6b2 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989 +Subproject commit 1ec833d6b25db08585b3d208eeee852710fb5f26 From 978e78ee26079a96be0cde295889c4b85be68068 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:57:25 +0100 Subject: [PATCH 110/343] Change PR checks --- .github/workflows/budibase_ci.yml | 38 ++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 6c875f2dfe..27501371be 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -135,15 +135,31 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - fetch-depth: 0 - - name: Check submodule + + - name: Fetch develop branch + run: git fetch origin develop + + - name: Check pro commit + id: pro_commit run: | - cd packages/pro - git fetch - if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/develop; then - echo "Current commit has not been merged to develop" - echo "Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md" - exit 1 - else - echo "All good, the submodule had been merged!" - fi + cd submodule + pro_commit=$(git rev-parse HEAD) + latest_commit=$(git rev-parse origin/develop) + echo "::set-output name=pro_commit::$pro_commit" + echo "::set-output name=latest_commit::$latest_commit" + + - name: Check submodule merged to develop + uses: actions/github-script@v4 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const submoduleCommit = '${{ steps.pro_commit.outputs.pro_commit }}'; + const latestCommit = '${{ steps.pro_commit.outputs.latest_commit }}'; + + if (submoduleCommit !== latestCommit) { + console.error('Submodule commit does not match the latest commit on the develop branch.'); + console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md') + process.exit(1); + } else { + console.log('All good, the submodule had been merged and setup correctly!') + } From aa3294f08e7b7b2f8c07e6b7c427799786838853 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 12:00:30 +0100 Subject: [PATCH 111/343] Fix --- .github/workflows/budibase_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 27501371be..fad4055fe9 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -138,6 +138,8 @@ jobs: - name: Fetch develop branch run: git fetch origin develop + with: + token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Check pro commit id: pro_commit From d82c06d96a29adf1a5018de5ed02f169f2c2d1b2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Jun 2023 11:01:30 +0000 Subject: [PATCH 112/343] Bump version to 2.7.25-alpha.9 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index eab4d03540..9aad207176 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.8", + "version": "2.7.25-alpha.9", "npmClient": "yarn", "useNx": true, "packages": [ From 602ea9bc4ef976bf01e72ba96943db83cfdbbe73 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 20 Jun 2023 12:33:18 +0100 Subject: [PATCH 113/343] General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. --- .../commandPalette/CommandPalette.svelte | 4 +- .../src/components/deploy/AppActions.svelte | 137 +++++++++++++++++- .../src/components/deploy/RevertModal.svelte | 3 +- .../src/components/deploy/VersionModal.svelte | 2 + .../builder/app/[application]/_layout.svelte | 26 +++- .../app/[application]/settings/_layout.svelte | 2 +- .../app/[application]/settings/index.svelte | 6 - .../settings/name-and-url.svelte | 3 - .../pages/builder/portal/apps/index.svelte | 1 - .../portal/users/groups/[groupId].svelte | 2 +- .../portal/users/users/[userId].svelte | 2 +- packages/builder/src/stores/portal/index.js | 1 - packages/server/src/middleware/builder.ts | 6 - 13 files changed, 159 insertions(+), 36 deletions(-) diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte index 3a369446a3..5421e2f123 100644 --- a/packages/builder/src/components/commandPalette/CommandPalette.svelte +++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte @@ -55,7 +55,7 @@ name: "Automations", description: "", icon: "Compass", - action: () => $goto("./automate"), + action: () => $goto("./automation"), }, { type: "Publish", @@ -127,7 +127,7 @@ type: "Automation", name: automation.name, icon: "ShareAndroid", - action: () => $goto(`./automate/${automation._id}`), + action: () => $goto(`./automation/${automation._id}`), })), ...Constants.Themes.map(theme => ({ type: "Change Builder Theme", diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 84feb4f189..def44646dd 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -24,12 +24,18 @@ import { onMount } from "svelte" import DeployModal from "components/deploy/DeployModal.svelte" import { apps } from "stores/portal" - import { store } from "builderStore" + import { + store, + screenHistoryStore, + automationHistoryStore, + } from "builderStore" import TourWrap from "components/portal/onboarding/TourWrap.svelte" import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js" import { url, goto } from "@roxi/routify" + import { isEqual, cloneDeep } from "lodash" export let application + export let loaded let unpublishModal let updateAppModal @@ -40,7 +46,7 @@ let appActionPopoverOpen = false let appActionPopoverAnchor - let publishing + let publishing = false $: filteredApps = $apps.filter(app => app.devId === application) $: selectedApp = filteredApps?.length ? filteredApps[0] : null @@ -58,6 +64,81 @@ $store.version && $store.upgradableVersion !== $store.version + let cachedVersion = $store.version + "" + let versionAltered = false + let screensAltered = false + let automationsAltered = false + + let publishRecord = { + screenHistory: null, + automationHistory: null, + } + + //Meta Changes + let appMeta = {} + let appMetaUpdated = false + let appMetaInitialised = false + + const unsub = store.subscribe(state => { + let { name, url: appUrl, navigation, theme, customTheme, icon } = state + const update = { + name, + url: appUrl, + navigation: { ...cloneDeep(navigation) }, + theme, + customTheme, + icon, + } + + if (!isEqual(update, appMeta)) { + if (!appMetaInitialised) { + appMetaInitialised = true + } else { + appMetaUpdated = true + } + appMeta = { + ...(appMeta || {}), + ...update, + } + } + }) + + const monitorHistoryStore = (historyStore, publishedHistoryId, cb) => { + if (!historyStore.history.length || historyStore.loading) { + return + } + if (!historyStore.canUndo) { + cb(publishedHistoryId != -1) + return + } + const historyEntry = historyStore.history[historyStore.position - 1] + + if (historyEntry) { + cb(publishedHistoryId != historyEntry.id) + } + } + + $: monitorHistoryStore( + $screenHistoryStore, + publishRecord.screenHistory, + updated => { + screensAltered = updated + } + ) + + $: monitorHistoryStore( + $automationHistoryStore, + publishRecord.automationHistory, + updated => { + automationsAltered = updated + } + ) + + $: versionAltered = cachedVersion != $store.version + $: altered = + screensAltered || appMetaUpdated || automationsAltered || versionAltered + $: canPublish = (!isPublished || altered) && !publishing && loaded + const initialiseApp = async () => { const applicationPkg = await API.fetchAppPackage($store.devId) await store.actions.initialise(applicationPkg) @@ -112,6 +193,27 @@ } } + const resetAppHistory = (historyStore, historyKey) => { + if (historyStore.history.length) { + const historyEntryPos = historyStore.position + const historyEntry = historyStore.history[historyEntryPos - 1] + + publishRecord = { + ...publishRecord, + [historyKey]: historyEntry?.id || -1, + } + } + } + + const resetStateTracking = () => { + resetAppHistory($automationHistoryStore, "automationHistory") + resetAppHistory($screenHistoryStore, "screenHistory") + automationsAltered = false + screensAltered = false + appMetaUpdated = false + cachedVersion = $store.version + "" + } + async function publishApp() { try { publishing = true @@ -124,7 +226,9 @@ }) await completePublish() + resetStateTracking() } catch (error) { + console.error(error) analytics.captureException(error) notifications.error("Error publishing app") } @@ -153,6 +257,7 @@ type: "success", icon: "GlobeStrike", }) + publishRecord = {} } catch (err) { notifications.error("Error unpublishing app") } @@ -176,7 +281,7 @@ {#if $store.hasLock} -
+
{#if updateAvailable} @@ -317,7 +422,7 @@ cta on:click={publishApp} id={"builder-app-publish-button"} - disabled={publishing} + disabled={!canPublish} > Publish @@ -349,8 +454,20 @@ /> - - + + +{:else} +
+
+ + Preview + +
+
{/if} diff --git a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte deleted file mode 100644 index fb20cc50e5..0000000000 --- a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte +++ /dev/null @@ -1,76 +0,0 @@ - - -
- (open = !open)} - selected={open} - disabled={!allCols.length} - tooltip={$compact ? "Width" : null} - > - {$compact ? "" : "Width"} - -
- - -
- {#each sizeOptions as option} - columns.actions.changeAllColumnWidths(option.size)} - selected={option.selected} - > - {option.label} - - {/each} - {#if custom} - Custom - {/if} -
- - - diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte index fb66b106c9..b8728156db 100644 --- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte @@ -3,12 +3,13 @@ import { ActionButton, Popover, Toggle, Icon } from "@budibase/bbui" import { getColumnIcon } from "../lib/utils" - const { columns, stickyColumn, compact } = getContext("grid") + const { columns, stickyColumn } = getContext("grid") let open = false let anchor $: anyHidden = $columns.some(col => !col.visible) + $: text = getText($columns) const toggleVisibility = (column, visible) => { columns.update(state => { @@ -38,6 +39,11 @@ }) columns.actions.saveChanges() } + + const getText = columns => { + const hidden = columns.filter(col => !col.visible).length + return hidden ? `Hide columns (${hidden})` : "Hide columns" + }
@@ -48,13 +54,12 @@ on:click={() => (open = !open)} selected={open || anyHidden} disabled={!$columns.length} - tooltip={$compact ? "Columns" : ""} > - {$compact ? "" : "Columns"} + {text}
- +
{#if $stickyColumn} diff --git a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte b/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte deleted file mode 100644 index e9617ce0b6..0000000000 --- a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte +++ /dev/null @@ -1,71 +0,0 @@ - - -
- (open = !open)} - selected={open} - tooltip={$compact ? "Height" : null} - > - {$compact ? "" : "Height"} - -
- - -
- {#each sizeOptions as option} - changeRowHeight(option.size)} - > - {option.label} - - {/each} -
- - - diff --git a/packages/frontend-core/src/components/grid/controls/SizeButton.svelte b/packages/frontend-core/src/components/grid/controls/SizeButton.svelte new file mode 100644 index 0000000000..eb9bf917d9 --- /dev/null +++ b/packages/frontend-core/src/components/grid/controls/SizeButton.svelte @@ -0,0 +1,135 @@ + + +
+ (open = !open)} + selected={open} + disabled={!allCols.length} + > + Size + +
+ + +
+
+ +
+ {#each rowSizeOptions as option} + changeRowHeight(option.size)} + > + {option.label} + + {/each} +
+
+
+ +
+ {#each columnSizeOptions as option} + columns.actions.changeAllColumnWidths(option.size)} + selected={option.selected} + > + {option.label} + + {/each} + {#if custom} + Custom + {/if} +
+
+
+ + + diff --git a/packages/frontend-core/src/components/grid/controls/SortButton.svelte b/packages/frontend-core/src/components/grid/controls/SortButton.svelte index 2018e83e44..bd75249216 100644 --- a/packages/frontend-core/src/components/grid/controls/SortButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/SortButton.svelte @@ -2,7 +2,7 @@ import { getContext } from "svelte" import { ActionButton, Popover, Select } from "@budibase/bbui" - const { sort, columns, stickyColumn, compact } = getContext("grid") + const { sort, columns, stickyColumn } = getContext("grid") let open = false let anchor @@ -90,13 +90,12 @@ on:click={() => (open = !open)} selected={open} disabled={!columnOptions.length} - tooltip={$compact ? "Sort" : ""} > - {$compact ? "" : "Sort"} + Sort
- +
x._instanceName} + getOptionValue={x => x._id} + /> + + +
+ + diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js index eee7f5b757..3b3ee6fd00 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js @@ -16,6 +16,7 @@ export { default as S3Upload } from "./S3Upload.svelte" export { default as ExportData } from "./ExportData.svelte" export { default as ContinueIf } from "./ContinueIf.svelte" export { default as UpdateFieldValue } from "./UpdateFieldValue.svelte" +export { default as ScrollTo } from "./ScrollTo.svelte" export { default as ShowNotification } from "./ShowNotification.svelte" export { default as PromptUser } from "./PromptUser.svelte" export { default as OpenSidePanel } from "./OpenSidePanel.svelte" diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json index bb21116213..2ec7235c59 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json @@ -70,6 +70,11 @@ "type": "form", "component": "UpdateFieldValue" }, + { + "name": "Scroll To Field", + "type": "form", + "component": "ScrollTo" + }, { "name": "Validate Form", "type": "form", diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 71637723c1..5f8d9c007d 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -2221,7 +2221,8 @@ "ValidateForm", "ClearForm", "ChangeFormStep", - "UpdateFieldValue" + "UpdateFieldValue", + "ScrollTo" ], "styles": ["size"], "size": { diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 27e854781c..3dc85ecaf6 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -404,12 +404,20 @@ } } + const handleScrollToField = ({ field }) => { + const fieldId = get(getField(field)).fieldState.fieldId + const label = document.querySelector(`label[for="${fieldId}"]`) + document.getElementById(fieldId).focus({ preventScroll: true }) + label.scrollIntoView({ behavior: "smooth" }) + } + // Action context to pass to children const actions = [ { type: ActionTypes.ValidateForm, callback: formApi.validate }, { type: ActionTypes.ClearForm, callback: formApi.reset }, { type: ActionTypes.ChangeFormStep, callback: formApi.changeStep }, { type: ActionTypes.UpdateFieldValue, callback: handleUpdateFieldValue }, + { type: ActionTypes.ScrollTo, callback: handleScrollToField }, ] diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js index 6c882c9792..37a45fbe5d 100644 --- a/packages/client/src/constants.js +++ b/packages/client/src/constants.js @@ -29,6 +29,7 @@ export const ActionTypes = { SetDataProviderSorting: "SetDataProviderSorting", ClearForm: "ClearForm", ChangeFormStep: "ChangeFormStep", + ScrollTo: "ScrollTo", } export const DNDPlaceholderID = "dnd-placeholder" diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index ed702f6718..68f312f0ad 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -153,6 +153,17 @@ const navigationHandler = action => { routeStore.actions.navigate(url, peek, externalNewTab) } +const scrollHandler = async (action, context) => { + return await executeActionHandler( + context, + action.parameters.componentId, + ActionTypes.ScrollTo, + { + field: action.parameters.field, + } + ) +} + const queryExecutionHandler = async action => { const { datasourceId, queryId, queryParams, notificationOverride } = action.parameters @@ -369,6 +380,7 @@ const handlerMap = { ["Duplicate Row"]: duplicateRowHandler, ["Delete Row"]: deleteRowHandler, ["Navigate To"]: navigationHandler, + ["Scroll To Field"]: scrollHandler, ["Execute Query"]: queryExecutionHandler, ["Trigger Automation"]: triggerAutomationHandler, ["Validate Form"]: validateFormHandler, From f85e1826a21e589fdbf69e4258e60d10999a77c1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 10:55:58 +0000 Subject: [PATCH 165/343] Bump version to 2.7.26-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 39302af0f0..06ea327572 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.26-alpha.2", + "version": "2.7.26-alpha.3", "npmClient": "yarn", "useNx": true, "packages": [ From fd8400bee58fd23d8b6796d4d48356b32cf4b9b4 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 23 Jun 2023 11:56:59 +0100 Subject: [PATCH 166/343] PR feedback and removed some comments --- packages/builder/src/stores/portal/licensing.js | 3 --- packages/client/src/components/ClientApp.svelte | 5 ++--- packages/client/src/index.js | 4 +++- packages/server/src/api/controllers/static/index.ts | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index e94e7d2e21..4a59f29f52 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -76,12 +76,9 @@ export const createLicensingStore = () => { await actions.setQuotaUsage() }, setNavigation: () => { - //"/builder/portal/account/upgrade" const adminStore = get(admin) const authStore = get(auth) - //Add cloud check here too??? - const upgradeUrl = authStore?.user?.accountPortalAccess ? `${adminStore.accountPortalUrl}/portal/upgrade` : "/builder/portal/account/upgrade" diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 8c6c20f258..06c4681b95 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -90,8 +90,7 @@ builderStore.actions.notifyLoaded() } else { builderStore.actions.analyticsPing({ - source: "app", - ...{ embedded: $appStore.embedded || undefined }, + embedded: !!$appStore.embedded, }) } }) @@ -169,7 +168,7 @@ {@html ErrorSVG} - Your application could not be loaded + This Budibase app is not publicly accessible
diff --git a/packages/client/src/index.js b/packages/client/src/index.js index a95ec24746..1550ba4d7b 100644 --- a/packages/client/src/index.js +++ b/packages/client/src/index.js @@ -46,7 +46,9 @@ const loadBudibase = async () => { appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"]) // Set the flag used to determine if the app is being loaded via an iframe - appStore.actions.setAppEmbedded(window["##BUDIBASE_APP_EMBEDDED##"] == "true") + appStore.actions.setAppEmbedded( + window["##BUDIBASE_APP_EMBEDDED##"] === "true" + ) // Fetch environment info if (!get(environmentStore)?.loaded) { diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index fe3f653051..fc17cd46e0 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -100,9 +100,8 @@ export const deleteObjects = async function (ctx: any) { } export const serveApp = async function (ctx: any) { - const bbHeaderEmbed = ctx.request.get("x-budibase-embed") - ? ctx.get("x-budibase-embed").toLowerCase() == "true" - : false + const bbHeaderEmbed = + ctx.request.get("x-budibase-embed")?.toLowerCase() === "true" //Public Settings const { config } = await configs.getSettingsConfigDoc() From fda97f74e11bc2a32153f62ae486ffd85f7036ee Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 11:15:07 +0000 Subject: [PATCH 167/343] Bump version to 2.7.26-alpha.4 --- lerna.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index 98b654c82f..e5daa13e57 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,9 @@ { - "version": "2.7.26-alpha.3", + "version": "2.7.26-alpha.4", "npmClient": "yarn", - "packages": ["packages/*"], + "packages": [ + "packages/*" + ], "useNx": true, "command": { "publish": { @@ -17,4 +19,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 3ad8625192a3c2c347259e0a7c7c34860ad8e2b5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 13:13:49 +0000 Subject: [PATCH 168/343] Bump version to 2.7.26-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e5daa13e57..369e8c59bc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.26-alpha.4", + "version": "2.7.26-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" From 22a8b2cbaa96009febd86a2b192dd9a9911b4524 Mon Sep 17 00:00:00 2001 From: Ryan Eaton Date: Fri, 23 Jun 2023 09:22:05 -0400 Subject: [PATCH 169/343] spelling fix --- .../app/[application]/data/datasource/bb_internal/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte index 68567fe788..33f3b626a2 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte @@ -32,7 +32,7 @@ Budibase internal tables are part of your app, so the data will be - stored in your apps context. + stored in your app's context. From 8623840f7d3e4b85f91b8acdd11beb8f67fd8ed4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 14:23:14 +0000 Subject: [PATCH 170/343] Bump version to 2.7.34-alpha.0 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 3171d1bf15..894ce11a4a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.33", + "version": "2.7.34-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" @@ -19,4 +19,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From b130de71dcc04764653465818b6492000d2884ea Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 23 Jun 2023 16:45:22 +0100 Subject: [PATCH 171/343] Persist the current step when remounting a form --- packages/client/src/components/app/forms/Form.svelte | 3 +++ packages/client/src/components/app/forms/InnerForm.svelte | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte index b15ab55c5b..39c9bf4b59 100644 --- a/packages/client/src/components/app/forms/Form.svelte +++ b/packages/client/src/components/app/forms/Form.svelte @@ -2,6 +2,7 @@ import { getContext } from "svelte" import InnerForm from "./InnerForm.svelte" import { Helpers } from "@budibase/bbui" + import { writable } from "svelte/store" export let dataSource export let theme @@ -23,6 +24,7 @@ let loaded = false let schema let table + let currentStep = writable(1) $: fetchSchema(dataSource) $: schemaKey = generateSchemaKey(schema) @@ -92,6 +94,7 @@ {initialValues} {disableValidation} {editAutoColumns} + {currentStep} > diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 9eb21b0bae..51f25c4971 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -13,11 +13,14 @@ export let disableValidation = false export let editAutoColumns = false + // We export this store so that when we remount the inner form we can still + // persist what step we're on + export let currentStep + const component = getContext("component") const { styleable, Provider, ActionTypes } = getContext("sdk") let fields = [] - const currentStep = writable(1) const formState = writable({ values: {}, errors: {}, From a4ea6a3d342153922fa21d3e12139c2cbacc3681 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 23 Jun 2023 16:50:10 +0100 Subject: [PATCH 172/343] Ensure initial value of current form step inside form state store is correct --- packages/client/src/components/app/forms/InnerForm.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 51f25c4971..88ad35f4b9 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -25,7 +25,7 @@ values: {}, errors: {}, valid: true, - currentStep: 1, + currentStep: get(currentStep), }) // Reactive derived stores to derive form state from field array From 1b868ea31c86b9e3f8faee29bfc050aac5d6aaa5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 23 Jun 2023 16:51:52 +0100 Subject: [PATCH 173/343] Lint pro on CI --- .github/workflows/budibase_ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 00b7c608a8..c04031cc9d 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -27,6 +27,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Use Node.js 14.x uses: actions/setup-node@v3 with: From ca4011e292ebb3bd9970478f1117fc16d8865efa Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 16:38:13 +0000 Subject: [PATCH 174/343] Bump version to 2.7.34-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 894ce11a4a..91b5c6e304 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.0", + "version": "2.7.34-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" From 8325b5bb1e0c8d48dbfe5edef89b8c9ae1e2ca4f Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 23 Jun 2023 18:34:05 +0100 Subject: [PATCH 175/343] Add count to duplicate errors (#10920) * Add count to duplicate errors * Lint: Remove unused prop --- .../common/bindings/DrawerBindableInput.svelte | 1 - .../components/overlay/NotificationDisplay.svelte | 4 ++-- packages/client/src/stores/notification.js | 14 +++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte index 7fbbf75a30..dacb076bdb 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte @@ -21,7 +21,6 @@ export let allowHelpers = true export let updateOnChange = true export let drawerLeft - export let key const dispatch = createEventDispatcher() let bindingDrawer diff --git a/packages/client/src/components/overlay/NotificationDisplay.svelte b/packages/client/src/components/overlay/NotificationDisplay.svelte index 669fa41a1d..46b3a2a6a1 100644 --- a/packages/client/src/components/overlay/NotificationDisplay.svelte +++ b/packages/client/src/components/overlay/NotificationDisplay.svelte @@ -6,7 +6,7 @@
{#if $notificationStore} - {#each $notificationStore as { type, icon, message, id, dismissable } (id)} + {#each $notificationStore as { type, icon, message, id, dismissable, count } (id)}
1 ? `(${count}) ${message}` : message} {icon} {dismissable} on:dismiss={() => notificationStore.actions.dismiss(id)} diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.js index bbde660fd4..2a9f9749ec 100644 --- a/packages/client/src/stores/notification.js +++ b/packages/client/src/stores/notification.js @@ -13,7 +13,13 @@ const createNotificationStore = () => { setTimeout(() => (block = false), timeout) } - const send = (message, type = "info", icon, autoDismiss = true) => { + const send = ( + message, + type = "info", + icon, + autoDismiss = true, + count = 1 + ) => { if (block) { return } @@ -33,6 +39,11 @@ const createNotificationStore = () => { } const _id = id() store.update(state => { + const duplicateError = state.find(err => err.message === message) + if (duplicateError) { + duplicateError.count += 1 + return [...state] + } return [ ...state, { @@ -42,6 +53,7 @@ const createNotificationStore = () => { icon, dismissable: !autoDismiss, delay: get(store) != null, + count, }, ] }) From f60a34ee871b526667d9c8e0e7cf0a8804c938b8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 17:38:15 +0000 Subject: [PATCH 176/343] Bump version to 2.7.34-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 91b5c6e304..ab0f3edab6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.1", + "version": "2.7.34-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" From 798d5d13ab2df2443f740f5a16eb79a9152679ec Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 26 Jun 2023 07:30:32 +0000 Subject: [PATCH 177/343] Bump version to 2.7.34-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ab0f3edab6..266062fbda 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.2", + "version": "2.7.34-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" From 5d14bb70c6693e6095b15d96e80f3070b8ee9a20 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 08:58:06 +0100 Subject: [PATCH 178/343] Ensure builder websocket is only instantiated once --- packages/builder/src/builderStore/store/frontend.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index d0414b5733..8160939df9 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -117,10 +117,13 @@ export const getFrontendStore = () => { reset: () => { store.set({ ...INITIAL_FRONTEND_STATE }) websocket?.disconnect() + websocket = null }, initialise: async pkg => { const { layouts, screens, application, clientLibPath, hasLock } = pkg - websocket = createBuilderWebsocket(application.appId) + if (!websocket) { + websocket = createBuilderWebsocket(application.appId) + } await store.actions.components.refreshDefinitions(application.appId) // Reset store state From 3f0fac43ea30a5582383a42ade1dc2d4e6894f42 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 08:58:25 +0100 Subject: [PATCH 179/343] Add padding to secondary user header to match tab spacing --- .../builder/src/pages/builder/app/[application]/_layout.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 5a22c8bbef..0d5942c39e 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -295,8 +295,9 @@ display: flex; flex-direction: row; gap: 8px; - min-width: 0px; + min-width: 0; overflow: hidden; + margin-left: var(--spacing-xl); } .secondary-editor-body { From 8bfb909280f769889e90dd6af44cbaa316c9cd8c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 09:22:40 +0100 Subject: [PATCH 180/343] Fix scroll overflow in binding drawer --- .../builder/src/components/common/bindings/BindingPanel.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index c95988e90c..beb205fa81 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -469,10 +469,12 @@ display: flex; flex-direction: column; gap: var(--spacing-xl); + overflow: hidden; } .overlay-wrap { position: relative; flex: 1; + overflow: hidden; } .mode-overlay { position: absolute; From 1606ca0c84949fbb8194d1f5e98ca8e5b63c1846 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Mon, 26 Jun 2023 09:52:02 +0100 Subject: [PATCH 181/343] Refactor Datasource Creation Modal (#10783) --- .../src/FancyForm/FancyCheckboxGroup.svelte | 3 +- packages/builder/package.json | 3 +- .../_components/DatasourceCard.svelte | 60 ----- .../_components/GoogleSignIn.svelte | 145 ------------ .../modals/GoogleDatasourceConfigModal.svelte | 207 ------------------ .../DatasourceConfigEditor/ConfigInput.svelte | 40 ++++ .../fields/Boolean.svelte | 20 ++ .../fields/FieldGroup.svelte | 47 ++++ .../fields/LongForm.svelte | 22 ++ .../fields/Object.svelte | 37 ++++ .../fields/String.svelte | 39 ++++ .../DatasourceConfigEditor/index.svelte | 114 ++++++++++ .../DatasourceConfigEditor/stores/config.js | 26 +++ .../stores/validatedConfig.js | 40 ++++ .../stores/validation.js | 95 ++++++++ .../GoogleAuthPrompt.svelte | 31 +++ .../GoogleButton.svelte | 0 .../TableImportSelection/index.svelte | 62 ++++++ .../tableSelectionStore.js | 64 ++++++ .../index.svelte | 76 +++++++ .../stores/datasourceCreation.js | 92 ++++++++ .../stores/datasourceCreation.test.js | 116 ++++++++++ .../stores/onGoogleAuth.js | 24 ++ .../stores/onGoogleAuth.test.js | 70 ++++++ .../CreateInternalTableModal.svelte | 22 ++ .../builder/app/[application]/data/new.svelte | 183 +++------------- .../builder/src/stores/backend/datasources.js | 97 ++++++-- packages/builder/src/stores/backend/index.js | 3 +- .../src/stores/backend/integrations.js | 12 +- .../src/stores/backend/sortedIntegrations.js | 39 ++++ .../stores/backend/sortedIntegrations.test.js | 127 +++++++++++ packages/builder/src/stores/selectors.js | 35 +++ packages/builder/src/stores/selectors.test.js | 56 +++++ 33 files changed, 1418 insertions(+), 589 deletions(-) delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Object.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/String.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/config.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/validatedConfig.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/validation.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte rename packages/builder/src/{components/backend/DatasourceNavigator/_components => pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal}/GoogleButton.svelte (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/TableImportSelection/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/TableImportSelection/tableSelectionStore.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte create mode 100644 packages/builder/src/stores/backend/sortedIntegrations.js create mode 100644 packages/builder/src/stores/backend/sortedIntegrations.test.js create mode 100644 packages/builder/src/stores/selectors.js create mode 100644 packages/builder/src/stores/selectors.test.js diff --git a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte index aaea388c36..ca3a6d937a 100644 --- a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte +++ b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte @@ -12,7 +12,6 @@ const dispatch = createEventDispatcher() $: updateSelected(selectedBooleans) - $: dispatch("change", selected) $: allSelected = selected?.length === options.length $: noneSelected = !selected?.length @@ -28,6 +27,7 @@ } } selected = array + dispatch("change", selected) } function toggleSelectAll() { @@ -36,6 +36,7 @@ } else { selectedBooleans = reset() } + dispatch("change", selected) } diff --git a/packages/builder/package.json b/packages/builder/package.json index a2567dc638..646bb144df 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -9,7 +9,8 @@ "dev:builder": "routify -c dev:vite", "dev:vite": "vite --host 0.0.0.0", "rollup": "rollup -c -w", - "test": "vitest run" + "test": "vitest run", + "test:watch": "vitest" }, "jest": { "globals": { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte deleted file mode 100644 index 67ecf1c56c..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte +++ /dev/null @@ -1,60 +0,0 @@ - - -
dispatcher("selected", integrationType)} - class="item hoverable" -> -
- -
- {schema.friendlyName} - {#if schema.type} - {schema.type || ""} - {/if} -
-
-
- - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte deleted file mode 100644 index c30e8fc2ee..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte +++ /dev/null @@ -1,145 +0,0 @@ - - - - - btn_google_dark_normal_ios - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte deleted file mode 100644 index 14f81f915c..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ /dev/null @@ -1,207 +0,0 @@ - - - - {#if step === GoogleDatasouceConfigStep.AUTH} - - {#if isGoogleConfigured === true} - - Authenticate with your google account to use the {integrationName} integration. - - - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. - Configure Google SSO - {/if} - {/if} - {#if step === GoogleDatasouceConfigStep.SET_URL} - - Add the URL of the sheet you want to connect. - - (isValid = e.detail)} - /> - - {/if} - {#if step === GoogleDatasouceConfigStep.SET_SHEETS} - - Select which spreadsheets you want to connect. - - - - {#if setSheetsErrorTitle || setSheetsErrorMessage} - - {/if} - - {/if} - diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte new file mode 100644 index 0000000000..37fd579594 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte @@ -0,0 +1,40 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte new file mode 100644 index 0000000000..daa4b7a2f9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte @@ -0,0 +1,20 @@ + + +
+ + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte new file mode 100644 index 0000000000..a83929663b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte @@ -0,0 +1,47 @@ + + + !!properties.value)} + header={name} +> + + {#each value as field} +
+ + handleChange(field.key, e.detail)} + value={field.value} + /> +
+ {/each} + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte new file mode 100644 index 0000000000..efbeb007e8 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte @@ -0,0 +1,22 @@ + + +
+ +