From 2480ae5aabf8065750cff252b8d06e96829b7d8a Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 15 Jul 2022 11:33:05 +0100
Subject: [PATCH 01/23] Merge commit

---
 .../overview/automation/HistoryTab.svelte     | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 49788ed954..09d3db6815 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Layout, Table, Select, Pagination } from "@budibase/bbui"
+  import { Layout, Table, Select, Pagination, Link } from "@budibase/bbui"
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./StatusRenderer.svelte"
   import HistoryDetailsPanel from "./HistoryDetailsPanel.svelte"
@@ -7,12 +7,17 @@
   import { createPaginationStore } from "helpers/pagination"
   import { onMount } from "svelte"
   import dayjs from "dayjs"
+  import { auth, admin } from "stores/portal"
 
   const ERROR = "error",
     SUCCESS = "success",
     STOPPED = "stopped"
   export let app
 
+  $: licensePlan = $auth.user?.license?.plan
+  $: console.log($auth.user?.license)
+  $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
+
   let pageInfo = createPaginationStore()
   let runHistory = null
   let showPanel = false
@@ -33,6 +38,20 @@
     { value: "5-m", label: "Past 5 mins" },
   ]
 
+  $: allowedTimeOptions = timeOptions.filter(option => {
+    option.value === "1-d" && licensePlan.type === "free"
+  })
+  $: console.log(allowedTimeOptions)
+
+  $: parsedOptions = timeOptions.reduce((acc, ele) => {
+    if (ele.value !== "1-d" && licensePlan.type === "free") {
+      ele = { ...ele, disabled: true }
+    }
+    acc.push(ele)
+    return acc
+  }, [])
+  $: console.log(parsedOptions)
+
   const statusOptions = [
     { value: SUCCESS, label: "Success" },
     { value: ERROR, label: "Error" },
@@ -121,6 +140,12 @@
 <div class="root" class:panelOpen={showPanel}>
   <Layout paddingX="XL" gap="S" alignContent="start">
     <div class="search">
+      {#if licensePlan.type === "free"}
+        <div>
+          Upgrade your budibase installation to unlock additional features.
+          <Link size="L" href={upgradeUrl}>Pro</Link>
+        </div>
+      {/if}
       <div class="select">
         <Select
           placeholder="All automations"
@@ -131,10 +156,10 @@
       </div>
       <div class="select">
         <Select
-          placeholder="Past 30 days"
+          placeholder={allowedTimeOptions[0]?.label}
           label="Date range"
           bind:value={timeRange}
-          options={timeOptions}
+          options={parsedOptions}
         />
       </div>
       <div class="select">

From fe4314e1680346d0849ce09bb92f6c50df8f1699 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 1 Aug 2022 15:23:41 +0100
Subject: [PATCH 02/23] Investigation edits

---
 packages/bbui/src/Form/Core/Picker.svelte     | 15 ++++
 packages/bbui/src/Form/Core/Select.svelte     |  4 +
 packages/bbui/src/Form/Select.svelte          |  4 +
 .../src/components/deploy/VersionModal.svelte |  9 ---
 .../overview/automation/HistoryTab.svelte     | 75 +++++++++++++------
 .../builder/portal/settings/upgrade.svelte    |  1 +
 6 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index cdaf00aded..3362d8f0bb 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -8,6 +8,7 @@
   import Search from "./Search.svelte"
   import Icon from "../../Icon/Icon.svelte"
   import StatusLight from "../../StatusLight/StatusLight.svelte"
+  import Badge from "../../Badge/Badge.svelte"
 
   export let id = null
   export let disabled = false
@@ -19,6 +20,8 @@
   export let placeholderOption = null
   export let options = []
   export let isOptionSelected = () => false
+  export let isOptionEnabled = () => true
+  export let getBadgeLabel = () => ""
   export let onSelectOption = () => {}
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
@@ -164,6 +167,7 @@
               aria-selected="true"
               tabindex="0"
               on:click={() => onSelectOption(getOptionValue(option, idx))}
+              class:is-disabled={!isOptionEnabled(option)}
             >
               {#if getOptionIcon(option, idx)}
                 <span class="option-extra">
@@ -175,6 +179,11 @@
                   <StatusLight square color={getOptionColour(option, idx)} />
                 </span>
               {/if}
+              {#if getBadgeLabel(option)}
+                <span class="badge-pro">
+                  <Badge grey quiet size="S">{getBadgeLabel(option)}</Badge>
+                </span>
+              {/if}
               <span class="spectrum-Menu-itemLabel">
                 {getOptionLabel(option, idx)}
               </span>
@@ -194,6 +203,9 @@
 </div>
 
 <style>
+  .badge-pro {
+    padding-right: var(--spacing-s);
+  }
   .spectrum-Popover {
     max-height: 240px;
     z-index: 999;
@@ -256,4 +268,7 @@
   .spectrum-Popover :global(.spectrum-Search .spectrum-Textfield-icon) {
     top: 9px;
   }
+  .spectrum-Menu-item.is-disabled {
+    pointer-events: none;
+  }
 </style>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index f549f58d0c..66f8882279 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -12,6 +12,8 @@
   export let getOptionValue = option => option
   export let getOptionIcon = () => null
   export let getOptionColour = () => null
+  export let isOptionEnabled
+  export let getBadgeLabel
   export let readonly = false
   export let quiet = false
   export let autoWidth = false
@@ -66,6 +68,8 @@
   {getOptionValue}
   {getOptionIcon}
   {getOptionColour}
+  {isOptionEnabled}
+  {getBadgeLabel}
   {autocomplete}
   {sort}
   isPlaceholder={value == null || value === ""}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 1b68746c5e..551f7ff3ed 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -15,6 +15,8 @@
   export let getOptionValue = option => extractProperty(option, "value")
   export let getOptionIcon = option => option?.icon
   export let getOptionColour = option => option?.colour
+  export let isOptionEnabled
+  export let getBadgeLabel
   export let quiet = false
   export let autoWidth = false
   export let sort = false
@@ -49,6 +51,8 @@
     {getOptionValue}
     {getOptionIcon}
     {getOptionColour}
+    {isOptionEnabled}
+    {getBadgeLabel}
     on:change={onChange}
     on:click
   />
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index b0f4655f1b..23d9fd83a0 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -106,12 +106,3 @@
     {/if}
   </ModalContent>
 </Modal>
-
-<style>
-  .icon-wrapper {
-    display: contents;
-  }
-  .icon-wrapper.highlight :global(svg) {
-    color: var(--spectrum-global-color-blue-600);
-  }
-</style>
diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 0159375d05..110e1e8d05 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Layout, Table, Select, Pagination, Link } from "@budibase/bbui"
+  import { Layout, Table, Select, Pagination, Banner } from "@budibase/bbui"
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./StatusRenderer.svelte"
   import HistoryDetailsPanel from "./HistoryDetailsPanel.svelte"
@@ -14,8 +14,7 @@
     STOPPED = "stopped"
   export let app
 
-  $: licensePlan = $auth.user?.license?.plan
-  $: console.log($auth.user?.license)
+  let licensePlan = $auth.user?.license?.plan
   $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
 
   let pageInfo = createPaginationStore()
@@ -38,19 +37,17 @@
     { value: "5-m", label: "Past 5 mins" },
   ]
 
-  $: allowedTimeOptions = timeOptions.filter(option => {
-    option.value === "1-d" && licensePlan.type === "free"
-  })
-  $: console.log(allowedTimeOptions)
+  const allowedFilters = ["1-d", "1-h", "15-m", "5-m"]
 
-  $: parsedOptions = timeOptions.reduce((acc, ele) => {
-    if (ele.value !== "1-d" && licensePlan.type === "free") {
-      ele = { ...ele, disabled: true }
-    }
-    acc.push(ele)
-    return acc
-  }, [])
-  $: console.log(parsedOptions)
+  let parsedOptions = timeOptions.filter(ele => {
+    return allowedFilters.indexOf(ele.value) >= 0
+  })
+
+  if (parsedOptions.length && timeRange === null) {
+    timeRange = parsedOptions[0].value
+  }
+
+  $: console.log("parsed options", parsedOptions)
 
   const statusOptions = [
     { value: SUCCESS, label: "Success" },
@@ -138,14 +135,25 @@
 </script>
 
 <div class="root" class:panelOpen={showPanel}>
+  <!-- {#if licensePlan?.type === "free"}
+    <Layout noPadding>
+      <div class="pro-banner">
+        <Banner
+          type="info"
+          showCloseButton={false}
+          extraButtonText={"Check it out!"}
+          extraButtonAction={() => {
+            window.open(upgradeUrl)
+          }}
+        >
+          24 hrs of logs currently available. Upgrade your budibase installation
+          to unlock additional features.
+        </Banner>
+      </div>
+    </Layout>
+  {/if} -->
   <Layout noPadding gap="M" alignContent="start">
     <div class="search">
-      {#if licensePlan.type === "free"}
-        <div>
-          Upgrade your budibase installation to unlock additional features.
-          <Link size="L" href={upgradeUrl}>Pro</Link>
-        </div>
-      {/if}
       <div class="select">
         <Select
           placeholder="All automations"
@@ -156,10 +164,27 @@
       </div>
       <div class="select">
         <Select
-          placeholder={allowedTimeOptions[0]?.label}
+          placeholder={parsedOptions[0]?.label}
           label="Date range"
           bind:value={timeRange}
-          options={parsedOptions}
+          options={timeOptions}
+          isOptionEnabled={x => {
+            if (licensePlan?.type === "free") {
+              return allowedFilters.indexOf(x.value) >= 0
+            }
+            return true
+          }}
+          getBadgeLabel={x => {
+            console.log("Running label change", licensePlan)
+            if (
+              licensePlan?.type === "free" &&
+              allowedFilters.indexOf(x.value) < 0
+            ) {
+              return "Pro"
+            } else {
+              return ""
+            }
+          }}
         />
       </div>
       <div class="select">
@@ -246,4 +271,8 @@
   .panelOpen {
     grid-template-columns: auto 420px;
   }
+
+  .pro-banner {
+    margin-bottom: var(--spectrum-global-dimension-static-size-300);
+  }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/settings/upgrade.svelte b/packages/builder/src/pages/builder/portal/settings/upgrade.svelte
index 5200834ffa..1b50a3bbcb 100644
--- a/packages/builder/src/pages/builder/portal/settings/upgrade.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/upgrade.svelte
@@ -71,6 +71,7 @@
   })
 </script>
 
+{"is adming" + $auth.isAdmin}
 {#if $auth.isAdmin}
   <Layout noPadding>
     <Layout gap="XS" noPadding>

From a134fa41eec41a7e201ba08b2c0c4a37fe5a4dc8 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 1 Aug 2022 17:15:46 +0100
Subject: [PATCH 03/23] Minor update to select logic and removed the sample pro
 badge behaviour

---
 packages/bbui/src/Form/Core/Picker.svelte     |  7 ---
 packages/bbui/src/Form/Core/Select.svelte     |  2 -
 packages/bbui/src/Form/Select.svelte          |  2 -
 .../overview/automation/HistoryTab.svelte     | 45 +++----------------
 4 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 3362d8f0bb..2bd10309f9 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -8,7 +8,6 @@
   import Search from "./Search.svelte"
   import Icon from "../../Icon/Icon.svelte"
   import StatusLight from "../../StatusLight/StatusLight.svelte"
-  import Badge from "../../Badge/Badge.svelte"
 
   export let id = null
   export let disabled = false
@@ -21,7 +20,6 @@
   export let options = []
   export let isOptionSelected = () => false
   export let isOptionEnabled = () => true
-  export let getBadgeLabel = () => ""
   export let onSelectOption = () => {}
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
@@ -179,11 +177,6 @@
                   <StatusLight square color={getOptionColour(option, idx)} />
                 </span>
               {/if}
-              {#if getBadgeLabel(option)}
-                <span class="badge-pro">
-                  <Badge grey quiet size="S">{getBadgeLabel(option)}</Badge>
-                </span>
-              {/if}
               <span class="spectrum-Menu-itemLabel">
                 {getOptionLabel(option, idx)}
               </span>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 66f8882279..3e15b7f6ef 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -13,7 +13,6 @@
   export let getOptionIcon = () => null
   export let getOptionColour = () => null
   export let isOptionEnabled
-  export let getBadgeLabel
   export let readonly = false
   export let quiet = false
   export let autoWidth = false
@@ -69,7 +68,6 @@
   {getOptionIcon}
   {getOptionColour}
   {isOptionEnabled}
-  {getBadgeLabel}
   {autocomplete}
   {sort}
   isPlaceholder={value == null || value === ""}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 551f7ff3ed..69126e648d 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -16,7 +16,6 @@
   export let getOptionIcon = option => option?.icon
   export let getOptionColour = option => option?.colour
   export let isOptionEnabled
-  export let getBadgeLabel
   export let quiet = false
   export let autoWidth = false
   export let sort = false
@@ -52,7 +51,6 @@
     {getOptionIcon}
     {getOptionColour}
     {isOptionEnabled}
-    {getBadgeLabel}
     on:change={onChange}
     on:click
   />
diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 110e1e8d05..343c9e8f13 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -14,7 +14,7 @@
     STOPPED = "stopped"
   export let app
 
-  let licensePlan = $auth.user?.license?.plan
+  $: licensePlan = $auth.user?.license?.plan
   $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
 
   let pageInfo = createPaginationStore()
@@ -28,6 +28,7 @@
 
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
+  $: cloudHosted = !$admin.cloud
 
   const timeOptions = [
     { value: "1-w", label: "Past week" },
@@ -37,18 +38,14 @@
     { value: "5-m", label: "Past 5 mins" },
   ]
 
-  const allowedFilters = ["1-d", "1-h", "15-m", "5-m"]
-
-  let parsedOptions = timeOptions.filter(ele => {
-    return allowedFilters.indexOf(ele.value) >= 0
+  $: parsedOptions = timeOptions.filter(ele => {
+    return !cloudHosted || (licensePlan?.type === "free" && "1-w" !== ele.value)
   })
 
-  if (parsedOptions.length && timeRange === null) {
+  $: if (parsedOptions.length && timeRange === null) {
     timeRange = parsedOptions[0].value
   }
 
-  $: console.log("parsed options", parsedOptions)
-
   const statusOptions = [
     { value: SUCCESS, label: "Success" },
     { value: ERROR, label: "Error" },
@@ -135,23 +132,6 @@
 </script>
 
 <div class="root" class:panelOpen={showPanel}>
-  <!-- {#if licensePlan?.type === "free"}
-    <Layout noPadding>
-      <div class="pro-banner">
-        <Banner
-          type="info"
-          showCloseButton={false}
-          extraButtonText={"Check it out!"}
-          extraButtonAction={() => {
-            window.open(upgradeUrl)
-          }}
-        >
-          24 hrs of logs currently available. Upgrade your budibase installation
-          to unlock additional features.
-        </Banner>
-      </div>
-    </Layout>
-  {/if} -->
   <Layout noPadding gap="M" alignContent="start">
     <div class="search">
       <div class="select">
@@ -169,22 +149,11 @@
           bind:value={timeRange}
           options={timeOptions}
           isOptionEnabled={x => {
-            if (licensePlan?.type === "free") {
-              return allowedFilters.indexOf(x.value) >= 0
+            if (cloudHosted) {
+              return licensePlan?.type === "free" && "1-w" !== x.value
             }
             return true
           }}
-          getBadgeLabel={x => {
-            console.log("Running label change", licensePlan)
-            if (
-              licensePlan?.type === "free" &&
-              allowedFilters.indexOf(x.value) < 0
-            ) {
-              return "Pro"
-            } else {
-              return ""
-            }
-          }}
         />
       </div>
       <div class="select">

From a1e16428b57e6fd9e4dca3a1a5eff2a777ba72a5 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 2 Aug 2022 09:06:35 +0100
Subject: [PATCH 04/23] Linting and tidying

---
 packages/bbui/src/Form/Core/Picker.svelte                 | 3 ---
 .../portal/overview/automation/HistoryTab.svelte          | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 2bd10309f9..d80ca98153 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -196,9 +196,6 @@
 </div>
 
 <style>
-  .badge-pro {
-    padding-right: var(--spacing-s);
-  }
   .spectrum-Popover {
     max-height: 240px;
     z-index: 999;
diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 343c9e8f13..d400658e3b 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Layout, Table, Select, Pagination, Banner } from "@budibase/bbui"
+  import { Layout, Table, Select, Pagination } from "@budibase/bbui"
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./StatusRenderer.svelte"
   import HistoryDetailsPanel from "./HistoryDetailsPanel.svelte"
@@ -15,7 +15,7 @@
   export let app
 
   $: licensePlan = $auth.user?.license?.plan
-  $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
+  // $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
 
   let pageInfo = createPaginationStore()
   let runHistory = null
@@ -240,8 +240,4 @@
   .panelOpen {
     grid-template-columns: auto 420px;
   }
-
-  .pro-banner {
-    margin-bottom: var(--spectrum-global-dimension-static-size-300);
-  }
 </style>

From e97c0d15b006baee10bd3cb56e824505f0773057 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 3 Aug 2022 15:43:10 +0100
Subject: [PATCH 05/23] Updated Pro upgrade flow

---
 .../overview/automation/HistoryTab.svelte     | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index d400658e3b..439023cc2f 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Layout, Table, Select, Pagination } from "@budibase/bbui"
+  import { Layout, Table, Select, Pagination, Button } from "@budibase/bbui"
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./StatusRenderer.svelte"
   import HistoryDetailsPanel from "./HistoryDetailsPanel.svelte"
@@ -15,7 +15,7 @@
   export let app
 
   $: licensePlan = $auth.user?.license?.plan
-  // $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
+  $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
 
   let pageInfo = createPaginationStore()
   let runHistory = null
@@ -28,7 +28,7 @@
 
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
-  $: cloudHosted = !$admin.cloud
+  $: cloudHosted = $admin.cloud
 
   const timeOptions = [
     { value: "1-w", label: "Past week" },
@@ -164,6 +164,18 @@
           options={statusOptions}
         />
       </div>
+      {#if cloudHosted && licensePlan?.type === "free"}
+        <div class="pro-upgrade">
+          <div class="pro-copy">Store up to 30 days of automations</div>
+          <Button
+            primary
+            newStyles
+            on:click={window.open(upgradeUrl, "_blank")}
+          >
+            Upgrade
+          </Button>
+        </div>
+      {/if}
     </div>
     {#if runHistory}
       <div>
@@ -240,4 +252,15 @@
   .panelOpen {
     grid-template-columns: auto 420px;
   }
+
+  .pro-upgrade {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+  }
+
+  .pro-copy {
+    margin-right: var(--spacing-l);
+  }
 </style>

From 5c29b57c0fabb31ec1f8bb2d896ec378ccdc81f5 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 3 Aug 2022 16:06:39 +0100
Subject: [PATCH 06/23] Removed forced default behaviour for date range

---
 .../portal/overview/automation/HistoryTab.svelte       | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 439023cc2f..fd584e4abd 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -38,14 +38,6 @@
     { value: "5-m", label: "Past 5 mins" },
   ]
 
-  $: parsedOptions = timeOptions.filter(ele => {
-    return !cloudHosted || (licensePlan?.type === "free" && "1-w" !== ele.value)
-  })
-
-  $: if (parsedOptions.length && timeRange === null) {
-    timeRange = parsedOptions[0].value
-  }
-
   const statusOptions = [
     { value: SUCCESS, label: "Success" },
     { value: ERROR, label: "Error" },
@@ -144,7 +136,7 @@
       </div>
       <div class="select">
         <Select
-          placeholder={parsedOptions[0]?.label}
+          placeholder="All"
           label="Date range"
           bind:value={timeRange}
           options={timeOptions}

From bf2d3f13b4d713565f18a3da8f89ce0a2a8cc3ed Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 21 Sep 2022 13:18:04 +0100
Subject: [PATCH 07/23] Don't show validation error for relationship

---
 .../components/backend/DataTable/modals/CreateEditColumn.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 21059b32dd..3fd38bddeb 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -314,7 +314,7 @@
       const relatedTable = $tables.list.find(
         tbl => tbl._id === fieldInfo.tableId
       )
-      if (inUse(relatedTable, fieldInfo.fieldName)) {
+      if (inUse(relatedTable, fieldInfo.fieldName) && !originalName) {
         newError.relatedName = `Column name already in use in table ${relatedTable.name}`
       }
     }

From 6763dc391473ffac0b5ece558e33da743669ba13 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 28 Sep 2022 12:17:00 +0100
Subject: [PATCH 08/23] Use new licensing feature flag to gate off the
 filtering behaviour.

---
 .../portal/overview/automation/HistoryTab.svelte      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index fd584e4abd..165949b7b0 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -8,6 +8,7 @@
   import { onMount } from "svelte"
   import dayjs from "dayjs"
   import { auth, admin } from "stores/portal"
+  import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
 
   const ERROR = "error",
     SUCCESS = "success",
@@ -28,7 +29,6 @@
 
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
-  $: cloudHosted = $admin.cloud
 
   const timeOptions = [
     { value: "1-w", label: "Past week" },
@@ -141,8 +141,11 @@
           bind:value={timeRange}
           options={timeOptions}
           isOptionEnabled={x => {
-            if (cloudHosted) {
-              return licensePlan?.type === "free" && "1-w" !== x.value
+            if (
+              isEnabled(TENANT_FEATURE_FLAGS.LICENSING) &&
+              licensePlan?.type === "free"
+            ) {
+              return "1-w" !== x.value
             }
             return true
           }}
@@ -156,7 +159,7 @@
           options={statusOptions}
         />
       </div>
-      {#if cloudHosted && licensePlan?.type === "free"}
+      {#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && licensePlan?.type === "free"}
         <div class="pro-upgrade">
           <div class="pro-copy">Store up to 30 days of automations</div>
           <Button

From 225f000b2a5e6fe94e73fe94bfd571bb7be4131b Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 29 Sep 2022 09:17:22 +0100
Subject: [PATCH 09/23] Centralised licensing types to frontend-core contants.
 Some minor refactoring

---
 .../overview/automation/HistoryTab.svelte     | 28 +++++++++----------
 packages/builder/src/constants/index.js       |  7 -----
 .../builder/portal/settings/usage.svelte      |  6 ++--
 packages/client/src/licensing/constants.js    |  7 -----
 packages/client/src/licensing/utils.js        |  4 +--
 packages/frontend-core/src/constants.js       |  1 +
 6 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 packages/client/src/licensing/constants.js

diff --git a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
index 165949b7b0..bd32e423c9 100644
--- a/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
+++ b/packages/builder/src/components/portal/overview/automation/HistoryTab.svelte
@@ -7,8 +7,8 @@
   import { createPaginationStore } from "helpers/pagination"
   import { onMount } from "svelte"
   import dayjs from "dayjs"
-  import { auth, admin } from "stores/portal"
-  import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
+  import { auth, licensing, admin } from "stores/portal"
+  import { Constants } from "@budibase/frontend-core"
 
   const ERROR = "error",
     SUCCESS = "success",
@@ -16,7 +16,6 @@
   export let app
 
   $: licensePlan = $auth.user?.license?.plan
-  $: upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
 
   let pageInfo = createPaginationStore()
   let runHistory = null
@@ -31,6 +30,8 @@
   $: fetchLogs(automationId, status, page, timeRange)
 
   const timeOptions = [
+    { value: "90-d", label: "Past 90 days" },
+    { value: "30-d", label: "Past 30 days" },
     { value: "1-w", label: "Past week" },
     { value: "1-d", label: "Past day" },
     { value: "1-h", label: "Past 1 hour" },
@@ -141,11 +142,12 @@
           bind:value={timeRange}
           options={timeOptions}
           isOptionEnabled={x => {
-            if (
-              isEnabled(TENANT_FEATURE_FLAGS.LICENSING) &&
-              licensePlan?.type === "free"
-            ) {
-              return "1-w" !== x.value
+            if (licensePlan?.type === Constants.PlanType.FREE) {
+              return ["1-w", "30-d", "90-d"].indexOf(x.value) < 0
+            } else if (licensePlan?.type === Constants.PlanType.TEAM) {
+              return ["90-d"].indexOf(x.value) < 0
+            } else if (licensePlan?.type === Constants.PlanType.PRO) {
+              return ["30-d", "90-d"].indexOf(x.value) < 0
             }
             return true
           }}
@@ -159,14 +161,10 @@
           options={statusOptions}
         />
       </div>
-      {#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && licensePlan?.type === "free"}
+      {#if (licensePlan?.type !== Constants.PlanType.ENTERPRISE && $auth.user.accountPortalAccess) || !$admin.cloud}
         <div class="pro-upgrade">
-          <div class="pro-copy">Store up to 30 days of automations</div>
-          <Button
-            primary
-            newStyles
-            on:click={window.open(upgradeUrl, "_blank")}
-          >
+          <div class="pro-copy">Expand your automation log history</div>
+          <Button primary newStyles on:click={$licensing.goToUpgradePage()}>
             Upgrade
           </Button>
         </div>
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index 49054ae247..151a0cdf8d 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -58,13 +58,6 @@ export const DefaultAppTheme = {
   navTextColor: "var(--spectrum-global-color-gray-800)",
 }
 
-export const PlanType = {
-  FREE: "free",
-  PRO: "pro",
-  BUSINESS: "business",
-  ENTERPRISE: "enterprise",
-}
-
 export const PluginSource = {
   URL: "URL",
   NPM: "NPM",
diff --git a/packages/builder/src/pages/builder/portal/settings/usage.svelte b/packages/builder/src/pages/builder/portal/settings/usage.svelte
index 75ceccc0a3..7609a4742e 100644
--- a/packages/builder/src/pages/builder/portal/settings/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/usage.svelte
@@ -11,7 +11,7 @@
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { admin, auth, licensing } from "../../../../stores/portal"
-  import { PlanType } from "../../../../constants"
+  import { Constants } from "@budibase/frontend-core"
   import { DashCard, Usage } from "../../../../components/usage"
 
   let staticUsage = []
@@ -125,7 +125,7 @@
   }
 
   const goToAccountPortal = () => {
-    if (license?.plan.type === PlanType.FREE) {
+    if (license?.plan.type === Constants.PlanType.FREE) {
       window.location.href = upgradeUrl
     } else {
       window.location.href = manageUrl
@@ -133,7 +133,7 @@
   }
 
   const setPrimaryActionText = () => {
-    if (license?.plan.type === PlanType.FREE) {
+    if (license?.plan.type === Constants.PlanType.FREE) {
       primaryActionText = "Upgrade"
       return
     }
diff --git a/packages/client/src/licensing/constants.js b/packages/client/src/licensing/constants.js
deleted file mode 100644
index 57454bc37a..0000000000
--- a/packages/client/src/licensing/constants.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const PlanType = {
-  FREE: "free",
-  PRO: "pro",
-  TEAM: "team",
-  BUSINESS: "business",
-  ENTERPRISE: "enterprise",
-}
diff --git a/packages/client/src/licensing/utils.js b/packages/client/src/licensing/utils.js
index efe1839ecb..effed6867f 100644
--- a/packages/client/src/licensing/utils.js
+++ b/packages/client/src/licensing/utils.js
@@ -1,6 +1,6 @@
 import { authStore } from "../stores/auth.js"
 import { get } from "svelte/store"
-import { PlanType } from "./constants"
+import { Constants } from "@budibase/frontend-core"
 
 const getLicense = () => {
   const user = get(authStore)
@@ -12,7 +12,7 @@ const getLicense = () => {
 export const isFreePlan = () => {
   const license = getLicense()
   if (license) {
-    return license.plan.type === PlanType.FREE
+    return license.plan.type === Constants.PlanType.FREE
   } else {
     // safety net - no license means free plan
     return true
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 633534dddb..af350ff333 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -98,6 +98,7 @@ export const BuilderRoleDescriptions = [
 export const PlanType = {
   FREE: "free",
   TEAM: "team",
+  PRO: "pro",
   BUSINESS: "business",
   ENTERPRISE: "enterprise",
 }

From d9a33e52cf6834e220ec5deb489c737acd3bf697 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Fri, 30 Sep 2022 11:43:42 +0100
Subject: [PATCH 10/23] AAS enable app service storage

---
 hosting/single/runner.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/single/runner.sh b/hosting/single/runner.sh
index cf82e6701b..151ee7026d 100644
--- a/hosting/single/runner.sh
+++ b/hosting/single/runner.sh
@@ -19,6 +19,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 # Azure App Service customisations
 if [[ "${TARGETBUILD}" = "aas" ]]; then
     DATA_DIR=/home
+    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
     /etc/init.d/ssh start
 else
     DATA_DIR=${DATA_DIR:-/data}

From 6d3b4c3ccc4e50937e45a94ce7d7ddc263b1bea2 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Fri, 30 Sep 2022 11:47:01 +0100
Subject: [PATCH 11/23] AAS enable app service storage

---
 hosting/scripts/build-target-paths.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/scripts/build-target-paths.sh b/hosting/scripts/build-target-paths.sh
index c974d9a304..67e1765ca8 100644
--- a/hosting/scripts/build-target-paths.sh
+++ b/hosting/scripts/build-target-paths.sh
@@ -4,6 +4,7 @@ echo ${TARGETBUILD} > /buildtarget.txt
 if [[ "${TARGETBUILD}" = "aas" ]]; then
     # Azure AppService uses /home for persisent data & SSH on port 2222
     DATA_DIR=/home
+    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
     mkdir -p $DATA_DIR/{search,minio,couch}
     mkdir -p $DATA_DIR/couch/{dbs,views}
     chown -R couchdb:couchdb $DATA_DIR/couch/

From a8908cef6adde89b73cf38fba8ce8745c4d535c9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 3 Oct 2022 09:38:54 +0000
Subject: [PATCH 12/23] Update pro version to 2.0.14-alpha.1

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 1997a3e1aa..b25bf04788 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.14-alpha.1",
     "@budibase/client": "2.0.14-alpha.1",
-    "@budibase/pro": "2.0.14-alpha.0",
+    "@budibase/pro": "2.0.14-alpha.1",
     "@budibase/string-templates": "2.0.14-alpha.1",
     "@budibase/types": "2.0.14-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 1a8387e615..4e7f4f4863 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.0.tgz#e4115967c9e37147216376bbabd622a9a13403d4"
-  integrity sha512-igWtifz/AFZx3kbQi7yO+dRDQX7mbY/ZCA2aRhmDIlhm3zky94XgFyG/7iPFmxh9jK+gpg1Sg3axY7vNDSX6+Q==
+"@budibase/backend-core@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.1.tgz#b48525f9559f99b7b02b829d3f893dbb92fb9e2e"
+  integrity sha512-7fP66cLu6+4/IFjgdrfMU2OH6fFwsfwxZuU8FsPYv0WMNh+nRaPsIaQsy/NRk1/I5mXj8IB3IUYoh3jIfpGgVg==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.0"
+    "@budibase/types" "2.0.14-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.0.tgz#e6cb571a0a757871e9ab65555470e2c9f4fc4403"
-  integrity sha512-Qh0U89AfnIpBA9fE4xH8hXYp4HexYSoc6WDjlVuNI46IvGRlHaeBAsRkI8XYG8mx830fQqVeEIY1WuRUso7bOg==
+"@budibase/pro@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.1.tgz#f9350ee5e176bf7e6d6017835a4b0513a986474f"
+  integrity sha512-GC4qPx80ZoEMlOfpPSChDtdAikG906SS48PdDBP/GiPu8n4yruKYElHQGFRPJ2D3EueEMU76VhJw453FezOuIA==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.0"
-    "@budibase/types" "2.0.14-alpha.0"
+    "@budibase/backend-core" "2.0.14-alpha.1"
+    "@budibase/types" "2.0.14-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.0.tgz#419ceefde9698b1918c1b41f90fc3010927acde7"
-  integrity sha512-20+VfYR9oIui3PDExL+3Ld0XWkrbD74CfWHS8+dYiRmW/PqUkhAT0suwpNui5OsVUn1I+9Jw0wvbitpgT5u2VQ==
+"@budibase/types@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.1.tgz#3fbf97893e211b2b6c921ea14103771a897615d8"
+  integrity sha512-llu2UVPU5bJn1Z4oJdst632Kxd5fLi5Ckm+GZ++7EW9Q50KuAET4nLvctFkzbBSWNE8qtIzhIODMLSuRB1MkOA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index eabd12d324..5475853ecc 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.14-alpha.1",
-    "@budibase/pro": "2.0.14-alpha.0",
+    "@budibase/pro": "2.0.14-alpha.1",
     "@budibase/string-templates": "2.0.14-alpha.1",
     "@budibase/types": "2.0.14-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b159a452b9..5dab488ecf 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.0.tgz#e4115967c9e37147216376bbabd622a9a13403d4"
-  integrity sha512-igWtifz/AFZx3kbQi7yO+dRDQX7mbY/ZCA2aRhmDIlhm3zky94XgFyG/7iPFmxh9jK+gpg1Sg3axY7vNDSX6+Q==
+"@budibase/backend-core@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.1.tgz#b48525f9559f99b7b02b829d3f893dbb92fb9e2e"
+  integrity sha512-7fP66cLu6+4/IFjgdrfMU2OH6fFwsfwxZuU8FsPYv0WMNh+nRaPsIaQsy/NRk1/I5mXj8IB3IUYoh3jIfpGgVg==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.0"
+    "@budibase/types" "2.0.14-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.0.tgz#e6cb571a0a757871e9ab65555470e2c9f4fc4403"
-  integrity sha512-Qh0U89AfnIpBA9fE4xH8hXYp4HexYSoc6WDjlVuNI46IvGRlHaeBAsRkI8XYG8mx830fQqVeEIY1WuRUso7bOg==
+"@budibase/pro@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.1.tgz#f9350ee5e176bf7e6d6017835a4b0513a986474f"
+  integrity sha512-GC4qPx80ZoEMlOfpPSChDtdAikG906SS48PdDBP/GiPu8n4yruKYElHQGFRPJ2D3EueEMU76VhJw453FezOuIA==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.0"
-    "@budibase/types" "2.0.14-alpha.0"
+    "@budibase/backend-core" "2.0.14-alpha.1"
+    "@budibase/types" "2.0.14-alpha.1"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.14-alpha.0":
-  version "2.0.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.0.tgz#419ceefde9698b1918c1b41f90fc3010927acde7"
-  integrity sha512-20+VfYR9oIui3PDExL+3Ld0XWkrbD74CfWHS8+dYiRmW/PqUkhAT0suwpNui5OsVUn1I+9Jw0wvbitpgT5u2VQ==
+"@budibase/types@2.0.14-alpha.1":
+  version "2.0.14-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.1.tgz#3fbf97893e211b2b6c921ea14103771a897615d8"
+  integrity sha512-llu2UVPU5bJn1Z4oJdst632Kxd5fLi5Ckm+GZ++7EW9Q50KuAET4nLvctFkzbBSWNE8qtIzhIODMLSuRB1MkOA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 7f233038acf2170b851340eaaba02741d79b81c1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 3 Oct 2022 10:01:53 +0000
Subject: [PATCH 13/23] v2.0.14-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              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 69a8cb66a4..4e08b98680 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 7ab82fcd60..75cd8ff374 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.14-alpha.1",
+    "@budibase/types": "2.0.14-alpha.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d5557bc3c5..ebbdbdd49a 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-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": "2.0.14-alpha.1",
+    "@budibase/string-templates": "2.0.14-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 631b1988ad..3d05114a82 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.14-alpha.1",
-    "@budibase/client": "2.0.14-alpha.1",
-    "@budibase/frontend-core": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.1",
+    "@budibase/bbui": "2.0.14-alpha.2",
+    "@budibase/client": "2.0.14-alpha.2",
+    "@budibase/frontend-core": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-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 6f094416f8..4921e9a3e9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.1",
-    "@budibase/types": "2.0.14-alpha.1",
+    "@budibase/backend-core": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-alpha.2",
+    "@budibase/types": "2.0.14-alpha.2",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 86ba8c5088..1e2049ac27 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-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": "2.0.14-alpha.1",
-    "@budibase/frontend-core": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.1",
+    "@budibase/bbui": "2.0.14-alpha.2",
+    "@budibase/frontend-core": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-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 b98282b9bd..0fbbb1c471 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-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": "2.0.14-alpha.1",
+    "@budibase/bbui": "2.0.14-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 992b391dea..4a3e0080f5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b25bf04788..fa1839ec11 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.14-alpha.1",
-    "@budibase/client": "2.0.14-alpha.1",
+    "@budibase/backend-core": "2.0.14-alpha.2",
+    "@budibase/client": "2.0.14-alpha.2",
     "@budibase/pro": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.1",
-    "@budibase/types": "2.0.14-alpha.1",
+    "@budibase/string-templates": "2.0.14-alpha.2",
+    "@budibase/types": "2.0.14-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 415fe4d9f5..a51978e10c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-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 c7105f984f..81adf125fb 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-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 5475853ecc..192d839878 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.1",
+  "version": "2.0.14-alpha.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.1",
+    "@budibase/backend-core": "2.0.14-alpha.2",
     "@budibase/pro": "2.0.14-alpha.1",
-    "@budibase/string-templates": "2.0.14-alpha.1",
-    "@budibase/types": "2.0.14-alpha.1",
+    "@budibase/string-templates": "2.0.14-alpha.2",
+    "@budibase/types": "2.0.14-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From fe619cbe09784ec37f207e0ac6be4f90b4e2b4b8 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 3 Oct 2022 10:04:59 +0000
Subject: [PATCH 14/23] Update pro version to 2.0.14-alpha.2

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

diff --git a/packages/server/package.json b/packages/server/package.json
index fa1839ec11..759cc502b0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.14-alpha.2",
     "@budibase/client": "2.0.14-alpha.2",
-    "@budibase/pro": "2.0.14-alpha.1",
+    "@budibase/pro": "2.0.14-alpha.2",
     "@budibase/string-templates": "2.0.14-alpha.2",
     "@budibase/types": "2.0.14-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4e7f4f4863..1995459efe 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.1.tgz#b48525f9559f99b7b02b829d3f893dbb92fb9e2e"
-  integrity sha512-7fP66cLu6+4/IFjgdrfMU2OH6fFwsfwxZuU8FsPYv0WMNh+nRaPsIaQsy/NRk1/I5mXj8IB3IUYoh3jIfpGgVg==
+"@budibase/backend-core@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.2.tgz#0e0cdcbf441be61850c9b21c9a707d1ddf6ae3e6"
+  integrity sha512-2OkcMoHpYyzpMzOWeeGWYo0fSDwppYlAutcH3r9cYJM/w4XWT282UBK5d7fqSuIEq8IIQQlCQxrazvzWq1qidg==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.1"
+    "@budibase/types" "2.0.14-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.1.tgz#f9350ee5e176bf7e6d6017835a4b0513a986474f"
-  integrity sha512-GC4qPx80ZoEMlOfpPSChDtdAikG906SS48PdDBP/GiPu8n4yruKYElHQGFRPJ2D3EueEMU76VhJw453FezOuIA==
+"@budibase/pro@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.2.tgz#71e8c6e3c34af4ff4b7d084e5210c9840f5e1581"
+  integrity sha512-pbzx07HYgmxjjeqcPvkqp2fiT6Gb8OCXAHVycbm38H1OG0dQg+KLkEJcXk+uhGsY6AJ1tzJ5HH+4Rbw6SE0Nng==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.1"
-    "@budibase/types" "2.0.14-alpha.1"
+    "@budibase/backend-core" "2.0.14-alpha.2"
+    "@budibase/types" "2.0.14-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.1.tgz#3fbf97893e211b2b6c921ea14103771a897615d8"
-  integrity sha512-llu2UVPU5bJn1Z4oJdst632Kxd5fLi5Ckm+GZ++7EW9Q50KuAET4nLvctFkzbBSWNE8qtIzhIODMLSuRB1MkOA==
+"@budibase/types@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.2.tgz#4b0da2cc6950cc1d6f3248e8414275d232e68db8"
+  integrity sha512-6GTPhcNCAgKD58CnixIKKLGbIAMzl7LWRSgQbUwrac6DT7gKU1tEP9x43gDfUhVDpXe1aLNi6f27rbFQbel3Pw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 192d839878..677880312a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.14-alpha.2",
-    "@budibase/pro": "2.0.14-alpha.1",
+    "@budibase/pro": "2.0.14-alpha.2",
     "@budibase/string-templates": "2.0.14-alpha.2",
     "@budibase/types": "2.0.14-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5dab488ecf..a4384fc329 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.1.tgz#b48525f9559f99b7b02b829d3f893dbb92fb9e2e"
-  integrity sha512-7fP66cLu6+4/IFjgdrfMU2OH6fFwsfwxZuU8FsPYv0WMNh+nRaPsIaQsy/NRk1/I5mXj8IB3IUYoh3jIfpGgVg==
+"@budibase/backend-core@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.2.tgz#0e0cdcbf441be61850c9b21c9a707d1ddf6ae3e6"
+  integrity sha512-2OkcMoHpYyzpMzOWeeGWYo0fSDwppYlAutcH3r9cYJM/w4XWT282UBK5d7fqSuIEq8IIQQlCQxrazvzWq1qidg==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.1"
+    "@budibase/types" "2.0.14-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.1.tgz#f9350ee5e176bf7e6d6017835a4b0513a986474f"
-  integrity sha512-GC4qPx80ZoEMlOfpPSChDtdAikG906SS48PdDBP/GiPu8n4yruKYElHQGFRPJ2D3EueEMU76VhJw453FezOuIA==
+"@budibase/pro@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.2.tgz#71e8c6e3c34af4ff4b7d084e5210c9840f5e1581"
+  integrity sha512-pbzx07HYgmxjjeqcPvkqp2fiT6Gb8OCXAHVycbm38H1OG0dQg+KLkEJcXk+uhGsY6AJ1tzJ5HH+4Rbw6SE0Nng==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.1"
-    "@budibase/types" "2.0.14-alpha.1"
+    "@budibase/backend-core" "2.0.14-alpha.2"
+    "@budibase/types" "2.0.14-alpha.2"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.14-alpha.1":
-  version "2.0.14-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.1.tgz#3fbf97893e211b2b6c921ea14103771a897615d8"
-  integrity sha512-llu2UVPU5bJn1Z4oJdst632Kxd5fLi5Ckm+GZ++7EW9Q50KuAET4nLvctFkzbBSWNE8qtIzhIODMLSuRB1MkOA==
+"@budibase/types@2.0.14-alpha.2":
+  version "2.0.14-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.2.tgz#4b0da2cc6950cc1d6f3248e8414275d232e68db8"
+  integrity sha512-6GTPhcNCAgKD58CnixIKKLGbIAMzl7LWRSgQbUwrac6DT7gKU1tEP9x43gDfUhVDpXe1aLNi6f27rbFQbel3Pw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 4ad00d45f83fbf1158a21ab6aeae74ce577c544e Mon Sep 17 00:00:00 2001
From: rosnerdev <83503879+rosnerdev@users.noreply.github.com>
Date: Tue, 4 Oct 2022 12:18:04 +0300
Subject: [PATCH 15/23] Update exec.js

I had an issue where the datasource plugin wouldn't work because of node engine incompatibility, and after a quick search on google I found that --ignore-engines is the option to use for ignoring this kind of error and it worked! So I want to make this a built-in feature so there's no need for me to manually do this.
---
 packages/cli/src/exec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/exec.js b/packages/cli/src/exec.js
index 72fd8e00eb..4df486aed6 100644
--- a/packages/cli/src/exec.js
+++ b/packages/cli/src/exec.js
@@ -22,6 +22,6 @@ exports.runPkgCommand = async (command, dir = "./") => {
     throw new Error("Must have yarn or npm installed to run build.")
   }
   const npmCmd = command === "install" ? `npm ${command}` : `npm run ${command}`
-  const cmd = yarn ? `yarn ${command}` : npmCmd
+  const cmd = yarn ? `yarn ${command} --ignore-engines` : npmCmd
   await exports.exec(cmd, dir)
 }

From 668c2584ae23364ee5b3a76c47297223a15e92c4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 4 Oct 2022 09:55:49 +0000
Subject: [PATCH 16/23] v2.0.14-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              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 4e08b98680..3730ebd344 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 75cd8ff374..a07db6fca0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "2.0.14-alpha.2",
+    "@budibase/types": "2.0.14-alpha.3",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ebbdbdd49a..7bc9cb7da6 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-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": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-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 3d05114a82..0b171e2591 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.14-alpha.2",
-    "@budibase/client": "2.0.14-alpha.2",
-    "@budibase/frontend-core": "2.0.14-alpha.2",
-    "@budibase/string-templates": "2.0.14-alpha.2",
+    "@budibase/bbui": "2.0.14-alpha.3",
+    "@budibase/client": "2.0.14-alpha.3",
+    "@budibase/frontend-core": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-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 4921e9a3e9..cc70a811f9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.2",
-    "@budibase/string-templates": "2.0.14-alpha.2",
-    "@budibase/types": "2.0.14-alpha.2",
+    "@budibase/backend-core": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-alpha.3",
+    "@budibase/types": "2.0.14-alpha.3",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 1e2049ac27..e6533daa85 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-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": "2.0.14-alpha.2",
-    "@budibase/frontend-core": "2.0.14-alpha.2",
-    "@budibase/string-templates": "2.0.14-alpha.2",
+    "@budibase/bbui": "2.0.14-alpha.3",
+    "@budibase/frontend-core": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-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 0fbbb1c471..ff68eeb5a2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-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": "2.0.14-alpha.2",
+    "@budibase/bbui": "2.0.14-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4a3e0080f5..16b053b4ed 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 759cc502b0..4a5eadeb14 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.0.14-alpha.2",
-    "@budibase/client": "2.0.14-alpha.2",
+    "@budibase/backend-core": "2.0.14-alpha.3",
+    "@budibase/client": "2.0.14-alpha.3",
     "@budibase/pro": "2.0.14-alpha.2",
-    "@budibase/string-templates": "2.0.14-alpha.2",
-    "@budibase/types": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-alpha.3",
+    "@budibase/types": "2.0.14-alpha.3",
     "@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 a51978e10c..73cff234a3 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-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 81adf125fb..5eb2a09957 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-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 677880312a..26ebed50ab 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.2",
+  "version": "2.0.14-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.2",
+    "@budibase/backend-core": "2.0.14-alpha.3",
     "@budibase/pro": "2.0.14-alpha.2",
-    "@budibase/string-templates": "2.0.14-alpha.2",
-    "@budibase/types": "2.0.14-alpha.2",
+    "@budibase/string-templates": "2.0.14-alpha.3",
+    "@budibase/types": "2.0.14-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b20ff6881bf707ce1b10602dcf84ef3066127c6d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 4 Oct 2022 09:58:51 +0000
Subject: [PATCH 17/23] Update pro version to 2.0.14-alpha.3

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 4a5eadeb14..5183f9737f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.14-alpha.3",
     "@budibase/client": "2.0.14-alpha.3",
-    "@budibase/pro": "2.0.14-alpha.2",
+    "@budibase/pro": "2.0.14-alpha.3",
     "@budibase/string-templates": "2.0.14-alpha.3",
     "@budibase/types": "2.0.14-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 1995459efe..74ec0fd8bc 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.2.tgz#0e0cdcbf441be61850c9b21c9a707d1ddf6ae3e6"
-  integrity sha512-2OkcMoHpYyzpMzOWeeGWYo0fSDwppYlAutcH3r9cYJM/w4XWT282UBK5d7fqSuIEq8IIQQlCQxrazvzWq1qidg==
+"@budibase/backend-core@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.3.tgz#ebb66e4bee8b8176802f8db9b9ee445525673af9"
+  integrity sha512-LVDVwfSa7eaGNgmh1ig3ENu5h8pOM7AWjPEcIPffY5ZWmcdiPCZYSEzePC1fC5csGv0PLwQeHHFEqEAKxDBIKQ==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.2"
+    "@budibase/types" "2.0.14-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.2.tgz#71e8c6e3c34af4ff4b7d084e5210c9840f5e1581"
-  integrity sha512-pbzx07HYgmxjjeqcPvkqp2fiT6Gb8OCXAHVycbm38H1OG0dQg+KLkEJcXk+uhGsY6AJ1tzJ5HH+4Rbw6SE0Nng==
+"@budibase/pro@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.3.tgz#0774b52deee3911e89e3f69d40693fc639d3cad8"
+  integrity sha512-X9MBpr2uwoBYjo6n/QuvPs1VBSFLqC1bJGec+5/4WRlywzNKLM6Rs2/FE3jYUDRtobAkKp1dUx9hpe3Y+wQKNQ==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.2"
-    "@budibase/types" "2.0.14-alpha.2"
+    "@budibase/backend-core" "2.0.14-alpha.3"
+    "@budibase/types" "2.0.14-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.2.tgz#4b0da2cc6950cc1d6f3248e8414275d232e68db8"
-  integrity sha512-6GTPhcNCAgKD58CnixIKKLGbIAMzl7LWRSgQbUwrac6DT7gKU1tEP9x43gDfUhVDpXe1aLNi6f27rbFQbel3Pw==
+"@budibase/types@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.3.tgz#81ccde9867a15f51dd1b746f2bdeb9f6a638ebdc"
+  integrity sha512-JPrH3ilmA4Cp59ThcxqL7X3xZuA2mpu2N/2IGH1VoKW3w7RV5IM9FeH/RrrQ3ajEwHzqs53lU5+8tE/vPdGVag==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 26ebed50ab..c65c6b7676 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.14-alpha.3",
-    "@budibase/pro": "2.0.14-alpha.2",
+    "@budibase/pro": "2.0.14-alpha.3",
     "@budibase/string-templates": "2.0.14-alpha.3",
     "@budibase/types": "2.0.14-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index a4384fc329..1f8ee96254 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.2.tgz#0e0cdcbf441be61850c9b21c9a707d1ddf6ae3e6"
-  integrity sha512-2OkcMoHpYyzpMzOWeeGWYo0fSDwppYlAutcH3r9cYJM/w4XWT282UBK5d7fqSuIEq8IIQQlCQxrazvzWq1qidg==
+"@budibase/backend-core@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.3.tgz#ebb66e4bee8b8176802f8db9b9ee445525673af9"
+  integrity sha512-LVDVwfSa7eaGNgmh1ig3ENu5h8pOM7AWjPEcIPffY5ZWmcdiPCZYSEzePC1fC5csGv0PLwQeHHFEqEAKxDBIKQ==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.2"
+    "@budibase/types" "2.0.14-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.2.tgz#71e8c6e3c34af4ff4b7d084e5210c9840f5e1581"
-  integrity sha512-pbzx07HYgmxjjeqcPvkqp2fiT6Gb8OCXAHVycbm38H1OG0dQg+KLkEJcXk+uhGsY6AJ1tzJ5HH+4Rbw6SE0Nng==
+"@budibase/pro@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.3.tgz#0774b52deee3911e89e3f69d40693fc639d3cad8"
+  integrity sha512-X9MBpr2uwoBYjo6n/QuvPs1VBSFLqC1bJGec+5/4WRlywzNKLM6Rs2/FE3jYUDRtobAkKp1dUx9hpe3Y+wQKNQ==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.2"
-    "@budibase/types" "2.0.14-alpha.2"
+    "@budibase/backend-core" "2.0.14-alpha.3"
+    "@budibase/types" "2.0.14-alpha.3"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.14-alpha.2":
-  version "2.0.14-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.2.tgz#4b0da2cc6950cc1d6f3248e8414275d232e68db8"
-  integrity sha512-6GTPhcNCAgKD58CnixIKKLGbIAMzl7LWRSgQbUwrac6DT7gKU1tEP9x43gDfUhVDpXe1aLNi6f27rbFQbel3Pw==
+"@budibase/types@2.0.14-alpha.3":
+  version "2.0.14-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.3.tgz#81ccde9867a15f51dd1b746f2bdeb9f6a638ebdc"
+  integrity sha512-JPrH3ilmA4Cp59ThcxqL7X3xZuA2mpu2N/2IGH1VoKW3w7RV5IM9FeH/RrrQ3ajEwHzqs53lU5+8tE/vPdGVag==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 86bbd73bcddb0d0b5f3768e6deed98656e3a50a9 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 4 Oct 2022 10:59:53 +0100
Subject: [PATCH 18/23] Fix linting for qa-core

---
 .../TestConfiguration/InternalAPIClient.ts          |  6 ++----
 .../internal-api/TestConfiguration/applications.ts  |  8 ++------
 .../config/internal-api/TestConfiguration/auth.ts   |  6 +++---
 .../config/internal-api/fixtures/applications.ts    |  9 ++++-----
 .../tests/internal-api/applications/create.spec.ts  | 13 +++++++------
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts b/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
index bfcbb9f4e2..dafc2b1ff2 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts
@@ -16,9 +16,7 @@ class InternalAPIClient {
 
   constructor(appId?: string) {
     if (!env.BUDIBASE_SERVER_URL) {
-      throw new Error(
-        "Must set BUDIBASE_SERVER_URL env var"
-      )
+      throw new Error("Must set BUDIBASE_SERVER_URL env var")
     }
     this.host = `${env.BUDIBASE_SERVER_URL}/api`
     this.appId = appId
@@ -55,4 +53,4 @@ class InternalAPIClient {
   put = this.apiCall("PUT")
 }
 
-export default InternalAPIClient
\ No newline at end of file
+export default InternalAPIClient
diff --git a/qa-core/src/config/internal-api/TestConfiguration/applications.ts b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
index 10e4a6657b..0c51487122 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/applications.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/applications.ts
@@ -1,6 +1,4 @@
-import {
-  Application,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { Application } from "@budibase/server/api/controllers/public/mapping/types"
 import { App } from "@budibase/types"
 import { Response } from "node-fetch"
 import InternalAPIClient from "./InternalAPIClient"
@@ -37,9 +35,7 @@ export default class AppApi {
     return [response, json]
   }
 
-  async create(
-    body: any
-  ): Promise<[Response, Partial<App>]> {
+  async create(body: any): Promise<[Response, Partial<App>]> {
     const response = await this.api.post(`/applications`, { body })
     const json = await response.json()
     return [response, json]
diff --git a/qa-core/src/config/internal-api/TestConfiguration/auth.ts b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
index 6ac53f24b6..d83c859ab3 100644
--- a/qa-core/src/config/internal-api/TestConfiguration/auth.ts
+++ b/qa-core/src/config/internal-api/TestConfiguration/auth.ts
@@ -9,11 +9,11 @@ export default class AuthApi {
   }
 
   async login(): Promise<[Response, any]> {
-    const response = await this.api.post(`/global/auth/default/login`, { 
+    const response = await this.api.post(`/global/auth/default/login`, {
       body: {
         username: process.env.BB_ADMIN_USER_EMAIL,
-        password: process.env.BB_ADMIN_USER_PASSWORD
-      }
+        password: process.env.BB_ADMIN_USER_PASSWORD,
+      },
     })
     const cookie = response.headers.get("set-cookie")
     this.api.cookie = cookie as any
diff --git a/qa-core/src/config/internal-api/fixtures/applications.ts b/qa-core/src/config/internal-api/fixtures/applications.ts
index dfad7e0b46..9076a05e1b 100644
--- a/qa-core/src/config/internal-api/fixtures/applications.ts
+++ b/qa-core/src/config/internal-api/fixtures/applications.ts
@@ -1,10 +1,9 @@
 import generator from "../../generator"
-import {
-  Application,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { Application } from "@budibase/server/api/controllers/public/mapping/types"
 
-
-const generate = (overrides: Partial<Application> = {}): Partial<Application> => ({
+const generate = (
+  overrides: Partial<Application> = {}
+): Partial<Application> => ({
   name: generator.word(),
   url: `/${generator.word()}`,
   ...overrides,
diff --git a/qa-core/src/tests/internal-api/applications/create.spec.ts b/qa-core/src/tests/internal-api/applications/create.spec.ts
index 81d43d9c91..2c934e0bd7 100644
--- a/qa-core/src/tests/internal-api/applications/create.spec.ts
+++ b/qa-core/src/tests/internal-api/applications/create.spec.ts
@@ -24,14 +24,14 @@ describe("Internal API - /applications endpoints", () => {
       useTemplate: "true",
       templateName: "Near Miss Register",
       templateKey: "app/near-miss-register",
-      templateFile: undefined
+      templateFile: undefined,
     })
   }
 
   it("GET - fetch applications", async () => {
     await config.applications.create({
       ...generateApp(),
-      useTemplate: false
+      useTemplate: false,
     })
     const [response, apps] = await config.applications.fetch()
     expect(response).toHaveStatusCode(200)
@@ -57,7 +57,7 @@ describe("Internal API - /applications endpoints", () => {
     expect(publish).toEqual({
       _id: expect.any(String),
       appUrl: app.url,
-      status: "SUCCESS"
+      status: "SUCCESS",
     })
   })
 
@@ -70,7 +70,8 @@ describe("Internal API - /applications endpoints", () => {
     config.applications.api.appId = app.appId
 
     // check preview renders
-    const [previewResponse, previewRenders] = await config.applications.canRender()
+    const [previewResponse, previewRenders] =
+      await config.applications.canRender()
     expect(previewResponse).toHaveStatusCode(200)
     expect(previewRenders).toBe(true)
 
@@ -79,8 +80,8 @@ describe("Internal API - /applications endpoints", () => {
 
     // check published app renders
     config.applications.api.appId = db.getProdAppID(app.appId)
-    const [publishedAppResponse, publishedAppRenders] = await config.applications.canRender()
+    const [publishedAppResponse, publishedAppRenders] =
+      await config.applications.canRender()
     expect(publishedAppRenders).toBe(true)
   })
-
 })

From ced67d924877906d11d1eac57ae5040d65b41a9a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 4 Oct 2022 12:03:00 +0000
Subject: [PATCH 19/23] v2.0.14-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              |  8 ++++----
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/sdk/package.json              |  2 +-
 packages/server/package.json           | 10 +++++-----
 packages/string-templates/package.json |  2 +-
 packages/types/package.json            |  2 +-
 packages/worker/package.json           |  8 ++++----
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3730ebd344..469bc51be7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a07db6fca0..76e724b77d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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": "2.0.14-alpha.3",
+    "@budibase/types": "2.0.14-alpha.4",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7bc9cb7da6..01e1a5f17e 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-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 0b171e2591..c838f05b8c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -71,10 +71,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.0.14-alpha.3",
-    "@budibase/client": "2.0.14-alpha.3",
-    "@budibase/frontend-core": "2.0.14-alpha.3",
-    "@budibase/string-templates": "2.0.14-alpha.3",
+    "@budibase/bbui": "2.0.14-alpha.4",
+    "@budibase/client": "2.0.14-alpha.4",
+    "@budibase/frontend-core": "2.0.14-alpha.4",
+    "@budibase/string-templates": "2.0.14-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 cc70a811f9..b01d71f5d2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-alpha.4",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.3",
-    "@budibase/string-templates": "2.0.14-alpha.3",
-    "@budibase/types": "2.0.14-alpha.3",
+    "@budibase/backend-core": "2.0.14-alpha.4",
+    "@budibase/string-templates": "2.0.14-alpha.4",
+    "@budibase/types": "2.0.14-alpha.4",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index e6533daa85..f436d4b7b9 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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": "2.0.14-alpha.3",
-    "@budibase/frontend-core": "2.0.14-alpha.3",
-    "@budibase/string-templates": "2.0.14-alpha.3",
+    "@budibase/bbui": "2.0.14-alpha.4",
+    "@budibase/frontend-core": "2.0.14-alpha.4",
+    "@budibase/string-templates": "2.0.14-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 ff68eeb5a2..bb61f196d1 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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": "2.0.14-alpha.3",
+    "@budibase/bbui": "2.0.14-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 16b053b4ed..8cd827b27e 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-alpha.4",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5183f9737f..5a14a192b3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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/backend-core": "2.0.14-alpha.3",
-    "@budibase/client": "2.0.14-alpha.3",
+    "@budibase/backend-core": "2.0.14-alpha.4",
+    "@budibase/client": "2.0.14-alpha.4",
     "@budibase/pro": "2.0.14-alpha.3",
-    "@budibase/string-templates": "2.0.14-alpha.3",
-    "@budibase/types": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-alpha.4",
+    "@budibase/types": "2.0.14-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 73cff234a3..9b077a3048 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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 5eb2a09957..0cda6ba689 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-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 c65c6b7676..9140de1652 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.0.14-alpha.3",
+  "version": "2.0.14-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.0.14-alpha.3",
+    "@budibase/backend-core": "2.0.14-alpha.4",
     "@budibase/pro": "2.0.14-alpha.3",
-    "@budibase/string-templates": "2.0.14-alpha.3",
-    "@budibase/types": "2.0.14-alpha.3",
+    "@budibase/string-templates": "2.0.14-alpha.4",
+    "@budibase/types": "2.0.14-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b5d81449246496918c2a1cc1d228f6c3673780f6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 4 Oct 2022 12:06:49 +0000
Subject: [PATCH 20/23] Update pro version to 2.0.14-alpha.4

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 5a14a192b3..599fefaf3e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -79,7 +79,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.0.14-alpha.4",
     "@budibase/client": "2.0.14-alpha.4",
-    "@budibase/pro": "2.0.14-alpha.3",
+    "@budibase/pro": "2.0.14-alpha.4",
     "@budibase/string-templates": "2.0.14-alpha.4",
     "@budibase/types": "2.0.14-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 74ec0fd8bc..e047b857b4 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.3.tgz#ebb66e4bee8b8176802f8db9b9ee445525673af9"
-  integrity sha512-LVDVwfSa7eaGNgmh1ig3ENu5h8pOM7AWjPEcIPffY5ZWmcdiPCZYSEzePC1fC5csGv0PLwQeHHFEqEAKxDBIKQ==
+"@budibase/backend-core@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.4.tgz#213446a9e04385fb38ab8785742cdb8b4eaf2cac"
+  integrity sha512-ma1Ipst4AQVi4sx+ULs3bX9xT4eHqavCvM/BXtZzV23SOTdjJTi9wX2KWbIvAUT5xo2NgN0uRf5zf7B6CBRuXw==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.3"
+    "@budibase/types" "2.0.14-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.3.tgz#0774b52deee3911e89e3f69d40693fc639d3cad8"
-  integrity sha512-X9MBpr2uwoBYjo6n/QuvPs1VBSFLqC1bJGec+5/4WRlywzNKLM6Rs2/FE3jYUDRtobAkKp1dUx9hpe3Y+wQKNQ==
+"@budibase/pro@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.4.tgz#9796271365f4ffb875655f86df84a2b4111b793a"
+  integrity sha512-I5QIv04hfoUPEYHPkCD5L/5WU7cJurmfhjy62ZMTNbJzFzhIGDzQlOjM0MnQO5kJvGv1NWl2PQvSty1rYzXGsw==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.3"
-    "@budibase/types" "2.0.14-alpha.3"
+    "@budibase/backend-core" "2.0.14-alpha.4"
+    "@budibase/types" "2.0.14-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.3.tgz#81ccde9867a15f51dd1b746f2bdeb9f6a638ebdc"
-  integrity sha512-JPrH3ilmA4Cp59ThcxqL7X3xZuA2mpu2N/2IGH1VoKW3w7RV5IM9FeH/RrrQ3ajEwHzqs53lU5+8tE/vPdGVag==
+"@budibase/types@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.4.tgz#37b1ff362d2551fd978e8c8153a4cec357eda0b0"
+  integrity sha512-l4dfMh5it1N56nc+jCtdXklrZA1cMt6WSVBoKCXBedZGpguJr18Wo/cfn1YWryuUMuSlpFVDTrlQQXCZ+ku92g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9140de1652..b6a04a2801 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.0.14-alpha.4",
-    "@budibase/pro": "2.0.14-alpha.3",
+    "@budibase/pro": "2.0.14-alpha.4",
     "@budibase/string-templates": "2.0.14-alpha.4",
     "@budibase/types": "2.0.14-alpha.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 1f8ee96254..d7532fdb50 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.3.tgz#ebb66e4bee8b8176802f8db9b9ee445525673af9"
-  integrity sha512-LVDVwfSa7eaGNgmh1ig3ENu5h8pOM7AWjPEcIPffY5ZWmcdiPCZYSEzePC1fC5csGv0PLwQeHHFEqEAKxDBIKQ==
+"@budibase/backend-core@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.14-alpha.4.tgz#213446a9e04385fb38ab8785742cdb8b4eaf2cac"
+  integrity sha512-ma1Ipst4AQVi4sx+ULs3bX9xT4eHqavCvM/BXtZzV23SOTdjJTi9wX2KWbIvAUT5xo2NgN0uRf5zf7B6CBRuXw==
   dependencies:
-    "@budibase/types" "2.0.14-alpha.3"
+    "@budibase/types" "2.0.14-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.3.tgz#0774b52deee3911e89e3f69d40693fc639d3cad8"
-  integrity sha512-X9MBpr2uwoBYjo6n/QuvPs1VBSFLqC1bJGec+5/4WRlywzNKLM6Rs2/FE3jYUDRtobAkKp1dUx9hpe3Y+wQKNQ==
+"@budibase/pro@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.14-alpha.4.tgz#9796271365f4ffb875655f86df84a2b4111b793a"
+  integrity sha512-I5QIv04hfoUPEYHPkCD5L/5WU7cJurmfhjy62ZMTNbJzFzhIGDzQlOjM0MnQO5kJvGv1NWl2PQvSty1rYzXGsw==
   dependencies:
-    "@budibase/backend-core" "2.0.14-alpha.3"
-    "@budibase/types" "2.0.14-alpha.3"
+    "@budibase/backend-core" "2.0.14-alpha.4"
+    "@budibase/types" "2.0.14-alpha.4"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.0.14-alpha.3":
-  version "2.0.14-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.3.tgz#81ccde9867a15f51dd1b746f2bdeb9f6a638ebdc"
-  integrity sha512-JPrH3ilmA4Cp59ThcxqL7X3xZuA2mpu2N/2IGH1VoKW3w7RV5IM9FeH/RrrQ3ajEwHzqs53lU5+8tE/vPdGVag==
+"@budibase/types@2.0.14-alpha.4":
+  version "2.0.14-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.14-alpha.4.tgz#37b1ff362d2551fd978e8c8153a4cec357eda0b0"
+  integrity sha512-l4dfMh5it1N56nc+jCtdXklrZA1cMt6WSVBoKCXBedZGpguJr18Wo/cfn1YWryuUMuSlpFVDTrlQQXCZ+ku92g==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

From 340e8c4590d4af4da1747ed756e0b5ca7827e552 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedrorevezsilva@gmail.com>
Date: Thu, 6 Oct 2022 11:10:49 +0100
Subject: [PATCH 21/23] Add instructions for Dev Env in Windows.

---
 docs/DEV-SETUP-WINDOWS.md | 80 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 docs/DEV-SETUP-WINDOWS.md

diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md
new file mode 100644
index 0000000000..9f16f86f7d
--- /dev/null
+++ b/docs/DEV-SETUP-WINDOWS.md
@@ -0,0 +1,80 @@
+## Dev Environment on Windows 10/11 (WSL2)
+
+
+### Install WSL with Ubuntu LTS
+
+Enable WSL 2 on Windows 10/11 for docker support.
+```
+wsl --set-default-version 2
+```
+Install Ubuntu LTS.
+```
+wsl --install Ubuntu
+```
+
+Or follow the instruction here:
+https://learn.microsoft.com/en-us/windows/wsl/install
+
+### Install Docker in windows
+Download the installer from docker and install it.
+
+Check this url for more detailed instructions:
+https://docs.docker.com/desktop/install/windows-install/
+
+You should follow the next steps from within the Ubuntu terminal.
+
+### Install NVM & Node 16
+NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating
+Install NVM
+```
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+```
+Install Node 16
+```
+nvm install 16
+```
+
+
+### Install npm requirements
+
+```
+npm install -g yarn jest lerna
+```
+
+### Clone the repo
+```
+git clone https://github.com/Budibase/budibase.git
+```
+
+### Check Versions
+
+This setup process was tested on Windows 11 with version numbers show below. Your mileage may vary using anything else.
+
+- Docker: 20.10.7
+- Docker-Compose: 2.10.2
+- Node: v16.17.1
+- Yarn: 1.22.19
+- Lerna: 5.5.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
+
+### Working with the code
+Here are the instructions to work on the application from within Visual Studio Code (in Windows) through the WSL. All the commands and files are within the Ubuntu system and it should run as if you were working on a Linux machine.
+
+https://code.visualstudio.com/docs/remote/wsl
+
+Note you will be able to run the application from within the WSL terminal and you will be able to access the application from the a browser in Windows.
\ No newline at end of file

From 2e22b9e87769cf1c0c58d7b2670f9d6bd944bdbc Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedrorevezsilva@gmail.com>
Date: Thu, 6 Oct 2022 11:30:33 +0100
Subject: [PATCH 22/23] Fix formating

---
 docs/DEV-SETUP-WINDOWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md
index 9f16f86f7d..1f7d23ac5e 100644
--- a/docs/DEV-SETUP-WINDOWS.md
+++ b/docs/DEV-SETUP-WINDOWS.md
@@ -25,6 +25,7 @@ You should follow the next steps from within the Ubuntu terminal.
 
 ### Install NVM & Node 16
 NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating
+
 Install NVM
 ```
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash

From 784f728a33300f62801d0f0af3c0e3f901cf5df4 Mon Sep 17 00:00:00 2001
From: Pedro Silva <pedrorevezsilva@gmail.com>
Date: Thu, 6 Oct 2022 14:39:51 +0100
Subject: [PATCH 23/23] Update node version

---
 docs/DEV-SETUP-DEBIAN.md  | 15 +++++++++------
 docs/DEV-SETUP-MACOSX.md  |  9 ++++++---
 docs/DEV-SETUP-WINDOWS.md |  8 ++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/docs/DEV-SETUP-DEBIAN.md b/docs/DEV-SETUP-DEBIAN.md
index 88a124708c..9edd8286cb 100644
--- a/docs/DEV-SETUP-DEBIAN.md
+++ b/docs/DEV-SETUP-DEBIAN.md
@@ -1,12 +1,15 @@
 ## Dev Environment on Debian 11
 
-### Install Node
+### Install NVM & Node 14
+NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating
 
-Budibase requires a recent version of node (14+):
+Install NVM
 ```
-curl -sL https://deb.nodesource.com/setup_16.x | sudo bash -
-apt -y install nodejs
-node -v
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+```
+Install Node 14
+```
+nvm install 14
 ```
 
 ### Install npm requirements
@@ -31,7 +34,7 @@ This setup process was tested on Debian 11 (bullseye) with version numbers show
 
 - Docker: 20.10.5
 - Docker-Compose: 1.29.2
-- Node: v16.15.1
+- Node: v14.20.1
 - Yarn: 1.22.19
 - Lerna: 5.1.4
 
diff --git a/docs/DEV-SETUP-MACOSX.md b/docs/DEV-SETUP-MACOSX.md
index c5990e58da..d9e2dcad6a 100644
--- a/docs/DEV-SETUP-MACOSX.md
+++ b/docs/DEV-SETUP-MACOSX.md
@@ -11,7 +11,7 @@ through brew.
 
 ### Install Node
 
-Budibase requires a recent version of node (14+):
+Budibase requires a recent version of node 14:
 ```
 brew install node npm
 node -v
@@ -38,7 +38,7 @@ This setup process was tested on Mac OSX 12 (Monterey) with version numbers show
 
 - Docker: 20.10.14
 - Docker-Compose: 2.6.0
-- Node: 18.3.0
+- Node: 14.20.1
 - Yarn: 1.22.19
 - Lerna: 5.1.4
 
@@ -59,4 +59,7 @@ The dev version will be available on port 10000 i.e.
 http://127.0.0.1:10000/builder/admin
 
 | **NOTE**: If you are working on a M1 Apple Silicon, you will need to uncomment `# platform: linux/amd64` line in
-[hosting/docker-compose-dev.yaml](../hosting/docker-compose.dev.yaml)
\ No newline at end of file
+[hosting/docker-compose-dev.yaml](../hosting/docker-compose.dev.yaml)
+
+### Troubleshooting
+If there are errors with the `yarn setup` command, you can try installing nvm and node 14. This is the same as the instructions for Debian 11. 
diff --git a/docs/DEV-SETUP-WINDOWS.md b/docs/DEV-SETUP-WINDOWS.md
index 1f7d23ac5e..c5608b7567 100644
--- a/docs/DEV-SETUP-WINDOWS.md
+++ b/docs/DEV-SETUP-WINDOWS.md
@@ -23,16 +23,16 @@ https://docs.docker.com/desktop/install/windows-install/
 
 You should follow the next steps from within the Ubuntu terminal.
 
-### Install NVM & Node 16
+### Install NVM & Node 14
 NVM documentation: https://github.com/nvm-sh/nvm#installing-and-updating
 
 Install NVM
 ```
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
 ```
-Install Node 16
+Install Node 14
 ```
-nvm install 16
+nvm install 14
 ```
 
 
@@ -53,7 +53,7 @@ This setup process was tested on Windows 11 with version numbers show below. You
 
 - Docker: 20.10.7
 - Docker-Compose: 2.10.2
-- Node: v16.17.1
+- Node: v14.20.1
 - Yarn: 1.22.19
 - Lerna: 5.5.4