From 8364c95ccb42ab111c37b4ce99d87bd5cb38f520 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 15:58:56 +0100 Subject: [PATCH 1/9] ensure binding / value selection in automation persists --- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index 532e0ff068..7b33cc191b 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -28,7 +28,6 @@ let blockComplete let showLooping = false - $: rowControl = $automationStore.selectedAutomation.automation.rowControl $: showBindingPicker = block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW" @@ -256,7 +255,7 @@ on:change={toggleFieldControl} defaultValue="Use values" autoWidth - value={rowControl ? "Use bindings" : "Use values"} + value={block.rowControl ? "Use bindings" : "Use values"} options={["Use values", "Use bindings"]} placeholder={null} /> From b8bd09d4ce728946cafe3693e9e940dfad68af9e Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 16:02:34 +0100 Subject: [PATCH 2/9] inform user that row selection only works with sql / internal --- packages/client/manifest.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 4190d7f076..16490cace4 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -3007,6 +3007,7 @@ "illegalChildren": ["section"], "hasChildren": true, "showEmptyState": false, + "info": "Row selection is only compatible with internal or SQL tables", "settings": [ { "type": "dataProvider", @@ -3295,6 +3296,7 @@ { "section": true, "name": "Table", + "info": "Row selection is only compatible with internal or SQL tables", "settings": [ { "type": "number", From 4c77cf2516dac427c1feebb70a253fc3ad92277d Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 May 2022 16:38:16 +0100 Subject: [PATCH 3/9] parse max iterations value correctly --- packages/server/src/threads/automation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js index 4ca490affd..7c5c96fc39 100644 --- a/packages/server/src/threads/automation.js +++ b/packages/server/src/threads/automation.js @@ -219,7 +219,7 @@ class Orchestrator { } if ( index === parseInt(env.AUTOMATION_MAX_ITERATIONS) || - index === loopStep.inputs.iterations + index === parseInt(loopStep.inputs.iterations) ) { this.updateContextAndOutput(loopStepNumber, step, tempOutput, { status: AutomationErrors.MAX_ITERATIONS, From f90050fb5318d4f7517d11f18c515d8cee88b519 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 24 May 2022 09:47:28 +0100 Subject: [PATCH 4/9] disable row selection within client table --- packages/client/src/components/app/table/Table.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/table/Table.svelte b/packages/client/src/components/app/table/Table.svelte index e8dcd30929..9346b3ca59 100644 --- a/packages/client/src/components/app/table/Table.svelte +++ b/packages/client/src/components/app/table/Table.svelte @@ -39,6 +39,8 @@ dataProvider?.id, ActionTypes.SetDataProviderSorting ) + $: table = dataProvider?.datasource?.type === "table" + $: { rowSelectionStore.actions.updateSelection( $component.id, @@ -142,7 +144,7 @@ {quiet} {compact} {customRenderers} - allowSelectRows={!!allowSelectRows} + allowSelectRows={allowSelectRows && table} bind:selectedRows allowEditRows={false} allowEditColumns={false} From 4bbfae3880f5163f39170419d7eccbd75a76347b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 25 May 2022 13:02:15 +0100 Subject: [PATCH 5/9] add better logging on session invalidation --- packages/backend-core/src/security/sessions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend-core/src/security/sessions.js b/packages/backend-core/src/security/sessions.js index 40a96d06e7..4e6899c248 100644 --- a/packages/backend-core/src/security/sessions.js +++ b/packages/backend-core/src/security/sessions.js @@ -80,6 +80,7 @@ exports.getSession = async (userId, sessionId) => { return client.get(makeSessionID(userId, sessionId)) } catch (err) { // if can't get session don't error, just don't return anything + console.error(err) return null } } From 888c5621de3941814cade9c8c3f204c570bc67d7 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 12:13:30 +0000 Subject: [PATCH 6/9] v1.0.182 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index 3ff2e1befa..eded810d32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.181", + "version": "1.0.182", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a8c70049ae..22eaca2f84 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 880252b384..a65413a82e 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.0.181", + "version": "1.0.182", "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.0.181", + "@budibase/string-templates": "^1.0.182", "@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 ba3ba0a490..1e88156231 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.181", + "version": "1.0.182", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.181", - "@budibase/client": "^1.0.181", - "@budibase/frontend-core": "^1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/bbui": "^1.0.182", + "@budibase/client": "^1.0.182", + "@budibase/frontend-core": "^1.0.182", + "@budibase/string-templates": "^1.0.182", "@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 d495afe900..44eb3e190c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.181", + "version": "1.0.182", "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 698c0d6a3e..24d35b3204 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.181", + "version": "1.0.182", "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.0.181", - "@budibase/frontend-core": "^1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/bbui": "^1.0.182", + "@budibase/frontend-core": "^1.0.182", + "@budibase/string-templates": "^1.0.182", "@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 8acb09f43a..90899f052b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.181", + "@budibase/bbui": "^1.0.182", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index f35919d7bf..0ba1a1f9ed 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.181", - "@budibase/client": "^1.0.181", + "@budibase/backend-core": "^1.0.182", + "@budibase/client": "^1.0.182", "@budibase/pro": "1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/string-templates": "^1.0.182", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 750c62e48a..c630f35fcd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.181", + "version": "1.0.182", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09a8711e15..797efbc6c7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.181", + "version": "1.0.182", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.181", + "@budibase/backend-core": "^1.0.182", "@budibase/pro": "1.0.181", - "@budibase/string-templates": "^1.0.181", + "@budibase/string-templates": "^1.0.182", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 05e6592ff4adfdefa41c49f9234d277a6248c51a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 12:14:44 +0000 Subject: [PATCH 7/9] Update pro version to 1.0.182 --- 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 0ba1a1f9ed..9befcebcb7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.182", "@budibase/client": "^1.0.182", - "@budibase/pro": "1.0.181", + "@budibase/pro": "1.0.182", "@budibase/string-templates": "^1.0.182", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 797efbc6c7..b56848b402 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.182", - "@budibase/pro": "1.0.181", + "@budibase/pro": "1.0.182", "@budibase/string-templates": "^1.0.182", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", From 4fadab23491380d61a6efac4f4919129073a77df Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 15:03:59 +0000 Subject: [PATCH 8/9] v1.0.183 --- lerna.json | 2 +- packages/backend-core/package.json | 2 +- 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 | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lerna.json b/lerna.json index eded810d32..791c46039a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.182", + "version": "1.0.183", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 22eaca2f84..dddd45d33c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a65413a82e..74cb2c522d 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.0.182", + "version": "1.0.183", "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.0.182", + "@budibase/string-templates": "^1.0.183", "@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 1e88156231..ff96a05455 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.182", + "version": "1.0.183", "license": "GPL-3.0", "private": true, "scripts": { @@ -67,10 +67,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.182", - "@budibase/client": "^1.0.182", - "@budibase/frontend-core": "^1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/bbui": "^1.0.183", + "@budibase/client": "^1.0.183", + "@budibase/frontend-core": "^1.0.183", + "@budibase/string-templates": "^1.0.183", "@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 44eb3e190c..2cc49c54d7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.182", + "version": "1.0.183", "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 24d35b3204..bb27b25af7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.182", + "version": "1.0.183", "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.0.182", - "@budibase/frontend-core": "^1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/bbui": "^1.0.183", + "@budibase/frontend-core": "^1.0.183", + "@budibase/string-templates": "^1.0.183", "@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 90899f052b..21b96e4078 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.182", + "@budibase/bbui": "^1.0.183", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 9befcebcb7..56702b82d0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,10 +70,10 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.182", - "@budibase/client": "^1.0.182", + "@budibase/backend-core": "^1.0.183", + "@budibase/client": "^1.0.183", "@budibase/pro": "1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/string-templates": "^1.0.183", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c630f35fcd..ba5d0cd221 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.182", + "version": "1.0.183", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index b56848b402..86607796af 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.182", + "version": "1.0.183", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -32,9 +32,9 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.182", + "@budibase/backend-core": "^1.0.183", "@budibase/pro": "1.0.182", - "@budibase/string-templates": "^1.0.182", + "@budibase/string-templates": "^1.0.183", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "^0.3.0", From 5449e49adc1b499e3119b1d9acc4ad6549a19677 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 25 May 2022 15:06:00 +0000 Subject: [PATCH 9/9] Update pro version to 1.0.183 --- 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 56702b82d0..6242ce2bd1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -72,7 +72,7 @@ "@apidevtools/swagger-parser": "^10.0.3", "@budibase/backend-core": "^1.0.183", "@budibase/client": "^1.0.183", - "@budibase/pro": "1.0.182", + "@budibase/pro": "1.0.183", "@budibase/string-templates": "^1.0.183", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 86607796af..4d6a01727a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -33,7 +33,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.183", - "@budibase/pro": "1.0.182", + "@budibase/pro": "1.0.183", "@budibase/string-templates": "^1.0.183", "@koa/router": "^8.0.0", "@sentry/node": "6.17.7",