From cd8e007da81986da3d2505390da9d94bf243c14e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sat, 11 Feb 2023 01:07:20 +0000 Subject: [PATCH 01/13] force display column to be chosen when uploading csv --- .../backend/TableNavigator/modals/CreateTableModal.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte index d7beab11e4..923645f582 100644 --- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte +++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte @@ -105,7 +105,10 @@ title="Create Table" confirmText="Create" onConfirm={saveTable} - disabled={error || !name || (rows.length && !allValid)} + disabled={error || + !name || + (rows.length && !allValid) || + displayColumn == null} > Date: Sat, 11 Feb 2023 01:14:58 +0000 Subject: [PATCH 02/13] fix displayColumn logic --- .../backend/TableNavigator/modals/CreateTableModal.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte index 923645f582..1987a51e5d 100644 --- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte +++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte @@ -107,8 +107,7 @@ onConfirm={saveTable} disabled={error || !name || - (rows.length && !allValid) || - displayColumn == null} + (rows.length && (!allValid || displayColumn == null))} > Date: Sun, 12 Feb 2023 15:40:20 +0000 Subject: [PATCH 03/13] v2.3.11 --- 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 9b2fc6454f..dfea8d562a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.10", + "version": "2.3.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ed97c0bf7e..0393539c50 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.3.10", + "version": "2.3.11", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.3.10", + "@budibase/types": "^2.3.11", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3ab5eea6b7..f776c2715c 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.3.10", + "version": "2.3.11", "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.3.10", + "@budibase/string-templates": "^2.3.11", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3255a98ae2..b784111192 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.3.10", + "version": "2.3.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.3.10", - "@budibase/client": "^2.3.10", - "@budibase/frontend-core": "^2.3.10", - "@budibase/string-templates": "^2.3.10", + "@budibase/bbui": "^2.3.11", + "@budibase/client": "^2.3.11", + "@budibase/frontend-core": "^2.3.11", + "@budibase/string-templates": "^2.3.11", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 02029a6162..9edaa3dd5a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.3.10", + "version": "2.3.11", "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.3.10", - "@budibase/string-templates": "^2.3.10", - "@budibase/types": "^2.3.10", + "@budibase/backend-core": "^2.3.11", + "@budibase/string-templates": "^2.3.11", + "@budibase/types": "^2.3.11", "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 a3ca8fd41b..dd6506c7a7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.3.10", + "version": "2.3.11", "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.3.10", - "@budibase/frontend-core": "^2.3.10", - "@budibase/string-templates": "^2.3.10", + "@budibase/bbui": "^2.3.11", + "@budibase/frontend-core": "^2.3.11", + "@budibase/string-templates": "^2.3.11", "@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 80f0951d1d..8b211a31b3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.3.10", + "version": "2.3.11", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.3.10", + "@budibase/bbui": "^2.3.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e7cd87e039..81a0d14059 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.3.10", + "version": "2.3.11", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 97ff6fdf95..4faf4388c7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.3.10", + "version": "2.3.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.3.10", - "@budibase/client": "^2.3.10", + "@budibase/backend-core": "^2.3.11", + "@budibase/client": "^2.3.11", "@budibase/pro": "2.3.10", - "@budibase/string-templates": "^2.3.10", - "@budibase/types": "^2.3.10", + "@budibase/string-templates": "^2.3.11", + "@budibase/types": "^2.3.11", "@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 1d9d2b28cd..50e4150e3f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.3.10", + "version": "2.3.11", "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 d0aebd9d8a..e46bc3d394 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.3.10", + "version": "2.3.11", "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 d22fce3717..15e6ac2dee 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.3.10", + "version": "2.3.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.3.10", + "@budibase/backend-core": "^2.3.11", "@budibase/pro": "2.3.10", - "@budibase/string-templates": "^2.3.10", - "@budibase/types": "^2.3.10", + "@budibase/string-templates": "^2.3.11", + "@budibase/types": "^2.3.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 27b7e8f02c543c9bd5bde996ff394e94c5d454d5 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 12 Feb 2023 15:43:59 +0000 Subject: [PATCH 04/13] Update pro version to 2.3.11 --- 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 4faf4388c7..ed64ecc813 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.3.11", "@budibase/client": "^2.3.11", - "@budibase/pro": "2.3.10", + "@budibase/pro": "2.3.11", "@budibase/string-templates": "^2.3.11", "@budibase/types": "^2.3.11", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 71e302aac3..88e33b3db6 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.10.tgz#4ee10c98a67de4106a93d05af0ba2e704d1d190e" - integrity sha512-IH+KC5KThj+D+Kpqlk6tYinUhV8i+j/vTFo1k98ced95epEqduV2+j/has9HPaRSzmP5tCnqHQvNgvj31nfINA== +"@budibase/backend-core@2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.11.tgz#74147e89826983f57400e58a6fc5f17384c4d347" + integrity sha512-G/AtqP4TQcew/7JhDcf57eUVEVDv4tGFeHSyCge1V7DElgyMnjoF2jfSbhNBwcVW/SWo9xnaucxGWONjuh5O3g== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.10" + "@budibase/types" "^2.3.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.10.tgz#250157ea2d7c3e81bdb4b96198305f27a9b2d513" - integrity sha512-i74Nba6APKHf81APTZLsRVOPqVcUYk+nUQ+iihSi8x4YXW9E42T105ESDXlFFSNYGGwMPnbPvyTyx+Fnh7qBLQ== +"@budibase/pro@2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.11.tgz#cae86c5521b9185de95f75688e1709b402d0f592" + integrity sha512-CNU2DUOmGS4JOishd+1F6D5AlywTx/mo73QY1Oe5fOGKuDl3ljUo+EIRubAZaM4mIfpnyXr0v0ipbouMP7eQMQ== dependencies: - "@budibase/backend-core" "2.3.10" - "@budibase/types" "2.3.10" + "@budibase/backend-core" "2.3.11" + "@budibase/types" "2.3.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.3.10", "@budibase/types@^2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.10.tgz#fe747be9697bb77d64f8a7ea894f69f87d28377b" - integrity sha512-ubf3Kim+EZJXXuIoKVjNaW3V9SmYnV6n0JRbDbIQ91/tJB5Z434/5eIhjgfu4b8kya+aNYp5ZvYJRsue/xou3g== +"@budibase/types@2.3.11", "@budibase/types@^2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.11.tgz#6e9aecac66d55edda8a9850c665ed9372198947e" + integrity sha512-MH+nJt23HzTGPeSTal0OL6W7Ss4TSvcFQA4+dT0aHhXVRS3neTHxc+wHAm03zWHG1PLNJxX5xlBR3iOV+NAAZA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 15e6ac2dee..77f88d81ac 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.3.11", - "@budibase/pro": "2.3.10", + "@budibase/pro": "2.3.11", "@budibase/string-templates": "^2.3.11", "@budibase/types": "^2.3.11", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 70f77e49be..894b54b909 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.10.tgz#4ee10c98a67de4106a93d05af0ba2e704d1d190e" - integrity sha512-IH+KC5KThj+D+Kpqlk6tYinUhV8i+j/vTFo1k98ced95epEqduV2+j/has9HPaRSzmP5tCnqHQvNgvj31nfINA== +"@budibase/backend-core@2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.11.tgz#74147e89826983f57400e58a6fc5f17384c4d347" + integrity sha512-G/AtqP4TQcew/7JhDcf57eUVEVDv4tGFeHSyCge1V7DElgyMnjoF2jfSbhNBwcVW/SWo9xnaucxGWONjuh5O3g== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.10" + "@budibase/types" "^2.3.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.10.tgz#250157ea2d7c3e81bdb4b96198305f27a9b2d513" - integrity sha512-i74Nba6APKHf81APTZLsRVOPqVcUYk+nUQ+iihSi8x4YXW9E42T105ESDXlFFSNYGGwMPnbPvyTyx+Fnh7qBLQ== +"@budibase/pro@2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.11.tgz#cae86c5521b9185de95f75688e1709b402d0f592" + integrity sha512-CNU2DUOmGS4JOishd+1F6D5AlywTx/mo73QY1Oe5fOGKuDl3ljUo+EIRubAZaM4mIfpnyXr0v0ipbouMP7eQMQ== dependencies: - "@budibase/backend-core" "2.3.10" - "@budibase/types" "2.3.10" + "@budibase/backend-core" "2.3.11" + "@budibase/types" "2.3.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.3.10", "@budibase/types@^2.3.10": - version "2.3.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.10.tgz#fe747be9697bb77d64f8a7ea894f69f87d28377b" - integrity sha512-ubf3Kim+EZJXXuIoKVjNaW3V9SmYnV6n0JRbDbIQ91/tJB5Z434/5eIhjgfu4b8kya+aNYp5ZvYJRsue/xou3g== +"@budibase/types@2.3.11", "@budibase/types@^2.3.11": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.11.tgz#6e9aecac66d55edda8a9850c665ed9372198947e" + integrity sha512-MH+nJt23HzTGPeSTal0OL6W7Ss4TSvcFQA4+dT0aHhXVRS3neTHxc+wHAm03zWHG1PLNJxX5xlBR3iOV+NAAZA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From ee054adf394be5f89c05cfa7f3e3f0da1c4b871f Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:06:33 +0000 Subject: [PATCH 05/13] Longform fields support for JSON string (#9666) --- .../design/settings/controls/FormFieldSelect.svelte | 4 ++-- packages/client/src/components/app/forms/Field.svelte | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte index 806abc4e92..b7b9f87bb4 100644 --- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte @@ -25,8 +25,8 @@ const getOptions = (schema, type) => { let entries = Object.entries(schema ?? {}) let types = [] - if (type === "field/options") { - // allow options to be used on both options and string fields + if (type === "field/options" || type === "field/longform") { + // allow options and longform to be used on string fields as well types = [type, "field/string"] } else { types = [type] diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte index a14c6ac9c8..435805cee8 100644 --- a/packages/client/src/components/app/forms/Field.svelte +++ b/packages/client/src/components/app/forms/Field.svelte @@ -85,7 +85,7 @@ {:else if !fieldState} - {:else if schemaType && schemaType !== type && type !== "options"} + {:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)} From 10b902b29533277e7eb52d6a4739813276cd4ca8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Feb 2023 11:23:03 +0000 Subject: [PATCH 06/13] v2.3.12 --- 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 dfea8d562a..b75f899d14 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.3.11", + "version": "2.3.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0393539c50..990eeb647e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.3.11", + "version": "2.3.12", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "^2.3.11", + "@budibase/types": "^2.3.12", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f776c2715c..36ac27d164 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.3.11", + "version": "2.3.12", "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.3.11", + "@budibase/string-templates": "^2.3.12", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index b784111192..3bc6bc7e6d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.3.11", + "version": "2.3.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.3.11", - "@budibase/client": "^2.3.11", - "@budibase/frontend-core": "^2.3.11", - "@budibase/string-templates": "^2.3.11", + "@budibase/bbui": "^2.3.12", + "@budibase/client": "^2.3.12", + "@budibase/frontend-core": "^2.3.12", + "@budibase/string-templates": "^2.3.12", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9edaa3dd5a..f51bf5cbbc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.3.11", + "version": "2.3.12", "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.3.11", - "@budibase/string-templates": "^2.3.11", - "@budibase/types": "^2.3.11", + "@budibase/backend-core": "^2.3.12", + "@budibase/string-templates": "^2.3.12", + "@budibase/types": "^2.3.12", "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 dd6506c7a7..f9010a469d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.3.11", + "version": "2.3.12", "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.3.11", - "@budibase/frontend-core": "^2.3.11", - "@budibase/string-templates": "^2.3.11", + "@budibase/bbui": "^2.3.12", + "@budibase/frontend-core": "^2.3.12", + "@budibase/string-templates": "^2.3.12", "@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 8b211a31b3..b6b5dae40c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.3.11", + "version": "2.3.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.3.11", + "@budibase/bbui": "^2.3.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 81a0d14059..e0bd5ebd23 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.3.11", + "version": "2.3.12", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index ed64ecc813..e91e56766b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.3.11", + "version": "2.3.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.3.11", - "@budibase/client": "^2.3.11", + "@budibase/backend-core": "^2.3.12", + "@budibase/client": "^2.3.12", "@budibase/pro": "2.3.11", - "@budibase/string-templates": "^2.3.11", - "@budibase/types": "^2.3.11", + "@budibase/string-templates": "^2.3.12", + "@budibase/types": "^2.3.12", "@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 50e4150e3f..4fc752c5b1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.3.11", + "version": "2.3.12", "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 e46bc3d394..bf1d8e371a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.3.11", + "version": "2.3.12", "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 77f88d81ac..845c08dbe7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.3.11", + "version": "2.3.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.3.11", + "@budibase/backend-core": "^2.3.12", "@budibase/pro": "2.3.11", - "@budibase/string-templates": "^2.3.11", - "@budibase/types": "^2.3.11", + "@budibase/string-templates": "^2.3.12", + "@budibase/types": "^2.3.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5d6c377c5c17ef31fe5003f1c46e15f544af51c8 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 13 Feb 2023 11:27:47 +0000 Subject: [PATCH 07/13] Update pro version to 2.3.12 --- 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 e91e56766b..eec82a5e33 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.3.12", "@budibase/client": "^2.3.12", - "@budibase/pro": "2.3.11", + "@budibase/pro": "2.3.12", "@budibase/string-templates": "^2.3.12", "@budibase/types": "^2.3.12", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 88e33b3db6..a27f3a6d51 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.11.tgz#74147e89826983f57400e58a6fc5f17384c4d347" - integrity sha512-G/AtqP4TQcew/7JhDcf57eUVEVDv4tGFeHSyCge1V7DElgyMnjoF2jfSbhNBwcVW/SWo9xnaucxGWONjuh5O3g== +"@budibase/backend-core@2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.12.tgz#2aa41514b086f19c672073ba6a492272e7eeb706" + integrity sha512-cOWZTc6Od3R8KdmEUpvDSI91i/4cif1TdtI9nr01VUB2eAXYs/4gI9LJwowA4kQVVqFARAh5hUsKC1BzZKuHwA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.11" + "@budibase/types" "^2.3.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.11.tgz#cae86c5521b9185de95f75688e1709b402d0f592" - integrity sha512-CNU2DUOmGS4JOishd+1F6D5AlywTx/mo73QY1Oe5fOGKuDl3ljUo+EIRubAZaM4mIfpnyXr0v0ipbouMP7eQMQ== +"@budibase/pro@2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.12.tgz#9a0daacdf39b0d41c5ad4cb5462af91e1f475fd9" + integrity sha512-zjs8TpdF5mKGXcskyGS7Q4IcJjZ/rJNQkFvKB+H0bn3cTKKx2IyPTHlcZ3H/4altMPOSW0u6H8InWQbXoRfJBw== dependencies: - "@budibase/backend-core" "2.3.11" - "@budibase/types" "2.3.11" + "@budibase/backend-core" "2.3.12" + "@budibase/types" "2.3.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.3.11", "@budibase/types@^2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.11.tgz#6e9aecac66d55edda8a9850c665ed9372198947e" - integrity sha512-MH+nJt23HzTGPeSTal0OL6W7Ss4TSvcFQA4+dT0aHhXVRS3neTHxc+wHAm03zWHG1PLNJxX5xlBR3iOV+NAAZA== +"@budibase/types@2.3.12", "@budibase/types@^2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.12.tgz#c2d8e126e1bbf5fd2dc33c38943bea5eaf643f58" + integrity sha512-TVfqvX/qVEbXphdHqpL9/PiFPyNDDa0vMFYy4/eoT69490eznOMEEO+T7SkbbB3TtpLyr20WwKwsWRBWfhi6+A== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 845c08dbe7..bb5633af6f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.3.12", - "@budibase/pro": "2.3.11", + "@budibase/pro": "2.3.12", "@budibase/string-templates": "^2.3.12", "@budibase/types": "^2.3.12", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 894b54b909..adc3344dc6 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.11.tgz#74147e89826983f57400e58a6fc5f17384c4d347" - integrity sha512-G/AtqP4TQcew/7JhDcf57eUVEVDv4tGFeHSyCge1V7DElgyMnjoF2jfSbhNBwcVW/SWo9xnaucxGWONjuh5O3g== +"@budibase/backend-core@2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.12.tgz#2aa41514b086f19c672073ba6a492272e7eeb706" + integrity sha512-cOWZTc6Od3R8KdmEUpvDSI91i/4cif1TdtI9nr01VUB2eAXYs/4gI9LJwowA4kQVVqFARAh5hUsKC1BzZKuHwA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "^2.3.11" + "@budibase/types" "^2.3.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.11.tgz#cae86c5521b9185de95f75688e1709b402d0f592" - integrity sha512-CNU2DUOmGS4JOishd+1F6D5AlywTx/mo73QY1Oe5fOGKuDl3ljUo+EIRubAZaM4mIfpnyXr0v0ipbouMP7eQMQ== +"@budibase/pro@2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.12.tgz#9a0daacdf39b0d41c5ad4cb5462af91e1f475fd9" + integrity sha512-zjs8TpdF5mKGXcskyGS7Q4IcJjZ/rJNQkFvKB+H0bn3cTKKx2IyPTHlcZ3H/4altMPOSW0u6H8InWQbXoRfJBw== dependencies: - "@budibase/backend-core" "2.3.11" - "@budibase/types" "2.3.11" + "@budibase/backend-core" "2.3.12" + "@budibase/types" "2.3.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.3.11", "@budibase/types@^2.3.11": - version "2.3.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.11.tgz#6e9aecac66d55edda8a9850c665ed9372198947e" - integrity sha512-MH+nJt23HzTGPeSTal0OL6W7Ss4TSvcFQA4+dT0aHhXVRS3neTHxc+wHAm03zWHG1PLNJxX5xlBR3iOV+NAAZA== +"@budibase/types@2.3.12", "@budibase/types@^2.3.12": + version "2.3.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.12.tgz#c2d8e126e1bbf5fd2dc33c38943bea5eaf643f58" + integrity sha512-TVfqvX/qVEbXphdHqpL9/PiFPyNDDa0vMFYy4/eoT69490eznOMEEO+T7SkbbB3TtpLyr20WwKwsWRBWfhi6+A== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 488b542ac1a74cfaf1043fc6916a8550cc1ef816 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 14 Feb 2023 14:38:55 +0000 Subject: [PATCH 08/13] Fix for #9654 - the error checking was looking at the through fields flipped, which caused many to many relationships to throw an error. Also I've updated the dev compose file on master so that switching between develop and master is smoother. --- hosting/docker-compose.dev.yaml | 19 +++-------- .../Datasources/CreateEditRelationship.svelte | 18 +++-------- .../integrations/postgres/emp-territory.sql | 32 +++++++++++++++++++ 3 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 packages/server/scripts/integrations/postgres/emp-territory.sql diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index 7906a389fa..7d8198db73 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -42,25 +42,16 @@ services: couchdb-service: # platform: linux/amd64 - container_name: budi-couchdb-dev + container_name: budi-couchdb3-dev restart: on-failure - image: ibmcom/couchdb3 + image: budibase/couchdb environment: - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD} - COUCHDB_USER=${COUCH_DB_USER} ports: - "${COUCH_DB_PORT}:5984" volumes: - - couchdb3_data:/opt/couchdb/data - - couch-init: - container_name: budi-couchdb-init-dev - image: curlimages/curl - environment: - PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984" - depends_on: - - couchdb-service - command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"] + - couchdb_data:/data redis-service: container_name: budi-redis-dev @@ -73,9 +64,9 @@ services: - redis_data:/data volumes: - couchdb3_data: + couchdb_data: driver: local minio_data: driver: local redis_data: - driver: local + driver: local \ No newline at end of file diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 4a3c4f6c60..1413cd157e 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -152,7 +152,7 @@ fromTable, throughTable, fromTable.primary[0], - throughFromKey + throughToKey ), throughToKey: errorChecker.manyForeignKeySet(throughToKey) || @@ -160,7 +160,7 @@ toTable, throughTable, toTable.primary[0], - throughToKey + throughFromKey ), fromForeign: errorChecker.foreignKeySet(fromForeign) || @@ -391,24 +391,14 @@ options={Object.keys(getTable(throughId)?.schema)} bind:value={throughToKey} bind:error={errors.throughToKey} - on:change={e => - changed(() => { - if (throughFromKey === e.detail) { - throughFromKey = null - } - })} + on:change={changed} />