From ad19d8ab2b3717cd05f09068831126b951e9985d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 2 Nov 2022 20:25:28 +0000 Subject: [PATCH 1/4] v2.1.12-alpha.0 --- 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 1c116117f0..a58985c0af 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.11", + "version": "2.1.12-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 941b4f3154..d981ed5559 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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.11", + "@budibase/types": "2.1.12-alpha.0", "@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 ab0e065c64..91b90abbe2 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.11", + "version": "2.1.12-alpha.0", "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.11", + "@budibase/string-templates": "2.1.12-alpha.0", "@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 4c777ebde8..9694fe2ee5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.11", - "@budibase/client": "^2.1.11", - "@budibase/frontend-core": "^2.1.11", - "@budibase/string-templates": "^2.1.11", + "@budibase/bbui": "2.1.12-alpha.0", + "@budibase/client": "2.1.12-alpha.0", + "@budibase/frontend-core": "2.1.12-alpha.0", + "@budibase/string-templates": "2.1.12-alpha.0", "@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 ba1d937be5..1197c35851 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/backend-core": "2.1.12-alpha.0", + "@budibase/string-templates": "2.1.12-alpha.0", + "@budibase/types": "2.1.12-alpha.0", "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 73513b45c8..2856f43c3e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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.11", - "@budibase/frontend-core": "^2.1.11", - "@budibase/string-templates": "^2.1.11", + "@budibase/bbui": "2.1.12-alpha.0", + "@budibase/frontend-core": "2.1.12-alpha.0", + "@budibase/string-templates": "2.1.12-alpha.0", "@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 f7c02b45db..72a36e06ad 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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.11", + "@budibase/bbui": "2.1.12-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 441cadb353..ded62537e4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9414da1a9e..f6e09ce117 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.11", + "version": "2.1.12-alpha.0", "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.11", - "@budibase/client": "^2.1.11", + "@budibase/backend-core": "2.1.12-alpha.0", + "@budibase/client": "2.1.12-alpha.0", "@budibase/pro": "2.1.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/string-templates": "2.1.12-alpha.0", + "@budibase/types": "2.1.12-alpha.0", "@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 9b3144c5b9..8a7f222be5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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 31c2799b64..a90a5bf8d3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.11", + "version": "2.1.12-alpha.0", "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 d91df714e1..e25c1be81f 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.11", + "version": "2.1.12-alpha.0", "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.11", + "@budibase/backend-core": "2.1.12-alpha.0", "@budibase/pro": "2.1.11", - "@budibase/string-templates": "^2.1.11", - "@budibase/types": "^2.1.11", + "@budibase/string-templates": "2.1.12-alpha.0", + "@budibase/types": "2.1.12-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e8a6a31760c70597cf0731faacd6ca2ae7d40806 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 2 Nov 2022 20:28:55 +0000 Subject: [PATCH 2/4] Update pro version to 2.1.12-alpha.0 --- 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 f6e09ce117..a030545767 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.12-alpha.0", "@budibase/client": "2.1.12-alpha.0", - "@budibase/pro": "2.1.11", + "@budibase/pro": "2.1.12-alpha.0", "@budibase/string-templates": "2.1.12-alpha.0", "@budibase/types": "2.1.12-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d9ebc676d0..85fade8b1e 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.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.4.tgz#732264961ae4a19949bd318150a0afcd068d37bc" - integrity sha512-3XtI8kl7laMHjmW6M9kIj+Eb8fa1gwG3pn0wyojydmUDZOGnnirPT2nvsr4m2icD7KYKhjmiwTI+101Z8QvRfw== +"@budibase/backend-core@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12-alpha.0.tgz#e5e82375e5b50e8f5311232ff974c66f5cde7081" + integrity sha512-1wBbSVl6UwuuomQyQTWO4KykxDyglrweBlBz/+RYQizEz4Cm1CPM+CEIAZ6x4NreUua9+SUFm+aGVzgeFYUgqA== dependencies: - "@budibase/types" "2.0.40-alpha.4" + "@budibase/types" "2.1.12-alpha.0" "@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.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.4.tgz#3edef22748da6ae9086c9d55b864979657f58afc" - integrity sha512-AaruTMmUBuqi3q5wRxL4Yr9SCqENsuoFxJBLfqXIl9DB0LuowfRklf5yehjGjxxHwZpqkIuMgJf/+jYbAvL44g== +"@budibase/pro@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12-alpha.0.tgz#76982e46a28e9e92cc8e7cde1c3950a4cc71bf0f" + integrity sha512-a1h0N+fHYbUcGWw02J+e39xto8a6r5BU/OsutvVmFno5DOhQ26FT9R5ix4he8LzI9J9/Ta9YegJbnXWLxeSq3g== dependencies: - "@budibase/backend-core" "2.0.40-alpha.4" - "@budibase/types" "2.0.40-alpha.4" + "@budibase/backend-core" "2.1.12-alpha.0" + "@budibase/types" "2.1.12-alpha.0" "@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.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.4.tgz#25268ef370e680a1401ca04d5fa6a96cd3a03d9e" - integrity sha512-E/4WJpEyP4djElEzwHwehawGXwgcFPWGoeeU/FwgyqiIhJF07tKABjo56MC2aqiYDegYknZtx3OU73pFo/Z4LA== +"@budibase/types@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12-alpha.0.tgz#a86c5ce7da41a7865040184cef3bcf5949dca8a0" + integrity sha512-c8Sd/xccdBytzcS79E4VACs81+8cuWQVcLuQ6NAFYf939febO10DFjYasIK1kZaYNNh6dksIBhK4Vyz1nuE6lg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e25c1be81f..72ddd604ce 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.12-alpha.0", - "@budibase/pro": "2.1.11", + "@budibase/pro": "2.1.12-alpha.0", "@budibase/string-templates": "2.1.12-alpha.0", "@budibase/types": "2.1.12-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 1a4b55ad72..000ab38814 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.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.40-alpha.4.tgz#732264961ae4a19949bd318150a0afcd068d37bc" - integrity sha512-3XtI8kl7laMHjmW6M9kIj+Eb8fa1gwG3pn0wyojydmUDZOGnnirPT2nvsr4m2icD7KYKhjmiwTI+101Z8QvRfw== +"@budibase/backend-core@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.12-alpha.0.tgz#e5e82375e5b50e8f5311232ff974c66f5cde7081" + integrity sha512-1wBbSVl6UwuuomQyQTWO4KykxDyglrweBlBz/+RYQizEz4Cm1CPM+CEIAZ6x4NreUua9+SUFm+aGVzgeFYUgqA== dependencies: - "@budibase/types" "2.0.40-alpha.4" + "@budibase/types" "2.1.12-alpha.0" "@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.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.40-alpha.4.tgz#3edef22748da6ae9086c9d55b864979657f58afc" - integrity sha512-AaruTMmUBuqi3q5wRxL4Yr9SCqENsuoFxJBLfqXIl9DB0LuowfRklf5yehjGjxxHwZpqkIuMgJf/+jYbAvL44g== +"@budibase/pro@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.12-alpha.0.tgz#76982e46a28e9e92cc8e7cde1c3950a4cc71bf0f" + integrity sha512-a1h0N+fHYbUcGWw02J+e39xto8a6r5BU/OsutvVmFno5DOhQ26FT9R5ix4he8LzI9J9/Ta9YegJbnXWLxeSq3g== dependencies: - "@budibase/backend-core" "2.0.40-alpha.4" - "@budibase/types" "2.0.40-alpha.4" + "@budibase/backend-core" "2.1.12-alpha.0" + "@budibase/types" "2.1.12-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.0.40-alpha.4": - version "2.0.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.40-alpha.4.tgz#25268ef370e680a1401ca04d5fa6a96cd3a03d9e" - integrity sha512-E/4WJpEyP4djElEzwHwehawGXwgcFPWGoeeU/FwgyqiIhJF07tKABjo56MC2aqiYDegYknZtx3OU73pFo/Z4LA== +"@budibase/types@2.1.12-alpha.0": + version "2.1.12-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.12-alpha.0.tgz#a86c5ce7da41a7865040184cef3bcf5949dca8a0" + integrity sha512-c8Sd/xccdBytzcS79E4VACs81+8cuWQVcLuQ6NAFYf939febO10DFjYasIK1kZaYNNh6dksIBhK4Vyz1nuE6lg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 6b928879fe3ea68c4759d7b24a8481fb020e2c4d Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 3 Nov 2022 14:12:54 +0000 Subject: [PATCH 3/4] Update pull_request_template.md --- pull_request_template.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pull_request_template.md b/pull_request_template.md index 41c7b87c16..ade39d55e4 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -5,6 +5,9 @@ Addresses: - `` - ...more if required +## App Export +- If possible, attach an app export file along with your request template to make QA testing easier, with minimal setup. + ## Screenshots _If a UI facing feature, a short video of the happy path, and some screenshots of the new functionality._ From ed373c3b776170cc0c2ee6ef120b8e7925b896c7 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 3 Nov 2022 17:47:33 +0000 Subject: [PATCH 4/4] Fixing an issue which meant validation would consider datasources invalid despite the configuration being valid - #8510 --- .../TableIntegrationMenu/IntegrationConfigForm.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index e1caa15fd0..05649e1773 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -44,7 +44,10 @@ // run the validation whenever the config changes $: validation.check(config) // dispatch the validation result - $: dispatch("valid", Object.keys($validation.errors).length === 0) + $: dispatch( + "valid", + Object.values($validation.errors).filter(val => val != null).length === 0 + ) let addButton