From 5aba8e4a65e28a7b4ced0af39d9103f513fbcc89 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 8 Nov 2022 14:31:36 +0000 Subject: [PATCH 01/48] Added readable prop to aggregate function --- packages/server/src/integrations/mongodb.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index d7709a08c7..9ccefbda58 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -58,6 +58,7 @@ const SCHEMA: Integration = { }, aggregate: { type: QueryType.JSON, + readable: true, steps: [ { key: "$addFields", From 572e31fb29ac6a7304aaf2e7a804aab9c32b2d1a Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 8 Nov 2022 17:02:31 +0000 Subject: [PATCH 02/48] Block lucene special characters from new column --- .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index dce6df6d0d..a2400f1836 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -304,6 +304,8 @@ const newError = {} if (!external && fieldInfo.name?.startsWith("_")) { newError.name = `Column name cannot start with an underscore.` + } else if (fieldInfo.name?.match(/[\-!*+?^"{}()~\/[\]\\]/g)) { + newError.name = `Illegal character; cannot be: + - ! ( ) { } [ ] ^ " ~ * ? : \\ /` } else if (PROHIBITED_COLUMN_NAMES.some(name => fieldInfo.name === name)) { newError.name = `${PROHIBITED_COLUMN_NAMES.join( ", " From 847fc9f83a6d7d1d9fa2dc4887513c238b3b3d58 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 8 Nov 2022 17:03:13 +0000 Subject: [PATCH 03/48] Remove escaped characters --- .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index a2400f1836..279a901ce9 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -304,7 +304,7 @@ const newError = {} if (!external && fieldInfo.name?.startsWith("_")) { newError.name = `Column name cannot start with an underscore.` - } else if (fieldInfo.name?.match(/[\-!*+?^"{}()~\/[\]\\]/g)) { + } else if (fieldInfo.name?.match(/[-!*+?^"{}()~/[\]\\]/g)) { newError.name = `Illegal character; cannot be: + - ! ( ) { } [ ] ^ " ~ * ? : \\ /` } else if (PROHIBITED_COLUMN_NAMES.some(name => fieldInfo.name === name)) { newError.name = `${PROHIBITED_COLUMN_NAMES.join( From 4f1ecf6dc13a18302c27e2a0f6ddbe3165a1ee30 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 8 Nov 2022 17:07:25 +0000 Subject: [PATCH 04/48] Missed colon --- .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 279a901ce9..4ae1d31edb 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -304,7 +304,7 @@ const newError = {} if (!external && fieldInfo.name?.startsWith("_")) { newError.name = `Column name cannot start with an underscore.` - } else if (fieldInfo.name?.match(/[-!*+?^"{}()~/[\]\\]/g)) { + } else if (fieldInfo.name?.match(/[-!*+?:^"{}()~/[\]\\]/g)) { newError.name = `Illegal character; cannot be: + - ! ( ) { } [ ] ^ " ~ * ? : \\ /` } else if (PROHIBITED_COLUMN_NAMES.some(name => fieldInfo.name === name)) { newError.name = `${PROHIBITED_COLUMN_NAMES.join( From ca2f85b6f911b215c8de74b1b8c354b32d415980 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 8 Nov 2022 17:16:35 +0000 Subject: [PATCH 05/48] Use whitelist instead --- .../backend/DataTable/modals/CreateEditColumn.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 4ae1d31edb..84ce61222c 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -304,8 +304,8 @@ const newError = {} if (!external && fieldInfo.name?.startsWith("_")) { newError.name = `Column name cannot start with an underscore.` - } else if (fieldInfo.name?.match(/[-!*+?:^"{}()~/[\]\\]/g)) { - newError.name = `Illegal character; cannot be: + - ! ( ) { } [ ] ^ " ~ * ? : \\ /` + } else if (fieldInfo.name && !fieldInfo.name.match(/^[a-zA-Z0-9\s]*$/g)) { + newError.name = `Illegal character; must be alpha-numeric.` } else if (PROHIBITED_COLUMN_NAMES.some(name => fieldInfo.name === name)) { newError.name = `${PROHIBITED_COLUMN_NAMES.join( ", " From 43b5c120b5225f78cfb68febe4572a177dafed89 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 9 Nov 2022 10:28:15 +0000 Subject: [PATCH 06/48] Refactor form block to use a different structure depending on type, and fix issue with bindings breaking and forms not appearing --- .../components/app/blocks/FormBlock.svelte | 242 ------------------ .../app/blocks/form/FormBlock.svelte | 101 ++++++++ .../app/blocks/form/InnerFormBlock.svelte | 192 ++++++++++++++ .../client/src/components/app/blocks/index.js | 2 +- 4 files changed, 294 insertions(+), 243 deletions(-) delete mode 100644 packages/client/src/components/app/blocks/FormBlock.svelte create mode 100644 packages/client/src/components/app/blocks/form/FormBlock.svelte create mode 100644 packages/client/src/components/app/blocks/form/InnerFormBlock.svelte diff --git a/packages/client/src/components/app/blocks/FormBlock.svelte b/packages/client/src/components/app/blocks/FormBlock.svelte deleted file mode 100644 index 3311ddd7bb..0000000000 --- a/packages/client/src/components/app/blocks/FormBlock.svelte +++ /dev/null @@ -1,242 +0,0 @@ - - - - {#if fields?.length} - - - - - {#if renderHeader} - - - {#if renderButtons} - - {#if renderDeleteButton} - - {/if} - {#if renderSaveButton} - - {/if} - - {/if} - - {/if} - - {#each fields as field, idx} - {#if getComponentForField(field)} - - {/if} - {/each} - - - - - - {:else} - - {/if} - diff --git a/packages/client/src/components/app/blocks/form/FormBlock.svelte b/packages/client/src/components/app/blocks/form/FormBlock.svelte new file mode 100644 index 0000000000..9ec587519f --- /dev/null +++ b/packages/client/src/components/app/blocks/form/FormBlock.svelte @@ -0,0 +1,101 @@ + + + + {#if actionType === "Create"} + + + + {:else} + + + + + + {/if} + diff --git a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte new file mode 100644 index 0000000000..948584120b --- /dev/null +++ b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte @@ -0,0 +1,192 @@ + + +{#if fields?.length} + + + {#if renderHeader} + + + {#if renderButtons} + + {#if renderDeleteButton} + + {/if} + {#if renderSaveButton} + + {/if} + + {/if} + + {/if} + + {#each fields as field, idx} + {#if getComponentForField(field)} + + {/if} + {/each} + + + +{:else} + +{/if} diff --git a/packages/client/src/components/app/blocks/index.js b/packages/client/src/components/app/blocks/index.js index 734bff2c0f..0f05890fef 100644 --- a/packages/client/src/components/app/blocks/index.js +++ b/packages/client/src/components/app/blocks/index.js @@ -1,5 +1,5 @@ export { default as tableblock } from "./TableBlock.svelte" export { default as cardsblock } from "./CardsBlock.svelte" export { default as repeaterblock } from "./RepeaterBlock.svelte" -export { default as formblock } from "./FormBlock.svelte" +export { default as formblock } from "./form/FormBlock.svelte" export { default as chartblock } from "./ChartBlock.svelte" From 217743e6fd98830345756b56d1724f749c70fbe6 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 9 Nov 2022 13:57:22 +0000 Subject: [PATCH 07/48] patching sub dep for loader-utils to patch security vulnerability --- packages/bbui/package.json | 5 ++++- packages/client/package.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cb0a06aece..2c7aa7c19a 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -85,5 +85,8 @@ "svelte-flatpickr": "^3.2.3", "svelte-portal": "^1.0.0" }, + "resolutions": { + "loader-utils": "1.4.1" + }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/client/package.json b/packages/client/package.json index 0c51890dff..bfce293df3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -59,5 +59,8 @@ "rollup-plugin-terser": "^7.0.2", "rollup-plugin-visualizer": "^5.5.4" }, + "resolutions": { + "loader-utils": "1.4.1" + }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file From 44fbdec0a22998c53be6d8a54e75378969ea2c8e Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 9 Nov 2022 14:27:49 +0000 Subject: [PATCH 08/48] v2.1.22 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 10 +++++----- 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, 34 insertions(+), 34 deletions(-) diff --git a/lerna.json b/lerna.json index 6275d78747..49766f3ab7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.21", + "version": "2.1.22", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8ef3588b7f..584db9db53 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.21", + "version": "2.1.22", "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.21", + "@budibase/types": "^2.1.22", "@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 2c7aa7c19a..786defcec5 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.21", + "version": "2.1.22", "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.21", + "@budibase/string-templates": "^2.1.22", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", @@ -89,4 +89,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index 8b55d1e955..dafb7ef7f7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.21", + "version": "2.1.22", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.21", - "@budibase/client": "^2.1.21", - "@budibase/frontend-core": "^2.1.21", - "@budibase/string-templates": "^2.1.21", + "@budibase/bbui": "^2.1.22", + "@budibase/client": "^2.1.22", + "@budibase/frontend-core": "^2.1.22", + "@budibase/string-templates": "^2.1.22", "@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 a390614cd2..fbc2e97845 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.21", + "version": "2.1.22", "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.21", - "@budibase/string-templates": "^2.1.21", - "@budibase/types": "^2.1.21", + "@budibase/backend-core": "^2.1.22", + "@budibase/string-templates": "^2.1.22", + "@budibase/types": "^2.1.22", "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 bfce293df3..f834ebfb5a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.21", + "version": "2.1.22", "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.21", - "@budibase/frontend-core": "^2.1.21", - "@budibase/string-templates": "^2.1.21", + "@budibase/bbui": "^2.1.22", + "@budibase/frontend-core": "^2.1.22", + "@budibase/string-templates": "^2.1.22", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -63,4 +63,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7b87b2f5ac..80b3df6306 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.21", + "version": "2.1.22", "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.21", + "@budibase/bbui": "^2.1.22", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1475a862c8..4b63618094 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.21", + "version": "2.1.22", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 577aac9c9c..a0df6eacce 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.21", + "version": "2.1.22", "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.21", - "@budibase/client": "^2.1.21", + "@budibase/backend-core": "^2.1.22", + "@budibase/client": "^2.1.22", "@budibase/pro": "2.1.21", - "@budibase/string-templates": "^2.1.21", - "@budibase/types": "^2.1.21", + "@budibase/string-templates": "^2.1.22", + "@budibase/types": "^2.1.22", "@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 58e0354181..aeee568ced 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.21", + "version": "2.1.22", "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 66dfd92698..7c26504406 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.21", + "version": "2.1.22", "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 979551c3fc..025208cd2b 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.21", + "version": "2.1.22", "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.21", + "@budibase/backend-core": "^2.1.22", "@budibase/pro": "2.1.21", - "@budibase/string-templates": "^2.1.21", - "@budibase/types": "^2.1.21", + "@budibase/string-templates": "^2.1.22", + "@budibase/types": "^2.1.22", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d6ffeb1b7350d417f0c53f9c229be1268baef42f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 9 Nov 2022 14:31:12 +0000 Subject: [PATCH 09/48] Update pro version to 2.1.22 --- 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 a0df6eacce..f4c5c85004 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.22", "@budibase/client": "^2.1.22", - "@budibase/pro": "2.1.21", + "@budibase/pro": "2.1.22", "@budibase/string-templates": "^2.1.22", "@budibase/types": "^2.1.22", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 452e0afb39..73deee3b20 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.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.21.tgz#6e473385dd6329229e54a3299a261b44568721ee" - integrity sha512-ktfXBNzRuRUeAhmZ0EnEyTNteHcMGsY6AK8+j+nEJzdc6zP/6DMSISXJcGG8SkXT77fWQkem69ao21/XN5r+ZQ== +"@budibase/backend-core@2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22.tgz#5986f1ff2189dd789fe6184806d327ff2813d7b7" + integrity sha512-ReuWU75gkNJqHEcZHO15qCOW6M8YpADe7B4fyXDMl6eZOw20xm71X/y7vsegS9VXDSxvh8LJpLZTCo7EOaFwRg== dependencies: - "@budibase/types" "^2.1.21" + "@budibase/types" "^2.1.22" "@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.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.21.tgz#f5a73c47f2e8eebdf0b86bcfe9d1bf30c7be5f6b" - integrity sha512-nNouTv7RwRc0XtxNWimrkaoYyqFO+9ZIgJsEaFhzDv/p4D6i0tggyMkAC3TDSZNuPPzxMq/3pThjrdt7LBW/DQ== +"@budibase/pro@2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22.tgz#9df787c65375a556b84f314eea1866b7d3275c56" + integrity sha512-X+R6AqLtw5MJy4fosBlsNBI98Zp8oItRGK26M8LVlCCcjZTePSeGGwY1o1+r/eXYDHHilmOQl9s+EUQhSEQ2XA== dependencies: - "@budibase/backend-core" "2.1.21" - "@budibase/types" "2.1.21" + "@budibase/backend-core" "2.1.22" + "@budibase/types" "2.1.22" "@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.21", "@budibase/types@^2.1.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.21.tgz#ff607f0979e710f68469b0a586b3dc835ceaf236" - integrity sha512-KSvvUj2DQECVsZ2xbh0jsPz6u/WfoIQbkzsJa7wdRcC9goQ5fDdjLtHZrLDKKBRV9ceSVh0021BxFQ705+CaEA== +"@budibase/types@2.1.22", "@budibase/types@^2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22.tgz#7280072af0fedd9a24b715391481e7f6b475dc27" + integrity sha512-v2/w9XMP8hf6NsdpvS5aTfbNKhug08ZqpW0S9vtJwM/Afk/ZWKCj43r7O0Vs1IUODm2Oxev5lujugMF2HqPhVQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 025208cd2b..a9cb2becb9 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.22", - "@budibase/pro": "2.1.21", + "@budibase/pro": "2.1.22", "@budibase/string-templates": "^2.1.22", "@budibase/types": "^2.1.22", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4647252bcc..ff3f85db2e 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.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.21.tgz#6e473385dd6329229e54a3299a261b44568721ee" - integrity sha512-ktfXBNzRuRUeAhmZ0EnEyTNteHcMGsY6AK8+j+nEJzdc6zP/6DMSISXJcGG8SkXT77fWQkem69ao21/XN5r+ZQ== +"@budibase/backend-core@2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22.tgz#5986f1ff2189dd789fe6184806d327ff2813d7b7" + integrity sha512-ReuWU75gkNJqHEcZHO15qCOW6M8YpADe7B4fyXDMl6eZOw20xm71X/y7vsegS9VXDSxvh8LJpLZTCo7EOaFwRg== dependencies: - "@budibase/types" "^2.1.21" + "@budibase/types" "^2.1.22" "@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.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.21.tgz#f5a73c47f2e8eebdf0b86bcfe9d1bf30c7be5f6b" - integrity sha512-nNouTv7RwRc0XtxNWimrkaoYyqFO+9ZIgJsEaFhzDv/p4D6i0tggyMkAC3TDSZNuPPzxMq/3pThjrdt7LBW/DQ== +"@budibase/pro@2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22.tgz#9df787c65375a556b84f314eea1866b7d3275c56" + integrity sha512-X+R6AqLtw5MJy4fosBlsNBI98Zp8oItRGK26M8LVlCCcjZTePSeGGwY1o1+r/eXYDHHilmOQl9s+EUQhSEQ2XA== dependencies: - "@budibase/backend-core" "2.1.21" - "@budibase/types" "2.1.21" + "@budibase/backend-core" "2.1.22" + "@budibase/types" "2.1.22" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.21", "@budibase/types@^2.1.21": - version "2.1.21" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.21.tgz#ff607f0979e710f68469b0a586b3dc835ceaf236" - integrity sha512-KSvvUj2DQECVsZ2xbh0jsPz6u/WfoIQbkzsJa7wdRcC9goQ5fDdjLtHZrLDKKBRV9ceSVh0021BxFQ705+CaEA== +"@budibase/types@2.1.22", "@budibase/types@^2.1.22": + version "2.1.22" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22.tgz#7280072af0fedd9a24b715391481e7f6b475dc27" + integrity sha512-v2/w9XMP8hf6NsdpvS5aTfbNKhug08ZqpW0S9vtJwM/Afk/ZWKCj43r7O0Vs1IUODm2Oxev5lujugMF2HqPhVQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 291514f57be9c4bdcc74da52ac00dffc1d7e9fcb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 10 Nov 2022 10:58:45 +0000 Subject: [PATCH 10/48] v2.1.23 --- 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 49766f3ab7..7b37c8f2ce 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.22", + "version": "2.1.23", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 584db9db53..ac74b7dbdd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.22", + "version": "2.1.23", "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.22", + "@budibase/types": "^2.1.23", "@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 786defcec5..48243d51c4 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.22", + "version": "2.1.23", "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.22", + "@budibase/string-templates": "^2.1.23", "@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 dafb7ef7f7..abff9e0d36 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.22", + "version": "2.1.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.22", - "@budibase/client": "^2.1.22", - "@budibase/frontend-core": "^2.1.22", - "@budibase/string-templates": "^2.1.22", + "@budibase/bbui": "^2.1.23", + "@budibase/client": "^2.1.23", + "@budibase/frontend-core": "^2.1.23", + "@budibase/string-templates": "^2.1.23", "@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 fbc2e97845..134b1e2bee 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.22", + "version": "2.1.23", "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.22", - "@budibase/string-templates": "^2.1.22", - "@budibase/types": "^2.1.22", + "@budibase/backend-core": "^2.1.23", + "@budibase/string-templates": "^2.1.23", + "@budibase/types": "^2.1.23", "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 f834ebfb5a..2437080573 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.22", + "version": "2.1.23", "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.22", - "@budibase/frontend-core": "^2.1.22", - "@budibase/string-templates": "^2.1.22", + "@budibase/bbui": "^2.1.23", + "@budibase/frontend-core": "^2.1.23", + "@budibase/string-templates": "^2.1.23", "@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 80b3df6306..6be2f6de05 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.22", + "version": "2.1.23", "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.22", + "@budibase/bbui": "^2.1.23", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4b63618094..15710f8e56 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.22", + "version": "2.1.23", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index f4c5c85004..219da84e3c 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.22", + "version": "2.1.23", "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.22", - "@budibase/client": "^2.1.22", + "@budibase/backend-core": "^2.1.23", + "@budibase/client": "^2.1.23", "@budibase/pro": "2.1.22", - "@budibase/string-templates": "^2.1.22", - "@budibase/types": "^2.1.22", + "@budibase/string-templates": "^2.1.23", + "@budibase/types": "^2.1.23", "@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 aeee568ced..5c04fb6c13 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.22", + "version": "2.1.23", "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 7c26504406..ba17c37516 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.22", + "version": "2.1.23", "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 a9cb2becb9..4cf3ae1b22 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.22", + "version": "2.1.23", "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.22", + "@budibase/backend-core": "^2.1.23", "@budibase/pro": "2.1.22", - "@budibase/string-templates": "^2.1.22", - "@budibase/types": "^2.1.22", + "@budibase/string-templates": "^2.1.23", + "@budibase/types": "^2.1.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bda23107606f1364dfebf3124b5b16e09b319c4b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 10 Nov 2022 11:02:04 +0000 Subject: [PATCH 11/48] Update pro version to 2.1.23 --- 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 219da84e3c..47b00931b8 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.23", "@budibase/client": "^2.1.23", - "@budibase/pro": "2.1.22", + "@budibase/pro": "2.1.23", "@budibase/string-templates": "^2.1.23", "@budibase/types": "^2.1.23", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 73deee3b20..a3ae885644 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.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22.tgz#5986f1ff2189dd789fe6184806d327ff2813d7b7" - integrity sha512-ReuWU75gkNJqHEcZHO15qCOW6M8YpADe7B4fyXDMl6eZOw20xm71X/y7vsegS9VXDSxvh8LJpLZTCo7EOaFwRg== +"@budibase/backend-core@2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.23.tgz#622e10844c64a0cc189d02d18f0ce2872d23110d" + integrity sha512-DvSd8XxQxsoGG8UrI7fxL7gzhgxUxXxT0k9kiF4sEi+MbC8fthFhoEhTfsxoPBBBfiHa9nQOZVrTC+3tmJBAPg== dependencies: - "@budibase/types" "^2.1.22" + "@budibase/types" "^2.1.23" "@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.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22.tgz#9df787c65375a556b84f314eea1866b7d3275c56" - integrity sha512-X+R6AqLtw5MJy4fosBlsNBI98Zp8oItRGK26M8LVlCCcjZTePSeGGwY1o1+r/eXYDHHilmOQl9s+EUQhSEQ2XA== +"@budibase/pro@2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.23.tgz#156a538fb40b3c8d67f39bf9c91c92bd45af011c" + integrity sha512-+o6Ie/z0WHrJdPWuq9YgyKylZatkn/lZSRCt2Vb89g20xRtWOsatQmUF5TdHrVzHGFh83Sp9NZE0QoemkvzZaA== dependencies: - "@budibase/backend-core" "2.1.22" - "@budibase/types" "2.1.22" + "@budibase/backend-core" "2.1.23" + "@budibase/types" "2.1.23" "@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.22", "@budibase/types@^2.1.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22.tgz#7280072af0fedd9a24b715391481e7f6b475dc27" - integrity sha512-v2/w9XMP8hf6NsdpvS5aTfbNKhug08ZqpW0S9vtJwM/Afk/ZWKCj43r7O0Vs1IUODm2Oxev5lujugMF2HqPhVQ== +"@budibase/types@2.1.23", "@budibase/types@^2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.23.tgz#73495b52fa67aca67b3e728b7b84f190ee21b33e" + integrity sha512-VvdmYNTbL9KEL/kZeeCcMkCUjcXHu0YFNmqZgJIoIz0ssyAJf5kmqkNeGD9I4ORw4AMAUOcPVyObZXCyRSFBAg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4cf3ae1b22..861f415dce 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.23", - "@budibase/pro": "2.1.22", + "@budibase/pro": "2.1.23", "@budibase/string-templates": "^2.1.23", "@budibase/types": "^2.1.23", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ff3f85db2e..0d3664f3e2 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.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.22.tgz#5986f1ff2189dd789fe6184806d327ff2813d7b7" - integrity sha512-ReuWU75gkNJqHEcZHO15qCOW6M8YpADe7B4fyXDMl6eZOw20xm71X/y7vsegS9VXDSxvh8LJpLZTCo7EOaFwRg== +"@budibase/backend-core@2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.23.tgz#622e10844c64a0cc189d02d18f0ce2872d23110d" + integrity sha512-DvSd8XxQxsoGG8UrI7fxL7gzhgxUxXxT0k9kiF4sEi+MbC8fthFhoEhTfsxoPBBBfiHa9nQOZVrTC+3tmJBAPg== dependencies: - "@budibase/types" "^2.1.22" + "@budibase/types" "^2.1.23" "@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.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.22.tgz#9df787c65375a556b84f314eea1866b7d3275c56" - integrity sha512-X+R6AqLtw5MJy4fosBlsNBI98Zp8oItRGK26M8LVlCCcjZTePSeGGwY1o1+r/eXYDHHilmOQl9s+EUQhSEQ2XA== +"@budibase/pro@2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.23.tgz#156a538fb40b3c8d67f39bf9c91c92bd45af011c" + integrity sha512-+o6Ie/z0WHrJdPWuq9YgyKylZatkn/lZSRCt2Vb89g20xRtWOsatQmUF5TdHrVzHGFh83Sp9NZE0QoemkvzZaA== dependencies: - "@budibase/backend-core" "2.1.22" - "@budibase/types" "2.1.22" + "@budibase/backend-core" "2.1.23" + "@budibase/types" "2.1.23" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.22", "@budibase/types@^2.1.22": - version "2.1.22" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.22.tgz#7280072af0fedd9a24b715391481e7f6b475dc27" - integrity sha512-v2/w9XMP8hf6NsdpvS5aTfbNKhug08ZqpW0S9vtJwM/Afk/ZWKCj43r7O0Vs1IUODm2Oxev5lujugMF2HqPhVQ== +"@budibase/types@2.1.23", "@budibase/types@^2.1.23": + version "2.1.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.23.tgz#73495b52fa67aca67b3e728b7b84f190ee21b33e" + integrity sha512-VvdmYNTbL9KEL/kZeeCcMkCUjcXHu0YFNmqZgJIoIz0ssyAJf5kmqkNeGD9I4ORw4AMAUOcPVyObZXCyRSFBAg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From be32ef1cb6819aae1606aabd504a8019dd7e26e6 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 10 Nov 2022 14:23:22 +0000 Subject: [PATCH 12/48] Add readable flag to datasource validation --- packages/backend-core/src/plugin/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/plugin/utils.js b/packages/backend-core/src/plugin/utils.js index 60a40f3a76..b943747483 100644 --- a/packages/backend-core/src/plugin/utils.js +++ b/packages/backend-core/src/plugin/utils.js @@ -51,6 +51,7 @@ function validateDatasource(schema) { const queryValidator = joi .object({ type: joi.string().allow(...Object.values(QueryType)), + readable: joi.boolean(), fields: joi.object().pattern(joi.string(), fieldValidator), }) .required() From 6d1449431ead6761ec667ed0724dec07c682aa75 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 10 Nov 2022 15:22:05 +0000 Subject: [PATCH 13/48] Null pointer fix --- packages/server/src/sdk/app/backups/imports.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts index 7cc9e0b0e6..6332716710 100644 --- a/packages/server/src/sdk/app/backups/imports.ts +++ b/packages/server/src/sdk/app/backups/imports.ts @@ -100,7 +100,7 @@ async function updateAutomations(prodAppId: string, db: PouchDB.Database) { const oldDevAppId = automation.appId, oldProdAppId = dbCore.getProdAppID(automation.appId) if ( - automation.definition.trigger.stepId === AutomationTriggerStepId.WEBHOOK + automation.definition.trigger?.stepId === AutomationTriggerStepId.WEBHOOK ) { const old = automation.definition.trigger.inputs automation.definition.trigger.inputs = { From 870bee4de53eaec6d356e66c7511ea112f6a8901 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 10 Nov 2022 15:53:01 +0000 Subject: [PATCH 14/48] v2.1.24 --- 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 7b37c8f2ce..becfc10031 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.23", + "version": "2.1.24", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ac74b7dbdd..40e0ff00f7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.23", + "version": "2.1.24", "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.23", + "@budibase/types": "^2.1.24", "@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 48243d51c4..f1f81105e0 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.23", + "version": "2.1.24", "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.23", + "@budibase/string-templates": "^2.1.24", "@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 abff9e0d36..db3b6cc6bf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.23", + "version": "2.1.24", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.23", - "@budibase/client": "^2.1.23", - "@budibase/frontend-core": "^2.1.23", - "@budibase/string-templates": "^2.1.23", + "@budibase/bbui": "^2.1.24", + "@budibase/client": "^2.1.24", + "@budibase/frontend-core": "^2.1.24", + "@budibase/string-templates": "^2.1.24", "@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 134b1e2bee..4aadb050b3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.23", + "version": "2.1.24", "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.23", - "@budibase/string-templates": "^2.1.23", - "@budibase/types": "^2.1.23", + "@budibase/backend-core": "^2.1.24", + "@budibase/string-templates": "^2.1.24", + "@budibase/types": "^2.1.24", "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 2437080573..97c25473c1 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.23", + "version": "2.1.24", "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.23", - "@budibase/frontend-core": "^2.1.23", - "@budibase/string-templates": "^2.1.23", + "@budibase/bbui": "^2.1.24", + "@budibase/frontend-core": "^2.1.24", + "@budibase/string-templates": "^2.1.24", "@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 6be2f6de05..9723355dd4 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.23", + "version": "2.1.24", "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.23", + "@budibase/bbui": "^2.1.24", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 15710f8e56..97d401aee9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.23", + "version": "2.1.24", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 47b00931b8..a92f17a73e 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.23", + "version": "2.1.24", "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.23", - "@budibase/client": "^2.1.23", + "@budibase/backend-core": "^2.1.24", + "@budibase/client": "^2.1.24", "@budibase/pro": "2.1.23", - "@budibase/string-templates": "^2.1.23", - "@budibase/types": "^2.1.23", + "@budibase/string-templates": "^2.1.24", + "@budibase/types": "^2.1.24", "@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 5c04fb6c13..36a8bd95f1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.23", + "version": "2.1.24", "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 ba17c37516..9334dd6074 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.23", + "version": "2.1.24", "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 861f415dce..b70ee5e2f9 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.23", + "version": "2.1.24", "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.23", + "@budibase/backend-core": "^2.1.24", "@budibase/pro": "2.1.23", - "@budibase/string-templates": "^2.1.23", - "@budibase/types": "^2.1.23", + "@budibase/string-templates": "^2.1.24", + "@budibase/types": "^2.1.24", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 816382f63817da162223a9edc9eb2bad6f84e7b3 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Thu, 10 Nov 2022 15:56:42 +0000 Subject: [PATCH 15/48] Update pro version to 2.1.24 --- 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 a92f17a73e..5ed82b10a1 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.24", "@budibase/client": "^2.1.24", - "@budibase/pro": "2.1.23", + "@budibase/pro": "2.1.24", "@budibase/string-templates": "^2.1.24", "@budibase/types": "^2.1.24", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index a3ae885644..652056a0a8 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.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.23.tgz#622e10844c64a0cc189d02d18f0ce2872d23110d" - integrity sha512-DvSd8XxQxsoGG8UrI7fxL7gzhgxUxXxT0k9kiF4sEi+MbC8fthFhoEhTfsxoPBBBfiHa9nQOZVrTC+3tmJBAPg== +"@budibase/backend-core@2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.24.tgz#4c0172359150cac624788c725cd6842a9a1b42e7" + integrity sha512-QjQ5bRNRWuiGB6J5MGaR1Uv6s6+jcCgrar4e2NCJn1Z+Ta7ZaBPI+6lH5d1vMLYjIUW9b/CavLtxpGazkfEPKQ== dependencies: - "@budibase/types" "^2.1.23" + "@budibase/types" "^2.1.24" "@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.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.23.tgz#156a538fb40b3c8d67f39bf9c91c92bd45af011c" - integrity sha512-+o6Ie/z0WHrJdPWuq9YgyKylZatkn/lZSRCt2Vb89g20xRtWOsatQmUF5TdHrVzHGFh83Sp9NZE0QoemkvzZaA== +"@budibase/pro@2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.24.tgz#bec9461bde8f57f9b7648b82e381b763fc0cff30" + integrity sha512-FttB/wZVljPp8nKEnOK7B0gOa4ZJLkfq2jEA/7GyoI9kvht/QJx1sOqVaafHVh24cev6NsfCsMtxCiaiM42cOw== dependencies: - "@budibase/backend-core" "2.1.23" - "@budibase/types" "2.1.23" + "@budibase/backend-core" "2.1.24" + "@budibase/types" "2.1.24" "@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.23", "@budibase/types@^2.1.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.23.tgz#73495b52fa67aca67b3e728b7b84f190ee21b33e" - integrity sha512-VvdmYNTbL9KEL/kZeeCcMkCUjcXHu0YFNmqZgJIoIz0ssyAJf5kmqkNeGD9I4ORw4AMAUOcPVyObZXCyRSFBAg== +"@budibase/types@2.1.24", "@budibase/types@^2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.24.tgz#bb502e331eeecb3cf174e5222e174d45d952fb9d" + integrity sha512-Vbn70peWwRCGhgKSpfEz6hCHjF3tzyfMzToXHCagDKh96/qhHaH5pAX5ioIQ2lkWU97ymnS2bKL5fmq9e7xdwg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b70ee5e2f9..c0b3f99171 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.24", - "@budibase/pro": "2.1.23", + "@budibase/pro": "2.1.24", "@budibase/string-templates": "^2.1.24", "@budibase/types": "^2.1.24", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0d3664f3e2..301332f393 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.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.23.tgz#622e10844c64a0cc189d02d18f0ce2872d23110d" - integrity sha512-DvSd8XxQxsoGG8UrI7fxL7gzhgxUxXxT0k9kiF4sEi+MbC8fthFhoEhTfsxoPBBBfiHa9nQOZVrTC+3tmJBAPg== +"@budibase/backend-core@2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.24.tgz#4c0172359150cac624788c725cd6842a9a1b42e7" + integrity sha512-QjQ5bRNRWuiGB6J5MGaR1Uv6s6+jcCgrar4e2NCJn1Z+Ta7ZaBPI+6lH5d1vMLYjIUW9b/CavLtxpGazkfEPKQ== dependencies: - "@budibase/types" "^2.1.23" + "@budibase/types" "^2.1.24" "@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.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.23.tgz#156a538fb40b3c8d67f39bf9c91c92bd45af011c" - integrity sha512-+o6Ie/z0WHrJdPWuq9YgyKylZatkn/lZSRCt2Vb89g20xRtWOsatQmUF5TdHrVzHGFh83Sp9NZE0QoemkvzZaA== +"@budibase/pro@2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.24.tgz#bec9461bde8f57f9b7648b82e381b763fc0cff30" + integrity sha512-FttB/wZVljPp8nKEnOK7B0gOa4ZJLkfq2jEA/7GyoI9kvht/QJx1sOqVaafHVh24cev6NsfCsMtxCiaiM42cOw== dependencies: - "@budibase/backend-core" "2.1.23" - "@budibase/types" "2.1.23" + "@budibase/backend-core" "2.1.24" + "@budibase/types" "2.1.24" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.23", "@budibase/types@^2.1.23": - version "2.1.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.23.tgz#73495b52fa67aca67b3e728b7b84f190ee21b33e" - integrity sha512-VvdmYNTbL9KEL/kZeeCcMkCUjcXHu0YFNmqZgJIoIz0ssyAJf5kmqkNeGD9I4ORw4AMAUOcPVyObZXCyRSFBAg== +"@budibase/types@2.1.24", "@budibase/types@^2.1.24": + version "2.1.24" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.24.tgz#bb502e331eeecb3cf174e5222e174d45d952fb9d" + integrity sha512-Vbn70peWwRCGhgKSpfEz6hCHjF3tzyfMzToXHCagDKh96/qhHaH5pAX5ioIQ2lkWU97ymnS2bKL5fmq9e7xdwg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From a5a8b96be1315801e3ec60e9496f78895f034a6f Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 11 Nov 2022 11:26:36 +0000 Subject: [PATCH 16/48] Fix logout race condition --- packages/builder/src/stores/portal/auth.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js index 31b4533738..b10cd05e00 100644 --- a/packages/builder/src/stores/portal/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -155,9 +155,9 @@ export function createAuthStore() { await actions.getSelf() }, logout: async () => { - setUser(null) - setPostLogout() await API.logOut() + setPostLogout() + setUser(null) await setInitInfo({}) }, updateSelf: async fields => { From 08766b3c228493b1c68d0a5ad4a0e1b565c546f6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 11 Nov 2022 12:51:08 +0000 Subject: [PATCH 17/48] v2.1.25 --- 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 becfc10031..d325a57f37 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.24", + "version": "2.1.25", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 40e0ff00f7..459219aca3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.24", + "version": "2.1.25", "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.24", + "@budibase/types": "^2.1.25", "@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 f1f81105e0..a2e6f7da7e 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.24", + "version": "2.1.25", "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.24", + "@budibase/string-templates": "^2.1.25", "@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 db3b6cc6bf..4eb7bbc4f0 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.24", + "version": "2.1.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.24", - "@budibase/client": "^2.1.24", - "@budibase/frontend-core": "^2.1.24", - "@budibase/string-templates": "^2.1.24", + "@budibase/bbui": "^2.1.25", + "@budibase/client": "^2.1.25", + "@budibase/frontend-core": "^2.1.25", + "@budibase/string-templates": "^2.1.25", "@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 4aadb050b3..0cb29dd5fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.24", + "version": "2.1.25", "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.24", - "@budibase/string-templates": "^2.1.24", - "@budibase/types": "^2.1.24", + "@budibase/backend-core": "^2.1.25", + "@budibase/string-templates": "^2.1.25", + "@budibase/types": "^2.1.25", "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 97c25473c1..3b4a5df0e7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.24", + "version": "2.1.25", "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.24", - "@budibase/frontend-core": "^2.1.24", - "@budibase/string-templates": "^2.1.24", + "@budibase/bbui": "^2.1.25", + "@budibase/frontend-core": "^2.1.25", + "@budibase/string-templates": "^2.1.25", "@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 9723355dd4..01af86d099 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.24", + "version": "2.1.25", "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.24", + "@budibase/bbui": "^2.1.25", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 97d401aee9..7410038dcd 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.24", + "version": "2.1.25", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 5ed82b10a1..d5efdf2f0a 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.24", + "version": "2.1.25", "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.24", - "@budibase/client": "^2.1.24", + "@budibase/backend-core": "^2.1.25", + "@budibase/client": "^2.1.25", "@budibase/pro": "2.1.24", - "@budibase/string-templates": "^2.1.24", - "@budibase/types": "^2.1.24", + "@budibase/string-templates": "^2.1.25", + "@budibase/types": "^2.1.25", "@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 36a8bd95f1..13a194c596 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.24", + "version": "2.1.25", "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 9334dd6074..8f2baab743 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.24", + "version": "2.1.25", "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 c0b3f99171..32f3c59ece 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.24", + "version": "2.1.25", "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.24", + "@budibase/backend-core": "^2.1.25", "@budibase/pro": "2.1.24", - "@budibase/string-templates": "^2.1.24", - "@budibase/types": "^2.1.24", + "@budibase/string-templates": "^2.1.25", + "@budibase/types": "^2.1.25", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0cf55b933e5724a97c9c6a1c3f9618f086bc7c78 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 11 Nov 2022 12:54:20 +0000 Subject: [PATCH 18/48] Update pro version to 2.1.25 --- 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 d5efdf2f0a..fab93cda87 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.25", "@budibase/client": "^2.1.25", - "@budibase/pro": "2.1.24", + "@budibase/pro": "2.1.25", "@budibase/string-templates": "^2.1.25", "@budibase/types": "^2.1.25", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 652056a0a8..1bf160010b 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.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.24.tgz#4c0172359150cac624788c725cd6842a9a1b42e7" - integrity sha512-QjQ5bRNRWuiGB6J5MGaR1Uv6s6+jcCgrar4e2NCJn1Z+Ta7ZaBPI+6lH5d1vMLYjIUW9b/CavLtxpGazkfEPKQ== +"@budibase/backend-core@2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.25.tgz#2cb8291f7a08ff8b8988f8c5ced232195e6f4986" + integrity sha512-xoVwfNbt+1PAJGxRqZFtJFwTv+vVNe4mJcLSUz/lAVOcwY6pKE1L5EjsA1z7czEHuDxoQs3S9Ls1QiQQwZh9gw== dependencies: - "@budibase/types" "^2.1.24" + "@budibase/types" "^2.1.25" "@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.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.24.tgz#bec9461bde8f57f9b7648b82e381b763fc0cff30" - integrity sha512-FttB/wZVljPp8nKEnOK7B0gOa4ZJLkfq2jEA/7GyoI9kvht/QJx1sOqVaafHVh24cev6NsfCsMtxCiaiM42cOw== +"@budibase/pro@2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.25.tgz#d5a5a65b8e447ee96988e8d96e7caad665d75ed3" + integrity sha512-aqFI6WaSwEhMrL9fMr0CPF+DHtukI0pQHArW1xZKD5+7TIR6MA82gTIpEn/YLVLiUIc4hjfsgpSHTSxZ495T3w== dependencies: - "@budibase/backend-core" "2.1.24" - "@budibase/types" "2.1.24" + "@budibase/backend-core" "2.1.25" + "@budibase/types" "2.1.25" "@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.24", "@budibase/types@^2.1.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.24.tgz#bb502e331eeecb3cf174e5222e174d45d952fb9d" - integrity sha512-Vbn70peWwRCGhgKSpfEz6hCHjF3tzyfMzToXHCagDKh96/qhHaH5pAX5ioIQ2lkWU97ymnS2bKL5fmq9e7xdwg== +"@budibase/types@2.1.25", "@budibase/types@^2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.25.tgz#17166655921e977b128025f6e10971f081eeb1c1" + integrity sha512-kWs3PKbCo9jHejzA9gaNmjNBwVHrR2wzhBNZrfILUXj8Nphgf8GRl2sj3u6xdO3jg7NcO/OawAQdDXpYOdR8PQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 32f3c59ece..bf32dc3eb3 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.25", - "@budibase/pro": "2.1.24", + "@budibase/pro": "2.1.25", "@budibase/string-templates": "^2.1.25", "@budibase/types": "^2.1.25", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 301332f393..427d449251 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.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.24.tgz#4c0172359150cac624788c725cd6842a9a1b42e7" - integrity sha512-QjQ5bRNRWuiGB6J5MGaR1Uv6s6+jcCgrar4e2NCJn1Z+Ta7ZaBPI+6lH5d1vMLYjIUW9b/CavLtxpGazkfEPKQ== +"@budibase/backend-core@2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.25.tgz#2cb8291f7a08ff8b8988f8c5ced232195e6f4986" + integrity sha512-xoVwfNbt+1PAJGxRqZFtJFwTv+vVNe4mJcLSUz/lAVOcwY6pKE1L5EjsA1z7czEHuDxoQs3S9Ls1QiQQwZh9gw== dependencies: - "@budibase/types" "^2.1.24" + "@budibase/types" "^2.1.25" "@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.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.24.tgz#bec9461bde8f57f9b7648b82e381b763fc0cff30" - integrity sha512-FttB/wZVljPp8nKEnOK7B0gOa4ZJLkfq2jEA/7GyoI9kvht/QJx1sOqVaafHVh24cev6NsfCsMtxCiaiM42cOw== +"@budibase/pro@2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.25.tgz#d5a5a65b8e447ee96988e8d96e7caad665d75ed3" + integrity sha512-aqFI6WaSwEhMrL9fMr0CPF+DHtukI0pQHArW1xZKD5+7TIR6MA82gTIpEn/YLVLiUIc4hjfsgpSHTSxZ495T3w== dependencies: - "@budibase/backend-core" "2.1.24" - "@budibase/types" "2.1.24" + "@budibase/backend-core" "2.1.25" + "@budibase/types" "2.1.25" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.24", "@budibase/types@^2.1.24": - version "2.1.24" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.24.tgz#bb502e331eeecb3cf174e5222e174d45d952fb9d" - integrity sha512-Vbn70peWwRCGhgKSpfEz6hCHjF3tzyfMzToXHCagDKh96/qhHaH5pAX5ioIQ2lkWU97ymnS2bKL5fmq9e7xdwg== +"@budibase/types@2.1.25", "@budibase/types@^2.1.25": + version "2.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.25.tgz#17166655921e977b128025f6e10971f081eeb1c1" + integrity sha512-kWs3PKbCo9jHejzA9gaNmjNBwVHrR2wzhBNZrfILUXj8Nphgf8GRl2sj3u6xdO3jg7NcO/OawAQdDXpYOdR8PQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From c71f9ccecf71bda4d9d06dfbc4589c1c08837242 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Sun, 13 Nov 2022 17:53:32 +0000 Subject: [PATCH 19/48] single image NFS & more logging --- hosting/single/runner.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh index a95c21a98f..ea825131db 100644 --- a/hosting/single/runner.sh +++ b/hosting/single/runner.sh @@ -27,12 +27,14 @@ if [[ "${TARGETBUILD}" = "aas" ]]; then else DATA_DIR=${DATA_DIR:-/data} fi - +mkdir -p ${DATA_DIR} # Mount NFS or GCP Filestore if env vars exist for it -if [[ -z ${FILESHARE_IP} && -z ${FILESHARE_NAME} ]]; then +if [[ ! -z ${FILESHARE_IP} && ! -z ${FILESHARE_NAME} ]]; then + echo "Mounting NFS share" + apt update && apt install -y nfs-common nfs-kernel-server echo "Mount file share ${FILESHARE_IP}:/${FILESHARE_NAME} to ${DATA_DIR}" mount -o nolock ${FILESHARE_IP}:/${FILESHARE_NAME} ${DATA_DIR} - echo "Mounting completed." + echo "Mounting result: $?" fi if [ -f "${DATA_DIR}/.env" ]; then @@ -74,9 +76,9 @@ mkdir -p ${DATA_DIR}/couch/{dbs,views} mkdir -p ${DATA_DIR}/minio mkdir -p ${DATA_DIR}/search chown -R couchdb:couchdb ${DATA_DIR}/couch -redis-server --requirepass $REDIS_PASSWORD & -/opt/clouseau/bin/clouseau & -/minio/minio server ${DATA_DIR}/minio & +redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +/opt/clouseau/bin/clouseau > /dev/stdout 2>&1 & +/minio/minio server ${DATA_DIR}/minio > /dev/stdout 2>&1 & /docker-entrypoint.sh /opt/couchdb/bin/couchdb & /etc/init.d/nginx restart if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then @@ -85,16 +87,18 @@ if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then chmod +x /etc/cron.d/certificate-renew # Request the certbot certificate /app/letsencrypt/certificate-request.sh ${CUSTOM_DOMAIN} + /etc/init.d/nginx restart fi -/etc/init.d/nginx restart pushd app -pm2 start --name app "yarn run:docker" +pm2 start -l /dev/stdout --name app "yarn run:docker" popd pushd worker -pm2 start --name worker "yarn run:docker" +pm2 start -l /dev/stdout --name worker "yarn run:docker" popd sleep 10 +echo "curl to couchdb endpoints" curl -X PUT ${COUCH_DB_URL}/_users curl -X PUT ${COUCH_DB_URL}/_replicator +echo "end of runner.sh, sleeping ..." sleep infinity From 8f058e222b4085b51835bf4a99c809ee3fa64c46 Mon Sep 17 00:00:00 2001 From: Dean Date: Sun, 13 Nov 2022 18:08:48 +0000 Subject: [PATCH 20/48] Fix for attachment cleanup on internal row delete. --- packages/server/src/api/controllers/table/internal.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts index a50009b1f6..d569fd4547 100644 --- a/packages/server/src/api/controllers/table/internal.ts +++ b/packages/server/src/api/controllers/table/internal.ts @@ -142,15 +142,15 @@ export async function destroy(ctx: any) { const tableToDelete = await db.get(ctx.params.tableId) // Delete all rows for that table - const rows = await db.allDocs( + const rowsData = await db.allDocs( getRowParams(ctx.params.tableId, null, { include_docs: true, }) ) await db.bulkDocs( - rows.rows.map((row: any) => ({ ...row.doc, _deleted: true })) + rowsData.rows.map((row: any) => ({ ...row.doc, _deleted: true })) ) - await quotas.removeRows(rows.rows.length, { + await quotas.removeRows(rowsData.rows.length, { tableId: ctx.params.tableId, }) @@ -179,7 +179,9 @@ export async function destroy(ctx: any) { oldTable: null, deletion: true, }) - await cleanupAttachments(tableToDelete, { rows }) + await cleanupAttachments(tableToDelete, { + rows: rowsData.rows.map((row: any) => row.doc), + }) return tableToDelete } From 0619fcd281de21164e9a02d09d9a9ae04e51e6d3 Mon Sep 17 00:00:00 2001 From: Dean Date: Sun, 13 Nov 2022 18:16:04 +0000 Subject: [PATCH 21/48] Added multiselect/array options support to the view contains filter --- .../src/components/backend/DataTable/modals/FilterModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte index a9eff7f957..b125e18b31 100644 --- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte @@ -97,7 +97,7 @@ } function fieldOptions(field) { - return schema[field]?.type === "options" + return schema[field]?.type === "options" || schema[field]?.type === "array" ? schema[field]?.constraints.inclusion : [true, false] } From 2eeac325f31abe2a479230454da80b6566286c35 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 14 Nov 2022 09:25:45 +0000 Subject: [PATCH 22/48] Adjust styles so placeholder component is left aligned --- packages/client/src/components/app/blocks/form/FormBlock.svelte | 2 +- .../client/src/components/app/blocks/form/InnerFormBlock.svelte | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/blocks/form/FormBlock.svelte b/packages/client/src/components/app/blocks/form/FormBlock.svelte index 9ec587519f..8964475673 100644 --- a/packages/client/src/components/app/blocks/form/FormBlock.svelte +++ b/packages/client/src/components/app/blocks/form/FormBlock.svelte @@ -65,7 +65,7 @@ type="container" props={{ direction: "column", - hAlign: "center", + hAlign: "left", vAlign: "stretch", }} > diff --git a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte index 948584120b..c4e9b0941c 100644 --- a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte +++ b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte @@ -97,6 +97,8 @@ styles={{ normal: { width: "600px", + "margin-left": "auto", + "margin-right": "auto", }, }} context="form" From 4c366114f02b205d39b59af458a944a5bb3c1e6d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 14 Nov 2022 09:33:01 +0000 Subject: [PATCH 23/48] Fix date time field inconsistency with showing time --- packages/client/src/components/app/forms/DateTimeField.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte index 19ff49c9ba..6bcd20d250 100644 --- a/packages/client/src/components/app/forms/DateTimeField.svelte +++ b/packages/client/src/components/app/forms/DateTimeField.svelte @@ -6,7 +6,7 @@ export let label export let placeholder export let disabled = false - export let enableTime = false + export let enableTime = true export let timeOnly = false export let time24hr = false export let ignoreTimezones = false From 80e223465054a978cd5edcaded9af981d8e99850 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 14 Nov 2022 14:32:46 +0000 Subject: [PATCH 24/48] v2.1.26 --- 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 d325a57f37..f53cf65bde 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.25", + "version": "2.1.26", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 459219aca3..d7d55a5e1e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.25", + "version": "2.1.26", "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.25", + "@budibase/types": "^2.1.26", "@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 a2e6f7da7e..9d9b4ce295 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.25", + "version": "2.1.26", "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.25", + "@budibase/string-templates": "^2.1.26", "@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 4eb7bbc4f0..102dd4ccf8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.25", + "version": "2.1.26", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.25", - "@budibase/client": "^2.1.25", - "@budibase/frontend-core": "^2.1.25", - "@budibase/string-templates": "^2.1.25", + "@budibase/bbui": "^2.1.26", + "@budibase/client": "^2.1.26", + "@budibase/frontend-core": "^2.1.26", + "@budibase/string-templates": "^2.1.26", "@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 0cb29dd5fc..cc0e4bf9d1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.25", + "version": "2.1.26", "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.25", - "@budibase/string-templates": "^2.1.25", - "@budibase/types": "^2.1.25", + "@budibase/backend-core": "^2.1.26", + "@budibase/string-templates": "^2.1.26", + "@budibase/types": "^2.1.26", "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 3b4a5df0e7..b41679ad6e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.25", + "version": "2.1.26", "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.25", - "@budibase/frontend-core": "^2.1.25", - "@budibase/string-templates": "^2.1.25", + "@budibase/bbui": "^2.1.26", + "@budibase/frontend-core": "^2.1.26", + "@budibase/string-templates": "^2.1.26", "@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 01af86d099..6cafe9910f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.25", + "version": "2.1.26", "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.25", + "@budibase/bbui": "^2.1.26", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7410038dcd..917083748d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.25", + "version": "2.1.26", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index fab93cda87..54c290a21b 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.25", + "version": "2.1.26", "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.25", - "@budibase/client": "^2.1.25", + "@budibase/backend-core": "^2.1.26", + "@budibase/client": "^2.1.26", "@budibase/pro": "2.1.25", - "@budibase/string-templates": "^2.1.25", - "@budibase/types": "^2.1.25", + "@budibase/string-templates": "^2.1.26", + "@budibase/types": "^2.1.26", "@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 13a194c596..6dce3eb62c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.25", + "version": "2.1.26", "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 8f2baab743..e25a40857f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.25", + "version": "2.1.26", "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 bf32dc3eb3..b2ef15c456 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.25", + "version": "2.1.26", "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.25", + "@budibase/backend-core": "^2.1.26", "@budibase/pro": "2.1.25", - "@budibase/string-templates": "^2.1.25", - "@budibase/types": "^2.1.25", + "@budibase/string-templates": "^2.1.26", + "@budibase/types": "^2.1.26", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d55998940fc671dbb13c0f9d64a8caf0e7c01992 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 14 Nov 2022 14:36:05 +0000 Subject: [PATCH 25/48] Update pro version to 2.1.26 --- 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 54c290a21b..baedd1ad92 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.26", "@budibase/client": "^2.1.26", - "@budibase/pro": "2.1.25", + "@budibase/pro": "2.1.26", "@budibase/string-templates": "^2.1.26", "@budibase/types": "^2.1.26", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 1bf160010b..7ad7e7092f 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.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.25.tgz#2cb8291f7a08ff8b8988f8c5ced232195e6f4986" - integrity sha512-xoVwfNbt+1PAJGxRqZFtJFwTv+vVNe4mJcLSUz/lAVOcwY6pKE1L5EjsA1z7czEHuDxoQs3S9Ls1QiQQwZh9gw== +"@budibase/backend-core@2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.26.tgz#e663ccb83e027c46b4a0a58e701ed75d2ef79ce8" + integrity sha512-ZXzeX+ifI0I3PVjyQCPJhn0RRXZptzfluziaSDrfAZQ85pvH6lluWcbUTPd1dx9WdSCS4N0rxvPsfL9FHb/TtA== dependencies: - "@budibase/types" "^2.1.25" + "@budibase/types" "^2.1.26" "@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.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.25.tgz#d5a5a65b8e447ee96988e8d96e7caad665d75ed3" - integrity sha512-aqFI6WaSwEhMrL9fMr0CPF+DHtukI0pQHArW1xZKD5+7TIR6MA82gTIpEn/YLVLiUIc4hjfsgpSHTSxZ495T3w== +"@budibase/pro@2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.26.tgz#335ca9343ae3f84c7a99224c6863ecf09573221f" + integrity sha512-1bdpQO+v//vbhQa1/+Ic1tB2PlU3hCAwgYNm4C+MhNicMc9InpOE4bMNn22s6eoOI5XcuHiSZld+Au8J9/xuRA== dependencies: - "@budibase/backend-core" "2.1.25" - "@budibase/types" "2.1.25" + "@budibase/backend-core" "2.1.26" + "@budibase/types" "2.1.26" "@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.25", "@budibase/types@^2.1.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.25.tgz#17166655921e977b128025f6e10971f081eeb1c1" - integrity sha512-kWs3PKbCo9jHejzA9gaNmjNBwVHrR2wzhBNZrfILUXj8Nphgf8GRl2sj3u6xdO3jg7NcO/OawAQdDXpYOdR8PQ== +"@budibase/types@2.1.26", "@budibase/types@^2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.26.tgz#15422f49fc096a7b0419b4104a86df97198ebfde" + integrity sha512-gykmR8jSLVNAvbg7/senimW0HGs/lC3W1TlfoAVvkhzS2AAiuyH3CVbEYmgdd0SnZbY2Hpaas+Eqdp4fkqFu8A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b2ef15c456..fbed9ddc0e 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.26", - "@budibase/pro": "2.1.25", + "@budibase/pro": "2.1.26", "@budibase/string-templates": "^2.1.26", "@budibase/types": "^2.1.26", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 427d449251..22609a331c 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.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.25.tgz#2cb8291f7a08ff8b8988f8c5ced232195e6f4986" - integrity sha512-xoVwfNbt+1PAJGxRqZFtJFwTv+vVNe4mJcLSUz/lAVOcwY6pKE1L5EjsA1z7czEHuDxoQs3S9Ls1QiQQwZh9gw== +"@budibase/backend-core@2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.26.tgz#e663ccb83e027c46b4a0a58e701ed75d2ef79ce8" + integrity sha512-ZXzeX+ifI0I3PVjyQCPJhn0RRXZptzfluziaSDrfAZQ85pvH6lluWcbUTPd1dx9WdSCS4N0rxvPsfL9FHb/TtA== dependencies: - "@budibase/types" "^2.1.25" + "@budibase/types" "^2.1.26" "@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.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.25.tgz#d5a5a65b8e447ee96988e8d96e7caad665d75ed3" - integrity sha512-aqFI6WaSwEhMrL9fMr0CPF+DHtukI0pQHArW1xZKD5+7TIR6MA82gTIpEn/YLVLiUIc4hjfsgpSHTSxZ495T3w== +"@budibase/pro@2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.26.tgz#335ca9343ae3f84c7a99224c6863ecf09573221f" + integrity sha512-1bdpQO+v//vbhQa1/+Ic1tB2PlU3hCAwgYNm4C+MhNicMc9InpOE4bMNn22s6eoOI5XcuHiSZld+Au8J9/xuRA== dependencies: - "@budibase/backend-core" "2.1.25" - "@budibase/types" "2.1.25" + "@budibase/backend-core" "2.1.26" + "@budibase/types" "2.1.26" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.25", "@budibase/types@^2.1.25": - version "2.1.25" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.25.tgz#17166655921e977b128025f6e10971f081eeb1c1" - integrity sha512-kWs3PKbCo9jHejzA9gaNmjNBwVHrR2wzhBNZrfILUXj8Nphgf8GRl2sj3u6xdO3jg7NcO/OawAQdDXpYOdR8PQ== +"@budibase/types@2.1.26", "@budibase/types@^2.1.26": + version "2.1.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.26.tgz#15422f49fc096a7b0419b4104a86df97198ebfde" + integrity sha512-gykmR8jSLVNAvbg7/senimW0HGs/lC3W1TlfoAVvkhzS2AAiuyH3CVbEYmgdd0SnZbY2Hpaas+Eqdp4fkqFu8A== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From d2f8a59b6540a6d8986f9643ea1fa878aaa1d0d9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 15 Nov 2022 10:49:17 +0000 Subject: [PATCH 26/48] Updating proxy configuration for docker-compose, k8s and single image to allow longer timeout for app export requests. Also fixing an issue that blocked requests from getting to app-service. --- hosting/nginx.prod.conf.hbs | 13 +++++++++++-- hosting/single/nginx/nginx-default-site.conf | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/hosting/nginx.prod.conf.hbs b/hosting/nginx.prod.conf.hbs index fe6f2529d3..64f6cbedd2 100644 --- a/hosting/nginx.prod.conf.hbs +++ b/hosting/nginx.prod.conf.hbs @@ -117,12 +117,21 @@ http { } location /api/backups/ { + # calls to export apps are limited + limit_req zone=ratelimit burst=20 nodelay; + + # 1800s timeout for app export requests proxy_read_timeout 1800s; proxy_connect_timeout 1800s; proxy_send_timeout 1800s; - proxy_pass http://app-service; + proxy_http_version 1.1; - proxy_set_header Connection ""; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_pass http://$apps:4002; } location /api/ { diff --git a/hosting/single/nginx/nginx-default-site.conf b/hosting/single/nginx/nginx-default-site.conf index bd89e21251..9a5ec91c1f 100644 --- a/hosting/single/nginx/nginx-default-site.conf +++ b/hosting/single/nginx/nginx-default-site.conf @@ -43,6 +43,24 @@ server { rewrite ^/worker/(.*)$ /$1 break; } + location /api/backups/ { + # calls to export apps are limited + limit_req zone=ratelimit burst=20 nodelay; + + # 1800s timeout for app export requests + proxy_read_timeout 1800s; + proxy_connect_timeout 1800s; + proxy_send_timeout 1800s; + + proxy_http_version 1.1; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_pass http://127.0.0.1:4001; + } + location /api/ { # calls to the API are rate limited with bursting limit_req zone=ratelimit burst=20 nodelay; From e7061647da6e2989166a201bc30a1526febe817c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 15 Nov 2022 12:52:06 +0000 Subject: [PATCH 27/48] Ensure action parameters can never be null and fix display of close screen modal action --- .../ButtonActionDrawer.svelte | 22 +++++++++---------- .../actions/CloseScreenModal.svelte | 9 ++++++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte index ef7c81233b..1d18fa3a92 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte @@ -23,14 +23,18 @@ export let bindings = [] export let nested - $: showAvailableActions = !actions?.length - let actionQuery - $: parsedQuery = - typeof actionQuery === "string" ? actionQuery.toLowerCase().trim() : "" - let selectedAction = actions?.length ? actions[0] : null + $: { + // Ensure parameters object is never null + if (selectedAction && !selectedAction.parameters) { + selectedAction.parameters = {} + } + } + $: parsedQuery = + typeof actionQuery === "string" ? actionQuery.toLowerCase().trim() : "" + $: showAvailableActions = !actions?.length $: mappedActionTypes = actionTypes.reduce((acc, action) => { let parsedName = action.name.toLowerCase().trim() if (parsedQuery.length && parsedName.indexOf(parsedQuery) < 0) { @@ -40,7 +44,6 @@ acc[action.type].push(action) return acc }, {}) - // These are ephemeral bindings which only exist while executing actions $: eventContexBindings = getEventContextBindings( $currentAsset, @@ -50,9 +53,8 @@ selectedAction?.id ) $: allBindings = eventContexBindings.concat(bindings) - - // Assign a unique ID to each action $: { + // Ensure each action has a unique ID if (actions) { actions.forEach(action => { if (!action.id) { @@ -61,13 +63,11 @@ }) } } - $: selectedActionComponent = selectedAction && actionTypes.find(t => t.name === selectedAction[EVENT_TYPE_KEY])?.component - - // Select the first action if we delete an action $: { + // Select the first action if we delete an action if (selectedAction && !actions?.includes(selectedAction)) { selectedAction = actions?.[0] } diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte index 5f3b3ef639..d01a085a23 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte @@ -6,9 +6,11 @@ export let bindings = [] -Navigate To screen, or leave blank. -
+ + You can optionally navigate to another screen after closing the screen + modal. +