From 98bffe1971b8ce17fd3eae666ede54e997fc2424 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 28 Apr 2022 13:18:10 +0100
Subject: [PATCH 01/49] Fix for #5633 - making sure when timestamp is null
 (creating row) date picker can be used.

---
 .../src/components/backend/DataTable/RowFieldControl.svelte    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index ee01ef7467..7a9e03976b 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -20,6 +20,9 @@
   export let readonly
 
   const resolveTimeStamp = timestamp => {
+    if (!timestamp) {
+      return null
+    }
     let maskedDate = new Date(`0-${timestamp}`)
     if (maskedDate instanceof Date && !isNaN(maskedDate.getTime())) {
       return maskedDate

From 7cf908785de1c81e9f01fb27f3e8888eb4152a4b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 28 Apr 2022 14:18:27 +0100
Subject: [PATCH 02/49] use excluded quotas tenants again

---
 charts/budibase/templates/app-service-deployment.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index c80cfa2ecc..8763274c50 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -112,6 +112,8 @@ spec:
           value: {{ .Values.globals.google.secret | quote }}
         - name: AUTOMATION_MAX_ITERATIONS
           value: {{ .Values.globals.automationMaxIterations | quote }}
+        - name: EXCLUDE_QUOTAS_TENANTS
+          value: {{ .Values.globals.excludeQuotasTenants | quote }}
 
         image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always

From 51c7c6ababd500343f02b401baaaaa4c3709055c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 28 Apr 2022 13:29:28 +0000
Subject: [PATCH 03/49] v1.0.130

---
 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 f6accc9b28..bf2853738e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.129",
+  "version": "1.0.130",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 27eba06de1..3e98ff3317 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "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 84d242f30a..cb5328d5e6 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.129",
+  "version": "1.0.130",
   "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.129",
+    "@budibase/string-templates": "^1.0.130",
     "@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 351b56c733..82cbfc808f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.129",
-    "@budibase/client": "^1.0.129",
-    "@budibase/frontend-core": "^1.0.129",
-    "@budibase/string-templates": "^1.0.129",
+    "@budibase/bbui": "^1.0.130",
+    "@budibase/client": "^1.0.130",
+    "@budibase/frontend-core": "^1.0.130",
+    "@budibase/string-templates": "^1.0.130",
     "@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 5346d54929..c19d1384c6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "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 8afda74bc5..28f29d8ecd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "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.129",
-    "@budibase/frontend-core": "^1.0.129",
-    "@budibase/string-templates": "^1.0.129",
+    "@budibase/bbui": "^1.0.130",
+    "@budibase/frontend-core": "^1.0.130",
+    "@budibase/string-templates": "^1.0.130",
     "@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 57645cc748..4dd71f62fa 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "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.129",
+    "@budibase/bbui": "^1.0.130",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index d1f426fafd..f6234c5949 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.129",
+  "version": "1.0.130",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.129",
-    "@budibase/client": "^1.0.129",
+    "@budibase/backend-core": "^1.0.130",
+    "@budibase/client": "^1.0.130",
     "@budibase/pro": "1.0.129",
-    "@budibase/string-templates": "^1.0.129",
+    "@budibase/string-templates": "^1.0.130",
     "@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 d8ef0d70fe..0a23cef871 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.129",
+  "version": "1.0.130",
   "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 cc1764736e..e934919792 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.129",
+  "version": "1.0.130",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.129",
+    "@budibase/backend-core": "^1.0.130",
     "@budibase/pro": "1.0.129",
-    "@budibase/string-templates": "^1.0.129",
+    "@budibase/string-templates": "^1.0.130",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 010a2dff54ab8568a83468bbcf204b70f7dcbb0a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 28 Apr 2022 13:31:06 +0000
Subject: [PATCH 04/49] Update pro version to 1.0.130

---
 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 f6234c5949..b1806a1f19 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.130",
     "@budibase/client": "^1.0.130",
-    "@budibase/pro": "1.0.129",
+    "@budibase/pro": "1.0.130",
     "@budibase/string-templates": "^1.0.130",
     "@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 e934919792..d65446d8e1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.130",
-    "@budibase/pro": "1.0.129",
+    "@budibase/pro": "1.0.130",
     "@budibase/string-templates": "^1.0.130",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From f88504f4b0889b0cad35afddc6fedb4ad954faf9 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 28 Apr 2022 14:16:39 +0000
Subject: [PATCH 05/49] v1.0.131

---
 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 bf2853738e..5d96b1d3bd 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.130",
+  "version": "1.0.131",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 3e98ff3317..754df07fb7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "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 cb5328d5e6..cba9fdbd6e 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.130",
+  "version": "1.0.131",
   "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.130",
+    "@budibase/string-templates": "^1.0.131",
     "@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 82cbfc808f..d22668bb0e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.130",
-    "@budibase/client": "^1.0.130",
-    "@budibase/frontend-core": "^1.0.130",
-    "@budibase/string-templates": "^1.0.130",
+    "@budibase/bbui": "^1.0.131",
+    "@budibase/client": "^1.0.131",
+    "@budibase/frontend-core": "^1.0.131",
+    "@budibase/string-templates": "^1.0.131",
     "@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 c19d1384c6..06f4a8dffa 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "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 28f29d8ecd..67ee8e4b29 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "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.130",
-    "@budibase/frontend-core": "^1.0.130",
-    "@budibase/string-templates": "^1.0.130",
+    "@budibase/bbui": "^1.0.131",
+    "@budibase/frontend-core": "^1.0.131",
+    "@budibase/string-templates": "^1.0.131",
     "@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 4dd71f62fa..d5844a93b3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "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.130",
+    "@budibase/bbui": "^1.0.131",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index b1806a1f19..03fe2db18a 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.130",
+  "version": "1.0.131",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.130",
-    "@budibase/client": "^1.0.130",
+    "@budibase/backend-core": "^1.0.131",
+    "@budibase/client": "^1.0.131",
     "@budibase/pro": "1.0.130",
-    "@budibase/string-templates": "^1.0.130",
+    "@budibase/string-templates": "^1.0.131",
     "@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 0a23cef871..449d300ecf 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.130",
+  "version": "1.0.131",
   "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 d65446d8e1..8955d9f6da 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.130",
+  "version": "1.0.131",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.130",
+    "@budibase/backend-core": "^1.0.131",
     "@budibase/pro": "1.0.130",
-    "@budibase/string-templates": "^1.0.130",
+    "@budibase/string-templates": "^1.0.131",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From e07a590116482e6bc0d6a67e953358106188fe4e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 28 Apr 2022 14:18:21 +0000
Subject: [PATCH 06/49] Update pro version to 1.0.131

---
 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 03fe2db18a..531a823b42 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.131",
     "@budibase/client": "^1.0.131",
-    "@budibase/pro": "1.0.130",
+    "@budibase/pro": "1.0.131",
     "@budibase/string-templates": "^1.0.131",
     "@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 8955d9f6da..3bc6441327 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.131",
-    "@budibase/pro": "1.0.130",
+    "@budibase/pro": "1.0.131",
     "@budibase/string-templates": "^1.0.131",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 45439ac3aa81e48294244962fd46fcbeb17186e3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 28 Apr 2022 16:35:38 +0100
Subject: [PATCH 07/49] Deregister field validation when unmounting form fields

---
 .../client/src/components/app/forms/Field.svelte     |  6 +++++-
 .../client/src/components/app/forms/InnerForm.svelte | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 3ebfc5084f..b267f6caff 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -44,7 +44,6 @@
     fieldApi = value?.fieldApi
     fieldSchema = value?.fieldSchema
   })
-  onDestroy(() => unsubscribe?.())
 
   // Determine label class from position
   $: labelClass = labelPos === "above" ? "" : `spectrum-FieldLabel--${labelPos}`
@@ -52,6 +51,11 @@
   const updateLabel = e => {
     builderStore.actions.updateProp("label", e.target.textContent)
   }
+
+  onDestroy(() => {
+    fieldApi?.deregister()
+    unsubscribe?.()
+  })
 </script>
 
 <FieldGroupFallback>
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 99dcbf4d5e..752bc9a2eb 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -329,6 +329,17 @@
       }
     }
 
+    // We don't want to actually remove the field state when deregistering, just
+    // remove any errors and validation
+    const deregister = () => {
+      const fieldInfo = getField(field)
+      fieldInfo.update(state => {
+        state.fieldState.validator = null
+        state.fieldState.error = null
+        return state
+      })
+    }
+
     // Updates the disabled state of a certain field
     const setDisabled = fieldDisabled => {
       const fieldInfo = getField(field)
@@ -348,6 +359,7 @@
       reset,
       updateValidation,
       setDisabled,
+      deregister,
       validate: () => {
         // Validate the field by force setting the same value again
         const { fieldState } = get(getField(field))

From 746362c4effb519fea59f514b168acfd46c91a68 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 29 Apr 2022 11:37:40 +0100
Subject: [PATCH 08/49] fix binding panel in automate

---
 .../SetupPanel/AutomationBlockSetup.svelte    |  1 +
 .../automation/SetupPanel/RowSelector.svelte  | 42 ++++++-------------
 .../SetupPanel/RowSelectorTypes.svelte        |  5 ++-
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 4333e4a2e5..68afc04886 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -265,6 +265,7 @@
           value={inputData[key]}
           on:change={e => onChange(e, key)}
           {bindings}
+          {isTestModal}
         />
       {:else if value.customType === "webhookUrl"}
         <WebhookDisplay
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index f91cd62bed..c72acc252a 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -4,14 +4,15 @@
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
   import { createEventDispatcher } from "svelte"
-  import { automationStore } from "builderStore"
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
+  import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte"
 
   const dispatch = createEventDispatcher()
 
   export let value
   export let bindings
   export let block
+  export let isTestModal
 
   let table
   let schemaFields
@@ -103,35 +104,18 @@
     {#each schemaFields as [field, schema]}
       {#if !schema.autocolumn}
         {#if schema.type !== "attachment"}
-          {#if $automationStore.selectedAutomation.automation.testData}
-            {#if !rowControl}
-              <RowSelectorTypes
-                {field}
-                {schema}
-                {bindings}
-                {value}
-                {onChange}
-              />
-            {:else}
-              <DrawerBindableInput
-                placeholder={placeholders[schema.type]}
-                panel={AutomationBindingPanel}
-                value={Array.isArray(value[field])
-                  ? value[field].join(" ")
-                  : value[field]}
-                on:change={e => onChange(e, field, schema.type)}
-                label={field}
-                type="string"
-                {bindings}
-                fillWidth={true}
-                allowJS={true}
-                updateOnChange={false}
-              />
-            {/if}
-          {:else if !rowControl}
-            <RowSelectorTypes {field} {schema} {bindings} {value} {onChange} />
+          {#if !rowControl}
+            <RowSelectorTypes
+              {isTestModal}
+              {field}
+              {schema}
+              {bindings}
+              {value}
+              {onChange}
+            />
           {:else}
-            <DrawerBindableInput
+            <svelte:component
+              this={isTestModal ? ModalBindableInput : DrawerBindableInput}
               placeholder={placeholders[schema.type]}
               panel={AutomationBindingPanel}
               value={Array.isArray(value[field])
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index f66df3a9b1..f3abad6e25 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -8,6 +8,7 @@
   } from "@budibase/bbui"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
+  import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
 
   export let onChange
@@ -15,6 +16,7 @@
   export let schema
   export let value
   export let bindings
+  export let isTestModal
 
   function schemaHasOptions(schema) {
     return !!schema.constraints?.inclusion?.length
@@ -51,7 +53,8 @@
 {:else if schema.type === "link"}
   <LinkedRowSelector bind:linkedRows={value[field]} {schema} />
 {:else if schema.type === "string" || schema.type === "number"}
-  <DrawerBindableInput
+  <svelte:component
+    this={isTestModal ? ModalBindableInput : DrawerBindableInput}
     panel={AutomationBindingPanel}
     value={value[field]}
     on:change={e => onChange(e, field)}

From ed8e4b3d77d8fbbf0c3f378ec26759c02717a77c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 29 Apr 2022 13:31:30 +0000
Subject: [PATCH 09/49] v1.0.132

---
 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 5d96b1d3bd..a2af84b074 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.131",
+  "version": "1.0.132",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 754df07fb7..a5896e0bf2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "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 cba9fdbd6e..ff00a11f44 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.131",
+  "version": "1.0.132",
   "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.131",
+    "@budibase/string-templates": "^1.0.132",
     "@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 d22668bb0e..4e72a2857c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.131",
-    "@budibase/client": "^1.0.131",
-    "@budibase/frontend-core": "^1.0.131",
-    "@budibase/string-templates": "^1.0.131",
+    "@budibase/bbui": "^1.0.132",
+    "@budibase/client": "^1.0.132",
+    "@budibase/frontend-core": "^1.0.132",
+    "@budibase/string-templates": "^1.0.132",
     "@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 06f4a8dffa..1ef25ddf77 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "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 67ee8e4b29..59e0b7afa7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "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.131",
-    "@budibase/frontend-core": "^1.0.131",
-    "@budibase/string-templates": "^1.0.131",
+    "@budibase/bbui": "^1.0.132",
+    "@budibase/frontend-core": "^1.0.132",
+    "@budibase/string-templates": "^1.0.132",
     "@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 d5844a93b3..4f754d490f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "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.131",
+    "@budibase/bbui": "^1.0.132",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 531a823b42..daff649503 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.131",
+  "version": "1.0.132",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.131",
-    "@budibase/client": "^1.0.131",
+    "@budibase/backend-core": "^1.0.132",
+    "@budibase/client": "^1.0.132",
     "@budibase/pro": "1.0.131",
-    "@budibase/string-templates": "^1.0.131",
+    "@budibase/string-templates": "^1.0.132",
     "@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 449d300ecf..257f7f7ed8 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "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 3bc6441327..a8d03105a3 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.131",
+  "version": "1.0.132",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.131",
+    "@budibase/backend-core": "^1.0.132",
     "@budibase/pro": "1.0.131",
-    "@budibase/string-templates": "^1.0.131",
+    "@budibase/string-templates": "^1.0.132",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From d9fdb884e378174056621f24b1f755c8ee5f948f Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 29 Apr 2022 13:32:47 +0000
Subject: [PATCH 10/49] Update pro version to 1.0.132

---
 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 daff649503..fffaffea10 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.132",
     "@budibase/client": "^1.0.132",
-    "@budibase/pro": "1.0.131",
+    "@budibase/pro": "1.0.132",
     "@budibase/string-templates": "^1.0.132",
     "@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 a8d03105a3..05b0e2cf40 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.132",
-    "@budibase/pro": "1.0.131",
+    "@budibase/pro": "1.0.132",
     "@budibase/string-templates": "^1.0.132",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 9ea6199ebacf9268d6f5cde895919141e4247af0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 29 Apr 2022 16:22:11 +0100
Subject: [PATCH 11/49] Fixing issue #5594 - allowing use of double underscores
 in table names for SQL.

---
 packages/server/src/integrations/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index 326b213bc7..16cc6d387e 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -85,9 +85,9 @@ export function breakExternalTableId(tableId: string | undefined) {
     return {}
   }
   const parts = tableId.split(DOUBLE_SEPARATOR)
-  let tableName = parts.pop()
+  let datasourceId = parts.shift()
   // if they need joined
-  let datasourceId = parts.join(DOUBLE_SEPARATOR)
+  let tableName = parts.join(DOUBLE_SEPARATOR)
   return { datasourceId, tableName }
 }
 

From 6b4377c93271025df71533173fa23827f9fd9f0e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 29 Apr 2022 16:47:43 +0100
Subject: [PATCH 12/49] Fix for #5612 - stop some formats of string being
 in-correctly parsed as dates by MySQL - disable type coercion for data source
 plus mysql tables (knex converts).

---
 packages/server/src/integrations/mysql.ts | 27 ++++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts
index 065a1b2333..c2ef44c1bd 100644
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@@ -101,7 +101,7 @@ module MySQLModule {
       }
       // if not a number, see if it is a date - important to do in this order as any
       // integer will be considered a valid date
-      else if (dayjs(binding).isValid()) {
+      else if (/^\d/.test(binding) && dayjs(binding).isValid()) {
         bindings[i] = dayjs(binding).toDate()
       }
     }
@@ -151,20 +151,24 @@ module MySQLModule {
 
     async internalQuery(
       query: SqlQuery,
-      connect: boolean = true
+      opts: { connect?: boolean; disableCoercion?: boolean } = {
+        connect: true,
+        disableCoercion: false,
+      }
     ): Promise<any[] | any> {
       try {
-        if (connect) {
+        if (opts?.connect) {
           await this.connect()
         }
+        const baseBindings = query.bindings || []
+        const bindings = opts?.disableCoercion
+          ? baseBindings
+          : bindingTypeCoerce(baseBindings)
         // Node MySQL is callback based, so we must wrap our call in a promise
-        const response = await this.client.query(
-          query.sql,
-          bindingTypeCoerce(query.bindings || [])
-        )
+        const response = await this.client.query(query.sql, bindings)
         return response[0]
       } finally {
-        if (connect) {
+        if (opts?.connect) {
           await this.disconnect()
         }
       }
@@ -179,7 +183,7 @@ module MySQLModule {
         // get the tables first
         const tablesResp = await this.internalQuery(
           { sql: "SHOW TABLES;" },
-          false
+          { connect: false }
         )
         const tableNames = tablesResp.map(
           (obj: any) =>
@@ -191,7 +195,7 @@ module MySQLModule {
           const schema: TableSchema = {}
           const descResp = await this.internalQuery(
             { sql: `DESCRIBE \`${tableName}\`;` },
-            false
+            { connect: false }
           )
           for (let column of descResp) {
             const columnName = column.Field
@@ -254,7 +258,8 @@ module MySQLModule {
     async query(json: QueryJson) {
       await this.connect()
       try {
-        const queryFn = (query: any) => this.internalQuery(query, false)
+        const queryFn = (query: any) =>
+          this.internalQuery(query, { connect: false, disableCoercion: true })
         return await this.queryWithReturning(json, queryFn)
       } finally {
         await this.disconnect()

From 31c45daacf4ad3fe152307e2591bc347a934639f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Sun, 1 May 2022 12:53:39 +0100
Subject: [PATCH 13/49] update google button to match their branding guidelines

---
 .../_components/GoogleButton.svelte           |  37 +++--
 .../_components/GoogleSignIn.svelte           | 145 ++++++++++++++++++
 2 files changed, 166 insertions(+), 16 deletions(-)
 create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
index 642aa548f2..4622bd7b19 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { ActionButton } from "@budibase/bbui"
   import GoogleLogo from "assets/google-logo.png"
   import { store } from "builderStore"
   import { auth } from "stores/portal"
@@ -10,7 +9,7 @@
   $: tenantId = $auth.tenantId
 </script>
 
-<ActionButton
+<button
   on:click={async () => {
     let ds = datasource
     if (!ds) {
@@ -22,26 +21,32 @@
     )
   }}
 >
-  <div class="inner">
-    <img src={GoogleLogo} alt="google icon" />
-    <p>Sign in with Google</p>
-  </div>
-</ActionButton>
+  <img src={GoogleLogo} alt="google icon" />
+  <p>Sign in with Google</p>
+</button>
 
 <style>
-  .inner {
+  button {
+    width: 195px;
+    height: 40px;
+    font-size: 14px;
     display: flex;
     flex-direction: row;
     align-items: center;
-    justify-content: center;
-    padding-top: var(--spacing-xs);
-    padding-bottom: var(--spacing-xs);
+    font-weight: 500;
+    background: #4285f4;
+    color: #ffffff;
+    border: none;
+    cursor: pointer;
+    padding: 2px;
+    border-radius: 2px;
   }
-  .inner img {
+
+  img {
+    border-radius: 2px;
     width: 18px;
-    margin: 3px 10px 3px 3px;
-  }
-  .inner p {
-    margin: 0;
+    margin-right: 11px;
+    background: #ffffff;
+    padding: 10px;
   }
 </style>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte
new file mode 100644
index 0000000000..c30e8fc2ee
--- /dev/null
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte
@@ -0,0 +1,145 @@
+<script>
+  export let width = 100
+  export let height = 100
+</script>
+
+<svg
+  {width}
+  {height}
+  viewBox="0 0 46 46"
+  version="1.1"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+>
+  <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+  <title>btn_google_dark_normal_ios</title>
+  <desc>Created with Sketch.</desc>
+  <defs>
+    <filter
+      x="-50%"
+      y="-50%"
+      width="200%"
+      height="200%"
+      filterUnits="objectBoundingBox"
+      id="filter-1"
+    >
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1" />
+      <feGaussianBlur
+        stdDeviation="0.5"
+        in="shadowOffsetOuter1"
+        result="shadowBlurOuter1"
+      />
+      <feColorMatrix
+        values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.168 0"
+        in="shadowBlurOuter1"
+        type="matrix"
+        result="shadowMatrixOuter1"
+      />
+      <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter2" />
+      <feGaussianBlur
+        stdDeviation="0.5"
+        in="shadowOffsetOuter2"
+        result="shadowBlurOuter2"
+      />
+      <feColorMatrix
+        values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.084 0"
+        in="shadowBlurOuter2"
+        type="matrix"
+        result="shadowMatrixOuter2"
+      />
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1" />
+        <feMergeNode in="shadowMatrixOuter2" />
+        <feMergeNode in="SourceGraphic" />
+      </feMerge>
+    </filter>
+    <rect id="path-2" x="0" y="0" width="40" height="40" rx="2" />
+    <rect id="path-3" x="5" y="5" width="38" height="38" rx="1" />
+  </defs>
+  <g
+    id="Google-Button"
+    stroke="none"
+    stroke-width="1"
+    fill="none"
+    fill-rule="evenodd"
+    sketch:type="MSPage"
+  >
+    <g
+      id="9-PATCH"
+      sketch:type="MSArtboardGroup"
+      transform="translate(-608.000000, -219.000000)"
+    />
+    <g
+      id="btn_google_dark_normal"
+      sketch:type="MSArtboardGroup"
+      transform="translate(-1.000000, -1.000000)"
+    >
+      <g
+        id="button"
+        sketch:type="MSLayerGroup"
+        transform="translate(4.000000, 4.000000)"
+        filter="url(#filter-1)"
+      >
+        <g id="button-bg">
+          <use
+            fill="#4285F4"
+            fill-rule="evenodd"
+            sketch:type="MSShapeGroup"
+            xlink:href="#path-2"
+          />
+          <use fill="none" xlink:href="#path-2" />
+          <use fill="none" xlink:href="#path-2" />
+          <use fill="none" xlink:href="#path-2" />
+        </g>
+      </g>
+      <g id="button-bg-copy">
+        <use
+          fill="#FFFFFF"
+          fill-rule="evenodd"
+          sketch:type="MSShapeGroup"
+          xlink:href="#path-3"
+        />
+        <use fill="none" xlink:href="#path-3" />
+        <use fill="none" xlink:href="#path-3" />
+        <use fill="none" xlink:href="#path-3" />
+      </g>
+      <g
+        id="logo_googleg_48dp"
+        sketch:type="MSLayerGroup"
+        transform="translate(15.000000, 15.000000)"
+      >
+        <path
+          d="M17.64,9.20454545 C17.64,8.56636364 17.5827273,7.95272727 17.4763636,7.36363636 L9,7.36363636 L9,10.845 L13.8436364,10.845 C13.635,11.97 13.0009091,12.9231818 12.0477273,13.5613636 L12.0477273,15.8195455 L14.9563636,15.8195455 C16.6581818,14.2527273 17.64,11.9454545 17.64,9.20454545 L17.64,9.20454545 Z"
+          id="Shape"
+          fill="#4285F4"
+          sketch:type="MSShapeGroup"
+        />
+        <path
+          d="M9,18 C11.43,18 13.4672727,17.1940909 14.9563636,15.8195455 L12.0477273,13.5613636 C11.2418182,14.1013636 10.2109091,14.4204545 9,14.4204545 C6.65590909,14.4204545 4.67181818,12.8372727 3.96409091,10.71 L0.957272727,10.71 L0.957272727,13.0418182 C2.43818182,15.9831818 5.48181818,18 9,18 L9,18 Z"
+          id="Shape"
+          fill="#34A853"
+          sketch:type="MSShapeGroup"
+        />
+        <path
+          d="M3.96409091,10.71 C3.78409091,10.17 3.68181818,9.59318182 3.68181818,9 C3.68181818,8.40681818 3.78409091,7.83 3.96409091,7.29 L3.96409091,4.95818182 L0.957272727,4.95818182 C0.347727273,6.17318182 0,7.54772727 0,9 C0,10.4522727 0.347727273,11.8268182 0.957272727,13.0418182 L3.96409091,10.71 L3.96409091,10.71 Z"
+          id="Shape"
+          fill="#FBBC05"
+          sketch:type="MSShapeGroup"
+        />
+        <path
+          d="M9,3.57954545 C10.3213636,3.57954545 11.5077273,4.03363636 12.4404545,4.92545455 L15.0218182,2.34409091 C13.4631818,0.891818182 11.4259091,0 9,0 C5.48181818,0 2.43818182,2.01681818 0.957272727,4.95818182 L3.96409091,7.29 C4.67181818,5.16272727 6.65590909,3.57954545 9,3.57954545 L9,3.57954545 Z"
+          id="Shape"
+          fill="#EA4335"
+          sketch:type="MSShapeGroup"
+        />
+        <path
+          d="M0,0 L18,0 L18,18 L0,18 L0,0 Z"
+          id="Shape"
+          sketch:type="MSShapeGroup"
+        />
+      </g>
+      <g id="handles_square" sketch:type="MSLayerGroup" />
+    </g>
+  </g>
+</svg>

From d4229129434f12e31f2e8dd211e0164fc408e5e8 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 2 May 2022 08:48:23 +0000
Subject: [PATCH 14/49] v1.0.133

---
 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 a2af84b074..7c72b2e228 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.132",
+  "version": "1.0.133",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a5896e0bf2..e544a10a3e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "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 ff00a11f44..72daac2bc3 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.132",
+  "version": "1.0.133",
   "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.132",
+    "@budibase/string-templates": "^1.0.133",
     "@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 4e72a2857c..83d3c50c2f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.132",
-    "@budibase/client": "^1.0.132",
-    "@budibase/frontend-core": "^1.0.132",
-    "@budibase/string-templates": "^1.0.132",
+    "@budibase/bbui": "^1.0.133",
+    "@budibase/client": "^1.0.133",
+    "@budibase/frontend-core": "^1.0.133",
+    "@budibase/string-templates": "^1.0.133",
     "@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 1ef25ddf77..a54e2a5363 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "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 59e0b7afa7..5477758e7f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "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.132",
-    "@budibase/frontend-core": "^1.0.132",
-    "@budibase/string-templates": "^1.0.132",
+    "@budibase/bbui": "^1.0.133",
+    "@budibase/frontend-core": "^1.0.133",
+    "@budibase/string-templates": "^1.0.133",
     "@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 4f754d490f..3fe7b7da3e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "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.132",
+    "@budibase/bbui": "^1.0.133",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index fffaffea10..bd6d85ab93 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.132",
+  "version": "1.0.133",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.132",
-    "@budibase/client": "^1.0.132",
+    "@budibase/backend-core": "^1.0.133",
+    "@budibase/client": "^1.0.133",
     "@budibase/pro": "1.0.132",
-    "@budibase/string-templates": "^1.0.132",
+    "@budibase/string-templates": "^1.0.133",
     "@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 257f7f7ed8..e9e0d85a04 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.132",
+  "version": "1.0.133",
   "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 05b0e2cf40..4813992b0d 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.132",
+  "version": "1.0.133",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.132",
+    "@budibase/backend-core": "^1.0.133",
     "@budibase/pro": "1.0.132",
-    "@budibase/string-templates": "^1.0.132",
+    "@budibase/string-templates": "^1.0.133",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 2d953b2dd85fd7ab426992a1f3a6dc0386bfe35d Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 2 May 2022 08:49:41 +0000
Subject: [PATCH 15/49] Update pro version to 1.0.133

---
 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 bd6d85ab93..c69daeaf39 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.133",
     "@budibase/client": "^1.0.133",
-    "@budibase/pro": "1.0.132",
+    "@budibase/pro": "1.0.133",
     "@budibase/string-templates": "^1.0.133",
     "@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 4813992b0d..94173e2e9a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.133",
-    "@budibase/pro": "1.0.132",
+    "@budibase/pro": "1.0.133",
     "@budibase/string-templates": "^1.0.133",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From b3fb74de0a7834124368764311beceb12f13b367 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 3 May 2022 10:06:54 +0100
Subject: [PATCH 16/49] record cypress runs in smoke test

---
 .github/workflows/smoke_test.yaml | 2 ++
 packages/builder/package.json     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
index b26d0386fc..927d860957 100644
--- a/.github/workflows/smoke_test.yaml
+++ b/.github/workflows/smoke_test.yaml
@@ -33,6 +33,8 @@ jobs:
         with:
           install: false
           command: yarn test:e2e:ci
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
       
       # TODO: upload recordings to s3
       # - name: Configure AWS Credentials
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 83d3c50c2f..037c3b9791 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -13,7 +13,7 @@
     "cy:setup:ci": "node ./cypress/setup.js",
     "cy:open": "cypress open",
     "cy:run": "cypress run",
-    "cy:run:ci": "xvfb-run cypress run --headed --browser chrome",
+    "cy:run:ci": "xvfb-run cypress run --headed --browser chrome --record",
     "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run",
     "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci",
     "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open",

From c2b3a7e0c85ca970cac0b6da2f46a499c8bfb4bf Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 09:32:48 +0000
Subject: [PATCH 17/49] v1.0.134

---
 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 7c72b2e228..82ef5dc786 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.133",
+  "version": "1.0.134",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e544a10a3e..09fc5cf002 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "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 72daac2bc3..bceefa032d 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.133",
+  "version": "1.0.134",
   "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.133",
+    "@budibase/string-templates": "^1.0.134",
     "@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 037c3b9791..a41f46c8a5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.133",
-    "@budibase/client": "^1.0.133",
-    "@budibase/frontend-core": "^1.0.133",
-    "@budibase/string-templates": "^1.0.133",
+    "@budibase/bbui": "^1.0.134",
+    "@budibase/client": "^1.0.134",
+    "@budibase/frontend-core": "^1.0.134",
+    "@budibase/string-templates": "^1.0.134",
     "@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 a54e2a5363..7d14c93ade 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "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 5477758e7f..743bd52cec 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "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.133",
-    "@budibase/frontend-core": "^1.0.133",
-    "@budibase/string-templates": "^1.0.133",
+    "@budibase/bbui": "^1.0.134",
+    "@budibase/frontend-core": "^1.0.134",
+    "@budibase/string-templates": "^1.0.134",
     "@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 3fe7b7da3e..972443e23c 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "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.133",
+    "@budibase/bbui": "^1.0.134",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index c69daeaf39..a099628690 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.133",
+  "version": "1.0.134",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.133",
-    "@budibase/client": "^1.0.133",
+    "@budibase/backend-core": "^1.0.134",
+    "@budibase/client": "^1.0.134",
     "@budibase/pro": "1.0.133",
-    "@budibase/string-templates": "^1.0.133",
+    "@budibase/string-templates": "^1.0.134",
     "@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 e9e0d85a04..8523ccbe1a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "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 94173e2e9a..270023f05f 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.133",
+  "version": "1.0.134",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.133",
+    "@budibase/backend-core": "^1.0.134",
     "@budibase/pro": "1.0.133",
-    "@budibase/string-templates": "^1.0.133",
+    "@budibase/string-templates": "^1.0.134",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From b27a5c92f894b5026adc029b0a27596c589c22db Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 09:34:07 +0000
Subject: [PATCH 18/49] Update pro version to 1.0.134

---
 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 a099628690..a621dc3453 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.134",
     "@budibase/client": "^1.0.134",
-    "@budibase/pro": "1.0.133",
+    "@budibase/pro": "1.0.134",
     "@budibase/string-templates": "^1.0.134",
     "@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 270023f05f..fd243cba90 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.134",
-    "@budibase/pro": "1.0.133",
+    "@budibase/pro": "1.0.134",
     "@budibase/string-templates": "^1.0.134",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From d090f2a8aa8efc8907f4ff5524def55c9251277b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 May 2022 14:11:06 +0100
Subject: [PATCH 19/49] Fix for #5553 - when importing for SQL databases
 attempt to manage date and time only column times, handle these when
 displaying in tables and when filtering.

---
 .../bbui/src/Table/DateTimeRenderer.svelte     | 13 +++++++++----
 .../backend/DataTable/RowFieldControl.svelte   |  9 +++++++--
 .../FilterEditor/FilterDrawer.svelte           | 11 ++++++++++-
 .../app/dynamic-filter/FilterModal.svelte      | 11 ++++++++++-
 .../src/integrations/microsoftSqlServer.ts     |  4 +---
 packages/server/src/integrations/mysql.ts      |  3 ++-
 packages/server/src/integrations/oracle.ts     |  6 +++---
 packages/server/src/integrations/postgres.ts   |  3 +--
 packages/server/src/integrations/utils.ts      | 17 ++++++++++++++---
 packages/server/yarn.lock                      | 18 +++++++++---------
 packages/worker/yarn.lock                      | 18 +++++++++---------
 11 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/packages/bbui/src/Table/DateTimeRenderer.svelte b/packages/bbui/src/Table/DateTimeRenderer.svelte
index 5d856968e7..f4b0821069 100644
--- a/packages/bbui/src/Table/DateTimeRenderer.svelte
+++ b/packages/bbui/src/Table/DateTimeRenderer.svelte
@@ -2,17 +2,22 @@
   import dayjs from "dayjs"
 
   export let value
+  export let schema
 
   // adding the 0- will turn a string like 00:00:00 into a valid ISO
   // date, but will make actual ISO dates invalid
   $: time = new Date(`0-${value}`)
-  $: isTime = !isNaN(time)
+  $: isTimeOnly = !isNaN(time) || schema?.timeOnly
+  $: isDateOnly = schema?.dateOnly
+  $: format = isTimeOnly
+    ? "HH:mm:ss"
+    : isDateOnly
+    ? "MMMM D YYYY"
+    : "MMMM D YYYY, HH:mm"
 </script>
 
 <div>
-  {dayjs(isTime ? time : value).format(
-    isTime ? "HH:mm:ss" : "MMMM D YYYY, HH:mm"
-  )}
+  {dayjs(isTimeOnly ? time : value).format(format)}
 </div>
 
 <style>
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 7a9e03976b..2286ae82aa 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -37,7 +37,7 @@
   $: label = meta.name ? capitalise(meta.name) : ""
 
   const timeStamp = resolveTimeStamp(value)
-  const isTimeStamp = !!timeStamp
+  const isTimeStamp = !!timeStamp || meta?.timeOnly
 </script>
 
 {#if type === "options" && meta.constraints.inclusion.length !== 0}
@@ -49,7 +49,12 @@
     sort
   />
 {:else if type === "datetime"}
-  <DatePicker {label} timeOnly={isTimeStamp} bind:value />
+  <DatePicker
+    {label}
+    timeOnly={isTimeStamp}
+    enableTime={!meta?.dateOnly}
+    bind:value
+  />
 {:else if type === "attachment"}
   <Dropzone {label} bind:value />
 {:else if type === "boolean"}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index 1441d3834b..95a5f54e32 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -49,6 +49,10 @@
     filters = [...filters, duplicate]
   }
 
+  const getSchema = filter => {
+    return schemaFields.find(field => field.name === filter.field)
+  }
+
   const onFieldChange = (expression, field) => {
     // Update the field type
     expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
@@ -150,7 +154,12 @@
                 bind:value={filter.value}
               />
             {:else if filter.type === "datetime"}
-              <DatePicker disabled={filter.noValue} bind:value={filter.value} />
+              <DatePicker
+                disabled={filter.noValue}
+                enableTime={!getSchema(filter).dateOnly}
+                timeOnly={getSchema(filter).timeOnly}
+                bind:value={filter.value}
+              />
             {:else}
               <DrawerBindableInput disabled />
             {/if}
diff --git a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
index 54ad1f3a80..b8815279dd 100644
--- a/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
+++ b/packages/client/src/components/app/dynamic-filter/FilterModal.svelte
@@ -88,6 +88,10 @@
     const schema = schemaFields.find(x => x.name === field)
     return schema?.constraints?.inclusion || []
   }
+
+  const getSchema = filter => {
+    return schemaFields.find(field => field.name === filter.field)
+  }
 </script>
 
 <div class="container" class:mobile={$context.device.mobile}>
@@ -134,7 +138,12 @@
               bind:value={filter.value}
             />
           {:else if filter.type === "datetime"}
-            <DatePicker disabled={filter.noValue} bind:value={filter.value} />
+            <DatePicker
+              disabled={filter.noValue}
+              enableTime={!getSchema(filter).dateOnly}
+              timeOnly={getSchema(filter).timeOnly}
+              bind:value={filter.value}
+            />
           {:else}
             <Input disabled />
           {/if}
diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index 1b37b5df9a..a7b9906481 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -242,12 +242,10 @@ module MSSQLModule {
           if (typeof name !== "string") {
             continue
           }
-          const type: string = convertSqlType(def.DATA_TYPE)
-
           schema[name] = {
             autocolumn: !!autoColumns.find((col: string) => col === name),
             name: name,
-            type,
+            ...convertSqlType(def.DATA_TYPE),
           }
         }
         tables[tableName] = {
diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts
index c2ef44c1bd..4fe996a019 100644
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@@ -15,6 +15,7 @@ import {
 } from "./utils"
 import { DatasourcePlus } from "./base/datasourcePlus"
 import dayjs from "dayjs"
+import { FieldTypes } from "../constants"
 const { NUMBER_REGEX } = require("../utilities")
 
 module MySQLModule {
@@ -215,8 +216,8 @@ module MySQLModule {
             schema[columnName] = {
               name: columnName,
               autocolumn: isAuto,
-              type: convertSqlType(column.Type),
               constraints,
+              ...convertSqlType(column.Type),
             }
           }
           if (!tables[tableName]) {
diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts
index 7cb7ba88cf..94e51694c1 100644
--- a/packages/server/src/integrations/oracle.ts
+++ b/packages/server/src/integrations/oracle.ts
@@ -279,9 +279,9 @@ module OracleModule {
       )
     }
 
-    private internalConvertType(column: OracleColumn): string {
+    private internalConvertType(column: OracleColumn): { type: string } {
       if (this.isBooleanType(column)) {
-        return FieldTypes.BOOLEAN
+        return { type: FieldTypes.BOOLEAN }
       }
 
       return convertSqlType(column.type)
@@ -328,7 +328,7 @@ module OracleModule {
               fieldSchema = {
                 autocolumn: OracleIntegration.isAutoColumn(oracleColumn),
                 name: columnName,
-                type: this.internalConvertType(oracleColumn),
+                ...this.internalConvertType(oracleColumn),
               }
               table.schema[columnName] = fieldSchema
             }
diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts
index 1dc6fd9d2d..01257f3aa0 100644
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@@ -227,7 +227,6 @@ module PostgresModule {
           }
         }
 
-        const type: string = convertSqlType(column.data_type)
         const identity = !!(
           column.identity_generation ||
           column.identity_start ||
@@ -242,7 +241,7 @@ module PostgresModule {
         tables[tableName].schema[columnName] = {
           autocolumn: isAuto,
           name: columnName,
-          type,
+          ...convertSqlType(column.data_type),
         }
       }
 
diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index 16cc6d387e..7e4efad84f 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -35,6 +35,9 @@ const SQL_DATE_TYPE_MAP = {
   date: FieldTypes.DATETIME,
 }
 
+const SQL_DATE_ONLY_TYPES = ["date"]
+const SQL_TIME_ONLY_TYPES = ["time"]
+
 const SQL_STRING_TYPE_MAP = {
   varchar: FieldTypes.STRING,
   char: FieldTypes.STRING,
@@ -137,12 +140,20 @@ export function breakRowIdField(_id: string | { _id: string }): any[] {
 }
 
 export function convertSqlType(type: string) {
+  let foundType = FieldTypes.STRING
+  const lcType = type.toLowerCase()
   for (let [external, internal] of Object.entries(SQL_TYPE_MAP)) {
-    if (type.toLowerCase().includes(external)) {
-      return internal
+    if (lcType.includes(external)) {
+      foundType = internal
+      break
     }
   }
-  return FieldTypes.STRING
+  const schema: any = { type: foundType }
+  if (foundType === FieldTypes.DATETIME) {
+    schema.dateOnly = SQL_DATE_ONLY_TYPES.includes(lcType)
+    schema.timeOnly = SQL_TIME_ONLY_TYPES.includes(lcType)
+  }
+  return schema
 }
 
 export function getSqlQuery(query: SqlQuery | string): SqlQuery {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 239b342eff..1d9f526842 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.127":
-  version "1.0.127"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.127.tgz#5d1f4b18b31436ddb770dc1ddf16f201ec95dda7"
-  integrity sha512-3INFkAIxL0Q8Sa65ELRGQqPs+4baykKyb1z/XuO1MyuDPnbFKXGOjl1V61EMy622gsmLk90IJL6aQfh3Grwhvw==
+"@budibase/backend-core@1.0.131":
+  version "1.0.131"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.131.tgz#4b284405e19a345de1af723d0c1e3fa315463140"
+  integrity sha512-1r6JjIcSBHogGm2YLB7k712+3LLE1+42C3eITa6n8r/QQIkyK7DJwm0I403IRKeh/93gwgQtBiRpJfhy2p7Pew==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1091,12 +1091,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.127":
-  version "1.0.127"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.127.tgz#a8bcffb8ccc6afde64370b3a3dc22e2d0dd04f46"
-  integrity sha512-dj0SFTmO8JuMQ97/Ik6jVPQsh9AW7U5Wkgpa4yeNfwWw3DvSoktCxpeZ9mND6BR/DWTaeZljFKsQ6uk6nimzdQ==
+"@budibase/pro@1.0.131":
+  version "1.0.131"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.131.tgz#65907e7ca528d237bf12dbe5c159156d03e8d5c3"
+  integrity sha512-pmK18/1TPDY+3IHUzGh0fG5CEy7+kSPpcl72smri8jvo5OsD4lWQVOTHSdqRn8aIf/qEHHWc2sspEEDGhYMv0Q==
   dependencies:
-    "@budibase/backend-core" "1.0.127"
+    "@budibase/backend-core" "1.0.131"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index dfdcc129d9..4962cc20e5 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -293,10 +293,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.127":
-  version "1.0.127"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.127.tgz#5d1f4b18b31436ddb770dc1ddf16f201ec95dda7"
-  integrity sha512-3INFkAIxL0Q8Sa65ELRGQqPs+4baykKyb1z/XuO1MyuDPnbFKXGOjl1V61EMy622gsmLk90IJL6aQfh3Grwhvw==
+"@budibase/backend-core@1.0.131":
+  version "1.0.131"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.131.tgz#4b284405e19a345de1af723d0c1e3fa315463140"
+  integrity sha512-1r6JjIcSBHogGm2YLB7k712+3LLE1+42C3eITa6n8r/QQIkyK7DJwm0I403IRKeh/93gwgQtBiRpJfhy2p7Pew==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -321,12 +321,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.127":
-  version "1.0.127"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.127.tgz#a8bcffb8ccc6afde64370b3a3dc22e2d0dd04f46"
-  integrity sha512-dj0SFTmO8JuMQ97/Ik6jVPQsh9AW7U5Wkgpa4yeNfwWw3DvSoktCxpeZ9mND6BR/DWTaeZljFKsQ6uk6nimzdQ==
+"@budibase/pro@1.0.131":
+  version "1.0.131"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.131.tgz#65907e7ca528d237bf12dbe5c159156d03e8d5c3"
+  integrity sha512-pmK18/1TPDY+3IHUzGh0fG5CEy7+kSPpcl72smri8jvo5OsD4lWQVOTHSdqRn8aIf/qEHHWc2sspEEDGhYMv0Q==
   dependencies:
-    "@budibase/backend-core" "1.0.127"
+    "@budibase/backend-core" "1.0.131"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 40d28238b951f699dc12f44994f1a2801599eb95 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 3 May 2022 14:18:18 +0100
Subject: [PATCH 20/49] Add workflow_dispatch to ci, release-develop and
 release (master)

---
 .github/workflows/budibase_ci.yml     | 1 +
 .github/workflows/release-develop.yml | 6 ++++++
 .github/workflows/release.yml         | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 0881d2528d..8e235532cf 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -11,6 +11,7 @@ on:
     branches:
       - master
       - develop 
+ workflow_dispatch:
 
 env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 87e4f0988a..7ee02ccdd1 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -14,6 +14,7 @@ on:
       - 'yarn.lock'
       - 'package.json'
       - 'yarn.lock'
+ workflow_dispatch:
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -26,6 +27,11 @@ jobs:
     runs-on: ubuntu-latest 
 
     steps:
+      - name: Fail if branch is not develop
+        if: github.ref != 'refs/heads/develop' 
+        run: | 
+          echo "Ref is not develop, you must run this job from develop."
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3fe81dbcd1..359ad4467b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,6 +14,7 @@ on:
       - 'yarn.lock'
       - 'package.json'
       - 'yarn.lock'
+ workflow_dispatch:
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -27,6 +28,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master' 
+        run: | 
+          echo "Ref is not master, you must run this job from master."
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:

From 808e3e7c8bea0a1358fadc112c4003f61045d537 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 13:54:24 +0000
Subject: [PATCH 21/49] v1.0.135

---
 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 82ef5dc786..b9d9cfb8b1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.134",
+  "version": "1.0.135",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 09fc5cf002..90b8bac22a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "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 bceefa032d..b55c6bb6fb 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.134",
+  "version": "1.0.135",
   "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.134",
+    "@budibase/string-templates": "^1.0.135",
     "@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 a41f46c8a5..61e320e61c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.134",
-    "@budibase/client": "^1.0.134",
-    "@budibase/frontend-core": "^1.0.134",
-    "@budibase/string-templates": "^1.0.134",
+    "@budibase/bbui": "^1.0.135",
+    "@budibase/client": "^1.0.135",
+    "@budibase/frontend-core": "^1.0.135",
+    "@budibase/string-templates": "^1.0.135",
     "@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 7d14c93ade..2951389d55 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "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 743bd52cec..92d9f36662 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "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.134",
-    "@budibase/frontend-core": "^1.0.134",
-    "@budibase/string-templates": "^1.0.134",
+    "@budibase/bbui": "^1.0.135",
+    "@budibase/frontend-core": "^1.0.135",
+    "@budibase/string-templates": "^1.0.135",
     "@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 972443e23c..138073f3b0 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "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.134",
+    "@budibase/bbui": "^1.0.135",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index a621dc3453..798b3e16ec 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.134",
+  "version": "1.0.135",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.134",
-    "@budibase/client": "^1.0.134",
+    "@budibase/backend-core": "^1.0.135",
+    "@budibase/client": "^1.0.135",
     "@budibase/pro": "1.0.134",
-    "@budibase/string-templates": "^1.0.134",
+    "@budibase/string-templates": "^1.0.135",
     "@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 8523ccbe1a..4e5a7e51ff 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "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 fd243cba90..4b2ab7100c 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.134",
+  "version": "1.0.135",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.134",
+    "@budibase/backend-core": "^1.0.135",
     "@budibase/pro": "1.0.134",
-    "@budibase/string-templates": "^1.0.134",
+    "@budibase/string-templates": "^1.0.135",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From b95daf63c7e6cc11845a576166df7f27fccc756c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 13:55:48 +0000
Subject: [PATCH 22/49] Update pro version to 1.0.135

---
 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 798b3e16ec..f0c42073f4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.135",
     "@budibase/client": "^1.0.135",
-    "@budibase/pro": "1.0.134",
+    "@budibase/pro": "1.0.135",
     "@budibase/string-templates": "^1.0.135",
     "@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 4b2ab7100c..96f77fa55a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.135",
-    "@budibase/pro": "1.0.134",
+    "@budibase/pro": "1.0.135",
     "@budibase/string-templates": "^1.0.135",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 9e46413202adebb6ddc65b4d90d42fc71d400676 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 May 2022 15:20:46 +0100
Subject: [PATCH 23/49] Fix for export issue reported in #5669 - streaming +
 closing the database didn't work well together, have to support an edge case
 for our code stopping execution, but DB access continuing.

---
 .../server/src/utilities/fileSystem/index.js  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js
index 8a02afc5b3..e2a76c49a1 100644
--- a/packages/server/src/utilities/fileSystem/index.js
+++ b/packages/server/src/utilities/fileSystem/index.js
@@ -2,7 +2,11 @@ const { budibaseTempDir } = require("../budibaseDir")
 const fs = require("fs")
 const { join } = require("path")
 const uuid = require("uuid/v4")
-const { doWithDB } = require("@budibase/backend-core/db")
+const {
+  doWithDB,
+  dangerousGetDB,
+  closeDB,
+} = require("@budibase/backend-core/db")
 const { ObjectStoreBuckets } = require("../../constants")
 const {
   upload,
@@ -151,14 +155,18 @@ exports.streamBackup = async appId => {
  * @return {*} either a readable stream or a string
  */
 exports.exportDB = async (dbName, { stream, filter, exportName } = {}) => {
-  return doWithDB(dbName, async db => {
-    // Stream the dump if required
-    if (stream) {
-      const memStream = new MemoryStream()
-      db.dump(memStream, { filter })
-      return memStream
-    }
+  // streaming a DB dump is a bit more complicated, can't close DB
+  if (stream) {
+    const db = dangerousGetDB(dbName)
+    const memStream = new MemoryStream()
+    memStream.on("end", async () => {
+      await closeDB(db)
+    })
+    db.dump(memStream, { filter })
+    return memStream
+  }
 
+  return doWithDB(dbName, async db => {
     // Write the dump to file if required
     if (exportName) {
       const path = join(budibaseTempDir(), exportName)

From cfd53b2f93c1045399792dbede294cc193a4fea6 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 May 2022 15:29:17 +0100
Subject: [PATCH 24/49] Fix for form issue #5669 - when in an empty state
 didn't correctly handle null stores.

---
 packages/client/src/components/app/forms/FormStep.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/FormStep.svelte b/packages/client/src/components/app/forms/FormStep.svelte
index 4441f515ee..22972c5c48 100644
--- a/packages/client/src/components/app/forms/FormStep.svelte
+++ b/packages/client/src/components/app/forms/FormStep.svelte
@@ -22,7 +22,7 @@
     if (
       formContext &&
       $builderStore.inBuilder &&
-      $componentStore.selectedComponentPath?.includes($component.id)
+      $componentStore?.selectedComponentPath?.includes($component.id)
     ) {
       formContext.formApi.setStep(step)
     }

From 6adb09d8d3bad902aea0e8c3018eb58c6d589d47 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 3 May 2022 15:52:46 +0100
Subject: [PATCH 25/49] Add test:ere:ci:record variant

---
 .github/workflows/smoke_test.yaml | 2 +-
 package.json                      | 1 +
 packages/builder/package.json     | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
index 927d860957..79c97b69af 100644
--- a/.github/workflows/smoke_test.yaml
+++ b/.github/workflows/smoke_test.yaml
@@ -32,7 +32,7 @@ jobs:
         uses: cypress-io/github-action@v2
         with:
           install: false
-          command: yarn test:e2e:ci
+          command: yarn test:e2e:ci:record
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
       
diff --git a/package.json b/package.json
index 727104d830..fb6d9da990 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "lint:fix": "yarn run lint:fix:prettier && yarn run lint:fix:eslint",
     "test:e2e": "lerna run cy:test --stream",
     "test:e2e:ci": "lerna run cy:ci --stream",
+    "test:e2e:ci:record": "lerna run cy:ci:record --stream",
     "build:specs": "lerna run specs",
     "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
     "build:docker:proxy": "docker build hosting/proxy -t proxy-service",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 61e320e61c..03cfd659e0 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -13,9 +13,11 @@
     "cy:setup:ci": "node ./cypress/setup.js",
     "cy:open": "cypress open",
     "cy:run": "cypress run",
-    "cy:run:ci": "xvfb-run cypress run --headed --browser chrome --record",
+    "cy:run:ci": "xvfb-run cypress run --headed --browser chrome",
+    "cy:run:ci:record": "xvfb-run cypress run --headed --browser chrome --record",
     "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run",
     "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci",
+    "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record",
     "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open",
     "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open"
   },

From c66cbcd522c61b98f00742d278f2b7db54ed3b5a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 May 2022 15:54:03 +0100
Subject: [PATCH 26/49] Fix for automation issue, doInAppContext for automation
 thread wasn't async, was immediately closing the database, rather than
 waiting for the operations to complete.

---
 packages/server/src/threads/automation.js | 16 +++++++---------
 packages/server/yarn.lock                 | 18 +++++++++---------
 packages/worker/yarn.lock                 | 18 +++++++++---------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index db462f5a8d..5993951d7b 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -286,18 +286,16 @@ class Orchestrator {
 
 module.exports = (input, callback) => {
   const appId = input.data.event.appId
-  doInAppContext(appId, () => {
+  doInAppContext(appId, async () => {
     const automationOrchestrator = new Orchestrator(
       input.data.automation,
       input.data.event
     )
-    automationOrchestrator
-      .execute()
-      .then(response => {
-        callback(null, response)
-      })
-      .catch(err => {
-        callback(err)
-      })
+    try {
+      const response = await automationOrchestrator.execute()
+      callback(null, response)
+    } catch (err) {
+      callback(err)
+    }
   })
 }
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 1d9f526842..491788a0af 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.131":
-  version "1.0.131"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.131.tgz#4b284405e19a345de1af723d0c1e3fa315463140"
-  integrity sha512-1r6JjIcSBHogGm2YLB7k712+3LLE1+42C3eITa6n8r/QQIkyK7DJwm0I403IRKeh/93gwgQtBiRpJfhy2p7Pew==
+"@budibase/backend-core@1.0.135":
+  version "1.0.135"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
+  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1091,12 +1091,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.131":
-  version "1.0.131"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.131.tgz#65907e7ca528d237bf12dbe5c159156d03e8d5c3"
-  integrity sha512-pmK18/1TPDY+3IHUzGh0fG5CEy7+kSPpcl72smri8jvo5OsD4lWQVOTHSdqRn8aIf/qEHHWc2sspEEDGhYMv0Q==
+"@budibase/pro@1.0.135":
+  version "1.0.135"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
+  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
   dependencies:
-    "@budibase/backend-core" "1.0.131"
+    "@budibase/backend-core" "1.0.135"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 4962cc20e5..292a0afd0c 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -293,10 +293,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.131":
-  version "1.0.131"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.131.tgz#4b284405e19a345de1af723d0c1e3fa315463140"
-  integrity sha512-1r6JjIcSBHogGm2YLB7k712+3LLE1+42C3eITa6n8r/QQIkyK7DJwm0I403IRKeh/93gwgQtBiRpJfhy2p7Pew==
+"@budibase/backend-core@1.0.135":
+  version "1.0.135"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
+  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -321,12 +321,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.131":
-  version "1.0.131"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.131.tgz#65907e7ca528d237bf12dbe5c159156d03e8d5c3"
-  integrity sha512-pmK18/1TPDY+3IHUzGh0fG5CEy7+kSPpcl72smri8jvo5OsD4lWQVOTHSdqRn8aIf/qEHHWc2sspEEDGhYMv0Q==
+"@budibase/pro@1.0.135":
+  version "1.0.135"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
+  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
   dependencies:
-    "@budibase/backend-core" "1.0.131"
+    "@budibase/backend-core" "1.0.135"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 9386a82e6fd730fca8cea9e2cf0b2c942e5a1b55 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 May 2022 16:04:59 +0100
Subject: [PATCH 27/49] Fixing similar issue in queries for context handling
 and fixing some issues raised by IDE.

---
 packages/server/src/threads/automation.js |  4 ++--
 packages/server/src/threads/query.js      | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index 5993951d7b..a7ce84d614 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -100,10 +100,10 @@ class Orchestrator {
     let automation = this._automation
     const app = await this.getApp()
     let stopped = false
-    let loopStep
+    let loopStep = null
 
     let stepCount = 0
-    let loopStepNumber
+    let loopStepNumber = null
     let loopSteps = []
     for (let step of automation.definition.steps) {
       stepCount++
diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js
index 71994a7244..ec9d9a6fa6 100644
--- a/packages/server/src/threads/query.js
+++ b/packages/server/src/threads/query.js
@@ -191,14 +191,13 @@ class QueryRunner {
 }
 
 module.exports = (input, callback) => {
-  doInAppContext(input.appId, () => {
+  doInAppContext(input.appId, async () => {
     const Runner = new QueryRunner(input)
-    Runner.execute()
-      .then(response => {
-        callback(null, response)
-      })
-      .catch(err => {
-        callback(err)
-      })
+    try {
+      const response = await Runner.execute()
+      callback(null, response)
+    } catch (err) {
+      callback(err)
+    }
   })
 }

From b7db3613e5eabdaeea27985b43eb6bc5370c66df Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 15:08:57 +0000
Subject: [PATCH 28/49] v1.0.136

---
 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 b9d9cfb8b1..1e553e1d6f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.135",
+  "version": "1.0.136",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 90b8bac22a..c8ad4e5bdb 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "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 b55c6bb6fb..497e21f7bb 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.135",
+  "version": "1.0.136",
   "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.135",
+    "@budibase/string-templates": "^1.0.136",
     "@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 61e320e61c..be0634d6d3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.135",
-    "@budibase/client": "^1.0.135",
-    "@budibase/frontend-core": "^1.0.135",
-    "@budibase/string-templates": "^1.0.135",
+    "@budibase/bbui": "^1.0.136",
+    "@budibase/client": "^1.0.136",
+    "@budibase/frontend-core": "^1.0.136",
+    "@budibase/string-templates": "^1.0.136",
     "@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 2951389d55..6d38cf5562 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "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 92d9f36662..7363e9d3fc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "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.135",
-    "@budibase/frontend-core": "^1.0.135",
-    "@budibase/string-templates": "^1.0.135",
+    "@budibase/bbui": "^1.0.136",
+    "@budibase/frontend-core": "^1.0.136",
+    "@budibase/string-templates": "^1.0.136",
     "@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 138073f3b0..f40e6537b5 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "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.135",
+    "@budibase/bbui": "^1.0.136",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index f0c42073f4..930fc3e5bf 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.135",
+  "version": "1.0.136",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.135",
-    "@budibase/client": "^1.0.135",
+    "@budibase/backend-core": "^1.0.136",
+    "@budibase/client": "^1.0.136",
     "@budibase/pro": "1.0.135",
-    "@budibase/string-templates": "^1.0.135",
+    "@budibase/string-templates": "^1.0.136",
     "@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 4e5a7e51ff..0543bce4a8 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "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 96f77fa55a..01742f4c6b 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.135",
+  "version": "1.0.136",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.135",
+    "@budibase/backend-core": "^1.0.136",
     "@budibase/pro": "1.0.135",
-    "@budibase/string-templates": "^1.0.135",
+    "@budibase/string-templates": "^1.0.136",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 6d4f8c02ed535c665939049bf049953f16912026 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 15:10:19 +0000
Subject: [PATCH 29/49] Update pro version to 1.0.136

---
 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 930fc3e5bf..9f50688b2e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.136",
     "@budibase/client": "^1.0.136",
-    "@budibase/pro": "1.0.135",
+    "@budibase/pro": "1.0.136",
     "@budibase/string-templates": "^1.0.136",
     "@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 01742f4c6b..e85dcb8333 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.136",
-    "@budibase/pro": "1.0.135",
+    "@budibase/pro": "1.0.136",
     "@budibase/string-templates": "^1.0.136",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 21e02dd2792b1e8d75b885e28ab3e519f925bf07 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 15:58:47 +0000
Subject: [PATCH 30/49] v1.0.137

---
 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 1e553e1d6f..4db39b96f5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.136",
+  "version": "1.0.137",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c8ad4e5bdb..2d9522b5ab 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "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 497e21f7bb..5086bb1128 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.136",
+  "version": "1.0.137",
   "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.136",
+    "@budibase/string-templates": "^1.0.137",
     "@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 be0634d6d3..ba8a080ba7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.136",
-    "@budibase/client": "^1.0.136",
-    "@budibase/frontend-core": "^1.0.136",
-    "@budibase/string-templates": "^1.0.136",
+    "@budibase/bbui": "^1.0.137",
+    "@budibase/client": "^1.0.137",
+    "@budibase/frontend-core": "^1.0.137",
+    "@budibase/string-templates": "^1.0.137",
     "@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 6d38cf5562..1c54e68b81 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "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 7363e9d3fc..5348981ba3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "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.136",
-    "@budibase/frontend-core": "^1.0.136",
-    "@budibase/string-templates": "^1.0.136",
+    "@budibase/bbui": "^1.0.137",
+    "@budibase/frontend-core": "^1.0.137",
+    "@budibase/string-templates": "^1.0.137",
     "@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 f40e6537b5..df3c52b544 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "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.136",
+    "@budibase/bbui": "^1.0.137",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 9f50688b2e..49dbb40e94 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.136",
+  "version": "1.0.137",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.136",
-    "@budibase/client": "^1.0.136",
+    "@budibase/backend-core": "^1.0.137",
+    "@budibase/client": "^1.0.137",
     "@budibase/pro": "1.0.136",
-    "@budibase/string-templates": "^1.0.136",
+    "@budibase/string-templates": "^1.0.137",
     "@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 0543bce4a8..35484f2c2f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.136",
+  "version": "1.0.137",
   "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 e85dcb8333..440f4c7999 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.136",
+  "version": "1.0.137",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.136",
+    "@budibase/backend-core": "^1.0.137",
     "@budibase/pro": "1.0.136",
-    "@budibase/string-templates": "^1.0.136",
+    "@budibase/string-templates": "^1.0.137",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 9d72647b02bb00d58ceb65b49ce69a0c04ac2205 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 16:00:42 +0000
Subject: [PATCH 31/49] Update pro version to 1.0.137

---
 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 49dbb40e94..3c248c9362 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.137",
     "@budibase/client": "^1.0.137",
-    "@budibase/pro": "1.0.136",
+    "@budibase/pro": "1.0.137",
     "@budibase/string-templates": "^1.0.137",
     "@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 440f4c7999..fccb23a9ea 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.137",
-    "@budibase/pro": "1.0.136",
+    "@budibase/pro": "1.0.137",
     "@budibase/string-templates": "^1.0.137",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 10864f03cef63f5d53eac3fbcc41d96bb94fb682 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 16:38:39 +0000
Subject: [PATCH 32/49] v1.0.138

---
 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 4db39b96f5..2f7203e4cf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.137",
+  "version": "1.0.138",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2d9522b5ab..9ab70185e0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "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 5086bb1128..b6283ab345 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.137",
+  "version": "1.0.138",
   "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.137",
+    "@budibase/string-templates": "^1.0.138",
     "@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 10c645c894..7c28ee850b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.137",
-    "@budibase/client": "^1.0.137",
-    "@budibase/frontend-core": "^1.0.137",
-    "@budibase/string-templates": "^1.0.137",
+    "@budibase/bbui": "^1.0.138",
+    "@budibase/client": "^1.0.138",
+    "@budibase/frontend-core": "^1.0.138",
+    "@budibase/string-templates": "^1.0.138",
     "@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 1c54e68b81..d15a2d1b14 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "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 5348981ba3..128c4f66a5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "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.137",
-    "@budibase/frontend-core": "^1.0.137",
-    "@budibase/string-templates": "^1.0.137",
+    "@budibase/bbui": "^1.0.138",
+    "@budibase/frontend-core": "^1.0.138",
+    "@budibase/string-templates": "^1.0.138",
     "@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 df3c52b544..2f54e127cb 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "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.137",
+    "@budibase/bbui": "^1.0.138",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 3c248c9362..571467afd1 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.137",
+  "version": "1.0.138",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.137",
-    "@budibase/client": "^1.0.137",
+    "@budibase/backend-core": "^1.0.138",
+    "@budibase/client": "^1.0.138",
     "@budibase/pro": "1.0.137",
-    "@budibase/string-templates": "^1.0.137",
+    "@budibase/string-templates": "^1.0.138",
     "@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 35484f2c2f..7b6071d639 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.137",
+  "version": "1.0.138",
   "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 fccb23a9ea..065e4d5eca 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.137",
+  "version": "1.0.138",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.137",
+    "@budibase/backend-core": "^1.0.138",
     "@budibase/pro": "1.0.137",
-    "@budibase/string-templates": "^1.0.137",
+    "@budibase/string-templates": "^1.0.138",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 3c5ffb3212cb07de92692f4f527c27d613ac6626 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 3 May 2022 16:40:06 +0000
Subject: [PATCH 33/49] Update pro version to 1.0.138

---
 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 571467afd1..9307a7358d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.138",
     "@budibase/client": "^1.0.138",
-    "@budibase/pro": "1.0.137",
+    "@budibase/pro": "1.0.138",
     "@budibase/string-templates": "^1.0.138",
     "@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 065e4d5eca..03282f44c0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.138",
-    "@budibase/pro": "1.0.137",
+    "@budibase/pro": "1.0.138",
     "@budibase/string-templates": "^1.0.138",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From af9b9b692124464a5a7f3e93ba76e93e319a252a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 10:24:28 +0100
Subject: [PATCH 34/49] Some foreach block fixes

---
 .../FlowChart/FlowItem.svelte                 | 16 ++++++++---
 packages/server/src/threads/automation.js     | 27 ++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 0829b85a90..532e0ff068 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -53,6 +53,18 @@
       x => x.blockToLoop === block.id
     )
 
+  async function removeLooping() {
+    loopingSelected = false
+    let loopBlock =
+      $automationStore.selectedAutomation?.automation.definition.steps.find(
+        x => x.blockToLoop === block.id
+      )
+    automationStore.actions.deleteAutomationBlock(loopBlock)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
+  }
+
   async function deleteStep() {
     let loopBlock =
       $automationStore.selectedAutomation?.automation.definition.steps.find(
@@ -151,9 +163,7 @@
     {#if !showLooping}
       <div class="blockSection">
         <div class="block-options">
-          <div class="delete-padding" on:click={() => deleteStep()}>
-            <Icon name="DeleteOutline" />
-          </div>
+          <ActionButton on:click={() => removeLooping()} icon="DeleteOutline" />
         </div>
         <Layout noPadding gap="S">
           <AutomationBlockSetup
diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index a7ce84d614..a95d3fac3c 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -107,7 +107,6 @@ class Orchestrator {
     let loopSteps = []
     for (let step of automation.definition.steps) {
       stepCount++
-      let input
       if (step.stepId === LOOP_STEP_ID) {
         loopStep = step
         loopStepNumber = stepCount
@@ -115,17 +114,21 @@ class Orchestrator {
       }
 
       if (loopStep) {
-        input = await processObject(loopStep.inputs, this._context)
+        // lets first of all handle the input
+        if (
+          typeof loopStep.inputs.binding === "string" &&
+          loopStep.inputs.option === "String"
+        ) {
+          loopStep.inputs.binding = loopStep.inputs.binding.split("\n")
+        }
       }
-      let iterations = loopStep ? input.binding.length : 1
+      let iterations = loopStep ? loopStep.inputs.binding.length : 1
       let iterationCount = 0
       for (let index = 0; index < iterations; index++) {
         let originalStepInput = cloneDeep(step.inputs)
 
         // Handle if the user has set a max iteration count or if it reaches the max limit set by us
         if (loopStep) {
-          // lets first of all handle the input
-          // if the input is array then use it, if it is a string then split it on every new line
           let newInput = await processObject(
             loopStep.inputs,
             cloneDeep(this._context)
@@ -134,16 +137,13 @@ class Orchestrator {
             newInput,
             loopStep.schema.inputs
           )
-          this._context.steps[loopStepNumber] = {
-            currentItem: newInput.binding[index],
-          }
 
           let tempOutput = { items: loopSteps, iterations: iterationCount }
           if (
-            (loopStep.inputs.option === "Array" &&
-              !Array.isArray(newInput.binding)) ||
-            (loopStep.inputs.option === "String" &&
-              typeof newInput.binding !== "string")
+            (originalStepInput.option === "Array" &&
+              !Array.isArray(originalStepInput.binding)) ||
+            (originalStepInput.option === "String" &&
+              typeof originalStepInput.binding !== "string")
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
@@ -153,6 +153,9 @@ class Orchestrator {
             loopStep = null
             break
           }
+          this._context.steps[loopStepNumber] = {
+            currentItem: newInput.binding[index],
+          }
 
           // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it
           // Pretty hacky because we need to account for the row object

From 45fd19583c3345771cc2fa60c67d9cc207242f5a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 11:55:26 +0100
Subject: [PATCH 35/49] linting

---
 .../SetupPanel/AutomationBlockSetup.svelte    |  8 ++++-
 .../server/src/automations/automationUtils.js | 12 +++++++
 packages/server/src/threads/automation.js     | 36 ++++++++++++-------
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 68afc04886..416a1ecace 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -177,12 +177,18 @@
     onChange({ detail: tempFilters }, defKey)
     drawer.hide()
   }
+  console.log(schemaProperties)
+  console.log(inputData)
 </script>
 
 <div class="fields">
   {#each schemaProperties as [key, value]}
     <div class="block-field">
-      <Label>{value.title || (key === "row" ? "Table" : key)}</Label>
+      <Label
+        tooltip={value.title === "Binding / Value"
+          ? "If using the String input type, please use a comma or newline separated string"
+          : null}>{value.title || (key === "row" ? "Table" : key)}</Label
+      >
       {#if value.type === "string" && value.enum}
         <Select
           on:change={e => onChange(e, key)}
diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js
index 0d858741dd..a3bcae0cee 100644
--- a/packages/server/src/automations/automationUtils.js
+++ b/packages/server/src/automations/automationUtils.js
@@ -86,3 +86,15 @@ exports.substituteLoopStep = (hbsString, substitute) => {
 
   return hbsString
 }
+
+exports.stringSplit = value => {
+  if (value == null) {
+    return []
+  }
+  if (value.split("\n").length > 1) {
+    value = value.split("\n")
+  } else {
+    value = value.split(",")
+  }
+  return value
+}
diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index a95d3fac3c..63a3ea8bf3 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -107,6 +107,7 @@ class Orchestrator {
     let loopSteps = []
     for (let step of automation.definition.steps) {
       stepCount++
+      let input
       if (step.stepId === LOOP_STEP_ID) {
         loopStep = step
         loopStepNumber = stepCount
@@ -114,15 +115,13 @@ class Orchestrator {
       }
 
       if (loopStep) {
-        // lets first of all handle the input
-        if (
-          typeof loopStep.inputs.binding === "string" &&
-          loopStep.inputs.option === "String"
-        ) {
-          loopStep.inputs.binding = loopStep.inputs.binding.split("\n")
-        }
+        input = await processObject(loopStep.inputs, this._context)
       }
-      let iterations = loopStep ? loopStep.inputs.binding.length : 1
+      let iterations = loopStep
+        ? Array.isArray(input.binding)
+          ? input.binding.length
+          : automationUtils.stringSplit(input.binding).length
+        : 1
       let iterationCount = 0
       for (let index = 0; index < iterations; index++) {
         let originalStepInput = cloneDeep(step.inputs)
@@ -140,10 +139,10 @@ class Orchestrator {
 
           let tempOutput = { items: loopSteps, iterations: iterationCount }
           if (
-            (originalStepInput.option === "Array" &&
-              !Array.isArray(originalStepInput.binding)) ||
-            (originalStepInput.option === "String" &&
-              typeof originalStepInput.binding !== "string")
+            (loopStep.inputs.option === "Array" &&
+              !Array.isArray(newInput.binding)) ||
+            (loopStep.inputs.option === "String" &&
+              typeof newInput.binding !== "string")
           ) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
@@ -153,8 +152,19 @@ class Orchestrator {
             loopStep = null
             break
           }
+
+          let item
+          if (
+            typeof loopStep.inputs.binding === "string" &&
+            loopStep.inputs.option === "String"
+          ) {
+            item = automationUtils.stringSplit(newInput.binding)
+          } else {
+            item = loopStep.inputs.binding
+          }
+
           this._context.steps[loopStepNumber] = {
-            currentItem: newInput.binding[index],
+            currentItem: item[index],
           }
 
           // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it

From 118b9bbd979c3e3ea9f5f2867062128f7cd43a5e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 11:56:54 +0100
Subject: [PATCH 36/49] remove log

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 416a1ecace..1af40694a3 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -177,8 +177,6 @@
     onChange({ detail: tempFilters }, defKey)
     drawer.hide()
   }
-  console.log(schemaProperties)
-  console.log(inputData)
 </script>
 
 <div class="fields">

From dfb292862ffd5bffa95b2d7f86726cd49c71dfa8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 4 May 2022 12:14:01 +0100
Subject: [PATCH 37/49] Fixing an issue with JSONparse helper always being
 considered invalid due to a lack of input.

---
 packages/server/yarn.lock                      | 18 +++++++++---------
 packages/string-templates/src/index.js         | 11 ++++++-----
 packages/string-templates/test/helpers.spec.js |  7 +++++++
 packages/worker/yarn.lock                      | 18 +++++++++---------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 491788a0af..35e9ce1387 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
-  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
+"@budibase/backend-core@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0"
+  integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1091,12 +1091,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
-  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
+"@budibase/pro@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544"
+  integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA==
   dependencies:
-    "@budibase/backend-core" "1.0.135"
+    "@budibase/backend-core" "1.0.138"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js
index 6e464c27c4..f4feceac4b 100644
--- a/packages/string-templates/src/index.js
+++ b/packages/string-templates/src/index.js
@@ -70,7 +70,7 @@ function createTemplate(string, opts) {
  * @param {object|array} object The input structure which is to be recursed, it is important to note that
  * if the structure contains any cycles then this will fail.
  * @param {object} context The context that handlebars should fill data from.
- * @param {object|undefined} opts optional - specify some options for processing.
+ * @param {object|undefined} [opts] optional - specify some options for processing.
  * @returns {Promise<object|array>} The structure input, as fully updated as possible.
  */
 module.exports.processObject = async (object, context, opts) => {
@@ -101,7 +101,7 @@ module.exports.processObject = async (object, context, opts) => {
  * then nothing will occur.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object|undefined} opts optional - specify some options for processing.
+ * @param {object|undefined} [opts] optional - specify some options for processing.
  * @returns {Promise<string>} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processString = async (string, context, opts) => {
@@ -115,7 +115,7 @@ module.exports.processString = async (string, context, opts) => {
  * @param {object|array} object The input structure which is to be recursed, it is important to note that
  * if the structure contains any cycles then this will fail.
  * @param {object} context The context that handlebars should fill data from.
- * @param {object|undefined} opts optional - specify some options for processing.
+ * @param {object|undefined} [opts] optional - specify some options for processing.
  * @returns {object|array} The structure input, as fully updated as possible.
  */
 module.exports.processObjectSync = (object, context, opts) => {
@@ -136,7 +136,7 @@ module.exports.processObjectSync = (object, context, opts) => {
  * then nothing will occur. This is a pure sync call and therefore does not have the full functionality of the async call.
  * @param {string} string The template string which is the filled from the context object.
  * @param {object} context An object of information which will be used to enrich the string.
- * @param {object|undefined} opts optional - specify some options for processing.
+ * @param {object|undefined} [opts] optional - specify some options for processing.
  * @returns {string} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processStringSync = (string, context, opts) => {
@@ -194,7 +194,7 @@ module.exports.makePropSafe = property => {
 /**
  * Checks whether or not a template string contains totally valid syntax (simply tries running it)
  * @param string The string to test for valid syntax - this may contain no templates and will be considered valid.
- * @param opts optional - specify some options for processing.
+ * @param [opts] optional - specify some options for processing.
  * @returns {boolean} Whether or not the input string is valid.
  */
 module.exports.isValid = (string, opts) => {
@@ -205,6 +205,7 @@ module.exports.isValid = (string, opts) => {
     "array",
     "cannot read property",
     "undefined",
+    "json at position 0",
   ]
   // this is a portion of a specific string always output by handlebars in the case of a syntax error
   const invalidCases = [`expecting '`]
diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js
index 0d39660d59..17e6876bba 100644
--- a/packages/string-templates/test/helpers.spec.js
+++ b/packages/string-templates/test/helpers.spec.js
@@ -360,6 +360,13 @@ describe("Test the literal helper", () => {
   })
 })
 
+describe("Test that JSONpase helper", () => {
+  it("should state that the JSONparse helper is valid", async () => {
+    const output = isValid(`{{ JSONparse input }}`)
+    expect(output).toBe(true)
+  })
+})
+
 describe("Cover a few complex use cases", () => {
   it("should allow use of three different collection helpers", async () => {
     const output = await processString(
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 292a0afd0c..a2a29f5f77 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -293,10 +293,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
-  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
+"@budibase/backend-core@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0"
+  integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -321,12 +321,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
-  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
+"@budibase/pro@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544"
+  integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA==
   dependencies:
-    "@budibase/backend-core" "1.0.135"
+    "@budibase/backend-core" "1.0.138"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 4e7a16db305da479edbda87f46edbf81ccc56e3d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 4 May 2022 12:28:21 +0100
Subject: [PATCH 38/49] Add isDev() to backend-core/env

---
 packages/backend-core/src/environment.js |  5 +++++
 packages/server/yarn.lock                | 18 +++++++++---------
 packages/worker/yarn.lock                | 18 +++++++++---------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/backend-core/src/environment.js b/packages/backend-core/src/environment.js
index 26e0d486f7..c4fc4a87c8 100644
--- a/packages/backend-core/src/environment.js
+++ b/packages/backend-core/src/environment.js
@@ -6,6 +6,10 @@ function isTest() {
   )
 }
 
+function isDev() {
+  return process.env.NODE_ENV !== "production"
+}
+
 module.exports = {
   JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
@@ -32,6 +36,7 @@ module.exports = {
   TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
   USE_COUCH: process.env.USE_COUCH || true,
   isTest,
+  isDev,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 491788a0af..35e9ce1387 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
-  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
+"@budibase/backend-core@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0"
+  integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1091,12 +1091,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
-  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
+"@budibase/pro@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544"
+  integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA==
   dependencies:
-    "@budibase/backend-core" "1.0.135"
+    "@budibase/backend-core" "1.0.138"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 292a0afd0c..a2a29f5f77 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -293,10 +293,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.135.tgz#b8cf217243b285c6e74435acba7c8960a1651c23"
-  integrity sha512-7gnTW6w8upJSPNqdyt5gpkubf0glDyTiSszLVVRZdxJypYAnBjcVrSFvlNPDzI4X2glnNnGcXBxFdDg6Z9ZS5w==
+"@budibase/backend-core@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.138.tgz#5297d6cf5b9ec8c15f0a6df4c7d8273b8ac900f0"
+  integrity sha512-1qN/5urKX8bBXwEz266Z94rco8dTI7VqIh75m8ZcqrAfoUpjvZJS76gZxfc5U/QWPwrgVFnLtYvnEjaLbGEflg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -321,12 +321,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.135":
-  version "1.0.135"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.135.tgz#fa4f3b2a8e14905c97305a79e4b91d1094dba1a0"
-  integrity sha512-XfZTfrplyY03zuTE3dPzdJvVD3qO5ShbRUYNX/05VBubwhS7S0mczwfCTJPi8agfx3LGN4yQd7GhFbaN2zrOPg==
+"@budibase/pro@1.0.138":
+  version "1.0.138"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.138.tgz#cacbebe5ce93eb533af62a794a638944c2c61544"
+  integrity sha512-4ABlUZvl2h8sd8awJATf3KJeoFWV/8SoqdbKiH1ICdUcM/6dad7nhbJ15QqJL+Uuh/+mN2yEbr8V6Un2+yF+CA==
   dependencies:
-    "@budibase/backend-core" "1.0.135"
+    "@budibase/backend-core" "1.0.138"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From be6228df53c3af04211438a095da964a51a29169 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 12:25:09 +0000
Subject: [PATCH 39/49] v1.0.139

---
 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 2f7203e4cf..096cc2fe9e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.138",
+  "version": "1.0.139",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 9ab70185e0..e70980bacd 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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 b6283ab345..996150d32f 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.138",
+  "version": "1.0.139",
   "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.138",
+    "@budibase/string-templates": "^1.0.139",
     "@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 7c28ee850b..3a9874b2c4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.138",
-    "@budibase/client": "^1.0.138",
-    "@budibase/frontend-core": "^1.0.138",
-    "@budibase/string-templates": "^1.0.138",
+    "@budibase/bbui": "^1.0.139",
+    "@budibase/client": "^1.0.139",
+    "@budibase/frontend-core": "^1.0.139",
+    "@budibase/string-templates": "^1.0.139",
     "@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 d15a2d1b14..b697117c0c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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 128c4f66a5..69aadb6e10 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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.138",
-    "@budibase/frontend-core": "^1.0.138",
-    "@budibase/string-templates": "^1.0.138",
+    "@budibase/bbui": "^1.0.139",
+    "@budibase/frontend-core": "^1.0.139",
+    "@budibase/string-templates": "^1.0.139",
     "@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 2f54e127cb..d37723d5ba 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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.138",
+    "@budibase/bbui": "^1.0.139",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 9307a7358d..e2ae8b4464 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.138",
+  "version": "1.0.139",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.138",
-    "@budibase/client": "^1.0.138",
+    "@budibase/backend-core": "^1.0.139",
+    "@budibase/client": "^1.0.139",
     "@budibase/pro": "1.0.138",
-    "@budibase/string-templates": "^1.0.138",
+    "@budibase/string-templates": "^1.0.139",
     "@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 7b6071d639..d4de4e712c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.138",
+  "version": "1.0.139",
   "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 03282f44c0..bd42a424e0 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.138",
+  "version": "1.0.139",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.138",
+    "@budibase/backend-core": "^1.0.139",
     "@budibase/pro": "1.0.138",
-    "@budibase/string-templates": "^1.0.138",
+    "@budibase/string-templates": "^1.0.139",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From dea5e73317036143a930624f8a530f18f6c8ec3d Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 13:25:46 +0100
Subject: [PATCH 40/49] account for objects in failure condition

---
 packages/server/src/threads/automation.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index 63a3ea8bf3..16a230e263 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -144,6 +144,7 @@ class Orchestrator {
             (loopStep.inputs.option === "String" &&
               typeof newInput.binding !== "string")
           ) {
+            console.log("hello")
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
               success: false,
@@ -191,7 +192,6 @@ class Orchestrator {
               }
             }
           }
-
           if (
             index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
             index === loopStep.inputs.iterations
@@ -205,10 +205,26 @@ class Orchestrator {
             break
           }
 
+          let isFailure = false
           if (
-            this._context.steps[loopStepNumber]?.currentItem ===
-            loopStep.inputs.failure
+            typeof this._context.steps[loopStepNumber]?.currentItem === "object"
           ) {
+            isFailure = Object.keys(
+              this._context.steps[loopStepNumber].currentItem
+            ).some(value => {
+              return (
+                this._context.steps[loopStepNumber].currentItem[value] ===
+                loopStep.inputs.failure
+              )
+            })
+          } else {
+            isFailure =
+              this._context.steps[loopStepNumber]?.currentItem ===
+              loopStep.inputs.failure
+          }
+          console.log(isFailure)
+
+          if (isFailure) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.FAILURE_CONDITION,
               success: false,

From fd46ebeaedd94c78021b49b1e33333c9c3152502 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 12:26:31 +0000
Subject: [PATCH 41/49] Update pro version to 1.0.139

---
 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 e2ae8b4464..211c956543 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.139",
     "@budibase/client": "^1.0.139",
-    "@budibase/pro": "1.0.138",
+    "@budibase/pro": "1.0.139",
     "@budibase/string-templates": "^1.0.139",
     "@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 bd42a424e0..db029d8850 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.139",
-    "@budibase/pro": "1.0.138",
+    "@budibase/pro": "1.0.139",
     "@budibase/string-templates": "^1.0.139",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From a2b38adac39400929d4bea376442aeee07696e9e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 4 May 2022 13:30:08 +0100
Subject: [PATCH 42/49] remove log

---
 packages/server/src/threads/automation.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/server/src/threads/automation.js b/packages/server/src/threads/automation.js
index 16a230e263..98c45e4af3 100644
--- a/packages/server/src/threads/automation.js
+++ b/packages/server/src/threads/automation.js
@@ -144,7 +144,6 @@ class Orchestrator {
             (loopStep.inputs.option === "String" &&
               typeof newInput.binding !== "string")
           ) {
-            console.log("hello")
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
               status: AutomationErrors.INCORRECT_TYPE,
               success: false,
@@ -222,7 +221,6 @@ class Orchestrator {
               this._context.steps[loopStepNumber]?.currentItem ===
               loopStep.inputs.failure
           }
-          console.log(isFailure)
 
           if (isFailure) {
             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {

From 008d69ab09524ec5f92a26bf746deea495e7cf23 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 12:40:27 +0000
Subject: [PATCH 43/49] v1.0.140

---
 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 096cc2fe9e..a6ef43f669 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.139",
+  "version": "1.0.140",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e70980bacd..d2b359835e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "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 996150d32f..387ae0b7d8 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.139",
+  "version": "1.0.140",
   "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.139",
+    "@budibase/string-templates": "^1.0.140",
     "@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 3a9874b2c4..eb909c72fd 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.139",
-    "@budibase/client": "^1.0.139",
-    "@budibase/frontend-core": "^1.0.139",
-    "@budibase/string-templates": "^1.0.139",
+    "@budibase/bbui": "^1.0.140",
+    "@budibase/client": "^1.0.140",
+    "@budibase/frontend-core": "^1.0.140",
+    "@budibase/string-templates": "^1.0.140",
     "@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 b697117c0c..b28a3bfb1a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "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 69aadb6e10..75b4c62e8e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "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.139",
-    "@budibase/frontend-core": "^1.0.139",
-    "@budibase/string-templates": "^1.0.139",
+    "@budibase/bbui": "^1.0.140",
+    "@budibase/frontend-core": "^1.0.140",
+    "@budibase/string-templates": "^1.0.140",
     "@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 d37723d5ba..33d5c974f6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "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.139",
+    "@budibase/bbui": "^1.0.140",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 211c956543..97397c4a26 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.139",
+  "version": "1.0.140",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.139",
-    "@budibase/client": "^1.0.139",
+    "@budibase/backend-core": "^1.0.140",
+    "@budibase/client": "^1.0.140",
     "@budibase/pro": "1.0.139",
-    "@budibase/string-templates": "^1.0.139",
+    "@budibase/string-templates": "^1.0.140",
     "@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 d4de4e712c..81d4fb96b5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "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 db029d8850..d6590f4970 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.139",
+  "version": "1.0.140",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.139",
+    "@budibase/backend-core": "^1.0.140",
     "@budibase/pro": "1.0.139",
-    "@budibase/string-templates": "^1.0.139",
+    "@budibase/string-templates": "^1.0.140",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 3073bb973a3cb2638b523f674ccf5ba6b2e90067 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 12:41:57 +0000
Subject: [PATCH 44/49] Update pro version to 1.0.140

---
 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 97397c4a26..97c745b8ba 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.140",
     "@budibase/client": "^1.0.140",
-    "@budibase/pro": "1.0.139",
+    "@budibase/pro": "1.0.140",
     "@budibase/string-templates": "^1.0.140",
     "@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 d6590f4970..873ddb0786 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.140",
-    "@budibase/pro": "1.0.139",
+    "@budibase/pro": "1.0.140",
     "@budibase/string-templates": "^1.0.140",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From eaa0b8e903488618bd33ce42ef5df5bbb933d24c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 13:14:06 +0000
Subject: [PATCH 45/49] v1.0.141

---
 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 a6ef43f669..8f5e7c824b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.140",
+  "version": "1.0.141",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index d2b359835e..e1e232cf2f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "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 387ae0b7d8..0f7b89d183 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.140",
+  "version": "1.0.141",
   "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.140",
+    "@budibase/string-templates": "^1.0.141",
     "@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 eb909c72fd..99bc6a11cf 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.140",
-    "@budibase/client": "^1.0.140",
-    "@budibase/frontend-core": "^1.0.140",
-    "@budibase/string-templates": "^1.0.140",
+    "@budibase/bbui": "^1.0.141",
+    "@budibase/client": "^1.0.141",
+    "@budibase/frontend-core": "^1.0.141",
+    "@budibase/string-templates": "^1.0.141",
     "@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 b28a3bfb1a..84aa73d183 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "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 75b4c62e8e..50b657e80e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "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.140",
-    "@budibase/frontend-core": "^1.0.140",
-    "@budibase/string-templates": "^1.0.140",
+    "@budibase/bbui": "^1.0.141",
+    "@budibase/frontend-core": "^1.0.141",
+    "@budibase/string-templates": "^1.0.141",
     "@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 33d5c974f6..a9ac402af0 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "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.140",
+    "@budibase/bbui": "^1.0.141",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 97c745b8ba..ee7927efe3 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.140",
+  "version": "1.0.141",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.140",
-    "@budibase/client": "^1.0.140",
+    "@budibase/backend-core": "^1.0.141",
+    "@budibase/client": "^1.0.141",
     "@budibase/pro": "1.0.140",
-    "@budibase/string-templates": "^1.0.140",
+    "@budibase/string-templates": "^1.0.141",
     "@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 81d4fb96b5..0415bf5bdd 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "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 873ddb0786..4938a9a6a1 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.140",
+  "version": "1.0.141",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.140",
+    "@budibase/backend-core": "^1.0.141",
     "@budibase/pro": "1.0.140",
-    "@budibase/string-templates": "^1.0.140",
+    "@budibase/string-templates": "^1.0.141",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 1cc60bd404ecd4f095388eeae54437c76071a844 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 13:15:23 +0000
Subject: [PATCH 46/49] Update pro version to 1.0.141

---
 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 ee7927efe3..df5c5c6626 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.141",
     "@budibase/client": "^1.0.141",
-    "@budibase/pro": "1.0.140",
+    "@budibase/pro": "1.0.141",
     "@budibase/string-templates": "^1.0.141",
     "@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 4938a9a6a1..bbba698248 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.141",
-    "@budibase/pro": "1.0.140",
+    "@budibase/pro": "1.0.141",
     "@budibase/string-templates": "^1.0.141",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 81b6d4c03db882bff975e2278c5831eb9e1fba55 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 4 May 2022 17:45:46 +0100
Subject: [PATCH 47/49] make secretkey refs conditional

---
 charts/budibase/templates/app-service-deployment.yaml    | 2 ++
 charts/budibase/templates/worker-service-deployment.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 8763274c50..3bbe718d73 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -34,6 +34,7 @@ spec:
           {{ else }}
           value: http://{{ .Release.Name }}-svc-couchdb:{{ .Values.services.couchdb.port }}
           {{ end }}
+        {{ if .Values.services.couchdb.enabled }}
         - name: COUCH_DB_USER
           valueFrom:
             secretKeyRef:
@@ -44,6 +45,7 @@ spec:
             secretKeyRef:
               name: {{ template "couchdb.fullname" . }}
               key: adminPassword
+        {{ end }}
         - name: ENABLE_ANALYTICS
           value: {{ .Values.globals.enableAnalytics | quote }}
         - name: INTERNAL_API_KEY
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index c2180aca2b..15ff05e214 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -29,6 +29,7 @@ spec:
       - env:
         - name: CLUSTER_PORT
           value: {{ .Values.services.worker.port | quote }}
+        {{ if .Values.services.couchdb.enabled }}
         - name: COUCH_DB_USER
           valueFrom:
             secretKeyRef:
@@ -39,6 +40,7 @@ spec:
             secretKeyRef:
               name: {{ template "couchdb.fullname" . }}
               key: adminPassword
+        {{ end }}
         - name: COUCH_DB_URL
           {{ if .Values.services.couchdb.url }}
           value: {{ .Values.services.couchdb.url }}

From 6204109df3faf85cacde87c3d5772494a3f24e93 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 16:58:22 +0000
Subject: [PATCH 48/49] v1.0.142

---
 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 8f5e7c824b..708450c773 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.141",
+  "version": "1.0.142",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e1e232cf2f..d13cb2f50b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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 0f7b89d183..6dfaaf6975 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.141",
+  "version": "1.0.142",
   "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.141",
+    "@budibase/string-templates": "^1.0.142",
     "@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 99bc6a11cf..32e1d978dd 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.141",
-    "@budibase/client": "^1.0.141",
-    "@budibase/frontend-core": "^1.0.141",
-    "@budibase/string-templates": "^1.0.141",
+    "@budibase/bbui": "^1.0.142",
+    "@budibase/client": "^1.0.142",
+    "@budibase/frontend-core": "^1.0.142",
+    "@budibase/string-templates": "^1.0.142",
     "@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 84aa73d183..2d9fbadcd7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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 50b657e80e..ee8dfa93e2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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.141",
-    "@budibase/frontend-core": "^1.0.141",
-    "@budibase/string-templates": "^1.0.141",
+    "@budibase/bbui": "^1.0.142",
+    "@budibase/frontend-core": "^1.0.142",
+    "@budibase/string-templates": "^1.0.142",
     "@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 a9ac402af0..85aaa58655 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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.141",
+    "@budibase/bbui": "^1.0.142",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index df5c5c6626..66ba87a218 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.141",
+  "version": "1.0.142",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.141",
-    "@budibase/client": "^1.0.141",
+    "@budibase/backend-core": "^1.0.142",
+    "@budibase/client": "^1.0.142",
     "@budibase/pro": "1.0.141",
-    "@budibase/string-templates": "^1.0.141",
+    "@budibase/string-templates": "^1.0.142",
     "@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 0415bf5bdd..676c625a2c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.141",
+  "version": "1.0.142",
   "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 bbba698248..01e6e4cae3 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.141",
+  "version": "1.0.142",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.141",
+    "@budibase/backend-core": "^1.0.142",
     "@budibase/pro": "1.0.141",
-    "@budibase/string-templates": "^1.0.141",
+    "@budibase/string-templates": "^1.0.142",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From b8b1bb31c63b57b5b48b16a782d916a8ba67506f Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 4 May 2022 16:59:52 +0000
Subject: [PATCH 49/49] Update pro version to 1.0.142

---
 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 66ba87a218..878bf46e50 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -70,7 +70,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.142",
     "@budibase/client": "^1.0.142",
-    "@budibase/pro": "1.0.141",
+    "@budibase/pro": "1.0.142",
     "@budibase/string-templates": "^1.0.142",
     "@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 01e6e4cae3..e886a707f1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -32,7 +32,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.142",
-    "@budibase/pro": "1.0.141",
+    "@budibase/pro": "1.0.142",
     "@budibase/string-templates": "^1.0.142",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",