From b3d326c41b080a3816a97c0190c2eb319a4e149f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 10 Jun 2022 11:04:17 +0100
Subject: [PATCH 01/35] Update basic user onboarding modal to be readonly
 rather than disabled and lighten disabled state text

---
 packages/bbui/src/Form/Core/TextField.svelte                  | 4 ++++
 .../manage/users/_components/BasicOnboardingModal.svelte      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
index 6a64876a2c..0a723c140a 100644
--- a/packages/bbui/src/Form/Core/TextField.svelte
+++ b/packages/bbui/src/Form/Core/TextField.svelte
@@ -112,4 +112,8 @@
   .spectrum-Textfield {
     width: 100%;
   }
+  input:disabled {
+    color: var(--spectrum-global-color-gray-600) !important;
+    -webkit-text-fill-color: var(--spectrum-global-color-gray-600) !important;
+  }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte
index a4b06f45a2..c9d4798696 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte
@@ -51,7 +51,7 @@
     bind:value={$email}
     error={$touched && $error}
   />
-  <Input disabled label="Password" value={password} />
+  <Input readonly label="Password" value={password} />
   <div>
     <div class="toggle">
       <Label size="L">Development access</Label>

From eb2fd47e4425aae7ca6007fc1c4d757b64e7ac70 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 10 Jun 2022 12:15:58 +0100
Subject: [PATCH 02/35] Add new styles setting to button to use update spectrum
 styles

---
 packages/bbui/src/Button/Button.svelte | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index e8f6b4500e..36abcbf4da 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -14,6 +14,7 @@
   export let active = false
   export let tooltip = undefined
   export let dataCy
+  export let newStyles = false
 
   let showTooltip = false
 </script>
@@ -25,6 +26,7 @@
   class:spectrum-Button--warning={warning}
   class:spectrum-Button--overBackground={overBackground}
   class:spectrum-Button--quiet={quiet}
+  class:new-styles={newStyles}
   class:active
   class="spectrum-Button spectrum-Button--size{size.toUpperCase()}"
   {disabled}
@@ -93,4 +95,20 @@
     padding-left: var(--spacing-m);
     line-height: 0;
   }
+  .spectrum-Button--primary.new-styles {
+    background: var(--spectrum-global-color-gray-800);
+    border-color: transparent;
+    color: var(--spectrum-global-color-gray-50);
+  }
+  .spectrum-Button--primary.new-styles:hover {
+    background: var(--spectrum-global-color-gray-900);
+  }
+  .spectrum-Button--secondary.new-styles {
+    background: var(--spectrum-global-color-gray-200);
+    border-color: transparent;
+    color: var(--spectrum-global-color-gray-900);
+  }
+  .spectrum-Button--secondary.new-styles:hover {
+    background: var(--spectrum-global-color-gray-300);
+  }
 </style>

From 9d38fa938f82e96cc2cf25cb1c1c5cac4f020e19 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 10 Jun 2022 12:16:28 +0100
Subject: [PATCH 03/35] Update apps list page and app rows to match new styles
 and behaviours

---
 .../src/components/common/AppLockModal.svelte |   6 +-
 .../src/components/start/AppRow.svelte        |  53 ++-----
 .../pages/builder/portal/apps/index.svelte    | 141 +-----------------
 3 files changed, 20 insertions(+), 180 deletions(-)

diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte
index 75e2b15925..5ca35f05db 100644
--- a/packages/builder/src/components/common/AppLockModal.svelte
+++ b/packages/builder/src/components/common/AppLockModal.svelte
@@ -87,7 +87,7 @@
     {#if lockedByYou && getExpiryDuration(app) > 0}
       <span class="lock-expiry-body">
         {processStringSync(
-          "This lock will expire in {{ duration time 'millisecond' }} from now",
+          "This lock will expire in {{ duration time 'millisecond' }} from now.",
           {
             time: getExpiryDuration(app),
           }
@@ -141,4 +141,8 @@
     gap: var(--spacing-s);
     max-width: 175px;
   }
+  .lock-status-text {
+    font-weight: 400;
+    color: var(--spectrum-global-color-gray-800);
+  }
 </style>
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index d30b8079d7..49f99c9f77 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -1,18 +1,11 @@
 <script>
-  import { Heading, Button, Icon, ActionMenu, MenuItem } from "@budibase/bbui"
+  import { Heading, Button, Icon } from "@budibase/bbui"
   import AppLockModal from "../common/AppLockModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
 
   export let app
-  export let exportApp
   export let editApp
-  export let updateApp
-  export let deleteApp
-  export let unpublishApp
   export let appOverview
-  export let releaseLock
-  export let editIcon
-  export let copyAppId
 </script>
 
 <div class="title" data-cy={`${app.devId}`}>
@@ -20,7 +13,7 @@
     <div class="app-icon" style="color: {app.icon?.color || ''}">
       <Icon size="XL" name={app.icon?.name || "Apps"} />
     </div>
-    <div class="name" data-cy="app-name-link" on:click={() => appOverview(app)}>
+    <div class="name" data-cy="app-name-link" on:click={() => editApp(app)}>
       <Heading size="XS">
         {app.name}
       </Heading>
@@ -37,7 +30,7 @@
   {/if}
 </div>
 <div class="desktop">
-  <AppLockModal {app} buttonSize="S" />
+  <AppLockModal {app} buttonSize="M" />
 </div>
 <div class="desktop">
   <div class="app-status">
@@ -52,47 +45,27 @@
 </div>
 <div data-cy={`row_actions_${app.appId}`}>
   <div class="app-row-actions">
+    <Button size="S" secondary newStyles on:click={() => appOverview(app)}>
+      Manage
+    </Button>
     <Button
       size="S"
-      secondary
-      quiet
+      primary
+      newStyles
       disabled={app.lockedOther}
       on:click={() => editApp(app)}
-      >Edit
+    >
+      Edit
     </Button>
-    <Button size="S" cta on:click={() => appOverview(app)}>View</Button>
   </div>
-  <ActionMenu align="right" dataCy="app-row-actions-menu-popover">
-    <span slot="control" class="app-row-actions-icon">
-      <Icon hoverable name="More" />
-    </span>
-    {#if app.lockedYou}
-      <MenuItem on:click={() => releaseLock(app)} icon="LockOpen">
-        Release lock
-      </MenuItem>
-    {/if}
-    <MenuItem on:click={() => exportApp(app)} icon="Download">Export</MenuItem>
-    {#if app.deployed}
-      <MenuItem on:click={() => unpublishApp(app)} icon="GlobeRemove">
-        Unpublish
-      </MenuItem>
-      <MenuItem on:click={() => copyAppId(app)} icon="Copy">
-        Copy App ID
-      </MenuItem>
-    {/if}
-    {#if !app.deployed}
-      <MenuItem on:click={() => updateApp(app)} icon="Edit">Edit</MenuItem>
-      <MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem>
-    {/if}
-    <MenuItem on:click={() => editIcon(app)} icon="Brush">Edit icon</MenuItem>
-  </ActionMenu>
 </div>
 
 <style>
   .app-row-actions {
     grid-gap: var(--spacing-s);
-    display: grid;
-    grid-template-columns: 75px 75px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
   }
   .app-status {
     display: grid;
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 2892a9b723..ac7bb55f33 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -3,20 +3,17 @@
     Heading,
     Layout,
     Button,
-    Input,
     Select,
     Modal,
     Page,
     notifications,
     Body,
     Search,
-    Helpers,
   } from "@budibase/bbui"
   import TemplateDisplay from "components/common/TemplateDisplay.svelte"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
   import UpdateAppModal from "components/start/UpdateAppModal.svelte"
-  import ChooseIconModal from "components/start/ChooseIconModal.svelte"
   import ExportAppModal from "components/start/ExportAppModal.svelte"
 
   import { store, automationStore } from "builderStore"
@@ -25,10 +22,9 @@
   import { apps, auth, admin, templates } from "stores/portal"
   import download from "downloadjs"
   import { goto } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import AppRow from "components/start/AppRow.svelte"
   import { AppStatus } from "constants"
-  import analytics, { Events, EventSource } from "analytics"
+  import analytics, { Events } from "analytics"
   import Logo from "assets/bb-space-man.svg"
 
   let sortBy = "name"
@@ -36,15 +32,11 @@
   let selectedApp
   let creationModal
   let updatingModal
-  let deletionModal
-  let unpublishModal
   let exportModal
-  let iconModal
   let creatingApp = false
   let loaded = $apps?.length || $templates?.length
   let searchTerm = ""
   let cloud = $admin.cloud
-  let appName = ""
   let creatingFromTemplate = false
 
   const resolveWelcomeMessage = (auth, apps) => {
@@ -170,18 +162,6 @@
     creatingApp = false
   }
 
-  const viewApp = app => {
-    analytics.captureEvent(Events.APP.VIEW_PUBLISHED, {
-      appId: app.appId,
-      eventSource: EventSource.PORTAL,
-    })
-    if (app.url) {
-      window.open(`/app${app.url}`)
-    } else {
-      window.open(`/${app.prodId}`)
-    }
-  }
-
   const appOverview = app => {
     $goto(`../overview/${app.devId}`)
   }
@@ -196,79 +176,6 @@
     $goto(`../../app/${app.devId}`)
   }
 
-  const editIcon = app => {
-    selectedApp = app
-    iconModal.show()
-  }
-
-  const exportApp = app => {
-    exportModal.show()
-    selectedApp = app
-  }
-
-  const unpublishApp = app => {
-    selectedApp = app
-    unpublishModal.show()
-  }
-
-  const confirmUnpublishApp = async () => {
-    if (!selectedApp) {
-      return
-    }
-    try {
-      analytics.captureEvent(Events.APP.UNPUBLISHED, {
-        appId: selectedApp.appId,
-      })
-      await API.unpublishApp(selectedApp.prodId)
-      await apps.load()
-      notifications.success("App unpublished successfully")
-    } catch (err) {
-      notifications.error("Error unpublishing app")
-    }
-  }
-
-  const deleteApp = app => {
-    selectedApp = app
-    deletionModal.show()
-  }
-
-  const confirmDeleteApp = async () => {
-    if (!selectedApp) {
-      return
-    }
-    try {
-      await API.deleteApp(selectedApp?.devId)
-      await apps.load()
-      // Get checklist, just in case that was the last app
-      await admin.init()
-      notifications.success("App deleted successfully")
-    } catch (err) {
-      notifications.error("Error deleting app")
-    }
-    selectedApp = null
-    appName = null
-  }
-
-  const updateApp = async app => {
-    selectedApp = app
-    updatingModal.show()
-  }
-
-  const releaseLock = async app => {
-    try {
-      await API.releaseAppLock(app.devId)
-      await apps.load()
-      notifications.success("Lock released successfully")
-    } catch (err) {
-      notifications.error("Error releasing lock")
-    }
-  }
-
-  const copyAppId = async app => {
-    await Helpers.copyToClipboard(app.prodId)
-    notifications.success("App ID copied to clipboard.")
-  }
-
   function createAppFromTemplateUrl(templateKey) {
     // validate the template key just to make sure
     const templateParts = templateKey.split("/")
@@ -416,19 +323,7 @@
 
           <div class="appTable" class:unlocked>
             {#each filteredApps as app (app.appId)}
-              <AppRow
-                {copyAppId}
-                {releaseLock}
-                {editIcon}
-                {app}
-                {unpublishApp}
-                {viewApp}
-                {editApp}
-                {exportApp}
-                {deleteApp}
-                {updateApp}
-                {appOverview}
-              />
+              <AppRow {app} {editApp} {appOverview} />
             {/each}
           </div>
         </Layout>
@@ -462,35 +357,6 @@
   <ExportAppModal app={selectedApp} />
 </Modal>
 
-<ConfirmDialog
-  bind:this={deletionModal}
-  title="Confirm deletion"
-  okText="Delete app"
-  onOk={confirmDeleteApp}
-  onCancel={() => (appName = null)}
-  disabled={appName !== selectedApp?.name}
->
-  Are you sure you want to delete the app <b>{selectedApp?.name}</b>?
-
-  <p>Please enter the app name below to confirm.</p>
-  <Input
-    bind:value={appName}
-    data-cy="delete-app-confirmation"
-    placeholder={selectedApp?.name}
-  />
-</ConfirmDialog>
-<ConfirmDialog
-  bind:this={unpublishModal}
-  title="Confirm unpublish"
-  okText="Unpublish app"
-  onOk={confirmUnpublishApp}
-  dataCy={"unpublish-modal"}
->
-  Are you sure you want to unpublish the app <b>{selectedApp?.name}</b>?
-</ConfirmDialog>
-
-<ChooseIconModal app={selectedApp} bind:this={iconModal} />
-
 <style>
   .appTable {
     border-top: var(--border-light);
@@ -547,12 +413,9 @@
     height: 70px;
     display: grid;
     align-items: center;
-    grid-gap: var(--spacing-xl);
-    grid-template-columns: auto 1fr;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    padding: 0 var(--spacing-s);
   }
   .appTable :global(> div) {
     border-bottom: var(--border-light);

From d8c37eb0b10497c6567dd53f6b34b1073c55d1ae Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 13 Jun 2022 10:56:50 +0100
Subject: [PATCH 04/35] Fix crash when running automations with an app action
 trigger without parameters

---
 packages/server/src/automations/triggers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index deff9f7503..216f24be02 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -97,7 +97,7 @@ exports.externalTrigger = async function (
     // values are likely to be submitted as strings, so we shall convert to correct type
     const coercedFields = {}
     const fields = automation.definition.trigger.inputs.fields
-    for (let key of Object.keys(fields)) {
+    for (let key of Object.keys(fields || {})) {
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields

From aeae3b04655709a006e5116816017fbd608ff118 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 15 Jun 2022 15:08:03 +0100
Subject: [PATCH 05/35] Update cypress tests

---
 .../cypress/integration/appOverview.spec.js   | 408 +++++++++++-------
 .../integration/createComponents.spec.js      | 321 +++++---------
 .../integration/renameAnApplication.spec.js   |  71 +--
 packages/builder/cypress/support/commands.js  |  33 +-
 4 files changed, 401 insertions(+), 432 deletions(-)

diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js
index 090e4e369b..4b9d072338 100644
--- a/packages/builder/cypress/integration/appOverview.spec.js
+++ b/packages/builder/cypress/integration/appOverview.spec.js
@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
 import clientPackage from "@budibase/client/package.json"
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Application Overview screen", () => {
     before(() => {
       cy.login()
@@ -10,31 +10,19 @@ filterTests(['all'], () => {
 
     it("Should be accessible from the applications list", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      
-      cy.get(".appTable .title").eq(0)
-      .invoke('attr', 'data-cy')
-      .then(($dataCy) => {
-        const dataCy = $dataCy;
-        cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .title")
+        .eq(0)
+        .invoke("attr", "data-cy")
+        .then($dataCy => {
+          const dataCy = $dataCy
+          cy.get(".appTable .app-row-actions button")
+            .contains("Manage")
+            .click({ force: true })
 
-        cy.location().should((loc) => {
-          expect(loc.pathname).to.eq('/builder/portal/overview/' + dataCy)
+          cy.location().should(loc => {
+            expect(loc.pathname).to.eq("/builder/portal/overview/" + dataCy)
+          })
         })
-      })
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-
-      cy.get(".appTable .title").eq(0)
-      .invoke('attr', 'data-cy')
-      .then(($dataCy) => {
-        const dataCy = $dataCy;
-        cy.get(".appTable .app-row-actions button").contains("View").click({force: true})
-
-        cy.location().should((loc) => {
-          expect(loc.pathname).to.eq('/builder/portal/overview/' + dataCy)
-        })
-      })
-
     })
 
     // Find a more suitable place for this.
@@ -43,24 +31,28 @@ filterTests(['all'], () => {
 
       cy.get(".appTable .lock-status").eq(0).contains("Locked by you").click()
 
-      cy.unlockApp({ owned : true })
+      cy.unlockApp({ owned: true })
 
       cy.get(".appTable").should("exist")
-      cy.get(".lock-status").should('not.be.visible')
+      cy.get(".lock-status").should("not.be.visible")
     })
-    
+
     it("Should allow unlocking in the app overview screen", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
       cy.wait(1000)
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".lock-status").eq(0).contains("Locked by you").click()
 
-      cy.unlockApp({ owned : true })
+      cy.unlockApp({ owned: true })
 
       cy.get(".lock-status").should("not.be.visible")
     })
@@ -68,107 +60,149 @@ filterTests(['all'], () => {
     it("Should reflect the deploy state of an app that hasn't been published.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .name").eq(0).click()
-      
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should("be.disabled")
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
+        "be.disabled"
+      )
 
       cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
       cy.get(".overview-tab").should("be.visible")
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("-")
       })
     })
 
     it("Should reflect the app deployment state", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
-      
-      cy.get(".toprightnav button.spectrum-Button").contains("Publish").click({ force : true })
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
-      .within(() => {
-        cy.get(".spectrum-Button").contains("Publish").click({ force : true })
-        cy.wait(1000)
-      });
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
+
+      cy.get(".toprightnav button.spectrum-Button")
+        .contains("Publish")
+        .click({ force: true })
+      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
+        .should("be.visible")
+        .within(() => {
+          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+          cy.wait(1000)
+        })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
-      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should("not.be.disabled")
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should(
+        "not.be.disabled"
+      )
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Published")
-        cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("Last published a few seconds ago")
       })
     })
 
-    it("Should reflect an application that has been unpublished", () => { 
+    it("Should reflect an application that has been unpublished", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
 
-      cy.get(".deployment-top-nav svg[aria-label='Globe']")
-      .click({ force: true })
+      cy.get(".deployment-top-nav svg[aria-label='Globe']").click({
+        force: true,
+      })
 
       cy.get("[data-cy='publish-popover-menu']").should("be.visible")
-      cy.get("[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']")
-      .click({ force : true })
-      
-      cy.get("[data-cy='unpublish-modal']").should("be.visible")
-      .within(() => {
-        cy.get(".confirm-wrap button").click({ force: true }
-      )})
+      cy.get(
+        "[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']"
+      ).click({ force: true })
+
+      cy.get("[data-cy='unpublish-modal']")
+        .should("be.visible")
+        .within(() => {
+          cy.get(".confirm-wrap button").click({ force: true })
+        })
       cy.wait(1000)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
         cy.get(".status-text").contains("Last published a few seconds ago")
       })
     })
 
-    it("Should allow the editing of the application icon and colour", () => { 
+    it("Should allow the editing of the application icon and colour", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable", { timeout: 2000})
-        .within(() => {
-          cy.get(".app-row-actions-icon").eq(0).click()
-        })
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.wait(1000)
+      cy.get(".app-overview-actions-icon").within(() => {
+        cy.get(".spectrum-Icon").click({ force: true })
+      })
       cy.get(".spectrum-Menu").contains("Edit icon").click()
       // Select random icon
       cy.get(".grid").within(() => {
-          cy.get(".icon-item").eq(Math.floor(Math.random() * 23) + 1).click()
+        cy.get(".icon-item")
+          .eq(Math.floor(Math.random() * 23) + 1)
+          .click()
       })
       // Select random colour
       cy.get(".fill").click()
       cy.get(".colors").within(() => {
-          cy.get(".color").eq(Math.floor(Math.random() * 33) + 1).click()
+        cy.get(".color")
+          .eq(Math.floor(Math.random() * 33) + 1)
+          .click()
       })
-      cy.intercept('**/applications/**').as('iconChange')
+      cy.intercept("**/applications/**").as("iconChange")
       cy.get(".spectrum-Button").contains("Save").click({ force: true })
       cy.wait("@iconChange")
-      cy.get("@iconChange").its('response.statusCode')
-      .should('eq', 200)
+      cy.get("@iconChange").its("response.statusCode").should("eq", 200)
       // Confirm icon has changed from default
       // Confirm colour has been applied
-      cy.get(".appTable", { timeout: 2000})
-        .within(() => {
-          cy.get('[aria-label]').eq(0).children()
-          .should('have.attr', 'xlink:href').and('not.contain', '#spectrum-icon-18-Apps')
-          cy.get(".title").children().children()
-          .should('have.attr', 'style').and('contains', 'color')
-        })
+      cy.get(".appTable", { timeout: 2000 }).within(() => {
+        cy.get("[aria-label]")
+          .eq(0)
+          .children()
+          .should("have.attr", "xlink:href")
+          .and("not.contain", "#spectrum-icon-18-Apps")
+        cy.get(".title")
+          .children()
+          .children()
+          .should("have.attr", "style")
+          .and("contains", "color")
+      })
     })
 
     it("Should reflect the last time the application was edited", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
-      cy.get(".header-right button").contains("Edit").click({ force: true });
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".header-right button").contains("Edit").click({ force: true })
 
       cy.navigateToFrontend()
 
@@ -177,41 +211,51 @@ filterTests(['all'], () => {
       })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='edited-by']").within(() => {
         cy.get(".editor-name").contains("You")
         cy.get(".last-edit-text").contains("Last edited a few seconds ago")
       })
-    });
+    })
 
     it("Should reflect application version is up-to-date", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".overview-tab [data-cy='app-version']").within(() => {
         cy.get(".version-status").contains("You're running the latest!")
       })
-    });
+    })
 
     it("Should navigate to the settings tab when clicking the App Version card header", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item.is-selected").contains("Overview")
       cy.get(".overview-tab").should("be.visible")
 
-      cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({ force : true })
+      cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({
+        force: true,
+      })
 
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
       cy.get(".settings-tab").should("be.visible")
       cy.get(".overview-tab").should("not.exist")
-
-    });
+    })
 
     it("Should allow the upgrading of an application, if available.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.wait(500)
 
       cy.location().then(loc => {
@@ -219,8 +263,7 @@ filterTests(['all'], () => {
         const appId = params[params.length - 1]
         cy.log(appId)
         //Downgrade the app for the test
-        cy.alterAppVersion(appId, "0.0.1-alpha.0")
-        .then(()=>{
+        cy.alterAppVersion(appId, "0.0.1-alpha.0").then(() => {
           cy.reload()
           cy.wait(1000)
           cy.log("Current deployment version: " + clientPackage.version)
@@ -228,115 +271,163 @@ filterTests(['all'], () => {
           cy.get(".version-status a").contains("Update").click()
           cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
-          cy.get(".version-section .page-action button").contains("Update").click({ force: true })
-          
-          cy.intercept('POST', '**/applications/**/client/update').as('updateVersion')
-          cy.get(".spectrum-Modal.is-open button").contains("Update").click({ force: true })
+          cy.get(".version-section .page-action button")
+            .contains("Update")
+            .click({ force: true })
+
+          cy.intercept("POST", "**/applications/**/client/update").as(
+            "updateVersion"
+          )
+          cy.get(".spectrum-Modal.is-open button")
+            .contains("Update")
+            .click({ force: true })
 
           cy.wait("@updateVersion")
-          .its('response.statusCode').should('eq', 200)
-          .then(() => {
-            cy.visit(`${Cypress.config().baseUrl}/builder`)
-            cy.get(".appTable .name").eq(0).click()
-
-            cy.get(".spectrum-Tabs-item").contains("Overview").click({ force: true })
-            cy.get(".overview-tab [data-cy='app-version']").within(() => {
-              cy.get(".spectrum-Heading").contains(clientPackage.version)
-              cy.get(".version-status").contains("You're running the latest!")
+            .its("response.statusCode")
+            .should("eq", 200)
+            .then(() => {
+              cy.visit(`${Cypress.config().baseUrl}/builder`)
+              cy.get(".appTable .app-row-actions button")
+                .contains("Manage")
+                .eq(0)
+                .click({ force: true })
+              cy.get(".spectrum-Tabs-item")
+                .contains("Overview")
+                .click({ force: true })
+              cy.get(".overview-tab [data-cy='app-version']").within(() => {
+                cy.get(".spectrum-Heading").contains(clientPackage.version)
+                cy.get(".version-status").contains("You're running the latest!")
+              })
             })
-          })
         })
-      });
-      
+      })
     })
 
     it("Should allow editing of the app details.", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
-
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item").contains("Settings").click()
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
       cy.get(".settings-tab").should("be.visible")
 
-      cy.get(".details-section .page-action button").contains("Edit").click({ force: true })
+      cy.get(".details-section .page-action button")
+        .contains("Edit")
+        .click({ force: true })
       cy.updateAppName("sample name")
 
       //publish and check its disabled
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions button").contains("Edit").eq(0).click({force: true})
+      cy.get(".appTable .app-row-actions button")
+        .contains("Edit")
+        .eq(0)
+        .click({ force: true })
 
-      cy.get(".toprightnav button.spectrum-Button").contains("Publish").click({ force : true })
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
-      .within(() => {
-        cy.get(".spectrum-Button").contains("Publish").click({ force : true })
-        cy.wait(1000)
-      });
+      cy.get(".toprightnav button.spectrum-Button")
+        .contains("Publish")
+        .click({ force: true })
+      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']")
+        .should("be.visible")
+        .within(() => {
+          cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+          cy.wait(1000)
+        })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(1000)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
       cy.get(".spectrum-Tabs-item").contains("Settings").click()
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
       cy.get(".details-section .page-action .spectrum-Button").scrollIntoView()
       cy.wait(1000)
-      cy.get(".details-section .page-action .spectrum-Button").should("be.disabled")
-
+      cy.get(".details-section .page-action .spectrum-Button").should(
+        "be.disabled"
+      )
     })
 
     xit("Should allow copying of the published application Id", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .app-row-actions").eq(0)
-      .within(() => {
-        cy.get(".spectrum-Button").contains("Edit").click({ force: true })
-      })
+      cy.get(".appTable .app-row-actions")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        })
 
       cy.publishApp("sample-name")
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
+      cy.get("[data-cy='app-overview-menu-popover']")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Menu-item")
+            .contains("Copy App ID")
+            .click({ force: true })
+        })
 
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
-        cy.get(".spectrum-Menu-item").contains("Copy App ID").click({ force: true })
-      })
-
-      cy.get(".spectrum-Toast-content").contains("App ID copied to clipboard.").should("be.visible")
+      cy.get(".spectrum-Toast-content")
+        .contains("App ID copied to clipboard.")
+        .should("be.visible")
     })
 
     it("Should allow unpublishing of the application", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
+      cy.get("[data-cy='app-overview-menu-popover']")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Menu-item")
+            .contains("Unpublish")
+            .click({ force: true })
+          cy.wait(500)
+        })
 
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
-        cy.get(".spectrum-Menu-item").contains("Unpublish").click({ force: true })
-        cy.wait(500)
-      })
-
-      cy.get("[data-cy='unpublish-modal']").should("be.visible")
-      .within(() => {
-        cy.get(".confirm-wrap button").click({ force: true }
-      )})
+      cy.get("[data-cy='unpublish-modal']")
+        .should("be.visible")
+        .within(() => {
+          cy.get(".confirm-wrap button").click({ force: true })
+        })
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+          "exist"
+        )
       })
     })
 
     it("Should allow deleting of the application", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(".appTable .name").eq(0).click()
+      cy.get(".appTable .app-row-actions button")
+        .contains("Manage")
+        .eq(0)
+        .click({ force: true })
+      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get(".app-overview-actions-icon > .icon").click({ force : true })
-
-      cy.get("[data-cy='app-overview-menu-popover']").eq(0).within(() => {
-        cy.get(".spectrum-Menu-item").contains("Delete").click({ force: true })
-        cy.wait(500)
-      })  
+      cy.get("[data-cy='app-overview-menu-popover']")
+        .eq(0)
+        .within(() => {
+          cy.get(".spectrum-Menu-item")
+            .contains("Delete")
+            .click({ force: true })
+          cy.wait(500)
+        })
 
       //The test application was renamed earlier in the spec
       cy.get(".spectrum-Dialog-grid").within(() => {
@@ -344,18 +435,17 @@ filterTests(['all'], () => {
         cy.get(".spectrum-Button--warning").click()
       })
 
-      cy.location().should((loc) => {
-        expect(loc.pathname).to.eq('/builder/portal/apps')
+      cy.location().should(loc => {
+        expect(loc.pathname).to.eq("/builder/portal/apps")
       })
 
       cy.get(".appTable").should("not.exist")
-      
+
       cy.get(".welcome .container h1").contains("Let's create your first app!")
     })
 
     after(() => {
       cy.deleteAllApps()
     })
-
   })
 })
diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index 47063fb026..eff7fc216f 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
+const interact = require("../support/interact")
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Create Components", () => {
     let headlineId
 
@@ -19,17 +19,15 @@ filterTests(['all'], () => {
 
     //Use the tree to delete a selected component
     const deleteSelectedComponent = () => {
-      cy.get(".nav-items-container .nav-item.selected .actions > div > .icon").click({
+      cy.get(
+        ".nav-items-container .nav-item.selected .actions > div > .icon"
+      ).click({
+        force: true,
+      })
+      cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
+      cy.get(".spectrum-Modal button").contains("Delete Component").click({
         force: true,
       })
-      cy.get(".spectrum-Popover.is-open li")
-        .contains("Delete")
-        .click()
-      cy.get(".spectrum-Modal button")
-        .contains("Delete Component")
-        .click({
-          force: true,
-        })
     }
 
     it("should add a container", () => {
@@ -47,18 +45,18 @@ filterTests(['all'], () => {
 
     it("should change the text of the headline", () => {
       const text = "Lorem ipsum dolor sit amet."
-      cy.get("[data-cy=setting-text] input")
-        .type(text)
-        .blur()
+      cy.get("[data-cy=setting-text] input").type(text).blur()
       cy.getComponent(headlineId).should("have.text", text)
     })
 
     it("should change the size of the headline", () => {
       cy.get("[data-cy=setting-size]").scrollIntoView().click()
       cy.get("[data-cy=setting-size]").within(() => {
-        cy.get(".spectrum-Form-item li.spectrum-Menu-item").contains("3XL").click()
+        cy.get(".spectrum-Form-item li.spectrum-Menu-item")
+          .contains("3XL")
+          .click()
       })
-      
+
       cy.getComponent(headlineId).within(() => {
         cy.get(".spectrum-Heading").should("have.css", "font-size", "60px")
       })
@@ -66,13 +64,9 @@ filterTests(['all'], () => {
 
     it("should create a form and reset to match schema", () => {
       cy.addComponent("Form", "Form").then(() => {
-        cy.get("[data-cy=setting-dataSource]")
-          .contains("Custom")
-          .click()
-        cy.get(interact.DROPDOWN)
-          .contains("dog")
-          .click()
-          cy.wait(500)
+        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
+        cy.get(interact.DROPDOWN).contains("dog").click()
+        cy.wait(500)
         cy.addComponent("Form", "Field Group").then(fieldGroupId => {
           cy.contains("Update form fields").click()
           cy.get(".spectrum-Modal")
@@ -83,11 +77,9 @@ filterTests(['all'], () => {
             cy.contains("name").should("exist")
             cy.contains("age").should("exist")
             cy.contains("breed").should("exist")
-           // cy.contains("image").should("exist")
+            // cy.contains("image").should("exist")
           })
-          cy.getComponent(fieldGroupId)
-            .find("input")
-            .should("have.length", 2)
+          cy.getComponent(fieldGroupId).find("input").should("have.length", 2)
           cy.getComponent(fieldGroupId)
             .find(interact.SPECTRUM_PICKER)
             .should("have.length", 1)
@@ -97,191 +89,102 @@ filterTests(['all'], () => {
 
     it("deletes a component", () => {
       cy.addComponent("Elements", "Paragraph").then(componentId => {
-        cy.get("[data-cy=setting-_instanceName] input")
-          .type(componentId)
-          .blur()
-        cy.get(".nav-items-container .nav-item.selected .actions > div > .icon").click({
+        cy.get("[data-cy=setting-_instanceName] input").type(componentId).blur()
+        cy.get(
+          ".nav-items-container .nav-item.selected .actions > div > .icon"
+        ).click({
+          force: true,
+        })
+        cy.get(".spectrum-Popover.is-open li").contains("Delete").click()
+        cy.get(".spectrum-Modal button").contains("Delete Component").click({
           force: true,
         })
-        cy.get(".spectrum-Popover.is-open li")
-          .contains("Delete")
-          .click()
-        cy.get(".spectrum-Modal button")
-          .contains("Delete Component")
-          .click({
-            force: true,
-          })
         cy.getComponent(componentId).should("not.exist")
       })
     })
 
-    it("should set focus to the field setting when fields are added to a form", () => {
-      cy.addComponent("Form", "Form").then((formId) => {
-        
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(formId)
-          .blur()
-
-        const componentTypeLabels = ["Text Field", "Number Field", "Password Field", 
-          "Options Picker", "Checkbox", "Long Form Field", "Date Picker", "Attachment", 
-          "JSON Field", "Multi-select Picker", "Relationship Picker"]
-
-        const refocusTest = (componentId) => {
-          cy.getComponent(componentId)
-          .find(".showMe").should("exist").click({ force: true })
-          
-          cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-        }
-
-        const testFieldFocusOnCreate = (componentLabel) => {
-          cy.log("Adding: " + componentLabel)
-          return cy.addComponent("Form", componentLabel).then((componentId) => {
-           
-            refocusTest(componentId)
-
-            cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-            .should("have.class", "is-focused")
-          })
-        }
-        
-        cy.wait(1000)
-        cy.wrap(componentTypeLabels).each((label) => {
-          return testFieldFocusOnCreate(label)
-        }).then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(formId).click({ force: true })
-          deleteSelectedComponent()
-        })
-      })
-    })
-
     it("should clear the iframe place holder when a form field has been set", () => {
-      cy.addComponent("Form", "Form").then((formId) => {
-        
+      cy.addComponent("Form", "Form").then(formId => {
         //For deletion
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(formId)
           .blur()
-
-        cy.get("[data-cy=setting-dataSource]")
-          .contains("Custom")
-          .click()
-        cy.get(".dropdown")
-          .contains("dog")
-          .click()
+        cy.get("[data-cy=setting-dataSource]").contains("Custom").click()
+        cy.get(".dropdown").contains("dog").click()
 
         const fieldTypeToColumnName = {
-          "Text Field" : "name", 
-          "Number Field": "age", 
-          "Options Picker": "breed"
+          "Text Field": "name",
+          "Number Field": "age",
+          "Options Picker": "breed",
         }
 
         const componentTypeLabels = Object.keys(fieldTypeToColumnName)
 
-        const testFieldFocusOnCreate = (componentLabel) => {
+        const testFieldFocusOnCreate = componentLabel => {
           cy.log("Adding: " + componentLabel)
-          return cy.addComponent("Form", componentLabel).then((componentId) => {
-           
+          return cy.addComponent("Form", componentLabel).then(componentId => {
             cy.getComponent(componentId)
-              .find(".placeholder_wrap").should("exist")
-
-            cy.get("[data-cy=setting-field] .spectrum-InputGroup")
-              .should("have.class", "is-focused")
-
+              .find(".component-placeholder")
+              .should("exist")
             cy.get("[data-cy=setting-field] button.spectrum-Picker").click()
 
             //Click the first appropriate field. They are filtered by type
-            cy.get("[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item")
-              .contains(fieldTypeToColumnName[componentLabel]).click()
+            cy.get(
+              "[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item"
+            )
+              .contains(fieldTypeToColumnName[componentLabel])
+              .click()
             cy.wait(500)
             cy.getComponent(componentId)
-              .find(".placeholder_wrap").should("not.exist")
+              .find(".component-placeholder")
+              .should("not.exist")
           })
         }
-        
+
         cy.wait(500)
-        cy.wrap(componentTypeLabels).each((label) => {
-          return testFieldFocusOnCreate(label)
-        }).then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(formId).click({ force: true })
-          deleteSelectedComponent()
-        })
-      })
-    })
-
-    it("should focus a charts settings on data provider if not nested in provider ", () => {
-      cy.addComponent("Layout", "Container").then((containerId) => {
-
-        //For deletion
-        cy.get("[data-cy=setting-_instanceName] input")
-          .clear()
-          .type(containerId)
-          .blur()
-
-        const chartTypeLabels = ["Bar Chart", "Line Chart", "Area Chart", "Pie Chart", 
-          "Donut Chart", "Candlestick Chart"]
-
-        const refocusTest = (componentId) => {
-          cy.getComponent(componentId)
-          .find(".showMe").should("exist").click({ force: true })
-          
-          cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
-          .should("have.class", "is-focused")
-        }
-
-        const testFocusOnCreate = (chartLabel) => {
-          cy.log("Adding: " + chartLabel)
-          cy.addComponent("Chart", chartLabel).then((componentId) => {
-            refocusTest(componentId)
-
-            cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
-            .should("have.class", "is-focused")
+        cy.wrap(componentTypeLabels)
+          .each(label => {
+            return testFieldFocusOnCreate(label)
+          })
+          .then(() => {
+            cy.get(".nav-items-container .nav-item")
+              .contains(formId)
+              .click({ force: true })
+            deleteSelectedComponent()
           })
-        }
-
-        cy.wait(1000)
-        cy.wrap(chartTypeLabels).each((label) => {
-          return testFocusOnCreate(label)
-        })
-        .then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(containerId).click({ force: true })
-          deleteSelectedComponent()
-        })
-
       })
-
     })
 
     it("should populate the provider for charts with a data provider in its path", () => {
-      cy.addComponent("Data", "Data Provider").then((providerId) => {
-
+      cy.addComponent("Data", "Data Provider").then(providerId => {
         //For deletion
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(providerId)
           .blur()
-
-          
         cy.get("[data-cy=setting-dataSource]")
           .contains("Choose an option")
           .click()
-
         cy.get(`[data-cy=dataSource-popover-${providerId}] ul li`)
           .contains("dog")
           .click()
 
-        const chartTypeLabels = ["Bar Chart", "Line Chart", "Area Chart", "Pie Chart", 
-          "Donut Chart", "Candlestick Chart"]
+        const chartTypeLabels = [
+          "Bar Chart",
+          "Line Chart",
+          "Area Chart",
+          "Pie Chart",
+          "Donut Chart",
+          "Candlestick Chart",
+        ]
 
-        const testFocusOnCreate = (chartLabel) => {
+        const testFocusOnCreate = chartLabel => {
           cy.log("Adding: " + chartLabel)
-          cy.addComponent("Chart", chartLabel).then((componentId) => {
-
-            cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker")
-              .should("not.have.class", "is-focused")
+          cy.addComponent("Chart", chartLabel).then(componentId => {
+            cy.get(
+              "[data-cy=dataProvider-prop-control] .spectrum-Picker"
+            ).should("not.have.class", "is-focused")
 
             // Pre populated.
             cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker-label")
@@ -289,114 +192,86 @@ filterTests(['all'], () => {
               .should("exist")
           })
         }
-
         cy.wait(1000)
-        cy.wrap(chartTypeLabels).each((label) => {
-          return testFocusOnCreate(label)
-        })
-        .then(()=>{
-          cy.get(".nav-items-container .nav-item").contains(providerId).click({ force: true })
-          deleteSelectedComponent()
-        })
+        cy.wrap(chartTypeLabels)
+          .each(label => {
+            return testFocusOnCreate(label)
+          })
+          .then(() => {
+            cy.get(".nav-items-container .nav-item")
+              .contains(providerId)
+              .click({ force: true })
+            deleteSelectedComponent()
+          })
       })
-
     })
 
     it("should replace the placeholder when a url is set on an image", () => {
-      cy.addComponent("Elements", "Image").then((imageId) => {
-        
-        cy.get("[data-cy=url-prop-control] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-
+      cy.addComponent("Elements", "Image").then(imageId => {
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(imageId)
           .blur()
-        
         //return $("New Data Provider.Rows")[0]["Attachment"][0]["url"]
         //No minio, so just enter something local that will not reslove
         cy.get("[data-cy=url-prop-control] input[type=text]")
           .type("cypress/fixtures/ghost.png")
           .blur()
-
         cy.getComponent(imageId)
-          .find(".placeholder_wrap").should("not.exist")
-
-        cy.getComponent(imageId)
-          .find(`img[alt=${imageId}]`).should("exist")
-        
+          .find(".component-placeholder")
+          .should("not.exist")
+        cy.getComponent(imageId).find(`img[alt=${imageId}]`).should("exist")
         cy.get(".nav-items-container .nav-item")
           .contains(imageId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })
 
     it("should add a markdown component.", () => {
-      cy.addComponent("Elements", "Markdown Viewer").then((markdownId) => {
-        
-        cy.get("[data-cy=value-prop-control] .spectrum-InputGroup")
-          .should("have.class", "is-focused")
-        
+      cy.addComponent("Elements", "Markdown Viewer").then(markdownId => {
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(markdownId)
           .blur()
-
-        cy.get("[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input")
-          .type("# Hi").blur()
-
+        cy.get(
+          "[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input"
+        )
+          .type("# Hi")
+          .blur()
         cy.getComponent(markdownId)
-          .find(".placeholder_wrap").should("not.exist")
-        
+          .find(".component-placeholder")
+          .should("not.exist")
         cy.getComponent(markdownId)
-          .find(".editor-preview-full h1").contains("Hi")
-
+          .find(".editor-preview-full h1")
+          .contains("Hi")
         cy.get(".nav-items-container .nav-item")
           .contains(markdownId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })
 
     it("should direct the user when adding an Icon component.", () => {
-      cy.addComponent("Elements", "Icon").then((iconId) => {
-        
-        cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton")
-          .should("have.class", "is-focused")
-
-        cy.getComponent(iconId)
-          .find(".placeholder_wrap").should("exist")
-        
+      cy.addComponent("Elements", "Icon").then(iconId => {
+        cy.getComponent(iconId).find(".component-placeholder").should("exist")
         cy.get("[data-cy=setting-_instanceName] input")
           .clear()
           .type(iconId)
           .blur()
-
         cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton").click()
-
         cy.get("[data-cy=icon-popover].spectrum-Popover.is-open").within(() => {
-          cy.get(".search-input input")
-          .type("save")
-          .blur()
-
+          cy.get(".search-input input").type("save").blur()
           cy.get(".search-input button").click({ force: true })
-
           cy.get(".icon-area .icon-container").eq(0).click({ force: true })
         })
-
         cy.getComponent(iconId)
-          .find(".placeholder_wrap").should("not.exist")
-
-        cy.getComponent(iconId)
-          .find("i.ri-save-fill").should("exist")
-
+          .find(".component-placeholder")
+          .should("not.exist")
+        cy.getComponent(iconId).find("i.ri-save-fill").should("exist")
         cy.get(".nav-items-container .nav-item")
           .contains(iconId)
           .click({ force: true })
-
         deleteSelectedComponent()
       })
     })
diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js
index 70c9dd4914..703535a507 100644
--- a/packages/builder/cypress/integration/renameAnApplication.spec.js
+++ b/packages/builder/cypress/integration/renameAnApplication.spec.js
@@ -1,7 +1,7 @@
 import filterTests from "../support/filterTests"
-const interact = require('../support/interact')
+const interact = require("../support/interact")
 
-filterTests(['all'], () => {
+filterTests(["all"], () => {
   context("Rename an App", () => {
     beforeEach(() => {
       cy.login()
@@ -32,12 +32,15 @@ filterTests(['all'], () => {
       const appRename = "Cypress Renamed"
       // Publish the app
       cy.get(interact.TOP_RIGHT_NAV)
-      cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
-      cy.get(interact.SPECTRUM_DIALOG_GRID)
-        .within(() => {
-          // Click publish again within the modal
-          cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
-        })
+      cy.get(interact.SPECTRUM_BUTTON)
+        .contains("Publish")
+        .click({ force: true })
+      cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
+        // Click publish again within the modal
+        cy.get(interact.SPECTRUM_BUTTON)
+          .contains("Publish")
+          .click({ force: true })
+      })
       // Rename app, Search for app, Confirm name was changed
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
@@ -64,14 +67,20 @@ filterTests(['all'], () => {
       const appName = "Cypress Tests"
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
-      cy.get(interact.SPECTRUM_BUTTON).contains("Create app").click({ force: true })
+      cy.get(interact.SPECTRUM_BUTTON)
+        .contains("Create app")
+        .click({ force: true })
       cy.contains(/Start from scratch/).click()
-      cy.get(interact.SPECTRUM_MODAL)
-        .within(() => {
-          cy.get("input").eq(0).type(appName)
-          cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").click({ force: true })
-          cy.get(interact.ERROR).should("have.text", "Another app with the same name already exists")
-        })
+      cy.get(interact.SPECTRUM_MODAL).within(() => {
+        cy.get("input").eq(0).type(appName)
+        cy.get(interact.SPECTRUM_BUTTON_GROUP)
+          .contains("Create app")
+          .click({ force: true })
+        cy.get(interact.ERROR).should(
+          "have.text",
+          "Another app with the same name already exists"
+        )
+      })
     })
 
     it("should validate application names", () => {
@@ -89,7 +98,10 @@ filterTests(['all'], () => {
       cy.reload()
       cy.wait(1000)
       renameApp(numberName, specialCharName)
-      cy.get(interact.ERROR).should("have.text", "App name must be letters, numbers and spaces only")
+      cy.get(interact.ERROR).should(
+        "have.text",
+        "App name must be letters, numbers and spaces only"
+      )
       // Set app name back to Cypress Tests
       cy.reload()
       cy.wait(1000)
@@ -98,24 +110,19 @@ filterTests(['all'], () => {
 
     const renameApp = (originalName, changedName, published, noName) => {
       cy.searchForApplication(originalName)
-      cy.get(interact.APP_TABLE)
-        .within(() => {
-          cy.get(interact.AREA_LABEL_MORE).eq(0).click()
-        })
-      // Check for when an app is published
-      if (published == true) {
-        // Should not have Edit as option, will unpublish app
-        cy.should("not.have.value", "Edit")
-        cy.get(interact.SPECTRUM_MENU).contains("Unpublish").click()
-        cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Unpublish app").click()
-        cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
-      }
-      cy.get(interact.APP_ROW_ACTION_MENU_POPOVER).eq(0).within(() => {
-        cy.get(interact.SPECTRUM_MENU_ITEMM).contains("Edit").click({ force: true })
+      cy.get(interact.APP_TABLE).within(() => {
+        cy.get(".app-row-actions button")
+          .contains("Manage")
+          .eq(0)
+          .click({ force: true })
       })
-
+      cy.get(".spectrum-Tabs-item").contains("Settings").click()
+      cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
+      cy.get(".settings-tab").should("be.visible")
+      cy.get(".details-section .page-action button")
+        .contains("Edit")
+        .click({ force: true })
       cy.updateAppName(changedName, noName)
-
     }
   })
 })
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index ba820526f0..e638eb6cbb 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -144,20 +144,27 @@ Cypress.Commands.add("deleteApp", name => {
             return
           }
 
+          // Go to app overview
           const appIdParsed = appId.split("_").pop()
           const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
           cy.get(actionEleId).within(() => {
-            cy.get(".spectrum-Icon").eq(0).click({ force: true })
+            cy.contains("Manage").click({ force: true })
           })
-          cy.get(".spectrum-Menu").then($menu => {
-            if ($menu.text().includes("Unpublish")) {
-              cy.get(".spectrum-Menu").contains("Unpublish").click()
-              cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+          cy.wait(1000)
+
+          // Unpublish first if needed
+          cy.get(`[data-cy="app-status"]`).then($status => {
+            if ($status.text().includes("Last published")) {
+              cy.contains("Unpublish").click()
+              cy.get(".spectrum-Modal").within(() => {
+                cy.contains("Unpublish app").click()
+              })
             }
           })
 
-          cy.get(actionEleId).within(() => {
-            cy.get(".spectrum-Icon").eq(0).click({ force: true })
+          // Delete app
+          cy.get(".app-overview-actions-icon").within(() => {
+            cy.get(".spectrum-Icon").click({ force: true })
           })
           cy.get(".spectrum-Menu").contains("Delete").click()
           cy.get(".spectrum-Dialog-grid").within(() => {
@@ -180,17 +187,7 @@ Cypress.Commands.add("deleteAllApps", () => {
     .its("body")
     .then(val => {
       for (let i = 0; i < val.length; i++) {
-        const appIdParsed = val[i].appId.split("_").pop()
-        const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
-        cy.get(actionEleId).within(() => {
-          cy.get(".spectrum-Icon").eq(0).click({ force: true })
-        })
-
-        cy.get(".spectrum-Menu").contains("Delete").click()
-        cy.get(".spectrum-Dialog-grid").within(() => {
-          cy.get("input").type(val[i].name)
-          cy.get(".spectrum-Button--warning").click()
-        })
+        cy.deleteApp(val[i].name)
         cy.reload()
       }
     })

From 07fa76458cba945de4dda52762b5dc30f69071a7 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 16 Jun 2022 13:04:25 +0100
Subject: [PATCH 06/35] Get all selected rows for external ds row export

---
 .../server/src/api/controllers/row/external.js |  9 ++-------
 packages/server/yarn.lock                      | 18 +++++++++---------
 packages/worker/yarn.lock                      | 18 +++++++++---------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js
index a8c8c0a627..29238f2678 100644
--- a/packages/server/src/api/controllers/row/external.js
+++ b/packages/server/src/api/controllers/row/external.js
@@ -155,27 +155,22 @@ exports.validate = async () => {
 }
 
 exports.exportRows = async ctx => {
-  const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId)
+  const { datasourceId } = breakExternalTableId(ctx.params.tableId)
   const db = getAppDB()
   let format = ctx.query.format
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     ctx.throw(400, "Datasource has not been configured for plus API.")
   }
-  const tables = datasource.entities
-  const table = tables[tableName]
   ctx.request.body = {
     query: {
       oneOf: {
-        [table.primaryDisplay]: ctx.request.body.rows.map(
-          id => breakRowIdField(id)[0]
-        ),
+        _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
       },
     },
   }
 
   let result = await exports.search(ctx)
-
   let headers = Object.keys(result.rows[0])
   const exporter = exporters[format]
   const filename = `export.${format}`
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 14dc041cfe..106747c982 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,10 +1094,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.200-alpha.0":
-  version "1.0.200-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.0.tgz#2fd1e1cc71c07891fd66e37ceaab2cffb0df1106"
-  integrity sha512-CZPPuj+WIDTxLVbrv/B4J4rQiNnkRBs3ZWK2AvlVlY9knWuM034MKHPK3YaeQdVofZqkTOfWKZp6KFRroC304g==
+"@budibase/backend-core@1.0.200-alpha.3":
+  version "1.0.200-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.3.tgz#b21ba2bdb4f1de3e5f14161b8203a1a98f693e4d"
+  integrity sha512-zVy6bfg4yrtjva0MoBMqIbFrNwA+v76XvRgI3GesaSuJKspWCk4lKtV6I4cr6q9Rr2U+kUzK/4ho/0F/oZcfsg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1175,12 +1175,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.200-alpha.0":
-  version "1.0.200-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.0.tgz#68adc9a61a1b975a990e1a4d4ddf5dba69fc038c"
-  integrity sha512-GxIxvBjCO7kQxFwASKtGC57C2cAN3oiHU+tTCb57qKtp63GdP1z+iqDLtUEOIXXume9bC1xxTD/LSBMziTrHKg==
+"@budibase/pro@1.0.200-alpha.3":
+  version "1.0.200-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.3.tgz#c6bc4c6b335fb8eae973939efc16958022a45a99"
+  integrity sha512-YUUlfVJA2xhtjL3jXem7WtuqdshDWF8qm4xbEXgvlpgOxHtGrjSxf9WR4kir/F2UDDTgVNmttAS1oWVDMSGzug==
   dependencies:
-    "@budibase/backend-core" "1.0.200-alpha.0"
+    "@budibase/backend-core" "1.0.200-alpha.3"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 2c278dea6a..3c0fb2831b 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.200-alpha.0":
-  version "1.0.200-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.0.tgz#2fd1e1cc71c07891fd66e37ceaab2cffb0df1106"
-  integrity sha512-CZPPuj+WIDTxLVbrv/B4J4rQiNnkRBs3ZWK2AvlVlY9knWuM034MKHPK3YaeQdVofZqkTOfWKZp6KFRroC304g==
+"@budibase/backend-core@1.0.200-alpha.3":
+  version "1.0.200-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.200-alpha.3.tgz#b21ba2bdb4f1de3e5f14161b8203a1a98f693e4d"
+  integrity sha512-zVy6bfg4yrtjva0MoBMqIbFrNwA+v76XvRgI3GesaSuJKspWCk4lKtV6I4cr6q9Rr2U+kUzK/4ho/0F/oZcfsg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,12 +322,12 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.200-alpha.0":
-  version "1.0.200-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.0.tgz#68adc9a61a1b975a990e1a4d4ddf5dba69fc038c"
-  integrity sha512-GxIxvBjCO7kQxFwASKtGC57C2cAN3oiHU+tTCb57qKtp63GdP1z+iqDLtUEOIXXume9bC1xxTD/LSBMziTrHKg==
+"@budibase/pro@1.0.200-alpha.3":
+  version "1.0.200-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.200-alpha.3.tgz#c6bc4c6b335fb8eae973939efc16958022a45a99"
+  integrity sha512-YUUlfVJA2xhtjL3jXem7WtuqdshDWF8qm4xbEXgvlpgOxHtGrjSxf9WR4kir/F2UDDTgVNmttAS1oWVDMSGzug==
   dependencies:
-    "@budibase/backend-core" "1.0.200-alpha.0"
+    "@budibase/backend-core" "1.0.200-alpha.3"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 148c7010e8a09ee357596aa10ed1d1992ccd48c1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 16 Jun 2022 19:30:34 +0100
Subject: [PATCH 07/35] Updating the single image docker build to pin versions
 before build to allow it to work with develop etc. Also optimising the image
 a bit so that it can be built significantly faster.

---
 hosting/single/Dockerfile | 107 +++++++++++++++++---------------------
 hosting/single/test.sh    |   4 ++
 scripts/pinVersions.js    |  55 ++++++++++++--------
 3 files changed, 85 insertions(+), 81 deletions(-)
 create mode 100755 hosting/single/test.sh

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index 79d84f70c6..4490586906 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -1,79 +1,71 @@
-FROM couchdb
+FROM couchdb:3.2.1
 
-ENV DEPLOYMENT_ENVIRONMENT=docker
-ENV POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS
-ENV COUCHDB_PASSWORD=budibase
-ENV COUCHDB_USER=budibase
-ENV COUCH_DB_URL=http://budibase:budibase@localhost:5984
-ENV BUDIBASE_ENVIRONMENT=PRODUCTION
-ENV MINIO_URL=http://localhost:9000
-ENV REDIS_URL=localhost:6379
-ENV WORKER_URL=http://localhost:4002
-ENV INTERNAL_API_KEY=budibase
-ENV JWT_SECRET=testsecret
-ENV MINIO_ACCESS_KEY=budibase
-ENV MINIO_SECRET_KEY=budibase
-ENV SELF_HOSTED=1
-ENV CLUSTER_PORT=10000
-ENV REDIS_PASSWORD=budibase
-ENV ARCHITECTURE=amd
-ENV APP_PORT=4001
-ENV WORKER_PORT=4002
+ENV DEPLOYMENT_ENVIRONMENT=docker \
+  POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS \
+  COUCHDB_PASSWORD=budibase \
+  COUCHDB_USER=budibase \
+  COUCH_DB_URL=http://budibase:budibase@localhost:5984 \
+  BUDIBASE_ENVIRONMENT=PRODUCTION \
+  MINIO_URL=http://localhost:9000 \
+  REDIS_URL=localhost:6379 \
+  WORKER_URL=http://localhost:4002 \
+  INTERNAL_API_KEY=budibase \
+  JWT_SECRET=testsecret \
+  MINIO_ACCESS_KEY=budibase \
+  MINIO_SECRET_KEY=budibase \
+  SELF_HOSTED=1 \
+  CLUSTER_PORT=10000 \
+  REDIS_PASSWORD=budibase \
+  ARCHITECTURE=amd \
+  APP_PORT=4001 \
+  WORKER_PORT=4002
 
-RUN apt-get update
-RUN apt-get install software-properties-common wget nginx -y
-RUN apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main'
-RUN apt-get update
+# install base dependencies
+RUN apt-get update && \
+  apt-get install software-properties-common wget -y && \
+  apt-add-repository 'deb http://security.debian.org/debian-security stretch/updates main' && \
+  apt-get update
+
+# install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx
+WORKDIR /nodejs
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh && \
+  bash /tmp/nodesource_setup.sh && \
+  apt-get install libaio1 nodejs nginx openjdk-8-jdk redis-server unzip -y && \
+  npm install --global yarn pm2
 
 # setup nginx
 ADD hosting/single/nginx.conf /etc/nginx
-RUN mkdir /etc/nginx/logs
-RUN useradd www
-RUN touch /etc/nginx/logs/error.log
-RUN touch /etc/nginx/logs/nginx.pid
+RUN mkdir /etc/nginx/logs && \
+  useradd www && \
+  touch /etc/nginx/logs/error.log && \
+  touch /etc/nginx/logs/nginx.pid
 
-# install java
-RUN apt-get install openjdk-8-jdk -y
+# add pin script
+WORKDIR /
+ADD scripts/pinVersions.js .
 
-# setup nodejs
-WORKDIR /nodejs
-RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh
-RUN bash /tmp/nodesource_setup.sh
-RUN apt-get install nodejs
-RUN npm install --global yarn
-RUN npm install --global pm2
-
-# setup redis
-RUN apt install redis-server -y
-
-# setup server
+# setup server and install client for oracle datasource
 WORKDIR /app
 ADD packages/server .
-RUN ls -al
-RUN yarn
-RUN yarn build
-# Install client for oracle datasource
-RUN apt-get install unzip libaio1
-RUN /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install.sh
+RUN node /pinVersions.js && yarn && yarn build && \
+  /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install.sh
 
 # setup worker
 WORKDIR /worker
 ADD packages/worker .
-RUN yarn
-RUN yarn build
+RUN node /pinVersions.js && yarn && yarn build
 
 # setup clouseau
 WORKDIR /
-RUN wget https://github.com/cloudant-labs/clouseau/releases/download/2.21.0/clouseau-2.21.0-dist.zip
-RUN unzip clouseau-2.21.0-dist.zip
-RUN mv clouseau-2.21.0 /opt/clouseau
-RUN rm clouseau-2.21.0-dist.zip
+RUN wget https://github.com/cloudant-labs/clouseau/releases/download/2.21.0/clouseau-2.21.0-dist.zip && \
+  unzip clouseau-2.21.0-dist.zip && \
+  mv clouseau-2.21.0 /opt/clouseau && \
+  rm clouseau-2.21.0-dist.zip
 
 WORKDIR /opt/clouseau
 RUN mkdir ./bin
 ADD hosting/single/clouseau ./bin/
-ADD hosting/single/log4j.properties .
-ADD hosting/single/clouseau.ini .
+ADD hosting/single/log4j.properties hosting/single/clouseau.ini ./
 RUN chmod +x ./bin/clouseau
 
 # setup CouchDB
@@ -82,8 +74,7 @@ ADD hosting/single/vm.args ./etc/
 
 # setup minio
 WORKDIR /minio
-RUN wget https://dl.min.io/server/minio/release/linux-${ARCHITECTURE}64/minio
-RUN chmod +x minio
+RUN wget https://dl.min.io/server/minio/release/linux-${ARCHITECTURE}64/minio && chmod +x minio
 
 # setup runner file
 WORKDIR /
diff --git a/hosting/single/test.sh b/hosting/single/test.sh
new file mode 100755
index 0000000000..b9f9a4032c
--- /dev/null
+++ b/hosting/single/test.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+id=$(docker run -t -d -p 10000:10000 budibase:latest)
+docker exec -it $id bash
+docker kill $id
diff --git a/scripts/pinVersions.js b/scripts/pinVersions.js
index ecc605ad28..44cbba1090 100644
--- a/scripts/pinVersions.js
+++ b/scripts/pinVersions.js
@@ -3,35 +3,44 @@ const path = require("path")
 
 const MONOREPO_ROOT = "packages"
 
-const packages = fs.readdirSync(MONOREPO_ROOT)
+const packages = getPackages()
+
+function getPackages() {
+  if (fs.existsSync(MONOREPO_ROOT)) {
+    return fs.readdirSync(MONOREPO_ROOT).map(pkg => path.join(MONOREPO_ROOT, pkg))
+  } else {
+    return ["./"]
+  }
+}
 
 function pinDeps(dependencies) {
-	for (let dependency in dependencies) {
-		if (dependency.startsWith("@budibase")) {
-			dependencies[dependency] = dependencies[dependency].replace("^", "")
-		}
-	}
+  for (let dependency in dependencies) {
+    if (dependency.startsWith("@budibase")) {
+      dependencies[dependency] = dependencies[dependency].replace("^", "")
+    }
+  }
+  return dependencies
 }
 
 // iterate over the monorepo packages
-for (let pkg of packages) {
-	const pkgPath = path.join(MONOREPO_ROOT, pkg)
+for (let pkgPath of packages) {
+  // only directories
+  if (fs.statSync(pkgPath).isDirectory()) {
+    // get the package JSON file
+    const pkgJsonPath = path.join(pkgPath, "package.json")
+    if (!fs.existsSync(pkgJsonPath)) {
+      continue
+    }
+    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath))
+    
 
-	// only directories
-	if (fs.statSync(pkgPath).isDirectory()) {
+    // find any budibase dependencies, and pin them
+    pkgJson.dependencies = pinDeps(pkgJson.dependencies)
+    pkgJson.devDependencies = pinDeps(pkgJson.devDependencies)
 
-
-		// get the package JSON file
-		const pkgJsonPath = path.join(pkgPath, "package.json")
-		const pkgJson = require(`../${pkgJsonPath}`)
-
-		// find any budibase dependencies, and pin them
-		pinDeps(pkgJson.dependencies)
-		pinDeps(pkgJson.devDependencies)
-
-		// update the package JSON files
-		fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2))
-	}
+    // update the package JSON files
+    fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2))
+  }
 }
 
-console.log("Pinned dev versions for budibase packages successfully.")
\ No newline at end of file
+console.log("Pinned dev versions for budibase packages successfully.")

From af60582dadd6574f1eef658fac3e4f3d724840b1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 16 Jun 2022 20:38:24 +0100
Subject: [PATCH 08/35] Slimming build down from 4GB to 1.8GB for single image.

---
 hosting/single/Dockerfile | 44 +++++++++++++++++++++++++++------------
 scripts/cleanup.sh        | 11 ++++++++++
 2 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 scripts/cleanup.sh

diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index 4490586906..f0df9373c5 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -1,5 +1,28 @@
+FROM node:14-slim as build
+
+# install node-gyp dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends g++ make python
+
+# add pin script
+WORKDIR /
+ADD scripts/pinVersions.js scripts/cleanup.sh ./
+RUN chmod +x /cleanup.sh
+
+# build server
+WORKDIR /app
+ADD packages/server .
+RUN node /pinVersions.js && yarn && yarn build && /cleanup.sh
+
+# build worker
+WORKDIR /worker
+ADD packages/worker .
+RUN node /pinVersions.js && yarn && yarn build && /cleanup.sh
+
 FROM couchdb:3.2.1
 
+COPY --from=build /app /app
+COPY --from=build /worker /worker
+
 ENV DEPLOYMENT_ENVIRONMENT=docker \
   POSTHOG_TOKEN=phc_fg5I3nDOf6oJVMHSaycEhpPdlgS8rzXG2r6F2IpxCHS \
   COUCHDB_PASSWORD=budibase \
@@ -40,20 +63,10 @@ RUN mkdir /etc/nginx/logs && \
   touch /etc/nginx/logs/error.log && \
   touch /etc/nginx/logs/nginx.pid
 
-# add pin script
 WORKDIR /
-ADD scripts/pinVersions.js .
-
-# setup server and install client for oracle datasource
-WORKDIR /app
-ADD packages/server .
-RUN node /pinVersions.js && yarn && yarn build && \
-  /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install.sh
-
-# setup worker
-WORKDIR /worker
-ADD packages/worker .
-RUN node /pinVersions.js && yarn && yarn build
+RUN mkdir -p scripts/integrations/oracle
+ADD packages/server/scripts/integrations/oracle scripts/integrations/oracle
+RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/x86-64/install.sh
 
 # setup clouseau
 WORKDIR /
@@ -81,10 +94,15 @@ WORKDIR /
 ADD hosting/single/runner.sh .
 RUN chmod +x ./runner.sh
 
+# cleanup cache
+RUN yarn cache clean -f
+
 EXPOSE 10000
 VOLUME /opt/couchdb/data
 VOLUME /minio
 
 # must set this just before running
 ENV NODE_ENV=production
+WORKDIR /
+
 CMD ["./runner.sh"]
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
new file mode 100644
index 0000000000..d0f557a876
--- /dev/null
+++ b/scripts/cleanup.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+dir=$(pwd)
+mv dist /
+mv package.json /
+cd /
+rm -r $dir
+mkdir $dir
+mv /dist $dir
+mv /package.json $dir
+cd $dir
+NODE_ENV=production yarn

From 81da3ab3fd83e0a4ee48e9be37639c202ae49b93 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 16 Jun 2022 20:49:50 +0100
Subject: [PATCH 09/35] Fixing a missing dependency.

---
 packages/backend-core/package.json | 2 +-
 packages/server/package.json       | 1 +
 packages/worker/package.json       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index daaa7580d3..4d14c37f6e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -19,6 +19,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
+    "@budibase/types": "^1.0.200-alpha.3",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
@@ -56,7 +57,6 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.200-alpha.3",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/server/package.json b/packages/server/package.json
index 73b9281df2..89d61b0837 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -81,6 +81,7 @@
     "@budibase/client": "^1.0.200-alpha.3",
     "@budibase/pro": "1.0.200-alpha.3",
     "@budibase/string-templates": "^1.0.200-alpha.3",
+    "@budibase/types": "^1.0.200-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index cc4e39e441..dd230fa452 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -36,6 +36,7 @@
   "dependencies": {
     "@budibase/backend-core": "^1.0.200-alpha.3",
     "@budibase/pro": "1.0.200-alpha.3",
+    "@budibase/types": "^1.0.200-alpha.3",
     "@budibase/string-templates": "^1.0.200-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",

From 82c2f1e05e3118459ee3f880a7e2eed39e90ff08 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 17 Jun 2022 14:12:04 +0100
Subject: [PATCH 10/35] Adding back dependencies.

---
 packages/backend-core/package.json |  2 +-
 packages/server/package.json       |  1 +
 packages/server/yarn.lock          | 18 +++++++++---------
 packages/worker/package.json       |  1 +
 packages/worker/yarn.lock          | 18 +++++++++---------
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 04d50eff1a..03d03729ce 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -20,6 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
+    "@budibase/types": "^1.0.206",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
@@ -57,7 +58,6 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.206",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/server/package.json b/packages/server/package.json
index 20e4529352..eac2dc3d0c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -81,6 +81,7 @@
     "@budibase/client": "^1.0.206",
     "@budibase/pro": "1.0.206",
     "@budibase/string-templates": "^1.0.206",
+    "@budibase/types": "^1.0.206",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b9f7f81a5b..c767ecec51 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,10 +1094,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.201-alpha.4.tgz#51fda5838e9c51c88c85204ad867811e49b7d34c"
-  integrity sha512-5oQMfKPDMpB4x5MzGgOtWFIPzc7RG/uu+rSe65PVwWfp77bDa3kxtCtC1p6vtJuPlb4GYrHqGLtr7WePbJf4fA==
+"@budibase/backend-core@1.0.206":
+  version "1.0.206"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.206.tgz#bf9f4153358e3b07c9df1dbc1cc8a100da880699"
+  integrity sha512-WjeWP58GumjW2sHqlsgbYYGi5nEm2oUjqo4UOX5QLKancVPfcKPB7DQal1K9il8vxiiT3ZVNG8XakUGjq2G7Uw==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1175,12 +1175,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.201-alpha.4.tgz#5b92dc7a4bb2004bcd43339c863430ea640e0b74"
-  integrity sha512-fsDlE8O4Y4JpZI3NwBoN8udX4cEx7/ebZ41Q7qD5VwA6Q2niapRcX0MvDmGdjDSVECG+NJU1uqCdg5cDq1Odxw==
+"@budibase/pro@1.0.206":
+  version "1.0.206"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.206.tgz#14343df74106d7bdc7f6e2a396305a06f6e446e5"
+  integrity sha512-SpXUX/xNaNRnDPemvQGe8bmH5yBK6u3TMG60KEBKHTou9OCsEw39x2qy2aHQkMhDFg8YTlfs42fVvhwKJlHbBw==
   dependencies:
-    "@budibase/backend-core" "1.0.201-alpha.4"
+    "@budibase/backend-core" "1.0.206"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3b8e0f7d6c..73a8b01af0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,6 +37,7 @@
     "@budibase/backend-core": "^1.0.206",
     "@budibase/pro": "1.0.206",
     "@budibase/string-templates": "^1.0.206",
+    "@budibase/types": "^1.0.206",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 194ca3f061..5e23c4645b 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.201-alpha.4.tgz#51fda5838e9c51c88c85204ad867811e49b7d34c"
-  integrity sha512-5oQMfKPDMpB4x5MzGgOtWFIPzc7RG/uu+rSe65PVwWfp77bDa3kxtCtC1p6vtJuPlb4GYrHqGLtr7WePbJf4fA==
+"@budibase/backend-core@1.0.206":
+  version "1.0.206"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.206.tgz#bf9f4153358e3b07c9df1dbc1cc8a100da880699"
+  integrity sha512-WjeWP58GumjW2sHqlsgbYYGi5nEm2oUjqo4UOX5QLKancVPfcKPB7DQal1K9il8vxiiT3ZVNG8XakUGjq2G7Uw==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,12 +322,12 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.201-alpha.4.tgz#5b92dc7a4bb2004bcd43339c863430ea640e0b74"
-  integrity sha512-fsDlE8O4Y4JpZI3NwBoN8udX4cEx7/ebZ41Q7qD5VwA6Q2niapRcX0MvDmGdjDSVECG+NJU1uqCdg5cDq1Odxw==
+"@budibase/pro@1.0.206":
+  version "1.0.206"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.206.tgz#14343df74106d7bdc7f6e2a396305a06f6e446e5"
+  integrity sha512-SpXUX/xNaNRnDPemvQGe8bmH5yBK6u3TMG60KEBKHTou9OCsEw39x2qy2aHQkMhDFg8YTlfs42fVvhwKJlHbBw==
   dependencies:
-    "@budibase/backend-core" "1.0.201-alpha.4"
+    "@budibase/backend-core" "1.0.206"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From ebbe2d06282298151648a4d253b2e3facd84ac84 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Jun 2022 10:40:05 +0100
Subject: [PATCH 11/35] Revert release pipeline to use develop again

---
 .github/workflows/release-develop.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 71d487e0a3..3c293b1bb8 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -4,7 +4,7 @@ concurrency: release-develop
 on: 
  push:
     branches:
-      - release
+      - develop
     paths:
       - '.aws/**'
       - '.github/**'
@@ -28,11 +28,11 @@ jobs:
     runs-on: ubuntu-latest 
 
     steps:
-      # - name: Fail if branch is not develop
-      #   if: github.ref != 'refs/heads/develop' 
-      #   run: | 
-      #     echo "Ref is not develop, you must run this job from develop."
-      #     exit 1
+      - name: Fail if branch is not develop
+        if: github.ref != 'refs/heads/develop' 
+        run: | 
+          echo "Ref is not develop, you must run this job from develop."
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:

From 346780a47291107fe4536ba6dbdea96f6932f312 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 09:49:23 +0000
Subject: [PATCH 12/35] v1.0.207-alpha.0

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

diff --git a/lerna.json b/lerna.json
index 080372bc14..90c55ddb69 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 04d50eff1a..43623f405c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -57,7 +57,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.206",
+    "@budibase/types": "^1.0.207-alpha.0",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 61710954d8..771bda5ef1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.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.0.206",
+    "@budibase/string-templates": "^1.0.207-alpha.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 5a08d88de0..bc2a3feba9 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.206",
-    "@budibase/client": "^1.0.206",
-    "@budibase/frontend-core": "^1.0.206",
-    "@budibase/string-templates": "^1.0.206",
+    "@budibase/bbui": "^1.0.207-alpha.0",
+    "@budibase/client": "^1.0.207-alpha.0",
+    "@budibase/frontend-core": "^1.0.207-alpha.0",
+    "@budibase/string-templates": "^1.0.207-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 9309f264f4..c169199597 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.206",
+  "version": "1.0.207-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 4dcccf985d..3db8b7f12c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.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.0.206",
-    "@budibase/frontend-core": "^1.0.206",
-    "@budibase/string-templates": "^1.0.206",
+    "@budibase/bbui": "^1.0.207-alpha.0",
+    "@budibase/frontend-core": "^1.0.207-alpha.0",
+    "@budibase/string-templates": "^1.0.207-alpha.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 9f76613cf4..6e5dd9c29e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.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.0.206",
+    "@budibase/bbui": "^1.0.207-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 20e4529352..1308bd82be 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.206",
-    "@budibase/client": "^1.0.206",
+    "@budibase/backend-core": "^1.0.207-alpha.0",
+    "@budibase/client": "^1.0.207-alpha.0",
     "@budibase/pro": "1.0.206",
-    "@budibase/string-templates": "^1.0.206",
+    "@budibase/string-templates": "^1.0.207-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.206",
+    "@budibase/types": "^1.0.207-alpha.0",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 58cb0324bd..30ee701a2e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.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 074661da38..9ba237084b 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.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 3b8e0f7d6c..b617987158 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.206",
+  "version": "1.0.207-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,9 +34,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.206",
+    "@budibase/backend-core": "^1.0.207-alpha.0",
     "@budibase/pro": "1.0.206",
-    "@budibase/string-templates": "^1.0.206",
+    "@budibase/string-templates": "^1.0.207-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -66,7 +66,7 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.206",
+    "@budibase/types": "^1.0.207-alpha.0",
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",

From e35a756093dd9e14d0c5496a63a2352fad91c520 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 09:50:48 +0000
Subject: [PATCH 13/35] Update pro version to 1.0.207-alpha.0

---
 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 1308bd82be..0d8ceae0b4 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.0.207-alpha.0",
     "@budibase/client": "^1.0.207-alpha.0",
-    "@budibase/pro": "1.0.206",
+    "@budibase/pro": "1.0.207-alpha.0",
     "@budibase/string-templates": "^1.0.207-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b617987158..62c1094f16 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.0",
-    "@budibase/pro": "1.0.206",
+    "@budibase/pro": "1.0.207-alpha.0",
     "@budibase/string-templates": "^1.0.207-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",

From 544db02f2cc1d188689d8e448306b0fd0a7a7e07 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Jun 2022 12:14:16 +0100
Subject: [PATCH 14/35] Add dispatch deploy job for release env

---
 .github/workflows/deploy-cloud.yaml  |  2 +-
 .github/workflows/deploy-preprod.yml |  2 +-
 .github/workflows/deploy-release.yml | 77 ++++++++++++++++++++++++++++
 packages/server/yarn.lock            | 18 +++----
 packages/worker/yarn.lock            | 18 +++----
 5 files changed, 97 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/deploy-release.yml

diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
index a05f97f097..869a88a5b3 100644
--- a/.github/workflows/deploy-cloud.yaml
+++ b/.github/workflows/deploy-cloud.yaml
@@ -1,4 +1,4 @@
-name: Budibase Cloud Deploy
+name: Budibase Deploy Production
 
 on:
  workflow_dispatch:
diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
index ab941100a0..c3f690f568 100644
--- a/.github/workflows/deploy-preprod.yml
+++ b/.github/workflows/deploy-preprod.yml
@@ -1,4 +1,4 @@
-name: Budibase Release Preprod
+name: Budibase Deploy Preprod
 
 on:
  workflow_dispatch:
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
new file mode 100644
index 0000000000..8aa44958d3
--- /dev/null
+++ b/.github/workflows/deploy-release.yml
@@ -0,0 +1,77 @@
+name: Budibase Deploy Release
+
+on:
+ workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Fail if branch is not develop
+        if: github.ref != 'refs/heads/release'
+        run: | 
+          echo "Ref is not develop, you must run this job from develop."
+          exit 1
+
+      - name: Get the latest budibase release version
+        id: version
+        run: | 
+          release_version=$(cat lerna.json | jq -r '.version')
+          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
+
+      - name: Tag and release Proxy service docker image
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build:docker:proxy:release
+          docker tag proxy-service budibase/proxy:$RELEASE_TAG
+          docker push budibase/proxy:$RELEASE_TAG
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
+          RELEASE_TAG: k8s-release
+
+      - name: Pull values.yaml from budibase-infra
+        run: | 
+          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
+          -H 'Accept: application/vnd.github.v3.raw' \
+          -o values.release.yaml \
+          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-release/values.yaml
+          wc -l values.release.yaml
+
+      - name: Deploy to Release Environment
+        uses: glopezep/helm@v1.7.1
+        with:
+          release: budibase-release
+          namespace: budibase
+          chart: charts/budibase
+          token: ${{ github.token }}
+          helm: helm3
+          values: |
+            globals: 
+              appVersion: develop
+            ingress:
+              enabled: true
+              nginx: true
+          value-files: >-
+            [
+              "values.release.yaml"
+            ]
+        env:
+          KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v4.0.0
+        with:
+          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
+          content: "Release Env Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Release Env."
+          embed-title: ${{ env.RELEASE_VERSION }}
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b9f7f81a5b..e096aacd0c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,10 +1094,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.201-alpha.4.tgz#51fda5838e9c51c88c85204ad867811e49b7d34c"
-  integrity sha512-5oQMfKPDMpB4x5MzGgOtWFIPzc7RG/uu+rSe65PVwWfp77bDa3kxtCtC1p6vtJuPlb4GYrHqGLtr7WePbJf4fA==
+"@budibase/backend-core@1.0.207-alpha.0":
+  version "1.0.207-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.0.tgz#8e27dced0ed675c81f8139434e9a605d620967c2"
+  integrity sha512-Xwd2ywdWI2m3vGoxhnCDb8D8CDhiTQCWiqkU8V2kKhAkZsmwgAEEL9V/8VuNMYH3Lym3OAqZW0zC75NqRiS6mg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1175,12 +1175,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.201-alpha.4.tgz#5b92dc7a4bb2004bcd43339c863430ea640e0b74"
-  integrity sha512-fsDlE8O4Y4JpZI3NwBoN8udX4cEx7/ebZ41Q7qD5VwA6Q2niapRcX0MvDmGdjDSVECG+NJU1uqCdg5cDq1Odxw==
+"@budibase/pro@1.0.207-alpha.0":
+  version "1.0.207-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.0.tgz#b79cd0b32f722a11b52feeb0c39456334a524362"
+  integrity sha512-L39oqPoUe0r74PKR3Jry/BNeP6Dn/HxwSwbIxIpsxM90g0ZtTXQthwcx+Ni9kmd3+Uucf9i+8b72ZYTK2ab+MQ==
   dependencies:
-    "@budibase/backend-core" "1.0.201-alpha.4"
+    "@budibase/backend-core" "1.0.207-alpha.0"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 194ca3f061..673a5aba2e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.201-alpha.4.tgz#51fda5838e9c51c88c85204ad867811e49b7d34c"
-  integrity sha512-5oQMfKPDMpB4x5MzGgOtWFIPzc7RG/uu+rSe65PVwWfp77bDa3kxtCtC1p6vtJuPlb4GYrHqGLtr7WePbJf4fA==
+"@budibase/backend-core@1.0.207-alpha.0":
+  version "1.0.207-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.0.tgz#8e27dced0ed675c81f8139434e9a605d620967c2"
+  integrity sha512-Xwd2ywdWI2m3vGoxhnCDb8D8CDhiTQCWiqkU8V2kKhAkZsmwgAEEL9V/8VuNMYH3Lym3OAqZW0zC75NqRiS6mg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,12 +322,12 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.201-alpha.4":
-  version "1.0.201-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.201-alpha.4.tgz#5b92dc7a4bb2004bcd43339c863430ea640e0b74"
-  integrity sha512-fsDlE8O4Y4JpZI3NwBoN8udX4cEx7/ebZ41Q7qD5VwA6Q2niapRcX0MvDmGdjDSVECG+NJU1uqCdg5cDq1Odxw==
+"@budibase/pro@1.0.207-alpha.0":
+  version "1.0.207-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.0.tgz#b79cd0b32f722a11b52feeb0c39456334a524362"
+  integrity sha512-L39oqPoUe0r74PKR3Jry/BNeP6Dn/HxwSwbIxIpsxM90g0ZtTXQthwcx+Ni9kmd3+Uucf9i+8b72ZYTK2ab+MQ==
   dependencies:
-    "@budibase/backend-core" "1.0.201-alpha.4"
+    "@budibase/backend-core" "1.0.207-alpha.0"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 3b318889a4b92bb45ee5cb0a03e3634c287181fb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 11:46:05 +0000
Subject: [PATCH 15/35] v1.0.207-alpha.1

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

diff --git a/lerna.json b/lerna.json
index 90c55ddb69..cc50b86a28 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 43623f405c..65ab506121 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -57,7 +57,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.0",
+    "@budibase/types": "^1.0.207-alpha.1",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 771bda5ef1..2438c7cb13 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.0",
+    "@budibase/string-templates": "^1.0.207-alpha.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 bc2a3feba9..db000ab445 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.0",
-    "@budibase/client": "^1.0.207-alpha.0",
-    "@budibase/frontend-core": "^1.0.207-alpha.0",
-    "@budibase/string-templates": "^1.0.207-alpha.0",
+    "@budibase/bbui": "^1.0.207-alpha.1",
+    "@budibase/client": "^1.0.207-alpha.1",
+    "@budibase/frontend-core": "^1.0.207-alpha.1",
+    "@budibase/string-templates": "^1.0.207-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 c169199597..7b891d3e60 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-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 3db8b7f12c..c33f0007f6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.0",
-    "@budibase/frontend-core": "^1.0.207-alpha.0",
-    "@budibase/string-templates": "^1.0.207-alpha.0",
+    "@budibase/bbui": "^1.0.207-alpha.1",
+    "@budibase/frontend-core": "^1.0.207-alpha.1",
+    "@budibase/string-templates": "^1.0.207-alpha.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 6e5dd9c29e..08040dc8f8 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.0",
+    "@budibase/bbui": "^1.0.207-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 0d8ceae0b4..c7128afbb0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.207-alpha.0",
-    "@budibase/client": "^1.0.207-alpha.0",
+    "@budibase/backend-core": "^1.0.207-alpha.1",
+    "@budibase/client": "^1.0.207-alpha.1",
     "@budibase/pro": "1.0.207-alpha.0",
-    "@budibase/string-templates": "^1.0.207-alpha.0",
+    "@budibase/string-templates": "^1.0.207-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.207-alpha.0",
+    "@budibase/types": "^1.0.207-alpha.1",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 30ee701a2e..fcbce6a894 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.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 9ba237084b..66bc9575b3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.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 62c1094f16..071d60e2d1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.0",
+  "version": "1.0.207-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,9 +34,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.0",
+    "@budibase/backend-core": "^1.0.207-alpha.1",
     "@budibase/pro": "1.0.207-alpha.0",
-    "@budibase/string-templates": "^1.0.207-alpha.0",
+    "@budibase/string-templates": "^1.0.207-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -66,7 +66,7 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.0",
+    "@budibase/types": "^1.0.207-alpha.1",
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",

From ab96245203f060cd24e1c626f80170fc22aea7fa Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 11:47:44 +0000
Subject: [PATCH 16/35] Update pro version to 1.0.207-alpha.1

---
 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 c7128afbb0..7579507592 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.0.207-alpha.1",
     "@budibase/client": "^1.0.207-alpha.1",
-    "@budibase/pro": "1.0.207-alpha.0",
+    "@budibase/pro": "1.0.207-alpha.1",
     "@budibase/string-templates": "^1.0.207-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 071d60e2d1..d0e73f3078 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.1",
-    "@budibase/pro": "1.0.207-alpha.0",
+    "@budibase/pro": "1.0.207-alpha.1",
     "@budibase/string-templates": "^1.0.207-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",

From e0916610c217a1559566bc5e9b620b3907a926d7 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 20 Jun 2022 12:48:45 +0100
Subject: [PATCH 17/35] add docs for contrib env setup

---
 .github/CODE_OF_CONDUCT.md |  77 +------------
 .github/CONTRIBUTING.md    | 209 +----------------------------------
 README.md                  |   5 +-
 docs/CODE_OF_CONDUCT.md    |  76 +++++++++++++
 docs/CONTRIBUTING.md       | 218 +++++++++++++++++++++++++++++++++++++
 docs/DEV-SETUP-DEBIAN.md   |  52 +++++++++
 docs/DEV-SETUP-MACOSX.md   |  54 +++++++++
 7 files changed, 405 insertions(+), 286 deletions(-)
 mode change 100644 => 120000 .github/CODE_OF_CONDUCT.md
 mode change 100644 => 120000 .github/CONTRIBUTING.md
 create mode 100644 docs/CODE_OF_CONDUCT.md
 create mode 100644 docs/CONTRIBUTING.md
 create mode 100644 docs/DEV-SETUP-DEBIAN.md
 create mode 100644 docs/DEV-SETUP-MACOSX.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index 1be855e3fa..0000000000
--- a/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at community@budibase.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 120000
index 0000000000..d28e66efdc
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+../docs/CODE_OF_CONDUCT.md
\ No newline at end of file
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index bd21123709..0000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,208 +0,0 @@
-# Contributing
-
-From opening a bug report to creating a pull request: every contribution is appreciated and welcome. If you're planning to implement a new feature or change the api please create an issue first. This way we can ensure that your precious work is not in vain.
-
-## Not Sure Where to Start?
-
-Budibase is a low-code web application builder that creates svelte based web applications.
-
-Budibase is a monorepo managed by [lerna](https://github.com/lerna/lerna). Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up budibase.
-
-- **packages/builder** - contains code for the budibase builder client side svelte application.
-
-- **packages/client** - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
-
-- **packages/server** - The budibase server. This [Koa](https://koajs.com/) app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
-
-- **packages/worker** - This [Koa](https://koajs.com/) app is responsible for providing global apis for managing your budibase installation. Authentication, Users, Email, Org and Auth configs are all provided by the worker. 
-
-## Contributor License Agreement (CLA)
-
-In order to accept your pull request, we need you to submit a CLA. You only need to do this once. If you are submitting a pull request for the first time, just submit a Pull Request and our CLA Bot will give you instructions on how to sign the CLA before merging your Pull Request.
-
-All contributors must sign an [Individual Contributor License Agreement](https://github.com/budibase/budibase/blob/next/.github/cla/individual-cla.md).
-
-If contributing on behalf of your company, your company must sign a [Corporate Contributor License Agreement](https://github.com/budibase/budibase/blob/next/.github/cla/corporate-cla.md). If so, please contact us via community@budibase.com.
-
-## Glossary of Terms
-
-To understand the budibase API, it can be helpful to understand the top level entities that make up Budibase.
-
-### Client
-
-A client represents a single budibase customer. Each budibase client will have 1 or more budibase servers. Every client is assigned a unique ID.
-
-### App
-
-A client can have one or more budibase applications. Budibase applications would be things like "Developer Inventory Management" or "Goat Herder CRM". Think of a budibase application as a tree. 
-
-### Database
-
-An App can have one or more databases. Keeping with our [dendrology](https://en.wikipedia.org/wiki/Dendrology) analogy - think of an database as a branch on the tree. Databases are used to keep data separate for different instances of your app. For example, if you had a CRM app, you may create a database for your US office, and a database for your Australian office. Databases allow us to support [multitenancy](https://www.gartner.com/en/information-technology/glossary/multitenancy) in budibase applications.
-
-### Table
-
-Tables in budibase are almost akin to tables in relational databases. A table may be a "Car" or an "Employee". They are the main building blocks for the creation and management of backend data in budibase.
-
-### View
-
-A View is an advanced feature in budibase that allows you to write a custom query using [MapReduce](https://pouchdb.com/guides/queries.html) queries. Views enable powerful query functionality and calculations, allowing you to do more with your data.
-
-### Page
-
-A page in budibase is actually a single, self contained svelte web app. There are only 2 pages in budibase. The **login** page and the **main** page.
-
-### Screen
-
-A screen is a component within a single page. Generally, screens represent client side routes, and can be switched without refreshing the page.
-
-### Component
-
-A component is the basic frontend building block of a budibase app.
-
-### Component Library
-
-Component libraries are collections of components as well as the definition of their props contained in a file called `components.json`. 
-
-## Contributing to Budibase
-
-* Please maintain the existing code style. 
-
-* Please try to keep your commits small and focused.
-
-* Please write tests.
-
-* If the project diverges from your branch, please rebase instead of merging. This makes the commit graph easier to read.
-
-* Once your work is completed, please raise a PR against the `develop` branch with some information about what has changed and why.
-
-### Getting Started For Contributors
-#### 1.  Prerequisites
-
-NodeJS Version `14.x.x`
-
-*yarn -* `npm install -g yarn`
-
-*jest* - `npm install -g jest`
-
-#### 2. Clone this repository
-
-`git clone https://github.com/Budibase/budibase.git`
-
-then `cd ` into your local copy.
-
-#### 3.  Install and Build
-
-| **NOTE**: On Windows, all yarn commands must be executed on a bash shell (e.g. git bash)
-
-To develop the Budibase platform you'll need [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) installed.
-
-##### Quick method
-
-`yarn setup` will check that all necessary components are installed and setup the repo for usage.
-
-##### Manual method
-
-The following commands can be executed to manually get Budibase up and running (assuming Docker/Docker Compose has been installed).
-
-`yarn` to install project dependencies
-
-`yarn bootstrap` will install all budibase modules and symlink them together using lerna.
-
-`yarn build` will build all budibase packages.
-
-#### 4. Running
-
-To run the budibase server and builder in dev mode (i.e. with live reloading):
-
-1. Open a new console
-2. `yarn dev` (from root)
-3. Access the builder on http://localhost:10000/builder
-
-This will enable watch mode for both the builder app, server, client library and any component libraries.
-
-#### 5. Debugging using VS Code
-
-To debug the budibase server and worker a VS Code launch configuration has been provided. 
-
-Visit the debug window and select `Budibase Server` or `Budibase Worker` to debug the respective component. 
-Alternatively to start both components simultaneously select `Start Budibase`.
-
-In addition to the above, the remaining budibase components may be ran in dev mode using: `yarn dev:noserver`.
-
-#### 6. Cleanup
-
-If you wish to delete all the apps created in development and reset the environment then run the following:
-
-1. `yarn nuke:docker` will wipe all the Budibase services
-2. `yarn dev` will restart all the services
-
-### Backend
-
-For the backend we run [Redis](https://redis.io/), [CouchDB](https://couchdb.apache.org/), [MinIO](https://min.io/) and [NGINX](https://www.nginx.com/) in Docker compose. This means that to develop Budibase you will need Docker and Docker compose installed. The backend services are then ran separately as Node services with nodemon so that they can be debugged outside of Docker.
-
-### Data Storage
-
-When you are running locally, budibase stores data on disk using docker volumes. The volumes and the types of data associated with each are:
-
-- `redis_data` 
-  - Sessions, email tokens
-- `couchdb3_data` 
-  - Global and app databases
-- `minio_data` 
-  - App manifest, budibase client, static assets
-
-### Devlopment Modes
-
-A combination of environment variables controls the mode that budibase runs in. 
-Yarn commands can be used to mimic the different modes that budibase can be ran in
-
-#### Self Hosted
-The default mode. A single tenant installation with no usage restrictions. 
-
-To enable this mode, use:
-```
-yarn mode:self
-```
-
-#### Cloud
-The cloud mode, with account portal turned off. 
-
-To enable this mode, use:
-```
-yarn mode:cloud
-```
-#### Cloud & Account
-The cloud mode, with account portal turned on. This is a replica of the mode that runs at https://budibase.app 
-
-
-To enable this mode, use:
-```
-yarn mode:account
-```
-### CI
- An overview of the CI pipelines can be found [here](./workflows/README.md)
-### Troubleshooting
-
-Sometimes, things go wrong. This can be due to incompatible updates on the budibase platform. To clear down your development environment and start again follow **Step 6. Cleanup**, then proceed from **Step 3. Install and Build** in the setup guide above. You should have a fresh Budibase installation.
-### Running tests
-
-#### End-to-end Tests
-
-Budibase uses Cypress to run a number of E2E tests. To run the tests execute the following command in the root folder:
-
-```
-yarn test:e2e
-```
-
-Or if you are in the builder you can run `yarn cy:test`.
-
-
-### Other Useful Information
-
-* The contributors are listed in [AUTHORS.md](https://github.com/Budibase/budibase/blob/master/.github/AUTHORS.md) (add yourself).
-
-* This project uses a modified version of the MPLv2 license, see [LICENSE](https://github.com/budibase/server/blob/master/LICENSE).
-
-* We use the [C4 (Collective Code Construction Contract)](https://rfc.zeromq.org/spec:42/C4/) process for contributions.
-  Please read this if you are unfamiliar with it.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 120000
index 0000000000..c81d5e88a2
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1 @@
+../docs/CONTRIBUTING.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 17a3ab1ef2..e8c6475d90 100644
--- a/README.md
+++ b/README.md
@@ -174,6 +174,7 @@ Budibase is dedicated to providing a welcoming, diverse, and harrassment-free ex
 ## 🙌 Contributing to Budibase
 
 From opening a bug report to creating a pull request: every contribution is appreciated and welcomed. If you're planning to implement a new feature or change the API please create an issue first. This way we can ensure your work is not in vain.
+Environment setup instructions are available for [Debian](https://github.com/Budibase/budibase/tree/HEAD/docs/DEV-SETUP-DEBIAN.md) and [MacOSX](https://github.com/Budibase/budibase/tree/HEAD/docs/DEV-SETUP-MACOSX.md)
 
 ### Not Sure Where to Start?
 A good place to start contributing, is the [First time issues project](https://github.com/Budibase/budibase/projects/22).
@@ -187,7 +188,7 @@ Budibase is a monorepo managed by lerna. Lerna manages the building and publishi
 
 - [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
 
-For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/docs/CONTRIBUTING.md)
 
 <br /><br />
 
@@ -202,7 +203,7 @@ Budibase is open-source, licensed as [GPL v3](https://www.gnu.org/licenses/gpl-3
 
 [![Stargazers over time](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
 
-If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) to clear down your environment.
+If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/HEAD/docs/CONTRIBUTING.md#troubleshooting) to clear down your environment.
 
 <br /><br />
 
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..1be855e3fa
--- /dev/null
+++ b/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at community@budibase.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 0000000000..dc4f3a397a
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,218 @@
+# Contributing
+
+From opening a bug report to creating a pull request: every contribution is appreciated and welcome. If you're planning to implement a new feature or change the api please [create an issue](https://github.com/Budibase/budibase/issues/new/choose) first. This way we can ensure that your precious work is not in vain.
+
+## Table of contents
+
+- [Quick start](#quick-start)
+- [Status](#status)
+- [What's included](#whats-included)
+- [Bugs and feature requests](#bugs-and-feature-requests)
+
+
+## Not Sure Where to Start?
+
+Budibase is a low-code web application builder that creates svelte based web applications.
+
+Budibase is a monorepo managed by [lerna](https://github.com/lerna/lerna). Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up budibase.
+
+- **packages/builder** - contains code for the budibase builder client side svelte application.
+
+- **packages/client** - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
+
+- **packages/server** - The budibase server. This [Koa](https://koajs.com/) app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
+
+- **packages/worker** - This [Koa](https://koajs.com/) app is responsible for providing global apis for managing your budibase installation. Authentication, Users, Email, Org and Auth configs are all provided by the worker. 
+
+
+
+## Contributor License Agreement (CLA)
+
+In order to accept your pull request, we need you to submit a CLA. You only need to do this once. If you are submitting a pull request for the first time, just submit a Pull Request and our CLA Bot will give you instructions on how to sign the CLA before merging your Pull Request.
+
+All contributors must sign an [Individual Contributor License Agreement](https://github.com/budibase/budibase/blob/next/.github/cla/individual-cla.md).
+
+If contributing on behalf of your company, your company must sign a [Corporate Contributor License Agreement](https://github.com/budibase/budibase/blob/next/.github/cla/corporate-cla.md). If so, please contact us via community@budibase.com.
+
+## Glossary of Terms
+
+To understand the budibase API, it can be helpful to understand the top level entities that make up Budibase.
+
+### Client
+
+A client represents a single budibase customer. Each budibase client will have 1 or more budibase servers. Every client is assigned a unique ID.
+
+### App
+
+A client can have one or more budibase applications. Budibase applications would be things like "Developer Inventory Management" or "Goat Herder CRM". Think of a budibase application as a tree. 
+
+### Database
+
+An App can have one or more databases. Keeping with our [dendrology](https://en.wikipedia.org/wiki/Dendrology) analogy - think of an database as a branch on the tree. Databases are used to keep data separate for different instances of your app. For example, if you had a CRM app, you may create a database for your US office, and a database for your Australian office. Databases allow us to support [multitenancy](https://www.gartner.com/en/information-technology/glossary/multitenancy) in budibase applications.
+
+### Table
+
+Tables in budibase are almost akin to tables in relational databases. A table may be a "Car" or an "Employee". They are the main building blocks for the creation and management of backend data in budibase.
+
+### View
+
+A View is an advanced feature in budibase that allows you to write a custom query using [MapReduce](https://pouchdb.com/guides/queries.html) queries. Views enable powerful query functionality and calculations, allowing you to do more with your data.
+
+### Page
+
+A page in budibase is actually a single, self contained svelte web app. There are only 2 pages in budibase. The **login** page and the **main** page.
+
+### Screen
+
+A screen is a component within a single page. Generally, screens represent client side routes, and can be switched without refreshing the page.
+
+### Component
+
+A component is the basic frontend building block of a budibase app.
+
+### Component Library
+
+Component libraries are collections of components as well as the definition of their props contained in a file called `components.json`. 
+
+## Contributing to Budibase
+
+* Please maintain the existing code style. 
+
+* Please try to keep your commits small and focused.
+
+* Please write tests.
+
+* If the project diverges from your branch, please rebase instead of merging. This makes the commit graph easier to read.
+
+* Once your work is completed, please raise a PR against the `develop` branch with some information about what has changed and why.
+
+### Getting Started For Contributors
+#### 1.  Prerequisites
+
+NodeJS Version `14.x.x`
+
+*yarn -* `npm install -g yarn`
+
+*jest* - `npm install -g jest`
+
+#### 2. Clone this repository
+
+`git clone https://github.com/Budibase/budibase.git`
+
+then `cd ` into your local copy.
+
+#### 3.  Install and Build
+
+| **NOTE**: On Windows, all yarn commands must be executed on a bash shell (e.g. git bash)
+
+To develop the Budibase platform you'll need [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) installed.
+
+##### Quick method
+
+`yarn setup` will check that all necessary components are installed and setup the repo for usage.
+
+##### Manual method
+
+The following commands can be executed to manually get Budibase up and running (assuming Docker/Docker Compose has been installed).
+
+`yarn` to install project dependencies
+
+`yarn bootstrap` will install all budibase modules and symlink them together using lerna.
+
+`yarn build` will build all budibase packages.
+
+#### 4. Running
+
+To run the budibase server and builder in dev mode (i.e. with live reloading):
+
+1. Open a new console
+2. `yarn dev` (from root)
+3. Access the builder on http://localhost:10000/builder
+
+This will enable watch mode for both the builder app, server, client library and any component libraries.
+
+#### 5. Debugging using VS Code
+
+To debug the budibase server and worker a VS Code launch configuration has been provided. 
+
+Visit the debug window and select `Budibase Server` or `Budibase Worker` to debug the respective component. 
+Alternatively to start both components simultaneously select `Start Budibase`.
+
+In addition to the above, the remaining budibase components may be ran in dev mode using: `yarn dev:noserver`.
+
+#### 6. Cleanup
+
+If you wish to delete all the apps created in development and reset the environment then run the following:
+
+1. `yarn nuke:docker` will wipe all the Budibase services
+2. `yarn dev` will restart all the services
+
+### Backend
+
+For the backend we run [Redis](https://redis.io/), [CouchDB](https://couchdb.apache.org/), [MinIO](https://min.io/) and [NGINX](https://www.nginx.com/) in Docker compose. This means that to develop Budibase you will need Docker and Docker compose installed. The backend services are then ran separately as Node services with nodemon so that they can be debugged outside of Docker.
+
+### Data Storage
+
+When you are running locally, budibase stores data on disk using docker volumes. The volumes and the types of data associated with each are:
+
+- `redis_data` 
+  - Sessions, email tokens
+- `couchdb3_data` 
+  - Global and app databases
+- `minio_data` 
+  - App manifest, budibase client, static assets
+
+### Devlopment Modes
+
+A combination of environment variables controls the mode that budibase runs in. 
+Yarn commands can be used to mimic the different modes that budibase can be ran in
+
+#### Self Hosted
+The default mode. A single tenant installation with no usage restrictions. 
+
+To enable this mode, use:
+```
+yarn mode:self
+```
+
+#### Cloud
+The cloud mode, with account portal turned off. 
+
+To enable this mode, use:
+```
+yarn mode:cloud
+```
+#### Cloud & Account
+The cloud mode, with account portal turned on. This is a replica of the mode that runs at https://budibase.app 
+
+
+To enable this mode, use:
+```
+yarn mode:account
+```
+### CI
+ An overview of the CI pipelines can be found [here](./workflows/README.md)
+### Troubleshooting
+
+Sometimes, things go wrong. This can be due to incompatible updates on the budibase platform. To clear down your development environment and start again follow **Step 6. Cleanup**, then proceed from **Step 3. Install and Build** in the setup guide above. You should have a fresh Budibase installation.
+### Running tests
+
+#### End-to-end Tests
+
+Budibase uses Cypress to run a number of E2E tests. To run the tests execute the following command in the root folder:
+
+```
+yarn test:e2e
+```
+
+Or if you are in the builder you can run `yarn cy:test`.
+
+
+### Other Useful Information
+
+* The contributors are listed in [AUTHORS.md](https://github.com/Budibase/budibase/blob/master/.github/AUTHORS.md) (add yourself).
+
+* This project uses a modified version of the MPLv2 license, see [LICENSE](https://github.com/budibase/server/blob/master/LICENSE).
+
+* We use the [C4 (Collective Code Construction Contract)](https://rfc.zeromq.org/spec:42/C4/) process for contributions.
+  Please read this if you are unfamiliar with it.
diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md
new file mode 100644
index 0000000000..88a124708c
--- /dev/null
+++ b/docs/DEV-SETUP-DEBIAN.md
@@ -0,0 +1,52 @@
+## Dev Environment on Debian 11
+
+### Install Node
+
+Budibase requires a recent version of node (14+):
+```
+curl -sL https://deb.nodesource.com/setup_16.x | sudo bash -
+apt -y install nodejs
+node -v
+```
+
+### Install npm requirements
+
+```
+npm install -g yarn jest lerna
+```
+### Install Docker and Docker Compose
+
+```
+apt install docker.io
+pip3 install docker-compose
+```
+### Clone the repo
+```
+git clone https://github.com/Budibase/budibase.git
+```
+
+### Check Versions
+
+This setup process was tested on Debian 11 (bullseye) with version numbers show below. Your mileage may vary using anything else.
+
+- Docker: 20.10.5
+- Docker-Compose: 1.29.2
+- Node: v16.15.1
+- Yarn: 1.22.19
+- Lerna: 5.1.4
+
+### Build
+
+```
+cd budibase
+yarn setup
+```
+The yarn setup command runs several build steps i.e.
+```
+node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev
+```
+So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose.
+
+The dev version will be available on port 10000 i.e.
+
+http://127.0.0.1:10000/builder/admin
\ No newline at end of file
diff --git a/docs/DEV-SETUP-MACOSX.md b/docs/DEV-SETUP-MACOSX.md
new file mode 100644
index 0000000000..5606fd0d10
--- /dev/null
+++ b/docs/DEV-SETUP-MACOSX.md
@@ -0,0 +1,54 @@
+## Dev Environment on MAC OSX 12 (Monterey)
+
+### Install Homebrew
+
+Install instructions [here](https://brew.sh/)
+
+### Install Node
+
+Budibase requires a recent version of node (14+):
+```
+brew install node npm
+node -v
+```
+
+### Install npm requirements
+
+```
+npm install -g yarn jest lerna
+```
+### Install Docker and Docker Compose
+
+```
+brew install docker docker-compose
+```
+### Clone the repo
+```
+git clone https://github.com/Budibase/budibase.git
+```
+
+### Check Versions
+
+This setup process was tested on Mac OSX 12 (Monterey) with version numbers shown below. Your mileage may vary using anything else.
+
+- Docker: 20.10.14
+- Docker-Compose: 2.6.0
+- Node: 18.3.0
+- Yarn: 1.22.19
+- Lerna: 5.1.4
+
+### Build
+
+```
+cd budibase
+yarn setup
+```
+The yarn setup command runs several build steps i.e.
+```
+node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev
+```
+So this command will actually run the application in dev mode. It creates .env files under `./packages/server` and `./packages/worker` and runs docker containers for each service via docker-compose.
+
+The dev version will be available on port 10000 i.e.
+
+http://127.0.0.1:10000/builder/admin
\ No newline at end of file

From 7a97dd14e3014e12a61fe9058e437b5f8f4ae0b5 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Jun 2022 12:51:57 +0100
Subject: [PATCH 18/35] Fix typo on branch name check

---
 .github/workflows/deploy-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index 8aa44958d3..0fb8a5fea0 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -18,7 +18,7 @@ jobs:
           aws-region: eu-west-1
 
       - name: Fail if branch is not develop
-        if: github.ref != 'refs/heads/release'
+        if: github.ref != 'refs/heads/develop'
         run: | 
           echo "Ref is not develop, you must run this job from develop."
           exit 1

From 125c51dbc4d0880e984b3aeeaa365759a77c86f6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 12:09:16 +0000
Subject: [PATCH 19/35] v1.0.207-alpha.2

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

diff --git a/lerna.json b/lerna.json
index cc50b86a28..fc0ee9d41f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 65ab506121..6cc17973bf 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -57,7 +57,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.1",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 2438c7cb13..2c96bddca7 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.1",
+    "@budibase/string-templates": "^1.0.207-alpha.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 db000ab445..6d807f5bc7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.1",
-    "@budibase/client": "^1.0.207-alpha.1",
-    "@budibase/frontend-core": "^1.0.207-alpha.1",
-    "@budibase/string-templates": "^1.0.207-alpha.1",
+    "@budibase/bbui": "^1.0.207-alpha.2",
+    "@budibase/client": "^1.0.207-alpha.2",
+    "@budibase/frontend-core": "^1.0.207-alpha.2",
+    "@budibase/string-templates": "^1.0.207-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 7b891d3e60..969714b849 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-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 c33f0007f6..a8fffb865a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.1",
-    "@budibase/frontend-core": "^1.0.207-alpha.1",
-    "@budibase/string-templates": "^1.0.207-alpha.1",
+    "@budibase/bbui": "^1.0.207-alpha.2",
+    "@budibase/frontend-core": "^1.0.207-alpha.2",
+    "@budibase/string-templates": "^1.0.207-alpha.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 08040dc8f8..c28c771fba 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.1",
+    "@budibase/bbui": "^1.0.207-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7579507592..05ddd908ad 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.207-alpha.1",
-    "@budibase/client": "^1.0.207-alpha.1",
+    "@budibase/backend-core": "^1.0.207-alpha.2",
+    "@budibase/client": "^1.0.207-alpha.2",
     "@budibase/pro": "1.0.207-alpha.1",
-    "@budibase/string-templates": "^1.0.207-alpha.1",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.207-alpha.1",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fcbce6a894..23c6a7a6ec 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.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 66bc9575b3..641c712632 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.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 d0e73f3078..cadb6de895 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.1",
+  "version": "1.0.207-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,9 +34,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.1",
+    "@budibase/backend-core": "^1.0.207-alpha.2",
     "@budibase/pro": "1.0.207-alpha.1",
-    "@budibase/string-templates": "^1.0.207-alpha.1",
+    "@budibase/string-templates": "^1.0.207-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -66,7 +66,7 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.1",
+    "@budibase/types": "^1.0.207-alpha.2",
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",

From 9c6fd1e617cfb56bcb0518d988e9f0a88c0c25d9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 12:10:47 +0000
Subject: [PATCH 20/35] Update pro version to 1.0.207-alpha.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 05ddd908ad..f0af9c5d18 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.0.207-alpha.2",
     "@budibase/client": "^1.0.207-alpha.2",
-    "@budibase/pro": "1.0.207-alpha.1",
+    "@budibase/pro": "1.0.207-alpha.2",
     "@budibase/string-templates": "^1.0.207-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index cadb6de895..6fdf2f709f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.2",
-    "@budibase/pro": "1.0.207-alpha.1",
+    "@budibase/pro": "1.0.207-alpha.2",
     "@budibase/string-templates": "^1.0.207-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",

From a4a6ce2b384dabeb7385eacc84ee39a9b79ffc86 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Jun 2022 13:27:03 +0100
Subject: [PATCH 21/35] Update workflow readmes and rename release staging to
 prerelease

---
 .github/workflows/README.md           | 31 ++++++++++++++++++++++++---
 .github/workflows/release-develop.yml |  4 ++--
 packages/server/yarn.lock             | 18 ++++++++--------
 packages/worker/yarn.lock             | 18 ++++++++--------
 4 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index d2fcd16bb0..5929a0540a 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -24,14 +24,14 @@ The standard CI Build job is what runs when you raise a PR to develop or master.
 Triggers:
 - Push to develop
 
-The job responsible for building, tagging and pushing docker images out to the test and staging environments. 
+The job responsible for building, tagging and pushing docker images out to the test and release environments. 
 - Installs all dependencies
 - builds the project 
 - run the unit tests
 - publish the budibase JS packages under a prerelease tag to NPM
 - build, tag and push docker images under the `develop` tag to docker hub
 
-These images will then be pulled by the test and staging environments, updating the latest automatically. Discord notifications are sent to the #infra channel when this occurs.
+These images will then be pulled by the test and release environments, updating the latest automatically. Discord notifications are sent to the #infra channel when this occurs.
 
 ### Release Job (release.yml)
 Triggers:
@@ -57,8 +57,33 @@ This job relies on the release job to have run first, so the latest image is pus
 - Build and release the budibase helm chart for kubernetes users
 - Perform a github release with the latest version. You can see previous releases here (https://github.com/Budibase/budibase/releases)
 
+### Deploy Release (deploy-release.yml)
+Triggers:
+- Manual Workflow Dispatch Trigger
 
-### Cloud Deploy (deploy-cloud.yml)
+This job is responsible for deploying to our release, cloud kubernetes environment. You must run the release job first, to ensure that the latest images have been built and pushed to docker hub. After kicking off this job, the following will occur:
+
+- Checks out the release branch 
+- Pulls the latest `values.yaml` from budibase infra, a private repo containing budibases infrastructure configuration
+- Gets the latest budibase version from `lerna.json`, if it hasn't been specified in the workflow when you kicked it off
+- Configures AWS Credentials  
+- Deploys the helm chart in the budibase repo to our preproduction EKS cluster, injecting the `values.yaml` we pulled from budibase-infra
+- Fires off a discord webhook in the #infra channel to show that the deployment completely successfully.
+
+### Deploy Preprod (deploy-preprod.yml)
+Triggers:
+- Manual Workflow Dispatch Trigger
+
+This job is responsible for deploying to our preprod, cloud kubernetes environment. You must run the release job first, to ensure that the latest images have been built and pushed to docker hub. After kicking off this job, the following will occur:
+
+- Checks out the master branch 
+- Pulls the latest `values.yaml` from budibase infra, a private repo containing budibases infrastructure configuration
+- Gets the latest budibase version from `lerna.json`, if it hasn't been specified in the workflow when you kicked it off
+- Configures AWS Credentials  
+- Deploys the helm chart in the budibase repo to our preprod EKS cluster, injecting the `values.yaml` we pulled from budibase-infra
+- Fires off a discord webhook in the #infra channel to show that the deployment completely successfully.
+
+### Deploy Production (deploy-cloud.yml)
 Triggers:
 - Manual Workflow Dispatch Trigger
 
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 3c293b1bb8..4502482b23 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -1,5 +1,5 @@
-name: Budibase Release Staging
-concurrency: release-develop
+name: Budibase Prerelease
+concurrency: release-prerelease
 
 on: 
  push:
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e096aacd0c..b9e8eda2a1 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,10 +1094,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.207-alpha.0":
-  version "1.0.207-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.0.tgz#8e27dced0ed675c81f8139434e9a605d620967c2"
-  integrity sha512-Xwd2ywdWI2m3vGoxhnCDb8D8CDhiTQCWiqkU8V2kKhAkZsmwgAEEL9V/8VuNMYH3Lym3OAqZW0zC75NqRiS6mg==
+"@budibase/backend-core@1.0.207-alpha.1":
+  version "1.0.207-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.1.tgz#7cc8e585dadbc1f10489c31bd59402f334c283b6"
+  integrity sha512-3M/rBYQP/Xy7fewrSd7msNgg37VOa+HuAGDSulokNCjoxlq/51Ks87FkWQgQOVpagtERV0WyZdH8qfFWzOqpnQ==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1175,12 +1175,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.207-alpha.0":
-  version "1.0.207-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.0.tgz#b79cd0b32f722a11b52feeb0c39456334a524362"
-  integrity sha512-L39oqPoUe0r74PKR3Jry/BNeP6Dn/HxwSwbIxIpsxM90g0ZtTXQthwcx+Ni9kmd3+Uucf9i+8b72ZYTK2ab+MQ==
+"@budibase/pro@1.0.207-alpha.1":
+  version "1.0.207-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.1.tgz#a8323f28e695843891eeb3225426e2a478fbd467"
+  integrity sha512-osdEwc27lUCkt7bci9wCZXeGOL45XtH4qBPIAzuRrYUvPwipzb8ro603cRpmvn9q7LN+Dt1xrF/OIlGAUUE2lQ==
   dependencies:
-    "@budibase/backend-core" "1.0.207-alpha.0"
+    "@budibase/backend-core" "1.0.207-alpha.1"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 673a5aba2e..d185768dff 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.207-alpha.0":
-  version "1.0.207-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.0.tgz#8e27dced0ed675c81f8139434e9a605d620967c2"
-  integrity sha512-Xwd2ywdWI2m3vGoxhnCDb8D8CDhiTQCWiqkU8V2kKhAkZsmwgAEEL9V/8VuNMYH3Lym3OAqZW0zC75NqRiS6mg==
+"@budibase/backend-core@1.0.207-alpha.1":
+  version "1.0.207-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.1.tgz#7cc8e585dadbc1f10489c31bd59402f334c283b6"
+  integrity sha512-3M/rBYQP/Xy7fewrSd7msNgg37VOa+HuAGDSulokNCjoxlq/51Ks87FkWQgQOVpagtERV0WyZdH8qfFWzOqpnQ==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,12 +322,12 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.207-alpha.0":
-  version "1.0.207-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.0.tgz#b79cd0b32f722a11b52feeb0c39456334a524362"
-  integrity sha512-L39oqPoUe0r74PKR3Jry/BNeP6Dn/HxwSwbIxIpsxM90g0ZtTXQthwcx+Ni9kmd3+Uucf9i+8b72ZYTK2ab+MQ==
+"@budibase/pro@1.0.207-alpha.1":
+  version "1.0.207-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.1.tgz#a8323f28e695843891eeb3225426e2a478fbd467"
+  integrity sha512-osdEwc27lUCkt7bci9wCZXeGOL45XtH4qBPIAzuRrYUvPwipzb8ro603cRpmvn9q7LN+Dt1xrF/OIlGAUUE2lQ==
   dependencies:
-    "@budibase/backend-core" "1.0.207-alpha.0"
+    "@budibase/backend-core" "1.0.207-alpha.1"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From 7dbd03fd17dd95643d0b67c6406cfe2c62f432fe Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 20 Jun 2022 13:35:44 +0100
Subject: [PATCH 22/35] Add feature flag awareness to k8s worker deployment

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

diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 73bb26dad9..a7f05f3137 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -123,6 +123,8 @@ spec:
           value: {{ .Values.globals.google.clientId | quote }}
         - name: GOOGLE_CLIENT_SECRET
           value: {{ .Values.globals.google.secret | quote }}
+        - name: TENANT_FEATURE_FLAGS
+          value: {{ .Values.globals.tenantFeatureFlags | quote }}
         image: budibase/worker:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         livenessProbe:

From 84e2dc78b07b7025f7c76d93fab1cbaa951f54bd Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 12:49:25 +0000
Subject: [PATCH 23/35] v1.0.207-alpha.3

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

diff --git a/lerna.json b/lerna.json
index fc0ee9d41f..a0663c0a88 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6cc17973bf..85ec117f76 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -57,7 +57,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.2",
+    "@budibase/types": "^1.0.207-alpha.3",
     "@shopify/jest-koa-mocks": "3.1.5",
     "@types/jest": "27.5.1",
     "@types/koa": "2.0.52",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 2c96bddca7..028d076053 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.2",
+    "@budibase/string-templates": "^1.0.207-alpha.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 6d807f5bc7..d912472916 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.2",
-    "@budibase/client": "^1.0.207-alpha.2",
-    "@budibase/frontend-core": "^1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.207-alpha.2",
+    "@budibase/bbui": "^1.0.207-alpha.3",
+    "@budibase/client": "^1.0.207-alpha.3",
+    "@budibase/frontend-core": "^1.0.207-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.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 969714b849..8262809410 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "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 a8fffb865a..8f68540774 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.2",
-    "@budibase/frontend-core": "^1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.207-alpha.2",
+    "@budibase/bbui": "^1.0.207-alpha.3",
+    "@budibase/frontend-core": "^1.0.207-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.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 c28c771fba..54380a2658 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.2",
+    "@budibase/bbui": "^1.0.207-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index f0af9c5d18..27cd6d50c2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.207-alpha.2",
-    "@budibase/client": "^1.0.207-alpha.2",
+    "@budibase/backend-core": "^1.0.207-alpha.3",
+    "@budibase/client": "^1.0.207-alpha.3",
     "@budibase/pro": "1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.207-alpha.2",
+    "@budibase/string-templates": "^1.0.207-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.207-alpha.2",
+    "@budibase/types": "^1.0.207-alpha.3",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 23c6a7a6ec..2093698196 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.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 641c712632..d1b5f3feb4 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.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 6fdf2f709f..0ecad6ebf2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.2",
+  "version": "1.0.207-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,9 +34,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.2",
+    "@budibase/backend-core": "^1.0.207-alpha.3",
     "@budibase/pro": "1.0.207-alpha.2",
-    "@budibase/string-templates": "^1.0.207-alpha.2",
+    "@budibase/string-templates": "^1.0.207-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -66,7 +66,7 @@
     "server-destroy": "1.0.1"
   },
   "devDependencies": {
-    "@budibase/types": "^1.0.207-alpha.2",
+    "@budibase/types": "^1.0.207-alpha.3",
     "@types/jest": "26.0.23",
     "@types/koa": "2.13.4",
     "@types/koa-router": "7.4.4",

From a280b3459cd3dd35331ca02ecc98daadd7c68ef0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 12:51:05 +0000
Subject: [PATCH 24/35] Update pro version to 1.0.207-alpha.3

---
 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 27cd6d50c2..6ed3f4c6ca 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.0.207-alpha.3",
     "@budibase/client": "^1.0.207-alpha.3",
-    "@budibase/pro": "1.0.207-alpha.2",
+    "@budibase/pro": "1.0.207-alpha.3",
     "@budibase/string-templates": "^1.0.207-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0ecad6ebf2..cdc5d15277 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.3",
-    "@budibase/pro": "1.0.207-alpha.2",
+    "@budibase/pro": "1.0.207-alpha.3",
     "@budibase/string-templates": "^1.0.207-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",

From 7593aa8b927a8c304ea7c088519dad7b6471c373 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 20 Jun 2022 14:18:28 +0100
Subject: [PATCH 25/35] fix typos in contrib doc

---
 docs/CONTRIBUTING.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index dc4f3a397a..961e13ee33 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -12,7 +12,7 @@ From opening a bug report to creating a pull request: every contribution is appr
 
 ## Not Sure Where to Start?
 
-Budibase is a low-code web application builder that creates svelte based web applications.
+Budibase is a low-code web application builder that creates svelte-based web applications.
 
 Budibase is a monorepo managed by [lerna](https://github.com/lerna/lerna). Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up budibase.
 
@@ -24,8 +24,6 @@ Budibase is a monorepo managed by [lerna](https://github.com/lerna/lerna). Lerna
 
 - **packages/worker** - This [Koa](https://koajs.com/) app is responsible for providing global apis for managing your budibase installation. Authentication, Users, Email, Org and Auth configs are all provided by the worker. 
 
-
-
 ## Contributor License Agreement (CLA)
 
 In order to accept your pull request, we need you to submit a CLA. You only need to do this once. If you are submitting a pull request for the first time, just submit a Pull Request and our CLA Bot will give you instructions on how to sign the CLA before merging your Pull Request.
@@ -138,7 +136,7 @@ To debug the budibase server and worker a VS Code launch configuration has been
 Visit the debug window and select `Budibase Server` or `Budibase Worker` to debug the respective component. 
 Alternatively to start both components simultaneously select `Start Budibase`.
 
-In addition to the above, the remaining budibase components may be ran in dev mode using: `yarn dev:noserver`.
+In addition to the above, the remaining budibase components may be run in dev mode using: `yarn dev:noserver`.
 
 #### 6. Cleanup
 
@@ -149,7 +147,7 @@ If you wish to delete all the apps created in development and reset the environm
 
 ### Backend
 
-For the backend we run [Redis](https://redis.io/), [CouchDB](https://couchdb.apache.org/), [MinIO](https://min.io/) and [NGINX](https://www.nginx.com/) in Docker compose. This means that to develop Budibase you will need Docker and Docker compose installed. The backend services are then ran separately as Node services with nodemon so that they can be debugged outside of Docker.
+For the backend we run [Redis](https://redis.io/), [CouchDB](https://couchdb.apache.org/), [MinIO](https://min.io/) and [NGINX](https://www.nginx.com/) in Docker compose. This means that to develop Budibase you will need Docker and Docker compose installed. The backend services are then run separately as Node services with nodemon so that they can be debugged outside of Docker.
 
 ### Data Storage
 
@@ -162,10 +160,10 @@ When you are running locally, budibase stores data on disk using docker volumes.
 - `minio_data` 
   - App manifest, budibase client, static assets
 
-### Devlopment Modes
+### Development Modes
 
-A combination of environment variables controls the mode that budibase runs in. 
-Yarn commands can be used to mimic the different modes that budibase can be ran in
+A combination of environment variables controls the mode budibase runs in. 
+Yarn commands can be used to mimic the different modes as described in the sections below:
 
 #### Self Hosted
 The default mode. A single tenant installation with no usage restrictions. 
@@ -194,7 +192,7 @@ yarn mode:account
  An overview of the CI pipelines can be found [here](./workflows/README.md)
 ### Troubleshooting
 
-Sometimes, things go wrong. This can be due to incompatible updates on the budibase platform. To clear down your development environment and start again follow **Step 6. Cleanup**, then proceed from **Step 3. Install and Build** in the setup guide above. You should have a fresh Budibase installation.
+Sometimes, things go wrong. This can be due to incompatible updates on the budibase platform. To clear down your development environment and start again follow **Step 6. Cleanup**, then proceed from **Step 3. Install and Build** in the setup guide above to create a fresh Budibase installation.
 ### Running tests
 
 #### End-to-end Tests

From eca2fe0b50a6da9d76c94feb5a4360170581c942 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 20 Jun 2022 16:49:58 +0100
Subject: [PATCH 26/35] Include external SQL server type in schema

---
 packages/server/src/integrations/microsoftSqlServer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index a7b9906481..530e569405 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -246,6 +246,7 @@ module MSSQLModule {
             autocolumn: !!autoColumns.find((col: string) => col === name),
             name: name,
             ...convertSqlType(def.DATA_TYPE),
+            externalType: def.DATA_TYPE,
           }
         }
         tables[tableName] = {

From 48046b4b904a1dd90caab50015ceaa12672486dc Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 20 Jun 2022 17:26:35 +0100
Subject: [PATCH 27/35] Add constants for sql int max min ranges

---
 packages/frontend-core/src/constants.js    | 22 ++++++++++++++++++++++
 packages/frontend-core/src/utils/lucene.js | 20 ++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 33cf1b7d1c..3389f88325 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -63,3 +63,25 @@ export const TableNames = {
  *   - Coerce types for search endpoint
  */
 export const ApiVersion = "1"
+
+/**
+ * Maximum minimum range for SQL number values
+ */
+export const SQL_NUMBER_TYPE_RANGE_MAP = {
+  integer: {
+    max: 2147483647,
+    min: -2147483648,
+  },
+  int: {
+    max: 2147483647,
+    min: -2147483648,
+  },
+  smallint: {
+    max: 32767,
+    min: -32768,
+  },
+  mediumint: {
+    max: 8388607,
+    min: -8388608,
+  },
+}
diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
index eaf681a78b..b4759eb656 100644
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@@ -1,5 +1,5 @@
 import { Helpers } from "@budibase/bbui"
-import { OperatorOptions } from "../constants"
+import { OperatorOptions, SQL_NUMBER_TYPE_RANGE_MAP } from "../constants"
 
 /**
  * Returns the valid operator options for a certain data type
@@ -94,7 +94,7 @@ export const buildLuceneQuery = filter => {
   }
   if (Array.isArray(filter)) {
     filter.forEach(expression => {
-      let { operator, field, type, value } = expression
+      let { operator, field, type, value, externalType } = expression
       // Parse all values into correct types
       if (type === "datetime" && value) {
         value = new Date(value).toISOString()
@@ -106,16 +106,16 @@ export const buildLuceneQuery = filter => {
         value = `${value}`?.toLowerCase() === "true"
       }
       if (operator.startsWith("range")) {
+        const minint =
+          SQL_NUMBER_TYPE_RANGE_MAP[externalType]?.min ||
+          Number.MIN_SAFE_INTEGER
+        const maxint =
+          SQL_NUMBER_TYPE_RANGE_MAP[externalType]?.max ||
+          Number.MAX_SAFE_INTEGER
         if (!query.range[field]) {
           query.range[field] = {
-            low:
-              type === "number"
-                ? Number.MIN_SAFE_INTEGER
-                : "0000-00-00T00:00:00.000Z",
-            high:
-              type === "number"
-                ? Number.MAX_SAFE_INTEGER
-                : "9999-00-00T00:00:00.000Z",
+            low: type === "number" ? minint : "0000-00-00T00:00:00.000Z",
+            high: type === "number" ? maxint : "9999-00-00T00:00:00.000Z",
           }
         }
         if (operator === "rangeLow" && value != null && value !== "") {

From a39340c3261e590183625f81cf66e8fc62059fb7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 16:34:21 +0000
Subject: [PATCH 28/35] v1.0.207-alpha.4

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

diff --git a/lerna.json b/lerna.json
index a0663c0a88..63c60b8698 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bb7ba36751..68c7ad03cb 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.3",
+    "@budibase/types": "^1.0.207-alpha.4",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 028d076053..71730d6000 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.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 d912472916..1e0c30755e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.3",
-    "@budibase/client": "^1.0.207-alpha.3",
-    "@budibase/frontend-core": "^1.0.207-alpha.3",
-    "@budibase/string-templates": "^1.0.207-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.4",
+    "@budibase/client": "^1.0.207-alpha.4",
+    "@budibase/frontend-core": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.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 8262809410..72e5cc9ff7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.4",
   "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 8f68540774..facc4ae923 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.3",
-    "@budibase/frontend-core": "^1.0.207-alpha.3",
-    "@budibase/string-templates": "^1.0.207-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.4",
+    "@budibase/frontend-core": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.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 54380a2658..b7ecff50b9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.3",
+    "@budibase/bbui": "^1.0.207-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index d01d0a1a91..44fead6753 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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/types": "^1.0.207-alpha.3",
-    "@budibase/backend-core": "^1.0.207-alpha.3",
-    "@budibase/client": "^1.0.207-alpha.3",
+    "@budibase/backend-core": "^1.0.207-alpha.4",
+    "@budibase/client": "^1.0.207-alpha.4",
     "@budibase/pro": "1.0.207-alpha.3",
-    "@budibase/string-templates": "^1.0.207-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/types": "^1.0.207-alpha.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 2093698196..c28301abca 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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 d1b5f3feb4..0d6f9d2323 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.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 36c9adfe7e..e4bcecde74 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.3",
+  "version": "1.0.207-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/types": "^1.0.207-alpha.3",
-    "@budibase/backend-core": "^1.0.207-alpha.3",
+    "@budibase/backend-core": "^1.0.207-alpha.4",
     "@budibase/pro": "1.0.207-alpha.3",
-    "@budibase/string-templates": "^1.0.207-alpha.3",
+    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/types": "^1.0.207-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From d2f2f86f69ebb10274323ca01e70e5b5df546bcc Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 20 Jun 2022 16:35:50 +0000
Subject: [PATCH 29/35] Update pro version to 1.0.207-alpha.4

---
 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 44fead6753..3e39066e43 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.0.207-alpha.4",
     "@budibase/client": "^1.0.207-alpha.4",
-    "@budibase/pro": "1.0.207-alpha.3",
+    "@budibase/pro": "1.0.207-alpha.4",
     "@budibase/string-templates": "^1.0.207-alpha.4",
     "@budibase/types": "^1.0.207-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e4bcecde74..bb3878e7e8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.4",
-    "@budibase/pro": "1.0.207-alpha.3",
+    "@budibase/pro": "1.0.207-alpha.4",
     "@budibase/string-templates": "^1.0.207-alpha.4",
     "@budibase/types": "^1.0.207-alpha.4",
     "@koa/router": "8.0.8",

From b3308b09d4940a8ca2843bab6a59c6dc67baf36e Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 20 Jun 2022 17:55:11 +0100
Subject: [PATCH 30/35] Set external type of field for filter

---
 .../FilterEditor/FilterDrawer.svelte           |  3 ++-
 packages/server/yarn.lock                      | 18 +++++++++---------
 packages/worker/yarn.lock                      | 18 +++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index 95a5f54e32..aa191ce0ea 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -54,8 +54,9 @@
   }
 
   const onFieldChange = (expression, field) => {
-    // Update the field type
+    // Update the field types
     expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
+    expression.externalType = getSchema(expression)?.externalType
 
     // Ensure a valid operator is set
     const validOperators = LuceneUtils.getValidOperatorsForType(
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index b9e8eda2a1..2c61b9aa49 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,10 +1094,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.207-alpha.1":
-  version "1.0.207-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.1.tgz#7cc8e585dadbc1f10489c31bd59402f334c283b6"
-  integrity sha512-3M/rBYQP/Xy7fewrSd7msNgg37VOa+HuAGDSulokNCjoxlq/51Ks87FkWQgQOVpagtERV0WyZdH8qfFWzOqpnQ==
+"@budibase/backend-core@1.0.207-alpha.3":
+  version "1.0.207-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.3.tgz#98bced0575ec4e2b158239a8c73b39ca2d816719"
+  integrity sha512-DU4X6jJ+DfhzOv4TTa1w4Dk5ZEdlK/z1joCTruT+SGM5qI75bXrGeol5OX2OaEbNKtXFKJ1zeVTmBCYcu7OFUg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1175,12 +1175,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.207-alpha.1":
-  version "1.0.207-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.1.tgz#a8323f28e695843891eeb3225426e2a478fbd467"
-  integrity sha512-osdEwc27lUCkt7bci9wCZXeGOL45XtH4qBPIAzuRrYUvPwipzb8ro603cRpmvn9q7LN+Dt1xrF/OIlGAUUE2lQ==
+"@budibase/pro@1.0.207-alpha.3":
+  version "1.0.207-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.3.tgz#9bde845ceb685f1b43286a124620c21fdf891a01"
+  integrity sha512-WFEMujpKTVAMvAgLBnMdw8ou9PxsbM4Oa9Dq+DAUsWpPACsMWOProyHLsdRxJyvHlgGfwVjo5MEusvStjI4j6g==
   dependencies:
-    "@budibase/backend-core" "1.0.207-alpha.1"
+    "@budibase/backend-core" "1.0.207-alpha.3"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d185768dff..87208f6452 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,10 +291,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.207-alpha.1":
-  version "1.0.207-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.1.tgz#7cc8e585dadbc1f10489c31bd59402f334c283b6"
-  integrity sha512-3M/rBYQP/Xy7fewrSd7msNgg37VOa+HuAGDSulokNCjoxlq/51Ks87FkWQgQOVpagtERV0WyZdH8qfFWzOqpnQ==
+"@budibase/backend-core@1.0.207-alpha.3":
+  version "1.0.207-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.207-alpha.3.tgz#98bced0575ec4e2b158239a8c73b39ca2d816719"
+  integrity sha512-DU4X6jJ+DfhzOv4TTa1w4Dk5ZEdlK/z1joCTruT+SGM5qI75bXrGeol5OX2OaEbNKtXFKJ1zeVTmBCYcu7OFUg==
   dependencies:
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -322,12 +322,12 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.0.207-alpha.1":
-  version "1.0.207-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.1.tgz#a8323f28e695843891eeb3225426e2a478fbd467"
-  integrity sha512-osdEwc27lUCkt7bci9wCZXeGOL45XtH4qBPIAzuRrYUvPwipzb8ro603cRpmvn9q7LN+Dt1xrF/OIlGAUUE2lQ==
+"@budibase/pro@1.0.207-alpha.3":
+  version "1.0.207-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.207-alpha.3.tgz#9bde845ceb685f1b43286a124620c21fdf891a01"
+  integrity sha512-WFEMujpKTVAMvAgLBnMdw8ou9PxsbM4Oa9Dq+DAUsWpPACsMWOProyHLsdRxJyvHlgGfwVjo5MEusvStjI4j6g==
   dependencies:
-    "@budibase/backend-core" "1.0.207-alpha.1"
+    "@budibase/backend-core" "1.0.207-alpha.3"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":

From a888d9a273c35db22a3ef94af729cc006446c3ad Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 20 Jun 2022 18:08:30 +0100
Subject: [PATCH 31/35] Added external types to ds+ schemas

---
 packages/server/src/integrations/mysql.ts    | 1 +
 packages/server/src/integrations/postgres.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts
index 7a06592ef7..287817ef27 100644
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@@ -232,6 +232,7 @@ module MySQLModule {
               autocolumn: isAuto,
               constraints,
               ...convertSqlType(column.Type),
+              externalType: column.Type,
             }
           }
           if (!tables[tableName]) {
diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts
index f0c5911476..0ac55a9cd0 100644
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@@ -271,6 +271,7 @@ module PostgresModule {
             autocolumn: isAuto,
             name: columnName,
             ...convertSqlType(column.data_type),
+            externalType: column.data_type,
           }
         }
 

From a2572889e90825e55038c3a58f537ff000626881 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 21 Jun 2022 09:40:37 +0100
Subject: [PATCH 32/35] Change constant to pascal case

---
 packages/frontend-core/src/constants.js    | 2 +-
 packages/frontend-core/src/utils/lucene.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 3389f88325..9ca47de23f 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -67,7 +67,7 @@ export const ApiVersion = "1"
 /**
  * Maximum minimum range for SQL number values
  */
-export const SQL_NUMBER_TYPE_RANGE_MAP = {
+export const SqlNumberTypeRangeMap = {
   integer: {
     max: 2147483647,
     min: -2147483648,
diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
index b4759eb656..616b11b410 100644
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@@ -1,5 +1,5 @@
 import { Helpers } from "@budibase/bbui"
-import { OperatorOptions, SQL_NUMBER_TYPE_RANGE_MAP } from "../constants"
+import { OperatorOptions, SqlNumberTypeRangeMap } from "../constants"
 
 /**
  * Returns the valid operator options for a certain data type
@@ -107,10 +107,10 @@ export const buildLuceneQuery = filter => {
       }
       if (operator.startsWith("range")) {
         const minint =
-          SQL_NUMBER_TYPE_RANGE_MAP[externalType]?.min ||
+        SqlNumberTypeRangeMap[externalType]?.min ||
           Number.MIN_SAFE_INTEGER
         const maxint =
-          SQL_NUMBER_TYPE_RANGE_MAP[externalType]?.max ||
+        SqlNumberTypeRangeMap[externalType]?.max ||
           Number.MAX_SAFE_INTEGER
         if (!query.range[field]) {
           query.range[field] = {

From bb083899a03dceb1fd232c8eb2b30612f5342125 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 21 Jun 2022 09:41:08 +0100
Subject: [PATCH 33/35] prettier

---
 packages/frontend-core/src/utils/lucene.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
index 616b11b410..8f59a2bd9d 100644
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@@ -107,11 +107,9 @@ export const buildLuceneQuery = filter => {
       }
       if (operator.startsWith("range")) {
         const minint =
-        SqlNumberTypeRangeMap[externalType]?.min ||
-          Number.MIN_SAFE_INTEGER
+          SqlNumberTypeRangeMap[externalType]?.min || Number.MIN_SAFE_INTEGER
         const maxint =
-        SqlNumberTypeRangeMap[externalType]?.max ||
-          Number.MAX_SAFE_INTEGER
+          SqlNumberTypeRangeMap[externalType]?.max || Number.MAX_SAFE_INTEGER
         if (!query.range[field]) {
           query.range[field] = {
             low: type === "number" ? minint : "0000-00-00T00:00:00.000Z",

From 82e54568474a7cc555cf26730214c2d6b24f51b3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Jun 2022 09:13:16 +0000
Subject: [PATCH 34/35] v1.0.207-alpha.5

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

diff --git a/lerna.json b/lerna.json
index 63c60b8698..9efea1029b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 68c7ad03cb..015815c30e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.4",
+    "@budibase/types": "^1.0.207-alpha.5",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 71730d6000..6e3886bec2 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.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 1e0c30755e..03d6bb969e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.4",
-    "@budibase/client": "^1.0.207-alpha.4",
-    "@budibase/frontend-core": "^1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.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 72e5cc9ff7..565a2645d5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
   "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 facc4ae923..9f11f373ad 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.4",
-    "@budibase/frontend-core": "^1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.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 b7ecff50b9..339f5b747c 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 3e39066e43..c77ce59de2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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": "^1.0.207-alpha.4",
-    "@budibase/client": "^1.0.207-alpha.4",
+    "@budibase/backend-core": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.5",
     "@budibase/pro": "1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
-    "@budibase/types": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.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 c28301abca..945f7301a2 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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 0d6f9d2323..fc56fcc1f6 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.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 bb3878e7e8..b8d0e2897a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.4",
+    "@budibase/backend-core": "^1.0.207-alpha.5",
     "@budibase/pro": "1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
-    "@budibase/types": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From a476a28e7371e8e8a464dd0d17714c26e78aef29 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Jun 2022 09:14:51 +0000
Subject: [PATCH 35/35] Update pro version to 1.0.207-alpha.5

---
 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 c77ce59de2..9ad440768c 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.0.207-alpha.5",
     "@budibase/client": "^1.0.207-alpha.5",
-    "@budibase/pro": "1.0.207-alpha.4",
+    "@budibase/pro": "1.0.207-alpha.5",
     "@budibase/string-templates": "^1.0.207-alpha.5",
     "@budibase/types": "^1.0.207-alpha.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b8d0e2897a..114aeb1fd2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -35,7 +35,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.207-alpha.5",
-    "@budibase/pro": "1.0.207-alpha.4",
+    "@budibase/pro": "1.0.207-alpha.5",
     "@budibase/string-templates": "^1.0.207-alpha.5",
     "@budibase/types": "^1.0.207-alpha.5",
     "@koa/router": "8.0.8",