From 5bf9ee38a037fec271577548b170522576b594c0 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Tue, 26 Jul 2022 16:33:27 +0100 Subject: [PATCH 01/15] fixed automation app:trigger not mapping test modal form --- .../FlowChart/TestDataModal.svelte | 22 ++-- .../SetupPanel/AutomationBlockSetup.svelte | 46 +++++-- .../SetupPanel/FieldSelector.svelte | 116 ++++++++++++++++++ 3 files changed, 164 insertions(+), 20 deletions(-) create mode 100644 packages/builder/src/components/automation/SetupPanel/FieldSelector.svelte diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index b86cffb1f9..86eec36094 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -15,16 +15,22 @@ let trigger = {} let schemaProperties = {} - // clone the trigger so we're not mutating the reference - $: trigger = cloneDeep( - $automationStore.selectedAutomation.automation.definition.trigger - ) + $: trigger + $: schemaProperties + $: { + // clone the trigger so we're not mutating the reference + trigger = cloneDeep( + $automationStore.selectedAutomation.automation.definition.trigger + ) - // get the outputs so we can define the fields - $: schemaProperties = Object.entries(trigger?.schema?.outputs?.properties) + // get the outputs so we can define the fields + let schema = Object.entries(trigger.schema?.outputs?.properties || {}) - if (!$automationStore.selectedAutomation.automation.testData) { - $automationStore.selectedAutomation.automation.testData = {} + if (trigger?.event === "app:trigger") { + schema = Object.entries({ fields: { customType: "fields" } }) + } + + schemaProperties = schema } // check to see if there is existing test data in the store diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 8b34cf8cd2..b8f403b452 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -1,6 +1,7 @@ + +FieldSelector + +{#if schemaFields.length && isTestModal} +
+ {#each schemaFields as [field, schema]} + + {/each} +
+{/if} + + From 1b3062dfcf03ed63086c11cb0ac61d5444f1b548 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Tue, 26 Jul 2022 17:22:42 +0100 Subject: [PATCH 02/15] amended code following recommendations in PR comments --- .../AutomationBuilder/FlowChart/TestDataModal.svelte | 4 +--- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 +- .../src/components/automation/SetupPanel/FieldSelector.svelte | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index 86eec36094..9bbca16802 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -15,8 +15,6 @@ let trigger = {} let schemaProperties = {} - $: trigger - $: schemaProperties $: { // clone the trigger so we're not mutating the reference trigger = cloneDeep( @@ -27,7 +25,7 @@ let schema = Object.entries(trigger.schema?.outputs?.properties || {}) if (trigger?.event === "app:trigger") { - schema = Object.entries({ fields: { customType: "fields" } }) + schema = [["fields", { customType: "fields" }]] } schemaProperties = schema diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index b8f403b452..fd0b82a8a6 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -53,7 +53,7 @@ $: getInputData(testData, block.inputs) const getInputData = (testData, blockInputs) => { - let newInputData = testData ? testData : blockInputs + let newInputData = testData || blockInputs if (block.event === "app:trigger" && !newInputData?.fields) { newInputData = cloneDeep(blockInputs) diff --git a/packages/builder/src/components/automation/SetupPanel/FieldSelector.svelte b/packages/builder/src/components/automation/SetupPanel/FieldSelector.svelte index 4ac7b16fa1..f510d961fb 100644 --- a/packages/builder/src/components/automation/SetupPanel/FieldSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/FieldSelector.svelte @@ -87,8 +87,6 @@ } -FieldSelector - {#if schemaFields.length && isTestModal}
{#each schemaFields as [field, schema]} From 2e3ef1c3ed994047e099300e905f251832e6e74b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 26 Jul 2022 17:06:56 +0000 Subject: [PATCH 03/15] v1.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 | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index b648e6ca22..9bced92ad5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.24", + "version": "1.1.25", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d8885ce717..a21c81eb80 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.24", + "version": "1.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": "^1.1.24", + "@budibase/types": "^1.1.25", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f2706bb76c..1767967895 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": "1.1.24", + "version": "1.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": "^1.1.24", + "@budibase/string-templates": "^1.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 e676bd5bc8..5e4b106d0a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.24", + "version": "1.1.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.24", - "@budibase/client": "^1.1.24", - "@budibase/frontend-core": "^1.1.24", - "@budibase/string-templates": "^1.1.24", + "@budibase/bbui": "^1.1.25", + "@budibase/client": "^1.1.25", + "@budibase/frontend-core": "^1.1.25", + "@budibase/string-templates": "^1.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 8d5963d053..8aa4751cf7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.24", + "version": "1.1.25", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 9dadbba401..64f5bc7a2d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.24", + "version": "1.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": "^1.1.24", - "@budibase/frontend-core": "^1.1.24", - "@budibase/string-templates": "^1.1.24", + "@budibase/bbui": "^1.1.25", + "@budibase/frontend-core": "^1.1.25", + "@budibase/string-templates": "^1.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 e05b7703a9..ff52856678 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.24", + "version": "1.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": "^1.1.24", + "@budibase/bbui": "^1.1.25", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 34a1d4cfd9..a51bb660f0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.24", + "version": "1.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": "^1.1.24", - "@budibase/client": "^1.1.24", + "@budibase/backend-core": "^1.1.25", + "@budibase/client": "^1.1.25", "@budibase/pro": "1.1.24", - "@budibase/string-templates": "^1.1.24", - "@budibase/types": "^1.1.24", + "@budibase/string-templates": "^1.1.25", + "@budibase/types": "^1.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 c13a19e9c6..518581509a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.24", + "version": "1.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 5eae0db6c3..b2239fc7b0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.24", + "version": "1.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 40e9550066..dd7581977b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.24", + "version": "1.1.25", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.24", + "@budibase/backend-core": "^1.1.25", "@budibase/pro": "1.1.24", - "@budibase/string-templates": "^1.1.24", - "@budibase/types": "^1.1.24", + "@budibase/string-templates": "^1.1.25", + "@budibase/types": "^1.1.25", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e4b8933067c2000139632162554abc01f12681d0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 26 Jul 2022 17:08:33 +0000 Subject: [PATCH 04/15] Update pro version to 1.1.25 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a51bb660f0..a9af342546 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.25", "@budibase/client": "^1.1.25", - "@budibase/pro": "1.1.24", + "@budibase/pro": "1.1.25", "@budibase/string-templates": "^1.1.25", "@budibase/types": "^1.1.25", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index dd7581977b..968505faff 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.25", - "@budibase/pro": "1.1.24", + "@budibase/pro": "1.1.25", "@budibase/string-templates": "^1.1.25", "@budibase/types": "^1.1.25", "@koa/router": "8.0.8", From 0ed3775a6d3752871953cf7ce98394a71afde274 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 27 Jul 2022 10:10:42 +0100 Subject: [PATCH 05/15] Fully remount component settings when changing selected component --- .../settings/ComponentSettingsPanel.svelte | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte index ff0c53e7ab..8ece061f57 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte @@ -27,20 +27,26 @@ {#if $selectedComponent} - - - - - - + {#key $selectedComponent._id} + + + + + + + {/key} {/if} From a9ef2e019339c597427835c32d0db66761136e34 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 27 Jul 2022 13:24:01 +0100 Subject: [PATCH 06/15] bumping lockfiles --- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 462361c7e8..38ee626c11 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@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.7.tgz#371048be47828da1f13e03b6d808bccb7114cdb5" - integrity sha512-FZnGTQihKugHnaim5osfITwTfIeachtO3ZERRqU68CpoJVI52oyzPixK1oUP2HYFGCcttqIJN90XD/keC1LzQQ== +"@budibase/backend-core@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.25.tgz#2ae3de9f2e49c8431de23bd1ce8f8040ab46b7d1" + integrity sha512-t95qEYuxLcl/kzZJ90/D9imuG63IpTPY1f2Wrex6JtvgBYh+jvFh1/t6XDPv0NuSWVd5/OILzX6322pq2ak5GQ== dependencies: - "@budibase/types" "^1.1.7" + "@budibase/types" "^1.1.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.7.tgz#b9120c60a38d4bbc87dc99ef219a8f23418b9d82" - integrity sha512-APMPIWbxPWzAWWKBglGa1csbVxllAsF5Lt7e5hrNVfN51rzJ3TvQ56iIUru0xGOWpelDQWd4FXe1/dpN0hSvEA== +"@budibase/pro@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.25.tgz#a9fd58b6bd80b9bf523f4e21a32e537b26bb3c92" + integrity sha512-4QvlMW6nqaXIYzpU9iQH54LPFGxdjiQUZGoRfPSdNoj1tKB57iQe0Gz39PopGyzOfVdytAlpJdD22Wfdb378jQ== dependencies: - "@budibase/backend-core" "1.1.7" - "@budibase/types" "1.1.7" + "@budibase/backend-core" "1.1.25" + "@budibase/types" "1.1.25" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1204,10 +1204,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.1.7", "@budibase/types@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.7.tgz#d1da67c6c6b09de639130775ed80290148434be0" - integrity sha512-WkR9bS4DdVAAzIgzHDsfMLPBcXs+RVwzOXp2eSFrun1fZQfkiAnMO7+EYhYx4+zF6RLBXiF6iYXPDJLzviufGQ== +"@budibase/types@1.1.25", "@budibase/types@^1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.25.tgz#4d52ac31368de37500a2ae8f8dc02a662d58d49a" + integrity sha512-K74BqAZiM+4URVvGPXhAVE3r+lLQoQ/LOFY30fAvAOv6WMJsw5r7NpF4m1l7bevPxZ6+ku1q/RnoI9aRGqdLlg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d4780b53de..54ea03d3b0 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@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.7.tgz#371048be47828da1f13e03b6d808bccb7114cdb5" - integrity sha512-FZnGTQihKugHnaim5osfITwTfIeachtO3ZERRqU68CpoJVI52oyzPixK1oUP2HYFGCcttqIJN90XD/keC1LzQQ== +"@budibase/backend-core@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.25.tgz#2ae3de9f2e49c8431de23bd1ce8f8040ab46b7d1" + integrity sha512-t95qEYuxLcl/kzZJ90/D9imuG63IpTPY1f2Wrex6JtvgBYh+jvFh1/t6XDPv0NuSWVd5/OILzX6322pq2ak5GQ== dependencies: - "@budibase/types" "^1.1.7" + "@budibase/types" "^1.1.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,19 +324,19 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.7.tgz#b9120c60a38d4bbc87dc99ef219a8f23418b9d82" - integrity sha512-APMPIWbxPWzAWWKBglGa1csbVxllAsF5Lt7e5hrNVfN51rzJ3TvQ56iIUru0xGOWpelDQWd4FXe1/dpN0hSvEA== +"@budibase/pro@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.25.tgz#a9fd58b6bd80b9bf523f4e21a32e537b26bb3c92" + integrity sha512-4QvlMW6nqaXIYzpU9iQH54LPFGxdjiQUZGoRfPSdNoj1tKB57iQe0Gz39PopGyzOfVdytAlpJdD22Wfdb378jQ== dependencies: - "@budibase/backend-core" "1.1.7" - "@budibase/types" "1.1.7" + "@budibase/backend-core" "1.1.25" + "@budibase/types" "1.1.25" node-fetch "^2.6.1" -"@budibase/types@1.1.7", "@budibase/types@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.7.tgz#d1da67c6c6b09de639130775ed80290148434be0" - integrity sha512-WkR9bS4DdVAAzIgzHDsfMLPBcXs+RVwzOXp2eSFrun1fZQfkiAnMO7+EYhYx4+zF6RLBXiF6iYXPDJLzviufGQ== +"@budibase/types@1.1.25", "@budibase/types@^1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.25.tgz#4d52ac31368de37500a2ae8f8dc02a662d58d49a" + integrity sha512-K74BqAZiM+4URVvGPXhAVE3r+lLQoQ/LOFY30fAvAOv6WMJsw5r7NpF4m1l7bevPxZ6+ku1q/RnoI9aRGqdLlg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 9fa39b05386ed8f1e1c9e2be3cfb5e84e43fb032 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 12:35:02 +0000 Subject: [PATCH 07/15] v1.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 | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 9bced92ad5..516a351844 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.25", + "version": "1.1.26", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a21c81eb80..e4e7a4e565 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.25", + "version": "1.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": "^1.1.25", + "@budibase/types": "^1.1.26", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1767967895..4a79ba3bbd 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": "1.1.25", + "version": "1.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": "^1.1.25", + "@budibase/string-templates": "^1.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 5e4b106d0a..b9a0301345 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.25", + "version": "1.1.26", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.25", - "@budibase/client": "^1.1.25", - "@budibase/frontend-core": "^1.1.25", - "@budibase/string-templates": "^1.1.25", + "@budibase/bbui": "^1.1.26", + "@budibase/client": "^1.1.26", + "@budibase/frontend-core": "^1.1.26", + "@budibase/string-templates": "^1.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 8aa4751cf7..9818905364 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.25", + "version": "1.1.26", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 64f5bc7a2d..c3d7e94fc0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.25", + "version": "1.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": "^1.1.25", - "@budibase/frontend-core": "^1.1.25", - "@budibase/string-templates": "^1.1.25", + "@budibase/bbui": "^1.1.26", + "@budibase/frontend-core": "^1.1.26", + "@budibase/string-templates": "^1.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 ff52856678..50ddff5409 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.25", + "version": "1.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": "^1.1.25", + "@budibase/bbui": "^1.1.26", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index a9af342546..dcb207fe53 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.25", + "version": "1.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": "^1.1.25", - "@budibase/client": "^1.1.25", + "@budibase/backend-core": "^1.1.26", + "@budibase/client": "^1.1.26", "@budibase/pro": "1.1.25", - "@budibase/string-templates": "^1.1.25", - "@budibase/types": "^1.1.25", + "@budibase/string-templates": "^1.1.26", + "@budibase/types": "^1.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 518581509a..686600a8a0 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.25", + "version": "1.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 b2239fc7b0..7c820d495c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.25", + "version": "1.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 968505faff..27c6c2b5b4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.25", + "version": "1.1.26", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.25", + "@budibase/backend-core": "^1.1.26", "@budibase/pro": "1.1.25", - "@budibase/string-templates": "^1.1.25", - "@budibase/types": "^1.1.25", + "@budibase/string-templates": "^1.1.26", + "@budibase/types": "^1.1.26", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 75c216a94d99ed13e45aa2146a5e3dd6167aee9c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 12:36:45 +0000 Subject: [PATCH 08/15] Update pro version to 1.1.26 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index dcb207fe53..09817c8901 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.26", "@budibase/client": "^1.1.26", - "@budibase/pro": "1.1.25", + "@budibase/pro": "1.1.26", "@budibase/string-templates": "^1.1.26", "@budibase/types": "^1.1.26", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 27c6c2b5b4..41590a4ac3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.26", - "@budibase/pro": "1.1.25", + "@budibase/pro": "1.1.26", "@budibase/string-templates": "^1.1.26", "@budibase/types": "^1.1.26", "@koa/router": "8.0.8", From 3a4f2a7e664d70fc33f7ad711583725c377ddfd9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 27 Jul 2022 16:18:12 +0100 Subject: [PATCH 09/15] Fixing issue discovered in #6813 - versioning of query rows was not correct in automations, was using old broken method. --- .../server/src/automations/steps/queryRows.js | 6 ++-- .../server/src/automations/steps/utils.js | 14 +++++---- packages/server/yarn.lock | 30 +++++++++---------- packages/worker/yarn.lock | 30 +++++++++---------- 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/packages/server/src/automations/steps/queryRows.js b/packages/server/src/automations/steps/queryRows.js index d4bc5fe076..b6d1938995 100644 --- a/packages/server/src/automations/steps/queryRows.js +++ b/packages/server/src/automations/steps/queryRows.js @@ -96,12 +96,14 @@ exports.run = async function ({ inputs, appId }) { tableId, }, body: { - sortOrder, sortType, + limit, sort: sortColumn, query: filters || {}, - limit, + // default to ascending, like data tab + sortOrder: sortOrder || SortOrders.ASCENDING, }, + version: "1", }) try { await rowController.search(ctx) diff --git a/packages/server/src/automations/steps/utils.js b/packages/server/src/automations/steps/utils.js index 61f4a8080d..ed9a441499 100644 --- a/packages/server/src/automations/steps/utils.js +++ b/packages/server/src/automations/steps/utils.js @@ -17,7 +17,8 @@ exports.getFetchResponse = async fetched => { // need to make sure all ctx structures have the // throw added to them, so that controllers don't // throw a ctx.throw undefined when error occurs -exports.buildCtx = (appId, emitter, { body, params } = {}) => { +// opts can contain, body, params and version +exports.buildCtx = (appId, emitter, opts = {}) => { const ctx = { appId, user: { appId }, @@ -26,11 +27,14 @@ exports.buildCtx = (appId, emitter, { body, params } = {}) => { throw error }, } - if (body) { - ctx.request = { body } + if (opts.body) { + ctx.request = { body: opts.body } } - if (params) { - ctx.params = params + if (opts.params) { + ctx.params = opts.params + } + if (opts.version) { + ctx.version = opts.version } return ctx } diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 462361c7e8..38ee626c11 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@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.7.tgz#371048be47828da1f13e03b6d808bccb7114cdb5" - integrity sha512-FZnGTQihKugHnaim5osfITwTfIeachtO3ZERRqU68CpoJVI52oyzPixK1oUP2HYFGCcttqIJN90XD/keC1LzQQ== +"@budibase/backend-core@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.25.tgz#2ae3de9f2e49c8431de23bd1ce8f8040ab46b7d1" + integrity sha512-t95qEYuxLcl/kzZJ90/D9imuG63IpTPY1f2Wrex6JtvgBYh+jvFh1/t6XDPv0NuSWVd5/OILzX6322pq2ak5GQ== dependencies: - "@budibase/types" "^1.1.7" + "@budibase/types" "^1.1.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1177,13 +1177,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.7.tgz#b9120c60a38d4bbc87dc99ef219a8f23418b9d82" - integrity sha512-APMPIWbxPWzAWWKBglGa1csbVxllAsF5Lt7e5hrNVfN51rzJ3TvQ56iIUru0xGOWpelDQWd4FXe1/dpN0hSvEA== +"@budibase/pro@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.25.tgz#a9fd58b6bd80b9bf523f4e21a32e537b26bb3c92" + integrity sha512-4QvlMW6nqaXIYzpU9iQH54LPFGxdjiQUZGoRfPSdNoj1tKB57iQe0Gz39PopGyzOfVdytAlpJdD22Wfdb378jQ== dependencies: - "@budibase/backend-core" "1.1.7" - "@budibase/types" "1.1.7" + "@budibase/backend-core" "1.1.25" + "@budibase/types" "1.1.25" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1204,10 +1204,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.1.7", "@budibase/types@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.7.tgz#d1da67c6c6b09de639130775ed80290148434be0" - integrity sha512-WkR9bS4DdVAAzIgzHDsfMLPBcXs+RVwzOXp2eSFrun1fZQfkiAnMO7+EYhYx4+zF6RLBXiF6iYXPDJLzviufGQ== +"@budibase/types@1.1.25", "@budibase/types@^1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.25.tgz#4d52ac31368de37500a2ae8f8dc02a662d58d49a" + integrity sha512-K74BqAZiM+4URVvGPXhAVE3r+lLQoQ/LOFY30fAvAOv6WMJsw5r7NpF4m1l7bevPxZ6+ku1q/RnoI9aRGqdLlg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d4780b53de..54ea03d3b0 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@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.7.tgz#371048be47828da1f13e03b6d808bccb7114cdb5" - integrity sha512-FZnGTQihKugHnaim5osfITwTfIeachtO3ZERRqU68CpoJVI52oyzPixK1oUP2HYFGCcttqIJN90XD/keC1LzQQ== +"@budibase/backend-core@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.25.tgz#2ae3de9f2e49c8431de23bd1ce8f8040ab46b7d1" + integrity sha512-t95qEYuxLcl/kzZJ90/D9imuG63IpTPY1f2Wrex6JtvgBYh+jvFh1/t6XDPv0NuSWVd5/OILzX6322pq2ak5GQ== dependencies: - "@budibase/types" "^1.1.7" + "@budibase/types" "^1.1.25" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -324,19 +324,19 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.7.tgz#b9120c60a38d4bbc87dc99ef219a8f23418b9d82" - integrity sha512-APMPIWbxPWzAWWKBglGa1csbVxllAsF5Lt7e5hrNVfN51rzJ3TvQ56iIUru0xGOWpelDQWd4FXe1/dpN0hSvEA== +"@budibase/pro@1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.25.tgz#a9fd58b6bd80b9bf523f4e21a32e537b26bb3c92" + integrity sha512-4QvlMW6nqaXIYzpU9iQH54LPFGxdjiQUZGoRfPSdNoj1tKB57iQe0Gz39PopGyzOfVdytAlpJdD22Wfdb378jQ== dependencies: - "@budibase/backend-core" "1.1.7" - "@budibase/types" "1.1.7" + "@budibase/backend-core" "1.1.25" + "@budibase/types" "1.1.25" node-fetch "^2.6.1" -"@budibase/types@1.1.7", "@budibase/types@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.7.tgz#d1da67c6c6b09de639130775ed80290148434be0" - integrity sha512-WkR9bS4DdVAAzIgzHDsfMLPBcXs+RVwzOXp2eSFrun1fZQfkiAnMO7+EYhYx4+zF6RLBXiF6iYXPDJLzviufGQ== +"@budibase/types@1.1.25", "@budibase/types@^1.1.25": + version "1.1.25" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.25.tgz#4d52ac31368de37500a2ae8f8dc02a662d58d49a" + integrity sha512-K74BqAZiM+4URVvGPXhAVE3r+lLQoQ/LOFY30fAvAOv6WMJsw5r7NpF4m1l7bevPxZ6+ku1q/RnoI9aRGqdLlg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 6713c0b46d62ac93b98da35db837731c029da3fb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 15:46:51 +0000 Subject: [PATCH 10/15] v1.1.27 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 516a351844..1a7fa084b5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.26", + "version": "1.1.27", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e4e7a4e565..67b5e77e90 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.26", + "version": "1.1.27", "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": "^1.1.26", + "@budibase/types": "^1.1.27", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4a79ba3bbd..6444fa6987 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": "1.1.26", + "version": "1.1.27", "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": "^1.1.26", + "@budibase/string-templates": "^1.1.27", "@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 b9a0301345..73093a4e70 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.26", + "version": "1.1.27", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.26", - "@budibase/client": "^1.1.26", - "@budibase/frontend-core": "^1.1.26", - "@budibase/string-templates": "^1.1.26", + "@budibase/bbui": "^1.1.27", + "@budibase/client": "^1.1.27", + "@budibase/frontend-core": "^1.1.27", + "@budibase/string-templates": "^1.1.27", "@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 9818905364..cade0a2bef 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.26", + "version": "1.1.27", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c3d7e94fc0..3b4fd87b91 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.26", + "version": "1.1.27", "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": "^1.1.26", - "@budibase/frontend-core": "^1.1.26", - "@budibase/string-templates": "^1.1.26", + "@budibase/bbui": "^1.1.27", + "@budibase/frontend-core": "^1.1.27", + "@budibase/string-templates": "^1.1.27", "@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 50ddff5409..1905c5e806 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.26", + "version": "1.1.27", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.26", + "@budibase/bbui": "^1.1.27", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 09817c8901..5ce838080f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.26", + "version": "1.1.27", "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": "^1.1.26", - "@budibase/client": "^1.1.26", + "@budibase/backend-core": "^1.1.27", + "@budibase/client": "^1.1.27", "@budibase/pro": "1.1.26", - "@budibase/string-templates": "^1.1.26", - "@budibase/types": "^1.1.26", + "@budibase/string-templates": "^1.1.27", + "@budibase/types": "^1.1.27", "@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 686600a8a0..9c453cfd08 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.26", + "version": "1.1.27", "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 7c820d495c..06178c8533 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.26", + "version": "1.1.27", "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 41590a4ac3..c5166582c4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.26", + "version": "1.1.27", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.26", + "@budibase/backend-core": "^1.1.27", "@budibase/pro": "1.1.26", - "@budibase/string-templates": "^1.1.26", - "@budibase/types": "^1.1.26", + "@budibase/string-templates": "^1.1.27", + "@budibase/types": "^1.1.27", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5945a432e78db02bb3c78d39ce6db51e7c0996c9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 27 Jul 2022 16:47:19 +0100 Subject: [PATCH 11/15] Fixing an issue with test panel not updating when new test data comes in. --- .../automation/AutomationBuilder/TestPanel.svelte | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte index bdc39b74e1..4f09edf7c2 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte @@ -5,9 +5,8 @@ import { ActionStepID } from "constants/backend/automations" export let automation - export let testResults - let blocks + let blocks, testResults $: { blocks = [] @@ -18,15 +17,11 @@ blocks = blocks .concat(automation.definition.steps || []) .filter(x => x.stepId !== ActionStepID.LOOP) - } else if (testResults) { - blocks = testResults.steps || [] - } - } - $: { - if (!testResults) { - testResults = $automationStore.selectedAutomation?.testResults + } else if ($automationStore.selectedAutomation) { + automation = $automationStore.selectedAutomation } } + $: testResults = $automationStore.selectedAutomation?.testResults
From 58984ea849304a60ad0c330a352fb2bfc769821a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 15:48:36 +0000 Subject: [PATCH 12/15] Update pro version to 1.1.27 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5ce838080f..e81cdb4301 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.27", "@budibase/client": "^1.1.27", - "@budibase/pro": "1.1.26", + "@budibase/pro": "1.1.27", "@budibase/string-templates": "^1.1.27", "@budibase/types": "^1.1.27", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index c5166582c4..863d2b6df4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.27", - "@budibase/pro": "1.1.26", + "@budibase/pro": "1.1.27", "@budibase/string-templates": "^1.1.27", "@budibase/types": "^1.1.27", "@koa/router": "8.0.8", From d42f3c3385df8324f6fb3b9aa69d3624a2fd861f Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 27 Jul 2022 17:15:01 +0100 Subject: [PATCH 13/15] Adding fix for issue in cloud with user password deletion causing undefined errors. --- packages/backend-core/src/middleware/authenticated.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/src/middleware/authenticated.js b/packages/backend-core/src/middleware/authenticated.js index 4e6e0b7ba2..d86af773c3 100644 --- a/packages/backend-core/src/middleware/authenticated.js +++ b/packages/backend-core/src/middleware/authenticated.js @@ -127,7 +127,7 @@ module.exports = ( } if (!user && tenantId) { user = { tenantId } - } else { + } else if (user) { delete user.password } // be explicit From 632479ee0e0d636be7f7e128a587a0665db09e40 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 16:49:29 +0000 Subject: [PATCH 14/15] v1.1.28 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 1a7fa084b5..3f4764058d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.1.27", + "version": "1.1.28", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 67b5e77e90..f3b2764483 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.1.27", + "version": "1.1.28", "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": "^1.1.27", + "@budibase/types": "^1.1.28", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6444fa6987..219d55aff0 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": "1.1.27", + "version": "1.1.28", "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": "^1.1.27", + "@budibase/string-templates": "^1.1.28", "@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 73093a4e70..c8ead15d1c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.1.27", + "version": "1.1.28", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.1.27", - "@budibase/client": "^1.1.27", - "@budibase/frontend-core": "^1.1.27", - "@budibase/string-templates": "^1.1.27", + "@budibase/bbui": "^1.1.28", + "@budibase/client": "^1.1.28", + "@budibase/frontend-core": "^1.1.28", + "@budibase/string-templates": "^1.1.28", "@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 cade0a2bef..43784fa23d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.1.27", + "version": "1.1.28", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 3b4fd87b91..4864c61c00 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.1.27", + "version": "1.1.28", "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": "^1.1.27", - "@budibase/frontend-core": "^1.1.27", - "@budibase/string-templates": "^1.1.27", + "@budibase/bbui": "^1.1.28", + "@budibase/frontend-core": "^1.1.28", + "@budibase/string-templates": "^1.1.28", "@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 1905c5e806..dfaefeaec1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.1.27", + "version": "1.1.28", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.1.27", + "@budibase/bbui": "^1.1.28", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index e81cdb4301..412df643ea 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.1.27", + "version": "1.1.28", "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": "^1.1.27", - "@budibase/client": "^1.1.27", + "@budibase/backend-core": "^1.1.28", + "@budibase/client": "^1.1.28", "@budibase/pro": "1.1.27", - "@budibase/string-templates": "^1.1.27", - "@budibase/types": "^1.1.27", + "@budibase/string-templates": "^1.1.28", + "@budibase/types": "^1.1.28", "@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 9c453cfd08..987e8dbfe6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.1.27", + "version": "1.1.28", "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 06178c8533..5fad118dc0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.1.27", + "version": "1.1.28", "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 863d2b6df4..1a31e090d4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.1.27", + "version": "1.1.28", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -35,10 +35,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.1.27", + "@budibase/backend-core": "^1.1.28", "@budibase/pro": "1.1.27", - "@budibase/string-templates": "^1.1.27", - "@budibase/types": "^1.1.27", + "@budibase/string-templates": "^1.1.28", + "@budibase/types": "^1.1.28", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 72cee3057d22d4bacbaf4c1da95f309b5eab6423 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 27 Jul 2022 16:51:16 +0000 Subject: [PATCH 15/15] Update pro version to 1.1.28 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 412df643ea..532cd2a215 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.1.28", "@budibase/client": "^1.1.28", - "@budibase/pro": "1.1.27", + "@budibase/pro": "1.1.28", "@budibase/string-templates": "^1.1.28", "@budibase/types": "^1.1.28", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1a31e090d4..51b13f540d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -36,7 +36,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.1.28", - "@budibase/pro": "1.1.27", + "@budibase/pro": "1.1.28", "@budibase/string-templates": "^1.1.28", "@budibase/types": "^1.1.28", "@koa/router": "8.0.8",