From 72ff7ce122d76e11fa84e76f4f003db4b74de46b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 15 Oct 2022 12:58:32 +0100 Subject: [PATCH 01/52] Prevent crash when determining datasource schema for non string type values --- packages/builder/src/builderStore/dataBinding.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 536692eecc..0a70150949 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -1004,7 +1004,10 @@ const bindingReplacement = ( * {{ literal [componentId] }} */ const extractLiteralHandlebarsID = value => { - return value?.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1] + if (!value || typeof value !== "string") { + return null + } + return value.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1] } /** From 857364b257141391e6aa1169d49d4c5ee4ca759b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 15 Oct 2022 13:06:34 +0100 Subject: [PATCH 02/52] Fix selected rows bindings for table blocks not having a category --- packages/builder/src/builderStore/dataBinding.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 0a70150949..d188073b95 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -481,6 +481,7 @@ const getSelectedRowsBindings = asset => { block._id + "-table" )}.${makePropSafe("selectedRows")}`, readableBinding: `${block._instanceName}.Selected rows`, + category: "Selected rows", })) ) } From 80351db592f494ee10e7efa84e1ee529957f5692 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 15 Oct 2022 13:17:40 +0100 Subject: [PATCH 03/52] Add sensible min widths to settings in the conditional UI drawer so that it's usable on any res --- .../_components/settings/ConditionalUIDrawer.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte index 74f0c930cd..855c42173b 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte @@ -282,12 +282,16 @@ gap: var(--spacing-l); display: grid; align-items: center; - grid-template-columns: auto 160px auto 1fr 130px 130px 1fr auto auto; + grid-template-columns: + auto 150px auto minmax(140px, 1fr) 120px 100px minmax(140px, 1fr) + auto auto; border-radius: var(--border-radius-s); transition: background-color ease-in-out 130ms; } .condition.update { - grid-template-columns: auto 160px 1fr auto 1fr auto 1fr 130px 130px 1fr auto auto; + grid-template-columns: + auto 150px minmax(140px, 1fr) auto minmax(140px, 1fr) auto + minmax(140px, 1fr) 120px 100px minmax(140px, 1fr) auto auto; } .condition:hover { background-color: var(--spectrum-global-color-gray-100); From d7f033eedffac2948d25f57cc0e6f2e494aac4a5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Sat, 15 Oct 2022 13:23:20 +0100 Subject: [PATCH 04/52] Add sensible min widths to settings in the filter drawer --- .../controls/FilterEditor/FilterDrawer.svelte | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index a419f5ad46..214db0f814 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -38,8 +38,8 @@ let behaviourValue const behaviourOptions = [ - { value: "and", label: "Match all of the following filters" }, - { value: "or", label: "Match any of the following filters" }, + { value: "and", label: "Match all filters" }, + { value: "or", label: "Match any filter" }, ] const addFilter = () => { filters = [ @@ -137,14 +137,9 @@
- - {#if !filters?.length} - Add your first filter expression. - {:else} - Results are filtered to only those which match all of the following - constraints. - {/if} - + {#if !filters?.length} + Add your first filter expression. + {/if} {#if filters?.length}
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte index 6eba5070fc..f543b34ddc 100644 --- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte +++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte @@ -1,6 +1,7 @@ @@ -46,9 +56,9 @@ Edit Delete - + - + Date: Thu, 1 Dec 2022 10:29:06 +0000 Subject: [PATCH 06/52] Remove helpers and convert to JS query bindings --- .../components/common/bindings/BindingPanel.svelte | 14 ++++++++++++-- .../common/bindings/ClientBindingPanel.svelte | 2 ++ .../common/bindings/DrawerBindableInput.svelte | 2 ++ .../components/integration/KeyValueBuilder.svelte | 2 ++ .../integration/QueryViewerBindingBuilder.svelte | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index d105253e14..7ba1c44853 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -39,6 +39,7 @@ export let value = "" export let valid export let allowJS = false + export let allowHelpers = true let helpers = handlebarsCompletions() let getCaretPosition @@ -54,6 +55,7 @@ let popoverAnchor let hoverTarget + $: console.log("HELPERS ", allowHelpers) $: usingJS = mode === "JavaScript" $: searchRgx = new RegExp(search, "ig") $: categories = Object.entries(groupBy("category", bindings)) @@ -85,7 +87,7 @@ return helper.label.match(searchRgx) || helper.description.match(searchRgx) }) - $: categoryNames = [...categories.map(cat => cat[0]), "Helpers"] + $: categoryNames = getCategoryNames(categories) $: codeMirrorHints = bindings?.map(x => `$("${x.readableBinding}")`) @@ -96,6 +98,14 @@ } } + const getCategoryNames = categories => { + let names = [...categories.map(cat => cat[0])] + if (allowHelpers) { + names.push("Helpers") + } + return names + } + // Adds a JS/HBS helper to the expression const addHelper = (helper, js) => { let tempVal @@ -343,7 +353,7 @@ for more details.

{/if} - {#if $admin.isDev} + {#if $admin.isDev && allowJS}
diff --git a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte index b220a15fc8..74e14574ab 100644 --- a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte @@ -5,6 +5,7 @@ export let valid export let value = "" export let allowJS = false + export let allowHelpers = true $: enrichedBindings = enrichBindings(bindings) @@ -25,5 +26,6 @@ bindings={enrichedBindings} {value} {allowJS} + {allowHelpers} on:change /> diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte index 22d322985d..cc64e28835 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte @@ -17,6 +17,7 @@ export let disabled = false export let fillWidth export let allowJS = true + export let allowHelpers = true export let updateOnChange = true export let drawerLeft @@ -77,6 +78,7 @@ on:change={event => (tempValue = event.detail)} {bindings} {allowJS} + {allowHelpers} /> diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte index 28db6b61c6..5d35498cfe 100644 --- a/packages/builder/src/components/integration/KeyValueBuilder.svelte +++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte @@ -33,6 +33,7 @@ export let showMenu = false export let bindings = [] export let bindingDrawerLeft + export let allowHelpers = true let fields = Object.entries(object || {}).map(([name, value]) => ({ name, @@ -122,6 +123,7 @@ disabled={readOnly} value={field.value} allowJS={false} + {allowHelpers} fillWidth={true} drawerLeft={bindingDrawerLeft} /> diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte index 8372e2af7e..049eecafcc 100644 --- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte +++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte @@ -37,6 +37,7 @@ valuePlaceholder="Default" bindings={[...userBindings]} bindingDrawerLeft="260px" + allowHelpers={false} on:change />
From f950e572e592aae03b4cc4c9b4229e700f7b7297 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 1 Dec 2022 10:34:03 +0000 Subject: [PATCH 07/52] Adjust z index --- packages/builder/src/components/integration/QueryViewer.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte index e70cf8330e..6a49ffa634 100644 --- a/packages/builder/src/components/integration/QueryViewer.svelte +++ b/packages/builder/src/components/integration/QueryViewer.svelte @@ -223,6 +223,7 @@ .config { display: grid; grid-gap: var(--spacing-s); + z-index: 1; } .config-field { From e83c25cb243b18e243ce4485b94f5f909219fc1b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 1 Dec 2022 10:37:58 +0000 Subject: [PATCH 08/52] Remove console log --- .../builder/src/components/common/bindings/BindingPanel.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 7ba1c44853..83fc19f388 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -55,7 +55,6 @@ let popoverAnchor let hoverTarget - $: console.log("HELPERS ", allowHelpers) $: usingJS = mode === "JavaScript" $: searchRgx = new RegExp(search, "ig") $: categories = Object.entries(groupBy("category", bindings)) From 2551ce181adc5dda496baf8260d1dd54e8b0ff18 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 5 Dec 2022 09:33:56 +0000 Subject: [PATCH 09/52] v2.1.43 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index b695f29f25..126bc40e84 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.42", + "version": "2.1.43", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d8e3f4c5d9..f2631dc870 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.42", + "@budibase/types": "^2.1.43", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 31f9843baf..b980006f2c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.42", + "version": "2.1.43", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.42", + "@budibase/string-templates": "^2.1.43", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index f15f0dae7a..ccba4e7055 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.42", + "version": "2.1.43", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.42", - "@budibase/client": "^2.1.42", - "@budibase/frontend-core": "^2.1.42", - "@budibase/string-templates": "^2.1.42", + "@budibase/bbui": "^2.1.43", + "@budibase/client": "^2.1.43", + "@budibase/frontend-core": "^2.1.43", + "@budibase/string-templates": "^2.1.43", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c491115904..e652e42b74 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.42", - "@budibase/string-templates": "^2.1.42", - "@budibase/types": "^2.1.42", + "@budibase/backend-core": "^2.1.43", + "@budibase/string-templates": "^2.1.43", + "@budibase/types": "^2.1.43", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 3781be6c65..67e54955fe 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.42", + "version": "2.1.43", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.42", - "@budibase/frontend-core": "^2.1.42", - "@budibase/string-templates": "^2.1.42", + "@budibase/bbui": "^2.1.43", + "@budibase/frontend-core": "^2.1.43", + "@budibase/string-templates": "^2.1.43", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a7a53aa314..59ab3427bc 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.42", + "@budibase/bbui": "^2.1.43", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ef13aee196..dd1db7a05c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 70bc31a1a6..f1305c2658 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.42", - "@budibase/client": "^2.1.42", + "@budibase/backend-core": "^2.1.43", + "@budibase/client": "^2.1.43", "@budibase/pro": "2.1.42", - "@budibase/string-templates": "^2.1.42", - "@budibase/types": "^2.1.42", + "@budibase/string-templates": "^2.1.43", + "@budibase/types": "^2.1.43", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7324c5caa3..94799dda65 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.42", + "version": "2.1.43", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index d51267e29c..8993b95466 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 37ea6d9e1e..e624dd49c5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.42", + "version": "2.1.43", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.42", + "@budibase/backend-core": "^2.1.43", "@budibase/pro": "2.1.42", - "@budibase/string-templates": "^2.1.42", - "@budibase/types": "^2.1.42", + "@budibase/string-templates": "^2.1.43", + "@budibase/types": "^2.1.43", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 075954b20b428ec251d54cc29cce64133f1c7d85 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 5 Dec 2022 09:37:29 +0000 Subject: [PATCH 10/52] Update pro version to 2.1.43 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f1305c2658..596311519e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.43", "@budibase/client": "^2.1.43", - "@budibase/pro": "2.1.42", + "@budibase/pro": "2.1.43", "@budibase/string-templates": "^2.1.43", "@budibase/types": "^2.1.43", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index fc500729bb..a6dd08f5ea 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.42.tgz#bc9602a2db12d7c7b24674847be61b3ba27b4c21" - integrity sha512-cfSxsBXj+NwywxJoK533dMe4wzDyQv5Ml+tid0cYrwaYaDIXqyGrXF8avzEuy3tKFlwoLyMW8SH4rr23OIuZTg== +"@budibase/backend-core@2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43.tgz#45e9f6b34ed2efb13dde2ee88e27ec3c2c5161d8" + integrity sha512-prQYMAmuZo6zXni9kv2+0IBtKedAJBHPTKE890FvUlQHVmNStH0+hyKTSFPYuGss3a/ObBuom//BG5Bus+bQhQ== dependencies: - "@budibase/types" "^2.1.42" + "@budibase/types" "^2.1.43" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.42.tgz#b63b8e449a19539e322b428e2a1183c7349aa6c8" - integrity sha512-TBxZfm9J8EIfYZblpjrHvcdZnrs7YsuL+oHiq5p2CQw5LDW/EYc/PnvAonWlWYaIPtPXyrP5z2OeK2DAwuo/fQ== +"@budibase/pro@2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43.tgz#3d576d52521b3a4b92dbfee6d332054ca1f095ac" + integrity sha512-UCH/BP+D+uKrcHWtCzS7CJStPpHvw1qLmv657eXScPbB5LnObfMrsTr8Ct7kiMiPLuARdC1GE9ITabn9+lYX0Q== dependencies: - "@budibase/backend-core" "2.1.42" - "@budibase/types" "2.1.42" + "@budibase/backend-core" "2.1.43" + "@budibase/types" "2.1.43" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.42", "@budibase/types@^2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.42.tgz#57693b0a4c625abc581453dbcd1a68a8aac5a00f" - integrity sha512-P5dG4cUYmRI7chlY4dRBZxp1n0CkRyqrSmfvYoHUxqrSSzNiL0qYmhySkG10wXZ9RSw5a17v5lXlFc1g8WZ9Ig== +"@budibase/types@2.1.43", "@budibase/types@^2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43.tgz#09bdf3efa6ea78cffbd85ca331141c707dc3f79b" + integrity sha512-38guuehQjXRPv/YE8ppoXyHz7tFZOYqOh0dlZURvrGGJItKJDkR31BMccnIYBoac+2g4znjiMo68S/RiTjlrnw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e624dd49c5..f9469a1e3a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.43", - "@budibase/pro": "2.1.42", + "@budibase/pro": "2.1.43", "@budibase/string-templates": "^2.1.43", "@budibase/types": "^2.1.43", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 45322b5251..c07d8f5b55 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.42.tgz#bc9602a2db12d7c7b24674847be61b3ba27b4c21" - integrity sha512-cfSxsBXj+NwywxJoK533dMe4wzDyQv5Ml+tid0cYrwaYaDIXqyGrXF8avzEuy3tKFlwoLyMW8SH4rr23OIuZTg== +"@budibase/backend-core@2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43.tgz#45e9f6b34ed2efb13dde2ee88e27ec3c2c5161d8" + integrity sha512-prQYMAmuZo6zXni9kv2+0IBtKedAJBHPTKE890FvUlQHVmNStH0+hyKTSFPYuGss3a/ObBuom//BG5Bus+bQhQ== dependencies: - "@budibase/types" "^2.1.42" + "@budibase/types" "^2.1.43" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.42.tgz#b63b8e449a19539e322b428e2a1183c7349aa6c8" - integrity sha512-TBxZfm9J8EIfYZblpjrHvcdZnrs7YsuL+oHiq5p2CQw5LDW/EYc/PnvAonWlWYaIPtPXyrP5z2OeK2DAwuo/fQ== +"@budibase/pro@2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43.tgz#3d576d52521b3a4b92dbfee6d332054ca1f095ac" + integrity sha512-UCH/BP+D+uKrcHWtCzS7CJStPpHvw1qLmv657eXScPbB5LnObfMrsTr8Ct7kiMiPLuARdC1GE9ITabn9+lYX0Q== dependencies: - "@budibase/backend-core" "2.1.42" - "@budibase/types" "2.1.42" + "@budibase/backend-core" "2.1.43" + "@budibase/types" "2.1.43" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.42", "@budibase/types@^2.1.42": - version "2.1.42" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.42.tgz#57693b0a4c625abc581453dbcd1a68a8aac5a00f" - integrity sha512-P5dG4cUYmRI7chlY4dRBZxp1n0CkRyqrSmfvYoHUxqrSSzNiL0qYmhySkG10wXZ9RSw5a17v5lXlFc1g8WZ9Ig== +"@budibase/types@2.1.43", "@budibase/types@^2.1.43": + version "2.1.43" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43.tgz#09bdf3efa6ea78cffbd85ca331141c707dc3f79b" + integrity sha512-38guuehQjXRPv/YE8ppoXyHz7tFZOYqOh0dlZURvrGGJItKJDkR31BMccnIYBoac+2g4znjiMo68S/RiTjlrnw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 4826f1ef82552369611bba78a01f9e35dfecb9a3 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 5 Dec 2022 15:02:39 +0000 Subject: [PATCH 11/52] Force a re-initialisation of table data and paging when importing rows to a datasource --- .../src/components/backend/DataTable/DataTable.svelte | 8 +++++++- .../backend/DataTable/buttons/ImportButton.svelte | 2 +- .../backend/DataTable/modals/ImportModal.svelte | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 7cb368830e..32a8727d57 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -117,6 +117,12 @@ const onUpdateRows = () => { fetch.refresh() } + + // When importing new rows it is better to reinitialise request/paging data. + // Not doing so causes inconsistency in paging behaviour and content. + const onImportData = () => { + fetch.getInitialData() + }
@@ -169,7 +175,7 @@ - + diff --git a/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte index f7bb0e3cc8..bf44653e3d 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte @@ -29,7 +29,7 @@ } // Always refresh rows just to be sure - dispatch("updaterows") + dispatch("importrows") } From 4e947fbb543bc598b308a1b2911c5905dac7a785 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 5 Dec 2022 18:40:59 +0000 Subject: [PATCH 12/52] v2.1.44 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 126bc40e84..2ff0f32c71 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.43", + "version": "2.1.44", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f2631dc870..af239c5234 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.43", + "@budibase/types": "^2.1.44", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b980006f2c..b2b3b9aac1 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.43", + "version": "2.1.44", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.43", + "@budibase/string-templates": "^2.1.44", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ccba4e7055..7122447fa9 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.43", + "version": "2.1.44", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.43", - "@budibase/client": "^2.1.43", - "@budibase/frontend-core": "^2.1.43", - "@budibase/string-templates": "^2.1.43", + "@budibase/bbui": "^2.1.44", + "@budibase/client": "^2.1.44", + "@budibase/frontend-core": "^2.1.44", + "@budibase/string-templates": "^2.1.44", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e652e42b74..2310cb8204 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.43", - "@budibase/string-templates": "^2.1.43", - "@budibase/types": "^2.1.43", + "@budibase/backend-core": "^2.1.44", + "@budibase/string-templates": "^2.1.44", + "@budibase/types": "^2.1.44", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 67e54955fe..fac9e08272 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.43", + "version": "2.1.44", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.43", - "@budibase/frontend-core": "^2.1.43", - "@budibase/string-templates": "^2.1.43", + "@budibase/bbui": "^2.1.44", + "@budibase/frontend-core": "^2.1.44", + "@budibase/string-templates": "^2.1.44", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 59ab3427bc..9d4382122e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.43", + "@budibase/bbui": "^2.1.44", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index dd1db7a05c..e25ccc5935 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 596311519e..70ce1ed26b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.43", - "@budibase/client": "^2.1.43", + "@budibase/backend-core": "^2.1.44", + "@budibase/client": "^2.1.44", "@budibase/pro": "2.1.43", - "@budibase/string-templates": "^2.1.43", - "@budibase/types": "^2.1.43", + "@budibase/string-templates": "^2.1.44", + "@budibase/types": "^2.1.44", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 94799dda65..d9cfc9bebf 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.43", + "version": "2.1.44", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8993b95466..afce21e29c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index f9469a1e3a..3217466c55 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.43", + "version": "2.1.44", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.43", + "@budibase/backend-core": "^2.1.44", "@budibase/pro": "2.1.43", - "@budibase/string-templates": "^2.1.43", - "@budibase/types": "^2.1.43", + "@budibase/string-templates": "^2.1.44", + "@budibase/types": "^2.1.44", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6ddd6601bcdf15aa376e8bfc352f856407a646b4 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 5 Dec 2022 18:44:23 +0000 Subject: [PATCH 13/52] Update pro version to 2.1.44 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 70ce1ed26b..1baf4d56a7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.44", "@budibase/client": "^2.1.44", - "@budibase/pro": "2.1.43", + "@budibase/pro": "2.1.44", "@budibase/string-templates": "^2.1.44", "@budibase/types": "^2.1.44", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index a6dd08f5ea..ff30c4c266 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43.tgz#45e9f6b34ed2efb13dde2ee88e27ec3c2c5161d8" - integrity sha512-prQYMAmuZo6zXni9kv2+0IBtKedAJBHPTKE890FvUlQHVmNStH0+hyKTSFPYuGss3a/ObBuom//BG5Bus+bQhQ== +"@budibase/backend-core@2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.44.tgz#637473b2a567b1f02786dc803e53a071ab024608" + integrity sha512-zMcrDtkE6h0NVhtwb5Wpc6bs052rBN5MENwEEuNvvgUxMoxXnTlDZQsx7iRPs3ytuCFL6rReAlFwl891PKbcuw== dependencies: - "@budibase/types" "^2.1.43" + "@budibase/types" "^2.1.44" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43.tgz#3d576d52521b3a4b92dbfee6d332054ca1f095ac" - integrity sha512-UCH/BP+D+uKrcHWtCzS7CJStPpHvw1qLmv657eXScPbB5LnObfMrsTr8Ct7kiMiPLuARdC1GE9ITabn9+lYX0Q== +"@budibase/pro@2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.44.tgz#6fb7ee736419eda57d969da1d5c8d2ff11665b83" + integrity sha512-TZw+S5ajs2806Hm+DdJtFUMLwlqiKVOG2xoZJGZVWlYO0CzGLssreAzTg3ssAlV6Xe8CMkOS8DB9yz/dh3gayQ== dependencies: - "@budibase/backend-core" "2.1.43" - "@budibase/types" "2.1.43" + "@budibase/backend-core" "2.1.44" + "@budibase/types" "2.1.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.43", "@budibase/types@^2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43.tgz#09bdf3efa6ea78cffbd85ca331141c707dc3f79b" - integrity sha512-38guuehQjXRPv/YE8ppoXyHz7tFZOYqOh0dlZURvrGGJItKJDkR31BMccnIYBoac+2g4znjiMo68S/RiTjlrnw== +"@budibase/types@2.1.44", "@budibase/types@^2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.44.tgz#2326005efb137c64ef61f7481d5c5cb34aa6817c" + integrity sha512-WVE6ee9TPwcUe2kAkURlQp1B+uGGsC/9WRWSGapmK/pvnDzb2RXrvDP5Pr1SNQ/GHTzsUxHpxHiaGDuupCXhpQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3217466c55..e3b44548c4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.44", - "@budibase/pro": "2.1.43", + "@budibase/pro": "2.1.44", "@budibase/string-templates": "^2.1.44", "@budibase/types": "^2.1.44", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c07d8f5b55..711ea55c69 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43.tgz#45e9f6b34ed2efb13dde2ee88e27ec3c2c5161d8" - integrity sha512-prQYMAmuZo6zXni9kv2+0IBtKedAJBHPTKE890FvUlQHVmNStH0+hyKTSFPYuGss3a/ObBuom//BG5Bus+bQhQ== +"@budibase/backend-core@2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.44.tgz#637473b2a567b1f02786dc803e53a071ab024608" + integrity sha512-zMcrDtkE6h0NVhtwb5Wpc6bs052rBN5MENwEEuNvvgUxMoxXnTlDZQsx7iRPs3ytuCFL6rReAlFwl891PKbcuw== dependencies: - "@budibase/types" "^2.1.43" + "@budibase/types" "^2.1.44" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43.tgz#3d576d52521b3a4b92dbfee6d332054ca1f095ac" - integrity sha512-UCH/BP+D+uKrcHWtCzS7CJStPpHvw1qLmv657eXScPbB5LnObfMrsTr8Ct7kiMiPLuARdC1GE9ITabn9+lYX0Q== +"@budibase/pro@2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.44.tgz#6fb7ee736419eda57d969da1d5c8d2ff11665b83" + integrity sha512-TZw+S5ajs2806Hm+DdJtFUMLwlqiKVOG2xoZJGZVWlYO0CzGLssreAzTg3ssAlV6Xe8CMkOS8DB9yz/dh3gayQ== dependencies: - "@budibase/backend-core" "2.1.43" - "@budibase/types" "2.1.43" + "@budibase/backend-core" "2.1.44" + "@budibase/types" "2.1.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.43", "@budibase/types@^2.1.43": - version "2.1.43" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43.tgz#09bdf3efa6ea78cffbd85ca331141c707dc3f79b" - integrity sha512-38guuehQjXRPv/YE8ppoXyHz7tFZOYqOh0dlZURvrGGJItKJDkR31BMccnIYBoac+2g4znjiMo68S/RiTjlrnw== +"@budibase/types@2.1.44", "@budibase/types@^2.1.44": + version "2.1.44" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.44.tgz#2326005efb137c64ef61f7481d5c5cb34aa6817c" + integrity sha512-WVE6ee9TPwcUe2kAkURlQp1B+uGGsC/9WRWSGapmK/pvnDzb2RXrvDP5Pr1SNQ/GHTzsUxHpxHiaGDuupCXhpQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 5ef9a9a2540486a6da7bd815bd451959e6b70c74 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 6 Dec 2022 14:00:56 +0000 Subject: [PATCH 14/52] enable support for company proxy --- .../budibase/templates/app-service-deployment.yaml | 12 ++++++++++++ .../templates/worker-service-deployment.yaml | 12 ++++++++++++ charts/budibase/values.yaml | 3 +++ 3 files changed, 27 insertions(+) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index bf1b672d37..81e70c50ac 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -158,6 +158,18 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + {{ if .Values.globals.globalAgentHttpProxy }} + - name: GLOBAL_AGENT_HTTP_PROXY + value: {{ .Values.globals.globalAgentHttpProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentHttpsProxy }} + - name: GLOBAL_AGENT_HTTPS_PROXY + value: {{ .Values.globals.globalAgentHttpsProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentNoProxy }} + - name: GLOBAL_AGENT_NO_PROXY + value: {{ .Values.globals.globalAgentNoProxy | quote }} + {{ end }} - name: CDN_URL value: {{ .Values.globals.cdnUrl }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index df692a0723..bb79aab8d8 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -147,6 +147,18 @@ spec: - name: ELASTIC_APM_SERVER_URL value: {{ .Values.globals.elasticApmServerUrl | quote }} {{ end }} + {{ if .Values.globals.globalAgentHttpProxy }} + - name: GLOBAL_AGENT_HTTP_PROXY + value: {{ .Values.globals.globalAgentHttpProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentHttpsProxy }} + - name: GLOBAL_AGENT_HTTPS_PROXY + value: {{ .Values.globals.globalAgentHttpsProxy | quote }} + {{ end }} + {{ if .Values.globals.globalAgentNoProxy }} + - name: GLOBAL_AGENT_NO_PROXY + value: {{ .Values.globals.globalAgentNoProxy | quote }} + {{ end }} - name: CDN_URL value: {{ .Values.globals.cdnUrl }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index a2a761aa86..3c788fbcc9 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -106,6 +106,9 @@ globals: # elasticApmEnabled: # elasticApmSecretToken: # elasticApmServerUrl: +# globalAgentHttpProxy: +# globalAgentHttpsProxy: +# globalAgentNoProxy: services: budibaseVersion: latest From ca6ad9076c0cb34eec670b79cec9e147e22a4c8d Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 6 Dec 2022 14:44:23 +0000 Subject: [PATCH 15/52] v2.1.45 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 2ff0f32c71..dbb364ac88 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.44", + "version": "2.1.45", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index af239c5234..71eacdf901 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.44", + "@budibase/types": "^2.1.45", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index b2b3b9aac1..2531faadfb 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.44", + "version": "2.1.45", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.44", + "@budibase/string-templates": "^2.1.45", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 7122447fa9..8b73b76773 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.44", + "version": "2.1.45", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.44", - "@budibase/client": "^2.1.44", - "@budibase/frontend-core": "^2.1.44", - "@budibase/string-templates": "^2.1.44", + "@budibase/bbui": "^2.1.45", + "@budibase/client": "^2.1.45", + "@budibase/frontend-core": "^2.1.45", + "@budibase/string-templates": "^2.1.45", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2310cb8204..254130abf6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.44", - "@budibase/string-templates": "^2.1.44", - "@budibase/types": "^2.1.44", + "@budibase/backend-core": "^2.1.45", + "@budibase/string-templates": "^2.1.45", + "@budibase/types": "^2.1.45", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index fac9e08272..3c8fa59a73 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.44", + "version": "2.1.45", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.44", - "@budibase/frontend-core": "^2.1.44", - "@budibase/string-templates": "^2.1.44", + "@budibase/bbui": "^2.1.45", + "@budibase/frontend-core": "^2.1.45", + "@budibase/string-templates": "^2.1.45", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 9d4382122e..c828018022 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.44", + "@budibase/bbui": "^2.1.45", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e25ccc5935..2742b96442 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1baf4d56a7..7a90fc6c83 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.44", - "@budibase/client": "^2.1.44", + "@budibase/backend-core": "^2.1.45", + "@budibase/client": "^2.1.45", "@budibase/pro": "2.1.44", - "@budibase/string-templates": "^2.1.44", - "@budibase/types": "^2.1.44", + "@budibase/string-templates": "^2.1.45", + "@budibase/types": "^2.1.45", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d9cfc9bebf..7face77010 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.44", + "version": "2.1.45", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index afce21e29c..eb7821b852 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e3b44548c4..f9aa8e5c53 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.44", + "version": "2.1.45", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.44", + "@budibase/backend-core": "^2.1.45", "@budibase/pro": "2.1.44", - "@budibase/string-templates": "^2.1.44", - "@budibase/types": "^2.1.44", + "@budibase/string-templates": "^2.1.45", + "@budibase/types": "^2.1.45", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 083c3e62d550adcfe00494f519d93580a983dcd6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 6 Dec 2022 14:48:32 +0000 Subject: [PATCH 16/52] Update pro version to 2.1.45 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 7a90fc6c83..5243966ded 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.45", "@budibase/client": "^2.1.45", - "@budibase/pro": "2.1.44", + "@budibase/pro": "2.1.45", "@budibase/string-templates": "^2.1.45", "@budibase/types": "^2.1.45", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ff30c4c266..85b3e01b0f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.44.tgz#637473b2a567b1f02786dc803e53a071ab024608" - integrity sha512-zMcrDtkE6h0NVhtwb5Wpc6bs052rBN5MENwEEuNvvgUxMoxXnTlDZQsx7iRPs3ytuCFL6rReAlFwl891PKbcuw== +"@budibase/backend-core@2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.45.tgz#49c515ab103fc1716df881fae0dd277fa12aeb71" + integrity sha512-eVUThmOXsAfsCPqrEvyJsxiPiQ/4Il2BEOmdgL3hI1O51mthUZ0X2Es9gLnccBZF32g8FFs3WSeYE9F4Mv+hzg== dependencies: - "@budibase/types" "^2.1.44" + "@budibase/types" "^2.1.45" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.44.tgz#6fb7ee736419eda57d969da1d5c8d2ff11665b83" - integrity sha512-TZw+S5ajs2806Hm+DdJtFUMLwlqiKVOG2xoZJGZVWlYO0CzGLssreAzTg3ssAlV6Xe8CMkOS8DB9yz/dh3gayQ== +"@budibase/pro@2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.45.tgz#64c6382be3ef68f5107ab94043c285d458d6f0c6" + integrity sha512-QO/qknEhHyjgjgLgOYUnEpgqxC6TLKIYyEwG/Yj5lCfAVjXQX/kKgJ0KAyM0c2+TWGn4YNokIDXURvMyDcsjig== dependencies: - "@budibase/backend-core" "2.1.44" - "@budibase/types" "2.1.44" + "@budibase/backend-core" "2.1.45" + "@budibase/types" "2.1.45" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.44", "@budibase/types@^2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.44.tgz#2326005efb137c64ef61f7481d5c5cb34aa6817c" - integrity sha512-WVE6ee9TPwcUe2kAkURlQp1B+uGGsC/9WRWSGapmK/pvnDzb2RXrvDP5Pr1SNQ/GHTzsUxHpxHiaGDuupCXhpQ== +"@budibase/types@2.1.45", "@budibase/types@^2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.45.tgz#8cbb82130262d60a5988233381f8666d7dac068b" + integrity sha512-slW1wzDzcdit/qv3Jp5Fa+M7ZYxBYLSldfsGEnDIJ7g23ewWhBuRF1khYxoy2OxG1pfcxLjo0s2ZaUjc2uVV4w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f9aa8e5c53..9414202a89 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.45", - "@budibase/pro": "2.1.44", + "@budibase/pro": "2.1.45", "@budibase/string-templates": "^2.1.45", "@budibase/types": "^2.1.45", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 711ea55c69..b3bf97effc 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.44.tgz#637473b2a567b1f02786dc803e53a071ab024608" - integrity sha512-zMcrDtkE6h0NVhtwb5Wpc6bs052rBN5MENwEEuNvvgUxMoxXnTlDZQsx7iRPs3ytuCFL6rReAlFwl891PKbcuw== +"@budibase/backend-core@2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.45.tgz#49c515ab103fc1716df881fae0dd277fa12aeb71" + integrity sha512-eVUThmOXsAfsCPqrEvyJsxiPiQ/4Il2BEOmdgL3hI1O51mthUZ0X2Es9gLnccBZF32g8FFs3WSeYE9F4Mv+hzg== dependencies: - "@budibase/types" "^2.1.44" + "@budibase/types" "^2.1.45" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.44.tgz#6fb7ee736419eda57d969da1d5c8d2ff11665b83" - integrity sha512-TZw+S5ajs2806Hm+DdJtFUMLwlqiKVOG2xoZJGZVWlYO0CzGLssreAzTg3ssAlV6Xe8CMkOS8DB9yz/dh3gayQ== +"@budibase/pro@2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.45.tgz#64c6382be3ef68f5107ab94043c285d458d6f0c6" + integrity sha512-QO/qknEhHyjgjgLgOYUnEpgqxC6TLKIYyEwG/Yj5lCfAVjXQX/kKgJ0KAyM0c2+TWGn4YNokIDXURvMyDcsjig== dependencies: - "@budibase/backend-core" "2.1.44" - "@budibase/types" "2.1.44" + "@budibase/backend-core" "2.1.45" + "@budibase/types" "2.1.45" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.44", "@budibase/types@^2.1.44": - version "2.1.44" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.44.tgz#2326005efb137c64ef61f7481d5c5cb34aa6817c" - integrity sha512-WVE6ee9TPwcUe2kAkURlQp1B+uGGsC/9WRWSGapmK/pvnDzb2RXrvDP5Pr1SNQ/GHTzsUxHpxHiaGDuupCXhpQ== +"@budibase/types@2.1.45", "@budibase/types@^2.1.45": + version "2.1.45" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.45.tgz#8cbb82130262d60a5988233381f8666d7dac068b" + integrity sha512-slW1wzDzcdit/qv3Jp5Fa+M7ZYxBYLSldfsGEnDIJ7g23ewWhBuRF1khYxoy2OxG1pfcxLjo0s2ZaUjc2uVV4w== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From b03bf753a00e30ab23f9335ed7f647a0279d85ea Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 6 Dec 2022 15:13:12 +0000 Subject: [PATCH 17/52] Fix issue with extremely long select values! --- packages/bbui/src/Form/Core/Picker.svelte | 3 +++ .../design/[screenId]/_components/AppPanel.svelte | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 16d13ef2cc..97bd1394b4 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -205,7 +205,10 @@ width: 100%; } .spectrum-Popover.auto-width :global(.spectrum-Menu-itemLabel) { + max-width: 400px; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .spectrum-Picker { width: 100%; diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte index c4b80dcc3a..e97e3ee15c 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte @@ -61,6 +61,13 @@ align-items: center; gap: var(--spacing-l); } + .header-left { + flex: 1 1 auto; + width: 0; + } + .header-left :global(> *) { + max-width: 100%; + } .header-left :global(.spectrum-Picker) { font-weight: 600; color: var(--spectrum-global-color-gray-900); From 74a8eba2fa8c64961d8bc44c3eef0e9393151f21 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 6 Dec 2022 15:21:17 +0000 Subject: [PATCH 18/52] Fix side panel issue where content from multiple side panels would be shown --- packages/client/src/components/app/SidePanel.svelte | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte index 8731c7191e..a44bd65e6b 100644 --- a/packages/client/src/components/app/SidePanel.svelte +++ b/packages/client/src/components/app/SidePanel.svelte @@ -47,7 +47,10 @@ // Apply initial visibility update(visible) - return { update } + return { + update, + destroy: () => update(false), + } } @@ -57,7 +60,7 @@ class="side-panel" class:open > - {#if $sidePanelStore.open} + {#if open} {/if}
From 07347420e7c4d1e9a3c76146e3795dfb8c594582 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 6 Dec 2022 15:32:50 +0000 Subject: [PATCH 19/52] Fix issue with not being able to update component names --- packages/builder/src/builderStore/store/frontend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index e831f6a343..b596a13450 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -1049,8 +1049,8 @@ export const getFrontendStore = () => { const updatedSetting = settings.find(setting => setting.key === name) if ( - updatedSetting.type === "dataSource" || - updatedSetting.type === "table" + updatedSetting?.type === "dataSource" || + updatedSetting?.type === "table" ) { const { schema } = getSchemaForDatasource(null, value) const columnNames = Object.keys(schema || {}) From 9d1d208503b1a0d11e5a24d25515e6bc2ebfa323 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 6 Dec 2022 16:29:26 +0000 Subject: [PATCH 20/52] v2.1.43-alpha.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index e91c9edfc9..c7cc049819 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index dfefb243a4..17bf9c47f3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.43-alpha.9", + "@budibase/types": "2.1.43-alpha.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 2e81532a0d..dc7e23c70d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.43-alpha.9", + "@budibase/string-templates": "2.1.43-alpha.10", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ae6db2d7bf..e33b8f9232 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.43-alpha.9", - "@budibase/client": "2.1.43-alpha.9", - "@budibase/frontend-core": "2.1.43-alpha.9", - "@budibase/string-templates": "2.1.43-alpha.9", + "@budibase/bbui": "2.1.43-alpha.10", + "@budibase/client": "2.1.43-alpha.10", + "@budibase/frontend-core": "2.1.43-alpha.10", + "@budibase/string-templates": "2.1.43-alpha.10", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 977e71fe19..bb283d751a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.43-alpha.9", - "@budibase/string-templates": "2.1.43-alpha.9", - "@budibase/types": "2.1.43-alpha.9", + "@budibase/backend-core": "2.1.43-alpha.10", + "@budibase/string-templates": "2.1.43-alpha.10", + "@budibase/types": "2.1.43-alpha.10", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 3c10cfce03..b74b5446a1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.43-alpha.9", - "@budibase/frontend-core": "2.1.43-alpha.9", - "@budibase/string-templates": "2.1.43-alpha.9", + "@budibase/bbui": "2.1.43-alpha.10", + "@budibase/frontend-core": "2.1.43-alpha.10", + "@budibase/string-templates": "2.1.43-alpha.10", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a7645f2e64..09803434c2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.43-alpha.9", + "@budibase/bbui": "2.1.43-alpha.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0995e98bd1..e2b558c3af 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 14adf4e6c8..b06be3bea1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.43-alpha.9", - "@budibase/client": "2.1.43-alpha.9", + "@budibase/backend-core": "2.1.43-alpha.10", + "@budibase/client": "2.1.43-alpha.10", "@budibase/pro": "2.1.43-alpha.9", - "@budibase/string-templates": "2.1.43-alpha.9", - "@budibase/types": "2.1.43-alpha.9", + "@budibase/string-templates": "2.1.43-alpha.10", + "@budibase/types": "2.1.43-alpha.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b2c3851e0f..dd4d6b9a66 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index b35d71aa7b..17a3e2ed21 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9374840167..993ae59c84 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.43-alpha.9", + "version": "2.1.43-alpha.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.43-alpha.9", + "@budibase/backend-core": "2.1.43-alpha.10", "@budibase/pro": "2.1.43-alpha.9", - "@budibase/string-templates": "2.1.43-alpha.9", - "@budibase/types": "2.1.43-alpha.9", + "@budibase/string-templates": "2.1.43-alpha.10", + "@budibase/types": "2.1.43-alpha.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a3773c57a1786900765288d956abbba5f3ad9966 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 6 Dec 2022 16:32:55 +0000 Subject: [PATCH 21/52] Update pro version to 2.1.43-alpha.10 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b06be3bea1..4f7da723fc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.43-alpha.10", "@budibase/client": "2.1.43-alpha.10", - "@budibase/pro": "2.1.43-alpha.9", + "@budibase/pro": "2.1.43-alpha.10", "@budibase/string-templates": "2.1.43-alpha.10", "@budibase/types": "2.1.43-alpha.10", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 775dea80bc..cb48ae35c0 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.9.tgz#c2e59c710390a0816e6a77f2444f378cc1843cd2" - integrity sha512-tkRV2noQ8GMuJmCh0TQAbmwOXH2HdFxnD8aNHuBMxbWEVCF3ICydozr1i+zCGnGQCtYVCtk1bgedPUwtDkvB7Q== +"@budibase/backend-core@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.10.tgz#573647b851993734d83ce201c44eb4c3df2b8141" + integrity sha512-1YOwm0n1gydvtqas7xW7oje97LiYxCZ0jGIMoxXk8AK94iXAYW/UYEcc/BdOnEvK0Zz4KEfvZ8tgAvq4VM83uQ== dependencies: - "@budibase/types" "2.1.43-alpha.9" + "@budibase/types" "2.1.43-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.9.tgz#60756ded5eb190cbe3cbc74fc18614021a74afaf" - integrity sha512-ibmQO3MqllynwqMsQcfUPyZ9gJdgiLMOZXnq7rFsyKgGsPtddgb2M3hMROGS6wGQ4osqp1cShg5MykstTpL6HA== +"@budibase/pro@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.10.tgz#300ba146e2715b9b3d36f4febcde030f01760347" + integrity sha512-q9bwYw3xcDD08z9OZVHfqiBKNGjdDQ+c+SEYQRlNrvF9EbGc4WFiPzKDJrNlVSQF+/+oBHxGo6J9mFqrL66sdA== dependencies: - "@budibase/backend-core" "2.1.43-alpha.9" - "@budibase/types" "2.1.43-alpha.9" + "@budibase/backend-core" "2.1.43-alpha.10" + "@budibase/types" "2.1.43-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.9.tgz#6b677230232efc29bb26d34e073033838632031e" - integrity sha512-PAI+rTGEvxfOKhvvf/18bc2uR69k1n3qvX+KFzGqcGj0f1PglPz8+/9R4nW/kT2kSVPkT7SN7M5ILsuZnd6jjQ== +"@budibase/types@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.10.tgz#0ee0766d07126a36913836de94d8fcebc77aead3" + integrity sha512-APp/srnTGZ1nIgCuOMsm2rEimMjKzKHZYd1QkuRq13dFcuwTG+Gr/soITTWurczAbS9jTo3MfZh859s1uv2e3g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 993ae59c84..cf15b97090 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.43-alpha.10", - "@budibase/pro": "2.1.43-alpha.9", + "@budibase/pro": "2.1.43-alpha.10", "@budibase/string-templates": "2.1.43-alpha.10", "@budibase/types": "2.1.43-alpha.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index bd514cf543..bd31e5aa8c 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.9.tgz#c2e59c710390a0816e6a77f2444f378cc1843cd2" - integrity sha512-tkRV2noQ8GMuJmCh0TQAbmwOXH2HdFxnD8aNHuBMxbWEVCF3ICydozr1i+zCGnGQCtYVCtk1bgedPUwtDkvB7Q== +"@budibase/backend-core@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.43-alpha.10.tgz#573647b851993734d83ce201c44eb4c3df2b8141" + integrity sha512-1YOwm0n1gydvtqas7xW7oje97LiYxCZ0jGIMoxXk8AK94iXAYW/UYEcc/BdOnEvK0Zz4KEfvZ8tgAvq4VM83uQ== dependencies: - "@budibase/types" "2.1.43-alpha.9" + "@budibase/types" "2.1.43-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.9.tgz#60756ded5eb190cbe3cbc74fc18614021a74afaf" - integrity sha512-ibmQO3MqllynwqMsQcfUPyZ9gJdgiLMOZXnq7rFsyKgGsPtddgb2M3hMROGS6wGQ4osqp1cShg5MykstTpL6HA== +"@budibase/pro@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.43-alpha.10.tgz#300ba146e2715b9b3d36f4febcde030f01760347" + integrity sha512-q9bwYw3xcDD08z9OZVHfqiBKNGjdDQ+c+SEYQRlNrvF9EbGc4WFiPzKDJrNlVSQF+/+oBHxGo6J9mFqrL66sdA== dependencies: - "@budibase/backend-core" "2.1.43-alpha.9" - "@budibase/types" "2.1.43-alpha.9" + "@budibase/backend-core" "2.1.43-alpha.10" + "@budibase/types" "2.1.43-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.43-alpha.9": - version "2.1.43-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.9.tgz#6b677230232efc29bb26d34e073033838632031e" - integrity sha512-PAI+rTGEvxfOKhvvf/18bc2uR69k1n3qvX+KFzGqcGj0f1PglPz8+/9R4nW/kT2kSVPkT7SN7M5ILsuZnd6jjQ== +"@budibase/types@2.1.43-alpha.10": + version "2.1.43-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.43-alpha.10.tgz#0ee0766d07126a36913836de94d8fcebc77aead3" + integrity sha512-APp/srnTGZ1nIgCuOMsm2rEimMjKzKHZYd1QkuRq13dFcuwTG+Gr/soITTWurczAbS9jTo3MfZh859s1uv2e3g== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b9ce140d954f77859ac500245ca5b4a282292bf8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Dec 2022 17:20:26 +0000 Subject: [PATCH 22/52] Fix for #7732 - as well as some tests for it, make sure that it is working as expected. --- packages/backend-core/src/db/utils.ts | 2 +- .../src/api/controllers/public/users.ts | 29 +++++++++++--- .../api/routes/public/tests/compare.spec.js | 24 ++---------- .../src/api/routes/public/tests/users.spec.js | 38 +++++++++++++++++++ .../src/api/routes/public/tests/utils.ts | 28 ++++++++++++++ .../server/src/utilities/workerRequests.ts | 4 +- 6 files changed, 95 insertions(+), 30 deletions(-) create mode 100644 packages/server/src/api/routes/public/tests/users.spec.js create mode 100644 packages/server/src/api/routes/public/tests/utils.ts diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 590c3eeef8..870744ffea 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -181,7 +181,7 @@ export function generateUserMetadataID(globalId: string) { /** * Breaks up the ID to get the global ID. */ -export function getGlobalIDFromUserMetadataID(id: string) { +export function getGlobalIDFromUserMetadataID(id?: string) { const prefix = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}` if (!id || !id.includes(prefix)) { return id diff --git a/packages/server/src/api/controllers/public/users.ts b/packages/server/src/api/controllers/public/users.ts index 129d2c883f..4140d3c978 100644 --- a/packages/server/src/api/controllers/public/users.ts +++ b/packages/server/src/api/controllers/public/users.ts @@ -5,9 +5,18 @@ import { saveGlobalUser, } from "../../../utilities/workerRequests" import { publicApiUserFix } from "../../../utilities/users" +import { db as dbCore } from "@budibase/backend-core" import { search as stringSearch } from "./utils" +import { BBContext, User } from "@budibase/types" -function getUser(ctx: any, userId?: string) { +function isLoggedInUser(ctx: BBContext, user: User) { + const loggedInId = ctx.user?._id + const globalUserId = dbCore.getGlobalIDFromUserMetadataID(loggedInId) + // check both just incase + return globalUserId === user._id || loggedInId === user._id +} + +function getUser(ctx: BBContext, userId?: string) { if (userId) { ctx.params = { userId } } else if (!ctx.params?.userId) { @@ -16,37 +25,45 @@ function getUser(ctx: any, userId?: string) { return readGlobalUser(ctx) } -export async function search(ctx: any, next: any) { +export async function search(ctx: BBContext, next: any) { const { name } = ctx.request.body const users = await allGlobalUsers(ctx) ctx.body = stringSearch(users, name, "email") await next() } -export async function create(ctx: any, next: any) { +export async function create(ctx: BBContext, next: any) { const response = await saveGlobalUser(publicApiUserFix(ctx)) ctx.body = await getUser(ctx, response._id) await next() } -export async function read(ctx: any, next: any) { +export async function read(ctx: BBContext, next: any) { ctx.body = await readGlobalUser(ctx) await next() } -export async function update(ctx: any, next: any) { +export async function update(ctx: BBContext, next: any) { const user = await readGlobalUser(ctx) ctx.request.body = { ...ctx.request.body, _rev: user._rev, } + // disallow updating your own role - always overwrite with DB roles + if (isLoggedInUser(ctx, user)) { + ctx.request.body.roles = user.roles + } const response = await saveGlobalUser(publicApiUserFix(ctx)) ctx.body = await getUser(ctx, response._id) await next() } -export async function destroy(ctx: any, next: any) { +export async function destroy(ctx: BBContext, next: any) { const user = await getUser(ctx) + // disallow deleting yourself + if (isLoggedInUser(ctx, user)) { + ctx.throw(405, "Cannot delete user using its own API key.") + } await deleteGlobalUser(ctx) ctx.body = user await next() diff --git a/packages/server/src/api/routes/public/tests/compare.spec.js b/packages/server/src/api/routes/public/tests/compare.spec.js index 860907b69d..eaf0fb2049 100644 --- a/packages/server/src/api/routes/public/tests/compare.spec.js +++ b/packages/server/src/api/routes/public/tests/compare.spec.js @@ -1,41 +1,23 @@ const jestOpenAPI = require("jest-openapi").default const generateSchema = require("../../../../../specs/generate") const setup = require("../../tests/utilities") -const { checkSlashesInUrl } = require("../../../../utilities") +const { generateMakeRequest } = require("./utils") const yamlPath = generateSchema() jestOpenAPI(yamlPath) -let request = setup.getRequest() let config = setup.getConfig() -let apiKey, table, app +let apiKey, table, app, makeRequest beforeAll(async () => { app = await config.init() table = await config.updateTable() apiKey = await config.generateApiKey() + makeRequest = generateMakeRequest(apiKey, setup) }) afterAll(setup.afterAll) -async function makeRequest(method, endpoint, body, appId = config.getAppId()) { - const extraHeaders = { - "x-budibase-api-key": apiKey, - } - if (appId) { - extraHeaders["x-budibase-app-id"] = appId - } - const req = request - [method](checkSlashesInUrl(`/api/public/v1/${endpoint}`)) - .set(config.defaultHeaders(extraHeaders)) - if (body) { - req.send(body) - } - const res = await req - expect(res.body).toBeDefined() - return res -} - describe("check the applications endpoints", () => { it("should allow retrieving applications through search", async () => { const res = await makeRequest("post", "/applications/search") diff --git a/packages/server/src/api/routes/public/tests/users.spec.js b/packages/server/src/api/routes/public/tests/users.spec.js new file mode 100644 index 0000000000..82f63cb847 --- /dev/null +++ b/packages/server/src/api/routes/public/tests/users.spec.js @@ -0,0 +1,38 @@ +const setup = require("../../tests/utilities") +const { generateMakeRequest } = require("./utils") + +const workerRequests = require("../../../../utilities/workerRequests") + +let config = setup.getConfig() +let apiKey, globalUser, makeRequest + +beforeAll(async () => { + await config.init() + globalUser = await config.globalUser() + apiKey = await config.generateApiKey(globalUser._id) + makeRequest = generateMakeRequest(apiKey, setup) + workerRequests.readGlobalUser.mockReturnValue(globalUser) +}) + +afterAll(setup.afterAll) + +describe("check user endpoints", () => { + it("should not allow a user to update their own roles", async () => { + const res = await makeRequest("put", `/users/${globalUser._id}`, { + ...globalUser, + roles: { + "app_1": "ADMIN", + } + }) + expect(workerRequests.saveGlobalUser.mock.lastCall[0].body.data.roles["app_1"]).toBeUndefined() + expect(res.status).toBe(200) + expect(res.body.data.roles["app_1"]).toBeUndefined() + }) + + it("should not allow a user to delete themselves", async () => { + const res = await makeRequest("delete", `/users/${globalUser._id}`) + expect(res.status).toBe(405) + expect(workerRequests.deleteGlobalUser.mock.lastCall).toBeUndefined() + }) +}) + diff --git a/packages/server/src/api/routes/public/tests/utils.ts b/packages/server/src/api/routes/public/tests/utils.ts new file mode 100644 index 0000000000..ad468332e6 --- /dev/null +++ b/packages/server/src/api/routes/public/tests/utils.ts @@ -0,0 +1,28 @@ +import { checkSlashesInUrl } from "../../../../utilities" + +export function generateMakeRequest(apiKey: string, setup: any) { + const request = setup.getRequest() + const config = setup.getConfig() + return async ( + method: string, + endpoint: string, + body?: any, + intAppId: string = config.getAppId() + ) => { + const extraHeaders: any = { + "x-budibase-api-key": apiKey, + } + if (intAppId) { + extraHeaders["x-budibase-app-id"] = intAppId + } + const req = request[method]( + checkSlashesInUrl(`/api/public/v1/${endpoint}`) + ).set(config.defaultHeaders(extraHeaders)) + if (body) { + req.send(body) + } + const res = await req + expect(res.body).toBeDefined() + return res + } +} diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts index d1fd467025..b3a61ddd68 100644 --- a/packages/server/src/utilities/workerRequests.ts +++ b/packages/server/src/utilities/workerRequests.ts @@ -3,7 +3,7 @@ import env from "../environment" import { checkSlashesInUrl } from "./index" import { db as dbCore, constants, tenancy } from "@budibase/backend-core" import { updateAppRole } from "./global" -import { BBContext, Automation } from "@budibase/types" +import { BBContext, User } from "@budibase/types" export function request(ctx?: BBContext, request?: any) { if (!request.headers) { @@ -138,7 +138,7 @@ export async function deleteGlobalUser(ctx: BBContext) { return checkResponse(response, "delete user", { ctx }) } -export async function readGlobalUser(ctx: BBContext) { +export async function readGlobalUser(ctx: BBContext): Promise { const response = await fetch( checkSlashesInUrl( env.WORKER_URL + `/api/global/users/${ctx.params.userId}` From d3029d33ae748e39ea0fc20e9ede3261509f3f6c Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Dec 2022 18:21:54 +0000 Subject: [PATCH 23/52] Minor fix for #8843 - the binding input drawer was using the format helper. rather than helpers. when generating JS helpers. --- .../builder/src/components/common/bindings/utils.js | 2 +- packages/string-templates/test/javascript.spec.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/common/bindings/utils.js b/packages/builder/src/components/common/bindings/utils.js index c7b40604ad..8d414ffed3 100644 --- a/packages/builder/src/components/common/bindings/utils.js +++ b/packages/builder/src/components/common/bindings/utils.js @@ -24,7 +24,7 @@ export function addJSBinding(value, caretPos, binding, { helper } = {}) { if (!helper) { binding = `$("${binding}")` } else { - binding = `helper.${binding}()` + binding = `helpers.${binding}()` } if (caretPos.start) { value = diff --git a/packages/string-templates/test/javascript.spec.js b/packages/string-templates/test/javascript.spec.js index 5363f37e02..4ec7c48b1e 100644 --- a/packages/string-templates/test/javascript.spec.js +++ b/packages/string-templates/test/javascript.spec.js @@ -129,3 +129,15 @@ describe("Test the JavaScript helper", () => { expect(output).toBe("Error while executing JS") }) }) + +describe("check JS helpers", () => { + it("should error if using the format helper. not helpers.", () => { + const output = processJS(`return helper.toInt(4.3)`) + expect(output).toBe("Error while executing JS") + }) + + it("should be able to use toInt", () => { + const output = processJS(`return helpers.toInt(4.3)`) + expect(output).toBe(4) + }) +}) \ No newline at end of file From 4300e5c7332bf504621e0689841618d337c98674 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Dec 2022 18:23:55 +0000 Subject: [PATCH 24/52] Fix for CI build failure. --- packages/backend-core/src/db/utils.ts | 2 +- packages/server/src/api/controllers/public/users.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 870744ffea..590c3eeef8 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -181,7 +181,7 @@ export function generateUserMetadataID(globalId: string) { /** * Breaks up the ID to get the global ID. */ -export function getGlobalIDFromUserMetadataID(id?: string) { +export function getGlobalIDFromUserMetadataID(id: string) { const prefix = `${DocumentType.ROW}${SEPARATOR}${InternalTable.USER_METADATA}${SEPARATOR}` if (!id || !id.includes(prefix)) { return id diff --git a/packages/server/src/api/controllers/public/users.ts b/packages/server/src/api/controllers/public/users.ts index 4140d3c978..88dc82ffd2 100644 --- a/packages/server/src/api/controllers/public/users.ts +++ b/packages/server/src/api/controllers/public/users.ts @@ -11,7 +11,7 @@ import { BBContext, User } from "@budibase/types" function isLoggedInUser(ctx: BBContext, user: User) { const loggedInId = ctx.user?._id - const globalUserId = dbCore.getGlobalIDFromUserMetadataID(loggedInId) + const globalUserId = dbCore.getGlobalIDFromUserMetadataID(loggedInId!) // check both just incase return globalUserId === user._id || loggedInId === user._id } From 0e9477b9823f411b8f539bc69db0448bb2056bce Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 7 Dec 2022 08:57:17 +0000 Subject: [PATCH 25/52] Fix filter drawer and filtering in general across data, design and automate and update to support keyed fields and 'match any' --- .../SetupPanel/AutomationBlockSetup.svelte | 13 +-- .../backend/DataTable/DataTable.svelte | 5 +- .../buttons/TableFilterButton.svelte | 8 +- .../controls/FilterEditor/FilterDrawer.svelte | 83 +++++++++++++------ .../controls/FilterEditor/FilterEditor.svelte | 68 ++------------- 5 files changed, 82 insertions(+), 95 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 4fd2f40391..d09faa34c9 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -38,13 +38,15 @@ export let testData export let schemaProperties export let isTestModal = false + let webhookModal let drawer - let tempFilters = lookForFilters(schemaProperties) || [] let fillWidth = true let codeBindingOpen = false let inputData + $: filters = lookForFilters(schemaProperties) || [] + $: tempFilters = filters $: stepId = block.stepId $: bindings = getAvailableBindings( block || $automationStore.selectedBlock, @@ -222,16 +224,17 @@ {:else if value.customType === "filters"} Define filters - + (tempFilters = e.detail)} /> {:else if value.customType === "password"} diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 7cb368830e..6a135b5428 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -25,6 +25,7 @@ import { API } from "api" let hideAutocolumns = true + let filters $: isUsersTable = $tables.selected?._id === TableNames.USERS $: type = $tables.selected?.type @@ -102,8 +103,9 @@ // Fetch data whenever filters change const onFilter = e => { + filters = e.detail fetch.update({ - filter: e.detail, + filter: filters, }) } @@ -178,6 +180,7 @@ {#key id} diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte index 633c7e1ad1..be9c6259c6 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte @@ -8,9 +8,10 @@ export let disabled = false const dispatch = createEventDispatcher() - let modal - let tempValue = filters || [] + let modal + + $: tempValue = filters || [] $: schemaFields = Object.values(schema || {}) @@ -34,8 +35,9 @@
(tempValue = e.detail)} />
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index 019a61a3bf..58b95b7248 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -17,22 +17,30 @@ import { generate } from "shortid" import { LuceneUtils, Constants } from "@budibase/frontend-core" import { getFields } from "helpers/searchFields" - import { createEventDispatcher, onMount } from "svelte" - - const dispatch = createEventDispatcher() - const { OperatorOptions } = Constants - const { getValidOperatorsForType } = LuceneUtils + import { createEventDispatcher } from "svelte" export let schemaFields export let filters = [] export let bindings = [] export let panel = ClientBindingPanel export let allowBindings = true - export let allOr = false export let fillWidth = false export let tableId - $: dispatch("change", filters) + const dispatch = createEventDispatcher() + const { OperatorOptions } = Constants + const { getValidOperatorsForType } = LuceneUtils + const KeyedFieldRegex = /\d[0-9]*:/g + const behaviourOptions = [ + { value: "and", label: "Match all of the following filters" }, + { value: "or", label: "Match any of the following filters" }, + ] + + let rawFilters + let matchAny = false + + $: parseFilters(filters) + $: dispatch("change", enrichFilters(rawFilters, matchAny)) $: enrichedSchemaFields = getFields( schemaFields || [], { allowLinks: true }, @@ -41,14 +49,41 @@ $: fieldOptions = enrichedSchemaFields.map(field => field.name) || [] $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"] - let behaviourValue - const behaviourOptions = [ - { value: "and", label: "Match all of the following filters" }, - { value: "or", label: "Match any of the following filters" }, - ] + // Remove field key prefixes and determine whether to use the "match all" + // or "match any" behaviour + const parseFilters = filters => { + matchAny = filters?.find(filter => filter.operator === "allOr") != null + rawFilters = (filters || []) + .filter(filter => filter.operator !== "allOr") + .map(filter => { + const { field } = filter + let newFilter = { ...filter } + delete newFilter.allOr + if (typeof field === "string" && field.match(KeyedFieldRegex) != null) { + const parts = field.split(":") + parts.shift() + newFilter.field = parts.join(":") + } + return newFilter + }) + } + + // Add field key prefixes and a special metadata filter object to indicate + // whether to use the "match all" or "match any" behaviour + const enrichFilters = (rawFilters, matchAny) => { + let count = 1 + return rawFilters + .filter(filter => filter.field) + .map(filter => ({ + ...filter, + field: `${count++}:${filter.field}`, + })) + .concat(matchAny ? [{ operator: "allOr" }] : []) + } + const addFilter = () => { - filters = [ - ...filters, + rawFilters = [ + ...rawFilters, { id: generate(), field: null, @@ -60,13 +95,13 @@ } const removeFilter = id => { - filters = filters.filter(field => field.id !== id) + rawFilters = rawFilters.filter(field => field.id !== id) } const duplicateFilter = id => { - const existingFilter = filters.find(filter => filter.id === id) + const existingFilter = rawFilters.find(filter => filter.id === id) const duplicate = { ...existingFilter, id: generate() } - filters = [...filters, duplicate] + rawFilters = [...rawFilters, duplicate] } const getSchema = filter => { @@ -133,32 +168,28 @@ const schema = enrichedSchemaFields.find(x => x.name === field) return schema?.constraints?.inclusion || [] } - - onMount(() => { - behaviourValue = allOr ? "or" : "and" - })
- {#if !filters?.length} + {#if !rawFilters?.length} Add your first filter expression. {:else} Results are filtered to only those which match all of the following constraints. {/if} - {#if filters?.length} + {#if rawFilters?.length}
filter.operator !== "allOr") - if (allOr && filters) { - filters.push({ operator: "allOr" }) - } - // only save if anything was updated - if (filters) { - dispatch("change", addNumbering(filters)) - } - notifications.success("Filters saved.") + notifications.success("Filters saved") drawer.hide() } @@ -85,13 +36,10 @@ { - toSaveFilters = event.detail - }} + on:change={e => (tempValue = e.detail)} /> From d4a74121631fcf51212e25a8b6563b35b1893dc3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 7 Dec 2022 09:00:29 +0000 Subject: [PATCH 26/52] Update filter labels to reflect that more than and less than also include equal to --- .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 2 +- packages/frontend-core/src/constants.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index 58b95b7248..24353c8f58 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -300,7 +300,7 @@ column-gap: var(--spacing-l); row-gap: var(--spacing-s); align-items: center; - grid-template-columns: 1fr 150px 120px 1fr 16px 16px; + grid-template-columns: 1fr 170px 120px 1fr 16px 16px; } .filter-label { diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 1eed492c25..ff9f4628d0 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -28,11 +28,11 @@ export const OperatorOptions = { }, MoreThan: { value: "rangeLow", - label: "More than", + label: "More than or equal to", }, LessThan: { value: "rangeHigh", - label: "Less than", + label: "Less than or equal to", }, Contains: { value: "contains", From 608576ff3bb85ed383988e12f5ae47e2e8f835a7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 7 Dec 2022 09:02:31 +0000 Subject: [PATCH 27/52] Remove console log --- .../settings/controls/FilterEditor/FilterEditor.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 5f97af2fc1..af3afd8bcc 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -22,10 +22,7 @@ $: schemaFields = Object.values(schema || {}) async function saveFilter() { - if (tempValue !== value) { - console.log("saving", tempValue) - dispatch("change", tempValue) - } + dispatch("change", tempValue) notifications.success("Filters saved") drawer.hide() } From a8461924949c42b18f2fbeeb886e5a70c7dd7032 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 7 Dec 2022 09:51:47 +0000 Subject: [PATCH 28/52] Fix side panel ejection --- .../client/src/components/app/SidePanel.svelte | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte index a44bd65e6b..825b401bb8 100644 --- a/packages/client/src/components/app/SidePanel.svelte +++ b/packages/client/src/components/app/SidePanel.svelte @@ -29,6 +29,17 @@ // Derive visibility $: open = $sidePanelStore.contentId === $component.id + // Derive a render key which is only changed whenever this panel is made + // visible after being hidden. We need to key the content to avoid showing + // stale data when re-revealing a side panel that was closed, but we cannot + // hide the content altogether when hidden as this breaks ejection. + let renderKey = null + $: { + if (open) { + renderKey = Math.random() + } + } + const showInSidePanel = (el, visible) => { const update = visible => { const target = document.getElementById("side-panel-container") @@ -60,9 +71,9 @@ class="side-panel" class:open > - {#if open} + {#key renderKey} - {/if} + {/key}