From 8c62ea9833a416c3c1a5c5e2bcf4479d0d2e1451 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Oct 2022 12:03:13 +0100
Subject: [PATCH 01/27] Values or defaults passed to the picker are parsed to
 ensure only valid options are marked/added to the component.

---
 .../bbui/src/Form/Core/Multiselect.svelte     | 22 ++++++++++++++++---
 .../common/bindings/BindingPanel.svelte       |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index eb39e39042..3fbbaf5d4a 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,12 +15,28 @@
   export let sort = false
   export let autoWidth = false
 
+  $: streamed = Array.isArray(value)
+    ? value.reduce((acc, ele) => {
+        if (typeof ele === "string") {
+          let temp = ele.trim()
+          if (!temp) {
+            return acc
+          }
+        }
+        let processedOpt = ele.toString()
+        if (options.indexOf(processedOpt) > -1) {
+          acc.push(ele.toString())
+        }
+        return acc
+      }, [])
+    : []
+
   const dispatch = createEventDispatcher()
-  $: selectedLookupMap = getSelectedLookupMap(value)
+  $: selectedLookupMap = getSelectedLookupMap(streamed)
   $: optionLookupMap = getOptionLookupMap(options)
-  $: fieldText = getFieldText(value, optionLookupMap, placeholder)
+  $: fieldText = getFieldText(streamed, optionLookupMap, placeholder)
   $: isOptionSelected = optionValue => selectedLookupMap[optionValue] === true
-  $: toggleOption = makeToggleOption(selectedLookupMap, value)
+  $: toggleOption = makeToggleOption(selectedLookupMap, streamed)
 
   const getFieldText = (value, map, placeholder) => {
     if (Array.isArray(value) && value.length > 0) {
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 1a1714967d..d105253e14 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -247,7 +247,7 @@
                       return
                     }
                     hoverTarget = {
-                      title: binding.display?.name || binding.fieldSchema.name,
+                      title: binding.display?.name || binding.fieldSchema?.name,
                       description: binding.description,
                     }
                     popover.show()

From 449ddf2a6bdb5783ac2351f27a395d8ba18a7fb3 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Oct 2022 12:08:37 +0100
Subject: [PATCH 02/27] Added the json field type to the Automation field
 block. Also added in the automation icon to identify the automation bindings

---
 .../automation/SetupPanel/RowSelector.svelte  | 13 ++++++++++--
 .../SetupPanel/RowSelectorTypes.svelte        | 21 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index c72acc252a..b3d50c1658 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -14,6 +14,11 @@
   export let block
   export let isTestModal
 
+  $: parsedBindings = bindings.map(binding => {
+    binding.icon = "ShareAndroid"
+    return binding
+  })
+
   let table
   let schemaFields
 
@@ -79,6 +84,10 @@
       return [value]
     }
 
+    if (type === "json") {
+      return value.value
+    }
+
     return value
   }
 
@@ -109,7 +118,7 @@
               {isTestModal}
               {field}
               {schema}
-              {bindings}
+              bindings={parsedBindings}
               {value}
               {onChange}
             />
@@ -124,7 +133,7 @@
               on:change={e => onChange(e, field, schema.type)}
               label={field}
               type="string"
-              {bindings}
+              bindings={parsedBindings}
               fillWidth={true}
               allowJS={true}
               updateOnChange={false}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index f3abad6e25..30b888b5fb 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -5,11 +5,13 @@
     DatePicker,
     Multiselect,
     TextArea,
+    Label,
   } 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"
+  import Editor from "components/integration/QueryEditor.svelte"
 
   export let onChange
   export let field
@@ -18,6 +20,11 @@
   export let bindings
   export let isTestModal
 
+  $: parsedBindings = bindings.map(binding => {
+    binding.icon = "ShareAndroid"
+    return binding
+  })
+
   function schemaHasOptions(schema) {
     return !!schema.constraints?.inclusion?.length
   }
@@ -50,6 +57,18 @@
   />
 {:else if schema.type === "longform"}
   <TextArea label={field} bind:value={value[field]} />
+{:else if schema.type === "json"}
+  <Label>{field}</Label>
+  <Editor
+    editorHeight="150"
+    mode="json"
+    on:change={e => {
+      if (e.detail?.value !== value[field]) {
+        onChange(e, field, schema.type)
+      }
+    }}
+    value={value[field]}
+  />
 {:else if schema.type === "link"}
   <LinkedRowSelector bind:linkedRows={value[field]} {schema} />
 {:else if schema.type === "string" || schema.type === "number"}
@@ -60,7 +79,7 @@
     on:change={e => onChange(e, field)}
     label={field}
     type="string"
-    {bindings}
+    bindings={parsedBindings}
     fillWidth={true}
     allowJS={true}
     updateOnChange={false}

From 20feb35854a009fb7f5ff783b209c06c477d082b Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 17 Oct 2022 12:43:23 +0100
Subject: [PATCH 03/27] Minor update to fix padding for the json field label

---
 .../SetupPanel/RowSelectorTypes.svelte        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 30b888b5fb..ee95ee613f 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -58,17 +58,19 @@
 {:else if schema.type === "longform"}
   <TextArea label={field} bind:value={value[field]} />
 {:else if schema.type === "json"}
-  <Label>{field}</Label>
-  <Editor
-    editorHeight="150"
-    mode="json"
-    on:change={e => {
-      if (e.detail?.value !== value[field]) {
-        onChange(e, field, schema.type)
-      }
-    }}
-    value={value[field]}
-  />
+  <span>
+    <Label>{field}</Label>
+    <Editor
+      editorHeight="150"
+      mode="json"
+      on:change={e => {
+        if (e.detail?.value !== value[field]) {
+          onChange(e, field, schema.type)
+        }
+      }}
+      value={value[field]}
+    />
+  </span>
 {:else if schema.type === "link"}
   <LinkedRowSelector bind:linkedRows={value[field]} {schema} />
 {:else if schema.type === "string" || schema.type === "number"}

From b31f7f4b876ab15c61d680c06ca30f62e5cf6d40 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 18 Oct 2022 11:06:18 +0100
Subject: [PATCH 04/27] Refactor for multiselect value parsing and a fix to
 ensure default values are parsed before reaching the picker

---
 packages/bbui/src/Form/Core/Multiselect.svelte    | 15 ++++++---------
 .../client/src/components/app/forms/Field.svelte  | 10 +++++++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index 3fbbaf5d4a..c76f5324c5 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -16,16 +16,13 @@
   export let autoWidth = false
 
   $: streamed = Array.isArray(value)
-    ? value.reduce((acc, ele) => {
-        if (typeof ele === "string") {
-          let temp = ele.trim()
-          if (!temp) {
-            return acc
-          }
+    ? value.reduce((acc, entry) => {
+        if (typeof ele === "string" && entry.trim() === "") {
+          return acc
         }
-        let processedOpt = ele.toString()
-        if (options.indexOf(processedOpt) > -1) {
-          acc.push(ele.toString())
+        let processedOption = String(entry)
+        if (options.indexOf(processedOption) > -1) {
+          acc.push(processedOption)
         }
         return acc
       }, [])
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 9a91ea5b2d..1203630de5 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -27,11 +27,19 @@
   $: formField = formApi?.registerField(
     field,
     type,
-    defaultValue,
+    parseDefaultValue(defaultValue),
     disabled,
     validation,
     formStep
   )
+
+  const parseDefaultValue = defaultValue => {
+    if (Array.isArray(defaultValue) && type === "array") {
+      return defaultValue.map(val => String(val))
+    }
+    return defaultValue
+  }
+
   $: schemaType = fieldSchema?.type !== "formula" ? fieldSchema?.type : "string"
 
   // Focus label when editing

From 0e4a7ace08f6748b67ba2269a373be0a9b9bb9fe Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 18 Oct 2022 16:24:36 +0100
Subject: [PATCH 05/27] Pushed default parsing up into the InnerForm component
 to ensure that invalid default values are removed entirely. Fixes for custom
 validation for array types

---
 .../bbui/src/Form/Core/Multiselect.svelte     | 19 +++-----------
 packages/bbui/src/Form/Core/Select.svelte     |  2 +-
 .../ValidationEditor/ValidationDrawer.svelte  |  3 +++
 .../src/components/app/forms/Field.svelte     |  9 +------
 .../src/components/app/forms/InnerForm.svelte | 26 ++++++++++++++++---
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index c76f5324c5..eb39e39042 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,25 +15,12 @@
   export let sort = false
   export let autoWidth = false
 
-  $: streamed = Array.isArray(value)
-    ? value.reduce((acc, entry) => {
-        if (typeof ele === "string" && entry.trim() === "") {
-          return acc
-        }
-        let processedOption = String(entry)
-        if (options.indexOf(processedOption) > -1) {
-          acc.push(processedOption)
-        }
-        return acc
-      }, [])
-    : []
-
   const dispatch = createEventDispatcher()
-  $: selectedLookupMap = getSelectedLookupMap(streamed)
+  $: selectedLookupMap = getSelectedLookupMap(value)
   $: optionLookupMap = getOptionLookupMap(options)
-  $: fieldText = getFieldText(streamed, optionLookupMap, placeholder)
+  $: fieldText = getFieldText(value, optionLookupMap, placeholder)
   $: isOptionSelected = optionValue => selectedLookupMap[optionValue] === true
-  $: toggleOption = makeToggleOption(selectedLookupMap, streamed)
+  $: toggleOption = makeToggleOption(selectedLookupMap, value)
 
   const getFieldText = (value, map, placeholder) => {
     if (Array.isArray(value) && value.length > 0) {
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index f549f58d0c..fbb7f80c13 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -36,7 +36,7 @@
 
   const getFieldText = (value, options, placeholder) => {
     // Always use placeholder if no value
-    if (value == null || value === "") {
+    if (value == null || value === "" || value.length == 0) {
       return placeholder || "Choose an option"
     }
 
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index 081e748caf..2624c28e7f 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -305,6 +305,9 @@
                       getOptionLabel={x => x}
                       getOptionValue={x => x}
                       value={rule.value}
+                      on:change={e => {
+                        rule.value = e.detail
+                      }}
                     />
                   {:else if rule.type === "boolean"}
                     <Select
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 1203630de5..d6dddbbe39 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -27,19 +27,12 @@
   $: formField = formApi?.registerField(
     field,
     type,
-    parseDefaultValue(defaultValue),
+    defaultValue,
     disabled,
     validation,
     formStep
   )
 
-  const parseDefaultValue = defaultValue => {
-    if (Array.isArray(defaultValue) && type === "array") {
-      return defaultValue.map(val => String(val))
-    }
-    return defaultValue
-  }
-
   $: schemaType = fieldSchema?.type !== "formula" ? fieldSchema?.type : "string"
 
   // Focus label when editing
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 3b33ef1868..0c512bbe0f 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -128,6 +128,23 @@
     return fields.find(field => get(field).name === name)
   }
 
+  const getDefault = (defaultValue, schema, type) => {
+    // Remove any values not present in the field schema
+    // Convert any values supplied to string
+    if (Array.isArray(defaultValue) && type == "array") {
+      return defaultValue.reduce((acc, entry) => {
+        let processedOption = String(entry)
+        let schemaOptions = schema.constraints.inclusion
+        if (schemaOptions.indexOf(processedOption) > -1) {
+          acc.push(processedOption)
+        }
+        return acc
+      }, [])
+    } else {
+      return defaultValue
+    }
+  }
+
   const formApi = {
     registerField: (
       field,
@@ -143,6 +160,7 @@
 
       // Create validation function based on field schema
       const schemaConstraints = schema?.[field]?.constraints
+
       const validator = disableValidation
         ? null
         : createValidatorFromConstraints(
@@ -152,8 +170,10 @@
             table
           )
 
+      const parsedDefault = getDefault(defaultValue, schema?.[field], type)
+
       // If we've already registered this field then keep some existing state
-      let initialValue = Helpers.deepGet(initialValues, field) ?? defaultValue
+      let initialValue = Helpers.deepGet(initialValues, field) ?? parsedDefault
       let initialError = null
       let fieldId = `id-${Helpers.uuid()}`
       const existingField = getField(field)
@@ -186,11 +206,11 @@
           error: initialError,
           disabled:
             disabled || fieldDisabled || (isAutoColumn && !editAutoColumns),
-          defaultValue,
+          defaultValue: parsedDefault,
           validator,
           lastUpdate: Date.now(),
         },
-        fieldApi: makeFieldApi(field, defaultValue),
+        fieldApi: makeFieldApi(field, parsedDefault),
         fieldSchema: schema?.[field] ?? {},
       })
 

From 008d4dfd7fb0ac82a4d26c6a50133bfcfb6818c5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 21 Oct 2022 10:32:32 +0100
Subject: [PATCH 06/27] Ensure non string types are ignored when searching for
 HBS blocks

---
 packages/string-templates/src/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js
index eae545de14..ab7afc1dcc 100644
--- a/packages/string-templates/src/index.js
+++ b/packages/string-templates/src/index.js
@@ -323,6 +323,9 @@ module.exports.doesContainStrings = (template, strings) => {
  * @return {string[]} The found HBS blocks.
  */
 module.exports.findHBSBlocks = string => {
+  if (!string || typeof string !== "string") {
+    return []
+  }
   let regexp = new RegExp(FIND_ANY_HBS_REGEX)
   let matches = string.match(regexp)
   if (matches == null) {

From 69846d9ee1552462d89c630cabefc8c7b93dc66a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 21 Oct 2022 09:58:52 +0000
Subject: [PATCH 07/27] v2.0.34

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 854f49ae42..847db9bcd1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.33",
+  "version": "2.0.34",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index effca67953..d7f5b56339 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.33",
+    "@budibase/types": "^2.0.34",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 900879e882..173b322977 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
     "@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 2c4264160f..6c4015d749 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
-    "@budibase/client": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
+    "@budibase/client": "^2.0.34",
+    "@budibase/frontend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
     "@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 34e1d74169..4fc6dc1b86 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 8aa264bf70..ae22d7d8a8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
-    "@budibase/frontend-core": "^2.0.33",
-    "@budibase/string-templates": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
+    "@budibase/frontend-core": "^2.0.34",
+    "@budibase/string-templates": "^2.0.34",
     "@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 0c0b18df9b..222f4a9598 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.33",
+    "@budibase/bbui": "^2.0.34",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 3612328dc5..884c443249 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 65940c7bc2..5ffb043966 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.33",
-    "@budibase/client": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
+    "@budibase/client": "^2.0.34",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fb3450760c..4ecb13eadf 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index ba513029bb..1ae6f5a033 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 748fb7a065..c00f657143 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.33",
+    "@budibase/backend-core": "^2.0.34",
     "@budibase/pro": "2.0.33",
-    "@budibase/string-templates": "^2.0.33",
-    "@budibase/types": "^2.0.33",
+    "@budibase/string-templates": "^2.0.34",
+    "@budibase/types": "^2.0.34",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 721c75d39e3ab8dd91ffa6633a1a8dadec41aa2d Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 21 Oct 2022 10:02:00 +0000
Subject: [PATCH 08/27] Update pro version to 2.0.34

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 5ffb043966..4e2bbf4f66 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.34",
     "@budibase/client": "^2.0.34",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34",
     "@budibase/string-templates": "^2.0.34",
     "@budibase/types": "^2.0.34",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a6acdda8b9..abb3de2e76 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
+  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "^2.0.34"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
+  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34"
+    "@budibase/types" "2.0.34"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
+  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c00f657143..7f05ac0f87 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.34",
-    "@budibase/pro": "2.0.33",
+    "@budibase/pro": "2.0.34",
     "@budibase/string-templates": "^2.0.34",
     "@budibase/types": "^2.0.34",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e8058520eb..6929ea98b6 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.33.tgz#adb9e727deeb8a46932f8f12090a9562dc34bb54"
-  integrity sha512-cHlBvk7JW351WfzvzE13VkPxcTwjFY/+dORsANjm2WeesmO9SKDINzakTEISI1EpJCl4r/b7P4jpx3OgX+iecg==
+"@budibase/backend-core@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
+  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
   dependencies:
-    "@budibase/types" "^2.0.33"
+    "@budibase/types" "^2.0.34"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.33.tgz#be74080445036373c2cb34798b5a6f6a11267f7e"
-  integrity sha512-bVQmw/qY9WqDkmdX38Ga0UdQg7xd+uLzXAqRPkuOBeKr+gXvIdYrRHuuaoos47asxhd9+NcwjyYNai6FZ/w30w==
+"@budibase/pro@2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
+  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
   dependencies:
-    "@budibase/backend-core" "2.0.33"
-    "@budibase/types" "2.0.33"
+    "@budibase/backend-core" "2.0.34"
+    "@budibase/types" "2.0.34"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.33", "@budibase/types@^2.0.33":
-  version "2.0.33"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.33.tgz#0e87fd976ad9e5a84f05b3dfa0daf71e9150cd7b"
-  integrity sha512-QVUciZO4wkJpWyWNgP1MxKdfDzP1of6iDLFfo6J/lgp5voluFxEZsY0A5MOMQEf8TFw990h3gCOCNaN/GwMviw==
+"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
+  version "2.0.34"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
+  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 76394d1673dfe636a809047d8bf03ff4feaaab69 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 21 Oct 2022 15:33:56 +0100
Subject: [PATCH 09/27] Ensure bindings are not mutated when enriching with
 custom icons

---
 .../src/components/automation/SetupPanel/RowSelector.svelte  | 5 +++--
 .../components/automation/SetupPanel/RowSelectorTypes.svelte | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index b3d50c1658..e5a5b2af8c 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -15,8 +15,9 @@
   export let isTestModal
 
   $: parsedBindings = bindings.map(binding => {
-    binding.icon = "ShareAndroid"
-    return binding
+    let clone = Object.assign({}, binding)
+    clone.icon = "ShareAndroid"
+    return clone
   })
 
   let table
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index ee95ee613f..0e5e13ce1e 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -21,8 +21,9 @@
   export let isTestModal
 
   $: parsedBindings = bindings.map(binding => {
-    binding.icon = "ShareAndroid"
-    return binding
+    let clone = Object.assign({}, binding)
+    clone.icon = "ShareAndroid"
+    return clone
   })
 
   function schemaHasOptions(schema) {

From 6f148d31345d86d33e8bca6d82df8635f3a076a4 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 21 Oct 2022 16:47:59 +0100
Subject: [PATCH 10/27] Apply transition locally to color picker

---
 packages/bbui/src/ColorPicker/ColorPicker.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/ColorPicker/ColorPicker.svelte b/packages/bbui/src/ColorPicker/ColorPicker.svelte
index 52a877415b..f972a360de 100644
--- a/packages/bbui/src/ColorPicker/ColorPicker.svelte
+++ b/packages/bbui/src/ColorPicker/ColorPicker.svelte
@@ -132,7 +132,7 @@
   {#if open}
     <div
       use:clickOutside={() => (open = false)}
-      transition:fly={{ y: -20, duration: 200 }}
+      transition:fly|local={{ y: -20, duration: 200 }}
       class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open"
       class:spectrum-Popover--align-right={alignRight}
     >

From 5e9860ab18fc6c6f3de785460ae25cc75ace42b6 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 24 Oct 2022 09:07:14 +0100
Subject: [PATCH 11/27] Separating the multiselect fix into its own ticket

---
 packages/bbui/src/Form/Core/Select.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index fbb7f80c13..f549f58d0c 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -36,7 +36,7 @@
 
   const getFieldText = (value, options, placeholder) => {
     // Always use placeholder if no value
-    if (value == null || value === "" || value.length == 0) {
+    if (value == null || value === "") {
       return placeholder || "Choose an option"
     }
 

From eb8461def098bdd972db1dcec4fd32205e03722c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 09:55:12 +0000
Subject: [PATCH 12/27] v2.0.35

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 847db9bcd1..b037f02d34 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.34",
+  "version": "2.0.35",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index d7f5b56339..bb19c5912a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.34",
+    "@budibase/types": "^2.0.35",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 173b322977..91addce429 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.34",
+    "@budibase/string-templates": "^2.0.35",
     "@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 6c4015d749..39dd6584b5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.34",
-    "@budibase/client": "^2.0.34",
-    "@budibase/frontend-core": "^2.0.34",
-    "@budibase/string-templates": "^2.0.34",
+    "@budibase/bbui": "^2.0.35",
+    "@budibase/client": "^2.0.35",
+    "@budibase/frontend-core": "^2.0.35",
+    "@budibase/string-templates": "^2.0.35",
     "@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 4fc6dc1b86..e81fc24a3a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.34",
-    "@budibase/string-templates": "^2.0.34",
-    "@budibase/types": "^2.0.34",
+    "@budibase/backend-core": "^2.0.35",
+    "@budibase/string-templates": "^2.0.35",
+    "@budibase/types": "^2.0.35",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index ae22d7d8a8..72db9a2da3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.34",
-    "@budibase/frontend-core": "^2.0.34",
-    "@budibase/string-templates": "^2.0.34",
+    "@budibase/bbui": "^2.0.35",
+    "@budibase/frontend-core": "^2.0.35",
+    "@budibase/string-templates": "^2.0.35",
     "@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 222f4a9598..ec76239cf3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.34",
+    "@budibase/bbui": "^2.0.35",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 884c443249..f509ccaae2 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 4e2bbf4f66..c7c80d03cc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.34",
-    "@budibase/client": "^2.0.34",
+    "@budibase/backend-core": "^2.0.35",
+    "@budibase/client": "^2.0.35",
     "@budibase/pro": "2.0.34",
-    "@budibase/string-templates": "^2.0.34",
-    "@budibase/types": "^2.0.34",
+    "@budibase/string-templates": "^2.0.35",
+    "@budibase/types": "^2.0.35",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 4ecb13eadf..143bdb05bb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1ae6f5a033..e2a157d940 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7f05ac0f87..19d8262426 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.34",
+    "@budibase/backend-core": "^2.0.35",
     "@budibase/pro": "2.0.34",
-    "@budibase/string-templates": "^2.0.34",
-    "@budibase/types": "^2.0.34",
+    "@budibase/string-templates": "^2.0.35",
+    "@budibase/types": "^2.0.35",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 5c5aa7376b9448fd79d035342a09f0986f6dbc0d Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 09:58:48 +0000
Subject: [PATCH 13/27] Update pro version to 2.0.35

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index c7c80d03cc..f7267e758a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.35",
     "@budibase/client": "^2.0.35",
-    "@budibase/pro": "2.0.34",
+    "@budibase/pro": "2.0.35",
     "@budibase/string-templates": "^2.0.35",
     "@budibase/types": "^2.0.35",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index abb3de2e76..515d68df0a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
-  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
+"@budibase/backend-core@2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.35.tgz#e2d74f0c46eb27ddb75187033ddbd8a9c4cdd07c"
+  integrity sha512-scrmeQh3cTpvHgtL4QJtmMigvbCjYFq0Qv5jVCn8cF7oMmbu32D0Wxn7ty0vuPb3jZrG5Qc0wbSyZNjQTuu9sw==
   dependencies:
-    "@budibase/types" "^2.0.34"
+    "@budibase/types" "^2.0.35"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
-  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
+"@budibase/pro@2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.35.tgz#b458acf20510a076c299627769d1664cf45611cc"
+  integrity sha512-BuCvP4cwAi92q+cbYWCA2KwvnwO7+gsg7qPKx9upC1+80JOQbVSVQfklGvJKLYB3szyqfKyuxSOqC9dEcg/F+A==
   dependencies:
-    "@budibase/backend-core" "2.0.34"
-    "@budibase/types" "2.0.34"
+    "@budibase/backend-core" "2.0.35"
+    "@budibase/types" "2.0.35"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
-  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
+"@budibase/types@2.0.35", "@budibase/types@^2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.35.tgz#6ed367e7a45e254748bfdac418480b8b24e0acf7"
+  integrity sha512-7QnrWjXSqKyJfUiTwQH/+5BCTPx0VG6hkkeNGYIaPxfa02tH2YcFjXMTzc+7FDH5iZUH4Z8TmFUdPlkBk1eiSg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 19d8262426..dad1328543 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.35",
-    "@budibase/pro": "2.0.34",
+    "@budibase/pro": "2.0.35",
     "@budibase/string-templates": "^2.0.35",
     "@budibase/types": "^2.0.35",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 6929ea98b6..50afa28dbd 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
-  integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
+"@budibase/backend-core@2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.35.tgz#e2d74f0c46eb27ddb75187033ddbd8a9c4cdd07c"
+  integrity sha512-scrmeQh3cTpvHgtL4QJtmMigvbCjYFq0Qv5jVCn8cF7oMmbu32D0Wxn7ty0vuPb3jZrG5Qc0wbSyZNjQTuu9sw==
   dependencies:
-    "@budibase/types" "^2.0.34"
+    "@budibase/types" "^2.0.35"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
-  integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
+"@budibase/pro@2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.35.tgz#b458acf20510a076c299627769d1664cf45611cc"
+  integrity sha512-BuCvP4cwAi92q+cbYWCA2KwvnwO7+gsg7qPKx9upC1+80JOQbVSVQfklGvJKLYB3szyqfKyuxSOqC9dEcg/F+A==
   dependencies:
-    "@budibase/backend-core" "2.0.34"
-    "@budibase/types" "2.0.34"
+    "@budibase/backend-core" "2.0.35"
+    "@budibase/types" "2.0.35"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
-  version "2.0.34"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
-  integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
+"@budibase/types@2.0.35", "@budibase/types@^2.0.35":
+  version "2.0.35"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.35.tgz#6ed367e7a45e254748bfdac418480b8b24e0acf7"
+  integrity sha512-7QnrWjXSqKyJfUiTwQH/+5BCTPx0VG6hkkeNGYIaPxfa02tH2YcFjXMTzc+7FDH5iZUH4Z8TmFUdPlkBk1eiSg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From b2677e0a37bdd9bc3da7bde719928bbe35ae1a62 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 11:47:15 +0000
Subject: [PATCH 14/27] v2.0.36

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index b037f02d34..79be19b0d8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.35",
+  "version": "2.0.36",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bb19c5912a..742f6ddd69 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.35",
+    "@budibase/types": "^2.0.36",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 91addce429..ee3e02b3a6 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.35",
+    "@budibase/string-templates": "^2.0.36",
     "@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 39dd6584b5..883acaa39f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.35",
-    "@budibase/client": "^2.0.35",
-    "@budibase/frontend-core": "^2.0.35",
-    "@budibase/string-templates": "^2.0.35",
+    "@budibase/bbui": "^2.0.36",
+    "@budibase/client": "^2.0.36",
+    "@budibase/frontend-core": "^2.0.36",
+    "@budibase/string-templates": "^2.0.36",
     "@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 e81fc24a3a..e6dca26c6a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.35",
-    "@budibase/string-templates": "^2.0.35",
-    "@budibase/types": "^2.0.35",
+    "@budibase/backend-core": "^2.0.36",
+    "@budibase/string-templates": "^2.0.36",
+    "@budibase/types": "^2.0.36",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 72db9a2da3..28e5720801 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.35",
-    "@budibase/frontend-core": "^2.0.35",
-    "@budibase/string-templates": "^2.0.35",
+    "@budibase/bbui": "^2.0.36",
+    "@budibase/frontend-core": "^2.0.36",
+    "@budibase/string-templates": "^2.0.36",
     "@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 ec76239cf3..5fca9f1ff2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.35",
+    "@budibase/bbui": "^2.0.36",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f509ccaae2..4d9a34940d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index f7267e758a..dac91dd287 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.35",
-    "@budibase/client": "^2.0.35",
+    "@budibase/backend-core": "^2.0.36",
+    "@budibase/client": "^2.0.36",
     "@budibase/pro": "2.0.35",
-    "@budibase/string-templates": "^2.0.35",
-    "@budibase/types": "^2.0.35",
+    "@budibase/string-templates": "^2.0.36",
+    "@budibase/types": "^2.0.36",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 143bdb05bb..8b51b2583d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index e2a157d940..0eca2aef63 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index dad1328543..dc696984d8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.35",
+    "@budibase/backend-core": "^2.0.36",
     "@budibase/pro": "2.0.35",
-    "@budibase/string-templates": "^2.0.35",
-    "@budibase/types": "^2.0.35",
+    "@budibase/string-templates": "^2.0.36",
+    "@budibase/types": "^2.0.36",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0a913d011187fb993bc2bcdd3bfbc7e0c1925675 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 11:50:36 +0000
Subject: [PATCH 15/27] Update pro version to 2.0.36

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index dac91dd287..dad858d472 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.36",
     "@budibase/client": "^2.0.36",
-    "@budibase/pro": "2.0.35",
+    "@budibase/pro": "2.0.36",
     "@budibase/string-templates": "^2.0.36",
     "@budibase/types": "^2.0.36",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 515d68df0a..9e25fdf58f 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.35.tgz#e2d74f0c46eb27ddb75187033ddbd8a9c4cdd07c"
-  integrity sha512-scrmeQh3cTpvHgtL4QJtmMigvbCjYFq0Qv5jVCn8cF7oMmbu32D0Wxn7ty0vuPb3jZrG5Qc0wbSyZNjQTuu9sw==
+"@budibase/backend-core@2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.36.tgz#8f2cc0a6257676fc0a3093fffb7f78038957087c"
+  integrity sha512-dHrlUYWgAD5vcpn3NJVCIG7Oy3aXlcVOM5eHmp11GLYVZl27Dakw+XKg8BCQc2y7PIQk9nXFd5sPZkCceqe5vg==
   dependencies:
-    "@budibase/types" "^2.0.35"
+    "@budibase/types" "^2.0.36"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.35.tgz#b458acf20510a076c299627769d1664cf45611cc"
-  integrity sha512-BuCvP4cwAi92q+cbYWCA2KwvnwO7+gsg7qPKx9upC1+80JOQbVSVQfklGvJKLYB3szyqfKyuxSOqC9dEcg/F+A==
+"@budibase/pro@2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.36.tgz#5dbc7d9cce53fa9136418063a565e95dd020568c"
+  integrity sha512-Tb+KIFIpsjvTKCLQfrw5wHa7rKoNArR2RyOVT6gabQMUQD1gypOJ5eIQEEt2/VtODLog7HHUPWFYCnrOYkkhtA==
   dependencies:
-    "@budibase/backend-core" "2.0.35"
-    "@budibase/types" "2.0.35"
+    "@budibase/backend-core" "2.0.36"
+    "@budibase/types" "2.0.36"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.35", "@budibase/types@^2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.35.tgz#6ed367e7a45e254748bfdac418480b8b24e0acf7"
-  integrity sha512-7QnrWjXSqKyJfUiTwQH/+5BCTPx0VG6hkkeNGYIaPxfa02tH2YcFjXMTzc+7FDH5iZUH4Z8TmFUdPlkBk1eiSg==
+"@budibase/types@2.0.36", "@budibase/types@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.36.tgz#2193213a9c13b8cea0fe53089483fa67e20d310b"
+  integrity sha512-E2CEtyNUGaYBNXIbA5c1rST6Cm1YmAd2pfXnAqObGzQFVKBbLdHba15JvoYRy3GmZZfmzShd4CRjgz6D0YC8Rw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index dc696984d8..9b25ff7fea 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.36",
-    "@budibase/pro": "2.0.35",
+    "@budibase/pro": "2.0.36",
     "@budibase/string-templates": "^2.0.36",
     "@budibase/types": "^2.0.36",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 50afa28dbd..2ce979eb87 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.35.tgz#e2d74f0c46eb27ddb75187033ddbd8a9c4cdd07c"
-  integrity sha512-scrmeQh3cTpvHgtL4QJtmMigvbCjYFq0Qv5jVCn8cF7oMmbu32D0Wxn7ty0vuPb3jZrG5Qc0wbSyZNjQTuu9sw==
+"@budibase/backend-core@2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.36.tgz#8f2cc0a6257676fc0a3093fffb7f78038957087c"
+  integrity sha512-dHrlUYWgAD5vcpn3NJVCIG7Oy3aXlcVOM5eHmp11GLYVZl27Dakw+XKg8BCQc2y7PIQk9nXFd5sPZkCceqe5vg==
   dependencies:
-    "@budibase/types" "^2.0.35"
+    "@budibase/types" "^2.0.36"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.35.tgz#b458acf20510a076c299627769d1664cf45611cc"
-  integrity sha512-BuCvP4cwAi92q+cbYWCA2KwvnwO7+gsg7qPKx9upC1+80JOQbVSVQfklGvJKLYB3szyqfKyuxSOqC9dEcg/F+A==
+"@budibase/pro@2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.36.tgz#5dbc7d9cce53fa9136418063a565e95dd020568c"
+  integrity sha512-Tb+KIFIpsjvTKCLQfrw5wHa7rKoNArR2RyOVT6gabQMUQD1gypOJ5eIQEEt2/VtODLog7HHUPWFYCnrOYkkhtA==
   dependencies:
-    "@budibase/backend-core" "2.0.35"
-    "@budibase/types" "2.0.35"
+    "@budibase/backend-core" "2.0.36"
+    "@budibase/types" "2.0.36"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.35", "@budibase/types@^2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.35.tgz#6ed367e7a45e254748bfdac418480b8b24e0acf7"
-  integrity sha512-7QnrWjXSqKyJfUiTwQH/+5BCTPx0VG6hkkeNGYIaPxfa02tH2YcFjXMTzc+7FDH5iZUH4Z8TmFUdPlkBk1eiSg==
+"@budibase/types@2.0.36", "@budibase/types@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.36.tgz#2193213a9c13b8cea0fe53089483fa67e20d310b"
+  integrity sha512-E2CEtyNUGaYBNXIbA5c1rST6Cm1YmAd2pfXnAqObGzQFVKBbLdHba15JvoYRy3GmZZfmzShd4CRjgz6D0YC8Rw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 3d35c9752a14c360bb633238af6712914901d750 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 24 Oct 2022 14:56:05 +0100
Subject: [PATCH 16/27] Allow automations scroll. Copy datasource class.

---
 .../automation/AutomationPanel/AutomationPanel.svelte    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index 2f57767863..b586db9731 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -7,7 +7,7 @@
   export let webhookModal
 </script>
 
-<div class="title">
+<div class="nav">
   <Tabs selected="Automations">
     <Tab title="Automations">
       <AutomationList />
@@ -27,12 +27,15 @@
     top: var(--spacing-l);
     right: var(--spacing-xl);
   }
-
-  .title {
+  .nav {
+    overflow-y: auto;
+    background: var(--background);
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
     position: relative;
+    border-right: var(--border-light);
+    margin-bottom: -60px;
   }
 </style>

From e06b8017def30e940318679049bc62af1bc2294e Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 24 Oct 2022 15:02:56 +0100
Subject: [PATCH 17/27] Add padding

---
 .../automation/AutomationPanel/AutomationPanel.svelte           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index b586db9731..2e4dc5e27b 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -36,6 +36,6 @@
     align-items: stretch;
     position: relative;
     border-right: var(--border-light);
-    margin-bottom: -60px;
+    padding-bottom: 60px;
   }
 </style>

From cee8a810b95549c775741ee2322120f067d66df2 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 14:40:33 +0000
Subject: [PATCH 18/27] v2.0.37

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 79be19b0d8..cf842a80a4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.36",
+  "version": "2.0.37",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 742f6ddd69..40832284dd 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.36",
+    "@budibase/types": "^2.0.37",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ee3e02b3a6..33f95942ca 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.36",
+    "@budibase/string-templates": "^2.0.37",
     "@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 883acaa39f..9843005ca3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.36",
-    "@budibase/client": "^2.0.36",
-    "@budibase/frontend-core": "^2.0.36",
-    "@budibase/string-templates": "^2.0.36",
+    "@budibase/bbui": "^2.0.37",
+    "@budibase/client": "^2.0.37",
+    "@budibase/frontend-core": "^2.0.37",
+    "@budibase/string-templates": "^2.0.37",
     "@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 e6dca26c6a..df6a874bea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.36",
-    "@budibase/string-templates": "^2.0.36",
-    "@budibase/types": "^2.0.36",
+    "@budibase/backend-core": "^2.0.37",
+    "@budibase/string-templates": "^2.0.37",
+    "@budibase/types": "^2.0.37",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 28e5720801..6a16058416 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.36",
-    "@budibase/frontend-core": "^2.0.36",
-    "@budibase/string-templates": "^2.0.36",
+    "@budibase/bbui": "^2.0.37",
+    "@budibase/frontend-core": "^2.0.37",
+    "@budibase/string-templates": "^2.0.37",
     "@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 5fca9f1ff2..af71ddf2b6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.36",
+    "@budibase/bbui": "^2.0.37",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4d9a34940d..d22a431bcc 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index dad858d472..f0ea590c3b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.36",
-    "@budibase/client": "^2.0.36",
+    "@budibase/backend-core": "^2.0.37",
+    "@budibase/client": "^2.0.37",
     "@budibase/pro": "2.0.36",
-    "@budibase/string-templates": "^2.0.36",
-    "@budibase/types": "^2.0.36",
+    "@budibase/string-templates": "^2.0.37",
+    "@budibase/types": "^2.0.37",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 8b51b2583d..e908716092 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 0eca2aef63..e01d02773c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9b25ff7fea..b95f64a4fb 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.36",
+  "version": "2.0.37",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.36",
+    "@budibase/backend-core": "^2.0.37",
     "@budibase/pro": "2.0.36",
-    "@budibase/string-templates": "^2.0.36",
-    "@budibase/types": "^2.0.36",
+    "@budibase/string-templates": "^2.0.37",
+    "@budibase/types": "^2.0.37",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From fff8b6a38651591bff2efe23f46425da65ecc888 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 24 Oct 2022 14:43:52 +0000
Subject: [PATCH 19/27] Update pro version to 2.0.37

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index f0ea590c3b..2054903bc7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.37",
     "@budibase/client": "^2.0.37",
-    "@budibase/pro": "2.0.36",
+    "@budibase/pro": "2.0.37",
     "@budibase/string-templates": "^2.0.37",
     "@budibase/types": "^2.0.37",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 9e25fdf58f..d1cb3153eb 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.36.tgz#8f2cc0a6257676fc0a3093fffb7f78038957087c"
-  integrity sha512-dHrlUYWgAD5vcpn3NJVCIG7Oy3aXlcVOM5eHmp11GLYVZl27Dakw+XKg8BCQc2y7PIQk9nXFd5sPZkCceqe5vg==
+"@budibase/backend-core@2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.37.tgz#6cf1a105176ec8cb841de1b8a1bd4e93ac62a897"
+  integrity sha512-8gIwTdR9plIzv6DCIH1sKmCEUPj4Ab/nPx/5FwJjuoSmY7riJCtHNFaHHbqgkq6b4uAsohy81ZCrsDYSJpCbIQ==
   dependencies:
-    "@budibase/types" "^2.0.36"
+    "@budibase/types" "^2.0.37"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.36.tgz#5dbc7d9cce53fa9136418063a565e95dd020568c"
-  integrity sha512-Tb+KIFIpsjvTKCLQfrw5wHa7rKoNArR2RyOVT6gabQMUQD1gypOJ5eIQEEt2/VtODLog7HHUPWFYCnrOYkkhtA==
+"@budibase/pro@2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.37.tgz#65a9709662e6f4cdd4c37767f4e5eeefe0ba06f3"
+  integrity sha512-1y1zFQx9RW2VAODlFDL1Lge0iRRn0UEBLZhOKTLz+MgI3yHE3a6lQg1wNDXj2/WL2oQC5qt0LnE5RAhWjs4Nng==
   dependencies:
-    "@budibase/backend-core" "2.0.36"
-    "@budibase/types" "2.0.36"
+    "@budibase/backend-core" "2.0.37"
+    "@budibase/types" "2.0.37"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.36", "@budibase/types@^2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.36.tgz#2193213a9c13b8cea0fe53089483fa67e20d310b"
-  integrity sha512-E2CEtyNUGaYBNXIbA5c1rST6Cm1YmAd2pfXnAqObGzQFVKBbLdHba15JvoYRy3GmZZfmzShd4CRjgz6D0YC8Rw==
+"@budibase/types@2.0.37", "@budibase/types@^2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.37.tgz#724898e3ca1ca8d387a827058d3f550a2e2a82d1"
+  integrity sha512-wFhZjEJ+GnfdndJj4TlhgK8ZNaJmz4viVZUIEcvoXYWAU2i6ICcNop3qtssJ4fji5v41Oi3oEnvv8/Wk4VQWQQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b95f64a4fb..3847121246 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.37",
-    "@budibase/pro": "2.0.36",
+    "@budibase/pro": "2.0.37",
     "@budibase/string-templates": "^2.0.37",
     "@budibase/types": "^2.0.37",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 2ce979eb87..5ec38aa18d 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.36.tgz#8f2cc0a6257676fc0a3093fffb7f78038957087c"
-  integrity sha512-dHrlUYWgAD5vcpn3NJVCIG7Oy3aXlcVOM5eHmp11GLYVZl27Dakw+XKg8BCQc2y7PIQk9nXFd5sPZkCceqe5vg==
+"@budibase/backend-core@2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.37.tgz#6cf1a105176ec8cb841de1b8a1bd4e93ac62a897"
+  integrity sha512-8gIwTdR9plIzv6DCIH1sKmCEUPj4Ab/nPx/5FwJjuoSmY7riJCtHNFaHHbqgkq6b4uAsohy81ZCrsDYSJpCbIQ==
   dependencies:
-    "@budibase/types" "^2.0.36"
+    "@budibase/types" "^2.0.37"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.36.tgz#5dbc7d9cce53fa9136418063a565e95dd020568c"
-  integrity sha512-Tb+KIFIpsjvTKCLQfrw5wHa7rKoNArR2RyOVT6gabQMUQD1gypOJ5eIQEEt2/VtODLog7HHUPWFYCnrOYkkhtA==
+"@budibase/pro@2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.37.tgz#65a9709662e6f4cdd4c37767f4e5eeefe0ba06f3"
+  integrity sha512-1y1zFQx9RW2VAODlFDL1Lge0iRRn0UEBLZhOKTLz+MgI3yHE3a6lQg1wNDXj2/WL2oQC5qt0LnE5RAhWjs4Nng==
   dependencies:
-    "@budibase/backend-core" "2.0.36"
-    "@budibase/types" "2.0.36"
+    "@budibase/backend-core" "2.0.37"
+    "@budibase/types" "2.0.37"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.36", "@budibase/types@^2.0.36":
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.36.tgz#2193213a9c13b8cea0fe53089483fa67e20d310b"
-  integrity sha512-E2CEtyNUGaYBNXIbA5c1rST6Cm1YmAd2pfXnAqObGzQFVKBbLdHba15JvoYRy3GmZZfmzShd4CRjgz6D0YC8Rw==
+"@budibase/types@2.0.37", "@budibase/types@^2.0.37":
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.37.tgz#724898e3ca1ca8d387a827058d3f550a2e2a82d1"
+  integrity sha512-wFhZjEJ+GnfdndJj4TlhgK8ZNaJmz4viVZUIEcvoXYWAU2i6ICcNop3qtssJ4fji5v41Oi3oEnvv8/Wk4VQWQQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From b21919f9b0e50c7ad351b464a26800bf22b10dec Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 25 Oct 2022 15:19:07 +0100
Subject: [PATCH 20/27] Handle multiple automation loop bindings

---
 .../SetupPanel/AutomationBlockSetup.svelte    |  2 +-
 .../server/src/automations/automationUtils.js | 34 ++++++++++++-------
 .../unitTests/automationUtils.spec.js         | 17 ++++++++++
 3 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 packages/server/src/automations/unitTests/automationUtils.spec.js

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index bb70938dfe..4fd2f40391 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -120,7 +120,7 @@
         allSteps[idx]?.stepId === ActionStepID.LOOP &&
         allSteps.find(x => x.blockToLoop === block.id)
 
-      // If the previous block was a loop block, decerement the index so the following
+      // If the previous block was a loop block, decrement the index so the following
       // steps are in the correct order
       if (wasLoopBlock) {
         loopBlockCount++
diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js
index 0646e453c2..493efe34d2 100644
--- a/packages/server/src/automations/automationUtils.js
+++ b/packages/server/src/automations/automationUtils.js
@@ -82,24 +82,34 @@ exports.getError = err => {
 }
 
 exports.substituteLoopStep = (hbsString, substitute) => {
-  let blocks = []
   let checkForJS = isJSBinding(hbsString)
+  let substitutedHbsString = ""
+  let open = checkForJS ? `$("` : "{{"
+  let closed = checkForJS ? `")` : "}}"
   if (checkForJS) {
     hbsString = decodeJSBinding(hbsString)
-    blocks.push(hbsString)
-  } else {
-    blocks = findHBSBlocks(hbsString)
   }
-  for (let block of blocks) {
-    block = block.replace(/loop/, substitute)
-    if (checkForJS) {
-      hbsString = encodeJSBinding(block)
-    } else {
-      hbsString = block
+  let pointer = 0,
+    openPointer = 0,
+    closedPointer = 0
+  while (pointer < hbsString.length) {
+    openPointer = hbsString.indexOf(open, pointer)
+    closedPointer = hbsString.indexOf(closed, pointer) + 2
+    if (openPointer < 0 || closedPointer < 0) {
+      substitutedHbsString += hbsString.substring(pointer)
+      break
     }
+    let before = hbsString.substring(pointer, openPointer)
+    let block = hbsString
+      .substring(openPointer, closedPointer)
+      .replace(/loop/, substitute)
+    substitutedHbsString += before + block
+    pointer = closedPointer
   }
-
-  return hbsString
+  if (checkForJS) {
+    substitutedHbsString = encodeJSBinding(substitutedHbsString)
+  }
+  return substitutedHbsString
 }
 
 exports.stringSplit = value => {
diff --git a/packages/server/src/automations/unitTests/automationUtils.spec.js b/packages/server/src/automations/unitTests/automationUtils.spec.js
new file mode 100644
index 0000000000..0992bd6eb2
--- /dev/null
+++ b/packages/server/src/automations/unitTests/automationUtils.spec.js
@@ -0,0 +1,17 @@
+const automationUtils = require("../automationUtils")
+
+describe("automationUtils", () => {
+    test("substituteLoopStep should allow multiple loop binding substitutes", () => {
+        expect(automationUtils.substituteLoopStep(
+            `{{ loop.currentItem._id }} {{ loop.currentItem._id }} {{ loop.currentItem._id }}`, 
+            "step.2"))
+        .toBe(`{{ step.2.currentItem._id }} {{ step.2.currentItem._id }} {{ step.2.currentItem._id }}`)
+    })
+
+    test("substituteLoopStep should handle not subsituting outside of curly braces", () => {
+        expect(automationUtils.substituteLoopStep(
+            `loop {{ loop.currentItem._id }}loop loop{{ loop.currentItem._id }}loop`, 
+            "step.2"))
+        .toBe(`loop {{ step.2.currentItem._id }}loop loop{{ step.2.currentItem._id }}loop`)
+    })
+})
\ No newline at end of file

From aceb7f71078cfb0bf9fe9341459655c696aa4732 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 25 Oct 2022 15:19:46 +0100
Subject: [PATCH 21/27] Unused import

---
 packages/server/src/automations/automationUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.js
index 493efe34d2..e5a786f71a 100644
--- a/packages/server/src/automations/automationUtils.js
+++ b/packages/server/src/automations/automationUtils.js
@@ -1,6 +1,5 @@
 const { getTable } = require("../api/controllers/table/utils")
 const {
-  findHBSBlocks,
   decodeJSBinding,
   isJSBinding,
   encodeJSBinding,

From 59f4582687ba685c4f2228c0d5b29f5ed8400cbc Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 25 Oct 2022 15:43:52 +0000
Subject: [PATCH 22/27] v2.0.38

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index cf842a80a4..6e25699ad9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.37",
+  "version": "2.0.38",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 40832284dd..bc5a19e63c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.37",
+    "@budibase/types": "^2.0.38",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 33f95942ca..e05760fa60 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.37",
+    "@budibase/string-templates": "^2.0.38",
     "@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 9843005ca3..4020d25453 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.37",
-    "@budibase/client": "^2.0.37",
-    "@budibase/frontend-core": "^2.0.37",
-    "@budibase/string-templates": "^2.0.37",
+    "@budibase/bbui": "^2.0.38",
+    "@budibase/client": "^2.0.38",
+    "@budibase/frontend-core": "^2.0.38",
+    "@budibase/string-templates": "^2.0.38",
     "@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 df6a874bea..3df8749c94 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.37",
-    "@budibase/string-templates": "^2.0.37",
-    "@budibase/types": "^2.0.37",
+    "@budibase/backend-core": "^2.0.38",
+    "@budibase/string-templates": "^2.0.38",
+    "@budibase/types": "^2.0.38",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 6a16058416..bf43f9b853 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.37",
-    "@budibase/frontend-core": "^2.0.37",
-    "@budibase/string-templates": "^2.0.37",
+    "@budibase/bbui": "^2.0.38",
+    "@budibase/frontend-core": "^2.0.38",
+    "@budibase/string-templates": "^2.0.38",
     "@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 af71ddf2b6..d026ae62fc 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.37",
+    "@budibase/bbui": "^2.0.38",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d22a431bcc..3373139ac4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 2054903bc7..0f0ce3f87e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.37",
-    "@budibase/client": "^2.0.37",
+    "@budibase/backend-core": "^2.0.38",
+    "@budibase/client": "^2.0.38",
     "@budibase/pro": "2.0.37",
-    "@budibase/string-templates": "^2.0.37",
-    "@budibase/types": "^2.0.37",
+    "@budibase/string-templates": "^2.0.38",
+    "@budibase/types": "^2.0.38",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index e908716092..8cdab84af1 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index e01d02773c..0e97037a5a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3847121246..ac4c441043 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.37",
+    "@budibase/backend-core": "^2.0.38",
     "@budibase/pro": "2.0.37",
-    "@budibase/string-templates": "^2.0.37",
-    "@budibase/types": "^2.0.37",
+    "@budibase/string-templates": "^2.0.38",
+    "@budibase/types": "^2.0.38",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 074008b49955f54b99a93845d25544d012088107 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 25 Oct 2022 15:47:09 +0000
Subject: [PATCH 23/27] Update pro version to 2.0.38

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0f0ce3f87e..c89760ca62 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.38",
     "@budibase/client": "^2.0.38",
-    "@budibase/pro": "2.0.37",
+    "@budibase/pro": "2.0.38",
     "@budibase/string-templates": "^2.0.38",
     "@budibase/types": "^2.0.38",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index d1cb3153eb..1f51f29c7a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.37.tgz#6cf1a105176ec8cb841de1b8a1bd4e93ac62a897"
-  integrity sha512-8gIwTdR9plIzv6DCIH1sKmCEUPj4Ab/nPx/5FwJjuoSmY7riJCtHNFaHHbqgkq6b4uAsohy81ZCrsDYSJpCbIQ==
+"@budibase/backend-core@2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.38.tgz#d02a58b777e7598e1377cfe42f092d08cd905374"
+  integrity sha512-hD+5hwlTN6AdgAzHE9oJLT8cqMFcxcjGacFZSJXJ8SIJAJJL1B25ouhY6PLbbo4XJpD2FV/xpIQxWrAGl8tN/A==
   dependencies:
-    "@budibase/types" "^2.0.37"
+    "@budibase/types" "^2.0.38"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.37.tgz#65a9709662e6f4cdd4c37767f4e5eeefe0ba06f3"
-  integrity sha512-1y1zFQx9RW2VAODlFDL1Lge0iRRn0UEBLZhOKTLz+MgI3yHE3a6lQg1wNDXj2/WL2oQC5qt0LnE5RAhWjs4Nng==
+"@budibase/pro@2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.38.tgz#c307b0d49fb8a2d94e7ccb89445862645c5bc6b7"
+  integrity sha512-bR5HzQNcsrf7iYOERm/5XcK2RrEWcx7aR1vFCV+tDLHRq+h1VMo/YVaPCpcrnsgl+cQoccpHacv0fHO/VbIlJw==
   dependencies:
-    "@budibase/backend-core" "2.0.37"
-    "@budibase/types" "2.0.37"
+    "@budibase/backend-core" "2.0.38"
+    "@budibase/types" "2.0.38"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.37", "@budibase/types@^2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.37.tgz#724898e3ca1ca8d387a827058d3f550a2e2a82d1"
-  integrity sha512-wFhZjEJ+GnfdndJj4TlhgK8ZNaJmz4viVZUIEcvoXYWAU2i6ICcNop3qtssJ4fji5v41Oi3oEnvv8/Wk4VQWQQ==
+"@budibase/types@2.0.38", "@budibase/types@^2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.38.tgz#eb280a77333a0c4ae064e239534f5dd7a4adf7aa"
+  integrity sha512-xuFj7gi6v3MxTQSVpQJm5lXXu103yX2fvAipZXisUKSsqlSpr5FFf4+LZ95bcgo8KP8J8GNhpSk+M5sbyR6qMA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ac4c441043..70338b78bf 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.38",
-    "@budibase/pro": "2.0.37",
+    "@budibase/pro": "2.0.38",
     "@budibase/string-templates": "^2.0.38",
     "@budibase/types": "^2.0.38",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5ec38aa18d..8077c4f69d 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.37.tgz#6cf1a105176ec8cb841de1b8a1bd4e93ac62a897"
-  integrity sha512-8gIwTdR9plIzv6DCIH1sKmCEUPj4Ab/nPx/5FwJjuoSmY7riJCtHNFaHHbqgkq6b4uAsohy81ZCrsDYSJpCbIQ==
+"@budibase/backend-core@2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.38.tgz#d02a58b777e7598e1377cfe42f092d08cd905374"
+  integrity sha512-hD+5hwlTN6AdgAzHE9oJLT8cqMFcxcjGacFZSJXJ8SIJAJJL1B25ouhY6PLbbo4XJpD2FV/xpIQxWrAGl8tN/A==
   dependencies:
-    "@budibase/types" "^2.0.37"
+    "@budibase/types" "^2.0.38"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.37.tgz#65a9709662e6f4cdd4c37767f4e5eeefe0ba06f3"
-  integrity sha512-1y1zFQx9RW2VAODlFDL1Lge0iRRn0UEBLZhOKTLz+MgI3yHE3a6lQg1wNDXj2/WL2oQC5qt0LnE5RAhWjs4Nng==
+"@budibase/pro@2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.38.tgz#c307b0d49fb8a2d94e7ccb89445862645c5bc6b7"
+  integrity sha512-bR5HzQNcsrf7iYOERm/5XcK2RrEWcx7aR1vFCV+tDLHRq+h1VMo/YVaPCpcrnsgl+cQoccpHacv0fHO/VbIlJw==
   dependencies:
-    "@budibase/backend-core" "2.0.37"
-    "@budibase/types" "2.0.37"
+    "@budibase/backend-core" "2.0.38"
+    "@budibase/types" "2.0.38"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.37", "@budibase/types@^2.0.37":
-  version "2.0.37"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.37.tgz#724898e3ca1ca8d387a827058d3f550a2e2a82d1"
-  integrity sha512-wFhZjEJ+GnfdndJj4TlhgK8ZNaJmz4viVZUIEcvoXYWAU2i6ICcNop3qtssJ4fji5v41Oi3oEnvv8/Wk4VQWQQ==
+"@budibase/types@2.0.38", "@budibase/types@^2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.38.tgz#eb280a77333a0c4ae064e239534f5dd7a4adf7aa"
+  integrity sha512-xuFj7gi6v3MxTQSVpQJm5lXXu103yX2fvAipZXisUKSsqlSpr5FFf4+LZ95bcgo8KP8J8GNhpSk+M5sbyR6qMA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From a4125a97c57d9ee1c8d621454534721fc5f659ad Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 26 Oct 2022 15:13:27 +0100
Subject: [PATCH 24/27] Refactored approach to parsing multiselect values and
 ensuring any parsed values trigger a field update

---
 .../bbui/src/Form/Core/Multiselect.svelte     | 31 ++++++++++++++++++-
 .../src/components/app/forms/InnerForm.svelte | 25 ++-------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index eb39e39042..784cee70dc 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -1,6 +1,6 @@
 <script>
   import Picker from "./Picker.svelte"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, onMount } from "svelte"
 
   export let value = []
   export let id = null
@@ -16,8 +16,33 @@
   export let autoWidth = false
 
   const dispatch = createEventDispatcher()
+  const parseValues = value => {
+    return Array.isArray(value)
+      ? value.reduce((acc, entry) => {
+          if (typeof ele === "string" && entry.trim() === "") {
+            return acc
+          }
+          let processedOption = String(entry)
+          if (options.indexOf(processedOption) > -1) {
+            acc.push(processedOption)
+          }
+          return acc
+        }, [])
+      : []
+  }
+  let loaded = false
+
+  $: combinedValues = value ? [...value].concat(options) : []
+  $: superSet = new Set(combinedValues)
+
+  $: if (loaded && options.length != superSet.size) {
+    // ensure that the values being pushed in are valid.
+    dispatch("change", parseValues(value))
+  }
+
   $: selectedLookupMap = getSelectedLookupMap(value)
   $: optionLookupMap = getOptionLookupMap(options)
+
   $: fieldText = getFieldText(value, optionLookupMap, placeholder)
   $: isOptionSelected = optionValue => selectedLookupMap[optionValue] === true
   $: toggleOption = makeToggleOption(selectedLookupMap, value)
@@ -70,6 +95,10 @@
       }
     }
   }
+
+  onMount(() => {
+    loaded = true
+  })
 </script>
 
 <Picker
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 0c512bbe0f..6b7e1a84d0 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -128,23 +128,6 @@
     return fields.find(field => get(field).name === name)
   }
 
-  const getDefault = (defaultValue, schema, type) => {
-    // Remove any values not present in the field schema
-    // Convert any values supplied to string
-    if (Array.isArray(defaultValue) && type == "array") {
-      return defaultValue.reduce((acc, entry) => {
-        let processedOption = String(entry)
-        let schemaOptions = schema.constraints.inclusion
-        if (schemaOptions.indexOf(processedOption) > -1) {
-          acc.push(processedOption)
-        }
-        return acc
-      }, [])
-    } else {
-      return defaultValue
-    }
-  }
-
   const formApi = {
     registerField: (
       field,
@@ -170,10 +153,8 @@
             table
           )
 
-      const parsedDefault = getDefault(defaultValue, schema?.[field], type)
-
       // If we've already registered this field then keep some existing state
-      let initialValue = Helpers.deepGet(initialValues, field) ?? parsedDefault
+      let initialValue = Helpers.deepGet(initialValues, field) ?? defaultValue
       let initialError = null
       let fieldId = `id-${Helpers.uuid()}`
       const existingField = getField(field)
@@ -206,11 +187,11 @@
           error: initialError,
           disabled:
             disabled || fieldDisabled || (isAutoColumn && !editAutoColumns),
-          defaultValue: parsedDefault,
+          defaultValue,
           validator,
           lastUpdate: Date.now(),
         },
-        fieldApi: makeFieldApi(field, parsedDefault),
+        fieldApi: makeFieldApi(field, defaultValue),
         fieldSchema: schema?.[field] ?? {},
       })
 

From 8018365010e823f99fda8d3bd933753b1832a198 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 28 Oct 2022 15:46:03 +0100
Subject: [PATCH 25/27] Ensure 'validationErrors' is checked for details field
 errors when parsing an error response on update

---
 .../backend/DataTable/modals/CreateEditUser.svelte          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index a67330efa7..d18e8783d2 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -70,7 +70,11 @@
               .map(([key, error]) => ({ dataPath: key, message: error }))
               .flat()
           }
-        } else if (error.status === 400) {
+        } else if (error.status === 400 && response?.validationErrors) {
+          errors = Object.keys(response.validationErrors).map(field => ({
+            message: `${field} ${response.validationErrors[field][0]}`,
+          }))
+        } else {
           errors = [{ message: response?.message || "Unknown error" }]
         }
       } else {

From dce0d52b0ad22c3214c348154a7090f872a82ecf Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 31 Oct 2022 11:03:49 +0000
Subject: [PATCH 26/27] v2.0.39

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 6e25699ad9..4aa9fe34f6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.38",
+  "version": "2.0.39",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bc5a19e63c..c56f9010dc 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^2.0.38",
+    "@budibase/types": "^2.0.39",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e05760fa60..c6755c4446 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^2.0.38",
+    "@budibase/string-templates": "^2.0.39",
     "@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 4020d25453..3102d322e6 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.38",
-    "@budibase/client": "^2.0.38",
-    "@budibase/frontend-core": "^2.0.38",
-    "@budibase/string-templates": "^2.0.38",
+    "@budibase/bbui": "^2.0.39",
+    "@budibase/client": "^2.0.39",
+    "@budibase/frontend-core": "^2.0.39",
+    "@budibase/string-templates": "^2.0.39",
     "@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 3df8749c94..3d5456deb5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.38",
-    "@budibase/string-templates": "^2.0.38",
-    "@budibase/types": "^2.0.38",
+    "@budibase/backend-core": "^2.0.39",
+    "@budibase/string-templates": "^2.0.39",
+    "@budibase/types": "^2.0.39",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index bf43f9b853..78fe7b50b3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.38",
-    "@budibase/frontend-core": "^2.0.38",
-    "@budibase/string-templates": "^2.0.38",
+    "@budibase/bbui": "^2.0.39",
+    "@budibase/frontend-core": "^2.0.39",
+    "@budibase/string-templates": "^2.0.39",
     "@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 d026ae62fc..7308a43ddf 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.0.38",
+    "@budibase/bbui": "^2.0.39",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 3373139ac4..2ddc44721a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c89760ca62..0c2708ba1f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.0.38",
-    "@budibase/client": "^2.0.38",
+    "@budibase/backend-core": "^2.0.39",
+    "@budibase/client": "^2.0.39",
     "@budibase/pro": "2.0.38",
-    "@budibase/string-templates": "^2.0.38",
-    "@budibase/types": "^2.0.38",
+    "@budibase/string-templates": "^2.0.39",
+    "@budibase/types": "^2.0.39",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 8cdab84af1..2cdaf87fdd 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 0e97037a5a..0ed9336feb 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 70338b78bf..6bb267e483 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.38",
+  "version": "2.0.39",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.0.38",
+    "@budibase/backend-core": "^2.0.39",
     "@budibase/pro": "2.0.38",
-    "@budibase/string-templates": "^2.0.38",
-    "@budibase/types": "^2.0.38",
+    "@budibase/string-templates": "^2.0.39",
+    "@budibase/types": "^2.0.39",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 51d5c60b955f6de5805545ee295b834f2fa8b657 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 31 Oct 2022 11:07:43 +0000
Subject: [PATCH 27/27] Update pro version to 2.0.39

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 30 +++++++++++++++---------------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 30 +++++++++++++++---------------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0c2708ba1f..6e743b9a26 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.0.39",
     "@budibase/client": "^2.0.39",
-    "@budibase/pro": "2.0.38",
+    "@budibase/pro": "2.0.39",
     "@budibase/string-templates": "^2.0.39",
     "@budibase/types": "^2.0.39",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 1f51f29c7a..e90d5bdb28 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.38.tgz#d02a58b777e7598e1377cfe42f092d08cd905374"
-  integrity sha512-hD+5hwlTN6AdgAzHE9oJLT8cqMFcxcjGacFZSJXJ8SIJAJJL1B25ouhY6PLbbo4XJpD2FV/xpIQxWrAGl8tN/A==
+"@budibase/backend-core@2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.39.tgz#7b09d664763fe11177160e3f3f868163851ca100"
+  integrity sha512-vtWJXyxq+GsLiPF0le9yCTvd9kFRlyUXOpMZqwdM8f5M095lU3ZqK4PYScrtRaOSeQ9LO0u5yrSdG9pFZ5vPCw==
   dependencies:
-    "@budibase/types" "^2.0.38"
+    "@budibase/types" "^2.0.39"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.38.tgz#c307b0d49fb8a2d94e7ccb89445862645c5bc6b7"
-  integrity sha512-bR5HzQNcsrf7iYOERm/5XcK2RrEWcx7aR1vFCV+tDLHRq+h1VMo/YVaPCpcrnsgl+cQoccpHacv0fHO/VbIlJw==
+"@budibase/pro@2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.39.tgz#0830b531d2b3751fbda70320889991bff8495b64"
+  integrity sha512-mNowoCtot6OOntc+XgSUR9G0cILxIBWzyKmXSxa1IwnlLThCK3ZtOjc9m2BpxRRs8SOkAyPWyBezuWi82x0tEw==
   dependencies:
-    "@budibase/backend-core" "2.0.38"
-    "@budibase/types" "2.0.38"
+    "@budibase/backend-core" "2.0.39"
+    "@budibase/types" "2.0.39"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.38", "@budibase/types@^2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.38.tgz#eb280a77333a0c4ae064e239534f5dd7a4adf7aa"
-  integrity sha512-xuFj7gi6v3MxTQSVpQJm5lXXu103yX2fvAipZXisUKSsqlSpr5FFf4+LZ95bcgo8KP8J8GNhpSk+M5sbyR6qMA==
+"@budibase/types@2.0.39", "@budibase/types@^2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.39.tgz#dd6580367e08175fbe18152ac7bf0a59937eab79"
+  integrity sha512-FTp4If33Q8a112jTtPjjVQwZj9xLe15781mjgBKQI76+lNLxeRVMIe7QU/Pq3qPc4uJl8MpNlY2ZXhd9XA5y4g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6bb267e483..fda7811646 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.0.39",
-    "@budibase/pro": "2.0.38",
+    "@budibase/pro": "2.0.39",
     "@budibase/string-templates": "^2.0.39",
     "@budibase/types": "^2.0.39",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 8077c4f69d..13d26ee461 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.38.tgz#d02a58b777e7598e1377cfe42f092d08cd905374"
-  integrity sha512-hD+5hwlTN6AdgAzHE9oJLT8cqMFcxcjGacFZSJXJ8SIJAJJL1B25ouhY6PLbbo4XJpD2FV/xpIQxWrAGl8tN/A==
+"@budibase/backend-core@2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.39.tgz#7b09d664763fe11177160e3f3f868163851ca100"
+  integrity sha512-vtWJXyxq+GsLiPF0le9yCTvd9kFRlyUXOpMZqwdM8f5M095lU3ZqK4PYScrtRaOSeQ9LO0u5yrSdG9pFZ5vPCw==
   dependencies:
-    "@budibase/types" "^2.0.38"
+    "@budibase/types" "^2.0.39"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.38.tgz#c307b0d49fb8a2d94e7ccb89445862645c5bc6b7"
-  integrity sha512-bR5HzQNcsrf7iYOERm/5XcK2RrEWcx7aR1vFCV+tDLHRq+h1VMo/YVaPCpcrnsgl+cQoccpHacv0fHO/VbIlJw==
+"@budibase/pro@2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.39.tgz#0830b531d2b3751fbda70320889991bff8495b64"
+  integrity sha512-mNowoCtot6OOntc+XgSUR9G0cILxIBWzyKmXSxa1IwnlLThCK3ZtOjc9m2BpxRRs8SOkAyPWyBezuWi82x0tEw==
   dependencies:
-    "@budibase/backend-core" "2.0.38"
-    "@budibase/types" "2.0.38"
+    "@budibase/backend-core" "2.0.39"
+    "@budibase/types" "2.0.39"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.38", "@budibase/types@^2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.38.tgz#eb280a77333a0c4ae064e239534f5dd7a4adf7aa"
-  integrity sha512-xuFj7gi6v3MxTQSVpQJm5lXXu103yX2fvAipZXisUKSsqlSpr5FFf4+LZ95bcgo8KP8J8GNhpSk+M5sbyR6qMA==
+"@budibase/types@2.0.39", "@budibase/types@^2.0.39":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.39.tgz#dd6580367e08175fbe18152ac7bf0a59937eab79"
+  integrity sha512-FTp4If33Q8a112jTtPjjVQwZj9xLe15781mjgBKQI76+lNLxeRVMIe7QU/Pq3qPc4uJl8MpNlY2ZXhd9XA5y4g==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"