From 6875554799d37ecd859ec26046d5a16ed008afdd Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 21 Sep 2022 15:25:53 +0100
Subject: [PATCH 01/33] Only call startsWith if string

---
 .../builder/src/components/common/bindings/BindingPanel.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index ffa0e98819..e568b73472 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -43,7 +43,7 @@
   let helpers = handlebarsCompletions()
   let getCaretPosition
   let search = ""
-  let initialValueJS = value?.startsWith("{{ js ")
+  let initialValueJS = typeof value === "string" && value?.startsWith("{{ js ")
   let mode = initialValueJS ? "JavaScript" : "Handlebars"
   let jsValue = initialValueJS ? value : null
   let hbsValue = initialValueJS ? null : value

From cf5dbfe055d77e8ebdbc6a23f51636215adc108b Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 22 Sep 2022 09:40:45 +0100
Subject: [PATCH 02/33] Handle valueType change

---
 .../controls/FilterEditor/FilterDrawer.svelte | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 9bd66a4cb1..553db99fc5 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -100,13 +100,37 @@
     }
     if (
       operator === Constants.OperatorOptions.In.value &&
-      !Array.isArray(expression.value)
+      !Array.isArray(expression.value) &&
+      expression.valueType === "Value"
     ) {
       if (expression.value) {
         expression.value = [expression.value]
       } else {
         expression.value = []
       }
+    } else if (
+      operator !== Constants.OperatorOptions.In.value &&
+      Array.isArray(expression.value)
+    ) {
+      expression.value = null
+    }
+  }
+
+  const onValueTypeChange = (expression, valueType) => {
+    if (Array.isArray(expression.value) && valueType === "Binding") {
+      expression.value = null
+    } else if (
+      expression.operator === Constants.OperatorOptions.In.value &&
+      !Array.isArray(expression.value) &&
+      valueType === "Value"
+    ) {
+      if (typeof expression.value === "string") {
+        expression.value = expression.value.split(",")
+      } else if (expression.value) {
+        expression.value = [expression.value]
+      } else {
+        expression.value = []
+      }
     }
   }
 
@@ -167,6 +191,7 @@
                 options={valueTypeOptions}
                 bind:value={filter.valueType}
                 placeholder={null}
+                on:change={e => onValueTypeChange(filter, e.detail)}
               />
               {#if filter.valueType === "Binding"}
                 <DrawerBindableInput

From 7484cdfb59a05cd038f28e8318bbfb52b303b601 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 26 Sep 2022 17:54:00 +0100
Subject: [PATCH 03/33] Feature to allow adding apps from within the groups
 interface, rather than having to go to apps individually to do this.

---
 packages/backend-core/src/db/conversions.js   |  1 +
 .../portal/manage/groups/[groupId].svelte     | 30 +++++++++--
 .../groups/_components/AppAddModal.svelte     | 51 +++++++++++++++++++
 packages/builder/src/stores/backend/roles.js  | 22 +++++---
 packages/frontend-core/src/api/roles.js       |  9 ++++
 .../src/api/controllers/global/roles.js       |  3 +-
 6 files changed, 105 insertions(+), 11 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte

diff --git a/packages/backend-core/src/db/conversions.js b/packages/backend-core/src/db/conversions.js
index 90c04e9251..5b1a785ecc 100644
--- a/packages/backend-core/src/db/conversions.js
+++ b/packages/backend-core/src/db/conversions.js
@@ -36,6 +36,7 @@ exports.getDevelopmentAppID = appId => {
   const rest = split.join(APP_PREFIX)
   return `${APP_DEV_PREFIX}${rest}`
 }
+exports.getDevAppID = exports.getDevelopmentAppID
 
 /**
  * Convert a development app ID to a deployed app ID.
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
index 23cdbff877..92d270931d 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
@@ -25,6 +25,7 @@
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
   import GroupIcon from "./_components/GroupIcon.svelte"
+  import AppAddModal from "./_components/AppAddModal.svelte"
 
   export let groupId
 
@@ -34,8 +35,7 @@
   let prevSearch = undefined
   let pageInfo = createPaginationStore()
   let loaded = false
-  let editModal
-  let deleteModal
+  let editModal, deleteModal, appAddModal
 
   $: page = $pageInfo.page
   $: fetchUsers(page, searchTerm)
@@ -182,7 +182,14 @@
     </Layout>
 
     <Layout noPadding gap="S">
-      <Heading size="S">Apps</Heading>
+      <div class="header">
+        <Heading size="S">Apps</Heading>
+        <div>
+          <Button on:click={appAddModal.show()} icon="ExperienceAdd" cta>
+            Add app
+          </Button>
+        </div>
+      </div>
       <List>
         {#if groupApps.length}
           {#each groupApps as app}
@@ -203,6 +210,18 @@
                   {getRoleLabel(app.appId)}
                 </StatusLight>
               </div>
+              <Icon
+                on:click={e => {
+                  groups.actions.removeApp(
+                    groupId,
+                    apps.getProdAppID(app.appId)
+                  )
+                  e.stopPropagation()
+                }}
+                hoverable
+                size="S"
+                name="Close"
+              />
             </ListItem>
           {/each}
         {:else}
@@ -216,6 +235,11 @@
 <Modal bind:this={editModal}>
   <CreateEditGroupModal {group} {saveGroup} />
 </Modal>
+
+<Modal bind:this={appAddModal}>
+  <AppAddModal {group} />
+</Modal>
+
 <ConfirmDialog
   bind:this={deleteModal}
   title="Delete user group"
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
new file mode 100644
index 0000000000..845e962487
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
@@ -0,0 +1,51 @@
+<script>
+  import { Body, ModalContent, Select } from "@budibase/bbui"
+  import { apps, groups } from "stores/portal"
+  import { roles } from "stores/backend"
+  import RoleSelect from "components/common/RoleSelect.svelte"
+
+  export let group
+
+  $: appOptions = $apps.map(app => ({
+    label: app.name,
+    value: app,
+  }))
+  $: prodAppId = selectedApp ? apps.getProdAppID(selectedApp.appId) : ""
+  $: confirmDisabled =
+    (!selectingRole && !selectedApp) || (selectingRole && !selectedRoleId)
+  let selectedApp, selectedRoleId
+  let selectingRole = false
+
+  async function appSelected() {
+    if (!selectingRole) {
+      selectingRole = true
+      await roles.fetchByAppId(prodAppId)
+      // return false to stop closing modal
+      return false
+    } else {
+      await groups.actions.addApp(group._id, prodAppId, selectedRoleId)
+    }
+  }
+</script>
+
+<ModalContent
+  onConfirm={appSelected}
+  size="M"
+  title="Add app to group"
+  confirmText="Next"
+  showSecondaryButton
+  secondaryButtonText="Back"
+  secondaryAction={() => (selectingRole = false)}
+  disabled={confirmDisabled}
+>
+  {#if !selectingRole}
+    <Body>Select the app to add to the <i>"{group.name}"</i> group.</Body>
+    <Select bind:value={selectedApp} options={appOptions} />
+  {:else}
+    <Body
+      >Pick the role this group will appear as in the <i>"{selectedApp.name}"</i
+      > app.</Body
+    >
+    <RoleSelect allowPublic={false} bind:value={selectedRoleId} />
+  {/if}
+</ModalContent>
diff --git a/packages/builder/src/stores/backend/roles.js b/packages/builder/src/stores/backend/roles.js
index 4d9ab303c9..ac395aa232 100644
--- a/packages/builder/src/stores/backend/roles.js
+++ b/packages/builder/src/stores/backend/roles.js
@@ -5,16 +5,24 @@ import { RoleUtils } from "@budibase/frontend-core"
 export function createRolesStore() {
   const { subscribe, update, set } = writable([])
 
+  function setRoles(roles) {
+    set(
+      roles.sort((a, b) => {
+        const priorityA = RoleUtils.getRolePriority(a._id)
+        const priorityB = RoleUtils.getRolePriority(b._id)
+        return priorityA > priorityB ? -1 : 1
+      })
+    )
+  }
+
   const actions = {
     fetch: async () => {
       const roles = await API.getRoles()
-      set(
-        roles.sort((a, b) => {
-          const priorityA = RoleUtils.getRolePriority(a._id)
-          const priorityB = RoleUtils.getRolePriority(b._id)
-          return priorityA > priorityB ? -1 : 1
-        })
-      )
+      setRoles(roles)
+    },
+    fetchByAppId: async appId => {
+      const { roles } = await API.getRolesForApp(appId)
+      setRoles(roles)
     },
     delete: async role => {
       await API.deleteRole({
diff --git a/packages/frontend-core/src/api/roles.js b/packages/frontend-core/src/api/roles.js
index 15c27091c4..0b8a866a00 100644
--- a/packages/frontend-core/src/api/roles.js
+++ b/packages/frontend-core/src/api/roles.js
@@ -29,4 +29,13 @@ export const buildRoleEndpoints = API => ({
       url: "/api/roles",
     })
   },
+
+  /**
+   * Gets a list of roles within a specified app.
+   */
+  getRolesForApp: async appId => {
+    return await API.get({
+      url: `/api/global/roles/${appId}`,
+    })
+  },
 })
diff --git a/packages/worker/src/api/controllers/global/roles.js b/packages/worker/src/api/controllers/global/roles.js
index 800311b6be..d63f1a62b5 100644
--- a/packages/worker/src/api/controllers/global/roles.js
+++ b/packages/worker/src/api/controllers/global/roles.js
@@ -2,6 +2,7 @@ const { getAllRoles } = require("@budibase/backend-core/roles")
 const {
   getAllApps,
   getProdAppID,
+  getDevAppID,
   DocumentType,
 } = require("@budibase/backend-core/db")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
@@ -34,7 +35,7 @@ exports.fetch = async ctx => {
 
 exports.find = async ctx => {
   const appId = ctx.params.appId
-  await doInAppContext(appId, async () => {
+  await doInAppContext(getDevAppID(appId), async () => {
     const db = getAppDB()
     const app = await db.get(DocumentType.APP_METADATA)
     ctx.body = {

From ebb43de0a6addefbda09f80dd68f90cae0963109 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 26 Sep 2022 18:05:08 +0100
Subject: [PATCH 04/33] Fixing confirm text in second stage of adding app to
 group modal.

---
 .../portal/manage/groups/_components/AppAddModal.svelte       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
index 845e962487..f8d2e262bd 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
@@ -32,8 +32,8 @@
   onConfirm={appSelected}
   size="M"
   title="Add app to group"
-  confirmText="Next"
-  showSecondaryButton
+  confirmText={selectingRole ? "Confirm" : "Next"}
+  showSecondaryButton={selectingRole}
   secondaryButtonText="Back"
   secondaryAction={() => (selectingRole = false)}
   disabled={confirmDisabled}

From 2fd4c8e57e4e99c7ce6fbfc52dee024c380fabc3 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 26 Sep 2022 18:26:16 +0100
Subject: [PATCH 05/33] PR comments.

---
 .../portal/manage/groups/_components/AppAddModal.svelte   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
index f8d2e262bd..5d0f06fe73 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
@@ -39,12 +39,14 @@
   disabled={confirmDisabled}
 >
   {#if !selectingRole}
-    <Body>Select the app to add to the <i>"{group.name}"</i> group.</Body>
+    <Body
+      >Select an app to assign roles for members of <i>"{group.name}"</i></Body
+    >
     <Select bind:value={selectedApp} options={appOptions} />
   {:else}
     <Body
-      >Pick the role this group will appear as in the <i>"{selectedApp.name}"</i
-      > app.</Body
+      >Select the role that all members of "<i>{group.name}</i>" will have for
+      <i>"{selectedApp.name}"</i></Body
     >
     <RoleSelect allowPublic={false} bind:value={selectedRoleId} />
   {/if}

From 395b2a45e083fb38f6ee4d3ed2b4d71534d6f526 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 17:57:51 +0000
Subject: [PATCH 06/33] v1.4.18

---
 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 e09921a3ad..4a72009280 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1b41fed027..3085aa1e9d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.4.18-alpha.0",
+    "@budibase/types": "^1.4.18",
     "@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 bb42e08a67..d20fcd4a45 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.4.18-alpha.0",
+    "@budibase/string-templates": "^1.4.18",
     "@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 697a66fcd6..b8b9c057df 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.4.18-alpha.0",
-    "@budibase/client": "1.4.18-alpha.0",
-    "@budibase/frontend-core": "1.4.18-alpha.0",
-    "@budibase/string-templates": "1.4.18-alpha.0",
+    "@budibase/bbui": "^1.4.18",
+    "@budibase/client": "^1.4.18",
+    "@budibase/frontend-core": "^1.4.18",
+    "@budibase/string-templates": "^1.4.18",
     "@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 74dac563e2..1302fbe874 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "1.4.18-alpha.0",
-    "@budibase/string-templates": "1.4.18-alpha.0",
-    "@budibase/types": "1.4.18-alpha.0",
+    "@budibase/backend-core": "^1.4.18",
+    "@budibase/string-templates": "^1.4.18",
+    "@budibase/types": "^1.4.18",
     "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 bc142d8c94..9aa87aee66 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.4.18-alpha.0",
-    "@budibase/frontend-core": "1.4.18-alpha.0",
-    "@budibase/string-templates": "1.4.18-alpha.0",
+    "@budibase/bbui": "^1.4.18",
+    "@budibase/frontend-core": "^1.4.18",
+    "@budibase/string-templates": "^1.4.18",
     "@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 ed751423db..374b70c352 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.4.18-alpha.0",
+    "@budibase/bbui": "^1.4.18",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b37b5a5d9e..857e6203a3 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 4681691f42..5154f083c4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.4.18-alpha.0",
-    "@budibase/client": "1.4.18-alpha.0",
+    "@budibase/backend-core": "^1.4.18",
+    "@budibase/client": "^1.4.18",
     "@budibase/pro": "1.4.18-alpha.0",
-    "@budibase/string-templates": "1.4.18-alpha.0",
-    "@budibase/types": "1.4.18-alpha.0",
+    "@budibase/string-templates": "^1.4.18",
+    "@budibase/types": "^1.4.18",
     "@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 21c5c318df..4556f30e38 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "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 e7ee0ba32a..e4aaa80f72 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "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 132570545d..a35c190a62 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.4.18-alpha.0",
+  "version": "1.4.18",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.4.18-alpha.0",
+    "@budibase/backend-core": "^1.4.18",
     "@budibase/pro": "1.4.18-alpha.0",
-    "@budibase/string-templates": "1.4.18-alpha.0",
-    "@budibase/types": "1.4.18-alpha.0",
+    "@budibase/string-templates": "^1.4.18",
+    "@budibase/types": "^1.4.18",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e77f517d25857fd7c683e6e66df14b57afeb7eda Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 26 Sep 2022 18:58:08 +0100
Subject: [PATCH 07/33] Updating plugin badge to be new, rather than beta as
 now released.

---
 packages/builder/src/pages/builder/portal/_layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 7a5d289ddd..cf9cd55b19 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -56,7 +56,7 @@
         {
           title: "Plugins",
           href: "/builder/portal/manage/plugins",
-          badge: "Beta",
+          badge: "New",
         },
 
         {

From eb62e5b9aadd6cef28cdfbff63c59d3e8804d2ee Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 18:00:58 +0000
Subject: [PATCH 08/33] Update pro version to 1.4.18

---
 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 5154f083c4..c2c7d0b9cd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^1.4.18",
     "@budibase/client": "^1.4.18",
-    "@budibase/pro": "1.4.18-alpha.0",
+    "@budibase/pro": "1.4.18",
     "@budibase/string-templates": "^1.4.18",
     "@budibase/types": "^1.4.18",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 04d54f3c46..9fa9fabace 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18-alpha.0.tgz#27c77d0c28a17a2ee67ad0ada1431f4f03e34747"
-  integrity sha512-eP7v7MaULTi8ieWo0qHuXH8E2wv+8C+2FOdc4ah/af+MFP2lslfhlwF5X6aSkzODV9KbaQr1by0ytM7QS+nH6A==
+"@budibase/backend-core@1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18.tgz#37cc3d7de83bfc0b503bd34bd6e68b23424e1292"
+  integrity sha512-Uyjf2tVi3b0zkWTBhcE0LxCrP6PCaCZfEnDSVOx9E8yGSeFYxmS5YmhdhTeesXw7Sdcmd7gMfQ65R3rNbNaF5g==
   dependencies:
-    "@budibase/types" "1.4.18-alpha.0"
+    "@budibase/types" "^1.4.18"
     "@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@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18-alpha.0.tgz#e9910569a769e5ce107f8200ccba5295dc365fa0"
-  integrity sha512-GsWDZb1H3Cm3vhY8n5+eekS14pjJRI7SRDt838ff4ECLpTp6YSVnOkIwms8g7uQUuXa8HbSBDl50W93wTR4QdQ==
+"@budibase/pro@1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18.tgz#93a1259ccb6200a43aa5269a0e2dab92973d5d61"
+  integrity sha512-tKhlLI4iOZAj5/JnDCyfDLQzoSBxkis4v9WYob8ZJGsvvKjg7o7Svf/HHDgN7bCPZPbvraPDL4JbBBOlz3iuug==
   dependencies:
-    "@budibase/backend-core" "1.4.18-alpha.0"
-    "@budibase/types" "1.4.18-alpha.0"
+    "@budibase/backend-core" "1.4.18"
+    "@budibase/types" "1.4.18"
     "@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@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18-alpha.0.tgz#f1abbef32395659ba53176fdd485557fb0f66487"
-  integrity sha512-UIjVotIUzu4v9IVzqEzwQdusyr5bxfET89bZ2+mTeUIj5xzWmS6z4vlBlDv2nfZThFKvXDXE5YFgzSGdESBIrA==
+"@budibase/types@1.4.18", "@budibase/types@^1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18.tgz#883fe6597678eab4b42b6703ccc6e120cd275b6b"
+  integrity sha512-9daKGTGF4Y4AD2ajOucTT0ff0S5e1hWoTS0xILG1gKqq2RECOeIflJYGRdoorB+WWtpJw9O7CTTWk0c1V6pMQQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a35c190a62..afbdd0bd3e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.4.18",
-    "@budibase/pro": "1.4.18-alpha.0",
+    "@budibase/pro": "1.4.18",
     "@budibase/string-templates": "^1.4.18",
     "@budibase/types": "^1.4.18",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index eff2a655de..6eeb255f01 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18-alpha.0.tgz#27c77d0c28a17a2ee67ad0ada1431f4f03e34747"
-  integrity sha512-eP7v7MaULTi8ieWo0qHuXH8E2wv+8C+2FOdc4ah/af+MFP2lslfhlwF5X6aSkzODV9KbaQr1by0ytM7QS+nH6A==
+"@budibase/backend-core@1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18.tgz#37cc3d7de83bfc0b503bd34bd6e68b23424e1292"
+  integrity sha512-Uyjf2tVi3b0zkWTBhcE0LxCrP6PCaCZfEnDSVOx9E8yGSeFYxmS5YmhdhTeesXw7Sdcmd7gMfQ65R3rNbNaF5g==
   dependencies:
-    "@budibase/types" "1.4.18-alpha.0"
+    "@budibase/types" "^1.4.18"
     "@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@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18-alpha.0.tgz#e9910569a769e5ce107f8200ccba5295dc365fa0"
-  integrity sha512-GsWDZb1H3Cm3vhY8n5+eekS14pjJRI7SRDt838ff4ECLpTp6YSVnOkIwms8g7uQUuXa8HbSBDl50W93wTR4QdQ==
+"@budibase/pro@1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18.tgz#93a1259ccb6200a43aa5269a0e2dab92973d5d61"
+  integrity sha512-tKhlLI4iOZAj5/JnDCyfDLQzoSBxkis4v9WYob8ZJGsvvKjg7o7Svf/HHDgN7bCPZPbvraPDL4JbBBOlz3iuug==
   dependencies:
-    "@budibase/backend-core" "1.4.18-alpha.0"
-    "@budibase/types" "1.4.18-alpha.0"
+    "@budibase/backend-core" "1.4.18"
+    "@budibase/types" "1.4.18"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.4.18-alpha.0":
-  version "1.4.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18-alpha.0.tgz#f1abbef32395659ba53176fdd485557fb0f66487"
-  integrity sha512-UIjVotIUzu4v9IVzqEzwQdusyr5bxfET89bZ2+mTeUIj5xzWmS6z4vlBlDv2nfZThFKvXDXE5YFgzSGdESBIrA==
+"@budibase/types@1.4.18", "@budibase/types@^1.4.18":
+  version "1.4.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18.tgz#883fe6597678eab4b42b6703ccc6e120cd275b6b"
+  integrity sha512-9daKGTGF4Y4AD2ajOucTT0ff0S5e1hWoTS0xILG1gKqq2RECOeIflJYGRdoorB+WWtpJw9O7CTTWk0c1V6pMQQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 49be12b42863c290947e478847f8ed9146c06744 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 18:29:06 +0000
Subject: [PATCH 09/33] v1.4.19

---
 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 4a72009280..10f261f0e6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4.18",
+  "version": "1.4.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 3085aa1e9d..a4a74ed497 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.4.18",
+    "@budibase/types": "^1.4.19",
     "@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 d20fcd4a45..291abac371 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.4.18",
+    "@budibase/string-templates": "^1.4.19",
     "@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 b8b9c057df..7b7b0227f2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.4.18",
-    "@budibase/client": "^1.4.18",
-    "@budibase/frontend-core": "^1.4.18",
-    "@budibase/string-templates": "^1.4.18",
+    "@budibase/bbui": "^1.4.19",
+    "@budibase/client": "^1.4.19",
+    "@budibase/frontend-core": "^1.4.19",
+    "@budibase/string-templates": "^1.4.19",
     "@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 1302fbe874..7b247dbe04 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.4.18",
-    "@budibase/string-templates": "^1.4.18",
-    "@budibase/types": "^1.4.18",
+    "@budibase/backend-core": "^1.4.19",
+    "@budibase/string-templates": "^1.4.19",
+    "@budibase/types": "^1.4.19",
     "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 9aa87aee66..6266b050c2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.4.18",
-    "@budibase/frontend-core": "^1.4.18",
-    "@budibase/string-templates": "^1.4.18",
+    "@budibase/bbui": "^1.4.19",
+    "@budibase/frontend-core": "^1.4.19",
+    "@budibase/string-templates": "^1.4.19",
     "@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 374b70c352..49b19ad56e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.4.18",
+    "@budibase/bbui": "^1.4.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 857e6203a3..d7f5359780 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c2c7d0b9cd..afd18b1f6d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.4.18",
-    "@budibase/client": "^1.4.18",
+    "@budibase/backend-core": "^1.4.19",
+    "@budibase/client": "^1.4.19",
     "@budibase/pro": "1.4.18",
-    "@budibase/string-templates": "^1.4.18",
-    "@budibase/types": "^1.4.18",
+    "@budibase/string-templates": "^1.4.19",
+    "@budibase/types": "^1.4.19",
     "@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 4556f30e38..8fe5409947 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "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 e4aaa80f72..e4a6a7ea16 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "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 afbdd0bd3e..c55a1fa487 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.4.18",
+    "@budibase/backend-core": "^1.4.19",
     "@budibase/pro": "1.4.18",
-    "@budibase/string-templates": "^1.4.18",
-    "@budibase/types": "^1.4.18",
+    "@budibase/string-templates": "^1.4.19",
+    "@budibase/types": "^1.4.19",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 77c7019272dd811398e49ee9ad2ade071302fd74 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 18:32:14 +0000
Subject: [PATCH 10/33] Update pro version to 1.4.19

---
 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 afd18b1f6d..2ae2d6181e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^1.4.19",
     "@budibase/client": "^1.4.19",
-    "@budibase/pro": "1.4.18",
+    "@budibase/pro": "1.4.19",
     "@budibase/string-templates": "^1.4.19",
     "@budibase/types": "^1.4.19",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 9fa9fabace..b4b7423901 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18.tgz#37cc3d7de83bfc0b503bd34bd6e68b23424e1292"
-  integrity sha512-Uyjf2tVi3b0zkWTBhcE0LxCrP6PCaCZfEnDSVOx9E8yGSeFYxmS5YmhdhTeesXw7Sdcmd7gMfQ65R3rNbNaF5g==
+"@budibase/backend-core@1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.19.tgz#3d16bed1b3ca1af478d4b490e466712c4b5c587f"
+  integrity sha512-etmVvwWdLWf5aQcFGOX2E7q1gi4o3+q0bYxGsBYz76+T2K61gVh0RHJTwZ6k6uZx85sJMNz947Kor+2BxSzu2g==
   dependencies:
-    "@budibase/types" "^1.4.18"
+    "@budibase/types" "^1.4.19"
     "@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@1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18.tgz#93a1259ccb6200a43aa5269a0e2dab92973d5d61"
-  integrity sha512-tKhlLI4iOZAj5/JnDCyfDLQzoSBxkis4v9WYob8ZJGsvvKjg7o7Svf/HHDgN7bCPZPbvraPDL4JbBBOlz3iuug==
+"@budibase/pro@1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.19.tgz#9a856ca48ae57cbd8e16718cfea1a0a3ae3386b7"
+  integrity sha512-sVgpiP4RLQDWkSZrvXcXjEAwM5iP/J0dYZMAZl8cwIX234EiFCmWJwBSvsJ0BR5IJfr6b4+1XzhJ00/v0pHBkw==
   dependencies:
-    "@budibase/backend-core" "1.4.18"
-    "@budibase/types" "1.4.18"
+    "@budibase/backend-core" "1.4.19"
+    "@budibase/types" "1.4.19"
     "@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@1.4.18", "@budibase/types@^1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18.tgz#883fe6597678eab4b42b6703ccc6e120cd275b6b"
-  integrity sha512-9daKGTGF4Y4AD2ajOucTT0ff0S5e1hWoTS0xILG1gKqq2RECOeIflJYGRdoorB+WWtpJw9O7CTTWk0c1V6pMQQ==
+"@budibase/types@1.4.19", "@budibase/types@^1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.19.tgz#64f1a04c8c37aaa43c503a0f7ce46979dcbbab1f"
+  integrity sha512-DAy4UVOrCqVVcfqujsDEFk7ghhIaW+RYdHsx0ZTP9zb3SCzLr53tcQp1Wh6DkwK55ObQKSASRLaPPOpISC74hw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c55a1fa487..67d55fece3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.4.19",
-    "@budibase/pro": "1.4.18",
+    "@budibase/pro": "1.4.19",
     "@budibase/string-templates": "^1.4.19",
     "@budibase/types": "^1.4.19",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 6eeb255f01..58ad32bc53 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.18.tgz#37cc3d7de83bfc0b503bd34bd6e68b23424e1292"
-  integrity sha512-Uyjf2tVi3b0zkWTBhcE0LxCrP6PCaCZfEnDSVOx9E8yGSeFYxmS5YmhdhTeesXw7Sdcmd7gMfQ65R3rNbNaF5g==
+"@budibase/backend-core@1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.19.tgz#3d16bed1b3ca1af478d4b490e466712c4b5c587f"
+  integrity sha512-etmVvwWdLWf5aQcFGOX2E7q1gi4o3+q0bYxGsBYz76+T2K61gVh0RHJTwZ6k6uZx85sJMNz947Kor+2BxSzu2g==
   dependencies:
-    "@budibase/types" "^1.4.18"
+    "@budibase/types" "^1.4.19"
     "@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@1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.18.tgz#93a1259ccb6200a43aa5269a0e2dab92973d5d61"
-  integrity sha512-tKhlLI4iOZAj5/JnDCyfDLQzoSBxkis4v9WYob8ZJGsvvKjg7o7Svf/HHDgN7bCPZPbvraPDL4JbBBOlz3iuug==
+"@budibase/pro@1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.19.tgz#9a856ca48ae57cbd8e16718cfea1a0a3ae3386b7"
+  integrity sha512-sVgpiP4RLQDWkSZrvXcXjEAwM5iP/J0dYZMAZl8cwIX234EiFCmWJwBSvsJ0BR5IJfr6b4+1XzhJ00/v0pHBkw==
   dependencies:
-    "@budibase/backend-core" "1.4.18"
-    "@budibase/types" "1.4.18"
+    "@budibase/backend-core" "1.4.19"
+    "@budibase/types" "1.4.19"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.4.18", "@budibase/types@^1.4.18":
-  version "1.4.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.18.tgz#883fe6597678eab4b42b6703ccc6e120cd275b6b"
-  integrity sha512-9daKGTGF4Y4AD2ajOucTT0ff0S5e1hWoTS0xILG1gKqq2RECOeIflJYGRdoorB+WWtpJw9O7CTTWk0c1V6pMQQ==
+"@budibase/types@1.4.19", "@budibase/types@^1.4.19":
+  version "1.4.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.19.tgz#64f1a04c8c37aaa43c503a0f7ce46979dcbbab1f"
+  integrity sha512-DAy4UVOrCqVVcfqujsDEFk7ghhIaW+RYdHsx0ZTP9zb3SCzLr53tcQp1Wh6DkwK55ObQKSASRLaPPOpISC74hw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From d332e035d8e3416e82db5f1153a15fcf69b05f94 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 19:44:31 +0000
Subject: [PATCH 11/33] v2.0.0

---
 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 10f261f0e6..b3be9f0d1e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4.19",
+  "version": "2.0.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a4a74ed497..2bf725ec20 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.4.19",
+    "@budibase/types": "^2.0.0",
     "@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 291abac371..53c79ec8e6 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.4.19",
+    "@budibase/string-templates": "^2.0.0",
     "@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 7b7b0227f2..32d96858ec 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.4.19",
-    "@budibase/client": "^1.4.19",
-    "@budibase/frontend-core": "^1.4.19",
-    "@budibase/string-templates": "^1.4.19",
+    "@budibase/bbui": "^2.0.0",
+    "@budibase/client": "^2.0.0",
+    "@budibase/frontend-core": "^2.0.0",
+    "@budibase/string-templates": "^2.0.0",
     "@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 7b247dbe04..39271d5d8e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.4.19",
-    "@budibase/string-templates": "^1.4.19",
-    "@budibase/types": "^1.4.19",
+    "@budibase/backend-core": "^2.0.0",
+    "@budibase/string-templates": "^2.0.0",
+    "@budibase/types": "^2.0.0",
     "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 6266b050c2..86a0f31a4f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.4.19",
-    "@budibase/frontend-core": "^1.4.19",
-    "@budibase/string-templates": "^1.4.19",
+    "@budibase/bbui": "^2.0.0",
+    "@budibase/frontend-core": "^2.0.0",
+    "@budibase/string-templates": "^2.0.0",
     "@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 49b19ad56e..30c2a66014 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.4.19",
+    "@budibase/bbui": "^2.0.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d7f5359780..56c4f44ede 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 2ae2d6181e..83e74ccbe3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.4.19",
-    "@budibase/client": "^1.4.19",
+    "@budibase/backend-core": "^2.0.0",
+    "@budibase/client": "^2.0.0",
     "@budibase/pro": "1.4.19",
-    "@budibase/string-templates": "^1.4.19",
-    "@budibase/types": "^1.4.19",
+    "@budibase/string-templates": "^2.0.0",
+    "@budibase/types": "^2.0.0",
     "@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 8fe5409947..91e4238185 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "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 e4a6a7ea16..d69ab3f8ba 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "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 67d55fece3..43e50b499b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.4.19",
+  "version": "2.0.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.4.19",
+    "@budibase/backend-core": "^2.0.0",
     "@budibase/pro": "1.4.19",
-    "@budibase/string-templates": "^1.4.19",
-    "@budibase/types": "^1.4.19",
+    "@budibase/string-templates": "^2.0.0",
+    "@budibase/types": "^2.0.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 4949538a47c1a07d48426983573779f11c56d294 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 19:48:03 +0000
Subject: [PATCH 12/33] Update pro version to 2.0.0

---
 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 83e74ccbe3..b3ef5799e1 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.0",
     "@budibase/client": "^2.0.0",
-    "@budibase/pro": "1.4.19",
+    "@budibase/pro": "2.0.0",
     "@budibase/string-templates": "^2.0.0",
     "@budibase/types": "^2.0.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b4b7423901..40bf4149c7 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.19.tgz#3d16bed1b3ca1af478d4b490e466712c4b5c587f"
-  integrity sha512-etmVvwWdLWf5aQcFGOX2E7q1gi4o3+q0bYxGsBYz76+T2K61gVh0RHJTwZ6k6uZx85sJMNz947Kor+2BxSzu2g==
+"@budibase/backend-core@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.0.tgz#b9b8aa88ad6a94c518b14730bf00506d0bc71965"
+  integrity sha512-amNsJICGTMjWxq4AQz/3jvtJa5kcyzczvXRRiNPrcmA5GrOZs3Nti7SSp7XLaEZUfL1VI7u9V/PWf+QptTK34g==
   dependencies:
-    "@budibase/types" "^1.4.19"
+    "@budibase/types" "^2.0.0"
     "@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@1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.19.tgz#9a856ca48ae57cbd8e16718cfea1a0a3ae3386b7"
-  integrity sha512-sVgpiP4RLQDWkSZrvXcXjEAwM5iP/J0dYZMAZl8cwIX234EiFCmWJwBSvsJ0BR5IJfr6b4+1XzhJ00/v0pHBkw==
+"@budibase/pro@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.0.tgz#dfe4658bb9db517841a3b6f735a3f866379a026f"
+  integrity sha512-AzkhHNa9MWp4uU3nxbliEsYfMNtTNdnDFN+b3CyRwt9FD2O1aU0mlQFsOvP9609rHgAzKycYBQusZIY2cOW+Pw==
   dependencies:
-    "@budibase/backend-core" "1.4.19"
-    "@budibase/types" "1.4.19"
+    "@budibase/backend-core" "2.0.0"
+    "@budibase/types" "2.0.0"
     "@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@1.4.19", "@budibase/types@^1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.19.tgz#64f1a04c8c37aaa43c503a0f7ce46979dcbbab1f"
-  integrity sha512-DAy4UVOrCqVVcfqujsDEFk7ghhIaW+RYdHsx0ZTP9zb3SCzLr53tcQp1Wh6DkwK55ObQKSASRLaPPOpISC74hw==
+"@budibase/types@2.0.0", "@budibase/types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.0.tgz#bf99868e62991d9a176a6d5a6a8f0234d5898613"
+  integrity sha512-2zk6dGdq+oV+f0bexTJvoDYxowf6x9gQAYTKCV9Exu4peAKWAdqBPFDQR2zgzKcNPB06+G07hSfj12YZGtboDQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 43e50b499b..347f55b0e6 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.0",
-    "@budibase/pro": "1.4.19",
+    "@budibase/pro": "2.0.0",
     "@budibase/string-templates": "^2.0.0",
     "@budibase/types": "^2.0.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 58ad32bc53..408d717c20 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.19.tgz#3d16bed1b3ca1af478d4b490e466712c4b5c587f"
-  integrity sha512-etmVvwWdLWf5aQcFGOX2E7q1gi4o3+q0bYxGsBYz76+T2K61gVh0RHJTwZ6k6uZx85sJMNz947Kor+2BxSzu2g==
+"@budibase/backend-core@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.0.tgz#b9b8aa88ad6a94c518b14730bf00506d0bc71965"
+  integrity sha512-amNsJICGTMjWxq4AQz/3jvtJa5kcyzczvXRRiNPrcmA5GrOZs3Nti7SSp7XLaEZUfL1VI7u9V/PWf+QptTK34g==
   dependencies:
-    "@budibase/types" "^1.4.19"
+    "@budibase/types" "^2.0.0"
     "@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@1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.19.tgz#9a856ca48ae57cbd8e16718cfea1a0a3ae3386b7"
-  integrity sha512-sVgpiP4RLQDWkSZrvXcXjEAwM5iP/J0dYZMAZl8cwIX234EiFCmWJwBSvsJ0BR5IJfr6b4+1XzhJ00/v0pHBkw==
+"@budibase/pro@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.0.tgz#dfe4658bb9db517841a3b6f735a3f866379a026f"
+  integrity sha512-AzkhHNa9MWp4uU3nxbliEsYfMNtTNdnDFN+b3CyRwt9FD2O1aU0mlQFsOvP9609rHgAzKycYBQusZIY2cOW+Pw==
   dependencies:
-    "@budibase/backend-core" "1.4.19"
-    "@budibase/types" "1.4.19"
+    "@budibase/backend-core" "2.0.0"
+    "@budibase/types" "2.0.0"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.4.19", "@budibase/types@^1.4.19":
-  version "1.4.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.19.tgz#64f1a04c8c37aaa43c503a0f7ce46979dcbbab1f"
-  integrity sha512-DAy4UVOrCqVVcfqujsDEFk7ghhIaW+RYdHsx0ZTP9zb3SCzLr53tcQp1Wh6DkwK55ObQKSASRLaPPOpISC74hw==
+"@budibase/types@2.0.0", "@budibase/types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.0.tgz#bf99868e62991d9a176a6d5a6a8f0234d5898613"
+  integrity sha512-2zk6dGdq+oV+f0bexTJvoDYxowf6x9gQAYTKCV9Exu4peAKWAdqBPFDQR2zgzKcNPB06+G07hSfj12YZGtboDQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 0ee59e371a2c48edd939fdd2caba78341e1d26ae Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 26 Sep 2022 21:02:11 +0100
Subject: [PATCH 13/33] Fix cypress accountPortals.spec

---
 packages/builder/src/pages/builder/apps/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index ac907ad556..d175edabad 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -133,7 +133,7 @@
             </Body>
           </Layout>
           <Divider />
-          {#if $licensing.usageMetrics.dayPasses >= 100}
+          {#if $licensing.usageMetrics?.dayPasses >= 100}
             <div>
               <Layout gap="S" justifyItems="center">
                 <img class="spaceman" alt="spaceman" src={Spaceman} />

From de67b7b329615ff366bc6e8a356f45d54b6e9467 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 20:26:27 +0000
Subject: [PATCH 14/33] v2.0.1

---
 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 b3be9f0d1e..1c182899a6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0",
+  "version": "2.0.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2bf725ec20..930e842f52 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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.0",
+    "@budibase/types": "^2.0.1",
     "@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 53c79ec8e6..c6b94c0eb3 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.0",
+  "version": "2.0.1",
   "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.0",
+    "@budibase/string-templates": "^2.0.1",
     "@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 32d96858ec..6e5988b049 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.0",
-    "@budibase/client": "^2.0.0",
-    "@budibase/frontend-core": "^2.0.0",
-    "@budibase/string-templates": "^2.0.0",
+    "@budibase/bbui": "^2.0.1",
+    "@budibase/client": "^2.0.1",
+    "@budibase/frontend-core": "^2.0.1",
+    "@budibase/string-templates": "^2.0.1",
     "@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 39271d5d8e..bf8116af89 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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.0",
-    "@budibase/string-templates": "^2.0.0",
-    "@budibase/types": "^2.0.0",
+    "@budibase/backend-core": "^2.0.1",
+    "@budibase/string-templates": "^2.0.1",
+    "@budibase/types": "^2.0.1",
     "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 86a0f31a4f..b14b3e3c07 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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.0",
-    "@budibase/frontend-core": "^2.0.0",
-    "@budibase/string-templates": "^2.0.0",
+    "@budibase/bbui": "^2.0.1",
+    "@budibase/frontend-core": "^2.0.1",
+    "@budibase/string-templates": "^2.0.1",
     "@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 30c2a66014..eb341bfdf4 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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.0",
+    "@budibase/bbui": "^2.0.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 56c4f44ede..9d8aedee25 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b3ef5799e1..f4772cb595 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.0",
+  "version": "2.0.1",
   "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.0",
-    "@budibase/client": "^2.0.0",
+    "@budibase/backend-core": "^2.0.1",
+    "@budibase/client": "^2.0.1",
     "@budibase/pro": "2.0.0",
-    "@budibase/string-templates": "^2.0.0",
-    "@budibase/types": "^2.0.0",
+    "@budibase/string-templates": "^2.0.1",
+    "@budibase/types": "^2.0.1",
     "@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 91e4238185..92d0d01a51 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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 d69ab3f8ba..7b12ccf9cf 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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 347f55b0e6..bef2b944ce 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.0",
+  "version": "2.0.1",
   "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.0",
+    "@budibase/backend-core": "^2.0.1",
     "@budibase/pro": "2.0.0",
-    "@budibase/string-templates": "^2.0.0",
-    "@budibase/types": "^2.0.0",
+    "@budibase/string-templates": "^2.0.1",
+    "@budibase/types": "^2.0.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 27f00bb360bcc52f5c499df44efa1e2b37535e4b Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 20:29:39 +0000
Subject: [PATCH 15/33] Update pro version to 2.0.1

---
 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 f4772cb595..5d4a5e342d 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.1",
     "@budibase/client": "^2.0.1",
-    "@budibase/pro": "2.0.0",
+    "@budibase/pro": "2.0.1",
     "@budibase/string-templates": "^2.0.1",
     "@budibase/types": "^2.0.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 40bf4149c7..4e3137eafe 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.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.0.tgz#b9b8aa88ad6a94c518b14730bf00506d0bc71965"
-  integrity sha512-amNsJICGTMjWxq4AQz/3jvtJa5kcyzczvXRRiNPrcmA5GrOZs3Nti7SSp7XLaEZUfL1VI7u9V/PWf+QptTK34g==
+"@budibase/backend-core@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.1.tgz#458bb27f4d6365aa9d4eeeea5330e48672914c27"
+  integrity sha512-9hBdKABeNTDl8Mvi5lwOHaObMGHTpzceMhOEsVKPK419z4SSqr1D6nmBXsw1YmpeEwcZ7B6s5nziIxgmvlJPYQ==
   dependencies:
-    "@budibase/types" "^2.0.0"
+    "@budibase/types" "^2.0.1"
     "@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.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.0.tgz#dfe4658bb9db517841a3b6f735a3f866379a026f"
-  integrity sha512-AzkhHNa9MWp4uU3nxbliEsYfMNtTNdnDFN+b3CyRwt9FD2O1aU0mlQFsOvP9609rHgAzKycYBQusZIY2cOW+Pw==
+"@budibase/pro@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.1.tgz#16d4081cd365e0003bc7ceab66ea196c10e53642"
+  integrity sha512-X41yLuyR6oYnVj475cUqDKMtRQERG1d6Dk6DFFkFYwvzqBX4rNqNEhVRBAXZbjef1NThitgbD4jIAf5hJZc7tw==
   dependencies:
-    "@budibase/backend-core" "2.0.0"
-    "@budibase/types" "2.0.0"
+    "@budibase/backend-core" "2.0.1"
+    "@budibase/types" "2.0.1"
     "@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.0", "@budibase/types@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.0.tgz#bf99868e62991d9a176a6d5a6a8f0234d5898613"
-  integrity sha512-2zk6dGdq+oV+f0bexTJvoDYxowf6x9gQAYTKCV9Exu4peAKWAdqBPFDQR2zgzKcNPB06+G07hSfj12YZGtboDQ==
+"@budibase/types@2.0.1", "@budibase/types@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.1.tgz#3110504bff37768ae082fa8e6c39cc7fa29241ab"
+  integrity sha512-kTP91zQr+cKWA+RTCHOJzg6bCZ9qQ4QaIs3gMgw7JgBM8O/BEzcEQmpRf7KETaxmU/mTYfbsbfWHkAZaroIiJg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index bef2b944ce..1b1d5ae621 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.1",
-    "@budibase/pro": "2.0.0",
+    "@budibase/pro": "2.0.1",
     "@budibase/string-templates": "^2.0.1",
     "@budibase/types": "^2.0.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 408d717c20..7fb4a3db20 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.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.0.tgz#b9b8aa88ad6a94c518b14730bf00506d0bc71965"
-  integrity sha512-amNsJICGTMjWxq4AQz/3jvtJa5kcyzczvXRRiNPrcmA5GrOZs3Nti7SSp7XLaEZUfL1VI7u9V/PWf+QptTK34g==
+"@budibase/backend-core@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.1.tgz#458bb27f4d6365aa9d4eeeea5330e48672914c27"
+  integrity sha512-9hBdKABeNTDl8Mvi5lwOHaObMGHTpzceMhOEsVKPK419z4SSqr1D6nmBXsw1YmpeEwcZ7B6s5nziIxgmvlJPYQ==
   dependencies:
-    "@budibase/types" "^2.0.0"
+    "@budibase/types" "^2.0.1"
     "@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.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.0.tgz#dfe4658bb9db517841a3b6f735a3f866379a026f"
-  integrity sha512-AzkhHNa9MWp4uU3nxbliEsYfMNtTNdnDFN+b3CyRwt9FD2O1aU0mlQFsOvP9609rHgAzKycYBQusZIY2cOW+Pw==
+"@budibase/pro@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.1.tgz#16d4081cd365e0003bc7ceab66ea196c10e53642"
+  integrity sha512-X41yLuyR6oYnVj475cUqDKMtRQERG1d6Dk6DFFkFYwvzqBX4rNqNEhVRBAXZbjef1NThitgbD4jIAf5hJZc7tw==
   dependencies:
-    "@budibase/backend-core" "2.0.0"
-    "@budibase/types" "2.0.0"
+    "@budibase/backend-core" "2.0.1"
+    "@budibase/types" "2.0.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.0", "@budibase/types@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.0.tgz#bf99868e62991d9a176a6d5a6a8f0234d5898613"
-  integrity sha512-2zk6dGdq+oV+f0bexTJvoDYxowf6x9gQAYTKCV9Exu4peAKWAdqBPFDQR2zgzKcNPB06+G07hSfj12YZGtboDQ==
+"@budibase/types@2.0.1", "@budibase/types@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.1.tgz#3110504bff37768ae082fa8e6c39cc7fa29241ab"
+  integrity sha512-kTP91zQr+cKWA+RTCHOJzg6bCZ9qQ4QaIs3gMgw7JgBM8O/BEzcEQmpRf7KETaxmU/mTYfbsbfWHkAZaroIiJg==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 2c6bccc036134d8b0ca1381deea84a5222f26e52 Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Mon, 26 Sep 2022 22:33:11 +0100
Subject: [PATCH 16/33] Fixing issue with multi-tenancy and groups UI - apps
 with multi-tenancy enabled did not appear correctly and could not be added.

---
 .../pages/builder/portal/manage/groups/[groupId].svelte   | 8 ++++----
 .../portal/manage/groups/_components/AppAddModal.svelte   | 2 +-
 .../src/pages/builder/portal/manage/groups/index.svelte   | 1 -
 packages/builder/src/stores/portal/apps.js                | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
index 92d270931d..5e8fb0d170 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte
@@ -42,7 +42,7 @@
   $: group = $groups.find(x => x._id === groupId)
   $: filtered = $users.data
   $: groupApps = $apps.filter(app =>
-    groups.actions.getGroupAppIds(group).includes(apps.getProdAppID(app.appId))
+    groups.actions.getGroupAppIds(group).includes(apps.getProdAppID(app.devId))
   )
   $: {
     if (loaded && !group?._id) {
@@ -204,17 +204,17 @@
                 <StatusLight
                   square
                   color={RoleUtils.getRoleColour(
-                    group.roles[apps.getProdAppID(app.appId)]
+                    group.roles[apps.getProdAppID(app.devId)]
                   )}
                 >
-                  {getRoleLabel(app.appId)}
+                  {getRoleLabel(app.devId)}
                 </StatusLight>
               </div>
               <Icon
                 on:click={e => {
                   groups.actions.removeApp(
                     groupId,
-                    apps.getProdAppID(app.appId)
+                    apps.getProdAppID(app.devId)
                   )
                   e.stopPropagation()
                 }}
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
index 5d0f06fe73..a8f8fd661f 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/_components/AppAddModal.svelte
@@ -10,13 +10,13 @@
     label: app.name,
     value: app,
   }))
-  $: prodAppId = selectedApp ? apps.getProdAppID(selectedApp.appId) : ""
   $: confirmDisabled =
     (!selectingRole && !selectedApp) || (selectingRole && !selectedRoleId)
   let selectedApp, selectedRoleId
   let selectingRole = false
 
   async function appSelected() {
+    const prodAppId = apps.getProdAppID(selectedApp.devId)
     if (!selectingRole) {
       selectingRole = true
       await roles.fetchByAppId(prodAppId)
diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
index 558e9af8b7..a5707e00dd 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
@@ -27,7 +27,6 @@
     icon: "UserGroup",
     color: "var(--spectrum-global-color-blue-600)",
     users: [],
-    apps: [],
     roles: {},
   }
 
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.js
index 41fdc232b7..a83e35e941 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.js
@@ -21,6 +21,8 @@ const getProdAppID = appId => {
   } else if (!appId.startsWith("app")) {
     rest = appId
     separator = "_"
+  } else {
+    return appId
   }
   return `app${separator}${rest}`
 }

From e07a61466c32a1408b243419e1b258322a7494f2 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 22:11:02 +0000
Subject: [PATCH 17/33] v2.0.2

---
 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 1c182899a6..60aa5d45f6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.0.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 930e842f52..b9e1b30273 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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.1",
+    "@budibase/types": "^2.0.2",
     "@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 c6b94c0eb3..c7e5d290ac 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.1",
+  "version": "2.0.2",
   "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.1",
+    "@budibase/string-templates": "^2.0.2",
     "@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 6e5988b049..068e76d86a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.1",
-    "@budibase/client": "^2.0.1",
-    "@budibase/frontend-core": "^2.0.1",
-    "@budibase/string-templates": "^2.0.1",
+    "@budibase/bbui": "^2.0.2",
+    "@budibase/client": "^2.0.2",
+    "@budibase/frontend-core": "^2.0.2",
+    "@budibase/string-templates": "^2.0.2",
     "@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 bf8116af89..7a30bc9b64 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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.1",
-    "@budibase/string-templates": "^2.0.1",
-    "@budibase/types": "^2.0.1",
+    "@budibase/backend-core": "^2.0.2",
+    "@budibase/string-templates": "^2.0.2",
+    "@budibase/types": "^2.0.2",
     "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 b14b3e3c07..590ffed6dc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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.1",
-    "@budibase/frontend-core": "^2.0.1",
-    "@budibase/string-templates": "^2.0.1",
+    "@budibase/bbui": "^2.0.2",
+    "@budibase/frontend-core": "^2.0.2",
+    "@budibase/string-templates": "^2.0.2",
     "@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 eb341bfdf4..e2f2ed98b8 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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.1",
+    "@budibase/bbui": "^2.0.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 9d8aedee25..65a4d17e1d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5d4a5e342d..628022431a 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.1",
+  "version": "2.0.2",
   "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.1",
-    "@budibase/client": "^2.0.1",
+    "@budibase/backend-core": "^2.0.2",
+    "@budibase/client": "^2.0.2",
     "@budibase/pro": "2.0.1",
-    "@budibase/string-templates": "^2.0.1",
-    "@budibase/types": "^2.0.1",
+    "@budibase/string-templates": "^2.0.2",
+    "@budibase/types": "^2.0.2",
     "@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 92d0d01a51..08ff7ffa54 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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 7b12ccf9cf..27819a0bdf 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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 1b1d5ae621..d766c18fcd 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.1",
+  "version": "2.0.2",
   "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.1",
+    "@budibase/backend-core": "^2.0.2",
     "@budibase/pro": "2.0.1",
-    "@budibase/string-templates": "^2.0.1",
-    "@budibase/types": "^2.0.1",
+    "@budibase/string-templates": "^2.0.2",
+    "@budibase/types": "^2.0.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From ffe426d8d3f4908d0bf7c9aa099f4e52f0001872 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 22:13:08 +0000
Subject: [PATCH 18/33] Update pro version to 2.0.2

---
 packages/server/package.json | 2 +-
 packages/worker/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 628022431a..067d29fd21 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.2",
     "@budibase/client": "^2.0.2",
-    "@budibase/pro": "2.0.1",
+    "@budibase/pro": "2.0.2",
     "@budibase/string-templates": "^2.0.2",
     "@budibase/types": "^2.0.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d766c18fcd..f84298553d 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.2",
-    "@budibase/pro": "2.0.1",
+    "@budibase/pro": "2.0.2",
     "@budibase/string-templates": "^2.0.2",
     "@budibase/types": "^2.0.2",
     "@koa/router": "8.0.8",

From ec2c9ca42025d3d21f380c666fa9aaa4daa8fcad Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 26 Sep 2022 23:46:58 +0100
Subject: [PATCH 19/33] reverting pro version

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 067d29fd21..d5056428c5 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.2",
     "@budibase/client": "^2.0.2",
-    "@budibase/pro": "2.0.2",
+    "@budibase/pro": "2.0.1",
     "@budibase/string-templates": "^2.0.2",
     "@budibase/types": "^2.0.2",
     "@bull-board/api": "3.7.0",
@@ -200,4 +200,4 @@
     "oracledb": "5.3.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f84298553d..b8d860cfa7 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.2",
-    "@budibase/pro": "2.0.2",
+    "@budibase/pro": "2.0.1",
     "@budibase/string-templates": "^2.0.2",
     "@budibase/types": "^2.0.2",
     "@koa/router": "8.0.8",
@@ -105,4 +105,4 @@
     ]
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file

From 06d8533140c439a0812aa1bc8bbc3192c6c85b48 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 22:59:26 +0000
Subject: [PATCH 20/33] v2.0.3

---
 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           | 12 ++++++------
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           | 10 +++++-----
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lerna.json b/lerna.json
index 60aa5d45f6..bce5b2ec08 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.2",
+  "version": "2.0.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b9e1b30273..b25e5249ba 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.2",
+    "@budibase/types": "^2.0.3",
     "@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 c7e5d290ac..968a63063d 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.2",
+  "version": "2.0.3",
   "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.2",
+    "@budibase/string-templates": "^2.0.3",
     "@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 068e76d86a..468ca2f5b6 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.2",
-    "@budibase/client": "^2.0.2",
-    "@budibase/frontend-core": "^2.0.2",
-    "@budibase/string-templates": "^2.0.2",
+    "@budibase/bbui": "^2.0.3",
+    "@budibase/client": "^2.0.3",
+    "@budibase/frontend-core": "^2.0.3",
+    "@budibase/string-templates": "^2.0.3",
     "@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 7a30bc9b64..67398ce5ee 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.2",
-    "@budibase/string-templates": "^2.0.2",
-    "@budibase/types": "^2.0.2",
+    "@budibase/backend-core": "^2.0.3",
+    "@budibase/string-templates": "^2.0.3",
+    "@budibase/types": "^2.0.3",
     "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 590ffed6dc..402e3900f3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.2",
-    "@budibase/frontend-core": "^2.0.2",
-    "@budibase/string-templates": "^2.0.2",
+    "@budibase/bbui": "^2.0.3",
+    "@budibase/frontend-core": "^2.0.3",
+    "@budibase/string-templates": "^2.0.3",
     "@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 e2f2ed98b8..ccf85b1990 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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.2",
+    "@budibase/bbui": "^2.0.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 65a4d17e1d..2ceb7b3657 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index d5056428c5..a6d8064427 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.2",
+  "version": "2.0.3",
   "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.2",
-    "@budibase/client": "^2.0.2",
+    "@budibase/backend-core": "^2.0.3",
+    "@budibase/client": "^2.0.3",
     "@budibase/pro": "2.0.1",
-    "@budibase/string-templates": "^2.0.2",
-    "@budibase/types": "^2.0.2",
+    "@budibase/string-templates": "^2.0.3",
+    "@budibase/types": "^2.0.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -200,4 +200,4 @@
     "oracledb": "5.3.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 08ff7ffa54..c165ee6535 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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 27819a0bdf..db5cde26c3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "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 b8d860cfa7..a55aff70b8 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.2",
+  "version": "2.0.3",
   "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.2",
+    "@budibase/backend-core": "^2.0.3",
     "@budibase/pro": "2.0.1",
-    "@budibase/string-templates": "^2.0.2",
-    "@budibase/types": "^2.0.2",
+    "@budibase/string-templates": "^2.0.3",
+    "@budibase/types": "^2.0.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -105,4 +105,4 @@
     ]
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
\ No newline at end of file
+}

From 904af47d6c6abff595589f153786d8324311818a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 26 Sep 2022 23:02:38 +0000
Subject: [PATCH 21/33] Update pro version to 2.0.3

---
 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 a6d8064427..48dea06783 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.3",
     "@budibase/client": "^2.0.3",
-    "@budibase/pro": "2.0.1",
+    "@budibase/pro": "2.0.3",
     "@budibase/string-templates": "^2.0.3",
     "@budibase/types": "^2.0.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4e3137eafe..24e5ede0ad 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.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.1.tgz#458bb27f4d6365aa9d4eeeea5330e48672914c27"
-  integrity sha512-9hBdKABeNTDl8Mvi5lwOHaObMGHTpzceMhOEsVKPK419z4SSqr1D6nmBXsw1YmpeEwcZ7B6s5nziIxgmvlJPYQ==
+"@budibase/backend-core@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.3.tgz#349918fe0b5bbe217c3211f941c59881e8fc33f4"
+  integrity sha512-wuue0/70GVxx4Tli8WUzUb9tpSvnCwL2zitZzPvCQjjEiRGwq/OUpBUQl6SBSZVubQxhj6GmkdVYvGlg970v9g==
   dependencies:
-    "@budibase/types" "^2.0.1"
+    "@budibase/types" "^2.0.3"
     "@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.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.1.tgz#16d4081cd365e0003bc7ceab66ea196c10e53642"
-  integrity sha512-X41yLuyR6oYnVj475cUqDKMtRQERG1d6Dk6DFFkFYwvzqBX4rNqNEhVRBAXZbjef1NThitgbD4jIAf5hJZc7tw==
+"@budibase/pro@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.3.tgz#c7a53d842cafc624fe324d36274a9644082ba75f"
+  integrity sha512-4Z3Fyc8IrIXlzzghx4UsFRkOXGuOgQZXsdkyuh1M3OTjP7TdOod/vv2SGDqPdNrq6YKWrC9DSd27G70pdOQz2w==
   dependencies:
-    "@budibase/backend-core" "2.0.1"
-    "@budibase/types" "2.0.1"
+    "@budibase/backend-core" "2.0.3"
+    "@budibase/types" "2.0.3"
     "@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.1", "@budibase/types@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.1.tgz#3110504bff37768ae082fa8e6c39cc7fa29241ab"
-  integrity sha512-kTP91zQr+cKWA+RTCHOJzg6bCZ9qQ4QaIs3gMgw7JgBM8O/BEzcEQmpRf7KETaxmU/mTYfbsbfWHkAZaroIiJg==
+"@budibase/types@2.0.3", "@budibase/types@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.3.tgz#b93c482c3d65138602e153d46e3815da4cb83942"
+  integrity sha512-EyPmIUL7SsdlmZM8MJlcCXB1wDPzrTOmpjlyKmZ/aB/vBKj2ifY+mN7qjZW5LWGOZlWWj1NEfGTgr+XumssIAw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a55aff70b8..866be2a181 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.3",
-    "@budibase/pro": "2.0.1",
+    "@budibase/pro": "2.0.3",
     "@budibase/string-templates": "^2.0.3",
     "@budibase/types": "^2.0.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 7fb4a3db20..f483cfd3c7 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.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.1.tgz#458bb27f4d6365aa9d4eeeea5330e48672914c27"
-  integrity sha512-9hBdKABeNTDl8Mvi5lwOHaObMGHTpzceMhOEsVKPK419z4SSqr1D6nmBXsw1YmpeEwcZ7B6s5nziIxgmvlJPYQ==
+"@budibase/backend-core@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.3.tgz#349918fe0b5bbe217c3211f941c59881e8fc33f4"
+  integrity sha512-wuue0/70GVxx4Tli8WUzUb9tpSvnCwL2zitZzPvCQjjEiRGwq/OUpBUQl6SBSZVubQxhj6GmkdVYvGlg970v9g==
   dependencies:
-    "@budibase/types" "^2.0.1"
+    "@budibase/types" "^2.0.3"
     "@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.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.1.tgz#16d4081cd365e0003bc7ceab66ea196c10e53642"
-  integrity sha512-X41yLuyR6oYnVj475cUqDKMtRQERG1d6Dk6DFFkFYwvzqBX4rNqNEhVRBAXZbjef1NThitgbD4jIAf5hJZc7tw==
+"@budibase/pro@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.3.tgz#c7a53d842cafc624fe324d36274a9644082ba75f"
+  integrity sha512-4Z3Fyc8IrIXlzzghx4UsFRkOXGuOgQZXsdkyuh1M3OTjP7TdOod/vv2SGDqPdNrq6YKWrC9DSd27G70pdOQz2w==
   dependencies:
-    "@budibase/backend-core" "2.0.1"
-    "@budibase/types" "2.0.1"
+    "@budibase/backend-core" "2.0.3"
+    "@budibase/types" "2.0.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.1", "@budibase/types@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.1.tgz#3110504bff37768ae082fa8e6c39cc7fa29241ab"
-  integrity sha512-kTP91zQr+cKWA+RTCHOJzg6bCZ9qQ4QaIs3gMgw7JgBM8O/BEzcEQmpRf7KETaxmU/mTYfbsbfWHkAZaroIiJg==
+"@budibase/types@2.0.3", "@budibase/types@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.3.tgz#b93c482c3d65138602e153d46e3815da4cb83942"
+  integrity sha512-EyPmIUL7SsdlmZM8MJlcCXB1wDPzrTOmpjlyKmZ/aB/vBKj2ifY+mN7qjZW5LWGOZlWWj1NEfGTgr+XumssIAw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 8c60a73232e3fd565439338de4d45068ac83cb12 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 27 Sep 2022 09:30:54 +0100
Subject: [PATCH 22/33] Update groups page styles when user does not have
 access

---
 .../builder/portal/manage/groups/index.svelte | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
index a5707e00dd..b81918ba89 100644
--- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte
@@ -90,16 +90,14 @@
 
 <Layout noPadding gap="M">
   <Layout gap="XS" noPadding>
-    <Heading size="M">User groups</Heading>
-    {#if !$licensing.groupsEnabled}
-      <Tags>
-        <div class="tags">
-          <div class="tag">
-            <Tag icon="LockClosed">Pro plan</Tag>
-          </div>
-        </div>
-      </Tags>
-    {/if}
+    <div class="title">
+      <Heading size="M">User groups</Heading>
+      {#if !$licensing.groupsEnabled}
+        <Tags>
+          <Tag icon="LockClosed">Pro plan</Tag>
+        </Tags>
+      {/if}
+    </div>
     <Body>
       Easily assign and manage your users' access with user groups.
       {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
@@ -123,6 +121,7 @@
       {:else}
         <Button
           newStyles
+          primary
           disabled={!$auth.accountPortalAccess && $admin.cloud}
           on:click={$licensing.goToUpgradePage()}
         >
@@ -140,18 +139,22 @@
         </Button>
       {/if}
     </ButtonGroup>
-    <div class="controls-right">
-      <Search bind:value={searchString} placeholder="Search" />
-    </div>
+    {#if $licensing.groupsEnabled}
+      <div class="controls-right">
+        <Search bind:value={searchString} placeholder="Search" />
+      </div>
+    {/if}
   </div>
-  <Table
-    on:click={({ detail }) => $goto(`./${detail._id}`)}
-    {schema}
-    data={filteredGroups}
-    allowEditColumns={false}
-    allowEditRows={false}
-    {customRenderers}
-  />
+  {#if $licensing.groupsEnabled}
+    <Table
+      on:click={({ detail }) => $goto(`./${detail._id}`)}
+      {schema}
+      data={filteredGroups}
+      allowEditColumns={false}
+      allowEditRows={false}
+      {customRenderers}
+    />
+  {/if}
 </Layout>
 
 <Modal bind:this={modal}>
@@ -175,8 +178,11 @@
   .controls-right :global(.spectrum-Search) {
     width: 200px;
   }
-  .tag {
-    margin-top: var(--spacing-xs);
-    margin-left: var(--spacing-m);
+  .title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    gap: var(--spacing-m);
   }
 </style>

From fe413a57991f78a3b91fd783bd255d6643415f84 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 27 Sep 2022 09:31:04 +0100
Subject: [PATCH 23/33] Update plugins page empty state

---
 .../portal/manage/plugins/index.svelte        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
index b1f2480c28..84722c27be 100644
--- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
@@ -55,18 +55,20 @@
           Add plugin
         </Button>
       </div>
-      <div class="filters">
-        <div class="select">
-          <Select
-            bind:value={filter}
-            placeholder={null}
-            options={filterOptions}
-            autoWidth
-            quiet
-          />
+      {#if filteredPlugins?.length}
+        <div class="filters">
+          <div class="select">
+            <Select
+              bind:value={filter}
+              placeholder={null}
+              options={filterOptions}
+              autoWidth
+              quiet
+            />
+          </div>
+          <Search bind:value={searchTerm} placeholder="Search plugins" />
         </div>
-        <Search bind:value={searchTerm} placeholder="Search plugins" />
-      </div>
+      {/if}
     </div>
     {#if filteredPlugins?.length}
       <Layout noPadding gap="S">

From 297754df17cf74390a0eff3f548e9e54829a7414 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 27 Sep 2022 09:43:49 +0000
Subject: [PATCH 24/33] v2.0.4

---
 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 bce5b2ec08..b7b6e7caf7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.3",
+  "version": "2.0.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b25e5249ba..ec5d1abe1d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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.3",
+    "@budibase/types": "^2.0.4",
     "@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 968a63063d..c7a056696d 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.3",
+  "version": "2.0.4",
   "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.3",
+    "@budibase/string-templates": "^2.0.4",
     "@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 468ca2f5b6..93ff1f338c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.3",
-    "@budibase/client": "^2.0.3",
-    "@budibase/frontend-core": "^2.0.3",
-    "@budibase/string-templates": "^2.0.3",
+    "@budibase/bbui": "^2.0.4",
+    "@budibase/client": "^2.0.4",
+    "@budibase/frontend-core": "^2.0.4",
+    "@budibase/string-templates": "^2.0.4",
     "@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 67398ce5ee..aff6bc6c39 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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.3",
-    "@budibase/string-templates": "^2.0.3",
-    "@budibase/types": "^2.0.3",
+    "@budibase/backend-core": "^2.0.4",
+    "@budibase/string-templates": "^2.0.4",
+    "@budibase/types": "^2.0.4",
     "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 402e3900f3..6faec9ed8e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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.3",
-    "@budibase/frontend-core": "^2.0.3",
-    "@budibase/string-templates": "^2.0.3",
+    "@budibase/bbui": "^2.0.4",
+    "@budibase/frontend-core": "^2.0.4",
+    "@budibase/string-templates": "^2.0.4",
     "@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 ccf85b1990..c100afe846 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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.3",
+    "@budibase/bbui": "^2.0.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 2ceb7b3657..91d7949a85 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 48dea06783..bf53a0b2a5 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.3",
+  "version": "2.0.4",
   "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.3",
-    "@budibase/client": "^2.0.3",
+    "@budibase/backend-core": "^2.0.4",
+    "@budibase/client": "^2.0.4",
     "@budibase/pro": "2.0.3",
-    "@budibase/string-templates": "^2.0.3",
-    "@budibase/types": "^2.0.3",
+    "@budibase/string-templates": "^2.0.4",
+    "@budibase/types": "^2.0.4",
     "@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 c165ee6535..1fe0705eff 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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 db5cde26c3..a23bfdcd43 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "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 866be2a181..ab123cbdc5 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.3",
+  "version": "2.0.4",
   "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.3",
+    "@budibase/backend-core": "^2.0.4",
     "@budibase/pro": "2.0.3",
-    "@budibase/string-templates": "^2.0.3",
-    "@budibase/types": "^2.0.3",
+    "@budibase/string-templates": "^2.0.4",
+    "@budibase/types": "^2.0.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0bb17dde2c114fedc9bc3fc06242c652f60254ea Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 27 Sep 2022 09:47:32 +0000
Subject: [PATCH 25/33] Update pro version to 2.0.4

---
 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 bf53a0b2a5..855f6d44d0 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.4",
     "@budibase/client": "^2.0.4",
-    "@budibase/pro": "2.0.3",
+    "@budibase/pro": "2.0.4",
     "@budibase/string-templates": "^2.0.4",
     "@budibase/types": "^2.0.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 24e5ede0ad..5cb5ce2ef4 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.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.3.tgz#349918fe0b5bbe217c3211f941c59881e8fc33f4"
-  integrity sha512-wuue0/70GVxx4Tli8WUzUb9tpSvnCwL2zitZzPvCQjjEiRGwq/OUpBUQl6SBSZVubQxhj6GmkdVYvGlg970v9g==
+"@budibase/backend-core@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.4.tgz#ed90a07a2edab42adde42ceb6f98faa0dd95ac80"
+  integrity sha512-29dWEA5Xsdczaeu2fyQ/6Kk9LL58S8GRL9QjE/Zcnb1Xti1JmSymWNDL+Y8W2ZeTk6rq/eEJ+cnN8smudxZMjQ==
   dependencies:
-    "@budibase/types" "^2.0.3"
+    "@budibase/types" "^2.0.4"
     "@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.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.3.tgz#c7a53d842cafc624fe324d36274a9644082ba75f"
-  integrity sha512-4Z3Fyc8IrIXlzzghx4UsFRkOXGuOgQZXsdkyuh1M3OTjP7TdOod/vv2SGDqPdNrq6YKWrC9DSd27G70pdOQz2w==
+"@budibase/pro@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.4.tgz#ac2652af2b0ab64bca3f33398abbfbf463242bba"
+  integrity sha512-nH5Ci9v/JT+YfaXWrymxqMs8PN26jw+g3397fhEMSjmhMPXKSDnftBEbnB0eG7k6FDHbNfIW3GvmW1Y7sHn3ew==
   dependencies:
-    "@budibase/backend-core" "2.0.3"
-    "@budibase/types" "2.0.3"
+    "@budibase/backend-core" "2.0.4"
+    "@budibase/types" "2.0.4"
     "@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.3", "@budibase/types@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.3.tgz#b93c482c3d65138602e153d46e3815da4cb83942"
-  integrity sha512-EyPmIUL7SsdlmZM8MJlcCXB1wDPzrTOmpjlyKmZ/aB/vBKj2ifY+mN7qjZW5LWGOZlWWj1NEfGTgr+XumssIAw==
+"@budibase/types@2.0.4", "@budibase/types@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.4.tgz#afdd57a475e955cf4184c741b2d85bae51cb11b9"
+  integrity sha512-YX91bD/+ry6WejcfJYkR6Ns53OHJIF5u5RHNSJtRzB+FvAmFv0jUKyB+GPkAZpjo5YpkU2mSWcblpr959Hrf/g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ab123cbdc5..d3c28c145a 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.4",
-    "@budibase/pro": "2.0.3",
+    "@budibase/pro": "2.0.4",
     "@budibase/string-templates": "^2.0.4",
     "@budibase/types": "^2.0.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index f483cfd3c7..98e23fed68 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.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.3.tgz#349918fe0b5bbe217c3211f941c59881e8fc33f4"
-  integrity sha512-wuue0/70GVxx4Tli8WUzUb9tpSvnCwL2zitZzPvCQjjEiRGwq/OUpBUQl6SBSZVubQxhj6GmkdVYvGlg970v9g==
+"@budibase/backend-core@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.4.tgz#ed90a07a2edab42adde42ceb6f98faa0dd95ac80"
+  integrity sha512-29dWEA5Xsdczaeu2fyQ/6Kk9LL58S8GRL9QjE/Zcnb1Xti1JmSymWNDL+Y8W2ZeTk6rq/eEJ+cnN8smudxZMjQ==
   dependencies:
-    "@budibase/types" "^2.0.3"
+    "@budibase/types" "^2.0.4"
     "@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.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.3.tgz#c7a53d842cafc624fe324d36274a9644082ba75f"
-  integrity sha512-4Z3Fyc8IrIXlzzghx4UsFRkOXGuOgQZXsdkyuh1M3OTjP7TdOod/vv2SGDqPdNrq6YKWrC9DSd27G70pdOQz2w==
+"@budibase/pro@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.4.tgz#ac2652af2b0ab64bca3f33398abbfbf463242bba"
+  integrity sha512-nH5Ci9v/JT+YfaXWrymxqMs8PN26jw+g3397fhEMSjmhMPXKSDnftBEbnB0eG7k6FDHbNfIW3GvmW1Y7sHn3ew==
   dependencies:
-    "@budibase/backend-core" "2.0.3"
-    "@budibase/types" "2.0.3"
+    "@budibase/backend-core" "2.0.4"
+    "@budibase/types" "2.0.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.3", "@budibase/types@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.3.tgz#b93c482c3d65138602e153d46e3815da4cb83942"
-  integrity sha512-EyPmIUL7SsdlmZM8MJlcCXB1wDPzrTOmpjlyKmZ/aB/vBKj2ifY+mN7qjZW5LWGOZlWWj1NEfGTgr+XumssIAw==
+"@budibase/types@2.0.4", "@budibase/types@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.4.tgz#afdd57a475e955cf4184c741b2d85bae51cb11b9"
+  integrity sha512-YX91bD/+ry6WejcfJYkR6Ns53OHJIF5u5RHNSJtRzB+FvAmFv0jUKyB+GPkAZpjo5YpkU2mSWcblpr959Hrf/g==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 55affb4a53643f5e138f7e4359ff510ce21107c0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 27 Sep 2022 15:56:51 +0100
Subject: [PATCH 26/33] Use CDN when fetching plugins in cloud

---
 packages/client/src/components/ClientApp.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index c212fcf0f5..ab19e91038 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -16,6 +16,7 @@
     themeStore,
     appStore,
     devToolsStore,
+    environmentStore,
   } from "stores"
   import NotificationDisplay from "components/overlay/NotificationDisplay.svelte"
   import ConfirmationDisplay from "components/overlay/ConfirmationDisplay.svelte"
@@ -47,6 +48,8 @@
     !$builderStore.inBuilder &&
     $devToolsStore.enabled &&
     !$routeStore.queryParams?.peek
+  $: objectStoreUrl = $environmentStore.cloud ? "https://cdn.budi.live" : ""
+  $: pluginsUrl = `${objectStoreUrl}/plugins`
 
   // Handle no matching route
   $: {
@@ -92,7 +95,8 @@
 <svelte:head>
   {#if $builderStore.usedPlugins?.length}
     {#each $builderStore.usedPlugins as plugin (plugin.hash)}
-      <script src={`/plugins/${plugin.jsUrl}?r=${plugin.hash || ""}`}></script>
+      <script
+        src={`${pluginsUrl}/${plugin.jsUrl}?r=${plugin.hash || ""}`}></script>
     {/each}
   {/if}
 </svelte:head>

From a8f8ea2504be2e8febadca471ca143a7bd97daf4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 27 Sep 2022 18:15:36 +0000
Subject: [PATCH 27/33] v2.0.5

---
 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 b7b6e7caf7..ddf6b11649 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.4",
+  "version": "2.0.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ec5d1abe1d..e04b204892 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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.4",
+    "@budibase/types": "^2.0.5",
     "@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 c7a056696d..a832e36bfc 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.4",
+  "version": "2.0.5",
   "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.4",
+    "@budibase/string-templates": "^2.0.5",
     "@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 93ff1f338c..ab9b2d2435 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.4",
-    "@budibase/client": "^2.0.4",
-    "@budibase/frontend-core": "^2.0.4",
-    "@budibase/string-templates": "^2.0.4",
+    "@budibase/bbui": "^2.0.5",
+    "@budibase/client": "^2.0.5",
+    "@budibase/frontend-core": "^2.0.5",
+    "@budibase/string-templates": "^2.0.5",
     "@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 aff6bc6c39..de8c453fda 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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.4",
-    "@budibase/string-templates": "^2.0.4",
-    "@budibase/types": "^2.0.4",
+    "@budibase/backend-core": "^2.0.5",
+    "@budibase/string-templates": "^2.0.5",
+    "@budibase/types": "^2.0.5",
     "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 6faec9ed8e..ba0e012c5b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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.4",
-    "@budibase/frontend-core": "^2.0.4",
-    "@budibase/string-templates": "^2.0.4",
+    "@budibase/bbui": "^2.0.5",
+    "@budibase/frontend-core": "^2.0.5",
+    "@budibase/string-templates": "^2.0.5",
     "@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 c100afe846..83f731f5d0 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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.4",
+    "@budibase/bbui": "^2.0.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 91d7949a85..11e75b5762 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 855f6d44d0..9a8a9284b7 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.4",
+  "version": "2.0.5",
   "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.4",
-    "@budibase/client": "^2.0.4",
+    "@budibase/backend-core": "^2.0.5",
+    "@budibase/client": "^2.0.5",
     "@budibase/pro": "2.0.4",
-    "@budibase/string-templates": "^2.0.4",
-    "@budibase/types": "^2.0.4",
+    "@budibase/string-templates": "^2.0.5",
+    "@budibase/types": "^2.0.5",
     "@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 1fe0705eff..817553c695 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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 a23bfdcd43..0ed3b4b590 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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 d3c28c145a..ae2a6d9ad9 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.4",
+  "version": "2.0.5",
   "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.4",
+    "@budibase/backend-core": "^2.0.5",
     "@budibase/pro": "2.0.4",
-    "@budibase/string-templates": "^2.0.4",
-    "@budibase/types": "^2.0.4",
+    "@budibase/string-templates": "^2.0.5",
+    "@budibase/types": "^2.0.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 6c7c218600faadc504aaebfe31c1620df43335ae Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 27 Sep 2022 18:18:53 +0000
Subject: [PATCH 28/33] Update pro version to 2.0.5

---
 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 9a8a9284b7..27b19bc26f 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.5",
     "@budibase/client": "^2.0.5",
-    "@budibase/pro": "2.0.4",
+    "@budibase/pro": "2.0.5",
     "@budibase/string-templates": "^2.0.5",
     "@budibase/types": "^2.0.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 5cb5ce2ef4..4a989e8a78 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.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.4.tgz#ed90a07a2edab42adde42ceb6f98faa0dd95ac80"
-  integrity sha512-29dWEA5Xsdczaeu2fyQ/6Kk9LL58S8GRL9QjE/Zcnb1Xti1JmSymWNDL+Y8W2ZeTk6rq/eEJ+cnN8smudxZMjQ==
+"@budibase/backend-core@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.5.tgz#e720ad8a0fd0eb0157d8ec332e530b481fd5b912"
+  integrity sha512-uY/YQgZ1xTm3npzWNRgZQBY/nj2ZxSkGtGbgK4NyWwZzvVUwd9vfNAIdKf7crECMJncH1x4H9TalQoFXb/cmbA==
   dependencies:
-    "@budibase/types" "^2.0.4"
+    "@budibase/types" "^2.0.5"
     "@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.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.4.tgz#ac2652af2b0ab64bca3f33398abbfbf463242bba"
-  integrity sha512-nH5Ci9v/JT+YfaXWrymxqMs8PN26jw+g3397fhEMSjmhMPXKSDnftBEbnB0eG7k6FDHbNfIW3GvmW1Y7sHn3ew==
+"@budibase/pro@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.5.tgz#50c536f3e65db335e728379d2a931f295dfb0cd8"
+  integrity sha512-wG3yhwiHXFas3PooiAblRZBajjeWgVPnd65V9HTyac2OCdkSQLyD2djoSfwow+N3Vhe8CApNKMfLL/V7/s9EUg==
   dependencies:
-    "@budibase/backend-core" "2.0.4"
-    "@budibase/types" "2.0.4"
+    "@budibase/backend-core" "2.0.5"
+    "@budibase/types" "2.0.5"
     "@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.4", "@budibase/types@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.4.tgz#afdd57a475e955cf4184c741b2d85bae51cb11b9"
-  integrity sha512-YX91bD/+ry6WejcfJYkR6Ns53OHJIF5u5RHNSJtRzB+FvAmFv0jUKyB+GPkAZpjo5YpkU2mSWcblpr959Hrf/g==
+"@budibase/types@2.0.5", "@budibase/types@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.5.tgz#852c86611f237640b59d8dc4ae0c8c5fec491cf1"
+  integrity sha512-MnnDEB22kbXRsztmHPgvFDSYavpb0qm6H6Y/3UHXKqyFEg/KRpiF1p7lYsN+FAUDAWxpFgI+kp2Yw6gWyA5FLQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ae2a6d9ad9..80df0cca45 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.5",
-    "@budibase/pro": "2.0.4",
+    "@budibase/pro": "2.0.5",
     "@budibase/string-templates": "^2.0.5",
     "@budibase/types": "^2.0.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 98e23fed68..5fe8818a8f 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.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.4.tgz#ed90a07a2edab42adde42ceb6f98faa0dd95ac80"
-  integrity sha512-29dWEA5Xsdczaeu2fyQ/6Kk9LL58S8GRL9QjE/Zcnb1Xti1JmSymWNDL+Y8W2ZeTk6rq/eEJ+cnN8smudxZMjQ==
+"@budibase/backend-core@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.5.tgz#e720ad8a0fd0eb0157d8ec332e530b481fd5b912"
+  integrity sha512-uY/YQgZ1xTm3npzWNRgZQBY/nj2ZxSkGtGbgK4NyWwZzvVUwd9vfNAIdKf7crECMJncH1x4H9TalQoFXb/cmbA==
   dependencies:
-    "@budibase/types" "^2.0.4"
+    "@budibase/types" "^2.0.5"
     "@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.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.4.tgz#ac2652af2b0ab64bca3f33398abbfbf463242bba"
-  integrity sha512-nH5Ci9v/JT+YfaXWrymxqMs8PN26jw+g3397fhEMSjmhMPXKSDnftBEbnB0eG7k6FDHbNfIW3GvmW1Y7sHn3ew==
+"@budibase/pro@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.5.tgz#50c536f3e65db335e728379d2a931f295dfb0cd8"
+  integrity sha512-wG3yhwiHXFas3PooiAblRZBajjeWgVPnd65V9HTyac2OCdkSQLyD2djoSfwow+N3Vhe8CApNKMfLL/V7/s9EUg==
   dependencies:
-    "@budibase/backend-core" "2.0.4"
-    "@budibase/types" "2.0.4"
+    "@budibase/backend-core" "2.0.5"
+    "@budibase/types" "2.0.5"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.4", "@budibase/types@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.4.tgz#afdd57a475e955cf4184c741b2d85bae51cb11b9"
-  integrity sha512-YX91bD/+ry6WejcfJYkR6Ns53OHJIF5u5RHNSJtRzB+FvAmFv0jUKyB+GPkAZpjo5YpkU2mSWcblpr959Hrf/g==
+"@budibase/types@2.0.5", "@budibase/types@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.5.tgz#852c86611f237640b59d8dc4ae0c8c5fec491cf1"
+  integrity sha512-MnnDEB22kbXRsztmHPgvFDSYavpb0qm6H6Y/3UHXKqyFEg/KRpiF1p7lYsN+FAUDAWxpFgI+kp2Yw6gWyA5FLQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 9b8529c1d843deedd9ebf315eec26b407a3d1dbb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 28 Sep 2022 15:08:14 +0100
Subject: [PATCH 29/33] Update casing in 'does not contain' filter operator

---
 packages/frontend-core/src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 633534dddb..eb7a8849a5 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -40,7 +40,7 @@ export const OperatorOptions = {
   },
   NotContains: {
     value: "notContains",
-    label: "Does Not Contain",
+    label: "Does not contain",
   },
   In: {
     value: "oneOf",

From 9e1f19e5e18089d9786788bc443ab0aef7ce94d9 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 28 Sep 2022 15:08:44 +0100
Subject: [PATCH 30/33] Simplify, strengthen and make consistent filter drawer
 validation logic

---
 .../controls/FilterEditor/FilterDrawer.svelte | 117 ++++++++----------
 1 file changed, 53 insertions(+), 64 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index 000ae346a9..bbe81d866d 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -20,6 +20,8 @@
   import { createEventDispatcher, onMount } from "svelte"
 
   const dispatch = createEventDispatcher()
+  const { OperatorOptions } = Constants
+  const { getValidOperatorsForType } = LuceneUtils
 
   export let schemaFields
   export let filters = []
@@ -45,7 +47,7 @@
       {
         id: generate(),
         field: null,
-        operator: Constants.OperatorOptions.Equals.value,
+        operator: OperatorOptions.Equals.value,
         value: null,
         valueType: "Value",
       },
@@ -66,73 +68,60 @@
     return schemaFields.find(field => field.name === filter.field)
   }
 
-  const onFieldChange = (expression, field) => {
-    // Update the field types
-    expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
-    expression.externalType = getSchema(expression)?.externalType
+  const validateTypes = filter => {
+    // Update type based on field
+    const fieldSchema = enrichedSchemaFields.find(x => x.name === filter.field)
+    filter.type = fieldSchema?.type
 
-    // Ensure a valid operator is set
-    const validOperators = LuceneUtils.getValidOperatorsForType(
-      expression.type
-    ).map(x => x.value)
-    if (!validOperators.includes(expression.operator)) {
-      expression.operator =
-        validOperators[0] ?? Constants.OperatorOptions.Equals.value
-      onOperatorChange(expression, expression.operator)
-    }
-
-    // if changed to an array, change default value to empty array
-    const idx = filters.findIndex(x => x.id === expression.id)
-    if (expression.type === "array") {
-      filters[idx].value = []
-    } else {
-      filters[idx].value = null
-    }
+    // Update external type based on field
+    filter.externalType = getSchema(filter)?.externalType
   }
 
-  const onOperatorChange = (expression, operator) => {
+  const validateOperator = filter => {
+    // Ensure a valid operator is selected
+    const operators = getValidOperatorsForType(filter.type).map(x => x.value)
+    if (!operators.includes(filter.operator)) {
+      filter.operator = operators[0] ?? OperatorOptions.Equals.value
+    }
+
+    // Update the noValue flag if the operator does not take a value
     const noValueOptions = [
-      Constants.OperatorOptions.Empty.value,
-      Constants.OperatorOptions.NotEmpty.value,
+      OperatorOptions.Empty.value,
+      OperatorOptions.NotEmpty.value,
     ]
-    expression.noValue = noValueOptions.includes(operator)
-    if (expression.noValue) {
-      expression.value = null
+    filter.noValue = noValueOptions.includes(filter.operator)
+  }
+
+  const validateValue = filter => {
+    // Check if the operator allows a value at all
+    if (filter.noValue) {
+      filter.value = null
+      return
     }
-    if (
-      operator === Constants.OperatorOptions.In.value &&
-      !Array.isArray(expression.value) &&
-      expression.valueType === "Value"
-    ) {
-      if (expression.value) {
-        expression.value = [expression.value]
-      } else {
-        expression.value = []
+
+    // Ensure array values are properly set and cleared
+    if (Array.isArray(filter.value)) {
+      if (filter.valueType !== "Value" || filter.type !== "array") {
+        filter.value = null
       }
-    } else if (
-      operator !== Constants.OperatorOptions.In.value &&
-      Array.isArray(expression.value)
-    ) {
-      expression.value = null
+    } else if (filter.type === "array" && filter.valueType === "Value") {
+      filter.value = []
     }
   }
 
-  const onValueTypeChange = (expression, valueType) => {
-    if (Array.isArray(expression.value) && valueType === "Binding") {
-      expression.value = null
-    } else if (
-      expression.operator === Constants.OperatorOptions.In.value &&
-      !Array.isArray(expression.value) &&
-      valueType === "Value"
-    ) {
-      if (typeof expression.value === "string") {
-        expression.value = expression.value.split(",")
-      } else if (expression.value) {
-        expression.value = [expression.value]
-      } else {
-        expression.value = []
-      }
-    }
+  const onFieldChange = filter => {
+    validateTypes(filter)
+    validateOperator(filter)
+    validateValue(filter)
+  }
+
+  const onOperatorChange = filter => {
+    validateOperator(filter)
+    validateValue(filter)
+  }
+
+  const onValueTypeChange = filter => {
+    validateValue(filter)
   }
 
   const getFieldOptions = field => {
@@ -177,24 +166,24 @@
               <Select
                 bind:value={filter.field}
                 options={fieldOptions}
-                on:change={e => onFieldChange(filter, e.detail)}
+                on:change={() => onFieldChange(filter)}
                 placeholder="Column"
               />
               <Select
                 disabled={!filter.field}
-                options={LuceneUtils.getValidOperatorsForType(filter.type)}
+                options={getValidOperatorsForType(filter.type)}
                 bind:value={filter.operator}
-                on:change={e => onOperatorChange(filter, e.detail)}
+                on:change={() => onOperatorChange(filter)}
                 placeholder={null}
               />
               <Select
                 disabled={filter.noValue || !filter.field}
                 options={valueTypeOptions}
                 bind:value={filter.valueType}
+                on:change={() => onValueTypeChange(filter)}
                 placeholder={null}
-                on:change={e => onValueTypeChange(filter, e.detail)}
               />
-              {#if filter.valueType === "Binding"}
+              {#if filter.field && filter.valueType === "Binding"}
                 <DrawerBindableInput
                   disabled={filter.noValue}
                   title={`Value for "${filter.field}"`}
@@ -275,7 +264,7 @@
     column-gap: var(--spacing-l);
     row-gap: var(--spacing-s);
     align-items: center;
-    grid-template-columns: 1fr 120px 120px 1fr auto auto;
+    grid-template-columns: 1fr 150px 120px 1fr 16px 16px;
   }
 
   .filter-label {

From 05b707da64fdfead7f82f447602509b3247bbc60 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 28 Sep 2022 15:36:35 +0100
Subject: [PATCH 31/33] Update naming conventions in filter drawer

---
 .../controls/FilterEditor/FilterDrawer.svelte  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index bbe81d866d..a419f5ad46 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -68,7 +68,7 @@
     return schemaFields.find(field => field.name === filter.field)
   }
 
-  const validateTypes = filter => {
+  const santizeTypes = filter => {
     // Update type based on field
     const fieldSchema = enrichedSchemaFields.find(x => x.name === filter.field)
     filter.type = fieldSchema?.type
@@ -77,7 +77,7 @@
     filter.externalType = getSchema(filter)?.externalType
   }
 
-  const validateOperator = filter => {
+  const santizeOperator = filter => {
     // Ensure a valid operator is selected
     const operators = getValidOperatorsForType(filter.type).map(x => x.value)
     if (!operators.includes(filter.operator)) {
@@ -92,7 +92,7 @@
     filter.noValue = noValueOptions.includes(filter.operator)
   }
 
-  const validateValue = filter => {
+  const santizeValue = filter => {
     // Check if the operator allows a value at all
     if (filter.noValue) {
       filter.value = null
@@ -110,18 +110,18 @@
   }
 
   const onFieldChange = filter => {
-    validateTypes(filter)
-    validateOperator(filter)
-    validateValue(filter)
+    santizeTypes(filter)
+    santizeOperator(filter)
+    santizeValue(filter)
   }
 
   const onOperatorChange = filter => {
-    validateOperator(filter)
-    validateValue(filter)
+    santizeOperator(filter)
+    santizeValue(filter)
   }
 
   const onValueTypeChange = filter => {
-    validateValue(filter)
+    santizeValue(filter)
   }
 
   const getFieldOptions = field => {

From f4eba61994ba9c56288d2005547ac70d7390f2d1 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 28 Sep 2022 15:34:09 +0000
Subject: [PATCH 32/33] v2.0.6

---
 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 ddf6b11649..9a771b2983 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.5",
+  "version": "2.0.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e04b204892..bd5a839edc 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
+    "@budibase/types": "^2.0.6",
     "@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 a832e36bfc..6ebe70be0b 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.5",
+  "version": "2.0.6",
   "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.5",
+    "@budibase/string-templates": "^2.0.6",
     "@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 ab9b2d2435..a7d9d7d264 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.0.5",
-    "@budibase/client": "^2.0.5",
-    "@budibase/frontend-core": "^2.0.5",
-    "@budibase/string-templates": "^2.0.5",
+    "@budibase/bbui": "^2.0.6",
+    "@budibase/client": "^2.0.6",
+    "@budibase/frontend-core": "^2.0.6",
+    "@budibase/string-templates": "^2.0.6",
     "@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 de8c453fda..1d42e01246 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
-    "@budibase/string-templates": "^2.0.5",
-    "@budibase/types": "^2.0.5",
+    "@budibase/backend-core": "^2.0.6",
+    "@budibase/string-templates": "^2.0.6",
+    "@budibase/types": "^2.0.6",
     "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 ba0e012c5b..cfbb361dab 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
-    "@budibase/frontend-core": "^2.0.5",
-    "@budibase/string-templates": "^2.0.5",
+    "@budibase/bbui": "^2.0.6",
+    "@budibase/frontend-core": "^2.0.6",
+    "@budibase/string-templates": "^2.0.6",
     "@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 83f731f5d0..b44f15137a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
+    "@budibase/bbui": "^2.0.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 11e75b5762..70fb754fff 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 27b19bc26f..cb5994e03f 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.5",
+  "version": "2.0.6",
   "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.5",
-    "@budibase/client": "^2.0.5",
+    "@budibase/backend-core": "^2.0.6",
+    "@budibase/client": "^2.0.6",
     "@budibase/pro": "2.0.5",
-    "@budibase/string-templates": "^2.0.5",
-    "@budibase/types": "^2.0.5",
+    "@budibase/string-templates": "^2.0.6",
+    "@budibase/types": "^2.0.6",
     "@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 817553c695..a205959db2 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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 0ed3b4b590..7d6a2936ab 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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 80df0cca45..db65bb3ac8 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.5",
+  "version": "2.0.6",
   "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.5",
+    "@budibase/backend-core": "^2.0.6",
     "@budibase/pro": "2.0.5",
-    "@budibase/string-templates": "^2.0.5",
-    "@budibase/types": "^2.0.5",
+    "@budibase/string-templates": "^2.0.6",
+    "@budibase/types": "^2.0.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 56559510fdfdfbce9f67d2674a3d0f945ae4f2cd Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 28 Sep 2022 15:38:05 +0000
Subject: [PATCH 33/33] Update pro version to 2.0.6

---
 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 cb5994e03f..38b37812c4 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.6",
     "@budibase/client": "^2.0.6",
-    "@budibase/pro": "2.0.5",
+    "@budibase/pro": "2.0.6",
     "@budibase/string-templates": "^2.0.6",
     "@budibase/types": "^2.0.6",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4a989e8a78..305b715d55 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.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.5.tgz#e720ad8a0fd0eb0157d8ec332e530b481fd5b912"
-  integrity sha512-uY/YQgZ1xTm3npzWNRgZQBY/nj2ZxSkGtGbgK4NyWwZzvVUwd9vfNAIdKf7crECMJncH1x4H9TalQoFXb/cmbA==
+"@budibase/backend-core@2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.6.tgz#1e80e5a06a53c294def350f10fcce3c224d73a84"
+  integrity sha512-BxBfFH/qW66MXatD1DSrefPp/dQxgY9hq+Z8hB8raOZfoL+fxIa0m/U8Ihqe5atYPXf9B4/RdjjQk+ioZ/Bjaw==
   dependencies:
-    "@budibase/types" "^2.0.5"
+    "@budibase/types" "^2.0.6"
     "@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.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.5.tgz#50c536f3e65db335e728379d2a931f295dfb0cd8"
-  integrity sha512-wG3yhwiHXFas3PooiAblRZBajjeWgVPnd65V9HTyac2OCdkSQLyD2djoSfwow+N3Vhe8CApNKMfLL/V7/s9EUg==
+"@budibase/pro@2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.6.tgz#ac3d32e595c7649c1051c021347d1d8c7d870e0a"
+  integrity sha512-qvcalSJOEEE//cFazLuR8qrd12CBx6l/RIMKq9+KMXEA9ZyG7UfsCl3C2Yk6bgtW+ZkmmJabO9QjTTU81Ktn0A==
   dependencies:
-    "@budibase/backend-core" "2.0.5"
-    "@budibase/types" "2.0.5"
+    "@budibase/backend-core" "2.0.6"
+    "@budibase/types" "2.0.6"
     "@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.5", "@budibase/types@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.5.tgz#852c86611f237640b59d8dc4ae0c8c5fec491cf1"
-  integrity sha512-MnnDEB22kbXRsztmHPgvFDSYavpb0qm6H6Y/3UHXKqyFEg/KRpiF1p7lYsN+FAUDAWxpFgI+kp2Yw6gWyA5FLQ==
+"@budibase/types@2.0.6", "@budibase/types@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.6.tgz#03f294e4809c4044197a52325a7d1b55f40643a4"
+  integrity sha512-D2vQ+zSJqOpjCc7KdxnUtB4MucNC0OEsxcSp0uiIb+2Tv0dfRUUKl/IOrvXrkwqZ+uLDUMYYjKUQQcKxdBrnqA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index db65bb3ac8..9bf4319bd5 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.6",
-    "@budibase/pro": "2.0.5",
+    "@budibase/pro": "2.0.6",
     "@budibase/string-templates": "^2.0.6",
     "@budibase/types": "^2.0.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5fe8818a8f..5945f7b962 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.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.5.tgz#e720ad8a0fd0eb0157d8ec332e530b481fd5b912"
-  integrity sha512-uY/YQgZ1xTm3npzWNRgZQBY/nj2ZxSkGtGbgK4NyWwZzvVUwd9vfNAIdKf7crECMJncH1x4H9TalQoFXb/cmbA==
+"@budibase/backend-core@2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.6.tgz#1e80e5a06a53c294def350f10fcce3c224d73a84"
+  integrity sha512-BxBfFH/qW66MXatD1DSrefPp/dQxgY9hq+Z8hB8raOZfoL+fxIa0m/U8Ihqe5atYPXf9B4/RdjjQk+ioZ/Bjaw==
   dependencies:
-    "@budibase/types" "^2.0.5"
+    "@budibase/types" "^2.0.6"
     "@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.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.5.tgz#50c536f3e65db335e728379d2a931f295dfb0cd8"
-  integrity sha512-wG3yhwiHXFas3PooiAblRZBajjeWgVPnd65V9HTyac2OCdkSQLyD2djoSfwow+N3Vhe8CApNKMfLL/V7/s9EUg==
+"@budibase/pro@2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.6.tgz#ac3d32e595c7649c1051c021347d1d8c7d870e0a"
+  integrity sha512-qvcalSJOEEE//cFazLuR8qrd12CBx6l/RIMKq9+KMXEA9ZyG7UfsCl3C2Yk6bgtW+ZkmmJabO9QjTTU81Ktn0A==
   dependencies:
-    "@budibase/backend-core" "2.0.5"
-    "@budibase/types" "2.0.5"
+    "@budibase/backend-core" "2.0.6"
+    "@budibase/types" "2.0.6"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.5", "@budibase/types@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.5.tgz#852c86611f237640b59d8dc4ae0c8c5fec491cf1"
-  integrity sha512-MnnDEB22kbXRsztmHPgvFDSYavpb0qm6H6Y/3UHXKqyFEg/KRpiF1p7lYsN+FAUDAWxpFgI+kp2Yw6gWyA5FLQ==
+"@budibase/types@2.0.6", "@budibase/types@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.6.tgz#03f294e4809c4044197a52325a7d1b55f40643a4"
+  integrity sha512-D2vQ+zSJqOpjCc7KdxnUtB4MucNC0OEsxcSp0uiIb+2Tv0dfRUUKl/IOrvXrkwqZ+uLDUMYYjKUQQcKxdBrnqA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"