From 07553b99370eb412f5288f3dfea701325f5194cc Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 26 Jul 2021 13:58:18 +0200
Subject: [PATCH 01/19] clear form action - draft

---
 .../EventsEditor/actions/index.js             |  3 ++
 packages/client/src/constants.js              |  1 +
 packages/client/src/utils/buttonActions.js    |  9 ++++++
 .../src/forms/InnerForm.svelte                | 28 +++++++++++++++++++
 4 files changed, 41 insertions(+)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
index b8114461f9..2c9023714f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
@@ -42,4 +42,7 @@ export default [
     name: "Log Out",
     component: LogOut,
   },
+  {
+    name: "Clear Form",
+  },
 ]
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index e0595c0ce9..049b16801b 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -6,6 +6,7 @@ export const ActionTypes = {
   ValidateForm: "ValidateForm",
   RefreshDatasource: "RefreshDatasource",
   SetDataProviderQuery: "SetDataProviderQuery",
+  ClearForm: "ClearForm"
 }
 
 export const ApiVersion = "1"
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index af4826a1c4..d7707bfb11 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -77,6 +77,14 @@ const refreshDatasourceHandler = async (action, context) => {
   )
 }
 
+const clearFormHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ClearForm
+  )
+}
+
 const handlerMap = {
   ["Save Row"]: saveRowHandler,
   ["Delete Row"]: deleteRowHandler,
@@ -85,6 +93,7 @@ const handlerMap = {
   ["Trigger Automation"]: triggerAutomationHandler,
   ["Validate Form"]: validateFormHandler,
   ["Refresh Datasource"]: refreshDatasourceHandler,
+  ["Clear Form"]: clearFormHandler
 }
 
 const confirmTextMap = {
diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index 3a63b63bdc..55e14217e1 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -64,6 +64,13 @@
       })
       return get(formState).valid
     },
+    clear: () => {
+      const fields = Object.keys(fieldMap)
+      fields.forEach(field => {
+        const { fieldApi } = fieldMap[field]
+        fieldApi.clearValue();
+      })
+    }
   }
 
   // Provide both form API and state to children
@@ -72,6 +79,7 @@
   // Action context to pass to children
   const actions = [
     { type: ActionTypes.ValidateForm, callback: formApi.validate },
+    { type: ActionTypes.ClearForm, callback: formApi.clear },
   ]
 
   // Creates an API for a specific field
@@ -108,8 +116,28 @@
 
       return !newError
     }
+
+    const clearValue = () => {
+      const { fieldState } = fieldMap[field]
+      fieldState.update(state => {
+        state.value = defaultValue
+        state.error = null
+        return state
+      })
+
+      formState.update(state => {
+        state.values = { ...state.values, [field]: defaultValue }
+        delete state.errors[field]
+        state.valid = Object.keys(state.errors).length === 0
+        return state
+      })
+
+      return true
+    }
+
     return {
       setValue,
+      clearValue,
       validate: () => {
         const { fieldState } = fieldMap[field]
         setValue(get(fieldState).value, true)

From 3dbafac80647298fb375b574353f867b42d347ae Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 26 Jul 2021 15:05:22 +0200
Subject: [PATCH 02/19] clear form action - adjust manifest and add settings
 form

---
 .../EventsEditor/actions/ClearForm.svelte     | 35 +++++++++++++++++++
 .../EventsEditor/actions/index.js             |  2 ++
 packages/standard-components/manifest.json    |  3 +-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ClearForm.svelte

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ClearForm.svelte
new file mode 100644
index 0000000000..74eae6283c
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/ClearForm.svelte
@@ -0,0 +1,35 @@
+<script>
+  import { Select, Label } from "@budibase/bbui"
+  import { currentAsset, store } from "builderStore"
+  import { getActionProviderComponents } from "builderStore/dataBinding"
+
+  export let parameters
+
+  $: actionProviders = getActionProviderComponents(
+    $currentAsset,
+    $store.selectedComponentId,
+    "ClearForm"
+  )
+</script>
+
+<div class="root">
+  <Label small>Form</Label>
+  <Select
+    bind:value={parameters.componentId}
+    options={actionProviders}
+    getOptionLabel={x => x._instanceName}
+    getOptionValue={x => x._id}
+  />
+</div>
+
+<style>
+  .root {
+    display: grid;
+    column-gap: var(--spacing-l);
+    row-gap: var(--spacing-s);
+    grid-template-columns: 60px 1fr;
+    align-items: center;
+    max-width: 800px;
+    margin: 0 auto;
+  }
+</style>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
index 2c9023714f..5ac594328f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
@@ -5,6 +5,7 @@ import ExecuteQuery from "./ExecuteQuery.svelte"
 import TriggerAutomation from "./TriggerAutomation.svelte"
 import ValidateForm from "./ValidateForm.svelte"
 import LogOut from "./LogOut.svelte"
+import ClearForm from "./ClearForm.svelte"
 
 // Defines which actions are available to configure in the front end.
 // Unfortunately the "name" property is used as the identifier so please don't
@@ -44,5 +45,6 @@ export default [
   },
   {
     name: "Clear Form",
+    component: ClearForm
   },
 ]
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 2410ba56b5..e0603c0f0b 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -1647,7 +1647,8 @@
     "hasChildren": true,
     "illegalChildren": ["section"],
     "actions": [
-      "ValidateForm"
+      "ValidateForm",
+      "ClearForm"
     ],
     "styles": ["size"],
     "settings": [

From f2c26a90c358d51cb44a188cbb2394a7c5bb64ee Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 26 Jul 2021 15:22:14 +0200
Subject: [PATCH 03/19] fix lint issues

---
 .../PropertyControls/EventsEditor/actions/index.js            | 2 +-
 packages/client/src/constants.js                              | 2 +-
 packages/client/src/utils/buttonActions.js                    | 2 +-
 packages/standard-components/src/forms/InnerForm.svelte       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
index 5ac594328f..bfbf97701b 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
@@ -45,6 +45,6 @@ export default [
   },
   {
     name: "Clear Form",
-    component: ClearForm
+    component: ClearForm,
   },
 ]
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index 049b16801b..7204b8c951 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -6,7 +6,7 @@ export const ActionTypes = {
   ValidateForm: "ValidateForm",
   RefreshDatasource: "RefreshDatasource",
   SetDataProviderQuery: "SetDataProviderQuery",
-  ClearForm: "ClearForm"
+  ClearForm: "ClearForm",
 }
 
 export const ApiVersion = "1"
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 9dd32561d7..ea29180d36 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -103,7 +103,7 @@ const handlerMap = {
   ["Validate Form"]: validateFormHandler,
   ["Refresh Datasource"]: refreshDatasourceHandler,
   ["Log Out"]: logoutHandler,
-  ["Clear Form"]: clearFormHandler
+  ["Clear Form"]: clearFormHandler,
 }
 
 const confirmTextMap = {
diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index 55e14217e1..cd135c1551 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -68,9 +68,9 @@
       const fields = Object.keys(fieldMap)
       fields.forEach(field => {
         const { fieldApi } = fieldMap[field]
-        fieldApi.clearValue();
+        fieldApi.clearValue()
       })
-    }
+    },
   }
 
   // Provide both form API and state to children

From bb69f40a46cde019217d3c06a1c13f978c0203c0 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 26 Jul 2021 17:01:29 +0200
Subject: [PATCH 04/19] implement review comments

---
 packages/standard-components/src/forms/InnerForm.svelte | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index cd135c1551..05ef468165 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -119,20 +119,19 @@
 
     const clearValue = () => {
       const { fieldState } = fieldMap[field]
+      const newValue = initialValues[field] ?? defaultValue;
       fieldState.update(state => {
-        state.value = defaultValue
+        state.value = newValue
         state.error = null
         return state
       })
 
       formState.update(state => {
-        state.values = { ...state.values, [field]: defaultValue }
+        state.values = { ...state.values, [field]: newValue }
         delete state.errors[field]
         state.valid = Object.keys(state.errors).length === 0
         return state
       })
-
-      return true
     }
 
     return {

From cd132ca057a4fdc6d0bec5c333af4fb16688ed36 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Mon, 26 Jul 2021 17:47:53 +0200
Subject: [PATCH 05/19] fix lint issue

---
 packages/standard-components/src/forms/InnerForm.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/standard-components/src/forms/InnerForm.svelte b/packages/standard-components/src/forms/InnerForm.svelte
index 05ef468165..f6fadfa5cb 100644
--- a/packages/standard-components/src/forms/InnerForm.svelte
+++ b/packages/standard-components/src/forms/InnerForm.svelte
@@ -119,7 +119,7 @@
 
     const clearValue = () => {
       const { fieldState } = fieldMap[field]
-      const newValue = initialValues[field] ?? defaultValue;
+      const newValue = initialValues[field] ?? defaultValue
       fieldState.update(state => {
         state.value = newValue
         state.error = null

From 3298b66ebfd632484b5d21ee99930e38bf6ebcde Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 27 Jul 2021 14:29:06 +0200
Subject: [PATCH 06/19] convert automation icons into toggle

---
 .../automation/SetupPanel/SetupPanel.svelte   | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index ff3874a919..25d0839d2a 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { automationStore } from "builderStore"
   import { database } from "stores/backend"
-  import { notifications, Icon, Button, Modal, Heading } from "@budibase/bbui"
+  import { notifications, Button, Modal, Heading, Toggle } from "@budibase/bbui"
   import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
   import CreateWebookModal from "../Shared/CreateWebhookModal.svelte"
 
@@ -12,10 +12,10 @@
   $: automationLive = automation?.live
 
   function setAutomationLive(live) {
-    if (automation.live === live) {
+    if (automationLive === live) {
       return
     }
-    automation.live = live
+    automation.live = live;
     automationStore.actions.save({ instanceId, automation })
     if (live) {
       notifications.info(`Automation ${automation.name} enabled.`)
@@ -48,20 +48,11 @@
 
 <div class="title">
   <Heading size="S">Setup</Heading>
-  <Icon
-    l
-    disabled={!automationLive}
-    hoverable={automationLive}
-    name="PauseCircle"
-    on:click={() => setAutomationLive(false)}
-  />
-  <Icon
-    l
-    name="PlayCircle"
-    disabled={automationLive}
-    hoverable={!automationLive}
+  <Toggle
+    value={automationLive}
+    on:change={() => setAutomationLive(!automationLive)}
     data-cy="activate-automation"
-    on:click={() => setAutomationLive(true)}
+    text="Live"
   />
 </div>
 {#if $automationStore.selectedBlock}

From c84cf221298c57cce719a4195964bab7320829d7 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 27 Jul 2021 17:34:18 +0200
Subject: [PATCH 07/19] rename an app

---
 .../src/components/start/AppCard.svelte       |   4 +
 .../src/components/start/AppRow.svelte        |   2 +
 .../components/start/UpdateAppModal.svelte    | 111 ++++++++++++++++++
 .../pages/builder/portal/apps/index.svelte    |  14 +++
 packages/builder/src/stores/portal/apps.js    |  19 +++
 5 files changed, 150 insertions(+)
 create mode 100644 packages/builder/src/components/start/UpdateAppModal.svelte

diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index e41ffc4469..3e19bfa022 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -15,6 +15,7 @@
   export let exportApp
   export let viewApp
   export let editApp
+  export let updateApp
   export let deleteApp
   export let unpublishApp
   export let releaseLock
@@ -53,6 +54,9 @@
           </MenuItem>
         {/if}
         {#if !app.deployed}
+          <MenuItem on:click={() => updateApp(app)} icon="Edit">
+            Update
+          </MenuItem>
           <MenuItem on:click={() => deleteApp(app)} icon="Delete">
             Delete
           </MenuItem>
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 85bad84376..f8ecbf3320 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -14,6 +14,7 @@
   export let exportApp
   export let viewApp
   export let editApp
+  export let updateApp
   export let deleteApp
   export let unpublishApp
   export let releaseLock
@@ -82,6 +83,7 @@
       </MenuItem>
     {/if}
     {#if !app.deployed}
+      <MenuItem on:click={() => updateApp(app)} icon="Edit">Update</MenuItem>
       <MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem>
     {/if}
   </ActionMenu>
diff --git a/packages/builder/src/components/start/UpdateAppModal.svelte b/packages/builder/src/components/start/UpdateAppModal.svelte
new file mode 100644
index 0000000000..6977b42a32
--- /dev/null
+++ b/packages/builder/src/components/start/UpdateAppModal.svelte
@@ -0,0 +1,111 @@
+<script>
+  import { writable, get as svelteGet } from "svelte/store"
+  import {
+    notifications,
+    Input,
+    Modal,
+    ModalContent,
+    Body,
+  } from "@budibase/bbui"
+  import { hostingStore } from "builderStore"
+  import { apps } from "stores/portal"
+  import { string, object } from "yup"
+  import { onMount } from "svelte"
+  import { capitalise } from "helpers"
+
+  const values = writable({ name: null })
+  const errors = writable({})
+  const touched = writable({})
+  const validator = {
+    name: string().required("Your application must have a name"),
+  }
+
+  export let app;
+
+  let modal;
+  let valid = false
+  let dirty = false;
+  $: checkValidity($values, validator)
+  $: {
+    // prevent validation by setting name to undefined without an app
+    if (app) {
+      $values.name = app?.name
+    }
+  }
+
+  onMount(async () => {
+    await hostingStore.actions.fetchDeployedApps()
+    const existingAppNames = svelteGet(hostingStore).deployedAppNames
+    validator.name = string()
+      .required("Your application must have a name")
+      .test(
+        "non-existing-app-name",
+        "Another app with the same name already exists",
+        value => {
+          return !existingAppNames.some(
+            appName => dirty && appName.toLowerCase() === value.toLowerCase()
+          )
+        }
+      )
+  })
+
+  const checkValidity = async (values, validator) => {
+    const obj = object().shape(validator)
+    Object.keys(validator).forEach(key => ($errors[key] = null))
+    try {
+      await obj.validate(values, { abortEarly: false })
+    } catch (validationErrors) {
+      validationErrors.inner.forEach(error => {
+        $errors[error.path] = capitalise(error.message)
+      })
+    }
+    valid = await obj.isValid(values)
+  }
+
+  async function updateApp() {
+    try {
+      // Update App
+      await apps.update(app.instance._id, $values.name);
+      hide();
+    } catch (error) {
+      console.error(error)
+      notifications.error(error)
+    }
+  }
+
+  export const show = () => {
+    modal.show()
+  }
+  export const hide = () => {
+    modal.hide()
+  }
+
+  const onCancel = () => {
+    hide();
+  }
+
+  const onShow = () => {
+    dirty = false;
+  }
+
+</script>
+<Modal bind:this={modal} on:hide={onCancel} on:show={onShow}>
+  <ModalContent
+    title={"Update app"}
+    confirmText={"Update app"}
+    onConfirm={updateApp}
+    disabled={!(valid && dirty)}
+  >
+    <Body size="S">
+      Give your new app a name, and choose which groups have access (paid plans
+      only).
+    </Body>
+    <Input
+      bind:value={$values.name}
+      error={$touched.name && $errors.name}
+      on:blur={() => ($touched.name = true)}
+      on:change={() => dirty = true}
+      label="Name"
+    />
+  </ModalContent>
+</Modal>
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 6c229c1980..02260e19ec 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -14,6 +14,7 @@
     Body,
   } from "@budibase/bbui"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
+  import UpdateAppModal from "components/start/UpdateAppModal.svelte"
   import api, { del } from "builderStore/api"
   import analytics from "analytics"
   import { onMount } from "svelte"
@@ -30,6 +31,7 @@
   let template
   let selectedApp
   let creationModal
+  let updatingModal
   let deletionModal
   let unpublishModal
   let creatingApp = false
@@ -164,6 +166,11 @@
     selectedApp = null
   }
 
+  const updateApp = async app => {
+    selectedApp = app
+    updatingModal.show()
+  }
+
   const releaseLock = async app => {
     try {
       const response = await del(`/api/dev/${app.devId}/lock`)
@@ -236,6 +243,7 @@
             {editApp}
             {exportApp}
             {deleteApp}
+            {updateApp}
           />
         {/each}
       </div>
@@ -289,6 +297,12 @@
   Are you sure you want to unpublish the app <b>{selectedApp?.name}</b>?
 </ConfirmDialog>
 
+<UpdateAppModal
+  app={selectedApp}
+  bind:this={updatingModal}
+>
+</UpdateAppModal>
+
 <style>
   .title,
   .filter {
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.js
index f0cee6147c..c686e3d132 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.js
@@ -1,6 +1,7 @@
 import { writable } from "svelte/store"
 import { get } from "builderStore/api"
 import { AppStatus } from "../../constants"
+import api from "../../builderStore/api";
 
 export function createAppStore() {
   const store = writable([])
@@ -53,9 +54,27 @@ export function createAppStore() {
     }
   }
 
+  async function update (appId, name) {
+    const response = await api.put(`/api/applications/${appId}`, { name })
+    if (response.status === 200) {
+      store.update(state => {
+        const updatedAppIndex = state.findIndex(app => app.instance._id === appId);
+        if (updatedAppIndex !== -1) {
+          const updatedApp = state[updatedAppIndex];
+          updatedApp.name = name;
+          state.apps = state.splice(updatedAppIndex, 1, updatedApp);
+        }
+        return state
+      })
+    } else {
+      throw new Error("Error updating name")
+    }
+  }
+
   return {
     subscribe: store.subscribe,
     load,
+    update,
   }
 }
 

From 5df2242cf03f498777574565093da0f36f96c889 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 27 Jul 2021 21:19:31 +0200
Subject: [PATCH 08/19] fix lint issue

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

diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index 25d0839d2a..c6235f6f40 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -15,7 +15,7 @@
     if (automationLive === live) {
       return
     }
-    automation.live = live;
+    automation.live = live
     automationStore.actions.save({ instanceId, automation })
     if (live) {
       notifications.info(`Automation ${automation.name} enabled.`)

From 101ca5f01e0c00e27d3d01700785b733a9188e45 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 27 Jul 2021 23:48:06 +0200
Subject: [PATCH 09/19] fix cypress test

---
 packages/bbui/src/Form/Core/Switch.svelte                   | 3 +++
 packages/bbui/src/Form/Toggle.svelte                        | 3 ++-
 .../builder/cypress/integration/createAutomation.spec.js    | 6 +++---
 .../src/components/automation/SetupPanel/SetupPanel.svelte  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Switch.svelte b/packages/bbui/src/Form/Core/Switch.svelte
index 0d40e67007..a19675d872 100644
--- a/packages/bbui/src/Form/Core/Switch.svelte
+++ b/packages/bbui/src/Form/Core/Switch.svelte
@@ -6,15 +6,18 @@
   export let id = null
   export let text = null
   export let disabled = false
+  export let dataCy = null
 
   const dispatch = createEventDispatcher()
   const onChange = event => {
     dispatch("change", event.target.checked)
   }
+
 </script>
 
 <div class="spectrum-Switch spectrum-Switch--emphasized">
   <input
+    data-cy={dataCy}
     checked={value}
     {disabled}
     on:change={onChange}
diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index 8cc6506651..37de2836ba 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -9,6 +9,7 @@
   export let text = null
   export let disabled = false
   export let error = null
+  export let dataCy = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -18,5 +19,5 @@
 </script>
 
 <Field {label} {labelPosition} {error}>
-  <Switch {error} {disabled} {text} {value} on:change={onChange} />
+  <Switch {dataCy} {error} {disabled} {text} {value} on:change={onChange} />
 </Field>
diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js
index 75611eff06..e82eeff670 100644
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@@ -29,10 +29,10 @@ context("Create a automation", () => {
     cy.get(".setup").within(() => {
       cy.get(".spectrum-Picker-label").click()
       cy.contains("dog").click()
-      cy.get("input")
+      cy.get(".spectrum-Textfield-input")
         .first()
         .type("goodboy")
-      cy.get("input")
+      cy.get(".spectrum-Textfield-input")
         .eq(1)
         .type("11")
     })
@@ -41,7 +41,7 @@ context("Create a automation", () => {
     cy.contains("Save Automation").click()
 
     // Activate Automation
-    cy.get("[aria-label=PlayCircle]").click()
+    cy.get("[data-cy=activate-automation]").click()
   })
 
   it("should add row when a new row is added", () => {
diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index c6235f6f40..06a0df1afa 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -51,7 +51,7 @@
   <Toggle
     value={automationLive}
     on:change={() => setAutomationLive(!automationLive)}
-    data-cy="activate-automation"
+    dataCy="activate-automation"
     text="Live"
   />
 </div>

From 5221cd83622db192fc72a8481121e44029a28a02 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Wed, 28 Jul 2021 00:06:03 +0200
Subject: [PATCH 10/19] fix lint issue

---
 packages/bbui/src/Form/Core/Switch.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/bbui/src/Form/Core/Switch.svelte b/packages/bbui/src/Form/Core/Switch.svelte
index a19675d872..667b2ab871 100644
--- a/packages/bbui/src/Form/Core/Switch.svelte
+++ b/packages/bbui/src/Form/Core/Switch.svelte
@@ -12,7 +12,6 @@
   const onChange = event => {
     dispatch("change", event.target.checked)
   }
-
 </script>
 
 <div class="spectrum-Switch spectrum-Switch--emphasized">

From c9dd9594bcdfcefa6bfa36adc7598a408e35470d Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Wed, 28 Jul 2021 00:09:15 +0200
Subject: [PATCH 11/19] fix lint issue

---
 .../src/components/start/UpdateAppModal.svelte | 18 +++++++++---------
 .../src/pages/builder/portal/apps/index.svelte |  6 +-----
 packages/builder/src/stores/portal/apps.js     | 14 ++++++++------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/packages/builder/src/components/start/UpdateAppModal.svelte b/packages/builder/src/components/start/UpdateAppModal.svelte
index 6977b42a32..dbbc000d1f 100644
--- a/packages/builder/src/components/start/UpdateAppModal.svelte
+++ b/packages/builder/src/components/start/UpdateAppModal.svelte
@@ -20,11 +20,11 @@
     name: string().required("Your application must have a name"),
   }
 
-  export let app;
+  export let app
 
-  let modal;
+  let modal
   let valid = false
-  let dirty = false;
+  let dirty = false
   $: checkValidity($values, validator)
   $: {
     // prevent validation by setting name to undefined without an app
@@ -65,8 +65,8 @@
   async function updateApp() {
     try {
       // Update App
-      await apps.update(app.instance._id, $values.name);
-      hide();
+      await apps.update(app.instance._id, $values.name)
+      hide()
     } catch (error) {
       console.error(error)
       notifications.error(error)
@@ -81,14 +81,14 @@
   }
 
   const onCancel = () => {
-    hide();
+    hide()
   }
 
   const onShow = () => {
-    dirty = false;
+    dirty = false
   }
-
 </script>
+
 <Modal bind:this={modal} on:hide={onCancel} on:show={onShow}>
   <ModalContent
     title={"Update app"}
@@ -104,7 +104,7 @@
       bind:value={$values.name}
       error={$touched.name && $errors.name}
       on:blur={() => ($touched.name = true)}
-      on:change={() => dirty = true}
+      on:change={() => (dirty = true)}
       label="Name"
     />
   </ModalContent>
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 02260e19ec..aafe9b60c3 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -297,11 +297,7 @@
   Are you sure you want to unpublish the app <b>{selectedApp?.name}</b>?
 </ConfirmDialog>
 
-<UpdateAppModal
-  app={selectedApp}
-  bind:this={updatingModal}
->
-</UpdateAppModal>
+<UpdateAppModal app={selectedApp} bind:this={updatingModal} />
 
 <style>
   .title,
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.js
index c686e3d132..1b0e8becea 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.js
@@ -1,7 +1,7 @@
 import { writable } from "svelte/store"
 import { get } from "builderStore/api"
 import { AppStatus } from "../../constants"
-import api from "../../builderStore/api";
+import api from "../../builderStore/api"
 
 export function createAppStore() {
   const store = writable([])
@@ -54,15 +54,17 @@ export function createAppStore() {
     }
   }
 
-  async function update (appId, name) {
+  async function update(appId, name) {
     const response = await api.put(`/api/applications/${appId}`, { name })
     if (response.status === 200) {
       store.update(state => {
-        const updatedAppIndex = state.findIndex(app => app.instance._id === appId);
+        const updatedAppIndex = state.findIndex(
+          app => app.instance._id === appId
+        )
         if (updatedAppIndex !== -1) {
-          const updatedApp = state[updatedAppIndex];
-          updatedApp.name = name;
-          state.apps = state.splice(updatedAppIndex, 1, updatedApp);
+          const updatedApp = state[updatedAppIndex]
+          updatedApp.name = name
+          state.apps = state.splice(updatedAppIndex, 1, updatedApp)
         }
         return state
       })

From 6c9fb5d93a66e5032d68c97b690671e2e68c34c5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 28 Jul 2021 09:32:28 +0000
Subject: [PATCH 12/19] v0.9.83-alpha.1

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 16b8c05b8f..2d3ce3ebd7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 655a6d3efe..226caeb5b1 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 29d06c1a78..ed77bf28f4 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": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index eebcb2ab54..c3967c9ddb 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.0",
-    "@budibase/client": "^0.9.83-alpha.0",
+    "@budibase/bbui": "^0.9.83-alpha.1",
+    "@budibase/client": "^0.9.83-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.83-alpha.0",
+    "@budibase/string-templates": "^0.9.83-alpha.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 d04901f56b..701803ed0f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 2d2496b135..4e62ba96db 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.0",
-    "@budibase/standard-components": "^0.9.83-alpha.0",
-    "@budibase/string-templates": "^0.9.83-alpha.0",
+    "@budibase/bbui": "^0.9.83-alpha.1",
+    "@budibase/standard-components": "^0.9.83-alpha.1",
+    "@budibase/string-templates": "^0.9.83-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index ea308aa420..8d83ac5e24 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.83-alpha.0",
-    "@budibase/client": "^0.9.83-alpha.0",
-    "@budibase/string-templates": "^0.9.83-alpha.0",
+    "@budibase/auth": "^0.9.83-alpha.1",
+    "@budibase/client": "^0.9.83-alpha.1",
+    "@budibase/string-templates": "^0.9.83-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.83-alpha.0",
+    "@budibase/standard-components": "^0.9.83-alpha.1",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 9302ce41cf..024c5a3b50 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.0",
+    "@budibase/bbui": "^0.9.83-alpha.1",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 2675e6178f..f4244b422d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a66df7bdc5..16342d1a5b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.83-alpha.0",
+  "version": "0.9.83-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.83-alpha.0",
-    "@budibase/string-templates": "^0.9.83-alpha.0",
+    "@budibase/auth": "^0.9.83-alpha.1",
+    "@budibase/string-templates": "^0.9.83-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From cc767e85c3ba04f2ae704c52c9b546ef93cb981e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 28 Jul 2021 09:49:54 +0000
Subject: [PATCH 13/19] v0.9.83-alpha.2

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2d3ce3ebd7..751b6f933a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 226caeb5b1..4f0f2dc63e 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ed77bf28f4..5247b21449 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": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c3967c9ddb..1d15f45f6c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.1",
-    "@budibase/client": "^0.9.83-alpha.1",
+    "@budibase/bbui": "^0.9.83-alpha.2",
+    "@budibase/client": "^0.9.83-alpha.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.83-alpha.1",
+    "@budibase/string-templates": "^0.9.83-alpha.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 701803ed0f..cf60303a8b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 4e62ba96db..8b000cb3ea 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.1",
-    "@budibase/standard-components": "^0.9.83-alpha.1",
-    "@budibase/string-templates": "^0.9.83-alpha.1",
+    "@budibase/bbui": "^0.9.83-alpha.2",
+    "@budibase/standard-components": "^0.9.83-alpha.2",
+    "@budibase/string-templates": "^0.9.83-alpha.2",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 8d83ac5e24..9725677597 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.83-alpha.1",
-    "@budibase/client": "^0.9.83-alpha.1",
-    "@budibase/string-templates": "^0.9.83-alpha.1",
+    "@budibase/auth": "^0.9.83-alpha.2",
+    "@budibase/client": "^0.9.83-alpha.2",
+    "@budibase/string-templates": "^0.9.83-alpha.2",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.83-alpha.1",
+    "@budibase/standard-components": "^0.9.83-alpha.2",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 024c5a3b50..a80cb2f661 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.83-alpha.1",
+    "@budibase/bbui": "^0.9.83-alpha.2",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index f4244b422d..7f8b8f5545 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 16342d1a5b..39870aeaf3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.83-alpha.1",
+  "version": "0.9.83-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.83-alpha.1",
-    "@budibase/string-templates": "^0.9.83-alpha.1",
+    "@budibase/auth": "^0.9.83-alpha.2",
+    "@budibase/string-templates": "^0.9.83-alpha.2",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 611296eb953c802039643fc8aaaf5f6d23e72678 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 28 Jul 2021 10:25:47 +0000
Subject: [PATCH 14/19] v0.9.85-alpha.0

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 62c37abf5f..15d4880e20 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index fda2c86305..9461fb4bd1 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index bc34837879..b70534d0b8 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": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index fad2ec43e2..a3273e43ac 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.84",
-    "@budibase/client": "^0.9.84",
+    "@budibase/bbui": "^0.9.85-alpha.0",
+    "@budibase/client": "^0.9.85-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.84",
+    "@budibase/string-templates": "^0.9.85-alpha.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 c208268289..cfe61b4f96 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index b46cbed229..49928aad8e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.84",
-    "@budibase/standard-components": "^0.9.84",
-    "@budibase/string-templates": "^0.9.84",
+    "@budibase/bbui": "^0.9.85-alpha.0",
+    "@budibase/standard-components": "^0.9.85-alpha.0",
+    "@budibase/string-templates": "^0.9.85-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 2ce409ee01..38017c2aa7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.84",
-    "@budibase/client": "^0.9.84",
-    "@budibase/string-templates": "^0.9.84",
+    "@budibase/auth": "^0.9.85-alpha.0",
+    "@budibase/client": "^0.9.85-alpha.0",
+    "@budibase/string-templates": "^0.9.85-alpha.0",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.84",
+    "@budibase/standard-components": "^0.9.85-alpha.0",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 33fb12fbdb..346df1379f 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.84",
+    "@budibase/bbui": "^0.9.85-alpha.0",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 65f0d10daf..97ab74cc96 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8d3e908401..4e8729aca5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.84",
+  "version": "0.9.85-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.84",
-    "@budibase/string-templates": "^0.9.84",
+    "@budibase/auth": "^0.9.85-alpha.0",
+    "@budibase/string-templates": "^0.9.85-alpha.0",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 019243a3298b67a2a7a3c565353580521a5992b7 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Wed, 28 Jul 2021 17:05:14 +0200
Subject: [PATCH 15/19] add duplicate condition button

---
 .../PropertyControls/ConditionalUIDrawer.svelte    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
index ebe60c7110..67315c620c 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
@@ -101,6 +101,12 @@
     conditions = conditions.filter(link => link.id !== id)
   }
 
+  const duplicateCondition = id => {
+    const condition = conditions.find(link => link.id === id);
+    const duplicate = {...condition, id: generate()}
+    conditions = [...conditions, duplicate]
+  }
+
   const handleFinalize = e => {
     updateConditions(e)
     dragDisabled = true
@@ -235,6 +241,12 @@
                   bind:value={condition.referenceValue}
                 />
               {/if}
+              <Icon
+                name="Duplicate"
+                hoverable
+                size="S"
+                on:click={() => duplicateCondition(condition.id)}
+              />
               <Icon
                 name="Close"
                 hoverable
@@ -273,7 +285,7 @@
     gap: var(--spacing-l);
     display: grid;
     align-items: center;
-    grid-template-columns: auto 1fr auto 1fr 1fr 1fr 1fr auto;
+    grid-template-columns: auto 1fr auto 1fr 1fr 1fr 1fr auto auto;
     border-radius: var(--border-radius-s);
     transition: background-color ease-in-out 130ms;
   }

From 2b2528bdbd556723c534d180440a58767ca23a91 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Wed, 28 Jul 2021 17:20:25 +0200
Subject: [PATCH 16/19] fix lint issue

---
 .../PropertyControls/ConditionalUIDrawer.svelte               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
index 67315c620c..8b9cad1b7c 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
@@ -102,8 +102,8 @@
   }
 
   const duplicateCondition = id => {
-    const condition = conditions.find(link => link.id === id);
-    const duplicate = {...condition, id: generate()}
+    const condition = conditions.find(link => link.id === id)
+    const duplicate = { ...condition, id: generate() }
     conditions = [...conditions, duplicate]
   }
 

From 661ba80e5c658a230a5d108c25960f6fda067593 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Wed, 28 Jul 2021 17:56:52 +0200
Subject: [PATCH 17/19] fix update role modal

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

diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
index 59045a1198..8d139a7d66 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
@@ -48,7 +48,7 @@
     on:change
     {options}
     label="Role"
-    getOptionLabel={role => role.name}
-    getOptionValue={role => role._id}
+    getOptionLabel={role => role.label}
+    getOptionValue={role => role.value}
   />
 </ModalContent>

From 627a9fdb4d02c182b89d635e9bd437fd7385b2a9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 28 Jul 2021 16:05:40 +0000
Subject: [PATCH 18/19] v0.9.85-alpha.1

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 15d4880e20..0827935f38 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 9461fb4bd1..068c9f6116 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b70534d0b8..d9bb72adb1 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": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a3273e43ac..01bb45709f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.0",
-    "@budibase/client": "^0.9.85-alpha.0",
+    "@budibase/bbui": "^0.9.85-alpha.1",
+    "@budibase/client": "^0.9.85-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.85-alpha.0",
+    "@budibase/string-templates": "^0.9.85-alpha.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 cfe61b4f96..565292a763 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 49928aad8e..0906f2c7f6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.0",
-    "@budibase/standard-components": "^0.9.85-alpha.0",
-    "@budibase/string-templates": "^0.9.85-alpha.0",
+    "@budibase/bbui": "^0.9.85-alpha.1",
+    "@budibase/standard-components": "^0.9.85-alpha.1",
+    "@budibase/string-templates": "^0.9.85-alpha.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 38017c2aa7..8e888dc42f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.85-alpha.0",
-    "@budibase/client": "^0.9.85-alpha.0",
-    "@budibase/string-templates": "^0.9.85-alpha.0",
+    "@budibase/auth": "^0.9.85-alpha.1",
+    "@budibase/client": "^0.9.85-alpha.1",
+    "@budibase/string-templates": "^0.9.85-alpha.1",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.85-alpha.0",
+    "@budibase/standard-components": "^0.9.85-alpha.1",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 346df1379f..6dd8496962 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.0",
+    "@budibase/bbui": "^0.9.85-alpha.1",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 97ab74cc96..e6310ff28c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 4e8729aca5..435ba7fb8a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.85-alpha.0",
+  "version": "0.9.85-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.85-alpha.0",
-    "@budibase/string-templates": "^0.9.85-alpha.0",
+    "@budibase/auth": "^0.9.85-alpha.1",
+    "@budibase/string-templates": "^0.9.85-alpha.1",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

From 147cbb84978a89862b75ac791ae81ab10f13aafe Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 28 Jul 2021 21:46:10 +0000
Subject: [PATCH 19/19] v0.9.85-alpha.2

---
 lerna.json                                |  2 +-
 packages/auth/package.json                |  2 +-
 packages/bbui/package.json                |  2 +-
 packages/builder/package.json             |  8 ++++----
 packages/cli/package.json                 |  2 +-
 packages/client/package.json              |  8 ++++----
 packages/server/package.json              | 10 +++++-----
 packages/standard-components/package.json |  4 ++--
 packages/string-templates/package.json    |  2 +-
 packages/worker/package.json              |  6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lerna.json b/lerna.json
index 0827935f38..64dc8e2561 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 068c9f6116..defa92b61e 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d9bb72adb1..b808a68b18 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": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 01bb45709f..05e19c1799 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.1",
-    "@budibase/client": "^0.9.85-alpha.1",
+    "@budibase/bbui": "^0.9.85-alpha.2",
+    "@budibase/client": "^0.9.85-alpha.2",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.85-alpha.1",
+    "@budibase/string-templates": "^0.9.85-alpha.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 565292a763..8a8d36dc00 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 0906f2c7f6..9e13bbad77 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,9 +18,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.1",
-    "@budibase/standard-components": "^0.9.85-alpha.1",
-    "@budibase/string-templates": "^0.9.85-alpha.1",
+    "@budibase/bbui": "^0.9.85-alpha.2",
+    "@budibase/standard-components": "^0.9.85-alpha.2",
+    "@budibase/string-templates": "^0.9.85-alpha.2",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 8e888dc42f..758db5a0e4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -60,9 +60,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.85-alpha.1",
-    "@budibase/client": "^0.9.85-alpha.1",
-    "@budibase/string-templates": "^0.9.85-alpha.1",
+    "@budibase/auth": "^0.9.85-alpha.2",
+    "@budibase/client": "^0.9.85-alpha.2",
+    "@budibase/string-templates": "^0.9.85-alpha.2",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -115,7 +115,7 @@
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.4",
-    "@budibase/standard-components": "^0.9.85-alpha.1",
+    "@budibase/standard-components": "^0.9.85-alpha.2",
     "@jest/test-sequencer": "^24.8.0",
     "@types/bull": "^3.15.1",
     "@types/jest": "^26.0.23",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 6dd8496962..d175c64788 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.85-alpha.1",
+    "@budibase/bbui": "^0.9.85-alpha.2",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/link": "^3.1.3",
     "@spectrum-css/page": "^3.0.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index e6310ff28c..59409cdfc8 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 435ba7fb8a..ade3b7c05a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.85-alpha.1",
+  "version": "0.9.85-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.85-alpha.1",
-    "@budibase/string-templates": "^0.9.85-alpha.1",
+    "@budibase/auth": "^0.9.85-alpha.2",
+    "@budibase/string-templates": "^0.9.85-alpha.2",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",