From 8024b46eed0d2e7dfb2b72012cdee4277c49fe02 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 6 Oct 2022 11:39:14 +0100
Subject: [PATCH 001/273] update CSP to account for another s3 URL

---
 hosting/nginx.prod.conf.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/nginx.prod.conf.hbs b/hosting/nginx.prod.conf.hbs
index f3202ad4a4..d57a822f3f 100644
--- a/hosting/nginx.prod.conf.hbs
+++ b/hosting/nginx.prod.conf.hbs
@@ -55,7 +55,7 @@ http {
     set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
     set $csp_object "object-src 'none'";
     set $csp_base_uri "base-uri 'self'";
-    set $csp_connect "connect-src 'self' https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com";
+    set $csp_connect "connect-src 'self' https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com";
     set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";

From 73c99910b11536395eea8ec8ffbdc665b163d53c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 7 Feb 2023 15:32:59 +0000
Subject: [PATCH 002/273] initial commit of API design session outcomes.

---
 .../types/src/api/web/global/auditLogs.ts     | 36 +++++++++++++++++++
 packages/types/src/api/web/global/index.ts    |  1 +
 packages/types/src/api/web/index.ts           |  1 +
 packages/types/src/api/web/pagination.ts      | 24 +++++++++++++
 .../types/src/documents/global/auditLogs.ts   | 11 ++++++
 packages/types/src/sdk/events/event.ts        |  4 +++
 6 files changed, 77 insertions(+)
 create mode 100644 packages/types/src/api/web/global/auditLogs.ts
 create mode 100644 packages/types/src/api/web/pagination.ts
 create mode 100644 packages/types/src/documents/global/auditLogs.ts

diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
new file mode 100644
index 0000000000..7281d0ca36
--- /dev/null
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -0,0 +1,36 @@
+import { Event, AuditedEventFriendlyName } from "../../../sdk"
+import { PaginationResponse, PaginationRequest } from "../"
+
+export interface DownloadAuditLogsRequest {
+  userId?: string[]
+  appId?: string[]
+  event?: Event[]
+  startDate?: string
+  endDate?: string
+  metadataSearch?: string
+}
+
+export interface SearchAuditLogsRequest
+  extends PaginationRequest,
+    DownloadAuditLogsRequest {}
+
+export interface SearchAuditLogsResponse extends PaginationResponse {
+  data: {
+    app: {
+      _id: string
+      name: string
+    }
+    user: {
+      _id: string
+      name: string
+    }
+    event: Event
+    timestamp: string
+    name: string
+    metadata: any
+  }[]
+}
+
+export interface DefinitionsAuditLogsResponse {
+  events: typeof AuditedEventFriendlyName
+}
diff --git a/packages/types/src/api/web/global/index.ts b/packages/types/src/api/web/global/index.ts
index 415ed55ab1..f9eec2a779 100644
--- a/packages/types/src/api/web/global/index.ts
+++ b/packages/types/src/api/web/global/index.ts
@@ -1,2 +1,3 @@
 export * from "./environmentVariables"
+export * from "./auditLogs"
 export * from "./events"
diff --git a/packages/types/src/api/web/index.ts b/packages/types/src/api/web/index.ts
index 9688a89c7b..3d209f22bb 100644
--- a/packages/types/src/api/web/index.ts
+++ b/packages/types/src/api/web/index.ts
@@ -4,3 +4,4 @@ export * from "./errors"
 export * from "./schedule"
 export * from "./app"
 export * from "./global"
+export * from "./pagination"
diff --git a/packages/types/src/api/web/pagination.ts b/packages/types/src/api/web/pagination.ts
new file mode 100644
index 0000000000..ca640d58db
--- /dev/null
+++ b/packages/types/src/api/web/pagination.ts
@@ -0,0 +1,24 @@
+export enum SortOrder {
+  ASCENDING = "ascending",
+  DESCENDING = "descending",
+}
+
+export enum SortType {
+  STRING = "string",
+  number = "number",
+}
+
+export interface PaginationRequest {
+  limit?: number
+  bookmark?: string
+  sort?: {
+    order: SortOrder
+    column: string
+    type: SortType
+  }
+}
+
+export interface PaginationResponse {
+  bookmark: string
+  hasNextPage: boolean
+}
diff --git a/packages/types/src/documents/global/auditLogs.ts b/packages/types/src/documents/global/auditLogs.ts
new file mode 100644
index 0000000000..bc07bc88d4
--- /dev/null
+++ b/packages/types/src/documents/global/auditLogs.ts
@@ -0,0 +1,11 @@
+import { Document } from "../document"
+import { Event } from "../../sdk"
+
+export interface AuditLogDocument extends Document {
+  appId: string
+  event: Event
+  userId: string
+  timestamp: string
+  metadata: any
+  name: string
+}
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index f509682add..614dd18ded 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -182,6 +182,10 @@ export enum Event {
   ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened",
 }
 
+export const AuditedEventFriendlyName = {
+  [Event.USER_CREATED]: "user created",
+}
+
 // properties added at the final stage of the event pipeline
 export interface BaseEvent {
   version?: string

From 26becc9950ffdc4ed0965147654280bdd47c6fe0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 8 Feb 2023 15:18:44 +0000
Subject: [PATCH 003/273] add generic page for paywall features

---
 .../portal/_components/LockedFeature.svelte   | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte

diff --git a/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
new file mode 100644
index 0000000000..e6f4075e2e
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
@@ -0,0 +1,76 @@
+<script>
+  import {
+    Layout,
+    Heading,
+    Body,
+    Button,
+    Divider,
+    Tags,
+    Tag,
+  } from "@budibase/bbui"
+  import { auth, admin } from "stores/portal"
+
+  export let title
+  export let planType
+  export let description
+  export let enabled
+  export let upgradeButtonClick
+</script>
+
+<Layout noPadding>
+  <Layout gap="XS" noPadding>
+    <div class="title">
+      <Heading size="M">{title}</Heading>
+      {#if !enabled}
+        <Tags>
+          <Tag icon="LockClosed">{planType}</Tag>
+        </Tags>
+      {/if}
+    </div>
+    <Body>{description}</Body>
+  </Layout>
+  <Divider size="S" />
+
+  {#if enabled}
+    <slot />
+  {:else}
+    <div class="buttons">
+      <Button
+        primary
+        disabled={!$auth.accountPortalAccess && $admin.cloud}
+        on:click={async () => upgradeButtonClick()}
+      >
+        Upgrade
+      </Button>
+      <!--Show the view plans button-->
+      <Button
+        secondary
+        on:click={() => {
+          window.open("https://budibase.com/pricing/", "_blank")
+        }}
+      >
+        View Plans
+      </Button>
+    </div>
+  {/if}
+</Layout>
+
+<style>
+  .buttons {
+    display: flex;
+    gap: var(--spacing-l);
+  }
+  .title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    gap: var(--spacing-m);
+  }
+
+  .buttons {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-m);
+  }
+</style>

From 2bd6ff627a83db7cd0984e20b3aec654c8022b94 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 10 Feb 2023 14:57:42 +0000
Subject: [PATCH 004/273] update env vars with geneic splash screen

---
 .../portal/settings/environment/index.svelte  | 120 +++++-------------
 1 file changed, 34 insertions(+), 86 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index 3c170235e9..cff578febd 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -1,21 +1,17 @@
 <script>
   import {
     Layout,
-    Heading,
-    Body,
     Button,
-    Divider,
     Modal,
     Table,
-    Tags,
-    Tag,
     InlineAlert,
     notifications,
   } from "@budibase/bbui"
-  import { environment, licensing, auth, admin } from "stores/portal"
+  import { environment, licensing } from "stores/portal"
   import { onMount } from "svelte"
   import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
   import EditVariableColumn from "./_components/EditVariableColumn.svelte"
+  import LockedFeature from "../../_components/LockedFeature.svelte"
 
   let modal
 
@@ -61,91 +57,43 @@
   }
 </script>
 
-<Layout noPadding>
-  <Layout gap="XS" noPadding>
-    <div class="title">
-      <Heading size="M">Environment Variables</Heading>
-      {#if !$licensing.environmentVariablesEnabled}
-        <Tags>
-          <Tag icon="LockClosed">Business plan</Tag>
-        </Tags>
-      {/if}
-    </div>
-    <Body
-      >Add and manage environment variables for development and production</Body
-    >
-  </Layout>
-  <Divider size="S" />
-
-  {#if $licensing.environmentVariablesEnabled}
-    {#if noEncryptionKey}
-      <InlineAlert
-        message="Your Budibase installation does not have a key for encryption, please update your app service's environment variables to contain an 'ENCRYPTION_KEY' value."
-        header="No encryption key found"
-        type="error"
-      />
-    {/if}
-    <div>
-      <Button on:click={modal.show} cta disabled={noEncryptionKey}
-        >Add Variable</Button
-      >
-    </div>
-
-    <Layout noPadding>
-      <Table
-        {schema}
-        data={$environment.variables}
-        allowEditColumns={false}
-        allowEditRows={false}
-        allowSelectRows={false}
-        {customRenderers}
-      />
-    </Layout>
-  {:else}
-    <div class="buttons">
-      <Button
-        primary
-        disabled={!$auth.accountPortalAccess && $admin.cloud}
-        on:click={async () => {
-          await environment.upgradePanelOpened()
-          $licensing.goToUpgradePage()
-        }}
-      >
-        Upgrade
-      </Button>
-      <!--Show the view plans button-->
-      <Button
-        secondary
-        on:click={() => {
-          window.open("https://budibase.com/pricing/", "_blank")
-        }}
-      >
-        View Plans
-      </Button>
-    </div>
+<LockedFeature
+  title={"Environment Variables"}
+  planType={"Business plan"}
+  description={"Add and manage environment variables for development and production"}
+  enabled={$licensing.environmentVariablesEnabled}
+  upgradeButtonClick={async () => {
+    await environment.upgradePanelOpened()
+    $licensing.goToUpgradePage()
+  }}
+>
+  {#if noEncryptionKey}
+    <InlineAlert
+      message="Your Budibase installation does not have a key for encryption, please update your app service's environment variables to contain an 'ENCRYPTION_KEY' value."
+      header="No encryption key found"
+      type="error"
+    />
   {/if}
-</Layout>
+  <div>
+    <Button on:click={modal.show} cta disabled={noEncryptionKey}
+      >Add Variable</Button
+    >
+  </div>
+  <Layout noPadding>
+    <Table
+      {schema}
+      data={$environment.variables}
+      allowEditColumns={false}
+      allowEditRows={false}
+      allowSelectRows={false}
+      {customRenderers}
+    />
+  </Layout>
+</LockedFeature>
 
 <Modal bind:this={modal}>
   <CreateEditVariableModal {save} />
 </Modal>
 
 <style>
-  .buttons {
-    display: flex;
-    gap: var(--spacing-l);
-  }
-  .title {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    gap: var(--spacing-m);
-  }
-
-  .buttons {
-    display: flex;
-    flex-direction: row;
-    gap: var(--spacing-m);
-  }
 </style>

From 70ac7b81c3921b77cddce72d95816d2ada6fde94 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 13 Feb 2023 09:47:08 +0000
Subject: [PATCH 005/273] add base audit logs ui

---
 .../bbui/src/Form/Core/Multiselect.svelte     |   2 +
 packages/bbui/src/Form/Core/Picker.svelte     |  11 +-
 packages/bbui/src/Form/Multiselect.svelte     |   5 +
 packages/bbui/src/Form/Select.svelte          |   2 +
 .../builder/portal/account/_layout.svelte     |   3 +-
 .../auditLogs/_components/UserRenderer.svelte |   6 +
 .../_components/ViewDetailsRenderer.svelte    |  13 ++
 .../portal/account/auditLogs/index.svelte     | 200 ++++++++++++++++++
 .../overview/[appId]/backups/index.svelte     |   2 +-
 .../portal/settings/environment/index.svelte  |   1 +
 .../builder/src/stores/portal/licensing.js    |   5 +
 packages/builder/src/stores/portal/menu.js    |   5 +
 packages/frontend-core/src/constants.js       |   1 +
 13 files changed, 249 insertions(+), 7 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
 create mode 100644 packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
 create mode 100644 packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index d6c4dc23ac..a315f44a65 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -14,6 +14,7 @@
   export let autocomplete = false
   export let sort = false
   export let autoWidth = false
+  export let fetchTerm = null
 
   const dispatch = createEventDispatcher()
 
@@ -83,6 +84,7 @@
   {options}
   isPlaceholder={!value?.length}
   {autocomplete}
+  bind:fetchTerm
   {isOptionSelected}
   {getOptionLabel}
   {getOptionValue}
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 32cfcf3310..acd3c5da61 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -31,7 +31,8 @@
   export let autoWidth = false
   export let autocomplete = false
   export let sort = false
-
+  export let fetchTerm = null
+  $: console.log(fieldText)
   const dispatch = createEventDispatcher()
 
   let searchTerm = null
@@ -71,7 +72,7 @@
   }
 
   const getFilteredOptions = (options, term, getLabel) => {
-    if (autocomplete && term) {
+    if (autocomplete && term && !fetchTerm) {
       const lowerCaseTerm = term.toLowerCase()
       return options.filter(option => {
         return `${getLabel(option)}`.toLowerCase().includes(lowerCaseTerm)
@@ -144,8 +145,8 @@
   >
     {#if autocomplete}
       <Search
-        value={searchTerm}
-        on:change={event => (searchTerm = event.detail)}
+        value={fetchTerm ? fetchTerm : searchTerm}
+        on:change={event => (fetchTerm = event.detail)}
         {disabled}
         placeholder="Search"
       />
@@ -247,7 +248,7 @@
   }
   .popover-content.auto-width .spectrum-Menu-itemLabel {
     white-space: nowrap;
-    overflow: hidden;
+    overflow: none;
     text-overflow: ellipsis;
   }
   .popover-content:not(.auto-width) .spectrum-Menu-itemLabel {
diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index 7bcf22aa06..d28401b608 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -15,6 +15,9 @@
   export let getOptionValue = option => option
   export let sort = false
   export let autoWidth = false
+  export let autocomplete = false
+  export let fetchTerm = null
+
   const dispatch = createEventDispatcher()
   const onChange = e => {
     value = e.detail
@@ -34,6 +37,8 @@
     {getOptionLabel}
     {getOptionValue}
     {autoWidth}
+    {autocomplete}
+    bind:fetchTerm
     on:change={onChange}
     on:click
   />
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 69126e648d..4f30318282 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -20,6 +20,7 @@
   export let autoWidth = false
   export let sort = false
   export let tooltip = ""
+  export let autocomplete = false
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -51,6 +52,7 @@
     {getOptionIcon}
     {getOptionColour}
     {isOptionEnabled}
+    {autocomplete}
     on:change={onChange}
     on:click
   />
diff --git a/packages/builder/src/pages/builder/portal/account/_layout.svelte b/packages/builder/src/pages/builder/portal/account/_layout.svelte
index 3083b574a8..892e853aad 100644
--- a/packages/builder/src/pages/builder/portal/account/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/account/_layout.svelte
@@ -4,12 +4,13 @@
   import { Content, SideNav, SideNavItem } from "components/portal/page"
   import { menu } from "stores/portal"
 
+  $: wide = $isActive("./auditLogs")
   $: pages = $menu.find(x => x.title === "Account")?.subPages || []
   $: !pages.length && $goto("../")
 </script>
 
 <Page>
-  <Content narrow>
+  <Content narrow={!wide}>
     <div slot="side-nav">
       <SideNav>
         {#each pages as { title, href }}
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
new file mode 100644
index 0000000000..4baa24403e
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -0,0 +1,6 @@
+<script>
+  import { Avatar } from "@budibase/bbui"
+  export let row
+</script>
+
+<Avatar size="M" initials={"PC"} />
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
new file mode 100644
index 0000000000..a222871966
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
@@ -0,0 +1,13 @@
+<script>
+  import { ActionButton } from "@budibase/bbui"
+  import { getContext } from "svelte"
+
+  export let row
+  const auditLogs = getContext("auditLogs")
+  const onClick = e => {
+    e.stopPropagation()
+    auditLogs.viewDetails(row)
+  }
+</script>
+
+<ActionButton size="S" on:click={onClick}>Edit</ActionButton>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
new file mode 100644
index 0000000000..a5d403491a
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -0,0 +1,200 @@
+<script>
+  import {
+    Layout,
+    Table,
+    Select,
+    Search,
+    Multiselect,
+    notifications,
+  } from "@budibase/bbui"
+  import { licensing, users, apps } from "stores/portal"
+  import LockedFeature from "../../_components/LockedFeature.svelte"
+  import { createPaginationStore } from "helpers/pagination"
+  import { getContext, setContext } from "svelte"
+  import Portal from "svelte-portal"
+  import ViewDetailsRenderer from "./_components/ViewDetailsRenderer.svelte"
+  import UserRenderer from "./_components/UserRenderer.svelte"
+
+  const sidePanel = getContext("side-panel")
+  const schema = {
+    name: {},
+    date: {},
+    user: { width: "auto" },
+    app: {},
+    event: {},
+    view: { width: "auto", borderLeft: true, displayName: "" },
+  }
+
+  const customRenderers = [
+    {
+      column: "view",
+      component: ViewDetailsRenderer,
+    },
+    {
+      column: "user",
+      component: UserRenderer,
+    },
+  ]
+
+  let searchTerm = ""
+  let pageInfo = createPaginationStore()
+  let prevSearch = undefined
+  let selectedUsers = []
+  let selectedLog
+
+  let data = [
+    {
+      name: "User created",
+      date: "2021-03-01 12:00:00",
+      user: "Peter Clement",
+      app: "School Admin Panel",
+      event: "User added",
+      metadata: {
+        name: "Peter Clement",
+        email: "",
+      },
+    },
+  ]
+
+  $: fetchUsers(page, searchTerm)
+  $: page = $pageInfo.page
+  $: enrichedList = enrich($users.data || [], selectedUsers)
+  $: sortedList = sort(enrichedList)
+
+  const fetchUsers = async (page, search) => {
+    if ($pageInfo.loading) {
+      return
+    }
+    // need to remove the page if they've started searching
+    if (search && !prevSearch) {
+      pageInfo.reset()
+      page = undefined
+    }
+    prevSearch = search
+    try {
+      pageInfo.loading()
+      await users.search({ page, email: search })
+      pageInfo.fetched($users.hasNextPage, $users.nextPage)
+    } catch (error) {
+      notifications.error("Error getting user list")
+    }
+  }
+
+  const enrich = (list, selected) => {
+    return list.map(item => {
+      return {
+        ...item,
+        selected: selected.find(x => x === item._id) != null,
+      }
+    })
+  }
+
+  const sort = list => {
+    let sortedList = list.slice()
+    sortedList?.sort((a, b) => {
+      if (a.selected === b.selected) {
+        return a["email"] < b["email"] ? -1 : 1
+      } else if (a.selected) {
+        return -1
+      } else if (b.selected) {
+        return 1
+      }
+      return 0
+    })
+    return sortedList
+  }
+
+  const viewDetails = detail => {
+    selectedLog = detail
+    sidePanel.open()
+  }
+
+  setContext("auditLogs", {
+    viewDetails,
+  })
+</script>
+
+<LockedFeature
+  title={"Audit Logs"}
+  planType={"Business plan"}
+  description={"View all events that have occurred in your Budibase installation"}
+  enabled={$licensing.auditLogsEnabled}
+  upgradeButtonClick={async () => {
+    $licensing.goToUpgradePage()
+  }}
+>
+  <div class="controls">
+    <div class="search">
+      <div class="select">
+        <Select placeholder="All" label="Activity" />
+      </div>
+      <div class="select">
+        <Multiselect
+          bind:fetchTerm={searchTerm}
+          placeholder="All users"
+          label="Users"
+          autocomplete
+          bind:value={selectedUsers}
+          getOptionValue={user => user._id}
+          getOptionLabel={user => user.email}
+          options={sortedList}
+        />
+      </div>
+      <div class="select">
+        <Multiselect
+          placeholder="All apps"
+          label="App"
+          getOptionValue={app => app.appId}
+          getOptionLabel={app => app.name}
+          options={$apps}
+        />
+      </div>
+      <div class="select">
+        <Multiselect placeholder="All events" label="Event" />
+      </div>
+    </div>
+    <div style="width: 200px;">
+      <Search placeholder="Search" value={""} />
+    </div>
+  </div>
+  <Layout noPadding>
+    <Table
+      {customRenderers}
+      on:click={viewDetails}
+      {data}
+      allowEditColumns={false}
+      allowEditRows={false}
+      allowSelectRows={false}
+      {schema}
+    />
+  </Layout>
+</LockedFeature>
+
+{#if selectedLog}
+  <Portal target="#side-panel">
+    <div>hello</div>
+  </Portal>
+{/if}
+
+<style>
+  .controls {
+    display: flex;
+    flex-direction: row;
+    gap: var(--spacing-l);
+    align-items: flex-end;
+    flex-wrap: wrap;
+  }
+
+  .search {
+    display: flex;
+    gap: var(--spacing-m);
+    align-items: flex-start;
+    flex: 1 1 auto;
+    max-width: 100%;
+  }
+  .select {
+    flex: 1 1 0;
+    max-width: 200px;
+    min-width: 80px;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
index c15f944601..49b4a5babc 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
@@ -184,7 +184,7 @@
   <Divider />
 
   {#if !$licensing.backupsEnabled}
-    {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
+    {#if !$auth.accountPortalAccess && $admin.cloud}
       <Body>Contact your account holder to upgrade your plan.</Body>
     {/if}
     <div class="pro-buttons">
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index cff578febd..013d6b8ff4 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -55,6 +55,7 @@
       notifications.error(`Error saving variable: ${err.message}`)
     }
   }
+  $: console.log($environment.variables)
 </script>
 
 <LockedFeature
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 6f5c80e03c..9adb76fa8c 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -64,6 +64,10 @@ export const createLicensingStore = () => {
         Constants.Features.ENVIRONMENT_VARIABLES
       )
 
+      let auditLogsEnabled = license.features.includes(
+        Constants.Features.AUDIT_LOGS
+      )
+      auditLogsEnabled = true
       store.update(state => {
         return {
           ...state,
@@ -72,6 +76,7 @@ export const createLicensingStore = () => {
           groupsEnabled,
           backupsEnabled,
           environmentVariablesEnabled,
+          auditLogsEnabled,
         }
       })
     },
diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
index 8eea36c08c..56956fc330 100644
--- a/packages/builder/src/stores/portal/menu.js
+++ b/packages/builder/src/stores/portal/menu.js
@@ -75,6 +75,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
         title: "Usage",
         href: "/builder/portal/account/usage",
       },
+      {
+        title: "Audit Logs",
+        href: "/builder/portal/account/auditLogs",
+      },
     ]
     if ($admin.cloud && $auth?.user?.accountPortalAccess) {
       accountSubPages.push({
@@ -87,6 +91,7 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
         href: "/builder/portal/account/upgrade",
       })
     }
+    // add license check here
     if (
       $auth?.user?.accountPortalAccess &&
       $auth.user.account.stripeCustomerId
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 3a16013df2..8c7103a88f 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -115,6 +115,7 @@ export const Features = {
   USER_GROUPS: "userGroups",
   BACKUPS: "appBackups",
   ENVIRONMENT_VARIABLES: "environmentVariables",
+  AUDIT_LOGS: "auditLogs",
 }
 
 // Role IDs

From 2d2c960b75775feea171e09950327143a64838d5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 13 Feb 2023 11:43:25 +0000
Subject: [PATCH 006/273] add audit logs feature

---
 packages/builder/src/stores/portal/licensing.js | 3 +--
 packages/types/src/sdk/licensing/feature.ts     | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 9adb76fa8c..4215e92741 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -64,10 +64,9 @@ export const createLicensingStore = () => {
         Constants.Features.ENVIRONMENT_VARIABLES
       )
 
-      let auditLogsEnabled = license.features.includes(
+      const auditLogsEnabled = license.features.includes(
         Constants.Features.AUDIT_LOGS
       )
-      auditLogsEnabled = true
       store.update(state => {
         return {
           ...state,
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index a39bcab18b..7ebd1574ca 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -2,4 +2,5 @@ export enum Feature {
   USER_GROUPS = "userGroups",
   APP_BACKUPS = "appBackups",
   ENVIRONMENT_VARIABLES = "environmentVariables",
+  AUDIT_LOGS = "auditLogs",
 }

From 5cd6cb166ab51f0d07bab1367d0549abd8aaa6af Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 13 Feb 2023 11:53:01 +0000
Subject: [PATCH 007/273] Configurable test log levels and common error
 handling

---
 .../src/middleware/errorHandling.ts           | 28 +++++++++++++++
 packages/backend-core/src/middleware/index.ts |  5 +--
 packages/backend-core/tests/jestEnv.ts        | 28 +++------------
 packages/backend-core/tests/jestSetup.ts      | 21 +++++++++++-
 packages/backend-core/tests/logging.ts        | 34 +++++++++++++++++++
 packages/server/src/api/index.ts              | 25 ++------------
 packages/server/src/tests/jestEnv.ts          | 12 +++----
 packages/server/src/tests/jestSetup.ts        |  1 +
 packages/server/src/tests/logging.ts          | 34 +++++++++++++++++++
 packages/types/src/api/web/errors.ts          |  1 +
 packages/worker/src/api/index.ts              | 24 +++----------
 .../routes/system/tests/migrations.spec.ts    |  4 +--
 .../src/middleware/tests/tenancy.spec.ts      |  8 ++---
 packages/worker/src/tests/jestEnv.ts          |  2 +-
 packages/worker/src/tests/jestSetup.ts        |  7 ++--
 packages/worker/src/tests/logging.ts          | 34 +++++++++++++++++++
 16 files changed, 182 insertions(+), 86 deletions(-)
 create mode 100644 packages/backend-core/src/middleware/errorHandling.ts
 create mode 100644 packages/backend-core/tests/logging.ts
 create mode 100644 packages/server/src/tests/logging.ts
 create mode 100644 packages/worker/src/tests/logging.ts

diff --git a/packages/backend-core/src/middleware/errorHandling.ts b/packages/backend-core/src/middleware/errorHandling.ts
new file mode 100644
index 0000000000..1baaa92501
--- /dev/null
+++ b/packages/backend-core/src/middleware/errorHandling.ts
@@ -0,0 +1,28 @@
+import { APIError } from "@budibase/types"
+import * as errors from "../errors"
+import env from "../environment"
+
+export async function errorHandling(ctx: any, next: any) {
+  try {
+    await next()
+  } catch (err: any) {
+    const status = err.status || err.statusCode || 500
+    ctx.status = status
+
+    if (status > 499 || env.LOG_4XX) {
+      ctx.log.error(err)
+    }
+
+    const error = errors.getPublicError(err)
+    const body: APIError = {
+      message: err.message,
+      status: status,
+      validationErrors: err.validation,
+      error,
+    }
+
+    ctx.body = body
+  }
+}
+
+export default errorHandling
diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts
index 4986cde64b..de609f9a3e 100644
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@@ -1,7 +1,7 @@
 export * as jwt from "./passport/jwt"
 export * as local from "./passport/local"
-export * as google from "./passport/google"
-export * as oidc from "./passport/oidc"
+export * as google from "./passport/sso/google"
+export * as oidc from "./passport/sso/oidc"
 import * as datasourceGoogle from "./passport/datasource/google"
 export const datasource = {
   google: datasourceGoogle,
@@ -16,4 +16,5 @@ export { default as adminOnly } from "./adminOnly"
 export { default as builderOrAdmin } from "./builderOrAdmin"
 export { default as builderOnly } from "./builderOnly"
 export { default as logging } from "./logging"
+export { default as errorHandling } from "./errorHandling"
 export * as joiValidator from "./joi-validator"
diff --git a/packages/backend-core/tests/jestEnv.ts b/packages/backend-core/tests/jestEnv.ts
index 1190eb3bb7..71cf865737 100644
--- a/packages/backend-core/tests/jestEnv.ts
+++ b/packages/backend-core/tests/jestEnv.ts
@@ -1,23 +1,5 @@
-import env from "../src/environment"
-import { mocks } from "./utilities"
-
-// must explicitly enable fetch mock
-mocks.fetch.enable()
-
-// mock all dates to 2020-01-01T00:00:00.000Z
-// use tk.reset() to use real dates in individual tests
-import tk from "timekeeper"
-tk.freeze(mocks.date.MOCK_DATE)
-
-env._set("SELF_HOSTED", "1")
-env._set("NODE_ENV", "jest")
-
-if (!process.env.DEBUG) {
-  global.console.log = jest.fn() // console.log are ignored in tests
-}
-
-if (!process.env.CI) {
-  // set a longer timeout in dev for debugging
-  // 100 seconds
-  jest.setTimeout(100000)
-}
+process.env.SELF_HOSTED = "1"
+process.env.MULTI_TENANCY = "1"
+process.env.NODE_ENV = "jest"
+process.env.MOCK_REDIS = "1"
+process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
diff --git a/packages/backend-core/tests/jestSetup.ts b/packages/backend-core/tests/jestSetup.ts
index f7887ec824..e786086de6 100644
--- a/packages/backend-core/tests/jestSetup.ts
+++ b/packages/backend-core/tests/jestSetup.ts
@@ -1,4 +1,23 @@
+import "./logging"
 import env from "../src/environment"
-import { testContainerUtils } from "./utilities"
+import { mocks, testContainerUtils } from "./utilities"
+
+// must explicitly enable fetch mock
+mocks.fetch.enable()
+
+// mock all dates to 2020-01-01T00:00:00.000Z
+// use tk.reset() to use real dates in individual tests
+import tk from "timekeeper"
+tk.freeze(mocks.date.MOCK_DATE)
+
+if (!process.env.DEBUG) {
+  console.log = jest.fn() // console.log are ignored in tests
+}
+
+if (!process.env.CI) {
+  // set a longer timeout in dev for debugging
+  // 100 seconds
+  jest.setTimeout(100000)
+}
 
 testContainerUtils.setupEnv(env)
diff --git a/packages/backend-core/tests/logging.ts b/packages/backend-core/tests/logging.ts
new file mode 100644
index 0000000000..271f4d62ff
--- /dev/null
+++ b/packages/backend-core/tests/logging.ts
@@ -0,0 +1,34 @@
+export enum LogLevel {
+  TRACE = "trace",
+  DEBUG = "debug",
+  INFO = "info",
+  WARN = "warn",
+  ERROR = "error",
+}
+
+const LOG_INDEX: { [key in LogLevel]: number } = {
+  [LogLevel.TRACE]: 1,
+  [LogLevel.DEBUG]: 2,
+  [LogLevel.INFO]: 3,
+  [LogLevel.WARN]: 4,
+  [LogLevel.ERROR]: 5,
+}
+
+const setIndex = LOG_INDEX[process.env.LOG_LEVEL as LogLevel]
+
+if (setIndex > LOG_INDEX.trace) {
+  global.console.trace = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.debug) {
+  global.console.debug = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.info) {
+  global.console.info = jest.fn()
+  global.console.log = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.warn) {
+  global.console.warn = jest.fn()
+}
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index 3375161dd8..78a6056366 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -1,5 +1,5 @@
 import Router from "@koa/router"
-import { errors, auth } from "@budibase/backend-core"
+import { auth, middleware } from "@budibase/backend-core"
 import currentApp from "../middleware/currentapp"
 import zlib from "zlib"
 import { mainRoutes, staticRoutes, publicRoutes } from "./routes"
@@ -14,6 +14,8 @@ export const router: Router = new Router()
 router.get("/health", ctx => (ctx.status = 200))
 router.get("/version", ctx => (ctx.body = pkg.version))
 
+router.use(middleware.errorHandling)
+
 router
   .use(
     compress({
@@ -54,27 +56,6 @@ router
   .use(currentApp)
   .use(auth.auditLog)
 
-// error handling middleware
-router.use(async (ctx, next) => {
-  try {
-    await next()
-  } catch (err: any) {
-    ctx.status = err.status || err.statusCode || 500
-    const error = errors.getPublicError(err)
-    ctx.body = {
-      message: err.message,
-      status: ctx.status,
-      validationErrors: err.validation,
-      error,
-    }
-    ctx.log.error(err)
-    // unauthorised errors don't provide a useful trace
-    if (!env.isTest()) {
-      console.trace(err)
-    }
-  }
-})
-
 // authenticated routes
 for (let route of mainRoutes) {
   router.use(route.routes())
diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts
index 9707893bd9..b1ef038c1b 100644
--- a/packages/server/src/tests/jestEnv.ts
+++ b/packages/server/src/tests/jestEnv.ts
@@ -1,9 +1,9 @@
-import env from "../environment"
 import { tmpdir } from "os"
 
-env._set("SELF_HOSTED", "1")
-env._set("NODE_ENV", "jest")
-env._set("MULTI_TENANCY", "1")
+process.env.SELF_HOSTED = "1"
+process.env.NODE_ENV = "jest"
+process.env.MULTI_TENANCY = "1"
 // @ts-ignore
-env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
-env._set("LOG_LEVEL", "silent")
+process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
+process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
+process.env.MOCK_REDIS = "1"
diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts
index d87ccbfe7c..b052d9941b 100644
--- a/packages/server/src/tests/jestSetup.ts
+++ b/packages/server/src/tests/jestSetup.ts
@@ -1,3 +1,4 @@
+import "./logging"
 import env from "../environment"
 import { env as coreEnv } from "@budibase/backend-core"
 import { testContainerUtils } from "@budibase/backend-core/tests"
diff --git a/packages/server/src/tests/logging.ts b/packages/server/src/tests/logging.ts
new file mode 100644
index 0000000000..271f4d62ff
--- /dev/null
+++ b/packages/server/src/tests/logging.ts
@@ -0,0 +1,34 @@
+export enum LogLevel {
+  TRACE = "trace",
+  DEBUG = "debug",
+  INFO = "info",
+  WARN = "warn",
+  ERROR = "error",
+}
+
+const LOG_INDEX: { [key in LogLevel]: number } = {
+  [LogLevel.TRACE]: 1,
+  [LogLevel.DEBUG]: 2,
+  [LogLevel.INFO]: 3,
+  [LogLevel.WARN]: 4,
+  [LogLevel.ERROR]: 5,
+}
+
+const setIndex = LOG_INDEX[process.env.LOG_LEVEL as LogLevel]
+
+if (setIndex > LOG_INDEX.trace) {
+  global.console.trace = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.debug) {
+  global.console.debug = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.info) {
+  global.console.info = jest.fn()
+  global.console.log = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.warn) {
+  global.console.warn = jest.fn()
+}
diff --git a/packages/types/src/api/web/errors.ts b/packages/types/src/api/web/errors.ts
index 65870d6a29..996c0ba34c 100644
--- a/packages/types/src/api/web/errors.ts
+++ b/packages/types/src/api/web/errors.ts
@@ -2,4 +2,5 @@ export interface APIError {
   message: string
   status: number
   error?: any
+  validationErrors?: any
 }
diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts
index d8df62f532..b390d36bb8 100644
--- a/packages/worker/src/api/index.ts
+++ b/packages/worker/src/api/index.ts
@@ -3,8 +3,7 @@ const compress = require("koa-compress")
 const zlib = require("zlib")
 import { routes } from "./routes"
 import { middleware as pro } from "@budibase/pro"
-import { errors, auth, middleware } from "@budibase/backend-core"
-import { APIError } from "@budibase/types"
+import { auth, middleware } from "@budibase/backend-core"
 
 const PUBLIC_ENDPOINTS = [
   // deprecated single tenant sso callback
@@ -109,7 +108,9 @@ const NO_TENANCY_ENDPOINTS = [
 const NO_CSRF_ENDPOINTS = [...PUBLIC_ENDPOINTS]
 
 const router: Router = new Router()
+
 router
+  .use(middleware.errorHandling)
   .use(
     compress({
       threshold: 2048,
@@ -136,29 +137,12 @@ router
       (!ctx.isAuthenticated || (ctx.user && !ctx.user.budibaseAccess)) &&
       !ctx.internal
     ) {
-      ctx.throw(403, "Unauthorized - no public worker access")
+      ctx.throw(403, "Unauthorized")
     }
     return next()
   })
   .use(middleware.auditLog)
 
-// error handling middleware - TODO: This could be moved to backend-core
-router.use(async (ctx, next) => {
-  try {
-    await next()
-  } catch (err: any) {
-    ctx.log.error(err)
-    ctx.status = err.status || err.statusCode || 500
-    const error = errors.getPublicError(err)
-    const body: APIError = {
-      message: err.message,
-      status: ctx.status,
-      error,
-    }
-    ctx.body = body
-  }
-})
-
 router.get("/health", ctx => (ctx.status = 200))
 
 // authenticated routes
diff --git a/packages/worker/src/api/routes/system/tests/migrations.spec.ts b/packages/worker/src/api/routes/system/tests/migrations.spec.ts
index 304a64761e..950f5c2153 100644
--- a/packages/worker/src/api/routes/system/tests/migrations.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/migrations.spec.ts
@@ -30,7 +30,7 @@ describe("/api/system/migrations", () => {
         headers: {},
         status: 403,
       })
-      expect(res.text).toBe("Unauthorized - no public worker access")
+      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
       expect(migrateFn).toBeCalledTimes(0)
     })
 
@@ -47,7 +47,7 @@ describe("/api/system/migrations", () => {
         headers: {},
         status: 403,
       })
-      expect(res.text).toBe("Unauthorized - no public worker access")
+      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
     })
 
     it("returns definitions", async () => {
diff --git a/packages/worker/src/middleware/tests/tenancy.spec.ts b/packages/worker/src/middleware/tests/tenancy.spec.ts
index a8b7a50e55..8853291634 100644
--- a/packages/worker/src/middleware/tests/tenancy.spec.ts
+++ b/packages/worker/src/middleware/tests/tenancy.spec.ts
@@ -24,7 +24,7 @@ describe("tenancy middleware", () => {
   })
 
   it("should get tenant id from header", async () => {
-    const tenantId = structures.uuid()
+    const tenantId = structures.tenant.id()
     const headers = {
       [constants.Header.TENANT_ID]: tenantId,
     }
@@ -35,7 +35,7 @@ describe("tenancy middleware", () => {
   })
 
   it("should get tenant id from query param", async () => {
-    const tenantId = structures.uuid()
+    const tenantId = structures.tenant.id()
     const res = await config.request.get(
       `/api/global/configs/checklist?tenantId=${tenantId}`
     )
@@ -43,7 +43,7 @@ describe("tenancy middleware", () => {
   })
 
   it("should get tenant id from subdomain", async () => {
-    const tenantId = structures.uuid()
+    const tenantId = structures.tenant.id()
     const headers = {
       host: `${tenantId}.localhost:10000`,
     }
@@ -67,7 +67,7 @@ describe("tenancy middleware", () => {
   it("should throw when no tenant id is found", async () => {
     const res = await config.request.get(`/api/global/configs/checklist`)
     expect(res.status).toBe(403)
-    expect(res.text).toBe("Tenant id not set")
+    expect(res.body).toEqual({ message: "Tenant id not set", status: 403 })
     expect(res.headers[constants.Header.TENANT_ID]).toBe(undefined)
   })
 })
diff --git a/packages/worker/src/tests/jestEnv.ts b/packages/worker/src/tests/jestEnv.ts
index 0b27cf52aa..602a505c1b 100644
--- a/packages/worker/src/tests/jestEnv.ts
+++ b/packages/worker/src/tests/jestEnv.ts
@@ -1,7 +1,7 @@
 process.env.SELF_HOSTED = "0"
 process.env.NODE_ENV = "jest"
 process.env.JWT_SECRET = "test-jwtsecret"
-process.env.LOG_LEVEL = "silent"
+process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
 process.env.MULTI_TENANCY = "1"
 process.env.MINIO_URL = "http://localhost"
 process.env.MINIO_ACCESS_KEY = "test"
diff --git a/packages/worker/src/tests/jestSetup.ts b/packages/worker/src/tests/jestSetup.ts
index 2deef96176..31d36f00ae 100644
--- a/packages/worker/src/tests/jestSetup.ts
+++ b/packages/worker/src/tests/jestSetup.ts
@@ -1,5 +1,6 @@
-import { mocks, testContainerUtils } from "@budibase/backend-core/tests"
+import "./logging"
 
+import { mocks, testContainerUtils } from "@budibase/backend-core/tests"
 import env from "../environment"
 import { env as coreEnv } from "@budibase/backend-core"
 
@@ -11,10 +12,6 @@ mocks.fetch.enable()
 const tk = require("timekeeper")
 tk.freeze(mocks.date.MOCK_DATE)
 
-if (!process.env.DEBUG) {
-  global.console.log = jest.fn() // console.log are ignored in tests
-}
-
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging
   // 100 seconds
diff --git a/packages/worker/src/tests/logging.ts b/packages/worker/src/tests/logging.ts
new file mode 100644
index 0000000000..271f4d62ff
--- /dev/null
+++ b/packages/worker/src/tests/logging.ts
@@ -0,0 +1,34 @@
+export enum LogLevel {
+  TRACE = "trace",
+  DEBUG = "debug",
+  INFO = "info",
+  WARN = "warn",
+  ERROR = "error",
+}
+
+const LOG_INDEX: { [key in LogLevel]: number } = {
+  [LogLevel.TRACE]: 1,
+  [LogLevel.DEBUG]: 2,
+  [LogLevel.INFO]: 3,
+  [LogLevel.WARN]: 4,
+  [LogLevel.ERROR]: 5,
+}
+
+const setIndex = LOG_INDEX[process.env.LOG_LEVEL as LogLevel]
+
+if (setIndex > LOG_INDEX.trace) {
+  global.console.trace = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.debug) {
+  global.console.debug = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.info) {
+  global.console.info = jest.fn()
+  global.console.log = jest.fn()
+}
+
+if (setIndex > LOG_INDEX.warn) {
+  global.console.warn = jest.fn()
+}

From ae9979929ad92b8be257422e8cd6c6339892e8c4 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 13 Feb 2023 11:57:30 +0000
Subject: [PATCH 008/273] Enable higher concurrency and resiliency in worker
 tests

---
 packages/backend-core/package.json            |   4 +-
 .../src/cache/tests/writethrough.spec.js      |  61 ------
 .../src/cache/tests/writethrough.spec.ts      |  73 +++++++
 packages/backend-core/src/cache/user.ts       |  14 +-
 .../backend-core/src/context/deprovision.ts   | 108 ----------
 .../src/context/tests/index.spec.ts           |  11 +-
 packages/backend-core/src/db/db.ts            |   3 +-
 .../src/db/tests/utils.seq.spec.ts            | 190 -----------------
 .../backend-core/src/db/tests/utils.spec.ts   | 192 +++++++++++++++++
 packages/backend-core/src/db/views.ts         |  64 +++---
 packages/backend-core/src/events/analytics.ts |   4 +-
 .../posthog/tests/PosthogProcessor.spec.ts    |   6 +-
 .../backend-core/src/featureFlags/index.ts    |   4 +-
 packages/backend-core/src/index.ts            |  20 +-
 .../src/middleware/authenticated.ts           |   2 +-
 .../src/middleware/passport/utils.ts          |   4 +-
 .../backend-core/src/middleware/tenancy.ts    |   3 +-
 .../backend-core/src/migrations/migrations.ts |   8 +-
 .../src/objectStore/buckets/global.ts         |   4 +-
 .../src/objectStore/buckets/plugins.ts        |   4 +-
 packages/backend-core/src/platform/index.ts   |   3 +
 .../backend-core/src/platform/platformDb.ts   |   6 +
 packages/backend-core/src/platform/tenants.ts | 101 +++++++++
 .../src/platform/tests/tenants.spec.ts        |  25 +++
 packages/backend-core/src/platform/users.ts   |  90 ++++++++
 packages/backend-core/src/redis/index.ts      |   2 +-
 packages/backend-core/src/redis/redlock.ts    |  39 ++--
 packages/backend-core/src/tenancy/db.ts       |   6 +
 packages/backend-core/src/tenancy/index.ts    |   2 +-
 packages/backend-core/src/tenancy/tenancy.ts  | 102 +--------
 .../src/utils/tests/utils.spec.ts             |  46 ++--
 .../tests/utilities/DBTestConfiguration.ts    |  32 +++
 packages/backend-core/tests/utilities/db.ts   |   9 -
 .../backend-core/tests/utilities/index.ts     |   3 +-
 .../backend-core/tests/utilities/testEnv.ts   |  16 +-
 packages/backend-core/yarn.lock               |   8 +-
 packages/server/package.json                  |   3 +-
 .../src/api/routes/tests/backup.spec.ts       |   1 -
 .../src/tests/utilities/TestConfiguration.ts  |  96 +++++----
 packages/server/yarn.lock                     | 109 ++++++----
 packages/types/src/sdk/locks.ts               |   1 +
 packages/worker/package.json                  |   5 +-
 .../src/api/controllers/global/users.ts       |  49 +++--
 .../src/api/controllers/system/tenants.ts     |  12 +-
 .../api/routes/global/tests/configs.spec.ts   | 198 ++++++++----------
 .../src/api/routes/global/tests/roles.spec.ts |   5 +-
 .../src/api/routes/global/tests/users.spec.ts |  84 ++++----
 .../worker/src/api/routes/system/tenants.ts   |   2 +-
 .../api/routes/system/tests/restore.spec.ts   |   4 +-
 .../api/routes/system/tests/status.spec.ts    |  10 +-
 .../functions/globalInfoSyncUsers.ts          |   7 +-
 packages/worker/src/sdk/tenants/index.ts      |   1 +
 packages/worker/src/sdk/tenants/tenants.ts    |  76 +++++++
 packages/worker/src/sdk/users/users.ts        |   2 +-
 .../worker/src/tests/TestConfiguration.ts     | 121 ++++-------
 packages/worker/src/tests/api/base.ts         |   3 +-
 packages/worker/src/tests/api/restore.ts      |   1 +
 packages/worker/yarn.lock                     | 110 +++++-----
 58 files changed, 1165 insertions(+), 1004 deletions(-)
 delete mode 100644 packages/backend-core/src/cache/tests/writethrough.spec.js
 create mode 100644 packages/backend-core/src/cache/tests/writethrough.spec.ts
 delete mode 100644 packages/backend-core/src/context/deprovision.ts
 delete mode 100644 packages/backend-core/src/db/tests/utils.seq.spec.ts
 create mode 100644 packages/backend-core/src/db/tests/utils.spec.ts
 create mode 100644 packages/backend-core/src/platform/index.ts
 create mode 100644 packages/backend-core/src/platform/platformDb.ts
 create mode 100644 packages/backend-core/src/platform/tenants.ts
 create mode 100644 packages/backend-core/src/platform/tests/tenants.spec.ts
 create mode 100644 packages/backend-core/src/platform/users.ts
 create mode 100644 packages/backend-core/src/tenancy/db.ts
 create mode 100644 packages/backend-core/tests/utilities/DBTestConfiguration.ts
 delete mode 100644 packages/backend-core/tests/utilities/db.ts
 create mode 100644 packages/worker/src/sdk/tenants/index.ts
 create mode 100644 packages/worker/src/sdk/tenants/tenants.ts

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e20798f3ac..ac87025303 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -18,7 +18,7 @@
     "build:pro": "../../scripts/pro/build.sh",
     "postbuild": "yarn run build:pro",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "test": "jest --coverage --maxWorkers=2",
+    "test": "jest --coverage",
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
@@ -62,7 +62,7 @@
     "@trendyol/jest-testcontainers": "^2.1.1",
     "@types/chance": "1.1.3",
     "@types/ioredis": "4.28.0",
-    "@types/jest": "27.5.1",
+    "@types/jest": "28.1.1",
     "@types/koa": "2.13.4",
     "@types/koa-pino-logger": "3.0.0",
     "@types/lodash": "4.14.180",
diff --git a/packages/backend-core/src/cache/tests/writethrough.spec.js b/packages/backend-core/src/cache/tests/writethrough.spec.js
deleted file mode 100644
index fefca30c18..0000000000
--- a/packages/backend-core/src/cache/tests/writethrough.spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-require("../../../tests")
-const { Writethrough } = require("../writethrough")
-const { getDB } = require("../../db")
-const tk = require("timekeeper")
-const { structures } = require("../../../tests")
-
-const START_DATE = Date.now()
-tk.freeze(START_DATE)
-
-
-const DELAY = 5000
-
-const db = getDB(structures.db.id())
-const db2 = getDB(structures.db.id())
-const writethrough = new Writethrough(db, DELAY), writethrough2 = new Writethrough(db2, DELAY)
-
-describe("writethrough", () => {
-  describe("put", () => {
-    let first
-    it("should be able to store, will go to DB", async () => {
-      const response = await writethrough.put({ _id: "test", value: 1 })
-      const output = await db.get(response.id)
-      first = output
-      expect(output.value).toBe(1)
-    })
-
-    it("second put shouldn't update DB", async () => {
-      const response = await writethrough.put({ ...first, value: 2 })
-      const output = await db.get(response.id)
-      expect(first._rev).toBe(output._rev)
-      expect(output.value).toBe(1)
-    })
-
-    it("should put it again after delay period", async () => {
-      tk.freeze(START_DATE + DELAY + 1)
-      const response = await writethrough.put({ ...first, value: 3 })
-      const output = await db.get(response.id)
-      expect(response.rev).not.toBe(first._rev)
-      expect(output.value).toBe(3)
-    })
-  })
-
-  describe("get", () => {
-    it("should be able to retrieve", async () => {
-      const response = await writethrough.get("test")
-      expect(response.value).toBe(3)
-    })
-  })
-
-  describe("same doc, different databases (tenancy)", () => {
-    it("should be able to two different databases", async () => {
-      const resp1 = await writethrough.put({ _id: "db1", value: "first" })
-      const resp2 = await writethrough2.put({ _id: "db1", value: "second" })
-      expect(resp1.rev).toBeDefined()
-      expect(resp2.rev).toBeDefined()
-      expect((await db.get("db1")).value).toBe("first")
-      expect((await db2.get("db1")).value).toBe("second")
-    })
-  })
-})
-
diff --git a/packages/backend-core/src/cache/tests/writethrough.spec.ts b/packages/backend-core/src/cache/tests/writethrough.spec.ts
new file mode 100644
index 0000000000..d346788121
--- /dev/null
+++ b/packages/backend-core/src/cache/tests/writethrough.spec.ts
@@ -0,0 +1,73 @@
+import { structures, DBTestConfiguration } from "../../../tests"
+import { Writethrough } from "../writethrough"
+import { getDB } from "../../db"
+import tk from "timekeeper"
+
+const START_DATE = Date.now()
+tk.freeze(START_DATE)
+
+const DELAY = 5000
+
+describe("writethrough", () => {
+  const config = new DBTestConfiguration()
+
+  const db = getDB(structures.db.id())
+  const db2 = getDB(structures.db.id())
+
+  const writethrough = new Writethrough(db, DELAY)
+  const writethrough2 = new Writethrough(db2, DELAY)
+
+  describe("put", () => {
+    let first: any
+
+    it("should be able to store, will go to DB", async () => {
+      await config.doInTenant(async () => {
+        const response = await writethrough.put({ _id: "test", value: 1 })
+        const output = await db.get(response.id)
+        first = output
+        expect(output.value).toBe(1)
+      })
+    })
+
+    it("second put shouldn't update DB", async () => {
+      await config.doInTenant(async () => {
+        const response = await writethrough.put({ ...first, value: 2 })
+        const output = await db.get(response.id)
+        expect(first._rev).toBe(output._rev)
+        expect(output.value).toBe(1)
+      })
+    })
+
+    it("should put it again after delay period", async () => {
+      await config.doInTenant(async () => {
+        tk.freeze(START_DATE + DELAY + 1)
+        const response = await writethrough.put({ ...first, value: 3 })
+        const output = await db.get(response.id)
+        expect(response.rev).not.toBe(first._rev)
+        expect(output.value).toBe(3)
+      })
+    })
+  })
+
+  describe("get", () => {
+    it("should be able to retrieve", async () => {
+      await config.doInTenant(async () => {
+        const response = await writethrough.get("test")
+        expect(response.value).toBe(3)
+      })
+    })
+  })
+
+  describe("same doc, different databases (tenancy)", () => {
+    it("should be able to two different databases", async () => {
+      await config.doInTenant(async () => {
+        const resp1 = await writethrough.put({ _id: "db1", value: "first" })
+        const resp2 = await writethrough2.put({ _id: "db1", value: "second" })
+        expect(resp1.rev).toBeDefined()
+        expect(resp2.rev).toBeDefined()
+        expect((await db.get("db1")).value).toBe("first")
+        expect((await db2.get("db1")).value).toBe("second")
+      })
+    })
+  })
+})
diff --git a/packages/backend-core/src/cache/user.ts b/packages/backend-core/src/cache/user.ts
index a128465cd6..b514c3af9b 100644
--- a/packages/backend-core/src/cache/user.ts
+++ b/packages/backend-core/src/cache/user.ts
@@ -1,8 +1,9 @@
 import * as redis from "../redis/init"
-import { getTenantId, lookupTenantId, doWithGlobalDB } from "../tenancy"
+import * as tenancy from "../tenancy"
+import * as context from "../context"
+import * as platform from "../platform"
 import env from "../environment"
-import * as accounts from "../cloud/accounts"
-import { Database } from "@budibase/types"
+import * as accounts from "../accounts"
 
 const EXPIRY_SECONDS = 3600
 
@@ -10,7 +11,8 @@ const EXPIRY_SECONDS = 3600
  * The default populate user function
  */
 async function populateFromDB(userId: string, tenantId: string) {
-  const user = await doWithGlobalDB(tenantId, (db: Database) => db.get(userId))
+  const db = tenancy.getTenantDB(tenantId)
+  const user = await db.get(userId)
   user.budibaseAccess = true
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
     const account = await accounts.getAccount(user.email)
@@ -42,9 +44,9 @@ export async function getUser(
   }
   if (!tenantId) {
     try {
-      tenantId = getTenantId()
+      tenantId = context.getTenantId()
     } catch (err) {
-      tenantId = await lookupTenantId(userId)
+      tenantId = await platform.users.lookupTenantId(userId)
     }
   }
   const client = await redis.getUserClient()
diff --git a/packages/backend-core/src/context/deprovision.ts b/packages/backend-core/src/context/deprovision.ts
deleted file mode 100644
index 81f03096dc..0000000000
--- a/packages/backend-core/src/context/deprovision.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import {
-  getGlobalUserParams,
-  getAllApps,
-  doWithDB,
-  StaticDatabases,
-} from "../db"
-import { doWithGlobalDB } from "../tenancy"
-import { App, Tenants, User, Database } from "@budibase/types"
-
-const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants
-const PLATFORM_INFO_DB = StaticDatabases.PLATFORM_INFO.name
-
-async function removeTenantFromInfoDB(tenantId: string) {
-  try {
-    await doWithDB(PLATFORM_INFO_DB, async (infoDb: Database) => {
-      const tenants = (await infoDb.get(TENANT_DOC)) as Tenants
-      tenants.tenantIds = tenants.tenantIds.filter(id => id !== tenantId)
-
-      await infoDb.put(tenants)
-    })
-  } catch (err) {
-    console.error(`Error removing tenant ${tenantId} from info db`, err)
-    throw err
-  }
-}
-
-export async function removeUserFromInfoDB(dbUser: User) {
-  await doWithDB(PLATFORM_INFO_DB, async (infoDb: Database) => {
-    const keys = [dbUser._id!, dbUser.email]
-    const userDocs = await infoDb.allDocs({
-      keys,
-      include_docs: true,
-    })
-    const toDelete = userDocs.rows.map((row: any) => {
-      return {
-        ...row.doc,
-        _deleted: true,
-      }
-    })
-    await infoDb.bulkDocs(toDelete)
-  })
-}
-
-async function removeUsersFromInfoDB(tenantId: string) {
-  return doWithGlobalDB(tenantId, async (db: any) => {
-    try {
-      const allUsers = await db.allDocs(
-        getGlobalUserParams(null, {
-          include_docs: true,
-        })
-      )
-      await doWithDB(PLATFORM_INFO_DB, async (infoDb: any) => {
-        const allEmails = allUsers.rows.map((row: any) => row.doc.email)
-        // get the id docs
-        let keys = allUsers.rows.map((row: any) => row.id)
-        // and the email docs
-        keys = keys.concat(allEmails)
-        // retrieve the docs and delete them
-        const userDocs = await infoDb.allDocs({
-          keys,
-          include_docs: true,
-        })
-        const toDelete = userDocs.rows.map((row: any) => {
-          return {
-            ...row.doc,
-            _deleted: true,
-          }
-        })
-        await infoDb.bulkDocs(toDelete)
-      })
-    } catch (err) {
-      console.error(`Error removing tenant ${tenantId} users from info db`, err)
-      throw err
-    }
-  })
-}
-
-async function removeGlobalDB(tenantId: string) {
-  return doWithGlobalDB(tenantId, async (db: Database) => {
-    try {
-      await db.destroy()
-    } catch (err) {
-      console.error(`Error removing tenant ${tenantId} users from info db`, err)
-      throw err
-    }
-  })
-}
-
-async function removeTenantApps(tenantId: string) {
-  try {
-    const apps = (await getAllApps({ all: true })) as App[]
-    const destroyPromises = apps.map(app =>
-      doWithDB(app.appId, (db: Database) => db.destroy())
-    )
-    await Promise.allSettled(destroyPromises)
-  } catch (err) {
-    console.error(`Error removing tenant ${tenantId} apps`, err)
-    throw err
-  }
-}
-
-// can't live in tenancy package due to circular dependency on db/utils
-export async function deleteTenant(tenantId: string) {
-  await removeTenantFromInfoDB(tenantId)
-  await removeUsersFromInfoDB(tenantId)
-  await removeGlobalDB(tenantId)
-  await removeTenantApps(tenantId)
-}
diff --git a/packages/backend-core/src/context/tests/index.spec.ts b/packages/backend-core/src/context/tests/index.spec.ts
index c9b5870ffa..5c8ce6fc19 100644
--- a/packages/backend-core/src/context/tests/index.spec.ts
+++ b/packages/backend-core/src/context/tests/index.spec.ts
@@ -1,11 +1,14 @@
-require("../../../tests")
+import { testEnv } from "../../../tests"
 const context = require("../")
 const { DEFAULT_TENANT_ID } = require("../../constants")
-import env from "../../environment"
 
 describe("context", () => {
   describe("doInTenant", () => {
     describe("single-tenancy", () => {
+      beforeAll(() => {
+        testEnv.singleTenant()
+      })
+
       it("defaults to the default tenant", () => {
         const tenantId = context.getTenantId()
         expect(tenantId).toBe(DEFAULT_TENANT_ID)
@@ -20,8 +23,8 @@ describe("context", () => {
     })
 
     describe("multi-tenancy", () => {
-      beforeEach(() => {
-        env._set("MULTI_TENANCY", 1)
+      beforeAll(() => {
+        testEnv.multiTenant()
       })
 
       it("fails when no tenant id is set", () => {
diff --git a/packages/backend-core/src/db/db.ts b/packages/backend-core/src/db/db.ts
index bd6b5e13c1..f13eb9a965 100644
--- a/packages/backend-core/src/db/db.ts
+++ b/packages/backend-core/src/db/db.ts
@@ -1,7 +1,6 @@
 import env from "../environment"
-import { directCouchQuery, getPouchDB } from "./couch"
+import { directCouchQuery, DatabaseImpl } from "./couch"
 import { CouchFindOptions, Database } from "@budibase/types"
-import { DatabaseImpl } from "../db"
 
 const dbList = new Set()
 
diff --git a/packages/backend-core/src/db/tests/utils.seq.spec.ts b/packages/backend-core/src/db/tests/utils.seq.spec.ts
deleted file mode 100644
index 83253402f7..0000000000
--- a/packages/backend-core/src/db/tests/utils.seq.spec.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-require("../../../tests")
-const {
-  getDevelopmentAppID,
-  getProdAppID,
-  isDevAppID,
-  isProdAppID,
-} = require("../conversions")
-const { generateAppID, getPlatformUrl, getScopedConfig } = require("../utils")
-const tenancy = require("../../tenancy")
-const { Config, DEFAULT_TENANT_ID } = require("../../constants")
-import { generator } from "../../../tests"
-import env from "../../environment"
-
-describe("utils", () => {
-  describe("app ID manipulation", () => {
-    function getID() {
-      const appId = generateAppID()
-      const split = appId.split("_")
-      const uuid = split[split.length - 1]
-      const devAppId = `app_dev_${uuid}`
-      return { appId, devAppId, split, uuid }
-    }
-
-    it("should be able to generate a new app ID", () => {
-      expect(generateAppID().startsWith("app_")).toEqual(true)
-    })
-
-    it("should be able to convert a production app ID to development", () => {
-      const { appId, uuid } = getID()
-      expect(getDevelopmentAppID(appId)).toEqual(`app_dev_${uuid}`)
-    })
-
-    it("should be able to convert a development app ID to development", () => {
-      const { devAppId, uuid } = getID()
-      expect(getDevelopmentAppID(devAppId)).toEqual(`app_dev_${uuid}`)
-    })
-
-    it("should be able to convert a development ID to a production", () => {
-      const { devAppId, uuid } = getID()
-      expect(getProdAppID(devAppId)).toEqual(`app_${uuid}`)
-    })
-
-    it("should be able to convert a production ID to production", () => {
-      const { appId, uuid } = getID()
-      expect(getProdAppID(appId)).toEqual(`app_${uuid}`)
-    })
-
-    it("should be able to confirm dev app ID is development", () => {
-      const { devAppId } = getID()
-      expect(isDevAppID(devAppId)).toEqual(true)
-    })
-
-    it("should be able to confirm prod app ID is not development", () => {
-      const { appId } = getID()
-      expect(isDevAppID(appId)).toEqual(false)
-    })
-
-    it("should be able to confirm prod app ID is prod", () => {
-      const { appId } = getID()
-      expect(isProdAppID(appId)).toEqual(true)
-    })
-
-    it("should be able to confirm dev app ID is not prod", () => {
-      const { devAppId } = getID()
-      expect(isProdAppID(devAppId)).toEqual(false)
-    })
-  })
-})
-
-const DEFAULT_URL = "http://localhost:10000"
-const ENV_URL = "http://env.com"
-
-const setDbPlatformUrl = async (dbUrl: string) => {
-  const db = tenancy.getGlobalDB()
-  await db.put({
-    _id: "config_settings",
-    type: Config.SETTINGS,
-    config: {
-      platformUrl: dbUrl,
-    },
-  })
-}
-
-const clearSettingsConfig = async () => {
-  await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-    const db = tenancy.getGlobalDB()
-    try {
-      const config = await db.get("config_settings")
-      await db.remove("config_settings", config._rev)
-    } catch (e: any) {
-      if (e.status !== 404) {
-        throw e
-      }
-    }
-  })
-}
-
-describe("getPlatformUrl", () => {
-  describe("self host", () => {
-    beforeEach(async () => {
-      env._set("SELF_HOST", 1)
-      await clearSettingsConfig()
-    })
-
-    it("gets the default url", async () => {
-      await tenancy.doInTenant(null, async () => {
-        const url = await getPlatformUrl()
-        expect(url).toBe(DEFAULT_URL)
-      })
-    })
-
-    it("gets the platform url from the environment", async () => {
-      await tenancy.doInTenant(null, async () => {
-        env._set("PLATFORM_URL", ENV_URL)
-        const url = await getPlatformUrl()
-        expect(url).toBe(ENV_URL)
-      })
-    })
-
-    it("gets the platform url from the database", async () => {
-      await tenancy.doInTenant(null, async () => {
-        const dbUrl = generator.url()
-        await setDbPlatformUrl(dbUrl)
-        const url = await getPlatformUrl()
-        expect(url).toBe(dbUrl)
-      })
-    })
-  })
-
-  describe("cloud", () => {
-    const TENANT_AWARE_URL = "http://default.env.com"
-
-    beforeEach(async () => {
-      env._set("SELF_HOSTED", 0)
-      env._set("MULTI_TENANCY", 1)
-      env._set("PLATFORM_URL", ENV_URL)
-      await clearSettingsConfig()
-    })
-
-    it("gets the platform url from the environment without tenancy", async () => {
-      await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-        const url = await getPlatformUrl({ tenantAware: false })
-        expect(url).toBe(ENV_URL)
-      })
-    })
-
-    it("gets the platform url from the environment with tenancy", async () => {
-      await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-        const url = await getPlatformUrl()
-        expect(url).toBe(TENANT_AWARE_URL)
-      })
-    })
-
-    it("never gets the platform url from the database", async () => {
-      await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-        await setDbPlatformUrl(generator.url())
-        const url = await getPlatformUrl()
-        expect(url).toBe(TENANT_AWARE_URL)
-      })
-    })
-  })
-})
-
-describe("getScopedConfig", () => {
-  describe("settings config", () => {
-    beforeEach(async () => {
-      env._set("SELF_HOSTED", 1)
-      env._set("PLATFORM_URL", "")
-      await clearSettingsConfig()
-    })
-
-    it("returns the platform url with an existing config", async () => {
-      await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-        const dbUrl = generator.url()
-        await setDbPlatformUrl(dbUrl)
-        const db = tenancy.getGlobalDB()
-        const config = await getScopedConfig(db, { type: Config.SETTINGS })
-        expect(config.platformUrl).toBe(dbUrl)
-      })
-    })
-
-    it("returns the platform url without an existing config", async () => {
-      await tenancy.doInTenant(DEFAULT_TENANT_ID, async () => {
-        const db = tenancy.getGlobalDB()
-        const config = await getScopedConfig(db, { type: Config.SETTINGS })
-        expect(config.platformUrl).toBe(DEFAULT_URL)
-      })
-    })
-  })
-})
diff --git a/packages/backend-core/src/db/tests/utils.spec.ts b/packages/backend-core/src/db/tests/utils.spec.ts
new file mode 100644
index 0000000000..7bdca5ae8b
--- /dev/null
+++ b/packages/backend-core/src/db/tests/utils.spec.ts
@@ -0,0 +1,192 @@
+import { generator, DBTestConfiguration, testEnv } from "../../../tests"
+import {
+  getDevelopmentAppID,
+  getProdAppID,
+  isDevAppID,
+  isProdAppID,
+} from "../conversions"
+import { generateAppID, getPlatformUrl, getScopedConfig } from "../utils"
+import * as context from "../../context"
+import { Config } from "../../constants"
+import env from "../../environment"
+
+describe("utils", () => {
+  const config = new DBTestConfiguration()
+
+  describe("app ID manipulation", () => {
+    function getID() {
+      const appId = generateAppID()
+      const split = appId.split("_")
+      const uuid = split[split.length - 1]
+      const devAppId = `app_dev_${uuid}`
+      return { appId, devAppId, split, uuid }
+    }
+
+    it("should be able to generate a new app ID", () => {
+      expect(generateAppID().startsWith("app_")).toEqual(true)
+    })
+
+    it("should be able to convert a production app ID to development", () => {
+      const { appId, uuid } = getID()
+      expect(getDevelopmentAppID(appId)).toEqual(`app_dev_${uuid}`)
+    })
+
+    it("should be able to convert a development app ID to development", () => {
+      const { devAppId, uuid } = getID()
+      expect(getDevelopmentAppID(devAppId)).toEqual(`app_dev_${uuid}`)
+    })
+
+    it("should be able to convert a development ID to a production", () => {
+      const { devAppId, uuid } = getID()
+      expect(getProdAppID(devAppId)).toEqual(`app_${uuid}`)
+    })
+
+    it("should be able to convert a production ID to production", () => {
+      const { appId, uuid } = getID()
+      expect(getProdAppID(appId)).toEqual(`app_${uuid}`)
+    })
+
+    it("should be able to confirm dev app ID is development", () => {
+      const { devAppId } = getID()
+      expect(isDevAppID(devAppId)).toEqual(true)
+    })
+
+    it("should be able to confirm prod app ID is not development", () => {
+      const { appId } = getID()
+      expect(isDevAppID(appId)).toEqual(false)
+    })
+
+    it("should be able to confirm prod app ID is prod", () => {
+      const { appId } = getID()
+      expect(isProdAppID(appId)).toEqual(true)
+    })
+
+    it("should be able to confirm dev app ID is not prod", () => {
+      const { devAppId } = getID()
+      expect(isProdAppID(devAppId)).toEqual(false)
+    })
+  })
+
+  const DEFAULT_URL = "http://localhost:10000"
+  const ENV_URL = "http://env.com"
+
+  const setDbPlatformUrl = async (dbUrl: string) => {
+    const db = context.getGlobalDB()
+    await db.put({
+      _id: "config_settings",
+      type: Config.SETTINGS,
+      config: {
+        platformUrl: dbUrl,
+      },
+    })
+  }
+
+  const clearSettingsConfig = async () => {
+    await config.doInTenant(async () => {
+      const db = context.getGlobalDB()
+      try {
+        const config = await db.get("config_settings")
+        await db.remove("config_settings", config._rev)
+      } catch (e: any) {
+        if (e.status !== 404) {
+          throw e
+        }
+      }
+    })
+  }
+
+  describe("getPlatformUrl", () => {
+    describe("self host", () => {
+      beforeEach(async () => {
+        testEnv.selfHosted()
+        await clearSettingsConfig()
+      })
+
+      it("gets the default url", async () => {
+        await config.doInTenant(async () => {
+          const url = await getPlatformUrl()
+          expect(url).toBe(DEFAULT_URL)
+        })
+      })
+
+      it("gets the platform url from the environment", async () => {
+        await config.doInTenant(async () => {
+          env._set("PLATFORM_URL", ENV_URL)
+          const url = await getPlatformUrl()
+          expect(url).toBe(ENV_URL)
+        })
+      })
+
+      it("gets the platform url from the database", async () => {
+        await config.doInTenant(async () => {
+          const dbUrl = generator.url()
+          await setDbPlatformUrl(dbUrl)
+          const url = await getPlatformUrl()
+          expect(url).toBe(dbUrl)
+        })
+      })
+    })
+
+    describe("cloud", () => {
+      const TENANT_AWARE_URL = `http://${config.tenantId}.env.com`
+
+      beforeEach(async () => {
+        testEnv.cloudHosted()
+        testEnv.multiTenant()
+
+        env._set("PLATFORM_URL", ENV_URL)
+        await clearSettingsConfig()
+      })
+
+      it("gets the platform url from the environment without tenancy", async () => {
+        await config.doInTenant(async () => {
+          const url = await getPlatformUrl({ tenantAware: false })
+          expect(url).toBe(ENV_URL)
+        })
+      })
+
+      it("gets the platform url from the environment with tenancy", async () => {
+        await config.doInTenant(async () => {
+          const url = await getPlatformUrl()
+          expect(url).toBe(TENANT_AWARE_URL)
+        })
+      })
+
+      it("never gets the platform url from the database", async () => {
+        await config.doInTenant(async () => {
+          await setDbPlatformUrl(generator.url())
+          const url = await getPlatformUrl()
+          expect(url).toBe(TENANT_AWARE_URL)
+        })
+      })
+    })
+  })
+
+  describe("getScopedConfig", () => {
+    describe("settings config", () => {
+      beforeEach(async () => {
+        env._set("SELF_HOSTED", 1)
+        env._set("PLATFORM_URL", "")
+        await clearSettingsConfig()
+      })
+
+      it("returns the platform url with an existing config", async () => {
+        await config.doInTenant(async () => {
+          const dbUrl = generator.url()
+          await setDbPlatformUrl(dbUrl)
+          const db = context.getGlobalDB()
+          const config = await getScopedConfig(db, { type: Config.SETTINGS })
+          expect(config.platformUrl).toBe(dbUrl)
+        })
+      })
+
+      it("returns the platform url without an existing config", async () => {
+        await config.doInTenant(async () => {
+          const db = context.getGlobalDB()
+          const config = await getScopedConfig(db, { type: Config.SETTINGS })
+          expect(config.platformUrl).toBe(DEFAULT_URL)
+        })
+      })
+    })
+  })
+})
diff --git a/packages/backend-core/src/db/views.ts b/packages/backend-core/src/db/views.ts
index 4a87be0a68..8a2c2e7efd 100644
--- a/packages/backend-core/src/db/views.ts
+++ b/packages/backend-core/src/db/views.ts
@@ -1,13 +1,14 @@
 import {
-  DocumentType,
-  ViewName,
   DeprecatedViews,
+  DocumentType,
   SEPARATOR,
   StaticDatabases,
+  ViewName,
 } from "../constants"
 import { getGlobalDB } from "../context"
 import { doWithDB } from "./"
 import { Database, DatabaseQueryOpts } from "@budibase/types"
+import env from "../environment"
 
 const DESIGN_DB = "_design/database"
 
@@ -69,17 +70,6 @@ export const createNewUserEmailView = async () => {
   await createView(db, viewJs, ViewName.USER_BY_EMAIL)
 }
 
-export const createAccountEmailView = async () => {
-  const viewJs = `function(doc) {
-    if (doc._id.startsWith("${DocumentType.ACCOUNT_METADATA}${SEPARATOR}")) {
-      emit(doc.email.toLowerCase(), doc._id)
-    }
-  }`
-  await doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: Database) => {
-    await createView(db, viewJs, ViewName.ACCOUNT_BY_EMAIL)
-  })
-}
-
 export const createUserAppView = async () => {
   const db = getGlobalDB()
   const viewJs = `function(doc) {
@@ -113,17 +103,6 @@ export const createUserBuildersView = async () => {
   await createView(db, viewJs, ViewName.USER_BY_BUILDERS)
 }
 
-export const createPlatformUserView = async () => {
-  const viewJs = `function(doc) {
-    if (doc.tenantId) {
-      emit(doc._id.toLowerCase(), doc._id)
-    }
-  }`
-  await doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: Database) => {
-    await createView(db, viewJs, ViewName.PLATFORM_USERS_LOWERCASE)
-  })
-}
-
 export interface QueryViewOptions {
   arrayResponse?: boolean
 }
@@ -162,13 +141,48 @@ export const queryView = async <T>(
   }
 }
 
+// PLATFORM
+
+async function createPlatformView(viewJs: string, viewName: ViewName) {
+  try {
+    await doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: Database) => {
+      await createView(db, viewJs, viewName)
+    })
+  } catch (e: any) {
+    if (e.status === 409 && env.isTest()) {
+      // multiple tests can try to initialise platforms views
+      // at once - safe to exit on conflict
+      return
+    }
+    throw e
+  }
+}
+
+export const createPlatformAccountEmailView = async () => {
+  const viewJs = `function(doc) {
+    if (doc._id.startsWith("${DocumentType.ACCOUNT_METADATA}${SEPARATOR}")) {
+      emit(doc.email.toLowerCase(), doc._id)
+    }
+  }`
+  await createPlatformView(viewJs, ViewName.ACCOUNT_BY_EMAIL)
+}
+
+export const createPlatformUserView = async () => {
+  const viewJs = `function(doc) {
+    if (doc.tenantId) {
+      emit(doc._id.toLowerCase(), doc._id)
+    }
+  }`
+  await createPlatformView(viewJs, ViewName.PLATFORM_USERS_LOWERCASE)
+}
+
 export const queryPlatformView = async <T>(
   viewName: ViewName,
   params: DatabaseQueryOpts,
   opts?: QueryViewOptions
 ): Promise<T[] | T | undefined> => {
   const CreateFuncByName: any = {
-    [ViewName.ACCOUNT_BY_EMAIL]: createAccountEmailView,
+    [ViewName.ACCOUNT_BY_EMAIL]: createPlatformAccountEmailView,
     [ViewName.PLATFORM_USERS_LOWERCASE]: createPlatformUserView,
   }
 
diff --git a/packages/backend-core/src/events/analytics.ts b/packages/backend-core/src/events/analytics.ts
index f621a9c98b..7fbc6d9c2b 100644
--- a/packages/backend-core/src/events/analytics.ts
+++ b/packages/backend-core/src/events/analytics.ts
@@ -1,5 +1,5 @@
 import env from "../environment"
-import * as tenancy from "../tenancy"
+import * as context from "../context"
 import * as dbUtils from "../db/utils"
 import { Config } from "../constants"
 import { withCache, TTL, CacheKey } from "../cache"
@@ -42,7 +42,7 @@ export const enabled = async () => {
 }
 
 const getSettingsDoc = async () => {
-  const db = tenancy.getGlobalDB()
+  const db = context.getGlobalDB()
   let settings
   try {
     settings = await db.get(dbUtils.generateConfigID({ type: Config.SETTINGS }))
diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
index 349a0427ac..2c1340d36e 100644
--- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
+++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
@@ -1,4 +1,4 @@
-import "../../../../../tests"
+import { testEnv } from "../../../../../tests"
 import PosthogProcessor from "../PosthogProcessor"
 import { Event, IdentityType, Hosting } from "@budibase/types"
 const tk = require("timekeeper")
@@ -16,6 +16,10 @@ const newIdentity = () => {
 }
 
 describe("PosthogProcessor", () => {
+  beforeAll(() => {
+    testEnv.singleTenant()
+  })
+
   beforeEach(async () => {
     jest.clearAllMocks()
     await cache.bustCache(
diff --git a/packages/backend-core/src/featureFlags/index.ts b/packages/backend-core/src/featureFlags/index.ts
index 34ee3599a5..877cd60e1a 100644
--- a/packages/backend-core/src/featureFlags/index.ts
+++ b/packages/backend-core/src/featureFlags/index.ts
@@ -1,5 +1,5 @@
 import env from "../environment"
-import * as tenancy from "../tenancy"
+import * as context from "../context"
 
 /**
  * Read the TENANT_FEATURE_FLAGS env var and return an array of features flags for each tenant.
@@ -28,7 +28,7 @@ export function buildFeatureFlags() {
 }
 
 export function isEnabled(featureFlag: string) {
-  const tenantId = tenancy.getTenantId()
+  const tenantId = context.getTenantId()
   const flags = getTenantFeatureFlags(tenantId)
   return flags.includes(featureFlag)
 }
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index b38a53e9e4..d507d8175f 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -3,12 +3,11 @@ export * as migrations from "./migrations"
 export * as users from "./users"
 export * as roles from "./security/roles"
 export * as permissions from "./security/permissions"
-export * as accounts from "./cloud/accounts"
+export * as accounts from "./accounts"
 export * as installation from "./installation"
-export * as tenancy from "./tenancy"
 export * as featureFlags from "./featureFlags"
 export * as sessions from "./security/sessions"
-export * as deprovisioning from "./context/deprovision"
+export * as platform from "./platform"
 export * as auth from "./auth"
 export * as constants from "./constants"
 export * as logging from "./logging"
@@ -21,20 +20,27 @@ export * as context from "./context"
 export * as cache from "./cache"
 export * as objectStore from "./objectStore"
 export * as redis from "./redis"
+export * as locks from "./redis/redlock"
 export * as utils from "./utils"
 export * as errors from "./errors"
 export { default as env } from "./environment"
 
+// Add context to tenancy for backwards compatibility
+// only do this for external usages to prevent internal
+// circular dependencies
+import * as context from "./context"
+import * as _tenancy from "./tenancy"
+export const tenancy = {
+  ..._tenancy,
+  ...context,
+}
+
 // expose error classes directly
 export * from "./errors"
 
 // expose constants directly
 export * from "./constants"
 
-// expose inner locks from redis directly
-import * as redis from "./redis"
-export const locks = redis.redlock
-
 // expose package init function
 import * as db from "./db"
 export const init = (opts: any = {}) => {
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 3b5e9ae162..4bb2aaba76 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -4,7 +4,7 @@ import { getUser } from "../cache/user"
 import { getSession, updateSessionTTL } from "../security/sessions"
 import { buildMatcherRegex, matches } from "./matchers"
 import { SEPARATOR, queryGlobalView, ViewName } from "../db"
-import { getGlobalDB, doInTenant } from "../tenancy"
+import { getGlobalDB, doInTenant } from "../context"
 import { decrypt } from "../security/encryption"
 import * as identity from "../context/identity"
 import env from "../environment"
diff --git a/packages/backend-core/src/middleware/passport/utils.ts b/packages/backend-core/src/middleware/passport/utils.ts
index 3d79aada28..6eb3bc29d1 100644
--- a/packages/backend-core/src/middleware/passport/utils.ts
+++ b/packages/backend-core/src/middleware/passport/utils.ts
@@ -1,6 +1,6 @@
-import { isMultiTenant, getTenantId } from "../../tenancy"
+import { isMultiTenant, getTenantId } from "../../context"
 import { getScopedConfig } from "../../db"
-import { ConfigType, Database, Config } from "@budibase/types"
+import { ConfigType, Database } from "@budibase/types"
 
 /**
  * Utility to handle authentication errors.
diff --git a/packages/backend-core/src/middleware/tenancy.ts b/packages/backend-core/src/middleware/tenancy.ts
index a09c463045..22b7cc213d 100644
--- a/packages/backend-core/src/middleware/tenancy.ts
+++ b/packages/backend-core/src/middleware/tenancy.ts
@@ -1,4 +1,5 @@
-import { doInTenant, getTenantIDFromCtx } from "../tenancy"
+import { doInTenant } from "../context"
+import { getTenantIDFromCtx } from "../tenancy"
 import { buildMatcherRegex, matches } from "./matchers"
 import { Header } from "../constants"
 import {
diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 55b8ab1938..79c7eb55ea 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -7,7 +7,7 @@ import {
   doWithDB,
 } from "../db"
 import environment from "../environment"
-import { doInTenant, getTenantIds, getTenantId } from "../tenancy"
+import * as platform from "../platform"
 import * as context from "../context"
 import { DEFINITIONS } from "."
 import {
@@ -47,7 +47,7 @@ export const runMigration = async (
   const migrationType = migration.type
   let tenantId: string | undefined
   if (migrationType !== MigrationType.INSTALLATION) {
-    tenantId = getTenantId()
+    tenantId = context.getTenantId()
   }
   const migrationName = migration.name
   const silent = migration.silent
@@ -160,7 +160,7 @@ export const runMigrations = async (
       tenantIds = [options.noOp.tenantId]
     } else if (!options.tenantIds || !options.tenantIds.length) {
       // run for all tenants
-      tenantIds = await getTenantIds()
+      tenantIds = await platform.tenants.getTenantIds()
     } else {
       tenantIds = options.tenantIds
     }
@@ -185,7 +185,7 @@ export const runMigrations = async (
     // for all migrations
     for (const migration of migrations) {
       // run the migration
-      await doInTenant(tenantId, () => runMigration(migration, options))
+      await context.doInTenant(tenantId, () => runMigration(migration, options))
     }
   }
   console.log("Migrations complete")
diff --git a/packages/backend-core/src/objectStore/buckets/global.ts b/packages/backend-core/src/objectStore/buckets/global.ts
index 8bf883b11e..69e201bb98 100644
--- a/packages/backend-core/src/objectStore/buckets/global.ts
+++ b/packages/backend-core/src/objectStore/buckets/global.ts
@@ -1,5 +1,5 @@
 import env from "../../environment"
-import * as tenancy from "../../tenancy"
+import * as context from "../../context"
 import * as objectStore from "../objectStore"
 import * as cloudfront from "../cloudfront"
 
@@ -22,7 +22,7 @@ export const getGlobalFileUrl = (type: string, name: string, etag?: string) => {
 export const getGlobalFileS3Key = (type: string, name: string) => {
   let file = `${type}/${name}`
   if (env.MULTI_TENANCY) {
-    const tenantId = tenancy.getTenantId()
+    const tenantId = context.getTenantId()
     file = `${tenantId}/${file}`
   }
   return file
diff --git a/packages/backend-core/src/objectStore/buckets/plugins.ts b/packages/backend-core/src/objectStore/buckets/plugins.ts
index cd3bf77e87..f7721afb23 100644
--- a/packages/backend-core/src/objectStore/buckets/plugins.ts
+++ b/packages/backend-core/src/objectStore/buckets/plugins.ts
@@ -1,6 +1,6 @@
 import env from "../../environment"
 import * as objectStore from "../objectStore"
-import * as tenancy from "../../tenancy"
+import * as context from "../../context"
 import * as cloudfront from "../cloudfront"
 import { Plugin } from "@budibase/types"
 
@@ -61,7 +61,7 @@ const getPluginS3Key = (plugin: Plugin, fileName: string) => {
 export const getPluginS3Dir = (pluginName: string) => {
   let s3Key = `${pluginName}`
   if (env.MULTI_TENANCY) {
-    const tenantId = tenancy.getTenantId()
+    const tenantId = context.getTenantId()
     s3Key = `${tenantId}/${s3Key}`
   }
   if (env.CLOUDFRONT_CDN) {
diff --git a/packages/backend-core/src/platform/index.ts b/packages/backend-core/src/platform/index.ts
new file mode 100644
index 0000000000..877d85ade0
--- /dev/null
+++ b/packages/backend-core/src/platform/index.ts
@@ -0,0 +1,3 @@
+export * as users from "./users"
+export * as tenants from "./tenants"
+export * from "./platformDb"
diff --git a/packages/backend-core/src/platform/platformDb.ts b/packages/backend-core/src/platform/platformDb.ts
new file mode 100644
index 0000000000..90b683dd33
--- /dev/null
+++ b/packages/backend-core/src/platform/platformDb.ts
@@ -0,0 +1,6 @@
+import { StaticDatabases } from "../constants"
+import { getDB } from "../db/db"
+
+export function getPlatformDB() {
+  return getDB(StaticDatabases.PLATFORM_INFO.name)
+}
diff --git a/packages/backend-core/src/platform/tenants.ts b/packages/backend-core/src/platform/tenants.ts
new file mode 100644
index 0000000000..b9f946a735
--- /dev/null
+++ b/packages/backend-core/src/platform/tenants.ts
@@ -0,0 +1,101 @@
+import { StaticDatabases } from "../constants"
+import { getPlatformDB } from "./platformDb"
+import { LockName, LockOptions, LockType, Tenants } from "@budibase/types"
+import * as locks from "../redis/redlock"
+
+const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants
+
+export const tenacyLockOptions: LockOptions = {
+  type: LockType.DEFAULT,
+  name: LockName.UPDATE_TENANTS_DOC,
+  ttl: 10 * 1000, // auto expire after 10 seconds
+  systemLock: true,
+}
+
+// READ
+
+export async function getTenantIds(): Promise<string[]> {
+  const tenants = await getTenants()
+  return tenants.tenantIds
+}
+
+async function getTenants(): Promise<Tenants> {
+  const db = getPlatformDB()
+  let tenants: Tenants
+
+  try {
+    tenants = await db.get(TENANT_DOC)
+  } catch (e: any) {
+    // doesn't exist yet - create
+    if (e.status === 404) {
+      tenants = await createTenantsDoc()
+    } else {
+      throw e
+    }
+  }
+
+  return tenants
+}
+
+export async function exists(tenantId: string) {
+  const tenants = await getTenants()
+  return tenants.tenantIds.indexOf(tenantId) !== -1
+}
+
+// CREATE / UPDATE
+
+function newTenantsDoc(): Tenants {
+  return {
+    _id: TENANT_DOC,
+    tenantIds: [],
+  }
+}
+
+async function createTenantsDoc(): Promise<Tenants> {
+  const db = getPlatformDB()
+  let tenants = newTenantsDoc()
+
+  try {
+    const response = await db.put(tenants)
+    tenants._rev = response.rev
+  } catch (e: any) {
+    // don't throw 409 is doc has already been created
+    if (e.status === 409) {
+      return db.get(TENANT_DOC)
+    }
+    throw e
+  }
+
+  return tenants
+}
+
+export async function addTenant(tenantId: string) {
+  const db = getPlatformDB()
+
+  // use a lock as tenant creation is conflict prone
+  await locks.doWithLock(tenacyLockOptions, async () => {
+    const tenants = await getTenants()
+
+    // write the new tenant if it doesn't already exist
+    if (tenants.tenantIds.indexOf(tenantId) === -1) {
+      tenants.tenantIds.push(tenantId)
+      await db.put(tenants)
+    }
+  })
+}
+
+// DELETE
+
+export async function removeTenant(tenantId: string) {
+  try {
+    await locks.doWithLock(tenacyLockOptions, async () => {
+      const db = getPlatformDB()
+      const tenants = await getTenants()
+      tenants.tenantIds = tenants.tenantIds.filter(id => id !== tenantId)
+      await db.put(tenants)
+    })
+  } catch (err) {
+    console.error(`Error removing tenant ${tenantId} from info db`, err)
+    throw err
+  }
+}
diff --git a/packages/backend-core/src/platform/tests/tenants.spec.ts b/packages/backend-core/src/platform/tests/tenants.spec.ts
new file mode 100644
index 0000000000..92e999cb2d
--- /dev/null
+++ b/packages/backend-core/src/platform/tests/tenants.spec.ts
@@ -0,0 +1,25 @@
+import { DBTestConfiguration, structures } from "../../../tests"
+import * as tenants from "../tenants"
+
+describe("tenants", () => {
+  const config = new DBTestConfiguration()
+
+  describe("addTenant", () => {
+    it("concurrently adds multiple tenants safely", async () => {
+      const tenant1 = structures.tenant.id()
+      const tenant2 = structures.tenant.id()
+      const tenant3 = structures.tenant.id()
+
+      await Promise.all([
+        tenants.addTenant(tenant1),
+        tenants.addTenant(tenant2),
+        tenants.addTenant(tenant3),
+      ])
+
+      const tenantIds = await tenants.getTenantIds()
+      expect(tenantIds.includes(tenant1)).toBe(true)
+      expect(tenantIds.includes(tenant2)).toBe(true)
+      expect(tenantIds.includes(tenant3)).toBe(true)
+    })
+  })
+})
diff --git a/packages/backend-core/src/platform/users.ts b/packages/backend-core/src/platform/users.ts
new file mode 100644
index 0000000000..c65a7e0ec4
--- /dev/null
+++ b/packages/backend-core/src/platform/users.ts
@@ -0,0 +1,90 @@
+import { getPlatformDB } from "./platformDb"
+import { DEFAULT_TENANT_ID } from "../constants"
+import env from "../environment"
+import {
+  PlatformUser,
+  PlatformUserByEmail,
+  PlatformUserById,
+  User,
+} from "@budibase/types"
+
+// READ
+
+export async function lookupTenantId(userId: string) {
+  if (!env.MULTI_TENANCY) {
+    return DEFAULT_TENANT_ID
+  }
+
+  const user = await getUserDoc(userId)
+  return user.tenantId
+}
+
+async function getUserDoc(emailOrId: string): Promise<PlatformUser> {
+  const db = getPlatformDB()
+  return db.get(emailOrId)
+}
+
+// CREATE
+
+function newUserIdDoc(id: string, tenantId: string): PlatformUserById {
+  return {
+    _id: id,
+    tenantId,
+  }
+}
+
+function newUserEmailDoc(
+  userId: string,
+  email: string,
+  tenantId: string
+): PlatformUserByEmail {
+  return {
+    _id: email,
+    userId,
+    tenantId,
+  }
+}
+
+/**
+ * Add a new user id or email doc if it doesn't exist.
+ */
+async function addUserDoc(emailOrId: string, newDocFn: () => PlatformUser) {
+  const db = getPlatformDB()
+  let user: PlatformUser
+
+  try {
+    await db.get(emailOrId)
+  } catch (e: any) {
+    if (e.status === 404) {
+      user = newDocFn()
+      await db.put(user)
+    } else {
+      throw e
+    }
+  }
+}
+
+export async function addUser(tenantId: string, userId: string, email: string) {
+  await Promise.all([
+    addUserDoc(userId, () => newUserIdDoc(userId, tenantId)),
+    addUserDoc(email, () => newUserEmailDoc(userId, email, tenantId)),
+  ])
+}
+
+// DELETE
+
+export async function removeUser(user: User) {
+  const db = getPlatformDB()
+  const keys = [user._id!, user.email]
+  const userDocs = await db.allDocs({
+    keys,
+    include_docs: true,
+  })
+  const toDelete = userDocs.rows.map((row: any) => {
+    return {
+      ...row.doc,
+      _deleted: true,
+    }
+  })
+  await db.bulkDocs(toDelete)
+}
diff --git a/packages/backend-core/src/redis/index.ts b/packages/backend-core/src/redis/index.ts
index ea4379f048..5bf2c65c39 100644
--- a/packages/backend-core/src/redis/index.ts
+++ b/packages/backend-core/src/redis/index.ts
@@ -3,4 +3,4 @@
 export { default as Client } from "./redis"
 export * as utils from "./utils"
 export * as clients from "./init"
-export * as redlock from "./redlock"
+export * as locks from "./redlock"
diff --git a/packages/backend-core/src/redis/redlock.ts b/packages/backend-core/src/redis/redlock.ts
index 54b2c0a8d1..2021da2b56 100644
--- a/packages/backend-core/src/redis/redlock.ts
+++ b/packages/backend-core/src/redis/redlock.ts
@@ -1,29 +1,22 @@
 import Redlock, { Options } from "redlock"
 import { getLockClient } from "./init"
 import { LockOptions, LockType } from "@budibase/types"
-import * as tenancy from "../tenancy"
-
-let noRetryRedlock: Redlock | undefined
+import * as context from "../context"
+import env from "../environment"
 
 const getClient = async (type: LockType): Promise<Redlock> => {
+  if (env.isTest() && type !== LockType.TRY_ONCE) {
+    return newRedlock(OPTIONS.TEST)
+  }
   switch (type) {
     case LockType.TRY_ONCE: {
-      if (!noRetryRedlock) {
-        noRetryRedlock = await newRedlock(OPTIONS.TRY_ONCE)
-      }
-      return noRetryRedlock
+      return newRedlock(OPTIONS.TRY_ONCE)
     }
     case LockType.DEFAULT: {
-      if (!noRetryRedlock) {
-        noRetryRedlock = await newRedlock(OPTIONS.DEFAULT)
-      }
-      return noRetryRedlock
+      return newRedlock(OPTIONS.DEFAULT)
     }
     case LockType.DELAY_500: {
-      if (!noRetryRedlock) {
-        noRetryRedlock = await newRedlock(OPTIONS.DELAY_500)
-      }
-      return noRetryRedlock
+      return newRedlock(OPTIONS.DELAY_500)
     }
     default: {
       throw new Error(`Could not get redlock client: ${type}`)
@@ -36,6 +29,11 @@ export const OPTIONS = {
     // immediately throws an error if the lock is already held
     retryCount: 0,
   },
+  TEST: {
+    // higher retry count in unit tests
+    // due to high contention.
+    retryCount: 100,
+  },
   DEFAULT: {
     // the expected clock drift; for more details
     // see http://redis.io/topics/distlock
@@ -69,12 +67,19 @@ export const doWithLock = async (opts: LockOptions, task: any) => {
   const redlock = await getClient(opts.type)
   let lock
   try {
-    // aquire lock
-    let name: string = `lock:${tenancy.getTenantId()}_${opts.name}`
+    // determine lock name
+    // by default use the tenantId for uniqueness, unless using a system lock
+    const prefix = opts.systemLock ? "system" : context.getTenantId()
+    let name: string = `lock:${prefix}_${opts.name}`
+
+    // add additional unique name if required
     if (opts.nameSuffix) {
       name = name + `_${opts.nameSuffix}`
     }
+
+    // create the lock
     lock = await redlock.lock(name, opts.ttl)
+
     // perform locked task
     // need to await to ensure completion before unlocking
     const result = await task()
diff --git a/packages/backend-core/src/tenancy/db.ts b/packages/backend-core/src/tenancy/db.ts
new file mode 100644
index 0000000000..10477a8579
--- /dev/null
+++ b/packages/backend-core/src/tenancy/db.ts
@@ -0,0 +1,6 @@
+import { getDB } from "../db/db"
+import { getGlobalDBName } from "../context"
+
+export function getTenantDB(tenantId: string) {
+  return getDB(getGlobalDBName(tenantId))
+}
diff --git a/packages/backend-core/src/tenancy/index.ts b/packages/backend-core/src/tenancy/index.ts
index 1618a136dd..3f17e33271 100644
--- a/packages/backend-core/src/tenancy/index.ts
+++ b/packages/backend-core/src/tenancy/index.ts
@@ -1,2 +1,2 @@
-export * from "../context"
+export * from "./db"
 export * from "./tenancy"
diff --git a/packages/backend-core/src/tenancy/tenancy.ts b/packages/backend-core/src/tenancy/tenancy.ts
index 732402bcb7..e8ddf88226 100644
--- a/packages/backend-core/src/tenancy/tenancy.ts
+++ b/packages/backend-core/src/tenancy/tenancy.ts
@@ -1,4 +1,3 @@
-import { doWithDB, getGlobalDBName } from "../db"
 import {
   DEFAULT_TENANT_ID,
   getTenantId,
@@ -11,10 +10,7 @@ import {
   TenantResolutionStrategy,
   GetTenantIdOptions,
 } from "@budibase/types"
-import { Header, StaticDatabases } from "../constants"
-
-const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants
-const PLATFORM_INFO_DB = StaticDatabases.PLATFORM_INFO.name
+import { Header } from "../constants"
 
 export function addTenantToUrl(url: string) {
   const tenantId = getTenantId()
@@ -27,89 +23,6 @@ export function addTenantToUrl(url: string) {
   return url
 }
 
-export async function doesTenantExist(tenantId: string) {
-  return doWithDB(PLATFORM_INFO_DB, async (db: any) => {
-    let tenants
-    try {
-      tenants = await db.get(TENANT_DOC)
-    } catch (err) {
-      // if theres an error the doc doesn't exist, no tenants exist
-      return false
-    }
-    return (
-      tenants &&
-      Array.isArray(tenants.tenantIds) &&
-      tenants.tenantIds.indexOf(tenantId) !== -1
-    )
-  })
-}
-
-export async function tryAddTenant(
-  tenantId: string,
-  userId: string,
-  email: string,
-  afterCreateTenant: () => Promise<void>
-) {
-  return doWithDB(PLATFORM_INFO_DB, async (db: any) => {
-    const getDoc = async (id: string) => {
-      if (!id) {
-        return null
-      }
-      try {
-        return await db.get(id)
-      } catch (err) {
-        return { _id: id }
-      }
-    }
-    let [tenants, userIdDoc, emailDoc] = await Promise.all([
-      getDoc(TENANT_DOC),
-      getDoc(userId),
-      getDoc(email),
-    ])
-    if (!Array.isArray(tenants.tenantIds)) {
-      tenants = {
-        _id: TENANT_DOC,
-        tenantIds: [],
-      }
-    }
-    let promises = []
-    if (userIdDoc) {
-      userIdDoc.tenantId = tenantId
-      promises.push(db.put(userIdDoc))
-    }
-    if (emailDoc) {
-      emailDoc.tenantId = tenantId
-      emailDoc.userId = userId
-      promises.push(db.put(emailDoc))
-    }
-    if (tenants.tenantIds.indexOf(tenantId) === -1) {
-      tenants.tenantIds.push(tenantId)
-      promises.push(db.put(tenants))
-      await afterCreateTenant()
-    }
-    await Promise.all(promises)
-  })
-}
-
-export function doWithGlobalDB(tenantId: string, cb: any) {
-  return doWithDB(getGlobalDBName(tenantId), cb)
-}
-
-export async function lookupTenantId(userId: string) {
-  return doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: any) => {
-    let tenantId = env.MULTI_TENANCY ? DEFAULT_TENANT_ID : null
-    try {
-      const doc = await db.get(userId)
-      if (doc && doc.tenantId) {
-        tenantId = doc.tenantId
-      }
-    } catch (err) {
-      // just return the default
-    }
-    return tenantId
-  })
-}
-
 export const isUserInAppTenant = (appId: string, user?: any) => {
   let userTenantId
   if (user) {
@@ -121,19 +34,6 @@ export const isUserInAppTenant = (appId: string, user?: any) => {
   return tenantId === userTenantId
 }
 
-export async function getTenantIds() {
-  return doWithDB(PLATFORM_INFO_DB, async (db: any) => {
-    let tenants
-    try {
-      tenants = await db.get(TENANT_DOC)
-    } catch (err) {
-      // if theres an error the doc doesn't exist, no tenants exist
-      return []
-    }
-    return (tenants && tenants.tenantIds) || []
-  })
-}
-
 const ALL_STRATEGIES = Object.values(TenantResolutionStrategy)
 
 export const getTenantIDFromCtx = (
diff --git a/packages/backend-core/src/utils/tests/utils.spec.ts b/packages/backend-core/src/utils/tests/utils.spec.ts
index b3cd527fb3..7d6c5561e8 100644
--- a/packages/backend-core/src/utils/tests/utils.spec.ts
+++ b/packages/backend-core/src/utils/tests/utils.spec.ts
@@ -1,21 +1,12 @@
-import { structures } from "../../../tests"
+import { structures, DBTestConfiguration } from "../../../tests"
 import * as utils from "../../utils"
-import * as events from "../../events"
 import * as db from "../../db"
 import { Header } from "../../constants"
-import { doInTenant } from "../../context"
 import { newid } from "../../utils"
+import env from "../../environment"
 
 describe("utils", () => {
-  describe("platformLogout", () => {
-    it("should call platform logout", async () => {
-      await doInTenant(structures.tenant.id(), async () => {
-        const ctx = structures.koa.newContext()
-        await utils.platformLogout({ ctx, userId: "test" })
-        expect(events.auth.logout).toBeCalledTimes(1)
-      })
-    })
-  })
+  const config = new DBTestConfiguration()
 
   describe("getAppIdFromCtx", () => {
     it("gets appId from header", async () => {
@@ -50,21 +41,28 @@ describe("utils", () => {
     })
 
     it("gets appId from url", async () => {
-      const ctx = structures.koa.newContext()
-      const expected = db.generateAppID()
-      const app = structures.apps.app(expected)
+      await config.doInTenant(async () => {
+        const url = "http://test.com"
+        env._set("PLATFORM_URL", url)
 
-      // set custom url
-      const appUrl = newid()
-      app.url = `/${appUrl}`
-      ctx.path = `/app/${appUrl}`
+        const ctx = structures.koa.newContext()
+        ctx.host = `${config.tenantId}.test.com`
 
-      // save the app
-      const database = db.getDB(expected)
-      await database.put(app)
+        const expected = db.generateAppID(config.tenantId)
+        const app = structures.apps.app(expected)
 
-      const actual = await utils.getAppIdFromCtx(ctx)
-      expect(actual).toBe(expected)
+        // set custom url
+        const appUrl = newid()
+        app.url = `/${appUrl}`
+        ctx.path = `/app/${appUrl}`
+
+        // save the app
+        const database = db.getDB(expected)
+        await database.put(app)
+
+        const actual = await utils.getAppIdFromCtx(ctx)
+        expect(actual).toBe(expected)
+      })
     })
 
     it("doesn't get appId from url when previewing", async () => {
diff --git a/packages/backend-core/tests/utilities/DBTestConfiguration.ts b/packages/backend-core/tests/utilities/DBTestConfiguration.ts
new file mode 100644
index 0000000000..cad62e2979
--- /dev/null
+++ b/packages/backend-core/tests/utilities/DBTestConfiguration.ts
@@ -0,0 +1,32 @@
+import "./mocks"
+import * as structures from "./structures"
+import * as testEnv from "./testEnv"
+import * as context from "../../src/context"
+
+class DBTestConfiguration {
+  tenantId: string
+
+  constructor() {
+    // db tests need to be multi tenant to prevent conflicts
+    testEnv.multiTenant()
+    this.tenantId = structures.tenant.id()
+  }
+
+  // TENANCY
+
+  doInTenant(task: any) {
+    return context.doInTenant(this.tenantId, () => {
+      return task()
+    })
+  }
+
+  getTenantId() {
+    try {
+      return context.getTenantId()
+    } catch (e) {
+      return this.tenantId!
+    }
+  }
+}
+
+export default DBTestConfiguration
diff --git a/packages/backend-core/tests/utilities/db.ts b/packages/backend-core/tests/utilities/db.ts
deleted file mode 100644
index 84b77bb201..0000000000
--- a/packages/backend-core/tests/utilities/db.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as db from "../../src/db"
-
-const dbConfig = {
-  inMemory: true,
-}
-
-export const init = () => {
-  db.init(dbConfig)
-}
diff --git a/packages/backend-core/tests/utilities/index.ts b/packages/backend-core/tests/utilities/index.ts
index 468d980a7f..efe014908b 100644
--- a/packages/backend-core/tests/utilities/index.ts
+++ b/packages/backend-core/tests/utilities/index.ts
@@ -4,5 +4,4 @@ export { generator } from "./structures"
 export * as testEnv from "./testEnv"
 export * as testContainerUtils from "./testContainerUtils"
 
-import * as dbConfig from "./db"
-dbConfig.init()
+export { default as DBTestConfiguration } from "./DBTestConfiguration"
diff --git a/packages/backend-core/tests/utilities/testEnv.ts b/packages/backend-core/tests/utilities/testEnv.ts
index b4f06b5153..b138e019fc 100644
--- a/packages/backend-core/tests/utilities/testEnv.ts
+++ b/packages/backend-core/tests/utilities/testEnv.ts
@@ -1,12 +1,12 @@
 import env from "../../src/environment"
-import * as tenancy from "../../src/tenancy"
-import { newid } from "../../src/utils"
+import * as context from "../../src/context"
+import * as structures from "./structures"
 
 // TENANCY
 
 export async function withTenant(task: (tenantId: string) => any) {
-  const tenantId = newid()
-  return tenancy.doInTenant(tenantId, async () => {
+  const tenantId = structures.tenant.id()
+  return context.doInTenant(tenantId, async () => {
     await task(tenantId)
   })
 }
@@ -19,6 +19,14 @@ export function multiTenant() {
   env._set("MULTI_TENANCY", 1)
 }
 
+export function selfHosted() {
+  env._set("SELF_HOSTED", 1)
+}
+
+export function cloudHosted() {
+  env._set("SELF_HOSTED", 0)
+}
+
 // NODE
 
 export function nodeDev() {
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index d88b1058f9..5f8edb3df6 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -1197,10 +1197,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.1.tgz#2c8b6dc6ff85c33bcd07d0b62cb3d19ddfdb3ab9"
-  integrity sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==
+"@types/jest@28.1.1":
+  version "28.1.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.1.tgz#8c9ba63702a11f8c386ee211280e8b68cb093cd1"
+  integrity sha512-C2p7yqleUKtCkVjlOur9BWVA4HgUQmEj/HWCt5WzZ5mLXrWnyIfl0wGuArc+kBXsy0ZZfLp+7dywB4HtSVYGVA==
   dependencies:
     jest-matcher-utils "^27.0.0"
     pretty-format "^27.0.0"
diff --git a/packages/server/package.json b/packages/server/package.json
index 391a5f326f..cfc5fa9fa3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -141,6 +141,7 @@
     "@types/pouchdb": "6.4.0",
     "@types/redis": "4.0.11",
     "@types/server-destroy": "1.0.1",
+    "@types/supertest": "2.0.12",
     "@types/tar": "6.1.3",
     "@typescript-eslint/parser": "5.45.0",
     "apidoc": "0.50.4",
@@ -159,7 +160,7 @@
     "path-to-regexp": "6.2.0",
     "prettier": "2.5.1",
     "rimraf": "3.0.2",
-    "supertest": "4.0.2",
+    "supertest": "6.2.2",
     "swagger-jsdoc": "6.1.0",
     "timekeeper": "2.2.0",
     "ts-jest": "28.0.4",
diff --git a/packages/server/src/api/routes/tests/backup.spec.ts b/packages/server/src/api/routes/tests/backup.spec.ts
index 7b325c080d..ef362ef403 100644
--- a/packages/server/src/api/routes/tests/backup.spec.ts
+++ b/packages/server/src/api/routes/tests/backup.spec.ts
@@ -19,7 +19,6 @@ describe("/backups", () => {
         .get(`/api/backups/export?appId=${config.getAppId()}&appname=test`)
         .set(config.defaultHeaders())
         .expect(200)
-      expect(res.text).toBeDefined()
       expect(res.headers["content-type"]).toEqual("application/gzip")
       expect(events.app.exported).toBeCalledTimes(1)
     })
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 5c45f89a2b..29a5f07607 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -236,42 +236,41 @@ class TestConfiguration {
     email = this.defaultUserValues.email,
     roles,
   }: any = {}) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: Database) => {
-      let existing
-      try {
-        existing = await db.get(id)
-      } catch (err) {
-        existing = { email }
-      }
-      const user = {
-        _id: id,
-        ...existing,
-        roles: roles || {},
-        tenantId: this.getTenantId(),
-        firstName,
-        lastName,
-      }
-      await sessions.createASession(id, {
-        sessionId: "sessionid",
-        tenantId: this.getTenantId(),
-        csrfToken: this.defaultUserValues.csrfToken,
-      })
-      if (builder) {
-        user.builder = { global: true }
-      } else {
-        user.builder = { global: false }
-      }
-      if (admin) {
-        user.admin = { global: true }
-      } else {
-        user.admin = { global: false }
-      }
-      const resp = await db.put(user)
-      return {
-        _rev: resp.rev,
-        ...user,
-      }
+    const db = tenancy.getTenantDB(this.getTenantId())
+    let existing
+    try {
+      existing = await db.get(id)
+    } catch (err) {
+      existing = { email }
+    }
+    const user = {
+      _id: id,
+      ...existing,
+      roles: roles || {},
+      tenantId: this.getTenantId(),
+      firstName,
+      lastName,
+    }
+    await sessions.createASession(id, {
+      sessionId: "sessionid",
+      tenantId: this.getTenantId(),
+      csrfToken: this.defaultUserValues.csrfToken,
     })
+    if (builder) {
+      user.builder = { global: true }
+    } else {
+      user.builder = { global: false }
+    }
+    if (admin) {
+      user.admin = { global: true }
+    } else {
+      user.admin = { global: false }
+    }
+    const resp = await db.put(user)
+    return {
+      _rev: resp.rev,
+      ...user,
+    }
   }
 
   async createUser(
@@ -407,20 +406,19 @@ class TestConfiguration {
   // API
 
   async generateApiKey(userId = this.defaultUserValues.globalUserId) {
-    return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => {
-      const id = dbCore.generateDevInfoID(userId)
-      let devInfo
-      try {
-        devInfo = await db.get(id)
-      } catch (err) {
-        devInfo = { _id: id, userId }
-      }
-      devInfo.apiKey = encryption.encrypt(
-        `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}`
-      )
-      await db.put(devInfo)
-      return devInfo.apiKey
-    })
+    const db = tenancy.getTenantDB(this.getTenantId())
+    const id = dbCore.generateDevInfoID(userId)
+    let devInfo
+    try {
+      devInfo = await db.get(id)
+    } catch (err) {
+      devInfo = { _id: id, userId }
+    }
+    devInfo.apiKey = encryption.encrypt(
+      `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}`
+    )
+    await db.put(devInfo)
+    return devInfo.apiKey
   }
 
   // APP
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4982b57131..c3fc7b0bbe 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -3547,6 +3547,14 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/superagent@*":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.16.tgz#12c9c16f232f9d89beab91d69368f96ce8e2d881"
+  integrity sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ==
+  dependencies:
+    "@types/cookiejar" "*"
+    "@types/node" "*"
+
 "@types/superagent@^4.1.12":
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.15.tgz#63297de457eba5e2bc502a7609426c4cceab434a"
@@ -3555,6 +3563,13 @@
     "@types/cookiejar" "*"
     "@types/node" "*"
 
+"@types/supertest@2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc"
+  integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==
+  dependencies:
+    "@types/superagent" "*"
+
 "@types/tar@6.1.3":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750"
@@ -4241,7 +4256,7 @@ arrify@^2.0.0:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asap@^2.0.3:
+asap@^2.0.0, asap@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
@@ -5416,7 +5431,7 @@ commoner@^0.10.1:
     q "^1.1.2"
     recast "^0.11.17"
 
-component-emitter@^1.2.0, component-emitter@^1.2.1:
+component-emitter@^1.2.1, component-emitter@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -5518,7 +5533,7 @@ cookie@^0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
-cookiejar@^2.1.0:
+cookiejar@^2.1.3:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
   integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
@@ -5967,6 +5982,14 @@ detective@^4.3.1:
     acorn "^5.2.1"
     defined "^1.0.0"
 
+dezalgo@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
+  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 diff-match-patch@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
@@ -6061,11 +6084,6 @@ dotenv@16.0.1:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
   integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
 
-dotenv@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
-
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
@@ -6888,7 +6906,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -6977,7 +6995,7 @@ fast-redact@^3.0.0:
   resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.1.tgz#790fcff8f808c2e12fabbfb2be5cb2deda448fa0"
   integrity sha512-odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A==
 
-fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.0.8:
+fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.0.8, fast-safe-stringify@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
@@ -7264,7 +7282,7 @@ form-data@4.0.0, form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^2.3.1, form-data@^2.5.0:
+form-data@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
   integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
@@ -7291,11 +7309,21 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-formidable@^1.1.1, formidable@^1.2.0:
+formidable@^1.1.1:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168"
   integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==
 
+formidable@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.1.1.tgz#81269cbea1a613240049f5f61a9d97731517414f"
+  integrity sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==
+  dependencies:
+    dezalgo "^1.0.4"
+    hexoid "^1.0.0"
+    once "^1.4.0"
+    qs "^6.11.0"
+
 forwarded-parse@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325"
@@ -7947,6 +7975,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hexoid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
+  integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
+
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -10703,7 +10736,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-methods@^1.1.1, methods@^1.1.2:
+methods@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
@@ -10755,7 +10788,12 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.24, mime-types@^2.1.27,
   dependencies:
     mime-db "1.52.0"
 
-mime@^1.3.4, mime@^1.4.1:
+mime@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
+mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -12502,14 +12540,14 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qs@^6.11.0:
+qs@^6.10.3, qs@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.4.0, qs@^6.5.1:
+qs@^6.4.0:
   version "6.10.5"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
   integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==
@@ -13990,29 +14028,30 @@ sublevel-pouchdb@7.2.2:
     ltgt "2.2.1"
     readable-stream "1.1.14"
 
-superagent@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
-  integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
+superagent@^7.1.0:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6"
+  integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==
   dependencies:
-    component-emitter "^1.2.0"
-    cookiejar "^2.1.0"
-    debug "^3.1.0"
-    extend "^3.0.0"
-    form-data "^2.3.1"
-    formidable "^1.2.0"
-    methods "^1.1.1"
-    mime "^1.4.1"
-    qs "^6.5.1"
-    readable-stream "^2.3.5"
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.3"
+    debug "^4.3.4"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^2.0.1"
+    methods "^1.1.2"
+    mime "2.6.0"
+    qs "^6.10.3"
+    readable-stream "^3.6.0"
+    semver "^7.3.7"
 
-supertest@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/supertest/-/supertest-4.0.2.tgz#c2234dbdd6dc79b6f15b99c8d6577b90e4ce3f36"
-  integrity sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==
+supertest@6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/supertest/-/supertest-6.2.2.tgz#04a5998fd3efaff187cb69f07a169755d655b001"
+  integrity sha512-wCw9WhAtKJsBvh07RaS+/By91NNE0Wh0DN19/hWPlBOU8tAfOtbZoVSV4xXeoKoxgPx0rx2y+y+8660XtE7jzg==
   dependencies:
     methods "^1.1.2"
-    superagent "^3.8.3"
+    superagent "^7.1.0"
 
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
diff --git a/packages/types/src/sdk/locks.ts b/packages/types/src/sdk/locks.ts
index e6809319b1..d868691891 100644
--- a/packages/types/src/sdk/locks.ts
+++ b/packages/types/src/sdk/locks.ts
@@ -12,6 +12,7 @@ export enum LockName {
   MIGRATIONS = "migrations",
   TRIGGER_QUOTA = "trigger_quota",
   SYNC_ACCOUNT_LICENSE = "sync_account_license",
+  UPDATE_TENANTS_DOC = "update_tenants_doc",
 }
 
 export interface LockOptions {
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9a55f527df..061a44c958 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -22,7 +22,7 @@
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
-    "test": "jest --coverage --maxWorkers=2",
+    "test": "jest --coverage",
     "test:watch": "jest --watch",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",
@@ -73,7 +73,7 @@
     "@swc/core": "^1.3.25",
     "@swc/jest": "^0.2.24",
     "@trendyol/jest-testcontainers": "^2.1.1",
-    "@types/jest": "26.0.23",
+    "@types/jest": "28.1.1",
     "@types/jsonwebtoken": "8.5.1",
     "@types/koa": "2.13.4",
     "@types/koa__router": "8.0.8",
@@ -81,6 +81,7 @@
     "@types/node-fetch": "2.6.1",
     "@types/pouchdb": "6.4.0",
     "@types/server-destroy": "1.0.1",
+    "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
     "@typescript-eslint/parser": "5.45.0",
     "copyfiles": "2.4.1",
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 817480151d..43ec23eade 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -1,5 +1,5 @@
 import { checkInviteCode } from "../../../utilities/redis"
-import sdk from "../../../sdk"
+import * as userSdk from "../../../sdk/users"
 import env from "../../../environment"
 import {
   BulkUserRequest,
@@ -8,6 +8,7 @@ import {
   CreateAdminUserRequest,
   InviteUserRequest,
   InviteUsersRequest,
+  MigrationType,
   SearchUsersRequest,
   User,
 } from "@budibase/types"
@@ -16,7 +17,9 @@ import {
   cache,
   errors,
   events,
+  migrations,
   tenancy,
+  platform,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 
@@ -25,7 +28,7 @@ const MAX_USERS_UPLOAD_LIMIT = 1000
 export const save = async (ctx: any) => {
   try {
     const currentUserId = ctx.user._id
-    ctx.body = await sdk.users.save(ctx.request.body, { currentUserId })
+    ctx.body = await userSdk.save(ctx.request.body, { currentUserId })
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
   }
@@ -35,7 +38,7 @@ const bulkDelete = async (userIds: string[], currentUserId: string) => {
   if (userIds?.indexOf(currentUserId) !== -1) {
     throw new Error("Unable to delete self.")
   }
-  return await sdk.users.bulkDelete(userIds)
+  return await userSdk.bulkDelete(userIds)
 }
 
 const bulkCreate = async (users: User[], groupIds: string[]) => {
@@ -44,7 +47,7 @@ const bulkCreate = async (users: User[], groupIds: string[]) => {
       "Max limit for upload is 1000 users. Please reduce file size and try again."
     )
   }
-  return await sdk.users.bulkCreate(users, groupIds)
+  return await userSdk.bulkCreate(users, groupIds)
 }
 
 export const bulkUpdate = async (ctx: any) => {
@@ -71,16 +74,26 @@ const parseBooleanParam = (param: any) => {
 export const adminUser = async (ctx: any) => {
   const { email, password, tenantId } = ctx.request
     .body as CreateAdminUserRequest
+
+  if (await platform.tenants.exists(tenantId)) {
+    ctx.throw(403, "Organisation already exists.")
+  }
+
+  if (env.MULTI_TENANCY) {
+    // store the new tenant record in the platform db
+    await platform.tenants.addTenant(tenantId)
+    await migrations.backPopulateMigrations({
+      type: MigrationType.GLOBAL,
+      tenantId,
+    })
+  }
+
   await tenancy.doInTenant(tenantId, async () => {
     // account portal sends a pre-hashed password - honour param to prevent double hashing
     const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)
     // account portal sends no password for SSO users
     const requirePassword = parseBooleanParam(ctx.request.query.requirePassword)
 
-    if (await tenancy.doesTenantExist(tenantId)) {
-      ctx.throw(403, "Organisation already exists.")
-    }
-
     const userExists = await checkAnyUserExists()
     if (userExists) {
       ctx.throw(
@@ -106,7 +119,7 @@ export const adminUser = async (ctx: any) => {
       // always bust checklist beforehand, if an error occurs but can proceed, don't get
       // stuck in a cycle
       await cache.bustCache(cache.CacheKey.CHECKLIST)
-      const finalUser = await sdk.users.save(user, {
+      const finalUser = await userSdk.save(user, {
         hashPassword,
         requirePassword,
       })
@@ -128,7 +141,7 @@ export const adminUser = async (ctx: any) => {
 export const countByApp = async (ctx: any) => {
   const appId = ctx.params.appId
   try {
-    ctx.body = await sdk.users.countUsersByApp(appId)
+    ctx.body = await userSdk.countUsersByApp(appId)
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
   }
@@ -140,7 +153,7 @@ export const destroy = async (ctx: any) => {
     ctx.throw(400, "Unable to delete self.")
   }
 
-  await sdk.users.destroy(id, ctx.user)
+  await userSdk.destroy(id, ctx.user)
 
   ctx.body = {
     message: `User ${id} deleted.`,
@@ -149,7 +162,7 @@ export const destroy = async (ctx: any) => {
 
 export const search = async (ctx: any) => {
   const body = ctx.request.body as SearchUsersRequest
-  const paginated = await sdk.users.paginatedUsers(body)
+  const paginated = await userSdk.paginatedUsers(body)
   // user hashed password shouldn't ever be returned
   for (let user of paginated.data) {
     if (user) {
@@ -161,7 +174,7 @@ export const search = async (ctx: any) => {
 
 // called internally by app server user fetch
 export const fetch = async (ctx: any) => {
-  const all = await sdk.users.allUsers()
+  const all = await userSdk.allUsers()
   // user hashed password shouldn't ever be returned
   for (let user of all) {
     if (user) {
@@ -173,12 +186,12 @@ export const fetch = async (ctx: any) => {
 
 // called internally by app server user find
 export const find = async (ctx: any) => {
-  ctx.body = await sdk.users.getUser(ctx.params.id)
+  ctx.body = await userSdk.getUser(ctx.params.id)
 }
 
 export const tenantUserLookup = async (ctx: any) => {
   const id = ctx.params.id
-  const user = await sdk.users.getPlatformUser(id)
+  const user = await userSdk.getPlatformUser(id)
   if (user) {
     ctx.body = user
   } else {
@@ -188,7 +201,7 @@ export const tenantUserLookup = async (ctx: any) => {
 
 export const invite = async (ctx: any) => {
   const request = ctx.request.body as InviteUserRequest
-  const response = await sdk.users.invite([request])
+  const response = await userSdk.invite([request])
 
   // explicitly throw for single user invite
   if (response.unsuccessful.length) {
@@ -207,7 +220,7 @@ export const invite = async (ctx: any) => {
 
 export const inviteMultiple = async (ctx: any) => {
   const request = ctx.request.body as InviteUsersRequest
-  ctx.body = await sdk.users.invite(request)
+  ctx.body = await userSdk.invite(request)
 }
 
 export const checkInvite = async (ctx: any) => {
@@ -229,7 +242,7 @@ export const inviteAccept = async (ctx: any) => {
     // info is an extension of the user object that was stored by global
     const { email, info }: any = await checkInviteCode(inviteCode)
     ctx.body = await tenancy.doInTenant(info.tenantId, async () => {
-      const saved = await sdk.users.save({
+      const saved = await userSdk.save({
         firstName,
         lastName,
         password,
diff --git a/packages/worker/src/api/controllers/system/tenants.ts b/packages/worker/src/api/controllers/system/tenants.ts
index 6916049534..151507358f 100644
--- a/packages/worker/src/api/controllers/system/tenants.ts
+++ b/packages/worker/src/api/controllers/system/tenants.ts
@@ -1,8 +1,7 @@
-import { BBContext } from "@budibase/types"
-import { deprovisioning } from "@budibase/backend-core"
-import { quotas } from "@budibase/pro"
+import { UserCtx } from "@budibase/types"
+import * as tenantSdk from "../../../sdk/tenants"
 
-const _delete = async (ctx: BBContext) => {
+export async function destroy(ctx: UserCtx) {
   const user = ctx.user!
   const tenantId = ctx.params.tenantId
 
@@ -11,13 +10,10 @@ const _delete = async (ctx: BBContext) => {
   }
 
   try {
-    await quotas.bustCache()
-    await deprovisioning.deleteTenant(tenantId)
+    await tenantSdk.deleteTenant(tenantId)
     ctx.status = 204
   } catch (err) {
     ctx.log.error(err)
     throw err
   }
 }
-
-export { _delete as delete }
diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts
index ee27c4d451..39ad74d295 100644
--- a/packages/worker/src/api/routes/global/tests/configs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts
@@ -2,7 +2,7 @@
 jest.mock("nodemailer")
 import { TestConfiguration, structures, mocks } from "../../../../tests"
 mocks.email.mock()
-import { Config, context, events } from "@budibase/backend-core"
+import { Config, events } from "@budibase/backend-core"
 
 describe("configs", () => {
   const config = new TestConfiguration()
@@ -113,64 +113,56 @@ describe("configs", () => {
 
       describe("create", () => {
         it("should create activated OIDC config", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            await saveOIDCConfig()
-            expect(events.auth.SSOCreated).toBeCalledTimes(1)
-            expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
-            expect(events.auth.SSODeactivated).not.toBeCalled()
-            expect(events.auth.SSOActivated).toBeCalledTimes(1)
-            expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
-            await config.deleteConfig(Config.OIDC)
-          })
+          await saveOIDCConfig()
+          expect(events.auth.SSOCreated).toBeCalledTimes(1)
+          expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSODeactivated).not.toBeCalled()
+          expect(events.auth.SSOActivated).toBeCalledTimes(1)
+          expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
+          await config.deleteConfig(Config.OIDC)
         })
 
         it("should create deactivated OIDC config", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            await saveOIDCConfig({ activated: false })
-            expect(events.auth.SSOCreated).toBeCalledTimes(1)
-            expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
-            expect(events.auth.SSOActivated).not.toBeCalled()
-            expect(events.auth.SSODeactivated).not.toBeCalled()
-            await config.deleteConfig(Config.OIDC)
-          })
+          await saveOIDCConfig({ activated: false })
+          expect(events.auth.SSOCreated).toBeCalledTimes(1)
+          expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOActivated).not.toBeCalled()
+          expect(events.auth.SSODeactivated).not.toBeCalled()
+          await config.deleteConfig(Config.OIDC)
         })
       })
 
       describe("update", () => {
         it("should update OIDC config to deactivated", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            const oidcConf = await saveOIDCConfig()
-            jest.clearAllMocks()
-            await saveOIDCConfig(
-              { ...oidcConf.config.configs[0], activated: false },
-              oidcConf._id,
-              oidcConf._rev
-            )
-            expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-            expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
-            expect(events.auth.SSOActivated).not.toBeCalled()
-            expect(events.auth.SSODeactivated).toBeCalledTimes(1)
-            expect(events.auth.SSODeactivated).toBeCalledWith(Config.OIDC)
-            await config.deleteConfig(Config.OIDC)
-          })
+          const oidcConf = await saveOIDCConfig()
+          jest.clearAllMocks()
+          await saveOIDCConfig(
+            { ...oidcConf.config.configs[0], activated: false },
+            oidcConf._id,
+            oidcConf._rev
+          )
+          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
+          expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOActivated).not.toBeCalled()
+          expect(events.auth.SSODeactivated).toBeCalledTimes(1)
+          expect(events.auth.SSODeactivated).toBeCalledWith(Config.OIDC)
+          await config.deleteConfig(Config.OIDC)
         })
 
         it("should update OIDC config to activated", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            const oidcConf = await saveOIDCConfig({ activated: false })
-            jest.clearAllMocks()
-            await saveOIDCConfig(
-              { ...oidcConf.config.configs[0], activated: true },
-              oidcConf._id,
-              oidcConf._rev
-            )
-            expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-            expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
-            expect(events.auth.SSODeactivated).not.toBeCalled()
-            expect(events.auth.SSOActivated).toBeCalledTimes(1)
-            expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
-            await config.deleteConfig(Config.OIDC)
-          })
+          const oidcConf = await saveOIDCConfig({ activated: false })
+          jest.clearAllMocks()
+          await saveOIDCConfig(
+            { ...oidcConf.config.configs[0], activated: true },
+            oidcConf._id,
+            oidcConf._rev
+          )
+          expect(events.auth.SSOUpdated).toBeCalledTimes(1)
+          expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSODeactivated).not.toBeCalled()
+          expect(events.auth.SSOActivated).toBeCalledTimes(1)
+          expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
+          await config.deleteConfig(Config.OIDC)
         })
       })
     })
@@ -187,26 +179,22 @@ describe("configs", () => {
 
       describe("create", () => {
         it("should create SMTP config", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            await config.deleteConfig(Config.SMTP)
-            await saveSMTPConfig()
-            expect(events.email.SMTPUpdated).not.toBeCalled()
-            expect(events.email.SMTPCreated).toBeCalledTimes(1)
-            await config.deleteConfig(Config.SMTP)
-          })
+          await config.deleteConfig(Config.SMTP)
+          await saveSMTPConfig()
+          expect(events.email.SMTPUpdated).not.toBeCalled()
+          expect(events.email.SMTPCreated).toBeCalledTimes(1)
+          await config.deleteConfig(Config.SMTP)
         })
       })
 
       describe("update", () => {
         it("should update SMTP config", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            const smtpConf = await saveSMTPConfig()
-            jest.clearAllMocks()
-            await saveSMTPConfig(smtpConf.config, smtpConf._id, smtpConf._rev)
-            expect(events.email.SMTPCreated).not.toBeCalled()
-            expect(events.email.SMTPUpdated).toBeCalledTimes(1)
-            await config.deleteConfig(Config.SMTP)
-          })
+          const smtpConf = await saveSMTPConfig()
+          jest.clearAllMocks()
+          await saveSMTPConfig(smtpConf.config, smtpConf._id, smtpConf._rev)
+          expect(events.email.SMTPCreated).not.toBeCalled()
+          expect(events.email.SMTPUpdated).toBeCalledTimes(1)
+          await config.deleteConfig(Config.SMTP)
         })
       })
     })
@@ -223,73 +211,65 @@ describe("configs", () => {
 
       describe("create", () => {
         it("should create settings config with default settings", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            await config.deleteConfig(Config.SETTINGS)
+          await config.deleteConfig(Config.SETTINGS)
 
-            await saveSettingsConfig()
+          await saveSettingsConfig()
 
-            expect(events.org.nameUpdated).not.toBeCalled()
-            expect(events.org.logoUpdated).not.toBeCalled()
-            expect(events.org.platformURLUpdated).not.toBeCalled()
-          })
+          expect(events.org.nameUpdated).not.toBeCalled()
+          expect(events.org.logoUpdated).not.toBeCalled()
+          expect(events.org.platformURLUpdated).not.toBeCalled()
         })
 
         it("should create settings config with non-default settings", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            config.modeSelf()
-            await config.deleteConfig(Config.SETTINGS)
-            const conf = {
-              company: "acme",
-              logoUrl: "http://example.com",
-              platformUrl: "http://example.com",
-            }
+          config.selfHosted()
+          await config.deleteConfig(Config.SETTINGS)
+          const conf = {
+            company: "acme",
+            logoUrl: "http://example.com",
+            platformUrl: "http://example.com",
+          }
 
-            await saveSettingsConfig(conf)
+          await saveSettingsConfig(conf)
 
-            expect(events.org.nameUpdated).toBeCalledTimes(1)
-            expect(events.org.logoUpdated).toBeCalledTimes(1)
-            expect(events.org.platformURLUpdated).toBeCalledTimes(1)
-            config.modeCloud()
-          })
+          expect(events.org.nameUpdated).toBeCalledTimes(1)
+          expect(events.org.logoUpdated).toBeCalledTimes(1)
+          expect(events.org.platformURLUpdated).toBeCalledTimes(1)
+          config.cloudHosted()
         })
       })
 
       describe("update", () => {
         it("should update settings config", async () => {
-          await context.doInTenant(config.tenant1User!.tenantId, async () => {
-            config.modeSelf()
-            await config.deleteConfig(Config.SETTINGS)
-            const settingsConfig = await saveSettingsConfig()
-            settingsConfig.config.company = "acme"
-            settingsConfig.config.logoUrl = "http://example.com"
-            settingsConfig.config.platformUrl = "http://example.com"
+          config.selfHosted()
+          await config.deleteConfig(Config.SETTINGS)
+          const settingsConfig = await saveSettingsConfig()
+          settingsConfig.config.company = "acme"
+          settingsConfig.config.logoUrl = "http://example.com"
+          settingsConfig.config.platformUrl = "http://example.com"
 
-            await saveSettingsConfig(
-              settingsConfig.config,
-              settingsConfig._id,
-              settingsConfig._rev
-            )
+          await saveSettingsConfig(
+            settingsConfig.config,
+            settingsConfig._id,
+            settingsConfig._rev
+          )
 
-            expect(events.org.nameUpdated).toBeCalledTimes(1)
-            expect(events.org.logoUpdated).toBeCalledTimes(1)
-            expect(events.org.platformURLUpdated).toBeCalledTimes(1)
-            config.modeCloud()
-          })
+          expect(events.org.nameUpdated).toBeCalledTimes(1)
+          expect(events.org.logoUpdated).toBeCalledTimes(1)
+          expect(events.org.platformURLUpdated).toBeCalledTimes(1)
+          config.cloudHosted()
         })
       })
     })
   })
 
   it("should return the correct checklist status based on the state of the budibase installation", async () => {
-    await context.doInTenant(config.tenant1User!.tenantId, async () => {
-      await config.saveSmtpConfig()
+    await config.saveSmtpConfig()
 
-      const res = await config.api.configs.getConfigChecklist()
-      const checklist = res.body
+    const res = await config.api.configs.getConfigChecklist()
+    const checklist = res.body
 
-      expect(checklist.apps.checked).toBeFalsy()
-      expect(checklist.smtp.checked).toBeTruthy()
-      expect(checklist.adminUser.checked).toBeTruthy()
-    })
+    expect(checklist.apps.checked).toBeFalsy()
+    expect(checklist.smtp.checked).toBeTruthy()
+    expect(checklist.adminUser.checked).toBeTruthy()
   })
 })
diff --git a/packages/worker/src/api/routes/global/tests/roles.spec.ts b/packages/worker/src/api/routes/global/tests/roles.spec.ts
index 622a643f25..477ccaf94c 100644
--- a/packages/worker/src/api/routes/global/tests/roles.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/roles.spec.ts
@@ -32,6 +32,7 @@ async function addAppMetadata() {
 
 describe("/api/global/roles", () => {
   const config = new TestConfiguration()
+
   const role = new roles.Role(
     db.generateRoleID("newRole"),
     roles.BUILTIN_ROLE_IDS.BASIC,
@@ -43,13 +44,13 @@ describe("/api/global/roles", () => {
   })
 
   beforeEach(async () => {
-    appId = db.generateAppID()
+    appId = db.generateAppID(config.tenantId)
     appDb = db.getDB(appId)
     const mockAppDB = context.getAppDB as Mock
     mockAppDB.mockReturnValue(appDb)
 
     await addAppMetadata()
-    appDb.put(role)
+    await appDb.put(role)
   })
 
   afterAll(async () => {
diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts
index a8b07ec815..31ef1d9b0c 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -3,7 +3,9 @@ import { InviteUsersResponse, User } from "@budibase/types"
 jest.mock("nodemailer")
 import { TestConfiguration, mocks, structures } from "../../../../tests"
 const sendMailMock = mocks.email.mock()
-import { context, events, tenancy } from "@budibase/backend-core"
+import { events, tenancy, accounts as _accounts } from "@budibase/backend-core"
+
+const accounts = jest.mocked(_accounts)
 
 describe("/api/global/users", () => {
   const config = new TestConfiguration()
@@ -20,26 +22,24 @@ describe("/api/global/users", () => {
     jest.clearAllMocks()
   })
 
-  describe("invite", () => {
+  describe("POST /api/global/users/invite", () => {
     it("should be able to generate an invitation", async () => {
-      await context.doInTenant(config.tenant1User!.tenantId, async () => {
-        const email = structures.users.newEmail()
-        const { code, res } = await config.api.users.sendUserInvite(
-          sendMailMock,
-          email
-        )
+      const email = structures.users.newEmail()
+      const { code, res } = await config.api.users.sendUserInvite(
+        sendMailMock,
+        email
+      )
 
-        expect(res.body).toEqual({ message: "Invitation has been sent." })
-        expect(sendMailMock).toHaveBeenCalled()
-        expect(code).toBeDefined()
-        expect(events.user.invited).toBeCalledTimes(1)
-      })
+      expect(res.body).toEqual({ message: "Invitation has been sent." })
+      expect(sendMailMock).toHaveBeenCalled()
+      expect(code).toBeDefined()
+      expect(events.user.invited).toBeCalledTimes(1)
     })
 
     it("should not be able to generate an invitation for existing user", async () => {
       const { code, res } = await config.api.users.sendUserInvite(
         sendMailMock,
-        config.defaultUser!.email,
+        config.user!.email,
         400
       )
 
@@ -50,26 +50,24 @@ describe("/api/global/users", () => {
     })
 
     it("should be able to create new user from invite", async () => {
-      await context.doInTenant(config.tenant1User!.tenantId, async () => {
-        const email = structures.users.newEmail()
-        const { code } = await config.api.users.sendUserInvite(
-          sendMailMock,
-          email
-        )
+      const email = structures.users.newEmail()
+      const { code } = await config.api.users.sendUserInvite(
+        sendMailMock,
+        email
+      )
 
-        const res = await config.api.users.acceptInvite(code)
+      const res = await config.api.users.acceptInvite(code)
 
-        expect(res.body._id).toBeDefined()
-        const user = await config.getUser(email)
-        expect(user).toBeDefined()
-        expect(user._id).toEqual(res.body._id)
-        expect(events.user.inviteAccepted).toBeCalledTimes(1)
-        expect(events.user.inviteAccepted).toBeCalledWith(user)
-      })
+      expect(res.body._id).toBeDefined()
+      const user = await config.getUser(email)
+      expect(user).toBeDefined()
+      expect(user._id).toEqual(res.body._id)
+      expect(events.user.inviteAccepted).toBeCalledTimes(1)
+      expect(events.user.inviteAccepted).toBeCalledWith(user)
     })
   })
 
-  describe("inviteMultiple", () => {
+  describe("POST /api/global/users/multi/invite", () => {
     it("should be able to generate an invitation", async () => {
       const newUserInvite = () => ({
         email: structures.users.newEmail(),
@@ -87,7 +85,7 @@ describe("/api/global/users", () => {
     })
 
     it("should not be able to generate an invitation for existing user", async () => {
-      const request = [{ email: config.defaultUser!.email, userInfo: {} }]
+      const request = [{ email: config.user!.email, userInfo: {} }]
 
       const res = await config.api.users.sendMultiUserInvite(request)
 
@@ -100,7 +98,7 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("bulk (create)", () => {
+  describe("POST /api/global/users/bulk", () => {
     it("should ignore users existing in the same tenant", async () => {
       const user = await config.createUser()
       jest.clearAllMocks()
@@ -163,7 +161,7 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("create", () => {
+  describe("POST /api/global/users", () => {
     it("should be able to create a basic user", async () => {
       const user = structures.users.user()
 
@@ -242,7 +240,7 @@ describe("/api/global/users", () => {
     it("should not be able to create user with the same email as an account", async () => {
       const user = structures.users.user()
       const account = structures.accounts.cloudAccount()
-      mocks.accounts.getAccount.mockReturnValueOnce(account)
+      accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
 
       const response = await config.api.users.saveUser(user, 400)
 
@@ -283,7 +281,7 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("update", () => {
+  describe("POST /api/global/users (update)", () => {
     it("should be able to update a basic user", async () => {
       const user = await config.createUser()
       jest.clearAllMocks()
@@ -298,7 +296,7 @@ describe("/api/global/users", () => {
     })
 
     it("should not allow a user to update their own admin/builder status", async () => {
-      const user = (await config.api.users.getUser(config.defaultUser?._id!))
+      const user = (await config.api.users.getUser(config.user?._id!))
         .body as User
       await config.api.users.saveUser({
         ...user,
@@ -468,9 +466,9 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("bulk (delete)", () => {
+  describe("POST /api/global/users/bulk (delete)", () => {
     it("should not be able to bulk delete current user", async () => {
-      const user = await config.defaultUser!
+      const user = await config.user!
 
       const response = await config.api.users.bulkDeleteUsers([user._id!], 400)
 
@@ -482,7 +480,7 @@ describe("/api/global/users", () => {
       const user = await config.createUser()
       const account = structures.accounts.cloudAccount()
       account.budibaseUserId = user._id!
-      mocks.accounts.getAccountByTenantId.mockReturnValue(account)
+      accounts.getAccountByTenantId.mockReturnValue(Promise.resolve(account))
 
       const response = await config.api.users.bulkDeleteUsers([user._id!])
 
@@ -497,7 +495,7 @@ describe("/api/global/users", () => {
 
     it("should be able to bulk delete users", async () => {
       const account = structures.accounts.cloudAccount()
-      mocks.accounts.getAccountByTenantId.mockReturnValue(account)
+      accounts.getAccountByTenantId.mockReturnValue(Promise.resolve(account))
 
       const builder = structures.users.builderUser()
       const admin = structures.users.adminUser()
@@ -521,7 +519,7 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("destroy", () => {
+  describe("DELETE /api/global/users/:userId", () => {
     it("should be able to destroy a basic user", async () => {
       const user = await config.createUser()
       jest.clearAllMocks()
@@ -558,7 +556,7 @@ describe("/api/global/users", () => {
     it("should not be able to destroy account owner", async () => {
       const user = await config.createUser()
       const account = structures.accounts.cloudAccount()
-      mocks.accounts.getAccount.mockReturnValueOnce(account)
+      accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
 
       const response = await config.api.users.deleteUser(user._id!, 400)
 
@@ -566,10 +564,10 @@ describe("/api/global/users", () => {
     })
 
     it("should not be able to destroy account owner as account owner", async () => {
-      const user = await config.defaultUser!
+      const user = await config.user!
       const account = structures.accounts.cloudAccount()
       account.email = user.email
-      mocks.accounts.getAccount.mockReturnValueOnce(account)
+      accounts.getAccount.mockReturnValueOnce(Promise.resolve(account))
 
       const response = await config.api.users.deleteUser(user._id!, 400)
 
diff --git a/packages/worker/src/api/routes/system/tenants.ts b/packages/worker/src/api/routes/system/tenants.ts
index 111cfc5819..234459cfdc 100644
--- a/packages/worker/src/api/routes/system/tenants.ts
+++ b/packages/worker/src/api/routes/system/tenants.ts
@@ -7,7 +7,7 @@ const router: Router = new Router()
 router.delete(
   "/api/system/tenants/:tenantId",
   middleware.adminOnly,
-  controller.delete
+  controller.destroy
 )
 
 export default router
diff --git a/packages/worker/src/api/routes/system/tests/restore.spec.ts b/packages/worker/src/api/routes/system/tests/restore.spec.ts
index 4dd973270f..2130fd8dde 100644
--- a/packages/worker/src/api/routes/system/tests/restore.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/restore.spec.ts
@@ -25,12 +25,12 @@ describe("/api/system/restore", () => {
     })
 
     it("restores in self host", async () => {
-      config.modeSelf()
+      config.selfHosted()
       const res = await config.api.restore.restored()
       expect(res.body).toEqual({
         message: "System prepared after restore.",
       })
-      config.modeCloud()
+      config.cloudHosted()
     })
   })
 })
diff --git a/packages/worker/src/api/routes/system/tests/status.spec.ts b/packages/worker/src/api/routes/system/tests/status.spec.ts
index afd3f8ac46..fe0ff13551 100644
--- a/packages/worker/src/api/routes/system/tests/status.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/status.spec.ts
@@ -1,6 +1,6 @@
 import { TestConfiguration } from "../../../../tests"
-import { accounts } from "@budibase/backend-core"
-import { mocks } from "@budibase/backend-core/tests"
+import { accounts as _accounts } from "@budibase/backend-core"
+const accounts = jest.mocked(_accounts)
 
 describe("/api/system/status", () => {
   const config = new TestConfiguration()
@@ -19,7 +19,7 @@ describe("/api/system/status", () => {
 
   describe("GET /api/system/status", () => {
     it("returns status in self host", async () => {
-      config.modeSelf()
+      config.selfHosted()
       const res = await config.api.status.getStatus()
       expect(res.body).toEqual({
         health: {
@@ -27,7 +27,7 @@ describe("/api/system/status", () => {
         },
       })
       expect(accounts.getStatus).toBeCalledTimes(0)
-      config.modeCloud()
+      config.cloudHosted()
     })
 
     it("returns status in cloud", async () => {
@@ -37,7 +37,7 @@ describe("/api/system/status", () => {
         },
       }
 
-      mocks.accounts.getStatus.mockReturnValueOnce(value)
+      accounts.getStatus.mockReturnValueOnce(Promise.resolve(value))
 
       const res = await config.api.status.getStatus()
 
diff --git a/packages/worker/src/migrations/functions/globalInfoSyncUsers.ts b/packages/worker/src/migrations/functions/globalInfoSyncUsers.ts
index 941791fe93..1ffcc762c4 100644
--- a/packages/worker/src/migrations/functions/globalInfoSyncUsers.ts
+++ b/packages/worker/src/migrations/functions/globalInfoSyncUsers.ts
@@ -1,5 +1,6 @@
 import { User } from "@budibase/types"
-import sdk from "../../sdk"
+import * as usersSdk from "../../sdk/users"
+import { platform } from "@budibase/backend-core"
 
 /**
  * Date:
@@ -9,11 +10,11 @@ import sdk from "../../sdk"
  * Re-sync the global-db users to the global-info db users
  */
 export const run = async (globalDb: any) => {
-  const users = (await sdk.users.allUsers()) as User[]
+  const users = (await usersSdk.allUsers()) as User[]
   const promises = []
   for (let user of users) {
     promises.push(
-      sdk.users.addTenant(user.tenantId, user._id as string, user.email)
+      platform.users.addUser(user.tenantId, user._id as string, user.email)
     )
   }
   await Promise.all(promises)
diff --git a/packages/worker/src/sdk/tenants/index.ts b/packages/worker/src/sdk/tenants/index.ts
new file mode 100644
index 0000000000..19b7ea6615
--- /dev/null
+++ b/packages/worker/src/sdk/tenants/index.ts
@@ -0,0 +1 @@
+export * from "./tenants"
diff --git a/packages/worker/src/sdk/tenants/tenants.ts b/packages/worker/src/sdk/tenants/tenants.ts
new file mode 100644
index 0000000000..3ba9c3f3a7
--- /dev/null
+++ b/packages/worker/src/sdk/tenants/tenants.ts
@@ -0,0 +1,76 @@
+import { App } from "@budibase/types"
+import { tenancy, db as dbCore, platform } from "@budibase/backend-core"
+import { quotas } from "@budibase/pro"
+
+export async function deleteTenant(tenantId: string) {
+  await quotas.bustCache()
+  await platform.tenants.removeTenant(tenantId)
+  await removeGlobalDB(tenantId)
+  await removeTenantUsers(tenantId)
+  await removeTenantApps(tenantId)
+}
+
+async function removeGlobalDB(tenantId: string) {
+  try {
+    const db = tenancy.getTenantDB(tenantId)
+    await db.destroy()
+  } catch (err) {
+    console.error(`Error removing tenant ${tenantId} users from info db`, err)
+    throw err
+  }
+}
+
+async function removeTenantApps(tenantId: string) {
+  try {
+    const apps = (await dbCore.getAllApps({ all: true })) as App[]
+    const destroyPromises = apps.map(app => {
+      const db = dbCore.getDB(app.appId)
+      return db.destroy()
+    })
+    await Promise.allSettled(destroyPromises)
+  } catch (err) {
+    console.error(`Error removing tenant ${tenantId} apps`, err)
+    throw err
+  }
+}
+
+function getTenantUsers(tenantId: string) {
+  const db = tenancy.getTenantDB(tenantId)
+
+  return db.allDocs(
+    dbCore.getGlobalUserParams(null, {
+      include_docs: true,
+    })
+  )
+}
+
+async function removeTenantUsers(tenantId: string) {
+  try {
+    const allUsers = await getTenantUsers(tenantId)
+    const allEmails = allUsers.rows.map((row: any) => row.doc.email)
+
+    // get the id and email doc ids
+    let keys = allUsers.rows.map((row: any) => row.id)
+    keys = keys.concat(allEmails)
+
+    const platformDb = platform.getPlatformDB()
+
+    // retrieve the docs
+    const userDocs = await platformDb.allDocs({
+      keys,
+      include_docs: true,
+    })
+
+    // delete the docs
+    const toDelete = userDocs.rows.map((row: any) => {
+      return {
+        ...row.doc,
+        _deleted: true,
+      }
+    })
+    await platformDb.bulkDocs(toDelete)
+  } catch (err) {
+    console.error(`Error removing tenant ${tenantId} users from info db`, err)
+    throw err
+  }
+}
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 8410d0b2e0..330cdfde6d 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -549,7 +549,7 @@ export const bulkDelete = async (
 
 export const destroy = async (id: string, currentUser: any) => {
   const db = tenancy.getGlobalDB()
-  const dbUser = await db.get(id)
+  const dbUser = (await db.get(id)) as User
   const userId = dbUser._id as string
 
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts
index 0cc1e61e65..7d075e7fef 100644
--- a/packages/worker/src/tests/TestConfiguration.ts
+++ b/packages/worker/src/tests/TestConfiguration.ts
@@ -15,61 +15,29 @@ const supertest = require("supertest")
 import { Config } from "../constants"
 import {
   users,
-  tenancy,
+  context,
   sessions,
   auth,
   constants,
   env as coreEnv,
-  DEFAULT_TENANT_ID,
 } from "@budibase/backend-core"
-import structures, { TENANT_ID, CSRF_TOKEN } from "./structures"
+import structures, { CSRF_TOKEN } from "./structures"
 import { CreateUserResponse, User, AuthToken } from "@budibase/types"
 import API from "./api"
-import sdk from "../sdk"
-
-enum Mode {
-  CLOUD = "cloud",
-  SELF = "self",
-}
-
-async function retry<T extends (...arg0: any[]) => any>(
-  fn: T,
-  maxTry: number = 5,
-  retryCount = 1
-): Promise<Awaited<ReturnType<T>>> {
-  const currRetry = typeof retryCount === "number" ? retryCount : 1
-  try {
-    const result = await fn()
-    return result
-  } catch (e) {
-    console.log(`Retry ${currRetry} failed.`)
-    if (currRetry > maxTry) {
-      console.log(`All ${maxTry} retry attempts exhausted`)
-      throw e
-    }
-    return retry(fn, maxTry, currRetry + 1)
-  }
-}
 
 class TestConfiguration {
   server: any
   request: any
   api: API
-  defaultUser?: User
-  tenant1User?: User
-  #tenantId?: string
+  tenantId: string
+  user?: User
+  userPassword = "test"
 
-  constructor(
-    opts: { openServer: boolean; mode: Mode } = {
-      openServer: true,
-      mode: Mode.CLOUD,
-    }
-  ) {
-    if (opts.mode === Mode.CLOUD) {
-      this.modeCloud()
-    } else if (opts.mode === Mode.SELF) {
-      this.modeSelf()
-    }
+  constructor(opts: { openServer: boolean } = { openServer: true }) {
+    // default to cloud hosting
+    this.cloudHosted()
+
+    this.tenantId = structures.tenant.id()
 
     if (opts.openServer) {
       env.PORT = "0" // random port
@@ -85,26 +53,19 @@ class TestConfiguration {
     return this.request
   }
 
-  // MODES
-
-  setMultiTenancy = (value: boolean) => {
-    env._set("MULTI_TENANCY", value)
-    coreEnv._set("MULTI_TENANCY", value)
-  }
+  // HOSTING
 
   setSelfHosted = (value: boolean) => {
     env._set("SELF_HOSTED", value)
     coreEnv._set("SELF_HOSTED", value)
   }
 
-  modeCloud = () => {
+  cloudHosted = () => {
     this.setSelfHosted(false)
-    this.setMultiTenancy(true)
   }
 
-  modeSelf = () => {
+  selfHosted = () => {
     this.setSelfHosted(true)
-    this.setMultiTenancy(false)
   }
 
   // UTILS
@@ -125,7 +86,7 @@ class TestConfiguration {
     if (params) {
       request.params = params
     }
-    await tenancy.doInTenant(this.getTenantId(), () => {
+    await context.doInTenant(this.getTenantId(), () => {
       return controlFunc(request)
     })
     return request.body
@@ -135,18 +96,10 @@ class TestConfiguration {
 
   async beforeAll() {
     try {
-      this.#tenantId = structures.tenant.id()
-
-      // Running tests in parallel causes issues creating the globaldb twice. This ensures the db is properly created before starting
-      await retry(async () => await this.createDefaultUser())
-      await this.createSession(this.defaultUser!)
-
-      await tenancy.doInTenant(this.#tenantId, async () => {
-        await this.createTenant1User()
-        await this.createSession(this.tenant1User!)
-      })
+      await this.createDefaultUser()
+      await this.createSession(this.user!)
     } catch (e: any) {
-      console.log(e)
+      console.error(e)
       throw new Error(e.message)
     }
   }
@@ -159,12 +112,16 @@ class TestConfiguration {
 
   // TENANCY
 
+  doInTenant(task: any) {
+    return context.doInTenant(this.tenantId, () => {
+      return task()
+    })
+  }
+
   createTenant = async (): Promise<User> => {
     // create user / new tenant
     const res = await this.api.users.createAdminUser()
 
-    await sdk.users.addTenant(res.tenantId, res.userId, res.email)
-
     // return the created user
     const userRes = await this.api.users.getUser(res.userId, {
       headers: {
@@ -182,9 +139,9 @@ class TestConfiguration {
 
   getTenantId() {
     try {
-      return tenancy.getTenantId()
-    } catch (e: any) {
-      return DEFAULT_TENANT_ID
+      return context.getTenantId()
+    } catch (e) {
+      return this.tenantId!
     }
   }
 
@@ -232,14 +189,11 @@ class TestConfiguration {
   }
 
   defaultHeaders() {
-    const tenantId = this.getTenantId()
-    if (tenantId === TENANT_ID) {
-      return this.authHeaders(this.defaultUser!)
-    } else if (tenantId === this.getTenantId()) {
-      return this.authHeaders(this.tenant1User!)
-    } else {
-      throw new Error("could not determine auth headers to use")
-    }
+    return this.authHeaders(this.user!)
+  }
+
+  tenantIdHeaders() {
+    return { [constants.Header.TENANT_ID]: this.tenantId }
   }
 
   internalAPIHeaders() {
@@ -254,20 +208,15 @@ class TestConfiguration {
 
   async createDefaultUser() {
     const user = structures.users.adminUser({
-      password: "test",
+      password: this.userPassword,
     })
-    this.defaultUser = await this.createUser(user)
-  }
-
-  async createTenant1User() {
-    const user = structures.users.adminUser({
-      password: "test",
+    await context.doInTenant(this.tenantId!, async () => {
+      this.user = await this.createUser(user)
     })
-    this.tenant1User = await this.createUser(user)
   }
 
   async getUser(email: string): Promise<User> {
-    return tenancy.doInTenant(this.getTenantId(), () => {
+    return context.doInTenant(this.getTenantId(), () => {
       return users.getGlobalUserByEmail(email)
     })
   }
diff --git a/packages/worker/src/tests/api/base.ts b/packages/worker/src/tests/api/base.ts
index c1263ed5cb..460d61e70a 100644
--- a/packages/worker/src/tests/api/base.ts
+++ b/packages/worker/src/tests/api/base.ts
@@ -1,4 +1,5 @@
 import TestConfiguration from "../TestConfiguration"
+import { SuperTest, Test } from "supertest"
 
 export interface TestAPIOpts {
   headers?: any
@@ -7,7 +8,7 @@ export interface TestAPIOpts {
 
 export abstract class TestAPI {
   config: TestConfiguration
-  request: any
+  request: SuperTest<Test>
 
   protected constructor(config: TestConfiguration) {
     this.config = config
diff --git a/packages/worker/src/tests/api/restore.ts b/packages/worker/src/tests/api/restore.ts
index 6069c20185..c6a646317d 100644
--- a/packages/worker/src/tests/api/restore.ts
+++ b/packages/worker/src/tests/api/restore.ts
@@ -9,6 +9,7 @@ export class RestoreAPI extends TestAPI {
   restored = (opts?: TestAPIOpts) => {
     return this.request
       .post(`/api/system/restored`)
+      .set(this.config.tenantIdHeaders())
       .expect(opts?.status ? opts.status : 200)
   }
 }
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e7a02fce1f..b03e9d9d7c 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -800,17 +800,6 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
 "@jest/types@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
@@ -1317,6 +1306,11 @@
   resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.5.tgz#650820e95de346e1f84e30667d168c8fd25aa6e3"
   integrity sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==
 
+"@types/cookiejar@*":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8"
+  integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==
+
 "@types/cookies@*":
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz#7a92453d1d16389c05a5301eef566f34946cfd81"
@@ -1413,13 +1407,13 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@26.0.23":
-  version "26.0.23"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7"
-  integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==
+"@types/jest@28.1.1":
+  version "28.1.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.1.tgz#8c9ba63702a11f8c386ee211280e8b68cb093cd1"
+  integrity sha512-C2p7yqleUKtCkVjlOur9BWVA4HgUQmEj/HWCt5WzZ5mLXrWnyIfl0wGuArc+kBXsy0ZZfLp+7dywB4HtSVYGVA==
   dependencies:
-    jest-diff "^26.0.0"
-    pretty-format "^26.0.0"
+    jest-matcher-utils "^27.0.0"
+    pretty-format "^27.0.0"
 
 "@types/json-buffer@~3.0.0":
   version "3.0.0"
@@ -1689,6 +1683,21 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/superagent@*":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.16.tgz#12c9c16f232f9d89beab91d69368f96ce8e2d881"
+  integrity sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ==
+  dependencies:
+    "@types/cookiejar" "*"
+    "@types/node" "*"
+
+"@types/supertest@2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc"
+  integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==
+  dependencies:
+    "@types/superagent" "*"
+
 "@types/tough-cookie@^4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -1704,13 +1713,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
-"@types/yargs@^15.0.0":
-  version "15.0.14"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06"
-  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^16.0.0":
   version "16.0.5"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3"
@@ -1898,7 +1900,7 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
   integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2999,10 +3001,10 @@ dezalgo@1.0.3:
     asap "^2.0.0"
     wrappy "1"
 
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+diff-sequences@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+  integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
 
 diff-sequences@^28.1.1:
   version "28.1.1"
@@ -3066,11 +3068,6 @@ dotenv@16.0.1:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
   integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
 
-dotenv@8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
-  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
-
 double-ended-queue@2.1.0-0:
   version "2.1.0-0"
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
@@ -4727,15 +4724,15 @@ jest-config@^28.1.3:
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^26.0.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
+jest-diff@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+  integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    diff-sequences "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
 
 jest-diff@^28.1.3:
   version "28.1.3"
@@ -4777,10 +4774,10 @@ jest-environment-node@^28.1.3:
     jest-mock "^28.1.3"
     jest-util "^28.1.3"
 
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
+jest-get-type@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
 
 jest-get-type@^28.0.2:
   version "28.0.2"
@@ -4814,6 +4811,16 @@ jest-leak-detector@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
+jest-matcher-utils@^27.0.0:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
+  integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
 jest-matcher-utils@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
@@ -6624,14 +6631,13 @@ prettier@2.3.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6"
   integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==
 
-pretty-format@^26.0.0, pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+pretty-format@^27.0.0, pretty-format@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
 pretty-format@^28.1.3:

From 07e5598538f745b8495e5f58d7920c2d1a22fc38 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 13 Feb 2023 12:09:16 +0000
Subject: [PATCH 009/273] Enable use of redis container in worker tests

---
 packages/backend-core/src/environment.ts            |  5 +++--
 packages/backend-core/src/queue/queue.ts            |  2 +-
 packages/backend-core/src/redis/redis.ts            | 13 +++++++++----
 packages/backend-core/src/redis/utils.ts            | 10 ++++------
 .../tests/utilities/testContainerUtils.ts           |  5 +++++
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index d742ca1cc9..95e636c9b4 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -44,8 +44,9 @@ const environment = {
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
   GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
-  REDIS_URL: process.env.REDIS_URL,
-  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+  REDIS_URL: process.env.REDIS_URL || "localhost:6379",
+  REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase",
+  MOCK_REDIS: process.env.MOCK_REDIS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   AWS_REGION: process.env.AWS_REGION,
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index b34d46e463..8e1fc1fbf3 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -4,7 +4,6 @@ import { JobQueue } from "./constants"
 import InMemoryQueue from "./inMemoryQueue"
 import BullQueue from "bull"
 import { addListeners, StalledFn } from "./listeners"
-const { opts: redisOpts, redisProtocolUrl } = getRedisOptions()
 
 const CLEANUP_PERIOD_MS = 60 * 1000
 let QUEUES: BullQueue.Queue[] | InMemoryQueue[] = []
@@ -20,6 +19,7 @@ export function createQueue<T>(
   jobQueue: JobQueue,
   opts: { removeStalledCb?: StalledFn } = {}
 ): BullQueue.Queue<T> {
+  const { opts: redisOpts, redisProtocolUrl } = getRedisOptions()
   const queueConfig: any = redisProtocolUrl || { redis: redisOpts }
   let queue: any
   if (!env.isTest()) {
diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index 0267709cdc..2669cd816a 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -1,6 +1,6 @@
 import env from "../environment"
 // ioredis mock is all in memory
-const Redis = env.isTest() ? require("ioredis-mock") : require("ioredis")
+const Redis = env.MOCK_REDIS ? require("ioredis-mock") : require("ioredis")
 import {
   addDbPrefix,
   removeDbPrefix,
@@ -17,8 +17,13 @@ const DEFAULT_SELECT_DB = SelectableDatabase.DEFAULT
 // for testing just generate the client once
 let CLOSED = false
 let CLIENTS: { [key: number]: any } = {}
-// if in test always connected
-let CONNECTED = env.isTest()
+
+let CONNECTED = false
+
+// mock redis always connected
+if (env.MOCK_REDIS) {
+  CONNECTED = true
+}
 
 function pickClient(selectDb: number): any {
   return CLIENTS[selectDb]
@@ -57,7 +62,7 @@ function init(selectDb = DEFAULT_SELECT_DB) {
     return
   }
   // testing uses a single in memory client
-  if (env.isTest()) {
+  if (env.MOCK_REDIS) {
     CLIENTS[selectDb] = new Redis(getRedisOptions())
   }
   // start the timer - only allowed 5 seconds to connect
diff --git a/packages/backend-core/src/redis/utils.ts b/packages/backend-core/src/redis/utils.ts
index 4c556ebd54..7606c77b87 100644
--- a/packages/backend-core/src/redis/utils.ts
+++ b/packages/backend-core/src/redis/utils.ts
@@ -2,8 +2,6 @@ import env from "../environment"
 
 const SLOT_REFRESH_MS = 2000
 const CONNECT_TIMEOUT_MS = 10000
-const REDIS_URL = !env.REDIS_URL ? "localhost:6379" : env.REDIS_URL
-const REDIS_PASSWORD = !env.REDIS_PASSWORD ? "budibase" : env.REDIS_PASSWORD
 export const SEPARATOR = "-"
 
 /**
@@ -60,8 +58,8 @@ export enum SelectableDatabase {
 }
 
 export function getRedisOptions(clustered = false) {
-  let password = REDIS_PASSWORD
-  let url: string[] | string = REDIS_URL.split("//")
+  let password = env.REDIS_PASSWORD
+  let url: string[] | string = env.REDIS_URL.split("//")
   // get rid of the protocol
   url = url.length > 1 ? url[1] : url[0]
   // check for a password etc
@@ -78,8 +76,8 @@ export function getRedisOptions(clustered = false) {
   let redisProtocolUrl
 
   // fully qualified redis URL
-  if (/rediss?:\/\//.test(REDIS_URL)) {
-    redisProtocolUrl = REDIS_URL
+  if (/rediss?:\/\//.test(env.REDIS_URL)) {
+    redisProtocolUrl = env.REDIS_URL
   }
 
   const opts: any = {
diff --git a/packages/backend-core/tests/utilities/testContainerUtils.ts b/packages/backend-core/tests/utilities/testContainerUtils.ts
index 22198bd496..11c5fca806 100644
--- a/packages/backend-core/tests/utilities/testContainerUtils.ts
+++ b/packages/backend-core/tests/utilities/testContainerUtils.ts
@@ -34,12 +34,17 @@ function getMinioConfig() {
   return getContainerInfo("minio-service", 9000)
 }
 
+function getRedisConfig() {
+  return getContainerInfo("redis-service", 6379)
+}
+
 export function setupEnv(...envs: any[]) {
   const configs = [
     { key: "COUCH_DB_PORT", value: getCouchConfig().port },
     { key: "COUCH_DB_URL", value: getCouchConfig().url },
     { key: "MINIO_PORT", value: getMinioConfig().port },
     { key: "MINIO_URL", value: getMinioConfig().url },
+    { key: "REDIS_URL", value: getRedisConfig().url },
   ]
 
   for (const config of configs.filter(x => !!x.value)) {

From f53faff7ad80fd7530a20036cd51d22d5933048d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 13 Feb 2023 12:27:49 +0000
Subject: [PATCH 010/273] Add LOG_4XX to environment

---
 packages/backend-core/src/environment.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index d742ca1cc9..9a07695734 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -82,6 +82,7 @@ const environment = {
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   DEPLOYMENT_ENVIRONMENT:
     process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
+  LOG_4XX: process.env.LOG_4XX,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore

From cc7eb64a3bcb6be5429c6f232e39d2161a7a6355 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 13 Feb 2023 14:39:24 +0000
Subject: [PATCH 011/273] Rename LOG_4XX to ENABLE_4XX_HTTP_LOGGING and enable
 by default

---
 packages/backend-core/src/environment.ts              | 2 +-
 packages/backend-core/src/middleware/errorHandling.ts | 2 +-
 packages/backend-core/tests/jestEnv.ts                | 1 +
 packages/server/src/tests/jestEnv.ts                  | 1 +
 packages/worker/src/tests/jestEnv.ts                  | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index df44416609..ed7a161160 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -83,7 +83,7 @@ const environment = {
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   DEPLOYMENT_ENVIRONMENT:
     process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
-  LOG_4XX: process.env.LOG_4XX,
+  ENABLE_4XX_HTTP_LOGGING: process.env.ENABLE_4XX_HTTP_LOGGING || true,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/backend-core/src/middleware/errorHandling.ts b/packages/backend-core/src/middleware/errorHandling.ts
index 1baaa92501..5ac70c33e5 100644
--- a/packages/backend-core/src/middleware/errorHandling.ts
+++ b/packages/backend-core/src/middleware/errorHandling.ts
@@ -9,7 +9,7 @@ export async function errorHandling(ctx: any, next: any) {
     const status = err.status || err.statusCode || 500
     ctx.status = status
 
-    if (status > 499 || env.LOG_4XX) {
+    if (status > 499 || env.ENABLE_4XX_HTTP_LOGGING) {
       ctx.log.error(err)
     }
 
diff --git a/packages/backend-core/tests/jestEnv.ts b/packages/backend-core/tests/jestEnv.ts
index 71cf865737..ec8de2942e 100644
--- a/packages/backend-core/tests/jestEnv.ts
+++ b/packages/backend-core/tests/jestEnv.ts
@@ -3,3 +3,4 @@ process.env.MULTI_TENANCY = "1"
 process.env.NODE_ENV = "jest"
 process.env.MOCK_REDIS = "1"
 process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
+process.env.ENABLE_4XX_HTTP_LOGGING = "0"
diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts
index b1ef038c1b..c567b260b3 100644
--- a/packages/server/src/tests/jestEnv.ts
+++ b/packages/server/src/tests/jestEnv.ts
@@ -6,4 +6,5 @@ process.env.MULTI_TENANCY = "1"
 // @ts-ignore
 process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
 process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
+process.env.ENABLE_4XX_HTTP_LOGGING = "0"
 process.env.MOCK_REDIS = "1"
diff --git a/packages/worker/src/tests/jestEnv.ts b/packages/worker/src/tests/jestEnv.ts
index 602a505c1b..061897451e 100644
--- a/packages/worker/src/tests/jestEnv.ts
+++ b/packages/worker/src/tests/jestEnv.ts
@@ -2,6 +2,7 @@ process.env.SELF_HOSTED = "0"
 process.env.NODE_ENV = "jest"
 process.env.JWT_SECRET = "test-jwtsecret"
 process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
+process.env.ENABLE_4XX_HTTP_LOGGING = "0"
 process.env.MULTI_TENANCY = "1"
 process.env.MINIO_URL = "http://localhost"
 process.env.MINIO_ACCESS_KEY = "test"

From 6d60c275211cc37000f5f01fd585af1fdcbeb900 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 13 Feb 2023 16:32:14 +0000
Subject: [PATCH 012/273] add store and api funcs

---
 .../builder/src/stores/portal/auditLogs.js    | 37 ++++++++++++
 packages/frontend-core/src/api/auditLogs.js   | 58 +++++++++++++++++++
 packages/frontend-core/src/api/index.js       |  3 +
 3 files changed, 98 insertions(+)
 create mode 100644 packages/builder/src/stores/portal/auditLogs.js
 create mode 100644 packages/frontend-core/src/api/auditLogs.js

diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
new file mode 100644
index 0000000000..9381bea86a
--- /dev/null
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -0,0 +1,37 @@
+import { writable, get } from "svelte/store"
+import { API } from "api"
+import { licensing } from "stores/portal"
+
+export function createAuditLogsStore() {
+  const { subscribe, set } = writable({
+    logs: [],
+  })
+
+  async function search(opts = {}) {
+    if (get(licensing).auditLogsEnabled) {
+      const paged = await API.searchAuditLogs(opts)
+      set({
+        ...paged,
+        ...opts,
+      })
+      return paged
+    }
+  }
+
+  async function getEventDefinitions() {
+    return await API.getEventDefinitions()
+  }
+
+  async function downloadLogs(opts = {}) {
+    return await API.downloadLogs(opts)
+  }
+
+  return {
+    subscribe,
+    search,
+    getEventDefinitions,
+    downloadLogs,
+  }
+}
+
+export const environment = createAuditLogsStore()
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
new file mode 100644
index 0000000000..9858a88c0b
--- /dev/null
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -0,0 +1,58 @@
+const buildOpts = ({
+  userIds,
+  appIds,
+  startDate,
+  endDate,
+  metadataSearch,
+  event,
+}) => {
+  const opts = {}
+
+  if (startDate && endDate) {
+    opts.startDate = startDate
+    opts.endDate = endDate
+  }
+
+  if (metadataSearch) {
+    opts.metadataSearch = metadataSearch
+  }
+
+  if (event) {
+    opts.event = event
+  }
+
+  if (userIds) {
+    opts.userId = userIds
+  }
+
+  if (appIds) {
+    opts.appId = appIds
+  }
+
+  return opts
+}
+
+export const buildAuditLogsEndpoints = API => ({
+  /**
+   * Gets a list of users in the current tenant.
+   */
+  searchAuditLogs: async opts => {
+    return await API.post({
+      url: `/api/auditlogs/search`,
+      body: buildOpts(opts),
+    })
+  },
+
+  getEventDefinitions: async () => {
+    return await API.get({
+      url: `/api/auditlogs/definitions`,
+    })
+  },
+
+  downloadLogs: async opts => {
+    return await API.post({
+      url: `/api/auditlogs/definitions`,
+      body: buildOpts(opts),
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js
index e2935b416b..f8eee45cb8 100644
--- a/packages/frontend-core/src/api/index.js
+++ b/packages/frontend-core/src/api/index.js
@@ -28,6 +28,8 @@ import { buildPluginEndpoints } from "./plugins"
 import { buildBackupsEndpoints } from "./backups"
 import { buildEnvironmentVariableEndpoints } from "./environmentVariables"
 import { buildEventEndpoints } from "./events"
+import { buildAuditLogsEndpoints } from "./auditLogs"
+
 const defaultAPIClientConfig = {
   /**
    * Certain definitions can't change at runtime for client apps, such as the
@@ -250,5 +252,6 @@ export const createAPIClient = config => {
     ...buildBackupsEndpoints(API),
     ...buildEnvironmentVariableEndpoints(API),
     ...buildEventEndpoints(API),
+    ...buildAuditLogsEndpoints(API),
   }
 }

From 05ceee1cfee2e91e2a6110c8e6d768fbdfbeeb45 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 13 Feb 2023 17:13:59 +0000
Subject: [PATCH 013/273] Moving lucene handling to backend-core so that it can
 be used for other databases (outside row indexes).

---
 packages/backend-core/src/db/index.ts         |   1 +
 packages/backend-core/src/db/lucene.ts        | 563 ++++++++++++++++++
 packages/backend-core/src/index.ts            |   2 +
 .../src/api/controllers/row/internalSearch.ts | 527 +---------------
 .../server/src/api/controllers/row/utils.ts   |   3 +-
 packages/server/src/integrations/base/sql.ts  |   4 +-
 .../server/src/integrations/base/utils.ts     |  12 -
 packages/worker/src/api/routes/index.ts       |   3 +
 8 files changed, 578 insertions(+), 537 deletions(-)
 create mode 100644 packages/backend-core/src/db/lucene.ts
 delete mode 100644 packages/server/src/integrations/base/utils.ts

diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 0d9f75fa18..a569b17b36 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -7,3 +7,4 @@ export { default as Replication } from "./Replication"
 // exports to support old export structure
 export * from "../constants/db"
 export { getGlobalDBName, baseGlobalDBName } from "../context"
+export * from "./lucene"
diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
new file mode 100644
index 0000000000..028750797f
--- /dev/null
+++ b/packages/backend-core/src/db/lucene.ts
@@ -0,0 +1,563 @@
+import fetch from "node-fetch"
+import { db as dbCore } from "../"
+import { SearchFilters, Row } from "@budibase/types"
+
+const QUERY_START_REGEX = /\d[0-9]*:/g
+
+export type SearchParams = {
+  tableId: string
+  sort?: string
+  sortOrder?: string
+  sortType?: string
+  limit?: number
+  bookmark?: string
+  version?: string
+  rows?: Row[]
+}
+
+export function removeKeyNumbering(key: any): string {
+  if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
+    const parts = key.split(":")
+    // remove the number
+    parts.shift()
+    return parts.join(":")
+  } else {
+    return key
+  }
+}
+
+/**
+ * Class to build lucene query URLs.
+ * Optionally takes a base lucene query object.
+ */
+export class QueryBuilder {
+  dbName: string
+  index: string
+  query: SearchFilters
+  limit: number
+  sort?: string
+  bookmark?: string
+  sortOrder: string
+  sortType: string
+  includeDocs: boolean
+  version?: string
+
+  constructor(dbName: string, index: string, base?: SearchFilters) {
+    this.dbName = dbName
+    this.index = index
+    this.query = {
+      allOr: false,
+      string: {},
+      fuzzy: {},
+      range: {},
+      equal: {},
+      notEqual: {},
+      empty: {},
+      notEmpty: {},
+      oneOf: {},
+      contains: {},
+      notContains: {},
+      containsAny: {},
+      ...base,
+    }
+    this.limit = 50
+    this.sortOrder = "ascending"
+    this.sortType = "string"
+    this.includeDocs = true
+  }
+
+  setVersion(version?: string) {
+    if (version != null) {
+      this.version = version
+    }
+    return this
+  }
+
+  setTable(tableId: string) {
+    this.query.equal!.tableId = tableId
+    return this
+  }
+
+  setLimit(limit?: number) {
+    if (limit != null) {
+      this.limit = limit
+    }
+    return this
+  }
+
+  setSort(sort?: string) {
+    if (sort != null) {
+      this.sort = sort
+    }
+    return this
+  }
+
+  setSortOrder(sortOrder?: string) {
+    if (sortOrder != null) {
+      this.sortOrder = sortOrder
+    }
+    return this
+  }
+
+  setSortType(sortType?: string) {
+    if (sortType != null) {
+      this.sortType = sortType
+    }
+    return this
+  }
+
+  setBookmark(bookmark?: string) {
+    if (bookmark != null) {
+      this.bookmark = bookmark
+    }
+    return this
+  }
+
+  excludeDocs() {
+    this.includeDocs = false
+    return this
+  }
+
+  addString(key: string, partial: string) {
+    this.query.string![key] = partial
+    return this
+  }
+
+  addFuzzy(key: string, fuzzy: string) {
+    this.query.fuzzy![key] = fuzzy
+    return this
+  }
+
+  addRange(key: string, low: string | number, high: string | number) {
+    this.query.range![key] = {
+      low,
+      high,
+    }
+    return this
+  }
+
+  addEqual(key: string, value: any) {
+    this.query.equal![key] = value
+    return this
+  }
+
+  addNotEqual(key: string, value: any) {
+    this.query.notEqual![key] = value
+    return this
+  }
+
+  addEmpty(key: string, value: any) {
+    this.query.empty![key] = value
+    return this
+  }
+
+  addNotEmpty(key: string, value: any) {
+    this.query.notEmpty![key] = value
+    return this
+  }
+
+  addOneOf(key: string, value: any) {
+    this.query.oneOf![key] = value
+    return this
+  }
+
+  addContains(key: string, value: any) {
+    this.query.contains![key] = value
+    return this
+  }
+
+  addNotContains(key: string, value: any) {
+    this.query.notContains![key] = value
+    return this
+  }
+
+  addContainsAny(key: string, value: any) {
+    this.query.containsAny![key] = value
+    return this
+  }
+
+  /**
+   * Preprocesses a value before going into a lucene search.
+   * Transforms strings to lowercase and wraps strings and bools in quotes.
+   * @param value The value to process
+   * @param options The preprocess options
+   * @returns {string|*}
+   */
+  preprocess(value: any, { escape, lowercase, wrap, type }: any = {}) {
+    const hasVersion = !!this.version
+    // Determine if type needs wrapped
+    const originalType = typeof value
+    // Convert to lowercase
+    if (value && lowercase) {
+      value = value.toLowerCase ? value.toLowerCase() : value
+    }
+    // Escape characters
+    if (escape && originalType === "string") {
+      value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
+    }
+
+    // Wrap in quotes
+    if (originalType === "string" && !isNaN(value) && !type) {
+      value = `"${value}"`
+    } else if (hasVersion && wrap) {
+      value = originalType === "number" ? value : `"${value}"`
+    }
+    return value
+  }
+
+  buildSearchQuery() {
+    const builder = this
+    let allOr = this.query && this.query.allOr
+    let query = allOr ? "" : "*:*"
+    const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }
+    let tableId
+    if (this.query.equal!.tableId) {
+      tableId = this.query.equal!.tableId
+      delete this.query.equal!.tableId
+    }
+
+    const equal = (key: string, value: any) => {
+      // 0 evaluates to false, which means we would return all rows if we don't check it
+      if (!value && value !== 0) {
+        return null
+      }
+      return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
+    }
+
+    const contains = (key: string, value: any, mode = "AND") => {
+      if (Array.isArray(value) && value.length === 0) {
+        return null
+      }
+      if (!Array.isArray(value)) {
+        return `${key}:${value}`
+      }
+      let statement = `${builder.preprocess(value[0], { escape: true })}`
+      for (let i = 1; i < value.length; i++) {
+        statement += ` ${mode} ${builder.preprocess(value[i], {
+          escape: true,
+        })}`
+      }
+      return `${key}:(${statement})`
+    }
+
+    const notContains = (key: string, value: any) => {
+      // @ts-ignore
+      const allPrefix = allOr === "" ? "*:* AND" : ""
+      return allPrefix + "NOT " + contains(key, value)
+    }
+
+    const containsAny = (key: string, value: any) => {
+      return contains(key, value, "OR")
+    }
+
+    const oneOf = (key: string, value: any) => {
+      if (!Array.isArray(value)) {
+        if (typeof value === "string") {
+          value = value.split(",")
+        } else {
+          return ""
+        }
+      }
+      let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`
+      for (let i = 1; i < value.length; i++) {
+        orStatement += ` OR ${builder.preprocess(
+          value[i],
+          allPreProcessingOpts
+        )}`
+      }
+      return `${key}:(${orStatement})`
+    }
+
+    function build(structure: any, queryFn: any) {
+      for (let [key, value] of Object.entries(structure)) {
+        // check for new format - remove numbering if needed
+        key = removeKeyNumbering(key)
+        key = builder.preprocess(key.replace(/ /g, "_"), {
+          escape: true,
+        })
+        const expression = queryFn(key, value)
+        if (expression == null) {
+          continue
+        }
+        if (query.length > 0) {
+          query += ` ${allOr ? "OR" : "AND"} `
+        }
+        query += expression
+      }
+    }
+
+    // Construct the actual lucene search query string from JSON structure
+    if (this.query.string) {
+      build(this.query.string, (key: string, value: any) => {
+        if (!value) {
+          return null
+        }
+        value = builder.preprocess(value, {
+          escape: true,
+          lowercase: true,
+          type: "string",
+        })
+        return `${key}:${value}*`
+      })
+    }
+    if (this.query.range) {
+      build(this.query.range, (key: string, value: any) => {
+        if (!value) {
+          return null
+        }
+        if (value.low == null || value.low === "") {
+          return null
+        }
+        if (value.high == null || value.high === "") {
+          return null
+        }
+        const low = builder.preprocess(value.low, allPreProcessingOpts)
+        const high = builder.preprocess(value.high, allPreProcessingOpts)
+        return `${key}:[${low} TO ${high}]`
+      })
+    }
+    if (this.query.fuzzy) {
+      build(this.query.fuzzy, (key: string, value: any) => {
+        if (!value) {
+          return null
+        }
+        value = builder.preprocess(value, {
+          escape: true,
+          lowercase: true,
+          type: "fuzzy",
+        })
+        return `${key}:${value}~`
+      })
+    }
+    if (this.query.equal) {
+      build(this.query.equal, equal)
+    }
+    if (this.query.notEqual) {
+      build(this.query.notEqual, (key: string, value: any) => {
+        if (!value) {
+          return null
+        }
+        return `!${key}:${builder.preprocess(value, allPreProcessingOpts)}`
+      })
+    }
+    if (this.query.empty) {
+      build(this.query.empty, (key: string) => `!${key}:["" TO *]`)
+    }
+    if (this.query.notEmpty) {
+      build(this.query.notEmpty, (key: string) => `${key}:["" TO *]`)
+    }
+    if (this.query.oneOf) {
+      build(this.query.oneOf, oneOf)
+    }
+    if (this.query.contains) {
+      build(this.query.contains, contains)
+    }
+    if (this.query.notContains) {
+      build(this.query.notContains, notContains)
+    }
+    if (this.query.containsAny) {
+      build(this.query.containsAny, containsAny)
+    }
+    // make sure table ID is always added as an AND
+    if (tableId) {
+      query = `(${query})`
+      allOr = false
+      build({ tableId }, equal)
+    }
+    return query
+  }
+
+  buildSearchBody() {
+    let body: any = {
+      q: this.buildSearchQuery(),
+      limit: Math.min(this.limit, 200),
+      include_docs: this.includeDocs,
+    }
+    if (this.bookmark) {
+      body.bookmark = this.bookmark
+    }
+    if (this.sort) {
+      const order = this.sortOrder === "descending" ? "-" : ""
+      const type = `<${this.sortType}>`
+      body.sort = `${order}${this.sort.replace(/ /g, "_")}${type}`
+    }
+    return body
+  }
+
+  async run() {
+    const { url, cookie } = dbCore.getCouchInfo()
+    const fullPath = `${url}/${this.dbName}/_design/database/_search/${this.index}`
+    const body = this.buildSearchBody()
+    return await runQuery(fullPath, body, cookie)
+  }
+}
+
+/**
+ * Executes a lucene search query.
+ * @param url The query URL
+ * @param body The request body defining search criteria
+ * @param cookie The auth cookie for CouchDB
+ * @returns {Promise<{rows: []}>}
+ */
+const runQuery = async (url: string, body: any, cookie: string) => {
+  const response = await fetch(url, {
+    body: JSON.stringify(body),
+    method: "POST",
+    headers: {
+      Authorization: cookie,
+    },
+  })
+  const json = await response.json()
+
+  let output: any = {
+    rows: [],
+  }
+  if (json.rows != null && json.rows.length > 0) {
+    output.rows = json.rows.map((row: any) => row.doc)
+  }
+  if (json.bookmark) {
+    output.bookmark = json.bookmark
+  }
+  return output
+}
+
+/**
+ * Gets round the fixed limit of 200 results from a query by fetching as many
+ * pages as required and concatenating the results. This recursively operates
+ * until enough results have been found.
+ * @param dbName {string} Which database to run a lucene query on
+ * @param index {string} Which search index to utilise
+ * @param query {object} The JSON query structure
+ * @param params {object} The search params including:
+ *   tableId {string} The table ID to search
+ *   sort {string} The sort column
+ *   sortOrder {string} The sort order ("ascending" or "descending")
+ *   sortType {string} Whether to treat sortable values as strings or
+ *     numbers. ("string" or "number")
+ *   limit {number} The number of results to fetch
+ *   bookmark {string|null} Current bookmark in the recursive search
+ *   rows {array|null} Current results in the recursive search
+ * @returns {Promise<*[]|*>}
+ */
+async function recursiveSearch(
+  dbName: string,
+  index: string,
+  query: any,
+  params: any
+): Promise<any> {
+  const bookmark = params.bookmark
+  const rows = params.rows || []
+  if (rows.length >= params.limit) {
+    return rows
+  }
+  let pageSize = 200
+  if (rows.length > params.limit - 200) {
+    pageSize = params.limit - rows.length
+  }
+  const page = await new QueryBuilder(dbName, index, query)
+    .setVersion(params.version)
+    .setTable(params.tableId)
+    .setBookmark(bookmark)
+    .setLimit(pageSize)
+    .setSort(params.sort)
+    .setSortOrder(params.sortOrder)
+    .setSortType(params.sortType)
+    .run()
+  if (!page.rows.length) {
+    return rows
+  }
+  if (page.rows.length < 200) {
+    return [...rows, ...page.rows]
+  }
+  const newParams = {
+    ...params,
+    bookmark: page.bookmark,
+    rows: [...rows, ...page.rows],
+  }
+  return await recursiveSearch(dbName, index, query, newParams)
+}
+
+/**
+ * Performs a paginated search. A bookmark will be returned to allow the next
+ * page to be fetched. There is a max limit off 200 results per page in a
+ * paginated search.
+ * @param dbName {string} Which database to run a lucene query on
+ * @param index {string} Which search index to utilise
+ * @param query {object} The JSON query structure
+ * @param params {object} The search params including:
+ *   tableId {string} The table ID to search
+ *   sort {string} The sort column
+ *   sortOrder {string} The sort order ("ascending" or "descending")
+ *   sortType {string} Whether to treat sortable values as strings or
+ *     numbers. ("string" or "number")
+ *   limit {number} The desired page size
+ *   bookmark {string} The bookmark to resume from
+ * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
+ */
+export async function paginatedSearch(
+  dbName: string,
+  index: string,
+  query: SearchFilters,
+  params: SearchParams
+) {
+  let limit = params.limit
+  if (limit == null || isNaN(limit) || limit < 0) {
+    limit = 50
+  }
+  limit = Math.min(limit, 200)
+  const search = new QueryBuilder(dbName, index, query)
+    .setVersion(params.version)
+    .setTable(params.tableId)
+    .setSort(params.sort)
+    .setSortOrder(params.sortOrder)
+    .setSortType(params.sortType)
+  const searchResults = await search
+    .setBookmark(params.bookmark)
+    .setLimit(limit)
+    .run()
+
+  // Try fetching 1 row in the next page to see if another page of results
+  // exists or not
+  const nextResults = await search
+    .setTable(params.tableId)
+    .setBookmark(searchResults.bookmark)
+    .setLimit(1)
+    .run()
+
+  return {
+    ...searchResults,
+    hasNextPage: nextResults.rows && nextResults.rows.length > 0,
+  }
+}
+
+/**
+ * Performs a full search, fetching multiple pages if required to return the
+ * desired amount of results. There is a limit of 1000 results to avoid
+ * heavy performance hits, and to avoid client components breaking from
+ * handling too much data.
+ * @param dbName {string} Which database to run a lucene query on
+ * @param index {string} Which search index to utilise
+ * @param query {object} The JSON query structure
+ * @param params {object} The search params including:
+ *   tableId {string} The table ID to search
+ *   sort {string} The sort column
+ *   sortOrder {string} The sort order ("ascending" or "descending")
+ *   sortType {string} Whether to treat sortable values as strings or
+ *     numbers. ("string" or "number")
+ *   limit {number} The desired number of results
+ * @returns {Promise<{rows: *}>}
+ */
+export async function fullSearch(
+  dbName: string,
+  index: string,
+  query: SearchFilters,
+  params: SearchParams
+) {
+  let limit = params.limit
+  if (limit == null || isNaN(limit) || limit < 0) {
+    limit = 1000
+  }
+  params.limit = Math.min(limit, 1000)
+  const rows = await recursiveSearch(dbName, index, query, params)
+  return { rows }
+}
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index b38a53e9e4..aa205e0317 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -25,6 +25,8 @@ export * as utils from "./utils"
 export * as errors from "./errors"
 export { default as env } from "./environment"
 
+export { SearchParams } from "./db"
+
 // expose error classes directly
 export * from "./errors"
 
diff --git a/packages/server/src/api/controllers/row/internalSearch.ts b/packages/server/src/api/controllers/row/internalSearch.ts
index 7068aabc5a..a250fe0429 100644
--- a/packages/server/src/api/controllers/row/internalSearch.ts
+++ b/packages/server/src/api/controllers/row/internalSearch.ts
@@ -1,531 +1,16 @@
 import { SearchIndexes } from "../../../db/utils"
-import { removeKeyNumbering } from "./utils"
-import fetch from "node-fetch"
-import { db as dbCore, context } from "@budibase/backend-core"
-import { SearchFilters, Row } from "@budibase/types"
+import { db as dbCore, context, SearchParams } from "@budibase/backend-core"
+import { SearchFilters } from "@budibase/types"
 
-type SearchParams = {
-  tableId: string
-  sort?: string
-  sortOrder?: string
-  sortType?: string
-  limit?: number
-  bookmark?: string
-  version?: string
-  rows?: Row[]
-}
-
-/**
- * Class to build lucene query URLs.
- * Optionally takes a base lucene query object.
- */
-export class QueryBuilder {
-  query: SearchFilters
-  limit: number
-  sort?: string
-  bookmark?: string
-  sortOrder: string
-  sortType: string
-  includeDocs: boolean
-  version?: string
-
-  constructor(base?: SearchFilters) {
-    this.query = {
-      allOr: false,
-      string: {},
-      fuzzy: {},
-      range: {},
-      equal: {},
-      notEqual: {},
-      empty: {},
-      notEmpty: {},
-      oneOf: {},
-      contains: {},
-      notContains: {},
-      containsAny: {},
-      ...base,
-    }
-    this.limit = 50
-    this.sortOrder = "ascending"
-    this.sortType = "string"
-    this.includeDocs = true
-  }
-
-  setVersion(version?: string) {
-    if (version != null) {
-      this.version = version
-    }
-    return this
-  }
-
-  setTable(tableId: string) {
-    this.query.equal!.tableId = tableId
-    return this
-  }
-
-  setLimit(limit?: number) {
-    if (limit != null) {
-      this.limit = limit
-    }
-    return this
-  }
-
-  setSort(sort?: string) {
-    if (sort != null) {
-      this.sort = sort
-    }
-    return this
-  }
-
-  setSortOrder(sortOrder?: string) {
-    if (sortOrder != null) {
-      this.sortOrder = sortOrder
-    }
-    return this
-  }
-
-  setSortType(sortType?: string) {
-    if (sortType != null) {
-      this.sortType = sortType
-    }
-    return this
-  }
-
-  setBookmark(bookmark?: string) {
-    if (bookmark != null) {
-      this.bookmark = bookmark
-    }
-    return this
-  }
-
-  excludeDocs() {
-    this.includeDocs = false
-    return this
-  }
-
-  addString(key: string, partial: string) {
-    this.query.string![key] = partial
-    return this
-  }
-
-  addFuzzy(key: string, fuzzy: string) {
-    this.query.fuzzy![key] = fuzzy
-    return this
-  }
-
-  addRange(key: string, low: string | number, high: string | number) {
-    this.query.range![key] = {
-      low,
-      high,
-    }
-    return this
-  }
-
-  addEqual(key: string, value: any) {
-    this.query.equal![key] = value
-    return this
-  }
-
-  addNotEqual(key: string, value: any) {
-    this.query.notEqual![key] = value
-    return this
-  }
-
-  addEmpty(key: string, value: any) {
-    this.query.empty![key] = value
-    return this
-  }
-
-  addNotEmpty(key: string, value: any) {
-    this.query.notEmpty![key] = value
-    return this
-  }
-
-  addOneOf(key: string, value: any) {
-    this.query.oneOf![key] = value
-    return this
-  }
-
-  addContains(key: string, value: any) {
-    this.query.contains![key] = value
-    return this
-  }
-
-  addNotContains(key: string, value: any) {
-    this.query.notContains![key] = value
-    return this
-  }
-
-  addContainsAny(key: string, value: any) {
-    this.query.containsAny![key] = value
-    return this
-  }
-
-  /**
-   * Preprocesses a value before going into a lucene search.
-   * Transforms strings to lowercase and wraps strings and bools in quotes.
-   * @param value The value to process
-   * @param options The preprocess options
-   * @returns {string|*}
-   */
-  preprocess(value: any, { escape, lowercase, wrap, type }: any = {}) {
-    const hasVersion = !!this.version
-    // Determine if type needs wrapped
-    const originalType = typeof value
-    // Convert to lowercase
-    if (value && lowercase) {
-      value = value.toLowerCase ? value.toLowerCase() : value
-    }
-    // Escape characters
-    if (escape && originalType === "string") {
-      value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
-    }
-
-    // Wrap in quotes
-    if (originalType === "string" && !isNaN(value) && !type) {
-      value = `"${value}"`
-    } else if (hasVersion && wrap) {
-      value = originalType === "number" ? value : `"${value}"`
-    }
-    return value
-  }
-
-  buildSearchQuery() {
-    const builder = this
-    let allOr = this.query && this.query.allOr
-    let query = allOr ? "" : "*:*"
-    const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }
-    let tableId
-    if (this.query.equal!.tableId) {
-      tableId = this.query.equal!.tableId
-      delete this.query.equal!.tableId
-    }
-
-    const equal = (key: string, value: any) => {
-      // 0 evaluates to false, which means we would return all rows if we don't check it
-      if (!value && value !== 0) {
-        return null
-      }
-      return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-    }
-
-    const contains = (key: string, value: any, mode = "AND") => {
-      if (Array.isArray(value) && value.length === 0) {
-        return null
-      }
-      if (!Array.isArray(value)) {
-        return `${key}:${value}`
-      }
-      let statement = `${builder.preprocess(value[0], { escape: true })}`
-      for (let i = 1; i < value.length; i++) {
-        statement += ` ${mode} ${builder.preprocess(value[i], {
-          escape: true,
-        })}`
-      }
-      return `${key}:(${statement})`
-    }
-
-    const notContains = (key: string, value: any) => {
-      // @ts-ignore
-      const allPrefix = allOr === "" ? "*:* AND" : ""
-      return allPrefix + "NOT " + contains(key, value)
-    }
-
-    const containsAny = (key: string, value: any) => {
-      return contains(key, value, "OR")
-    }
-
-    const oneOf = (key: string, value: any) => {
-      if (!Array.isArray(value)) {
-        if (typeof value === "string") {
-          value = value.split(",")
-        } else {
-          return ""
-        }
-      }
-      let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`
-      for (let i = 1; i < value.length; i++) {
-        orStatement += ` OR ${builder.preprocess(
-          value[i],
-          allPreProcessingOpts
-        )}`
-      }
-      return `${key}:(${orStatement})`
-    }
-
-    function build(structure: any, queryFn: any) {
-      for (let [key, value] of Object.entries(structure)) {
-        // check for new format - remove numbering if needed
-        key = removeKeyNumbering(key)
-        key = builder.preprocess(key.replace(/ /g, "_"), {
-          escape: true,
-        })
-        const expression = queryFn(key, value)
-        if (expression == null) {
-          continue
-        }
-        if (query.length > 0) {
-          query += ` ${allOr ? "OR" : "AND"} `
-        }
-        query += expression
-      }
-    }
-
-    // Construct the actual lucene search query string from JSON structure
-    if (this.query.string) {
-      build(this.query.string, (key: string, value: any) => {
-        if (!value) {
-          return null
-        }
-        value = builder.preprocess(value, {
-          escape: true,
-          lowercase: true,
-          type: "string",
-        })
-        return `${key}:${value}*`
-      })
-    }
-    if (this.query.range) {
-      build(this.query.range, (key: string, value: any) => {
-        if (!value) {
-          return null
-        }
-        if (value.low == null || value.low === "") {
-          return null
-        }
-        if (value.high == null || value.high === "") {
-          return null
-        }
-        const low = builder.preprocess(value.low, allPreProcessingOpts)
-        const high = builder.preprocess(value.high, allPreProcessingOpts)
-        return `${key}:[${low} TO ${high}]`
-      })
-    }
-    if (this.query.fuzzy) {
-      build(this.query.fuzzy, (key: string, value: any) => {
-        if (!value) {
-          return null
-        }
-        value = builder.preprocess(value, {
-          escape: true,
-          lowercase: true,
-          type: "fuzzy",
-        })
-        return `${key}:${value}~`
-      })
-    }
-    if (this.query.equal) {
-      build(this.query.equal, equal)
-    }
-    if (this.query.notEqual) {
-      build(this.query.notEqual, (key: string, value: any) => {
-        if (!value) {
-          return null
-        }
-        return `!${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-      })
-    }
-    if (this.query.empty) {
-      build(this.query.empty, (key: string) => `!${key}:["" TO *]`)
-    }
-    if (this.query.notEmpty) {
-      build(this.query.notEmpty, (key: string) => `${key}:["" TO *]`)
-    }
-    if (this.query.oneOf) {
-      build(this.query.oneOf, oneOf)
-    }
-    if (this.query.contains) {
-      build(this.query.contains, contains)
-    }
-    if (this.query.notContains) {
-      build(this.query.notContains, notContains)
-    }
-    if (this.query.containsAny) {
-      build(this.query.containsAny, containsAny)
-    }
-    // make sure table ID is always added as an AND
-    if (tableId) {
-      query = `(${query})`
-      allOr = false
-      build({ tableId }, equal)
-    }
-    return query
-  }
-
-  buildSearchBody() {
-    let body: any = {
-      q: this.buildSearchQuery(),
-      limit: Math.min(this.limit, 200),
-      include_docs: this.includeDocs,
-    }
-    if (this.bookmark) {
-      body.bookmark = this.bookmark
-    }
-    if (this.sort) {
-      const order = this.sortOrder === "descending" ? "-" : ""
-      const type = `<${this.sortType}>`
-      body.sort = `${order}${this.sort.replace(/ /g, "_")}${type}`
-    }
-    return body
-  }
-
-  async run() {
-    const appId = context.getAppId()
-    const { url, cookie } = dbCore.getCouchInfo()
-    const fullPath = `${url}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`
-    const body = this.buildSearchBody()
-    return await runQuery(fullPath, body, cookie)
-  }
-}
-
-/**
- * Executes a lucene search query.
- * @param url The query URL
- * @param body The request body defining search criteria
- * @param cookie The auth cookie for CouchDB
- * @returns {Promise<{rows: []}>}
- */
-const runQuery = async (url: string, body: any, cookie: string) => {
-  const response = await fetch(url, {
-    body: JSON.stringify(body),
-    method: "POST",
-    headers: {
-      Authorization: cookie,
-    },
-  })
-  const json = await response.json()
-
-  let output: any = {
-    rows: [],
-  }
-  if (json.rows != null && json.rows.length > 0) {
-    output.rows = json.rows.map((row: any) => row.doc)
-  }
-  if (json.bookmark) {
-    output.bookmark = json.bookmark
-  }
-  return output
-}
-
-/**
- * Gets round the fixed limit of 200 results from a query by fetching as many
- * pages as required and concatenating the results. This recursively operates
- * until enough results have been found.
- * @param query {object} The JSON query structure
- * @param params {object} The search params including:
- *   tableId {string} The table ID to search
- *   sort {string} The sort column
- *   sortOrder {string} The sort order ("ascending" or "descending")
- *   sortType {string} Whether to treat sortable values as strings or
- *     numbers. ("string" or "number")
- *   limit {number} The number of results to fetch
- *   bookmark {string|null} Current bookmark in the recursive search
- *   rows {array|null} Current results in the recursive search
- * @returns {Promise<*[]|*>}
- */
-async function recursiveSearch(query: any, params: any): Promise<any> {
-  const bookmark = params.bookmark
-  const rows = params.rows || []
-  if (rows.length >= params.limit) {
-    return rows
-  }
-  let pageSize = 200
-  if (rows.length > params.limit - 200) {
-    pageSize = params.limit - rows.length
-  }
-  const page = await new QueryBuilder(query)
-    .setVersion(params.version)
-    .setTable(params.tableId)
-    .setBookmark(bookmark)
-    .setLimit(pageSize)
-    .setSort(params.sort)
-    .setSortOrder(params.sortOrder)
-    .setSortType(params.sortType)
-    .run()
-  if (!page.rows.length) {
-    return rows
-  }
-  if (page.rows.length < 200) {
-    return [...rows, ...page.rows]
-  }
-  const newParams = {
-    ...params,
-    bookmark: page.bookmark,
-    rows: [...rows, ...page.rows],
-  }
-  return await recursiveSearch(query, newParams)
-}
-
-/**
- * Performs a paginated search. A bookmark will be returned to allow the next
- * page to be fetched. There is a max limit off 200 results per page in a
- * paginated search.
- * @param query {object} The JSON query structure
- * @param params {object} The search params including:
- *   tableId {string} The table ID to search
- *   sort {string} The sort column
- *   sortOrder {string} The sort order ("ascending" or "descending")
- *   sortType {string} Whether to treat sortable values as strings or
- *     numbers. ("string" or "number")
- *   limit {number} The desired page size
- *   bookmark {string} The bookmark to resume from
- * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
- */
 export async function paginatedSearch(
   query: SearchFilters,
   params: SearchParams
 ) {
-  let limit = params.limit
-  if (limit == null || isNaN(limit) || limit < 0) {
-    limit = 50
-  }
-  limit = Math.min(limit, 200)
-  const search = new QueryBuilder(query)
-    .setVersion(params.version)
-    .setTable(params.tableId)
-    .setSort(params.sort)
-    .setSortOrder(params.sortOrder)
-    .setSortType(params.sortType)
-  const searchResults = await search
-    .setBookmark(params.bookmark)
-    .setLimit(limit)
-    .run()
-
-  // Try fetching 1 row in the next page to see if another page of results
-  // exists or not
-  const nextResults = await search
-    .setTable(params.tableId)
-    .setBookmark(searchResults.bookmark)
-    .setLimit(1)
-    .run()
-
-  return {
-    ...searchResults,
-    hasNextPage: nextResults.rows && nextResults.rows.length > 0,
-  }
+  const appId = context.getAppId()
+  return dbCore.paginatedSearch(appId!, SearchIndexes.ROWS, query, params)
 }
 
-/**
- * Performs a full search, fetching multiple pages if required to return the
- * desired amount of results. There is a limit of 1000 results to avoid
- * heavy performance hits, and to avoid client components breaking from
- * handling too much data.
- * @param query {object} The JSON query structure
- * @param params {object} The search params including:
- *   tableId {string} The table ID to search
- *   sort {string} The sort column
- *   sortOrder {string} The sort order ("ascending" or "descending")
- *   sortType {string} Whether to treat sortable values as strings or
- *     numbers. ("string" or "number")
- *   limit {number} The desired number of results
- * @returns {Promise<{rows: *}>}
- */
 export async function fullSearch(query: SearchFilters, params: SearchParams) {
-  let limit = params.limit
-  if (limit == null || isNaN(limit) || limit < 0) {
-    limit = 1000
-  }
-  params.limit = Math.min(limit, 1000)
-  const rows = await recursiveSearch(query, params)
-  return { rows }
+  const appId = context.getAppId()
+  return dbCore.fullSearch(appId!, SearchIndexes.ROWS, query, params)
 }
diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts
index f0f1075205..82232b7f98 100644
--- a/packages/server/src/api/controllers/row/utils.ts
+++ b/packages/server/src/api/controllers/row/utils.ts
@@ -3,8 +3,7 @@ import * as userController from "../user"
 import { FieldTypes } from "../../../constants"
 import { context } from "@budibase/backend-core"
 import { makeExternalQuery } from "../../../integrations/base/query"
-import { BBContext, Row, Table } from "@budibase/types"
-export { removeKeyNumbering } from "../../../integrations/base/utils"
+import { Row, Table } from "@budibase/types"
 const validateJs = require("validate.js")
 const { cloneDeep } = require("lodash/fp")
 import { Format } from "../view/exporters"
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index e42350091b..557fbbedfd 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -6,11 +6,11 @@ import {
   SearchFilters,
   SortDirection,
 } from "@budibase/types"
+import { db as dbCore } from "@budibase/backend-core"
 import { QueryOptions } from "../../definitions/datasource"
 import { isIsoDateString, SqlClient } from "../utils"
 import SqlTableQueryBuilder from "./sqlTable"
 import environment from "../../environment"
-import { removeKeyNumbering } from "./utils"
 
 const envLimit = environment.SQL_MAX_ROWS
   ? parseInt(environment.SQL_MAX_ROWS)
@@ -136,7 +136,7 @@ class InternalBuilder {
       fn: (key: string, value: any) => void
     ) {
       for (let [key, value] of Object.entries(structure)) {
-        const updatedKey = removeKeyNumbering(key)
+        const updatedKey = dbCore.removeKeyNumbering(key)
         const isRelationshipField = updatedKey.includes(".")
         if (!opts.relationship && !isRelationshipField) {
           fn(`${opts.tableName}.${updatedKey}`, value)
diff --git a/packages/server/src/integrations/base/utils.ts b/packages/server/src/integrations/base/utils.ts
deleted file mode 100644
index 54efdb91a0..0000000000
--- a/packages/server/src/integrations/base/utils.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-const QUERY_START_REGEX = /\d[0-9]*:/g
-
-export function removeKeyNumbering(key: any): string {
-  if (typeof key === "string" && key.match(QUERY_START_REGEX) != null) {
-    const parts = key.split(":")
-    // remove the number
-    parts.shift()
-    return parts.join(":")
-  } else {
-    return key
-  }
-}
diff --git a/packages/worker/src/api/routes/index.ts b/packages/worker/src/api/routes/index.ts
index 3aa9422238..c64ad44423 100644
--- a/packages/worker/src/api/routes/index.ts
+++ b/packages/worker/src/api/routes/index.ts
@@ -18,6 +18,8 @@ import accountRoutes from "./system/accounts"
 import restoreRoutes from "./system/restore"
 
 let userGroupRoutes = api.groups
+let auditLogRoutes = api.auditLogs
+
 export const routes: Router[] = [
   configRoutes,
   userRoutes,
@@ -32,6 +34,7 @@ export const routes: Router[] = [
   selfRoutes,
   licenseRoutes,
   userGroupRoutes,
+  auditLogRoutes,
   migrationRoutes,
   accountRoutes,
   restoreRoutes,

From 46e9bf144393b62163984113cb23b9ed87a5aab0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 13 Feb 2023 18:16:13 +0000
Subject: [PATCH 014/273] Some updates to add in the audit log DB.

---
 packages/backend-core/src/constants/db.ts        |  4 ++++
 packages/backend-core/src/context/mainContext.ts | 14 ++++++++++++++
 packages/types/src/api/web/global/auditLogs.ts   |  6 ++++--
 packages/types/src/documents/global/auditLogs.ts |  4 ++--
 packages/types/src/documents/global/index.ts     |  1 +
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index f7d15b3880..d41098c405 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -68,6 +68,7 @@ export enum DocumentType {
   MEM_VIEW = "view",
   USER_FLAG = "flag",
   AUTOMATION_METADATA = "meta_au",
+  AUDIT_LOG = "al",
 }
 
 export const StaticDatabases = {
@@ -88,6 +89,9 @@ export const StaticDatabases = {
       install: "install",
     },
   },
+  AUDIT_LOGS: {
+    name: "audit-logs",
+  },
 }
 
 export const APP_PREFIX = DocumentType.APP + SEPARATOR
diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 9884d25d5a..1f14a20778 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -30,6 +30,13 @@ export function getGlobalDBName(tenantId?: string) {
   return baseGlobalDBName(tenantId)
 }
 
+export function getAuditLogDBName(tenantId?: string) {
+  if (!tenantId) {
+    tenantId = getTenantId()
+  }
+  return `${tenantId}${SEPARATOR}${StaticDatabases.AUDIT_LOGS.name}`
+}
+
 export function baseGlobalDBName(tenantId: string | undefined | null) {
   let dbName
   if (!tenantId || tenantId === DEFAULT_TENANT_ID) {
@@ -228,6 +235,13 @@ export function getGlobalDB(): Database {
   return getDB(baseGlobalDBName(context?.tenantId))
 }
 
+export function getAuditLogsDB(): Database {
+  if (!getTenantId()) {
+    throw new Error("Audit log DB not found")
+  }
+  return getDB(getAuditLogDBName())
+}
+
 /**
  * Gets the app database based on whatever the request
  * contained, dev or prod.
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 7281d0ca36..443cd79aa1 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -1,7 +1,7 @@
 import { Event, AuditedEventFriendlyName } from "../../../sdk"
 import { PaginationResponse, PaginationRequest } from "../"
 
-export interface DownloadAuditLogsRequest {
+export interface AuditLogSearchParams {
   userId?: string[]
   appId?: string[]
   event?: Event[]
@@ -10,9 +10,11 @@ export interface DownloadAuditLogsRequest {
   metadataSearch?: string
 }
 
+export interface DownloadAuditLogsRequest extends AuditLogSearchParams {}
+
 export interface SearchAuditLogsRequest
   extends PaginationRequest,
-    DownloadAuditLogsRequest {}
+    AuditLogSearchParams {}
 
 export interface SearchAuditLogsResponse extends PaginationResponse {
   data: {
diff --git a/packages/types/src/documents/global/auditLogs.ts b/packages/types/src/documents/global/auditLogs.ts
index bc07bc88d4..5b23650eec 100644
--- a/packages/types/src/documents/global/auditLogs.ts
+++ b/packages/types/src/documents/global/auditLogs.ts
@@ -1,8 +1,8 @@
 import { Document } from "../document"
 import { Event } from "../../sdk"
 
-export interface AuditLogDocument extends Document {
-  appId: string
+export interface AuditLogDoc extends Document {
+  appId?: string
   event: Event
   userId: string
   timestamp: string
diff --git a/packages/types/src/documents/global/index.ts b/packages/types/src/documents/global/index.ts
index 11ce7513f2..b728439dd6 100644
--- a/packages/types/src/documents/global/index.ts
+++ b/packages/types/src/documents/global/index.ts
@@ -6,3 +6,4 @@ export * from "./quotas"
 export * from "./schedule"
 export * from "./templates"
 export * from "./environmentVariables"
+export * from "./auditLogs"

From 1ed4f4b8feea5d2d06b719a97b81d2db9895fa17 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 15 Feb 2023 12:37:32 +0000
Subject: [PATCH 015/273] Update on audit logs, getting the full write flow
 from events configured.

---
 packages/backend-core/package.json            |   1 +
 packages/backend-core/src/events/events.ts    |  11 +-
 packages/backend-core/tsconfig.json           |   6 +-
 packages/backend-core/yarn.lock               | 118 ++-
 packages/server/package.json                  |   1 +
 .../api/controllers/row/ExternalRequest.ts    |   5 +-
 packages/server/yarn.lock                     | 812 +++++++++++++++++-
 .../types/src/documents/global/auditLogs.ts   |   2 +
 scripts/link-dependencies.sh                  |   4 +
 9 files changed, 932 insertions(+), 28 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 705e4b1114..b51afcb8b1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -25,6 +25,7 @@
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
     "@budibase/types": "2.3.14-alpha.0",
+    "@budibase/pro": "2.3.14-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index 01928221a0..e54497c0cf 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -1,6 +1,8 @@
-import { Event } from "@budibase/types"
+import { Event, IdentityType } from "@budibase/types"
+import { sdk } from "@budibase/pro"
 import { processors } from "./processors"
 import identification from "./identification"
+import { getAppId } from "../context"
 import * as backfill from "./backfill"
 
 export const publishEvent = async (
@@ -14,6 +16,13 @@ export const publishEvent = async (
   const backfilling = await backfill.isBackfillingEvent(event)
   // no backfill - send the event and exit
   if (!backfilling) {
+    // only audit log actual events, don't include backfills
+    const userId = identity.type === IdentityType.USER ? identity.id : undefined
+    await sdk.auditLogs.write(event, properties, {
+      userId,
+      timestamp,
+      appId: getAppId(),
+    })
     await processors.processEvent(event, identity, properties, timestamp)
     return
   }
diff --git a/packages/backend-core/tsconfig.json b/packages/backend-core/tsconfig.json
index e95fb9ab4d..62944d7f2c 100644
--- a/packages/backend-core/tsconfig.json
+++ b/packages/backend-core/tsconfig.json
@@ -4,11 +4,13 @@
     "composite": true,
     "baseUrl": ".",
     "paths": {
-      "@budibase/types": ["../types/src"]
+      "@budibase/types": ["../types/src"],
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "references": [
-    { "path": "../types" }
+    { "path": "../types" },
+    { "path": "../../../budibase-pro/packages/pro" }
   ],
   "exclude": [
     "node_modules",
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index d88b1058f9..93ca39ab35 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -475,6 +475,45 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@budibase/backend-core@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.14-alpha.0.tgz#8d60c93e9861301296907f61e770bdf1881b560c"
+  integrity sha512-lvRl6o9CCUx1VQ6ftu4FYuTp5mGgvbshNYoeaH0DbWFfhLNbibEHxx+pR+6M1ufhbu/EO6jKEr7DDeNiRBBMTw==
+  dependencies:
+    "@budibase/nano" "10.1.1"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.14-alpha.0"
+    "@shopify/jest-koa-mocks" "5.0.1"
+    "@techpass/passport-openidconnect" "0.3.2"
+    aws-cloudfront-sign "2.2.0"
+    aws-sdk "2.1030.0"
+    bcrypt "5.0.1"
+    bcryptjs "2.4.3"
+    bull "4.10.1"
+    correlation-id "4.0.0"
+    dotenv "16.0.1"
+    emitter-listener "1.1.2"
+    ioredis "4.28.0"
+    joi "17.6.0"
+    jsonwebtoken "9.0.0"
+    koa-passport "4.1.4"
+    lodash "4.17.21"
+    lodash.isarguments "3.1.0"
+    node-fetch "2.6.7"
+    passport-google-oauth "2.0.0"
+    passport-jwt "4.0.0"
+    passport-local "1.0.0"
+    passport-oauth2-refresh "^2.1.0"
+    posthog-node "1.3.0"
+    pouchdb "7.3.0"
+    pouchdb-find "7.2.2"
+    redlock "4.2.0"
+    sanitize-s3-objectkey "0.0.1"
+    semver "7.3.7"
+    tar-fs "2.1.1"
+    uuid "8.3.2"
+    zlib "1.0.5"
+
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -500,6 +539,25 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
+"@budibase/pro@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.14-alpha.0.tgz#db8ac1d0cacea21240c59458c4143e3e55663a4d"
+  integrity sha512-RJqXlvZmYrKCLxe7uVnc2KmDwE5OmoUZCA9M6b5Ne7ZHqrhtaNB/4Xlr1ESG79///epEWLv+Fde7mpHPzCvsZw==
+  dependencies:
+    "@budibase/backend-core" "2.3.14-alpha.0"
+    "@budibase/types" "2.3.14-alpha.0"
+    "@koa/router" "8.0.8"
+    bull "4.10.1"
+    joi "17.6.0"
+    jsonwebtoken "8.5.1"
+    lru-cache "^7.14.1"
+    node-fetch "^2.6.1"
+
+"@budibase/types@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.14-alpha.0.tgz#03072a669c016c616278dc01c577119dd710e4fe"
+  integrity sha512-D5qOD7YJhHUrPy81C9OpTlVzsXBmZwbF9WdoxYo/M8JYmhTJfj7Fu5dGTyDpipPQVqknFpTsig5kQqG3r08ZZw==
+
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -826,6 +884,18 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@koa/router@8.0.8":
+  version "8.0.8"
+  resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
+  integrity sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg==
+  dependencies:
+    debug "^4.1.1"
+    http-errors "^1.7.3"
+    koa-compose "^4.1.0"
+    methods "^1.1.2"
+    path-to-regexp "1.x"
+    urijs "^1.19.2"
+
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc"
@@ -3145,7 +3215,7 @@ http-cookie-agent@^4.0.2:
   dependencies:
     agent-base "^6.0.2"
 
-http-errors@^1.6.3, http-errors@~1.8.0:
+http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
   integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
@@ -3935,17 +4005,7 @@ jsonc-parser@^3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-jsonwebtoken@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
-jsonwebtoken@^8.2.0:
+jsonwebtoken@8.5.1, jsonwebtoken@^8.2.0:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -3961,6 +4021,16 @@ jsonwebtoken@^8.2.0:
     ms "^2.1.1"
     semver "^5.6.0"
 
+jsonwebtoken@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -4263,6 +4333,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.14.1:
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea"
+  integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==
+
 ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
@@ -4505,6 +4580,13 @@ node-fetch@2.6.7, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@^2.6.1:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
+  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-gyp-build-optional-packages@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17"
@@ -4837,6 +4919,13 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-to-regexp@1.x:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  dependencies:
+    isarray "0.0.1"
+
 pause@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
@@ -6154,6 +6243,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urijs@^1.19.2:
+  version "1.19.11"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
+  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
+
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
diff --git a/packages/server/package.json b/packages/server/package.json
index a367f65aed..68ed73beed 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -141,6 +141,7 @@
     "@types/pouchdb": "6.4.0",
     "@types/redis": "4.0.11",
     "@types/server-destroy": "1.0.1",
+    "@types/supertest": "^2.0.12",
     "@types/tar": "6.1.3",
     "@typescript-eslint/parser": "5.45.0",
     "apidoc": "0.50.4",
diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 2faff95595..a1522f6c6d 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -24,8 +24,7 @@ import { breakExternalTableId, isSQL } from "../../../integrations/utils"
 import { processObjectSync } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
 import { processFormulas, processDates } from "../../../utilities/rowProcessor"
-import { context } from "@budibase/backend-core"
-import { removeKeyNumbering } from "./utils"
+import { db as dbCore } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
 export interface ManyRelationship {
@@ -61,7 +60,7 @@ function buildFilters(
     let prefix = 1
     for (let operator of Object.values(filters)) {
       for (let field of Object.keys(operator || {})) {
-        if (removeKeyNumbering(field) === "_id") {
+        if (dbCore.removeKeyNumbering(field) === "_id") {
           if (primary) {
             const parts = breakRowIdField(operator[field])
             for (let field of primary) {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 16c86dd298..7efb1e4672 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@adobe/spectrum-css-workflow-icons@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
+  integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==
+
 "@adobe/spectrum-css-workflow-icons@^1.2.1":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf"
@@ -1317,6 +1322,60 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
+"@budibase/bbui@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.3.14-alpha.0.tgz#b27a689e221ff94ebf502b9b3c93a20cd327dab4"
+  integrity sha512-IGO+AsC5tizGUAl+PQrXac9LdSlLDoenADIbxwTZ4Rcr7insPPvH2Xfq0KRHiJCEp9xcHlpkp5ta8ND1uVp1nw==
+  dependencies:
+    "@adobe/spectrum-css-workflow-icons" "1.2.1"
+    "@budibase/string-templates" "2.3.14-alpha.0"
+    "@spectrum-css/accordion" "3.0.24"
+    "@spectrum-css/actionbutton" "1.0.1"
+    "@spectrum-css/actiongroup" "1.0.1"
+    "@spectrum-css/avatar" "3.0.2"
+    "@spectrum-css/button" "3.0.1"
+    "@spectrum-css/buttongroup" "3.0.2"
+    "@spectrum-css/checkbox" "3.0.2"
+    "@spectrum-css/dialog" "3.0.1"
+    "@spectrum-css/divider" "1.0.3"
+    "@spectrum-css/dropzone" "3.0.2"
+    "@spectrum-css/fieldgroup" "3.0.2"
+    "@spectrum-css/fieldlabel" "3.0.1"
+    "@spectrum-css/icon" "3.0.1"
+    "@spectrum-css/illustratedmessage" "3.0.2"
+    "@spectrum-css/inlinealert" "2.0.1"
+    "@spectrum-css/inputgroup" "3.0.2"
+    "@spectrum-css/label" "2.0.10"
+    "@spectrum-css/link" "3.1.1"
+    "@spectrum-css/menu" "3.0.1"
+    "@spectrum-css/modal" "3.0.1"
+    "@spectrum-css/pagination" "3.0.3"
+    "@spectrum-css/picker" "1.0.1"
+    "@spectrum-css/popover" "3.0.1"
+    "@spectrum-css/progressbar" "1.0.2"
+    "@spectrum-css/progresscircle" "1.0.2"
+    "@spectrum-css/radio" "3.0.2"
+    "@spectrum-css/search" "3.0.2"
+    "@spectrum-css/sidenav" "3.0.2"
+    "@spectrum-css/slider" "3.0.1"
+    "@spectrum-css/statuslight" "3.0.2"
+    "@spectrum-css/stepper" "3.0.3"
+    "@spectrum-css/switch" "1.0.2"
+    "@spectrum-css/table" "3.0.1"
+    "@spectrum-css/tabs" "3.2.12"
+    "@spectrum-css/tags" "3.0.2"
+    "@spectrum-css/textfield" "3.0.1"
+    "@spectrum-css/toast" "3.0.1"
+    "@spectrum-css/tooltip" "3.0.3"
+    "@spectrum-css/treeview" "3.0.2"
+    "@spectrum-css/typography" "3.0.1"
+    "@spectrum-css/underlay" "2.0.9"
+    "@spectrum-css/vars" "3.0.1"
+    dayjs "^1.10.4"
+    easymde "^2.16.1"
+    svelte-flatpickr "^3.2.3"
+    svelte-portal "^1.0.0"
+
 "@budibase/bbui@^0.9.139":
   version "0.9.190"
   resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81"
@@ -1367,6 +1426,71 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
+"@budibase/client@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.3.14-alpha.0.tgz#86fc86e557ab708e160b5c85c8853d11c6ad571f"
+  integrity sha512-pqPau8P7MG99rilSNh5MjNdNJKSytyr8b83i8vHydAvB++6+ekMwZfRcYrnR2wLXkg6ZztI/CmSkAYU4i1AYtw==
+  dependencies:
+    "@budibase/bbui" "2.3.14-alpha.0"
+    "@budibase/frontend-core" "2.3.14-alpha.0"
+    "@budibase/string-templates" "2.3.14-alpha.0"
+    "@spectrum-css/button" "^3.0.3"
+    "@spectrum-css/card" "^3.0.3"
+    "@spectrum-css/divider" "^1.0.3"
+    "@spectrum-css/link" "^3.1.3"
+    "@spectrum-css/page" "^3.0.1"
+    "@spectrum-css/tag" "^3.1.4"
+    "@spectrum-css/typography" "^3.0.2"
+    "@spectrum-css/vars" "^3.0.1"
+    apexcharts "^3.22.1"
+    dayjs "^1.10.5"
+    downloadjs "1.4.7"
+    html5-qrcode "^2.2.1"
+    leaflet "^1.7.1"
+    regexparam "^1.3.0"
+    sanitize-html "^2.7.0"
+    screenfull "^6.0.1"
+    shortid "^2.2.15"
+    socket.io-client "^4.5.1"
+    svelte "^3.49.0"
+    svelte-apexcharts "^1.0.2"
+    svelte-flatpickr "^3.1.0"
+    svelte-spa-router "^3.0.5"
+
+"@budibase/frontend-core@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.3.14-alpha.0.tgz#8c976af3f30feed688f4f36329bd715d5b5825af"
+  integrity sha512-Jjhy1+oGnyMVoZDnO612Hvvpxe0yBXzvEmhV+o4SN0eMvpZU48NKBU3buG1SvB1D5Y4rCn1FGsCboSTIk9n7rw==
+  dependencies:
+    "@budibase/bbui" "2.3.14-alpha.0"
+    lodash "^4.17.21"
+    svelte "^3.46.2"
+
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -1424,6 +1548,18 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
+"@budibase/string-templates@2.3.14-alpha.0":
+  version "2.3.14-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.14-alpha.0.tgz#a4c2bf4d328e383929699a5f9c70ed718ef4727b"
+  integrity sha512-Ekza3NntysyEXyAI6ha/SawkueCnHmMvudW5XtfIS2byLMdph0KqBp03MCW/sdkZ2mdkGi2Nwu/3nowOGSJxNw==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
 "@budibase/types@2.3.14-alpha.0":
   version "2.3.14-alpha.0"
   resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.14-alpha.0.tgz#03072a669c016c616278dc01c577119dd710e4fe"
@@ -2636,26 +2772,51 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
+"@spectrum-css/accordion@3.0.24":
+  version "3.0.24"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74"
+  integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA==
+
+"@spectrum-css/actionbutton@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
+  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
+
 "@spectrum-css/actionbutton@^1.0.1":
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4"
   integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg==
 
+"@spectrum-css/actiongroup@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
+  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
+
 "@spectrum-css/actiongroup@^1.0.1":
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae"
   integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow==
 
-"@spectrum-css/avatar@^3.0.2":
+"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95"
   integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ==
 
+"@spectrum-css/button@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643"
+  integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA==
+
 "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84"
   integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg==
 
+"@spectrum-css/buttongroup@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8"
+  integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw==
+
 "@spectrum-css/buttongroup@^3.0.2":
   version "3.0.10"
   resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d"
@@ -2666,16 +2827,33 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b"
   integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg==
 
+"@spectrum-css/checkbox@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd"
+  integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg==
+
 "@spectrum-css/checkbox@^3.0.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4"
   integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg==
 
+"@spectrum-css/dialog@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a"
+  integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw==
+
 "@spectrum-css/dialog@^3.0.1":
   version "3.0.12"
   resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004"
   integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q==
 
+"@spectrum-css/divider@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385"
+  integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA==
+  dependencies:
+    "@spectrum-css/vars" "^3.0.2"
+
 "@spectrum-css/divider@^1.0.3":
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29"
@@ -2683,56 +2861,106 @@
   dependencies:
     "@spectrum-css/vars" "^8.0.0"
 
+"@spectrum-css/dropzone@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf"
+  integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug==
+
 "@spectrum-css/dropzone@^3.0.2":
   version "3.0.24"
   resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299"
   integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg==
 
+"@spectrum-css/fieldgroup@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846"
+  integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw==
+
 "@spectrum-css/fieldgroup@^3.0.2":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8"
   integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA==
 
+"@spectrum-css/fieldlabel@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c"
+  integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw==
+
 "@spectrum-css/fieldlabel@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449"
   integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ==
 
+"@spectrum-css/icon@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177"
+  integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ==
+
 "@spectrum-css/icon@^3.0.1":
   version "3.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822"
   integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw==
 
+"@spectrum-css/illustratedmessage@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0"
+  integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA==
+
 "@spectrum-css/illustratedmessage@^3.0.2":
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11"
   integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA==
 
+"@spectrum-css/inlinealert@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2"
+  integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA==
+
 "@spectrum-css/inlinealert@^2.0.1":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376"
   integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA==
 
+"@spectrum-css/inputgroup@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691"
+  integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw==
+
 "@spectrum-css/inputgroup@^3.0.2":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b"
   integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g==
 
-"@spectrum-css/label@^2.0.10":
+"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001"
   integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ==
 
+"@spectrum-css/link@3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
+  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
+
 "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3":
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1"
   integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw==
 
+"@spectrum-css/menu@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
+  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
+
 "@spectrum-css/menu@^3.0.1":
   version "3.0.21"
   resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab"
   integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A==
 
+"@spectrum-css/modal@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d"
+  integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w==
+
 "@spectrum-css/modal@^3.0.1":
   version "3.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209"
@@ -2745,107 +2973,222 @@
   dependencies:
     "@spectrum-css/vars" "^4.3.1"
 
+"@spectrum-css/pagination@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65"
+  integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw==
+
 "@spectrum-css/pagination@^3.0.3":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41"
   integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw==
 
+"@spectrum-css/picker@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b"
+  integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA==
+
 "@spectrum-css/picker@^1.0.1":
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08"
   integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA==
 
+"@spectrum-css/popover@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc"
+  integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q==
+
 "@spectrum-css/popover@^3.0.1":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1"
   integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q==
 
+"@spectrum-css/progressbar@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424"
+  integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw==
+
 "@spectrum-css/progressbar@^1.0.2":
   version "1.0.30"
   resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed"
   integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw==
 
+"@spectrum-css/progresscircle@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c"
+  integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ==
+
 "@spectrum-css/progresscircle@^1.0.2":
   version "1.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a"
   integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg==
 
+"@spectrum-css/radio@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152"
+  integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ==
+
 "@spectrum-css/radio@^3.0.2":
   version "3.0.23"
   resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77"
   integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig==
 
+"@spectrum-css/search@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e"
+  integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw==
+
 "@spectrum-css/search@^3.0.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0"
   integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ==
 
+"@spectrum-css/sidenav@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713"
+  integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g==
+
 "@spectrum-css/sidenav@^3.0.2":
   version "3.0.23"
   resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd"
   integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog==
 
+"@spectrum-css/slider@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49"
+  integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q==
+
+"@spectrum-css/statuslight@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5"
+  integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w==
+
 "@spectrum-css/statuslight@^3.0.2":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7"
   integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ==
 
+"@spectrum-css/stepper@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34"
+  integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw==
+
 "@spectrum-css/stepper@^3.0.3":
   version "3.0.25"
   resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961"
   integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w==
 
+"@spectrum-css/switch@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44"
+  integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ==
+
 "@spectrum-css/switch@^1.0.2":
   version "1.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7"
   integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q==
 
+"@spectrum-css/table@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd"
+  integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug==
+
 "@spectrum-css/table@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf"
   integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg==
 
+"@spectrum-css/tabs@3.2.12":
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff"
+  integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA==
+
 "@spectrum-css/tabs@^3.0.1":
   version "3.2.16"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1"
   integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg==
 
+"@spectrum-css/tag@^3.1.4":
+  version "3.3.15"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278"
+  integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q==
+
+"@spectrum-css/tags@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757"
+  integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ==
+
 "@spectrum-css/tags@^3.0.2":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac"
   integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw==
 
+"@spectrum-css/textfield@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5"
+  integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA==
+
 "@spectrum-css/textfield@^3.0.1":
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490"
   integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw==
 
+"@spectrum-css/toast@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
+  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
+
 "@spectrum-css/toast@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f"
   integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w==
 
+"@spectrum-css/tooltip@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281"
+  integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A==
+
 "@spectrum-css/tooltip@^3.0.3":
   version "3.1.17"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd"
   integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg==
 
+"@spectrum-css/treeview@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2"
+  integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg==
+
 "@spectrum-css/treeview@^3.0.2":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046"
   integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw==
 
+"@spectrum-css/typography@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f"
+  integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA==
+
 "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38"
   integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA==
 
+"@spectrum-css/underlay@2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8"
+  integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg==
+
 "@spectrum-css/underlay@^2.0.9":
   version "2.0.30"
   resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1"
   integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ==
 
-"@spectrum-css/vars@^3.0.1":
+"@spectrum-css/vars@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e"
+  integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w==
+
+"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999"
   integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw==
@@ -3057,6 +3400,13 @@
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
+"@types/codemirror@^5.60.4":
+  version "5.60.7"
+  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808"
+  integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA==
+  dependencies:
+    "@types/tern" "*"
+
 "@types/connect@*":
   version "3.4.35"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
@@ -3272,6 +3622,11 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
+"@types/marked@^4.0.7":
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955"
+  integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -3547,6 +3902,14 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/superagent@*":
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.16.tgz#12c9c16f232f9d89beab91d69368f96ce8e2d881"
+  integrity sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ==
+  dependencies:
+    "@types/cookiejar" "*"
+    "@types/node" "*"
+
 "@types/superagent@^4.1.12":
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.15.tgz#63297de457eba5e2bc502a7609426c4cceab434a"
@@ -3555,6 +3918,13 @@
     "@types/cookiejar" "*"
     "@types/node" "*"
 
+"@types/supertest@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc"
+  integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ==
+  dependencies:
+    "@types/superagent" "*"
+
 "@types/tar@6.1.3":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.3.tgz#46a2ce7617950c4852dfd7e9cd41aa8161b9d750"
@@ -3563,6 +3933,13 @@
     "@types/node" "*"
     minipass "^3.3.5"
 
+"@types/tern@*":
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb"
+  integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -4168,7 +4545,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -4215,6 +4592,15 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -4358,6 +4744,13 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -5288,6 +5681,18 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
+codemirror-spell-checker@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
+  integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==
+  dependencies:
+    typo-js "*"
+
+codemirror@^5.63.1:
+  version "5.65.11"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f"
+  integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -5438,6 +5843,13 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -5841,6 +6253,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 default-shell@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
@@ -6037,11 +6456,25 @@ doctrine@3.0.0, doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-serializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    entities "^4.2.0"
+
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
+domelementtype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -6049,6 +6482,22 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
+domhandler@^5.0.1, domhandler@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+  dependencies:
+    domelementtype "^2.3.0"
+
+domutils@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
+  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
+  dependencies:
+    dom-serializer "^2.0.0"
+    domelementtype "^2.3.0"
+    domhandler "^5.0.1"
+
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -6093,6 +6542,11 @@ download@8.0.0:
     p-event "^2.1.0"
     pify "^4.0.1"
 
+downloadjs@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
+  integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -6108,6 +6562,17 @@ duplexify@^4.0.0:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
+easymde@^2.16.1:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b"
+  integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA==
+  dependencies:
+    "@types/codemirror" "^5.60.4"
+    "@types/marked" "^4.0.7"
+    codemirror "^5.63.1"
+    codemirror-spell-checker "1.1.2"
+    marked "^4.1.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -6270,6 +6735,17 @@ end-stream@~0.1.0:
   dependencies:
     write-stream "~0.4.3"
 
+engine.io-client@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91"
+  integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.0.3"
+    ws "~8.11.0"
+    xmlhttprequest-ssl "~2.0.0"
+
 engine.io-parser@~5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
@@ -6299,6 +6775,16 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
+entities@^4.2.0, entities@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -7479,6 +7965,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -7541,6 +8035,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
 getopts@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4"
@@ -7828,7 +8329,24 @@ gtoken@^5.0.4:
     google-p12-pem "^3.1.3"
     jws "^4.0.0"
 
-handlebars@^4.7.7:
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -7922,6 +8440,14 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -7935,6 +8461,13 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -7947,6 +8480,16 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -7976,6 +8519,29 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
+html5-qrcode@^2.2.1:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.6.tgz#95f572fd79b84cbce0e509da80eda43a394cec3c"
+  integrity sha512-yuCJUFzm04xGPM2a40XYPptpioV6K5uJA3Ogy0Xi/a7tAYrcD7T4ZCsbg0T1H2qX/143SZfDG1EINnNFh5rH0A==
+
+htmlparser2@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
+  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    entities "^4.3.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -8440,6 +9006,13 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -8546,6 +9119,13 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -8568,6 +9148,13 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -8585,6 +9172,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -8608,6 +9200,13 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -8723,6 +9322,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -9917,7 +10521,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -9931,12 +10535,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -10152,6 +10756,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet@^1.7.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
+  integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -10346,6 +10955,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -10451,6 +11065,21 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.without@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
@@ -10461,7 +11090,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -10613,6 +11242,11 @@ markdown-it@^12.2.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+marked@^4.1.0:
+  version "4.2.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5"
+  integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==
+
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -10708,7 +11342,7 @@ methods@^1.1.1, methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -11011,6 +11645,16 @@ nan@^2.15.0, nan@^2.16.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
+nanoid@^2.1.0:
+  version "2.1.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
+  integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
+
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -11689,6 +12333,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
+parse-srcset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -12037,6 +12686,15 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
+postcss@^8.3.11:
+  version "8.4.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
+  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
@@ -12808,6 +13466,16 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexparam@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa"
+  integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==
+
+regexparam@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
+  integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -12856,6 +13524,21 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -13151,6 +13834,18 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+sanitize-html@^2.7.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.9.0.tgz#f4829557b0175df9059d90fe972d5e6facb8565c"
+  integrity sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg==
+  dependencies:
+    deepmerge "^4.2.2"
+    escape-string-regexp "^4.0.0"
+    htmlparser2 "^8.0.0"
+    is-plain-object "^5.0.0"
+    parse-srcset "^1.0.2"
+    postcss "^8.3.11"
+
 sanitize-s3-objectkey@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
@@ -13182,6 +13877,11 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+screenfull@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238"
+  integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==
+
 search-params@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8"
@@ -13199,6 +13899,11 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -13351,6 +14056,13 @@ shimmer@^1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
+shortid@^2.2.15:
+  version "2.2.16"
+  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
+  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
+  dependencies:
+    nanoid "^2.1.0"
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -13491,6 +14203,16 @@ socket.io-adapter@~2.4.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
+socket.io-client@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.0.tgz#449255d2e0fe429f5ab47ecd3e3b1716b0039c13"
+  integrity sha512-2XOp18xnGghUICSd5ziUIS4rB0dhr6S8OvAps8y+HhOjFQlqGcf+FIh6fCIsKKZyWFxJeFPrZRNPGsHDTsz1Ug==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.2"
+    engine.io-client "~6.4.0"
+    socket.io-parser "~4.2.1"
+
 socket.io-parser@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
@@ -13499,6 +14221,14 @@ socket.io-parser@~4.2.0:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
+socket.io-parser@~4.2.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
+  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+
 socket.io@^4.5.1:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac"
@@ -13553,6 +14283,11 @@ source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -13975,6 +14710,11 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
@@ -14074,11 +14814,23 @@ svelte-portal@^1.0.0:
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
+svelte-spa-router@^3.0.5:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c"
+  integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ==
+  dependencies:
+    regexparam "2.0.1"
+
 svelte@3.49.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029"
   integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA==
 
+svelte@^3.46.2, svelte@^3.49.0:
+  version "3.55.1"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8"
+  integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==
+
 svg.draggable.js@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
@@ -14458,6 +15210,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
 to-json-schema@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
@@ -14726,6 +15483,13 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typeof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
@@ -14736,6 +15500,11 @@ typescript@4.7.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
   integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
+typo-js@*:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b"
+  integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -15086,6 +15855,14 @@ vm2@3.9.11:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
+vm2@^3.9.4:
+  version "3.9.14"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
+  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -15441,6 +16218,11 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@~8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+
 ws@~8.2.3:
   version "8.2.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
@@ -15509,6 +16291,11 @@ xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
+
 xpath.js@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
@@ -15647,6 +16434,11 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
diff --git a/packages/types/src/documents/global/auditLogs.ts b/packages/types/src/documents/global/auditLogs.ts
index 5b23650eec..7902997b39 100644
--- a/packages/types/src/documents/global/auditLogs.ts
+++ b/packages/types/src/documents/global/auditLogs.ts
@@ -1,6 +1,8 @@
 import { Document } from "../document"
 import { Event } from "../../sdk"
 
+export const AuditLogSystemUser = "SYSTEM"
+
 export interface AuditLogDoc extends Document {
   appId?: string
   event: Event
diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh
index d2a501162b..3a401e1f02 100755
--- a/scripts/link-dependencies.sh
+++ b/scripts/link-dependencies.sh
@@ -53,6 +53,10 @@ if [ -d "../budibase-pro" ]; then
   echo "Linking pro to server"
   cd packages/server && yarn link '@budibase/pro'
   cd -
+
+  echo "Linking pro to backend-core"
+  cd packages/backend-core && yarn link '@budibase/pro'
+  cd -
 fi
 
 if [ -d "../account-portal" ]; then

From c60b6da0abca77ab0b96a7edcbe52a2cf806135f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 15 Feb 2023 13:49:30 +0000
Subject: [PATCH 016/273] Removing pro from backend-core.

---
 packages/backend-core/package.json         |  1 -
 packages/backend-core/src/events/events.ts | 21 ++++++++++++++-------
 packages/backend-core/tsconfig.json        |  6 ++----
 packages/types/src/sdk/auditLogs.ts        | 13 +++++++++++++
 packages/types/src/sdk/index.ts            |  1 +
 scripts/link-dependencies.sh               |  4 ----
 6 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 packages/types/src/sdk/auditLogs.ts

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b51afcb8b1..705e4b1114 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -25,7 +25,6 @@
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
     "@budibase/types": "2.3.14-alpha.0",
-    "@budibase/pro": "2.3.14-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index e54497c0cf..14ef50b69c 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -1,10 +1,15 @@
-import { Event, IdentityType } from "@budibase/types"
-import { sdk } from "@budibase/pro"
+import { Event, IdentityType, AuditLogFn } from "@budibase/types"
 import { processors } from "./processors"
 import identification from "./identification"
 import { getAppId } from "../context"
 import * as backfill from "./backfill"
 
+let writeAuditLogs: AuditLogFn | undefined
+
+export const initAuditLogs = (fn: AuditLogFn) => {
+  writeAuditLogs = fn
+}
+
 export const publishEvent = async (
   event: Event,
   properties: any,
@@ -18,11 +23,13 @@ export const publishEvent = async (
   if (!backfilling) {
     // only audit log actual events, don't include backfills
     const userId = identity.type === IdentityType.USER ? identity.id : undefined
-    await sdk.auditLogs.write(event, properties, {
-      userId,
-      timestamp,
-      appId: getAppId(),
-    })
+    if (writeAuditLogs) {
+      await writeAuditLogs(event, properties, {
+        userId,
+        timestamp,
+        appId: getAppId(),
+      })
+    }
     await processors.processEvent(event, identity, properties, timestamp)
     return
   }
diff --git a/packages/backend-core/tsconfig.json b/packages/backend-core/tsconfig.json
index 62944d7f2c..e95fb9ab4d 100644
--- a/packages/backend-core/tsconfig.json
+++ b/packages/backend-core/tsconfig.json
@@ -4,13 +4,11 @@
     "composite": true,
     "baseUrl": ".",
     "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
+      "@budibase/types": ["../types/src"]
     }
   },
   "references": [
-    { "path": "../types" },
-    { "path": "../../../budibase-pro/packages/pro" }
+    { "path": "../types" }
   ],
   "exclude": [
     "node_modules",
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
new file mode 100644
index 0000000000..9f8eb3825c
--- /dev/null
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -0,0 +1,13 @@
+import { Event } from "./events"
+
+export type AuditWriteOpts = {
+  appId?: string
+  timestamp?: string | number
+  userId?: string
+}
+
+export type AuditLogFn = (
+  event: Event,
+  metadata: any,
+  opts: AuditWriteOpts
+) => Promise<any>
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index f8f9d9cb97..1b0fdb193b 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -12,3 +12,4 @@ export * from "./db"
 export * from "./middleware"
 export * from "./featureFlag"
 export * from "./environmentVariables"
+export * from "./auditLogs"
diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh
index 3a401e1f02..d2a501162b 100755
--- a/scripts/link-dependencies.sh
+++ b/scripts/link-dependencies.sh
@@ -53,10 +53,6 @@ if [ -d "../budibase-pro" ]; then
   echo "Linking pro to server"
   cd packages/server && yarn link '@budibase/pro'
   cd -
-
-  echo "Linking pro to backend-core"
-  cd packages/backend-core && yarn link '@budibase/pro'
-  cd -
 fi
 
 if [ -d "../account-portal" ]; then

From 6d83ea9becd14a1a9e8372933843dd8dc2683ff8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 15 Feb 2023 18:03:55 +0000
Subject: [PATCH 017/273] Adding in event auditing to server/worker.

---
 packages/backend-core/src/events/events.ts |   2 +-
 packages/backend-core/src/events/index.ts  |   1 +
 packages/backend-core/yarn.lock            | 118 +--
 packages/server/src/app.ts                 |   5 +
 packages/server/yarn.lock                  | 797 +--------------------
 packages/worker/src/index.ts               |   5 +
 6 files changed, 34 insertions(+), 894 deletions(-)

diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index 14ef50b69c..ba4b0a7448 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -6,7 +6,7 @@ import * as backfill from "./backfill"
 
 let writeAuditLogs: AuditLogFn | undefined
 
-export const initAuditLogs = (fn: AuditLogFn) => {
+export const configure = (fn: AuditLogFn) => {
   writeAuditLogs = fn
 }
 
diff --git a/packages/backend-core/src/events/index.ts b/packages/backend-core/src/events/index.ts
index d0d59a5b22..7aa4d06e58 100644
--- a/packages/backend-core/src/events/index.ts
+++ b/packages/backend-core/src/events/index.ts
@@ -3,6 +3,7 @@ export * as processors from "./processors"
 export * as analytics from "./analytics"
 export { default as identification } from "./identification"
 export * as backfillCache from "./backfill"
+export { configure } from "./events"
 
 import { processors } from "./processors"
 
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index 93ca39ab35..d88b1058f9 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -475,45 +475,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.14-alpha.0.tgz#8d60c93e9861301296907f61e770bdf1881b560c"
-  integrity sha512-lvRl6o9CCUx1VQ6ftu4FYuTp5mGgvbshNYoeaH0DbWFfhLNbibEHxx+pR+6M1ufhbu/EO6jKEr7DDeNiRBBMTw==
-  dependencies:
-    "@budibase/nano" "10.1.1"
-    "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.14-alpha.0"
-    "@shopify/jest-koa-mocks" "5.0.1"
-    "@techpass/passport-openidconnect" "0.3.2"
-    aws-cloudfront-sign "2.2.0"
-    aws-sdk "2.1030.0"
-    bcrypt "5.0.1"
-    bcryptjs "2.4.3"
-    bull "4.10.1"
-    correlation-id "4.0.0"
-    dotenv "16.0.1"
-    emitter-listener "1.1.2"
-    ioredis "4.28.0"
-    joi "17.6.0"
-    jsonwebtoken "9.0.0"
-    koa-passport "4.1.4"
-    lodash "4.17.21"
-    lodash.isarguments "3.1.0"
-    node-fetch "2.6.7"
-    passport-google-oauth "2.0.0"
-    passport-jwt "4.0.0"
-    passport-local "1.0.0"
-    passport-oauth2-refresh "^2.1.0"
-    posthog-node "1.3.0"
-    pouchdb "7.3.0"
-    pouchdb-find "7.2.2"
-    redlock "4.2.0"
-    sanitize-s3-objectkey "0.0.1"
-    semver "7.3.7"
-    tar-fs "2.1.1"
-    uuid "8.3.2"
-    zlib "1.0.5"
-
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -539,25 +500,6 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.14-alpha.0.tgz#db8ac1d0cacea21240c59458c4143e3e55663a4d"
-  integrity sha512-RJqXlvZmYrKCLxe7uVnc2KmDwE5OmoUZCA9M6b5Ne7ZHqrhtaNB/4Xlr1ESG79///epEWLv+Fde7mpHPzCvsZw==
-  dependencies:
-    "@budibase/backend-core" "2.3.14-alpha.0"
-    "@budibase/types" "2.3.14-alpha.0"
-    "@koa/router" "8.0.8"
-    bull "4.10.1"
-    joi "17.6.0"
-    jsonwebtoken "8.5.1"
-    lru-cache "^7.14.1"
-    node-fetch "^2.6.1"
-
-"@budibase/types@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.14-alpha.0.tgz#03072a669c016c616278dc01c577119dd710e4fe"
-  integrity sha512-D5qOD7YJhHUrPy81C9OpTlVzsXBmZwbF9WdoxYo/M8JYmhTJfj7Fu5dGTyDpipPQVqknFpTsig5kQqG3r08ZZw==
-
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -884,18 +826,6 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@koa/router@8.0.8":
-  version "8.0.8"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
-  integrity sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg==
-  dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
-    koa-compose "^4.1.0"
-    methods "^1.1.2"
-    path-to-regexp "1.x"
-    urijs "^1.19.2"
-
 "@mapbox/node-pre-gyp@^1.0.0":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc"
@@ -3215,7 +3145,7 @@ http-cookie-agent@^4.0.2:
   dependencies:
     agent-base "^6.0.2"
 
-http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
+http-errors@^1.6.3, http-errors@~1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
   integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
@@ -4005,7 +3935,17 @@ jsonc-parser@^3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-jsonwebtoken@8.5.1, jsonwebtoken@^8.2.0:
+jsonwebtoken@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
+jsonwebtoken@^8.2.0:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -4021,16 +3961,6 @@ jsonwebtoken@8.5.1, jsonwebtoken@^8.2.0:
     ms "^2.1.1"
     semver "^5.6.0"
 
-jsonwebtoken@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -4333,11 +4263,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.14.1:
-  version "7.14.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea"
-  integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==
-
 ltgt@2.2.1, ltgt@^2.1.2, ltgt@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
@@ -4580,13 +4505,6 @@ node-fetch@2.6.7, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.1:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-gyp-build-optional-packages@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17"
@@ -4919,13 +4837,6 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-to-regexp@1.x:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
 pause@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
@@ -6243,11 +6154,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.2:
-  version "1.19.11"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
-  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index be0c63f06a..af67f9c3b3 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -20,11 +20,16 @@ import * as automations from "./automations"
 import { Thread } from "./threads"
 import * as redis from "./utilities/redis"
 import { events, logging, middleware } from "@budibase/backend-core"
+import { sdk } from "@budibase/pro"
 import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 const Sentry = require("@sentry/node")
 const destroyable = require("server-destroy")
 
+// configure events to use the pro audit log write
+// can't integrate directly into backend-core due to cyclic issues
+events.configure(sdk.auditLogs.write)
+
 const app = new Koa()
 
 let mbNumber = parseInt(env.HTTP_MB_LIMIT || "10")
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 7efb1e4672..f79b1d80fe 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@adobe/spectrum-css-workflow-icons@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
-  integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==
-
 "@adobe/spectrum-css-workflow-icons@^1.2.1":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf"
@@ -1322,60 +1317,6 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/bbui@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.3.14-alpha.0.tgz#b27a689e221ff94ebf502b9b3c93a20cd327dab4"
-  integrity sha512-IGO+AsC5tizGUAl+PQrXac9LdSlLDoenADIbxwTZ4Rcr7insPPvH2Xfq0KRHiJCEp9xcHlpkp5ta8ND1uVp1nw==
-  dependencies:
-    "@adobe/spectrum-css-workflow-icons" "1.2.1"
-    "@budibase/string-templates" "2.3.14-alpha.0"
-    "@spectrum-css/accordion" "3.0.24"
-    "@spectrum-css/actionbutton" "1.0.1"
-    "@spectrum-css/actiongroup" "1.0.1"
-    "@spectrum-css/avatar" "3.0.2"
-    "@spectrum-css/button" "3.0.1"
-    "@spectrum-css/buttongroup" "3.0.2"
-    "@spectrum-css/checkbox" "3.0.2"
-    "@spectrum-css/dialog" "3.0.1"
-    "@spectrum-css/divider" "1.0.3"
-    "@spectrum-css/dropzone" "3.0.2"
-    "@spectrum-css/fieldgroup" "3.0.2"
-    "@spectrum-css/fieldlabel" "3.0.1"
-    "@spectrum-css/icon" "3.0.1"
-    "@spectrum-css/illustratedmessage" "3.0.2"
-    "@spectrum-css/inlinealert" "2.0.1"
-    "@spectrum-css/inputgroup" "3.0.2"
-    "@spectrum-css/label" "2.0.10"
-    "@spectrum-css/link" "3.1.1"
-    "@spectrum-css/menu" "3.0.1"
-    "@spectrum-css/modal" "3.0.1"
-    "@spectrum-css/pagination" "3.0.3"
-    "@spectrum-css/picker" "1.0.1"
-    "@spectrum-css/popover" "3.0.1"
-    "@spectrum-css/progressbar" "1.0.2"
-    "@spectrum-css/progresscircle" "1.0.2"
-    "@spectrum-css/radio" "3.0.2"
-    "@spectrum-css/search" "3.0.2"
-    "@spectrum-css/sidenav" "3.0.2"
-    "@spectrum-css/slider" "3.0.1"
-    "@spectrum-css/statuslight" "3.0.2"
-    "@spectrum-css/stepper" "3.0.3"
-    "@spectrum-css/switch" "1.0.2"
-    "@spectrum-css/table" "3.0.1"
-    "@spectrum-css/tabs" "3.2.12"
-    "@spectrum-css/tags" "3.0.2"
-    "@spectrum-css/textfield" "3.0.1"
-    "@spectrum-css/toast" "3.0.1"
-    "@spectrum-css/tooltip" "3.0.3"
-    "@spectrum-css/treeview" "3.0.2"
-    "@spectrum-css/typography" "3.0.1"
-    "@spectrum-css/underlay" "2.0.9"
-    "@spectrum-css/vars" "3.0.1"
-    dayjs "^1.10.4"
-    easymde "^2.16.1"
-    svelte-flatpickr "^3.2.3"
-    svelte-portal "^1.0.0"
-
 "@budibase/bbui@^0.9.139":
   version "0.9.190"
   resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81"
@@ -1426,71 +1367,6 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/client@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.3.14-alpha.0.tgz#86fc86e557ab708e160b5c85c8853d11c6ad571f"
-  integrity sha512-pqPau8P7MG99rilSNh5MjNdNJKSytyr8b83i8vHydAvB++6+ekMwZfRcYrnR2wLXkg6ZztI/CmSkAYU4i1AYtw==
-  dependencies:
-    "@budibase/bbui" "2.3.14-alpha.0"
-    "@budibase/frontend-core" "2.3.14-alpha.0"
-    "@budibase/string-templates" "2.3.14-alpha.0"
-    "@spectrum-css/button" "^3.0.3"
-    "@spectrum-css/card" "^3.0.3"
-    "@spectrum-css/divider" "^1.0.3"
-    "@spectrum-css/link" "^3.1.3"
-    "@spectrum-css/page" "^3.0.1"
-    "@spectrum-css/tag" "^3.1.4"
-    "@spectrum-css/typography" "^3.0.2"
-    "@spectrum-css/vars" "^3.0.1"
-    apexcharts "^3.22.1"
-    dayjs "^1.10.5"
-    downloadjs "1.4.7"
-    html5-qrcode "^2.2.1"
-    leaflet "^1.7.1"
-    regexparam "^1.3.0"
-    sanitize-html "^2.7.0"
-    screenfull "^6.0.1"
-    shortid "^2.2.15"
-    socket.io-client "^4.5.1"
-    svelte "^3.49.0"
-    svelte-apexcharts "^1.0.2"
-    svelte-flatpickr "^3.1.0"
-    svelte-spa-router "^3.0.5"
-
-"@budibase/frontend-core@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.3.14-alpha.0.tgz#8c976af3f30feed688f4f36329bd715d5b5825af"
-  integrity sha512-Jjhy1+oGnyMVoZDnO612Hvvpxe0yBXzvEmhV+o4SN0eMvpZU48NKBU3buG1SvB1D5Y4rCn1FGsCboSTIk9n7rw==
-  dependencies:
-    "@budibase/bbui" "2.3.14-alpha.0"
-    lodash "^4.17.21"
-    svelte "^3.46.2"
-
-"@budibase/handlebars-helpers@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
-  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
-  dependencies:
-    array-sort "^1.0.0"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    for-in "^1.0.2"
-    get-object "^0.2.0"
-    get-value "^3.0.1"
-    handlebars "^4.7.7"
-    handlebars-utils "^1.0.6"
-    has-value "^2.0.2"
-    helper-md "^0.2.2"
-    html-tag "^2.0.0"
-    is-even "^1.0.0"
-    is-glob "^4.0.1"
-    kind-of "^6.0.3"
-    micromatch "^3.1.5"
-    relative "^3.0.2"
-    striptags "^3.1.1"
-    to-gfm-code-block "^0.1.1"
-    year "^0.2.1"
-
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -1548,18 +1424,6 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/string-templates@2.3.14-alpha.0":
-  version "2.3.14-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.14-alpha.0.tgz#a4c2bf4d328e383929699a5f9c70ed718ef4727b"
-  integrity sha512-Ekza3NntysyEXyAI6ha/SawkueCnHmMvudW5XtfIS2byLMdph0KqBp03MCW/sdkZ2mdkGi2Nwu/3nowOGSJxNw==
-  dependencies:
-    "@budibase/handlebars-helpers" "^0.11.8"
-    dayjs "^1.10.4"
-    handlebars "^4.7.6"
-    handlebars-utils "^1.0.6"
-    lodash "^4.17.20"
-    vm2 "^3.9.4"
-
 "@budibase/types@2.3.14-alpha.0":
   version "2.3.14-alpha.0"
   resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.14-alpha.0.tgz#03072a669c016c616278dc01c577119dd710e4fe"
@@ -2772,51 +2636,26 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
-"@spectrum-css/accordion@3.0.24":
-  version "3.0.24"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74"
-  integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA==
-
-"@spectrum-css/actionbutton@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
-
 "@spectrum-css/actionbutton@^1.0.1":
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4"
   integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg==
 
-"@spectrum-css/actiongroup@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
-  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
-
 "@spectrum-css/actiongroup@^1.0.1":
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae"
   integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow==
 
-"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2":
+"@spectrum-css/avatar@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95"
   integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ==
 
-"@spectrum-css/button@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643"
-  integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA==
-
 "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84"
   integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg==
 
-"@spectrum-css/buttongroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8"
-  integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw==
-
 "@spectrum-css/buttongroup@^3.0.2":
   version "3.0.10"
   resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d"
@@ -2827,33 +2666,16 @@
   resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b"
   integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg==
 
-"@spectrum-css/checkbox@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd"
-  integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg==
-
 "@spectrum-css/checkbox@^3.0.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4"
   integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg==
 
-"@spectrum-css/dialog@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a"
-  integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw==
-
 "@spectrum-css/dialog@^3.0.1":
   version "3.0.12"
   resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004"
   integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q==
 
-"@spectrum-css/divider@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385"
-  integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA==
-  dependencies:
-    "@spectrum-css/vars" "^3.0.2"
-
 "@spectrum-css/divider@^1.0.3":
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29"
@@ -2861,106 +2683,56 @@
   dependencies:
     "@spectrum-css/vars" "^8.0.0"
 
-"@spectrum-css/dropzone@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf"
-  integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug==
-
 "@spectrum-css/dropzone@^3.0.2":
   version "3.0.24"
   resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299"
   integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg==
 
-"@spectrum-css/fieldgroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846"
-  integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw==
-
 "@spectrum-css/fieldgroup@^3.0.2":
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8"
   integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA==
 
-"@spectrum-css/fieldlabel@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c"
-  integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw==
-
 "@spectrum-css/fieldlabel@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449"
   integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ==
 
-"@spectrum-css/icon@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177"
-  integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ==
-
 "@spectrum-css/icon@^3.0.1":
   version "3.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822"
   integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw==
 
-"@spectrum-css/illustratedmessage@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0"
-  integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA==
-
 "@spectrum-css/illustratedmessage@^3.0.2":
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11"
   integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA==
 
-"@spectrum-css/inlinealert@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2"
-  integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA==
-
 "@spectrum-css/inlinealert@^2.0.1":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376"
   integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA==
 
-"@spectrum-css/inputgroup@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691"
-  integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw==
-
 "@spectrum-css/inputgroup@^3.0.2":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b"
   integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g==
 
-"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10":
+"@spectrum-css/label@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001"
   integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ==
 
-"@spectrum-css/link@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
-  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
-
 "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3":
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1"
   integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw==
 
-"@spectrum-css/menu@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
-  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
-
 "@spectrum-css/menu@^3.0.1":
   version "3.0.21"
   resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab"
   integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A==
 
-"@spectrum-css/modal@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d"
-  integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w==
-
 "@spectrum-css/modal@^3.0.1":
   version "3.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209"
@@ -2973,222 +2745,107 @@
   dependencies:
     "@spectrum-css/vars" "^4.3.1"
 
-"@spectrum-css/pagination@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65"
-  integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw==
-
 "@spectrum-css/pagination@^3.0.3":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41"
   integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw==
 
-"@spectrum-css/picker@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b"
-  integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA==
-
 "@spectrum-css/picker@^1.0.1":
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08"
   integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA==
 
-"@spectrum-css/popover@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc"
-  integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q==
-
 "@spectrum-css/popover@^3.0.1":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1"
   integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q==
 
-"@spectrum-css/progressbar@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424"
-  integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw==
-
 "@spectrum-css/progressbar@^1.0.2":
   version "1.0.30"
   resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed"
   integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw==
 
-"@spectrum-css/progresscircle@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c"
-  integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ==
-
 "@spectrum-css/progresscircle@^1.0.2":
   version "1.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a"
   integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg==
 
-"@spectrum-css/radio@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152"
-  integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ==
-
 "@spectrum-css/radio@^3.0.2":
   version "3.0.23"
   resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77"
   integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig==
 
-"@spectrum-css/search@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e"
-  integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw==
-
 "@spectrum-css/search@^3.0.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0"
   integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ==
 
-"@spectrum-css/sidenav@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713"
-  integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g==
-
 "@spectrum-css/sidenav@^3.0.2":
   version "3.0.23"
   resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd"
   integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog==
 
-"@spectrum-css/slider@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49"
-  integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q==
-
-"@spectrum-css/statuslight@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5"
-  integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w==
-
 "@spectrum-css/statuslight@^3.0.2":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7"
   integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ==
 
-"@spectrum-css/stepper@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34"
-  integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw==
-
 "@spectrum-css/stepper@^3.0.3":
   version "3.0.25"
   resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961"
   integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w==
 
-"@spectrum-css/switch@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44"
-  integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ==
-
 "@spectrum-css/switch@^1.0.2":
   version "1.0.22"
   resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7"
   integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q==
 
-"@spectrum-css/table@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd"
-  integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug==
-
 "@spectrum-css/table@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf"
   integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg==
 
-"@spectrum-css/tabs@3.2.12":
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff"
-  integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA==
-
 "@spectrum-css/tabs@^3.0.1":
   version "3.2.16"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1"
   integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg==
 
-"@spectrum-css/tag@^3.1.4":
-  version "3.3.15"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278"
-  integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q==
-
-"@spectrum-css/tags@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757"
-  integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ==
-
 "@spectrum-css/tags@^3.0.2":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac"
   integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw==
 
-"@spectrum-css/textfield@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5"
-  integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA==
-
 "@spectrum-css/textfield@^3.0.1":
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490"
   integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw==
 
-"@spectrum-css/toast@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
-  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
-
 "@spectrum-css/toast@^3.0.1":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f"
   integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w==
 
-"@spectrum-css/tooltip@3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281"
-  integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A==
-
 "@spectrum-css/tooltip@^3.0.3":
   version "3.1.17"
   resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd"
   integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg==
 
-"@spectrum-css/treeview@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2"
-  integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg==
-
 "@spectrum-css/treeview@^3.0.2":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046"
   integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw==
 
-"@spectrum-css/typography@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f"
-  integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA==
-
 "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38"
   integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA==
 
-"@spectrum-css/underlay@2.0.9":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8"
-  integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg==
-
 "@spectrum-css/underlay@^2.0.9":
   version "2.0.30"
   resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1"
   integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ==
 
-"@spectrum-css/vars@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e"
-  integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w==
-
-"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2":
+"@spectrum-css/vars@^3.0.1":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999"
   integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw==
@@ -3400,13 +3057,6 @@
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
-"@types/codemirror@^5.60.4":
-  version "5.60.7"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808"
-  integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA==
-  dependencies:
-    "@types/tern" "*"
-
 "@types/connect@*":
   version "3.4.35"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
@@ -3622,11 +3272,6 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/marked@^4.0.7":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955"
-  integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==
-
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -3933,13 +3578,6 @@
     "@types/node" "*"
     minipass "^3.3.5"
 
-"@types/tern@*":
-  version "0.23.4"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb"
-  integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -4545,7 +4183,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.10, argparse@^1.0.7:
+argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -4592,15 +4230,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -4744,13 +4373,6 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
-autolinker@~0.28.0:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
-  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
-  dependencies:
-    gulp-header "^1.7.1"
-
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -5681,18 +5303,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-codemirror-spell-checker@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
-  integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==
-  dependencies:
-    typo-js "*"
-
-codemirror@^5.63.1:
-  version "5.65.11"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f"
-  integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -5843,13 +5453,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-with-sourcemaps@*:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -6253,13 +5856,6 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
 default-shell@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
@@ -6456,25 +6052,11 @@ doctrine@3.0.0, doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
-domelementtype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -6482,22 +6064,6 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-domhandler@^5.0.1, domhandler@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
-domutils@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
-  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.1"
-
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -6542,11 +6108,6 @@ download@8.0.0:
     p-event "^2.1.0"
     pify "^4.0.1"
 
-downloadjs@1.4.7:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
-  integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==
-
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -6562,17 +6123,6 @@ duplexify@^4.0.0:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
-easymde@^2.16.1:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b"
-  integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA==
-  dependencies:
-    "@types/codemirror" "^5.60.4"
-    "@types/marked" "^4.0.7"
-    codemirror "^5.63.1"
-    codemirror-spell-checker "1.1.2"
-    marked "^4.1.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -6735,17 +6285,6 @@ end-stream@~0.1.0:
   dependencies:
     write-stream "~0.4.3"
 
-engine.io-client@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91"
-  integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.11.0"
-    xmlhttprequest-ssl "~2.0.0"
-
 engine.io-parser@~5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
@@ -6775,16 +6314,6 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-ent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
-
-entities@^4.2.0, entities@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -7965,14 +7494,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-object@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
-  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
-  dependencies:
-    is-number "^2.0.2"
-    isobject "^0.2.0"
-
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -8035,13 +7556,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
-get-value@^3.0.0, get-value@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
-  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
-  dependencies:
-    isobject "^3.0.1"
-
 getopts@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4"
@@ -8329,24 +7843,7 @@ gtoken@^5.0.4:
     google-p12-pem "^3.1.3"
     jws "^4.0.0"
 
-gulp-header@^1.7.1:
-  version "1.8.12"
-  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
-  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
-  dependencies:
-    concat-with-sourcemaps "*"
-    lodash.template "^4.4.0"
-    through2 "^2.0.0"
-
-handlebars-utils@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
-  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
-  dependencies:
-    kind-of "^6.0.0"
-    typeof-article "^0.1.1"
-
-handlebars@^4.7.6, handlebars@^4.7.7:
+handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -8440,14 +7937,6 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
-has-value@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
-  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
-  dependencies:
-    get-value "^3.0.0"
-    has-values "^2.0.1"
-
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -8461,13 +7950,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has-values@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
-  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
-  dependencies:
-    kind-of "^6.0.2"
-
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -8480,16 +7962,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-helper-md@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
-  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
-  dependencies:
-    ent "^2.2.0"
-    extend-shallow "^2.0.1"
-    fs-exists-sync "^0.1.0"
-    remarkable "^1.6.2"
-
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -8519,29 +7991,6 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-tag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
-  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
-  dependencies:
-    is-self-closing "^1.0.1"
-    kind-of "^6.0.0"
-
-html5-qrcode@^2.2.1:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.6.tgz#95f572fd79b84cbce0e509da80eda43a394cec3c"
-  integrity sha512-yuCJUFzm04xGPM2a40XYPptpioV6K5uJA3Ogy0Xi/a7tAYrcD7T4ZCsbg0T1H2qX/143SZfDG1EINnNFh5rH0A==
-
-htmlparser2@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
-  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    entities "^4.3.0"
-
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -9006,13 +8455,6 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-even@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
-  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
-  dependencies:
-    is-odd "^0.1.2"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -9119,13 +8561,6 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-number@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -9148,13 +8583,6 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
-is-odd@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
-  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
-  dependencies:
-    is-number "^3.0.0"
-
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -9172,11 +8600,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
 is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -9200,13 +8623,6 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
-is-self-closing@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
-  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
-  dependencies:
-    self-closing-tags "^1.0.1"
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -9322,11 +8738,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
-  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
-
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -10521,7 +9932,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -10535,12 +9946,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0, kind-of@^5.0.2:
+kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -10756,11 +10167,6 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-leaflet@^1.7.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
-  integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==
-
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -10955,11 +10361,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
-
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -11065,21 +10466,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash.template@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
 lodash.without@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
@@ -11090,7 +10476,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -11242,11 +10628,6 @@ markdown-it@^12.2.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-marked@^4.1.0:
-  version "4.2.12"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5"
-  integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==
-
 matcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
@@ -11342,7 +10723,7 @@ methods@^1.1.1, methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5:
+micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -11645,16 +11026,6 @@ nan@^2.15.0, nan@^2.16.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
-nanoid@^2.1.0:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
-  integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
-
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -12333,11 +11704,6 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
-parse-srcset@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
-  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -12686,15 +12052,6 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
-postcss@^8.3.11:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
@@ -13466,16 +12823,6 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexparam@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa"
-  integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==
-
-regexparam@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
-  integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -13524,21 +12871,6 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
-relative@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
-  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
-  dependencies:
-    isobject "^2.0.0"
-
-remarkable@^1.6.2:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
-  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
-  dependencies:
-    argparse "^1.0.10"
-    autolinker "~0.28.0"
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -13834,18 +13166,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@^2.7.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.9.0.tgz#f4829557b0175df9059d90fe972d5e6facb8565c"
-  integrity sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg==
-  dependencies:
-    deepmerge "^4.2.2"
-    escape-string-regexp "^4.0.0"
-    htmlparser2 "^8.0.0"
-    is-plain-object "^5.0.0"
-    parse-srcset "^1.0.2"
-    postcss "^8.3.11"
-
 sanitize-s3-objectkey@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
@@ -13877,11 +13197,6 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-screenfull@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238"
-  integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==
-
 search-params@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8"
@@ -13899,11 +13214,6 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
-self-closing-tags@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
-  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
-
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -14056,13 +13366,6 @@ shimmer@^1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
-shortid@^2.2.15:
-  version "2.2.16"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
-  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
-  dependencies:
-    nanoid "^2.1.0"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -14203,16 +13506,6 @@ socket.io-adapter@~2.4.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
-socket.io-client@^4.5.1:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.0.tgz#449255d2e0fe429f5ab47ecd3e3b1716b0039c13"
-  integrity sha512-2XOp18xnGghUICSd5ziUIS4rB0dhr6S8OvAps8y+HhOjFQlqGcf+FIh6fCIsKKZyWFxJeFPrZRNPGsHDTsz1Ug==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.2"
-    engine.io-client "~6.4.0"
-    socket.io-parser "~4.2.1"
-
 socket.io-parser@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
@@ -14221,14 +13514,6 @@ socket.io-parser@~4.2.0:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io-parser@~4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
-  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
-  dependencies:
-    "@socket.io/component-emitter" "~3.1.0"
-    debug "~4.3.1"
-
 socket.io@^4.5.1:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac"
@@ -14283,11 +13568,6 @@ source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -14710,11 +13990,6 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-striptags@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
-  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
-
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
@@ -14814,23 +14089,11 @@ svelte-portal@^1.0.0:
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
   integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
 
-svelte-spa-router@^3.0.5:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c"
-  integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ==
-  dependencies:
-    regexparam "2.0.1"
-
 svelte@3.49.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029"
   integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA==
 
-svelte@^3.46.2, svelte@^3.49.0:
-  version "3.55.1"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8"
-  integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==
-
 svg.draggable.js@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba"
@@ -15210,11 +14473,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-to-gfm-code-block@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
-  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
-
 to-json-schema@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
@@ -15483,13 +14741,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typeof-article@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
-  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
-  dependencies:
-    kind-of "^3.1.0"
-
 typeof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
@@ -15500,11 +14751,6 @@ typescript@4.7.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
   integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
-typo-js@*:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b"
-  integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw==
-
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -15855,14 +15101,6 @@ vm2@3.9.11:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
-vm2@^3.9.4:
-  version "3.9.14"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
-  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
-  dependencies:
-    acorn "^8.7.0"
-    acorn-walk "^8.2.0"
-
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -16218,11 +15456,6 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@~8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
-
 ws@~8.2.3:
   version "8.2.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
@@ -16291,11 +15524,6 @@ xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmlhttprequest-ssl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
-  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
-
 xpath.js@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
@@ -16434,11 +15662,6 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-year@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
-  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
-
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index dfb96a061c..48cbd74c4c 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -15,6 +15,7 @@ import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
 import { auth, logging, events, middleware } from "@budibase/backend-core"
+import { sdk } from "@budibase/pro"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -26,6 +27,10 @@ const koaSession = require("koa-session")
 const logger = require("koa-pino-logger")
 import destroyable from "server-destroy"
 
+// configure events to use the pro audit log write
+// can't integrate directly into backend-core due to cyclic issues
+events.configure(sdk.auditLogs.write)
+
 // this will setup http and https proxies form env variables
 bootstrap()
 

From 2afd3e1580930045944194f4a5a204a8f6136a41 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 15 Feb 2023 19:44:32 +0000
Subject: [PATCH 018/273] Updating events to include a proper friendly map of
 audited events.

---
 .../backend-core/src/events/publishers/app.ts | 11 +++
 .../src/events/publishers/auth.ts             |  6 +-
 .../src/events/publishers/backup.ts           |  5 +-
 .../src/events/publishers/group.ts            | 14 ++-
 .../src/events/publishers/user.ts             | 17 +++-
 packages/backend-core/src/utils/utils.ts      |  3 +-
 packages/types/src/sdk/events/app.ts          | 11 +++
 packages/types/src/sdk/events/auth.ts         |  2 +
 packages/types/src/sdk/events/backup.ts       |  2 +
 packages/types/src/sdk/events/event.ts        | 98 ++++++++++++++++++-
 packages/types/src/sdk/events/user.ts         | 15 ++-
 packages/types/src/sdk/events/userGroup.ts    | 11 +++
 .../worker/src/api/controllers/global/auth.ts |  6 +-
 packages/worker/src/sdk/users/users.ts        |  2 +-
 14 files changed, 187 insertions(+), 16 deletions(-)

diff --git a/packages/backend-core/src/events/publishers/app.ts b/packages/backend-core/src/events/publishers/app.ts
index 90da21f3f5..a4d578bb4f 100644
--- a/packages/backend-core/src/events/publishers/app.ts
+++ b/packages/backend-core/src/events/publishers/app.ts
@@ -19,6 +19,7 @@ const created = async (app: App, timestamp?: string | number) => {
   const properties: AppCreatedEvent = {
     appId: app.appId,
     version: app.version,
+    name: app.name,
   }
   await publishEvent(Event.APP_CREATED, properties, timestamp)
 }
@@ -27,6 +28,7 @@ async function updated(app: App) {
   const properties: AppUpdatedEvent = {
     appId: app.appId,
     version: app.version,
+    name: app.name,
   }
   await publishEvent(Event.APP_UPDATED, properties)
 }
@@ -34,6 +36,7 @@ async function updated(app: App) {
 async function deleted(app: App) {
   const properties: AppDeletedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_DELETED, properties)
 }
@@ -41,6 +44,7 @@ async function deleted(app: App) {
 async function published(app: App, timestamp?: string | number) {
   const properties: AppPublishedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_PUBLISHED, properties, timestamp)
 }
@@ -48,6 +52,7 @@ async function published(app: App, timestamp?: string | number) {
 async function unpublished(app: App) {
   const properties: AppUnpublishedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_UNPUBLISHED, properties)
 }
@@ -55,6 +60,7 @@ async function unpublished(app: App) {
 async function fileImported(app: App) {
   const properties: AppFileImportedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_FILE_IMPORTED, properties)
 }
@@ -63,6 +69,7 @@ async function templateImported(app: App, templateKey: string) {
   const properties: AppTemplateImportedEvent = {
     appId: app.appId,
     templateKey,
+    name: app.name,
   }
   await publishEvent(Event.APP_TEMPLATE_IMPORTED, properties)
 }
@@ -76,6 +83,7 @@ async function versionUpdated(
     appId: app.appId,
     currentVersion,
     updatedToVersion,
+    name: app.name,
   }
   await publishEvent(Event.APP_VERSION_UPDATED, properties)
 }
@@ -89,6 +97,7 @@ async function versionReverted(
     appId: app.appId,
     currentVersion,
     revertedToVersion,
+    name: app.name,
   }
   await publishEvent(Event.APP_VERSION_REVERTED, properties)
 }
@@ -96,6 +105,7 @@ async function versionReverted(
 async function reverted(app: App) {
   const properties: AppRevertedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_REVERTED, properties)
 }
@@ -103,6 +113,7 @@ async function reverted(app: App) {
 async function exported(app: App) {
   const properties: AppExportedEvent = {
     appId: app.appId,
+    name: app.name,
   }
   await publishEvent(Event.APP_EXPORTED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/auth.ts b/packages/backend-core/src/events/publishers/auth.ts
index 4436045599..5527e02a34 100644
--- a/packages/backend-core/src/events/publishers/auth.ts
+++ b/packages/backend-core/src/events/publishers/auth.ts
@@ -12,19 +12,21 @@ import {
 } from "@budibase/types"
 import { identification } from ".."
 
-async function login(source: LoginSource) {
+async function login(source: LoginSource, email: string) {
   const identity = await identification.getCurrentIdentity()
   const properties: LoginEvent = {
     userId: identity.id,
     source,
+    email,
   }
   await publishEvent(Event.AUTH_LOGIN, properties)
 }
 
-async function logout() {
+async function logout(email: string) {
   const identity = await identification.getCurrentIdentity()
   const properties: LogoutEvent = {
     userId: identity.id,
+    email,
   }
   await publishEvent(Event.AUTH_LOGOUT, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/backup.ts b/packages/backend-core/src/events/publishers/backup.ts
index 12263fe1ff..d7d87f09f1 100644
--- a/packages/backend-core/src/events/publishers/backup.ts
+++ b/packages/backend-core/src/events/publishers/backup.ts
@@ -13,6 +13,7 @@ async function appBackupRestored(backup: AppBackup) {
     appId: backup.appId,
     restoreId: backup._id!,
     backupCreatedAt: backup.timestamp,
+    name: backup.name as string,
   }
 
   await publishEvent(Event.APP_BACKUP_RESTORED, properties)
@@ -22,13 +23,15 @@ async function appBackupTriggered(
   appId: string,
   backupId: string,
   type: AppBackupType,
-  trigger: AppBackupTrigger
+  trigger: AppBackupTrigger,
+  name: string
 ) {
   const properties: AppBackupTriggeredEvent = {
     appId: appId,
     backupId,
     type,
     trigger,
+    name,
   }
   await publishEvent(Event.APP_BACKUP_TRIGGERED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/group.ts b/packages/backend-core/src/events/publishers/group.ts
index d79920562b..d8de4ccba4 100644
--- a/packages/backend-core/src/events/publishers/group.ts
+++ b/packages/backend-core/src/events/publishers/group.ts
@@ -8,12 +8,14 @@ import {
   GroupUsersAddedEvent,
   GroupUsersDeletedEvent,
   GroupAddedOnboardingEvent,
+  GroupPermissionsEditedEvent,
   UserGroupRoles,
 } from "@budibase/types"
 
 async function created(group: UserGroup, timestamp?: number) {
   const properties: GroupCreatedEvent = {
     groupId: group._id as string,
+    name: group.name,
   }
   await publishEvent(Event.USER_GROUP_CREATED, properties, timestamp)
 }
@@ -21,6 +23,7 @@ async function created(group: UserGroup, timestamp?: number) {
 async function updated(group: UserGroup) {
   const properties: GroupUpdatedEvent = {
     groupId: group._id as string,
+    name: group.name,
   }
   await publishEvent(Event.USER_GROUP_UPDATED, properties)
 }
@@ -28,6 +31,7 @@ async function updated(group: UserGroup) {
 async function deleted(group: UserGroup) {
   const properties: GroupDeletedEvent = {
     groupId: group._id as string,
+    name: group.name,
   }
   await publishEvent(Event.USER_GROUP_DELETED, properties)
 }
@@ -36,6 +40,7 @@ async function usersAdded(count: number, group: UserGroup) {
   const properties: GroupUsersAddedEvent = {
     count,
     groupId: group._id as string,
+    name: group.name,
   }
   await publishEvent(Event.USER_GROUP_USERS_ADDED, properties)
 }
@@ -44,6 +49,7 @@ async function usersDeleted(count: number, group: UserGroup) {
   const properties: GroupUsersDeletedEvent = {
     count,
     groupId: group._id as string,
+    name: group.name,
   }
   await publishEvent(Event.USER_GROUP_USERS_REMOVED, properties)
 }
@@ -56,9 +62,11 @@ async function createdOnboarding(groupId: string) {
   await publishEvent(Event.USER_GROUP_ONBOARDING, properties)
 }
 
-async function permissionsEdited(roles: UserGroupRoles) {
-  const properties: UserGroupRoles = {
-    ...roles,
+async function permissionsEdited(group: UserGroup) {
+  const properties: GroupPermissionsEditedEvent = {
+    permissions: group.roles!,
+    name: group.name,
+    groupId: group._id as string,
   }
   await publishEvent(Event.USER_GROUP_PERMISSIONS_EDITED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/user.ts b/packages/backend-core/src/events/publishers/user.ts
index 1fe50149b5..ec43dbbf00 100644
--- a/packages/backend-core/src/events/publishers/user.ts
+++ b/packages/backend-core/src/events/publishers/user.ts
@@ -19,6 +19,7 @@ import {
 async function created(user: User, timestamp?: number) {
   const properties: UserCreatedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_CREATED, properties, timestamp)
 }
@@ -26,6 +27,7 @@ async function created(user: User, timestamp?: number) {
 async function updated(user: User) {
   const properties: UserUpdatedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_UPDATED, properties)
 }
@@ -33,6 +35,7 @@ async function updated(user: User) {
 async function deleted(user: User) {
   const properties: UserDeletedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_DELETED, properties)
 }
@@ -40,6 +43,7 @@ async function deleted(user: User) {
 export async function onboardingComplete(user: User) {
   const properties: UserOnboardingEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_ONBOARDING_COMPLETE, properties)
 }
@@ -49,6 +53,7 @@ export async function onboardingComplete(user: User) {
 async function permissionAdminAssigned(user: User, timestamp?: number) {
   const properties: UserPermissionAssignedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(
     Event.USER_PERMISSION_ADMIN_ASSIGNED,
@@ -60,6 +65,7 @@ async function permissionAdminAssigned(user: User, timestamp?: number) {
 async function permissionAdminRemoved(user: User) {
   const properties: UserPermissionRemovedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PERMISSION_ADMIN_REMOVED, properties)
 }
@@ -67,6 +73,7 @@ async function permissionAdminRemoved(user: User) {
 async function permissionBuilderAssigned(user: User, timestamp?: number) {
   const properties: UserPermissionAssignedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(
     Event.USER_PERMISSION_BUILDER_ASSIGNED,
@@ -78,20 +85,22 @@ async function permissionBuilderAssigned(user: User, timestamp?: number) {
 async function permissionBuilderRemoved(user: User) {
   const properties: UserPermissionRemovedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PERMISSION_BUILDER_REMOVED, properties)
 }
 
 // INVITE
 
-async function invited() {
-  const properties: UserInvitedEvent = {}
+async function invited(email: string) {
+  const properties: UserInvitedEvent = { email }
   await publishEvent(Event.USER_INVITED, properties)
 }
 
 async function inviteAccepted(user: User) {
   const properties: UserInviteAcceptedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_INVITED_ACCEPTED, properties)
 }
@@ -101,6 +110,7 @@ async function inviteAccepted(user: User) {
 async function passwordForceReset(user: User) {
   const properties: UserPasswordForceResetEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PASSWORD_FORCE_RESET, properties)
 }
@@ -108,6 +118,7 @@ async function passwordForceReset(user: User) {
 async function passwordUpdated(user: User) {
   const properties: UserPasswordUpdatedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PASSWORD_UPDATED, properties)
 }
@@ -115,6 +126,7 @@ async function passwordUpdated(user: User) {
 async function passwordResetRequested(user: User) {
   const properties: UserPasswordResetRequestedEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PASSWORD_RESET_REQUESTED, properties)
 }
@@ -122,6 +134,7 @@ async function passwordResetRequested(user: User) {
 async function passwordReset(user: User) {
   const properties: UserPasswordResetEvent = {
     userId: user._id as string,
+    email: user.email,
   }
   await publishEvent(Event.USER_PASSWORD_RESET, properties)
 }
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index c608686431..0556a80c74 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -227,6 +227,7 @@ export async function getBuildersCount() {
  */
 export async function platformLogout(opts: PlatformLogoutOpts) {
   const ctx = opts.ctx
+  const email = ctx.user?.email!
   const userId = opts.userId
   const keepActiveSession = opts.keepActiveSession
 
@@ -247,7 +248,7 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
   await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  await events.auth.logout()
+  await events.auth.logout(email)
   await userCache.invalidateUser(userId)
 }
 
diff --git a/packages/types/src/sdk/events/app.ts b/packages/types/src/sdk/events/app.ts
index 73d491070f..7b63a4f0cd 100644
--- a/packages/types/src/sdk/events/app.ts
+++ b/packages/types/src/sdk/events/app.ts
@@ -3,50 +3,61 @@ import { BaseEvent } from "./event"
 export interface AppCreatedEvent extends BaseEvent {
   appId: string
   version: string
+  name: string
 }
 
 export interface AppUpdatedEvent extends BaseEvent {
   appId: string
   version: string
+  name: string
 }
 
 export interface AppDeletedEvent extends BaseEvent {
   appId: string
+  name: string
 }
 
 export interface AppPublishedEvent extends BaseEvent {
   appId: string
+  name: string
 }
 
 export interface AppUnpublishedEvent extends BaseEvent {
   appId: string
+  name: string
 }
 
 export interface AppFileImportedEvent extends BaseEvent {
   appId: string
+  name: string
 }
 
 export interface AppTemplateImportedEvent extends BaseEvent {
   appId: string
   templateKey: string
+  name: string
 }
 
 export interface AppVersionUpdatedEvent extends BaseEvent {
   appId: string
   currentVersion: string
   updatedToVersion: string
+  name: string
 }
 
 export interface AppVersionRevertedEvent extends BaseEvent {
   appId: string
   currentVersion: string
   revertedToVersion: string
+  name: string
 }
 
 export interface AppRevertedEvent extends BaseEvent {
   appId: string
+  name: string
 }
 
 export interface AppExportedEvent extends BaseEvent {
   appId: string
+  name: string
 }
diff --git a/packages/types/src/sdk/events/auth.ts b/packages/types/src/sdk/events/auth.ts
index eb9f3148a3..a98e1ca889 100644
--- a/packages/types/src/sdk/events/auth.ts
+++ b/packages/types/src/sdk/events/auth.ts
@@ -7,10 +7,12 @@ export type SSOType = ConfigType.OIDC | ConfigType.GOOGLE
 export interface LoginEvent extends BaseEvent {
   userId: string
   source: LoginSource
+  email: string
 }
 
 export interface LogoutEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface SSOCreatedEvent extends BaseEvent {
diff --git a/packages/types/src/sdk/events/backup.ts b/packages/types/src/sdk/events/backup.ts
index 1dddc109cc..23863cf8ac 100644
--- a/packages/types/src/sdk/events/backup.ts
+++ b/packages/types/src/sdk/events/backup.ts
@@ -5,6 +5,7 @@ export interface AppBackupRestoreEvent extends BaseEvent {
   appId: string
   restoreId: string
   backupCreatedAt: string
+  name: string
 }
 
 export interface AppBackupTriggeredEvent extends BaseEvent {
@@ -12,4 +13,5 @@ export interface AppBackupTriggeredEvent extends BaseEvent {
   appId: string
   trigger: AppBackupTrigger
   type: AppBackupType
+  name: string
 }
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 614dd18ded..f7a2051dfc 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -182,8 +182,102 @@ export enum Event {
   ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened",
 }
 
-export const AuditedEventFriendlyName = {
-  [Event.USER_CREATED]: "user created",
+export class AuditedEventFriendlyName {
+  // USER
+  static USER_CREATED = "User {{ email }} created"
+  static USER_UPDATED = "User {{ email }} updated"
+  static USER_DELETED = "User {{ email }} deleted"
+  static USER_PERMISSION_ADMIN_ASSIGNED = "User {{ email }} admin role assigned"
+  static USER_PERMISSION_ADMIN_REMOVED = "User {{ email }} admin role removed"
+  static USER_PERMISSION_BUILDER_ASSIGNED =
+    "User {{ email }} builder role assigned"
+  static USER_PERMISSION_BUILDER_REMOVED =
+    "User {{ email }} builder role removed"
+  static USER_INVITED = "User {{ email }} invited"
+  static USER_INVITED_ACCEPTED = "User {{ email }} accepted invite"
+  static USER_PASSWORD_UPDATED = "User {{ email }} password updated"
+  static USER_PASSWORD_RESET_REQUESTED =
+    "User {{ email }} password reset requested"
+  static USER_PASSWORD_RESET = "User {{ email }} password reset"
+  static USER_GROUP_CREATED = "User group {{ name }} created"
+  static USER_GROUP_UPDATED = "User group {{ name }} updated"
+  static USER_GROUP_DELETED = "User group {{ name }} deleted"
+  static USER_GROUP_USERS_ADDED =
+    "User group {{ name }} {{ count }} users added"
+  static USER_GROUP_USERS_REMOVED =
+    "User group {{ name }} {{ count }} users removed"
+  static USER_GROUP_PERMISSIONS_EDITED =
+    "User group {{ name }} permissions edited"
+
+  // EMAIL
+  static EMAIL_SMTP_CREATED = "Email configuration created"
+  static EMAIL_SMTP_UPDATED = "Email configuration updated"
+
+  // AUTH
+  static AUTH_SSO_CREATED = "SSO configuration created"
+  static AUTH_SSO_UPDATED = "SSO configuration updated"
+  static AUTH_SSO_ACTIVATED = "SSO configuration activated"
+  static AUTH_SSO_DEACTIVATED = "SSO configuration deactivated"
+  static AUTH_LOGIN = "User {{ email }} logged in"
+  static AUTH_LOGOUT = "User {{ email }} logged out"
+
+  // ORG
+  static ORG_NAME_UPDATED = "Organisation name updated"
+  static ORG_LOGO_UPDATED = "Organisation logo updated"
+  static ORG_PLATFORM_URL_UPDATED = "Organisation platform URL updated"
+
+  // APP
+  static APP_CREATED = "App {{ name }} created"
+  static APP_UPDATED = "App {{ name }} updated"
+  static APP_DELETED = "App {{ name }} deleted"
+  static APP_PUBLISHED = "App {{ name }} published"
+  static APP_UNPUBLISHED = "App {{ name }} unpublished"
+  static APP_TEMPLATE_IMPORTED = "App {{ name }} template imported"
+  static APP_FILE_IMPORTED = "App {{ name }} file imported"
+  static APP_VERSION_UPDATED = "App {{ name }} version updated"
+  static APP_VERSION_REVERTED = "App {{ name }} version reverted"
+  static APP_REVERTED = "App {{ name }} reverted"
+  static APP_EXPORTED = "App {{ name }} exported"
+  static APP_BACKUP_RESTORED = "App backup {{ name }} restored"
+  static APP_BACKUP_TRIGGERED = "App backup {{ name }} triggered"
+
+  // DATASOURCE
+  static DATASOURCE_CREATED = "Datasource created"
+  static DATASOURCE_UPDATED = "Datasource updated"
+  static DATASOURCE_DELETED = "Datasource deleted"
+
+  // QUERY
+  static QUERY_CREATED = "Query created"
+  static QUERY_UPDATED = "Query updated"
+  static QUERY_DELETED = "Query deleted"
+  static QUERY_IMPORT = "Query import"
+
+  // TABLE
+  static TABLE_CREATED = "Table created"
+  static TABLE_UPDATED = "Table updated"
+  static TABLE_DELETED = "Table deleted"
+  static TABLE_EXPORTED = "Table exported"
+  static TABLE_IMPORTED = "Table imported"
+  static TABLE_DATA_IMPORTED = "Data imported to table"
+
+  // ROWS
+  static ROWS_CREATED = "Rows created"
+  static ROWS_IMPORTED = "Rows imported"
+
+  // AUTOMATION
+  static AUTOMATION_CREATED = "Automation created"
+  static AUTOMATION_DELETED = "Automation deleted"
+
+  // SCREEN
+  static SCREEN_CREATED = "Screen created"
+  static SCREEN_DELETED = "Screen deleted"
+
+  // COMPONENT
+  static COMPONENT_CREATED = "Component created"
+  static COMPONENT_DELETED = "Component deleted"
+
+  static ENVIRONMENT_VARIABLE_CREATED = "Environment variable created"
+  static ENVIRONMENT_VARIABLE_DELETED = "Environment variable deleted"
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/types/src/sdk/events/user.ts b/packages/types/src/sdk/events/user.ts
index 3f8f72801c..1322934d45 100644
--- a/packages/types/src/sdk/events/user.ts
+++ b/packages/types/src/sdk/events/user.ts
@@ -2,47 +2,60 @@ import { BaseEvent } from "./event"
 
 export interface UserCreatedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserUpdatedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserDeletedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserOnboardingEvent extends BaseEvent {
   userId: string
   step?: string
+  email: string
 }
 
 export interface UserPermissionAssignedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserPermissionRemovedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
-export interface UserInvitedEvent extends BaseEvent {}
+export interface UserInvitedEvent extends BaseEvent {
+  email: string
+}
 
 export interface UserInviteAcceptedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserPasswordForceResetEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserPasswordUpdatedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserPasswordResetRequestedEvent extends BaseEvent {
   userId: string
+  email: string
 }
 
 export interface UserPasswordResetEvent extends BaseEvent {
   userId: string
+  email: string
 }
diff --git a/packages/types/src/sdk/events/userGroup.ts b/packages/types/src/sdk/events/userGroup.ts
index 2ce642e274..57deef4c20 100644
--- a/packages/types/src/sdk/events/userGroup.ts
+++ b/packages/types/src/sdk/events/userGroup.ts
@@ -2,27 +2,38 @@ import { BaseEvent } from "./event"
 
 export interface GroupCreatedEvent extends BaseEvent {
   groupId: string
+  name: string
 }
 
 export interface GroupUpdatedEvent extends BaseEvent {
   groupId: string
+  name: string
 }
 
 export interface GroupDeletedEvent extends BaseEvent {
   groupId: string
+  name: string
 }
 
 export interface GroupUsersAddedEvent extends BaseEvent {
   count: number
   groupId: string
+  name: string
 }
 
 export interface GroupUsersDeletedEvent extends BaseEvent {
   count: number
   groupId: string
+  name: string
 }
 
 export interface GroupAddedOnboardingEvent extends BaseEvent {
   groupId: string
   onboarding: boolean
 }
+
+export interface GroupPermissionsEditedEvent extends BaseEvent {
+  permissions: Record<string, string>
+  name: string
+  groupId: string
+}
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index e6d3c329d7..7491a47bb3 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -54,7 +54,7 @@ export const authenticate = async (ctx: any, next: any) => {
     async (err: any, user: User, info: any) => {
       await authInternal(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
-        await events.auth.login("local")
+        await events.auth.login("local", user.email)
       })
       ctx.status = 200
     }
@@ -208,7 +208,7 @@ export const googleAuth = async (ctx: any, next: any) => {
     async (err: any, user: User, info: any) => {
       await authInternal(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
-        await events.auth.login("google-internal")
+        await events.auth.login("google-internal", user.email)
       })
       ctx.redirect("/")
     }
@@ -272,7 +272,7 @@ export const oidcAuth = async (ctx: any, next: any) => {
     async (err: any, user: any, info: any) => {
       await authInternal(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
-        await events.auth.login("oidc")
+        await events.auth.login("oidc", user.email)
       })
       ctx.redirect("/")
     }
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 8410d0b2e0..617f07d404 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -623,7 +623,7 @@ export const invite = async (
       }
       await sendEmail(user.email, EmailTemplatePurpose.INVITATION, opts)
       response.successful.push({ email: user.email })
-      await events.user.invited()
+      await events.user.invited(user.email)
     } catch (e) {
       console.error(`Failed to send email invitation email=${user.email}`, e)
       response.unsuccessful.push({

From 6b5128a0bfc76a962aa5efcedf54f5ad0e0c1cc2 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 15 Feb 2023 23:38:59 +0000
Subject: [PATCH 019/273] running API tests with reporting qa nightly tests

---
 .github/workflows/smoke_test.yaml             | 35 +++--------
 .../DataTable/modals/CreateEditColumn.svelte  | 37 -----------
 qa-core/package.json                          |  2 +-
 .../scripts/testResultsWebhook.js             | 63 +++++++++----------
 qa-core/testReport.json                       |  1 +
 5 files changed, 38 insertions(+), 100 deletions(-)
 rename packages/builder/scripts/cypressResultsWebhook.js => qa-core/scripts/testResultsWebhook.js (72%)
 create mode 100644 qa-core/testReport.json

diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
index 29c7f5f85a..b4ed39fd68 100644
--- a/.github/workflows/smoke_test.yaml
+++ b/.github/workflows/smoke_test.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   nightly:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, qa]
 
     steps:
       - uses: actions/checkout@v2
@@ -15,30 +15,11 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 14.x
-      - run: yarn
-      - run: yarn bootstrap
-      - run: yarn build
-      - name: Pull  from budibase-infra
+      - name: QA Core Integration Tests
         run: | 
-          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-          -H 'Accept: application/vnd.github.v3.raw' \
-          -o 
-          -L 
-          wc -l 
-      
-      - uses: actions/upload-artifact@v3
-        with:
-          name: Test Reports
-          path: 
-
-      # TODO: enable once running in QA test env
-      # - name: Configure AWS Credentials
-      #   uses: aws-actions/configure-aws-credentials@v1
-      #   with:
-      #     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      #     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      #     aws-region: eu-west-1
-      
-      # - name: Upload test results HTML
-      #   uses: aws-actions/configure-aws-credentials@v1
-      #   run: aws s3 cp packages/builder/cypress/reports/testReport.html s3://{{ secrets.BUDI_QA_REPORTS_BUCKET_NAME }}/$GITHUB_RUN_ID/index.html
+          cd qa-core
+          yarn
+          yarn api:test:ci
+        env:
+          BUDIBASE_HOST: budicloud.qa.budibase.net
+          BUDIBASE_ACCOUNTS_URL: https://account-portal.budicloud.qa.budibase.net
\ No newline at end of file
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 95e53b4192..d7225a6645 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -18,7 +18,6 @@
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
     FIELDS,
-    AUTO_COLUMN_SUB_TYPES,
     RelationshipTypes,
     ALLOWABLE_STRING_OPTIONS,
     ALLOWABLE_NUMBER_OPTIONS,
@@ -132,12 +131,6 @@
     : availableAutoColumns
 
   // used to select what different options can be displayed for column type
-  $: canBeSearched =
-    editableColumn?.type !== LINK_TYPE &&
-    editableColumn?.type !== JSON_TYPE &&
-    editableColumn?.subtype !== AUTO_COLUMN_SUB_TYPES.CREATED_BY &&
-    editableColumn?.subtype !== AUTO_COLUMN_SUB_TYPES.UPDATED_BY &&
-    editableColumn?.type !== FORMULA_TYPE
   $: canBeDisplay =
     editableColumn?.type !== LINK_TYPE &&
     editableColumn?.type !== AUTO_TYPE &&
@@ -254,18 +247,6 @@
     }
   }
 
-  function onChangePrimaryIndex(e) {
-    indexes = e.detail ? [editableColumn.name] : []
-  }
-
-  function onChangeSecondaryIndex(e) {
-    if (e.detail) {
-      indexes[1] = editableColumn.name
-    } else {
-      indexes = indexes.slice(0, 1)
-    }
-  }
-
   function openJsonSchemaEditor() {
     jsonSchemaModal.show()
   }
@@ -460,24 +441,6 @@
     </div>
   {/if}
 
-  {#if canBeSearched && !external}
-    <div>
-      <Label>Search Indexes</Label>
-      <Toggle
-        value={indexes[0] === editableColumn.name}
-        disabled={indexes[1] === editableColumn.name}
-        on:change={onChangePrimaryIndex}
-        text="Primary"
-      />
-      <Toggle
-        value={indexes[1] === editableColumn.name}
-        disabled={!indexes[0] || indexes[0] === editableColumn.name}
-        on:change={onChangeSecondaryIndex}
-        text="Secondary"
-      />
-    </div>
-  {/if}
-
   {#if editableColumn.type === "string"}
     <Input
       type="number"
diff --git a/qa-core/package.json b/qa-core/package.json
index 8508361566..846ccb4dbe 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/Budibase/budibase.git"
   },
   "scripts": {
-    "test": "env-cmd jest --runInBand",
+    "test": "env-cmd jest --runInBand --json --outputFile=testResults.json",
     "test:watch": "env-cmd jest --watch",
     "test:debug": "DEBUG=1 jest",
     "docker:up": "docker-compose up -d",
diff --git a/packages/builder/scripts/cypressResultsWebhook.js b/qa-core/scripts/testResultsWebhook.js
similarity index 72%
rename from packages/builder/scripts/cypressResultsWebhook.js
rename to qa-core/scripts/testResultsWebhook.js
index 4de4c01cc7..034fe45064 100644
--- a/packages/builder/scripts/cypressResultsWebhook.js
+++ b/qa-core/scripts/testResultsWebhook.js
@@ -5,36 +5,29 @@ const path = require("path")
 const fs = require("fs")
 
 const WEBHOOK_URL = process.env.CYPRESS_WEBHOOK_URL
-const DASHBOARD_URL = process.env.CYPRESS_DASHBOARD_URL
 const GIT_SHA = process.env.GITHUB_SHA
 const GITHUB_ACTIONS_RUN_URL = process.env.GITHUB_ACTIONS_RUN_URL
 
 async function generateReport() {
   // read the report file
-  const REPORT_PATH = path.resolve(
-    __dirname,
-    "..",
-    "cypress",
-    "reports",
-    "testReport.json"
-  )
+  const REPORT_PATH = path.resolve(__dirname, "..", "testReport.json")
   const report = fs.readFileSync(REPORT_PATH, "utf-8")
   return JSON.parse(report)
 }
 
-async function discordCypressResultsNotification(report) {
+async function discordResultsNotification(report) {
   const {
-    suites,
-    tests,
-    passes,
-    pending,
-    failures,
-    duration,
-    passPercent,
-    skipped,
-  } = report.stats
+    numTotalTestSuites,
+    numTotalTests,
+    numPassedTests,
+    numPendingTests,
+    numFailedTests,
+    success,
+    startTime,
+    endTime,
+  } = report
 
-  const OUTCOME = failures > 0 ? "failure" : "success"
+  const OUTCOME = success ? "success" : "failure"
 
   const options = {
     method: "POST",
@@ -68,51 +61,51 @@ async function discordCypressResultsNotification(report) {
               name: "Commit",
               value: `https://github.com/Budibase/budibase/commit/${GIT_SHA}`,
             },
-            {
-              name: "Cypress Dashboard URL",
-              value: DASHBOARD_URL || "None Supplied",
-            },
             {
               name: "Github Actions Run URL",
               value: GITHUB_ACTIONS_RUN_URL || "None Supplied",
             },
             {
               name: "Test Suites",
-              value: suites,
+              value: numTotalTestSuites,
             },
             {
               name: "Tests",
-              value: tests,
+              value: numTotalTests,
             },
             {
               name: "Passed",
-              value: passes,
+              value: numPassedTests,
             },
             {
               name: "Pending",
-              value: pending,
-            },
-            {
-              name: "Skipped",
-              value: skipped,
+              value: numPendingTests,
             },
             {
               name: "Failures",
-              value: failures,
+              value: numFailedTests,
             },
             {
               name: "Duration",
-              value: `${duration / 1000} Seconds`,
+              value: endTime
+                ? `${(endTime - startTime) / 1000} Seconds`
+                : "DNF",
             },
             {
               name: "Pass Percentage",
-              value: Math.floor(passPercent),
+              value: Math.floor((numPassedTests / numTotalTests) * 100),
             },
           ],
         },
       ],
     }),
   }
+
+  // Only post in discord when tests fail
+  if (success) {
+    return
+  }
+
   const response = await fetch(WEBHOOK_URL, options)
 
   if (response.status >= 201) {
@@ -125,7 +118,7 @@ async function discordCypressResultsNotification(report) {
 
 async function run() {
   const report = await generateReport()
-  await discordCypressResultsNotification(report)
+  await discordResultsNotification(report)
 }
 
 run()
diff --git a/qa-core/testReport.json b/qa-core/testReport.json
new file mode 100644
index 0000000000..b1aa321bc5
--- /dev/null
+++ b/qa-core/testReport.json
@@ -0,0 +1 @@
+{"numFailedTestSuites":1,"numFailedTests":1,"numPassedTestSuites":11,"numPassedTests":41,"numPendingTestSuites":3,"numPendingTests":11,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":15,"numTotalTests":53,"openHandles":[],"snapshot":{"added":0,"didUpdate":false,"failure":false,"filesAdded":0,"filesRemoved":0,"filesRemovedList":[],"filesUnmatched":0,"filesUpdated":0,"matched":0,"total":0,"unchecked":0,"uncheckedKeysByFile":[],"unmatched":0,"updated":0},"startTime":1676469571194,"success":false,"testResults":[{"assertionResults":[{"ancestorTitles":["Public API - /rows endpoints"],"duration":548,"failureMessages":[],"fullName":"Public API - /rows endpoints POST - Create a row","location":null,"status":"passed","title":"POST - Create a row"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":60002,"failureMessages":["Error: thrown: \"Exceeded timeout of 60000 ms for a test.\nUse jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.\"\n    at /Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts:35:3\n    at _dispatchDescribe (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/index.js:105:26)\n    at describe (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/index.js:60:5)\n    at Object.<anonymous> (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts:6:1)\n    at Runtime._execModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1714:24)\n    at Runtime._loadModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1223:12)\n    at Runtime.requireModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1047:12)\n    at jestAdapter (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapter.js:89:13)\n    at runTestInternal (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runner/build/runTest.js:411:16)\n    at runTest (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runner/build/runTest.js:499:34)"],"fullName":"Public API - /rows endpoints POST - Search rows","location":null,"status":"failed","title":"POST - Search rows"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":496,"failureMessages":[],"fullName":"Public API - /rows endpoints GET - Retrieve a row","location":null,"status":"passed","title":"GET - Retrieve a row"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":644,"failureMessages":[],"fullName":"Public API - /rows endpoints PUT - update a row","location":null,"status":"passed","title":"PUT - update a row"}],"endTime":1676469635424,"message":"\u001b[1m\u001b[31m  \u001b[1m● \u001b[22m\u001b[1mPublic API - /rows endpoints › POST - Search rows\u001b[39m\u001b[22m\n\n    thrown: \"Exceeded timeout of 60000 ms for a test.\n    Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.\"\n\u001b[2m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 33 |\u001b[39m   })\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 34 |\u001b[39m\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[2m\u001b[39m\u001b[90m 35 |\u001b[39m   it(\u001b[32m\"POST - Search rows\"\u001b[39m\u001b[33m,\u001b[39m \u001b[36masync\u001b[39m () \u001b[33m=>\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m    |\u001b[39m   \u001b[31m\u001b[1m^\u001b[22m\u001b[2m\u001b[39m\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 36 |\u001b[39m     \u001b[36mconst\u001b[39m [response\u001b[33m,\u001b[39m rows] \u001b[33m=\u001b[39m \u001b[36mawait\u001b[39m config\u001b[33m.\u001b[39mrows\u001b[33m.\u001b[39msearch({\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 37 |\u001b[39m       query\u001b[33m:\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 38 |\u001b[39m         string\u001b[33m:\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m\u001b[22m\n\u001b[2m      \u001b[2mat \u001b[22m\u001b[2m\u001b[0m\u001b[36msrc/tests/public-api/tables/rows.spec.ts\u001b[39m\u001b[0m\u001b[2m:35:3\u001b[22m\u001b[2m\u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[22m\u001b[2m\u001b[0m\u001b[36msrc/tests/public-api/tables/rows.spec.ts\u001b[39m\u001b[0m\u001b[2m:6:1)\u001b[22m\u001b[2m\u001b[22m\n","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts","startTime":1676469571238,"status":"failed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":3773,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add BASIC user to app","location":null,"status":"passed","title":"Add BASIC user to app"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":4896,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add ADMIN user to app","location":null,"status":"passed","title":"Add ADMIN user to app"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":2606,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add POWER user to app","location":null,"status":"passed","title":"Add POWER user to app"}],"endTime":1676469650546,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/appSpecificRoles.spec.ts","startTime":1676469635431,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Table Operations"],"duration":4474,"failureMessages":[],"fullName":"Internal API - Table Operations Create and delete table, columns and rows","location":null,"status":"passed","title":"Create and delete table, columns and rows"},{"ancestorTitles":["Internal API - Table Operations"],"duration":7624,"failureMessages":[],"fullName":"Internal API - Table Operations Search and pagination","location":null,"status":"passed","title":"Search and pagination"}],"endTime":1676469664993,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/tables/tables.spec.ts","startTime":1676469650551,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":4680,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Publish app","location":null,"status":"passed","title":"Publish app"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1641,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Sync application before deployment","location":null,"status":"passed","title":"Sync application before deployment"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":2805,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Sync application after deployment","location":null,"status":"passed","title":"Sync application after deployment"}],"endTime":1676469676987,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/publish.spec.ts","startTime":1676469664996,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /applications endpoints"],"duration":792,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - Create an application","location":null,"status":"passed","title":"POST - Create an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":29,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - Search applications","location":null,"status":"passed","title":"POST - Search applications"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":140,"failureMessages":[],"fullName":"Public API - /applications endpoints GET - Retrieve an application","location":null,"status":"passed","title":"GET - Retrieve an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":305,"failureMessages":[],"fullName":"Public API - /applications endpoints PUT - update an application","location":null,"status":"passed","title":"PUT - update an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":12038,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - publish an application","location":null,"status":"passed","title":"POST - publish an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":14193,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - unpublish a published application","location":null,"status":"passed","title":"POST - unpublish a published application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":128,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - unpublish an unpublished application","location":null,"status":"passed","title":"POST - unpublish an unpublished application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":21572,"failureMessages":[],"fullName":"Public API - /applications endpoints DELETE - delete a published application and the dev application","location":null,"status":"passed","title":"DELETE - delete a published application and the dev application"}],"endTime":1676469727469,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/applications/applications.spec.ts","startTime":1676469676996,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1421,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Update an application","location":null,"status":"passed","title":"Update an application"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1268,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Revert Changes without changes","location":null,"status":"passed","title":"Revert Changes without changes"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":4735,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Revert Changes","location":null,"status":"passed","title":"Revert Changes"}],"endTime":1676469737505,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/update.spec.ts","startTime":1676469727506,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":2158,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Add Users with different roles","location":null,"status":"passed","title":"Add Users with different roles"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1010,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Delete User","location":null,"status":"passed","title":"Delete User"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1200,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Reset Password","location":null,"status":"passed","title":"Reset Password"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1258,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Change User information","location":null,"status":"passed","title":"Change User information"}],"endTime":1676469745995,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts","startTime":1676469737513,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - /screens endpoints"],"duration":2086,"failureMessages":[],"fullName":"Internal API - /screens endpoints Create a screen with each role type","location":null,"status":"passed","title":"Create a screen with each role type"},{"ancestorTitles":["Internal API - /screens endpoints"],"duration":1530,"failureMessages":[],"fullName":"Internal API - /screens endpoints Get screens","location":null,"status":"passed","title":"Get screens"},{"ancestorTitles":["Internal API - /screens endpoints"],"duration":1632,"failureMessages":[],"fullName":"Internal API - /screens endpoints Delete a screen","location":null,"status":"passed","title":"Delete a screen"}],"endTime":1676469753597,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/screens/screens.spec.ts","startTime":1676469746008,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation"],"duration":324,"failureMessages":[],"fullName":"Internal API - Application creation Get applications without applications","location":null,"status":"passed","title":"Get applications without applications"},{"ancestorTitles":["Internal API - Application creation"],"duration":1253,"failureMessages":[],"fullName":"Internal API - Application creation Get all Applications after creating an application","location":null,"status":"passed","title":"Get all Applications after creating an application"},{"ancestorTitles":["Internal API - Application creation"],"duration":1254,"failureMessages":[],"fullName":"Internal API - Application creation Get application details","location":null,"status":"passed","title":"Get application details"}],"endTime":1676469758806,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/create.spec.ts","startTime":1676469753605,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1747,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete DELETE - Delete an application","location":null,"status":"passed","title":"DELETE - Delete an application"}],"endTime":1676469762953,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/delete.spec.ts","startTime":1676469758814,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 1 permissions","location":null,"status":"pending","title":"Custom role access for level 1 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 2 permissions","location":null,"status":"pending","title":"Custom role access for level 2 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 3 permissions","location":null,"status":"pending","title":"Custom role access for level 3 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 4 permissions","location":null,"status":"pending","title":"Custom role access for level 4 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 5 permissions","location":null,"status":"pending","title":"Custom role access for level 5 permissions"}],"endTime":1676469763432,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/customRoles.spec.ts","startTime":1676469762962,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for BASIC Role","location":null,"status":"pending","title":"Check Screen access for BASIC Role"},{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for POWER role","location":null,"status":"pending","title":"Check Screen access for POWER role"},{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for ADMIN role","location":null,"status":"pending","title":"Check Screen access for ADMIN role"}],"endTime":1676469763656,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/screenAccess.spec.ts","startTime":1676469763438,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for app user","location":null,"status":"pending","title":"Check Table access for app user"},{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for developer","location":null,"status":"pending","title":"Check Table access for developer"},{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for admin","location":null,"status":"pending","title":"Check Table access for admin"}],"endTime":1676469763691,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/tableAccess.spec.ts","startTime":1676469763660,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /tables endpoints"],"duration":242,"failureMessages":[],"fullName":"Public API - /tables endpoints POST - Create a table","location":null,"status":"passed","title":"POST - Create a table"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":104,"failureMessages":[],"fullName":"Public API - /tables endpoints POST - Search tables","location":null,"status":"passed","title":"POST - Search tables"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":114,"failureMessages":[],"fullName":"Public API - /tables endpoints GET - Retrieve a table","location":null,"status":"passed","title":"GET - Retrieve a table"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":337,"failureMessages":[],"fullName":"Public API - /tables endpoints PUT - update a table","location":null,"status":"passed","title":"PUT - update a table"}],"endTime":1676469765643,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/tables.spec.ts","startTime":1676469763694,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /users endpoints"],"duration":352,"failureMessages":[],"fullName":"Public API - /users endpoints POST - Create a user","location":null,"status":"passed","title":"POST - Create a user"},{"ancestorTitles":["Public API - /users endpoints"],"duration":191,"failureMessages":[],"fullName":"Public API - /users endpoints POST - Search users","location":null,"status":"passed","title":"POST - Search users"},{"ancestorTitles":["Public API - /users endpoints"],"duration":99,"failureMessages":[],"fullName":"Public API - /users endpoints GET - Retrieve a user","location":null,"status":"passed","title":"GET - Retrieve a user"},{"ancestorTitles":["Public API - /users endpoints"],"duration":314,"failureMessages":[],"fullName":"Public API - /users endpoints PUT - update a user","location":null,"status":"passed","title":"PUT - update a user"}],"endTime":1676469766998,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/users/users.spec.ts","startTime":1676469765647,"status":"passed","summary":""}],"wasInterrupted":false}
\ No newline at end of file

From 9ca6aa8bbc7d6e22496a1f53e80a954c1133b8e0 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 15 Feb 2023 23:43:53 +0000
Subject: [PATCH 020/273] tidy up

---
 .github/workflows/smoke_test.yaml     | 8 +++++++-
 qa-core/.gitignore                    | 3 ++-
 qa-core/package.json                  | 1 +
 qa-core/scripts/testResultsWebhook.js | 2 +-
 qa-core/testReport.json               | 1 -
 5 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 qa-core/testReport.json

diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml
index b4ed39fd68..3fd61cd9c5 100644
--- a/.github/workflows/smoke_test.yaml
+++ b/.github/workflows/smoke_test.yaml
@@ -22,4 +22,10 @@ jobs:
           yarn api:test:ci
         env:
           BUDIBASE_HOST: budicloud.qa.budibase.net
-          BUDIBASE_ACCOUNTS_URL: https://account-portal.budicloud.qa.budibase.net
\ No newline at end of file
+          BUDIBASE_ACCOUNTS_URL: https://account-portal.budicloud.qa.budibase.net
+
+      - name: Cypress Discord Notify
+        run: yarn test:notify
+        env:
+          WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }}
+          GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
\ No newline at end of file
diff --git a/qa-core/.gitignore b/qa-core/.gitignore
index e82880bc81..08660a00a8 100644
--- a/qa-core/.gitignore
+++ b/qa-core/.gitignore
@@ -1,4 +1,5 @@
 node_modules/
 .env
 watchtower-hook.json
-dist/
\ No newline at end of file
+dist/
+.testReport.json
diff --git a/qa-core/package.json b/qa-core/package.json
index 846ccb4dbe..2ae04ece6c 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -12,6 +12,7 @@
     "test": "env-cmd jest --runInBand --json --outputFile=testResults.json",
     "test:watch": "env-cmd jest --watch",
     "test:debug": "DEBUG=1 jest",
+    "test:notify": "node scripts/testResultsWebhook",
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
     "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts",
diff --git a/qa-core/scripts/testResultsWebhook.js b/qa-core/scripts/testResultsWebhook.js
index 034fe45064..fc00bf34ad 100644
--- a/qa-core/scripts/testResultsWebhook.js
+++ b/qa-core/scripts/testResultsWebhook.js
@@ -4,7 +4,7 @@ const fetch = require("node-fetch")
 const path = require("path")
 const fs = require("fs")
 
-const WEBHOOK_URL = process.env.CYPRESS_WEBHOOK_URL
+const WEBHOOK_URL = process.env.WEBHOOK_URL
 const GIT_SHA = process.env.GITHUB_SHA
 const GITHUB_ACTIONS_RUN_URL = process.env.GITHUB_ACTIONS_RUN_URL
 
diff --git a/qa-core/testReport.json b/qa-core/testReport.json
deleted file mode 100644
index b1aa321bc5..0000000000
--- a/qa-core/testReport.json
+++ /dev/null
@@ -1 +0,0 @@
-{"numFailedTestSuites":1,"numFailedTests":1,"numPassedTestSuites":11,"numPassedTests":41,"numPendingTestSuites":3,"numPendingTests":11,"numRuntimeErrorTestSuites":0,"numTodoTests":0,"numTotalTestSuites":15,"numTotalTests":53,"openHandles":[],"snapshot":{"added":0,"didUpdate":false,"failure":false,"filesAdded":0,"filesRemoved":0,"filesRemovedList":[],"filesUnmatched":0,"filesUpdated":0,"matched":0,"total":0,"unchecked":0,"uncheckedKeysByFile":[],"unmatched":0,"updated":0},"startTime":1676469571194,"success":false,"testResults":[{"assertionResults":[{"ancestorTitles":["Public API - /rows endpoints"],"duration":548,"failureMessages":[],"fullName":"Public API - /rows endpoints POST - Create a row","location":null,"status":"passed","title":"POST - Create a row"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":60002,"failureMessages":["Error: thrown: \"Exceeded timeout of 60000 ms for a test.\nUse jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.\"\n    at /Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts:35:3\n    at _dispatchDescribe (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/index.js:105:26)\n    at describe (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/index.js:60:5)\n    at Object.<anonymous> (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts:6:1)\n    at Runtime._execModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1714:24)\n    at Runtime._loadModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1223:12)\n    at Runtime.requireModule (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runtime/build/index.js:1047:12)\n    at jestAdapter (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapter.js:89:13)\n    at runTestInternal (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runner/build/runTest.js:411:16)\n    at runTest (/Users/mmckeaveney/Dev/budibase/budibase/qa-core/node_modules/jest-runner/build/runTest.js:499:34)"],"fullName":"Public API - /rows endpoints POST - Search rows","location":null,"status":"failed","title":"POST - Search rows"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":496,"failureMessages":[],"fullName":"Public API - /rows endpoints GET - Retrieve a row","location":null,"status":"passed","title":"GET - Retrieve a row"},{"ancestorTitles":["Public API - /rows endpoints"],"duration":644,"failureMessages":[],"fullName":"Public API - /rows endpoints PUT - update a row","location":null,"status":"passed","title":"PUT - update a row"}],"endTime":1676469635424,"message":"\u001b[1m\u001b[31m  \u001b[1m● \u001b[22m\u001b[1mPublic API - /rows endpoints › POST - Search rows\u001b[39m\u001b[22m\n\n    thrown: \"Exceeded timeout of 60000 ms for a test.\n    Use jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.\"\n\u001b[2m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 33 |\u001b[39m   })\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 34 |\u001b[39m\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[2m\u001b[39m\u001b[90m 35 |\u001b[39m   it(\u001b[32m\"POST - Search rows\"\u001b[39m\u001b[33m,\u001b[39m \u001b[36masync\u001b[39m () \u001b[33m=>\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m    |\u001b[39m   \u001b[31m\u001b[1m^\u001b[22m\u001b[2m\u001b[39m\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 36 |\u001b[39m     \u001b[36mconst\u001b[39m [response\u001b[33m,\u001b[39m rows] \u001b[33m=\u001b[39m \u001b[36mawait\u001b[39m config\u001b[33m.\u001b[39mrows\u001b[33m.\u001b[39msearch({\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 37 |\u001b[39m       query\u001b[33m:\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m    \u001b[0m \u001b[90m 38 |\u001b[39m         string\u001b[33m:\u001b[39m {\u001b[0m\u001b[22m\n\u001b[2m\u001b[22m\n\u001b[2m      \u001b[2mat \u001b[22m\u001b[2m\u001b[0m\u001b[36msrc/tests/public-api/tables/rows.spec.ts\u001b[39m\u001b[0m\u001b[2m:35:3\u001b[22m\u001b[2m\u001b[22m\n\u001b[2m      \u001b[2mat Object.<anonymous> (\u001b[22m\u001b[2m\u001b[0m\u001b[36msrc/tests/public-api/tables/rows.spec.ts\u001b[39m\u001b[0m\u001b[2m:6:1)\u001b[22m\u001b[2m\u001b[22m\n","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/rows.spec.ts","startTime":1676469571238,"status":"failed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":3773,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add BASIC user to app","location":null,"status":"passed","title":"Add BASIC user to app"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":4896,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add ADMIN user to app","location":null,"status":"passed","title":"Add ADMIN user to app"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":2606,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Add POWER user to app","location":null,"status":"passed","title":"Add POWER user to app"}],"endTime":1676469650546,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/appSpecificRoles.spec.ts","startTime":1676469635431,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Table Operations"],"duration":4474,"failureMessages":[],"fullName":"Internal API - Table Operations Create and delete table, columns and rows","location":null,"status":"passed","title":"Create and delete table, columns and rows"},{"ancestorTitles":["Internal API - Table Operations"],"duration":7624,"failureMessages":[],"fullName":"Internal API - Table Operations Search and pagination","location":null,"status":"passed","title":"Search and pagination"}],"endTime":1676469664993,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/tables/tables.spec.ts","startTime":1676469650551,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":4680,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Publish app","location":null,"status":"passed","title":"Publish app"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1641,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Sync application before deployment","location":null,"status":"passed","title":"Sync application before deployment"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":2805,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Sync application after deployment","location":null,"status":"passed","title":"Sync application after deployment"}],"endTime":1676469676987,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/publish.spec.ts","startTime":1676469664996,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /applications endpoints"],"duration":792,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - Create an application","location":null,"status":"passed","title":"POST - Create an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":29,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - Search applications","location":null,"status":"passed","title":"POST - Search applications"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":140,"failureMessages":[],"fullName":"Public API - /applications endpoints GET - Retrieve an application","location":null,"status":"passed","title":"GET - Retrieve an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":305,"failureMessages":[],"fullName":"Public API - /applications endpoints PUT - update an application","location":null,"status":"passed","title":"PUT - update an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":12038,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - publish an application","location":null,"status":"passed","title":"POST - publish an application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":14193,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - unpublish a published application","location":null,"status":"passed","title":"POST - unpublish a published application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":128,"failureMessages":[],"fullName":"Public API - /applications endpoints POST - unpublish an unpublished application","location":null,"status":"passed","title":"POST - unpublish an unpublished application"},{"ancestorTitles":["Public API - /applications endpoints"],"duration":21572,"failureMessages":[],"fullName":"Public API - /applications endpoints DELETE - delete a published application and the dev application","location":null,"status":"passed","title":"DELETE - delete a published application and the dev application"}],"endTime":1676469727469,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/applications/applications.spec.ts","startTime":1676469676996,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1421,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Update an application","location":null,"status":"passed","title":"Update an application"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1268,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Revert Changes without changes","location":null,"status":"passed","title":"Revert Changes without changes"},{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":4735,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete Revert Changes","location":null,"status":"passed","title":"Revert Changes"}],"endTime":1676469737505,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/update.spec.ts","startTime":1676469727506,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":2158,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Add Users with different roles","location":null,"status":"passed","title":"Add Users with different roles"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1010,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Delete User","location":null,"status":"passed","title":"Delete User"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1200,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Reset Password","location":null,"status":"passed","title":"Reset Password"},{"ancestorTitles":["Internal API - User Management & Permissions"],"duration":1258,"failureMessages":[],"fullName":"Internal API - User Management & Permissions Change User information","location":null,"status":"passed","title":"Change User information"}],"endTime":1676469745995,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/userManagement.spec.ts","startTime":1676469737513,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - /screens endpoints"],"duration":2086,"failureMessages":[],"fullName":"Internal API - /screens endpoints Create a screen with each role type","location":null,"status":"passed","title":"Create a screen with each role type"},{"ancestorTitles":["Internal API - /screens endpoints"],"duration":1530,"failureMessages":[],"fullName":"Internal API - /screens endpoints Get screens","location":null,"status":"passed","title":"Get screens"},{"ancestorTitles":["Internal API - /screens endpoints"],"duration":1632,"failureMessages":[],"fullName":"Internal API - /screens endpoints Delete a screen","location":null,"status":"passed","title":"Delete a screen"}],"endTime":1676469753597,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/screens/screens.spec.ts","startTime":1676469746008,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation"],"duration":324,"failureMessages":[],"fullName":"Internal API - Application creation Get applications without applications","location":null,"status":"passed","title":"Get applications without applications"},{"ancestorTitles":["Internal API - Application creation"],"duration":1253,"failureMessages":[],"fullName":"Internal API - Application creation Get all Applications after creating an application","location":null,"status":"passed","title":"Get all Applications after creating an application"},{"ancestorTitles":["Internal API - Application creation"],"duration":1254,"failureMessages":[],"fullName":"Internal API - Application creation Get application details","location":null,"status":"passed","title":"Get application details"}],"endTime":1676469758806,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/create.spec.ts","startTime":1676469753605,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Application creation, update, publish and delete"],"duration":1747,"failureMessages":[],"fullName":"Internal API - Application creation, update, publish and delete DELETE - Delete an application","location":null,"status":"passed","title":"DELETE - Delete an application"}],"endTime":1676469762953,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/applications/delete.spec.ts","startTime":1676469758814,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 1 permissions","location":null,"status":"pending","title":"Custom role access for level 1 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 2 permissions","location":null,"status":"pending","title":"Custom role access for level 2 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 3 permissions","location":null,"status":"pending","title":"Custom role access for level 3 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 4 permissions","location":null,"status":"pending","title":"Custom role access for level 4 permissions"},{"ancestorTitles":["Internal API - App Specific Roles & Permissions"],"duration":null,"failureMessages":[],"fullName":"Internal API - App Specific Roles & Permissions Custom role access for level 5 permissions","location":null,"status":"pending","title":"Custom role access for level 5 permissions"}],"endTime":1676469763432,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/customRoles.spec.ts","startTime":1676469762962,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for BASIC Role","location":null,"status":"pending","title":"Check Screen access for BASIC Role"},{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for POWER role","location":null,"status":"pending","title":"Check Screen access for POWER role"},{"ancestorTitles":["Internal API - Role screen access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role screen access Check Screen access for ADMIN role","location":null,"status":"pending","title":"Check Screen access for ADMIN role"}],"endTime":1676469763656,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/screenAccess.spec.ts","startTime":1676469763438,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for app user","location":null,"status":"pending","title":"Check Table access for app user"},{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for developer","location":null,"status":"pending","title":"Check Table access for developer"},{"ancestorTitles":["Internal API - Role table access"],"duration":null,"failureMessages":[],"fullName":"Internal API - Role table access Check Table access for admin","location":null,"status":"pending","title":"Check Table access for admin"}],"endTime":1676469763691,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/internal-api/userManagement/tableAccess.spec.ts","startTime":1676469763660,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /tables endpoints"],"duration":242,"failureMessages":[],"fullName":"Public API - /tables endpoints POST - Create a table","location":null,"status":"passed","title":"POST - Create a table"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":104,"failureMessages":[],"fullName":"Public API - /tables endpoints POST - Search tables","location":null,"status":"passed","title":"POST - Search tables"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":114,"failureMessages":[],"fullName":"Public API - /tables endpoints GET - Retrieve a table","location":null,"status":"passed","title":"GET - Retrieve a table"},{"ancestorTitles":["Public API - /tables endpoints"],"duration":337,"failureMessages":[],"fullName":"Public API - /tables endpoints PUT - update a table","location":null,"status":"passed","title":"PUT - update a table"}],"endTime":1676469765643,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/tables/tables.spec.ts","startTime":1676469763694,"status":"passed","summary":""},{"assertionResults":[{"ancestorTitles":["Public API - /users endpoints"],"duration":352,"failureMessages":[],"fullName":"Public API - /users endpoints POST - Create a user","location":null,"status":"passed","title":"POST - Create a user"},{"ancestorTitles":["Public API - /users endpoints"],"duration":191,"failureMessages":[],"fullName":"Public API - /users endpoints POST - Search users","location":null,"status":"passed","title":"POST - Search users"},{"ancestorTitles":["Public API - /users endpoints"],"duration":99,"failureMessages":[],"fullName":"Public API - /users endpoints GET - Retrieve a user","location":null,"status":"passed","title":"GET - Retrieve a user"},{"ancestorTitles":["Public API - /users endpoints"],"duration":314,"failureMessages":[],"fullName":"Public API - /users endpoints PUT - update a user","location":null,"status":"passed","title":"PUT - update a user"}],"endTime":1676469766998,"message":"","name":"/Users/mmckeaveney/Dev/budibase/budibase/qa-core/src/tests/public-api/users/users.spec.ts","startTime":1676469765647,"status":"passed","summary":""}],"wasInterrupted":false}
\ No newline at end of file

From e7999504c89862b7f31b0e36d7d7a2f1336666cf Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 16 Feb 2023 10:13:25 +0000
Subject: [PATCH 021/273] wildcard all amazonaws addresses

---
 hosting/proxy/nginx.prod.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 21b337deae..2dc97010db 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -55,7 +55,7 @@ http {
     set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
     set $csp_object "object-src 'none'";
     set $csp_base_uri "base-uri 'self'";
-    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com https://api.github.com";
+    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.*.amazonaws.com https://api.github.com";
     set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";

From 55bff3de2950cc8e4de1df64b04c6651d31946b5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 16 Feb 2023 10:18:48 +0000
Subject: [PATCH 022/273] no wildcard at start of s3 csp

---
 hosting/proxy/nginx.prod.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index 2dc97010db..4d8b3466bf 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -55,7 +55,7 @@ http {
     set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
     set $csp_object "object-src 'none'";
     set $csp_base_uri "base-uri 'self'";
-    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.*.amazonaws.com https://api.github.com";
+    set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io  https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io  wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io  https://uploads.intercomcdn.com  https://uploads.intercomusercontent.com https://*.s3.*.amazonaws.com https://s3.*.amazonaws.com https://api.github.com";
     set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com  https://js.intercomcdn.com  https://fonts.intercomcdn.com";
     set $csp_frame "frame-src 'self' https:";
     set $csp_img "img-src http: https: data: blob:";

From c81ef6f128d9bf70641f86280cc44238e0848e92 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 16 Feb 2023 13:33:53 +0000
Subject: [PATCH 023/273] Attempt to fix flakey 409s when deleting screens that
 are linked in the nav (#9700)

---
 packages/builder/src/builderStore/store/frontend.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 7d19573cce..56b8a599f0 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -312,7 +312,7 @@ export const getFrontendStore = () => {
         const screensToDelete = Array.isArray(screens) ? screens : [screens]
 
         // Build array of promises to speed up bulk deletions
-        const promises = []
+        let promises = []
         let deleteUrls = []
         screensToDelete.forEach(screen => {
           // Delete the screen
@@ -326,8 +326,8 @@ export const getFrontendStore = () => {
           deleteUrls.push(screen.routing.route)
         })
 
-        promises.push(store.actions.links.delete(deleteUrls))
         await Promise.all(promises)
+        await store.actions.links.delete(deleteUrls)
         const deletedIds = screensToDelete.map(screen => screen._id)
         const routesResponse = await API.fetchAppRoutes()
         store.update(state => {

From 89829965d4da4abfd59025687879fd239bf95204 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 16 Feb 2023 14:14:22 +0000
Subject: [PATCH 024/273] Remove test on release-develop job (temporary)
 (#9711)

* Remove test on release-develop job (temporary)

* Remove test on release-develop job (temporary)

* Speed up pro release script by adding no verify flag to version update commits
---
 .github/workflows/release-develop.yml | 3 +--
 scripts/pro/release.sh                | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 1ac6b20003..d679d31139 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -45,10 +45,9 @@ jobs:
 
       - run: yarn 
       - run: yarn bootstrap
-      - run: yarn lint 
       - run: yarn build
       - run: yarn build:sdk
-      - run: yarn test
+#      - run: yarn test
 
       - name: Publish budibase packages to NPM
         env:
diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh
index 7fbb3c0fd6..e57d8deeb8 100755
--- a/scripts/pro/release.sh
+++ b/scripts/pro/release.sh
@@ -53,7 +53,7 @@ yarn clean -y && yarn bootstrap
 
 # Commit and push
 git add packages/pro/yarn.lock
-git commit -m "Update dependency versions to $VERSION"
+git commit -m "Update dependency versions to $VERSION" -n
 git push
 
 #############################################
@@ -91,5 +91,5 @@ git add packages/server/package.json
 git add packages/server/yarn.lock
 git add packages/worker/package.json
 git add packages/worker/yarn.lock
-git commit -m "Update pro version to $VERSION"
+git commit -m "Update pro version to $VERSION" -n
 git push

From a232d615279661634c40c2275bac95b8a72b3704 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 16 Feb 2023 14:26:19 +0000
Subject: [PATCH 025/273] v2.3.17-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 0377c73101..2ecb0c19a5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e6dda5e162..754dfe197f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.16",
+    "@budibase/types": "2.3.17-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 073f57f094..68da2f91d1 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.3.16",
+  "version": "2.3.17-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.16",
+    "@budibase/string-templates": "2.3.17-alpha.0",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7def4ba371..ed700b1397 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.16",
-    "@budibase/client": "^2.3.16",
-    "@budibase/frontend-core": "^2.3.16",
-    "@budibase/string-templates": "^2.3.16",
+    "@budibase/bbui": "2.3.17-alpha.0",
+    "@budibase/client": "2.3.17-alpha.0",
+    "@budibase/frontend-core": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5209c51b2e..badd55fad8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/backend-core": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/types": "2.3.17-alpha.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 5e2dad5217..1b5c3708ad 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.16",
-    "@budibase/frontend-core": "^2.3.16",
-    "@budibase/string-templates": "^2.3.16",
+    "@budibase/bbui": "2.3.17-alpha.0",
+    "@budibase/frontend-core": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 897b7107cf..94b8e1dcdd 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.16",
+    "@budibase/bbui": "2.3.17-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 51f5ca70e0..ca166434d4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 61d57c4179..bc58239468 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.16",
-    "@budibase/client": "^2.3.16",
+    "@budibase/backend-core": "2.3.17-alpha.0",
+    "@budibase/client": "2.3.17-alpha.0",
     "@budibase/pro": "2.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/types": "2.3.17-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 6b99e321e5..3445666e3a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 7d679edcf6..8c1c6f588a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6da61f1183..817fca19c3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.16",
+  "version": "2.3.17-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.16",
+    "@budibase/backend-core": "2.3.17-alpha.0",
     "@budibase/pro": "2.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/types": "2.3.17-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 5163e0426238a6794f005b23ada6cd08fd735bc0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 16 Feb 2023 14:30:28 +0000
Subject: [PATCH 026/273] Update pro version to 2.3.17-alpha.0

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 45 ++++++++++++++++++----------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 58 ++++++++++++++++++------------------
 4 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index bc58239468..219ac04de2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.0",
     "@budibase/client": "2.3.17-alpha.0",
-    "@budibase/pro": "2.3.16",
+    "@budibase/pro": "2.3.17-alpha.0",
     "@budibase/string-templates": "2.3.17-alpha.0",
     "@budibase/types": "2.3.17-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 497507c40d..5c0e299c3a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,13 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.16.tgz#05a8434501718b9eab0109be03c677c1d546fe17"
-  integrity sha512-wMuqxKVua3/3XejUMH/fJQgu1kK6t4HYpB5AY58sumNSLbFFp1MyqL+1LMSmpUY0nbjExq+9+wseNsnbWicWUw==
+"@budibase/backend-core@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.0.tgz#3a4e9323e9a057af0fdbdfe72c570eeec1c154ff"
+  integrity sha512-zxbxcmcgP7chm9Vt5Scbvegg482KXPhJTXjF2g8/06MPSPnwHkUGreUpH25X7Jei5OUGKlG89BonAhmyRBGErg==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.16"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.17-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1309,7 +1310,6 @@
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
-    pouchdb-replication-stream "1.2.9"
     redlock "4.2.0"
     sanitize-s3-objectkey "0.0.1"
     semver "7.3.7"
@@ -1379,13 +1379,26 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.16.tgz#3eca93b826ed6da5b6941d8b384c34c57da2b1b4"
-  integrity sha512-lIbPXOs61WP7jE80XHRDkBRmSEMYjiaog+qw0dUVP+Kp1QvBDa5Bdg7ESiy8YBae2+55FqXsb8nXjsqqbwFWDA==
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
   dependencies:
-    "@budibase/backend-core" "2.3.16"
-    "@budibase/types" "2.3.16"
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/pro@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.0.tgz#85d832e00801eb2fd20242a4250559672a300611"
+  integrity sha512-sR4FEys8ypKwX66rhth2XJq5pi6KKSrRBScv1JtB3XhJRjSTGjRPKFuXNR23B+wNZ9jonIyS8pEv38Qn+zO3Gg==
+  dependencies:
+    "@budibase/backend-core" "2.3.17-alpha.0"
+    "@budibase/types" "2.3.17-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1411,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.16", "@budibase/types@^2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.16.tgz#6d94b5f34ca58bcca1cca45737d0d1d0b21c9413"
-  integrity sha512-7caUKOlhleQL5gRqcgxSWvHcWIbl8hRPFl5ttWlLTfGO7BDMIRrcW7Wmptmgzoc6MiNCQAQ/uuZ8DeVOlJKRBA==
+"@budibase/types@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.0.tgz#4f60bedd7b2b54695c5ed2abd7025efd016d9bff"
+  integrity sha512-FBhV50D7Xsixz2DPBShu/iedcOtsm0QPHhWDWO6SSrXYe7pU0tgnIbBfwgwEWgqXlR3BRMHfEh9mmUiHew7ORA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 817fca19c3..d38c16bf39 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.0",
-    "@budibase/pro": "2.3.16",
+    "@budibase/pro": "2.3.17-alpha.0",
     "@budibase/string-templates": "2.3.17-alpha.0",
     "@budibase/types": "2.3.17-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d1f13b4d46..bab10c36ba 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,13 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.16.tgz#05a8434501718b9eab0109be03c677c1d546fe17"
-  integrity sha512-wMuqxKVua3/3XejUMH/fJQgu1kK6t4HYpB5AY58sumNSLbFFp1MyqL+1LMSmpUY0nbjExq+9+wseNsnbWicWUw==
+"@budibase/backend-core@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.0.tgz#3a4e9323e9a057af0fdbdfe72c570eeec1c154ff"
+  integrity sha512-zxbxcmcgP7chm9Vt5Scbvegg482KXPhJTXjF2g8/06MPSPnwHkUGreUpH25X7Jei5OUGKlG89BonAhmyRBGErg==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.16"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.17-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -506,7 +507,6 @@
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
-    pouchdb-replication-stream "1.2.9"
     redlock "4.2.0"
     sanitize-s3-objectkey "0.0.1"
     semver "7.3.7"
@@ -526,13 +526,26 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.16.tgz#3eca93b826ed6da5b6941d8b384c34c57da2b1b4"
-  integrity sha512-lIbPXOs61WP7jE80XHRDkBRmSEMYjiaog+qw0dUVP+Kp1QvBDa5Bdg7ESiy8YBae2+55FqXsb8nXjsqqbwFWDA==
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
   dependencies:
-    "@budibase/backend-core" "2.3.16"
-    "@budibase/types" "2.3.16"
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/pro@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.0.tgz#85d832e00801eb2fd20242a4250559672a300611"
+  integrity sha512-sR4FEys8ypKwX66rhth2XJq5pi6KKSrRBScv1JtB3XhJRjSTGjRPKFuXNR23B+wNZ9jonIyS8pEv38Qn+zO3Gg==
+  dependencies:
+    "@budibase/backend-core" "2.3.17-alpha.0"
+    "@budibase/types" "2.3.17-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -540,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.16", "@budibase/types@^2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.16.tgz#6d94b5f34ca58bcca1cca45737d0d1d0b21c9413"
-  integrity sha512-7caUKOlhleQL5gRqcgxSWvHcWIbl8hRPFl5ttWlLTfGO7BDMIRrcW7Wmptmgzoc6MiNCQAQ/uuZ8DeVOlJKRBA==
+"@budibase/types@2.3.17-alpha.0":
+  version "2.3.17-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.0.tgz#4f60bedd7b2b54695c5ed2abd7025efd016d9bff"
+  integrity sha512-FBhV50D7Xsixz2DPBShu/iedcOtsm0QPHhWDWO6SSrXYe7pU0tgnIbBfwgwEWgqXlR3BRMHfEh9mmUiHew7ORA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -6768,19 +6781,6 @@ pouchdb-promise@6.4.3, pouchdb-promise@^6.0.4:
   dependencies:
     lie "3.1.1"
 
-pouchdb-replication-stream@1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.9.tgz#aa4fa5d8f52df4825392f18e07c7e11acffc650a"
-  integrity sha512-hM8XRBfamTTUwRhKwLS/jSNouBhn9R/4ugdHNRD1EvJzwV8iImh6sDYbCU9PGuznjyOjXz6vpFRzKeI2KYfwnQ==
-  dependencies:
-    argsarray "0.0.1"
-    inherits "^2.0.3"
-    lodash.pick "^4.0.0"
-    ndjson "^1.4.3"
-    pouch-stream "^0.4.0"
-    pouchdb-promise "^6.0.4"
-    through2 "^2.0.0"
-
 pouchdb-selector-core@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"

From 8fe0cdf89f1ca3012f276c95704413b4f9936796 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:23:44 +0000
Subject: [PATCH 027/273] Handle webhook errors (#9715)

---
 .../server/src/automations/steps/discord.ts   | 38 +++++++++++-----
 .../src/automations/steps/integromat.ts       | 42 ++++++++++++------
 .../server/src/automations/steps/slack.ts     | 34 ++++++++++----
 .../server/src/automations/steps/zapier.ts    | 44 +++++++++++++------
 4 files changed, 111 insertions(+), 47 deletions(-)

diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts
index ae484fa42e..5d7487ed3b 100644
--- a/packages/server/src/automations/steps/discord.ts
+++ b/packages/server/src/automations/steps/discord.ts
@@ -67,17 +67,33 @@ export async function run({ inputs }: AutomationStepInput) {
   if (!avatar_url) {
     avatar_url = DEFAULT_AVATAR_URL
   }
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      username,
-      avatar_url,
-      content,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        username,
+        avatar_url,
+        content,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {
diff --git a/packages/server/src/automations/steps/integromat.ts b/packages/server/src/automations/steps/integromat.ts
index dd897b5429..811c0a3d91 100644
--- a/packages/server/src/automations/steps/integromat.ts
+++ b/packages/server/src/automations/steps/integromat.ts
@@ -69,19 +69,35 @@ export const definition: AutomationStepSchema = {
 export async function run({ inputs }: AutomationStepInput) {
   const { url, value1, value2, value3, value4, value5 } = inputs
 
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      value1,
-      value2,
-      value3,
-      value4,
-      value5,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        value1,
+        value2,
+        value3,
+        value4,
+        value5,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {
diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts
index 47c66bebf3..0c9320a699 100644
--- a/packages/server/src/automations/steps/slack.ts
+++ b/packages/server/src/automations/steps/slack.ts
@@ -50,15 +50,31 @@ export const definition: AutomationStepSchema = {
 
 export async function run({ inputs }: AutomationStepInput) {
   let { url, text } = inputs
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      text,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        text,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
   return {
diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts
index 1a48c1ec92..90068e685d 100644
--- a/packages/server/src/automations/steps/zapier.ts
+++ b/packages/server/src/automations/steps/zapier.ts
@@ -63,22 +63,38 @@ export const definition: AutomationStepSchema = {
 export async function run({ inputs }: AutomationStepInput) {
   const { url, value1, value2, value3, value4, value5 } = inputs
 
+  if (!url?.trim()?.length) {
+    return {
+      httpStatus: 400,
+      response: "Missing Webhook URL",
+      success: false,
+    }
+  }
   // send the platform to make sure zaps always work, even
   // if no values supplied
-  const response = await fetch(url, {
-    method: "post",
-    body: JSON.stringify({
-      platform: "budibase",
-      value1,
-      value2,
-      value3,
-      value4,
-      value5,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-  })
+  let response
+  try {
+    response = await fetch(url, {
+      method: "post",
+      body: JSON.stringify({
+        platform: "budibase",
+        value1,
+        value2,
+        value3,
+        value4,
+        value5,
+      }),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+  } catch (err: any) {
+    return {
+      httpStatus: 400,
+      response: err.message,
+      success: false,
+    }
+  }
 
   const { status, message } = await getFetchResponse(response)
 

From cd0e7d41a590a91efa66100ccded842c49f7b519 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 16 Feb 2023 16:37:12 +0000
Subject: [PATCH 028/273] v2.3.17

---
 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 0377c73101..cfbed56e23 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.16",
+  "version": "2.3.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 455436ff6a..25e73b9e4d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@budibase/nano": "10.1.1",
-    "@budibase/types": "^2.3.16",
+    "@budibase/types": "^2.3.17",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 073f57f094..8c9629b314 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.3.16",
+  "version": "2.3.17",
   "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.3.16",
+    "@budibase/string-templates": "^2.3.17",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7def4ba371..5e968c23a3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.16",
-    "@budibase/client": "^2.3.16",
-    "@budibase/frontend-core": "^2.3.16",
-    "@budibase/string-templates": "^2.3.16",
+    "@budibase/bbui": "^2.3.17",
+    "@budibase/client": "^2.3.17",
+    "@budibase/frontend-core": "^2.3.17",
+    "@budibase/string-templates": "^2.3.17",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5209c51b2e..fb08c290fc 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "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.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/backend-core": "^2.3.17",
+    "@budibase/string-templates": "^2.3.17",
+    "@budibase/types": "^2.3.17",
     "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 5e2dad5217..78df2b67f7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "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.3.16",
-    "@budibase/frontend-core": "^2.3.16",
-    "@budibase/string-templates": "^2.3.16",
+    "@budibase/bbui": "^2.3.17",
+    "@budibase/frontend-core": "^2.3.17",
+    "@budibase/string-templates": "^2.3.17",
     "@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 897b7107cf..502df0fbd4 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.16",
+    "@budibase/bbui": "^2.3.17",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 51f5ca70e0..d8a5c44c5b 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index aec1e3d047..78f03e0bfe 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.16",
-    "@budibase/client": "^2.3.16",
+    "@budibase/backend-core": "^2.3.17",
+    "@budibase/client": "^2.3.17",
     "@budibase/pro": "2.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/string-templates": "^2.3.17",
+    "@budibase/types": "^2.3.17",
     "@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 6b99e321e5..87b7c69dbb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "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 7d679edcf6..8417cadc06 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "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 7c2518e8b5..a146e431c2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.16",
+    "@budibase/backend-core": "^2.3.17",
     "@budibase/pro": "2.3.16",
-    "@budibase/string-templates": "^2.3.16",
-    "@budibase/types": "^2.3.16",
+    "@budibase/string-templates": "^2.3.17",
+    "@budibase/types": "^2.3.17",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 580822f4a8427048a5c4475f6424d778b0e2e06e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 16 Feb 2023 16:41:23 +0000
Subject: [PATCH 029/273] Update pro version to 2.3.17

---
 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 78f03e0bfe..f5787302fe 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.17",
     "@budibase/client": "^2.3.17",
-    "@budibase/pro": "2.3.16",
+    "@budibase/pro": "2.3.17",
     "@budibase/string-templates": "^2.3.17",
     "@budibase/types": "^2.3.17",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index e88dfaf333..31a5b3350e 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1273,13 +1273,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.16.tgz#05a8434501718b9eab0109be03c677c1d546fe17"
-  integrity sha512-wMuqxKVua3/3XejUMH/fJQgu1kK6t4HYpB5AY58sumNSLbFFp1MyqL+1LMSmpUY0nbjExq+9+wseNsnbWicWUw==
+"@budibase/backend-core@2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
+  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.16"
+    "@budibase/types" "^2.3.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1374,13 +1374,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.16.tgz#3eca93b826ed6da5b6941d8b384c34c57da2b1b4"
-  integrity sha512-lIbPXOs61WP7jE80XHRDkBRmSEMYjiaog+qw0dUVP+Kp1QvBDa5Bdg7ESiy8YBae2+55FqXsb8nXjsqqbwFWDA==
+"@budibase/pro@2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
+  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
   dependencies:
-    "@budibase/backend-core" "2.3.16"
-    "@budibase/types" "2.3.16"
+    "@budibase/backend-core" "2.3.17"
+    "@budibase/types" "2.3.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1406,10 +1406,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.16", "@budibase/types@^2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.16.tgz#6d94b5f34ca58bcca1cca45737d0d1d0b21c9413"
-  integrity sha512-7caUKOlhleQL5gRqcgxSWvHcWIbl8hRPFl5ttWlLTfGO7BDMIRrcW7Wmptmgzoc6MiNCQAQ/uuZ8DeVOlJKRBA==
+"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
+  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a146e431c2..71b8ed6e9c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.17",
-    "@budibase/pro": "2.3.16",
+    "@budibase/pro": "2.3.17",
     "@budibase/string-templates": "^2.3.17",
     "@budibase/types": "^2.3.17",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 826a6bd680..43d5ffb1bd 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -470,13 +470,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.16.tgz#05a8434501718b9eab0109be03c677c1d546fe17"
-  integrity sha512-wMuqxKVua3/3XejUMH/fJQgu1kK6t4HYpB5AY58sumNSLbFFp1MyqL+1LMSmpUY0nbjExq+9+wseNsnbWicWUw==
+"@budibase/backend-core@2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
+  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.16"
+    "@budibase/types" "^2.3.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -521,13 +521,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.16.tgz#3eca93b826ed6da5b6941d8b384c34c57da2b1b4"
-  integrity sha512-lIbPXOs61WP7jE80XHRDkBRmSEMYjiaog+qw0dUVP+Kp1QvBDa5Bdg7ESiy8YBae2+55FqXsb8nXjsqqbwFWDA==
+"@budibase/pro@2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
+  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
   dependencies:
-    "@budibase/backend-core" "2.3.16"
-    "@budibase/types" "2.3.16"
+    "@budibase/backend-core" "2.3.17"
+    "@budibase/types" "2.3.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -535,10 +535,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.16", "@budibase/types@^2.3.16":
-  version "2.3.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.16.tgz#6d94b5f34ca58bcca1cca45737d0d1d0b21c9413"
-  integrity sha512-7caUKOlhleQL5gRqcgxSWvHcWIbl8hRPFl5ttWlLTfGO7BDMIRrcW7Wmptmgzoc6MiNCQAQ/uuZ8DeVOlJKRBA==
+"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
+  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 49d9539c529efa12a5a48da9fa8a453bf6f1fc35 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 16 Feb 2023 16:44:50 +0000
Subject: [PATCH 030/273] Fix server docker build (#9718)

---
 packages/server/tsconfig.build.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json
index 212fc1479d..9289b6f9da 100644
--- a/packages/server/tsconfig.build.json
+++ b/packages/server/tsconfig.build.json
@@ -20,6 +20,7 @@
     "dist",
     "src/tests",
     "src/api/routes/tests/utilities",
+    "src/api/routes/public/tests/utils.ts",
     "src/automations/tests/utilities",
     "**/*.spec.ts",
     "**/*.spec.js"

From 788a9129334e66ff8270369051f78d7c6cdf1ad9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 16 Feb 2023 16:52:04 +0000
Subject: [PATCH 031/273] v2.3.17-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 2ecb0c19a5..658bded52f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 754dfe197f..2c63a821e8 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.0",
+    "@budibase/types": "2.3.17-alpha.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 68da2f91d1..d78388fcec 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.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.1",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index ed700b1397..60c933aa24 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.0",
-    "@budibase/client": "2.3.17-alpha.0",
-    "@budibase/frontend-core": "2.3.17-alpha.0",
-    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/bbui": "2.3.17-alpha.1",
+    "@budibase/client": "2.3.17-alpha.1",
+    "@budibase/frontend-core": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index badd55fad8..4af1c43cf4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.0",
-    "@budibase/string-templates": "2.3.17-alpha.0",
-    "@budibase/types": "2.3.17-alpha.0",
+    "@budibase/backend-core": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.1",
+    "@budibase/types": "2.3.17-alpha.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 1b5c3708ad..13684f4d43 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.0",
-    "@budibase/frontend-core": "2.3.17-alpha.0",
-    "@budibase/string-templates": "2.3.17-alpha.0",
+    "@budibase/bbui": "2.3.17-alpha.1",
+    "@budibase/frontend-core": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 94b8e1dcdd..f76fa2c3fe 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.0",
+    "@budibase/bbui": "2.3.17-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index ca166434d4..f8b3d2544e 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 219ac04de2..9c0f16b62f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.0",
-    "@budibase/client": "2.3.17-alpha.0",
+    "@budibase/backend-core": "2.3.17-alpha.1",
+    "@budibase/client": "2.3.17-alpha.1",
     "@budibase/pro": "2.3.17-alpha.0",
-    "@budibase/string-templates": "2.3.17-alpha.0",
-    "@budibase/types": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.1",
+    "@budibase/types": "2.3.17-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 3445666e3a..7dece7ded5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 8c1c6f588a..3a0653632d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d38c16bf39..a930af1e12 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.0",
+    "@budibase/backend-core": "2.3.17-alpha.1",
     "@budibase/pro": "2.3.17-alpha.0",
-    "@budibase/string-templates": "2.3.17-alpha.0",
-    "@budibase/types": "2.3.17-alpha.0",
+    "@budibase/string-templates": "2.3.17-alpha.1",
+    "@budibase/types": "2.3.17-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 457a60bff8e4afa204c88b40720b80e7265dbe60 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 16 Feb 2023 16:56:11 +0000
Subject: [PATCH 032/273] Update pro version to 2.3.17-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 9c0f16b62f..a4c9c119f1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.1",
     "@budibase/client": "2.3.17-alpha.1",
-    "@budibase/pro": "2.3.17-alpha.0",
+    "@budibase/pro": "2.3.17-alpha.1",
     "@budibase/string-templates": "2.3.17-alpha.1",
     "@budibase/types": "2.3.17-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 5c0e299c3a..2465c4f498 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.0.tgz#3a4e9323e9a057af0fdbdfe72c570eeec1c154ff"
-  integrity sha512-zxbxcmcgP7chm9Vt5Scbvegg482KXPhJTXjF2g8/06MPSPnwHkUGreUpH25X7Jei5OUGKlG89BonAhmyRBGErg==
+"@budibase/backend-core@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.1.tgz#84bca579947d0369ef0cb50e86db8d182bfa48ff"
+  integrity sha512-yPU3DLD4JAaEtnBxxMZZUT/DDdy6vNAhKkW0t65NXLSXgqIii5JLi89TR0BbDXFNdSYAww+ashDXWbw7GhH7ng==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.0"
+    "@budibase/types" "2.3.17-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.0.tgz#85d832e00801eb2fd20242a4250559672a300611"
-  integrity sha512-sR4FEys8ypKwX66rhth2XJq5pi6KKSrRBScv1JtB3XhJRjSTGjRPKFuXNR23B+wNZ9jonIyS8pEv38Qn+zO3Gg==
+"@budibase/pro@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.1.tgz#348b5d98772b50240b51e0d14070b9a9ec793527"
+  integrity sha512-l4vmhqHwJ3Zi+EperCbWE7vj1/CL2+eZHKgUMgmQ7WORmzXPW2rubZW+kf9UBsr9TQ7ynewPg/CQF/N8eDtXOw==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.0"
-    "@budibase/types" "2.3.17-alpha.0"
+    "@budibase/backend-core" "2.3.17-alpha.1"
+    "@budibase/types" "2.3.17-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.0.tgz#4f60bedd7b2b54695c5ed2abd7025efd016d9bff"
-  integrity sha512-FBhV50D7Xsixz2DPBShu/iedcOtsm0QPHhWDWO6SSrXYe7pU0tgnIbBfwgwEWgqXlR3BRMHfEh9mmUiHew7ORA==
+"@budibase/types@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.1.tgz#c11a2bb579e31b5b10f168fbd09fc4244d2f0590"
+  integrity sha512-zpo9sH1TFNUY6MEWSKBLM5qmXc9NwoVl2HMZ01UOL7etXOR2cb2H9T5/DCX3rpCGVeWjf8zmvQXXAWhSIjLiPg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a930af1e12..237ff94535 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.1",
-    "@budibase/pro": "2.3.17-alpha.0",
+    "@budibase/pro": "2.3.17-alpha.1",
     "@budibase/string-templates": "2.3.17-alpha.1",
     "@budibase/types": "2.3.17-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index bab10c36ba..7b67ba7ca9 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.0.tgz#3a4e9323e9a057af0fdbdfe72c570eeec1c154ff"
-  integrity sha512-zxbxcmcgP7chm9Vt5Scbvegg482KXPhJTXjF2g8/06MPSPnwHkUGreUpH25X7Jei5OUGKlG89BonAhmyRBGErg==
+"@budibase/backend-core@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.1.tgz#84bca579947d0369ef0cb50e86db8d182bfa48ff"
+  integrity sha512-yPU3DLD4JAaEtnBxxMZZUT/DDdy6vNAhKkW0t65NXLSXgqIii5JLi89TR0BbDXFNdSYAww+ashDXWbw7GhH7ng==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.0"
+    "@budibase/types" "2.3.17-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.0.tgz#85d832e00801eb2fd20242a4250559672a300611"
-  integrity sha512-sR4FEys8ypKwX66rhth2XJq5pi6KKSrRBScv1JtB3XhJRjSTGjRPKFuXNR23B+wNZ9jonIyS8pEv38Qn+zO3Gg==
+"@budibase/pro@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.1.tgz#348b5d98772b50240b51e0d14070b9a9ec793527"
+  integrity sha512-l4vmhqHwJ3Zi+EperCbWE7vj1/CL2+eZHKgUMgmQ7WORmzXPW2rubZW+kf9UBsr9TQ7ynewPg/CQF/N8eDtXOw==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.0"
-    "@budibase/types" "2.3.17-alpha.0"
+    "@budibase/backend-core" "2.3.17-alpha.1"
+    "@budibase/types" "2.3.17-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.0":
-  version "2.3.17-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.0.tgz#4f60bedd7b2b54695c5ed2abd7025efd016d9bff"
-  integrity sha512-FBhV50D7Xsixz2DPBShu/iedcOtsm0QPHhWDWO6SSrXYe7pU0tgnIbBfwgwEWgqXlR3BRMHfEh9mmUiHew7ORA==
+"@budibase/types@2.3.17-alpha.1":
+  version "2.3.17-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.1.tgz#c11a2bb579e31b5b10f168fbd09fc4244d2f0590"
+  integrity sha512-zpo9sH1TFNUY6MEWSKBLM5qmXc9NwoVl2HMZ01UOL7etXOR2cb2H9T5/DCX3rpCGVeWjf8zmvQXXAWhSIjLiPg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From eb6b49d84328830632726d88c7a961928d6d38df Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 17 Feb 2023 08:25:10 +0000
Subject: [PATCH 033/273] Fix qa deploy dispatch (#9724)

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

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index d679d31139..16c6c37bbd 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -193,5 +193,5 @@ jobs:
           PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
         with:
           repository: budibase/budibase-deploys
-          event: deploy-budibase-develop-to-qa
+          event: budicloud-qa-deploy
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
\ No newline at end of file

From 74c7a23c5c85441b8839d9b5b4617b5eb698daf1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 08:32:08 +0000
Subject: [PATCH 034/273] v2.3.17-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 658bded52f..ed684ccd66 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2c63a821e8..1805a07a09 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.1",
+    "@budibase/types": "2.3.17-alpha.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d78388fcec..09c199d0f3 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.3.17-alpha.1",
+  "version": "2.3.17-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.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.2",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 60c933aa24..54fa2e6f7c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.1",
-    "@budibase/client": "2.3.17-alpha.1",
-    "@budibase/frontend-core": "2.3.17-alpha.1",
-    "@budibase/string-templates": "2.3.17-alpha.1",
+    "@budibase/bbui": "2.3.17-alpha.2",
+    "@budibase/client": "2.3.17-alpha.2",
+    "@budibase/frontend-core": "2.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-alpha.2",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4af1c43cf4..610d617a0e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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.3.17-alpha.1",
-    "@budibase/string-templates": "2.3.17-alpha.1",
-    "@budibase/types": "2.3.17-alpha.1",
+    "@budibase/backend-core": "2.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/types": "2.3.17-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 13684f4d43..65dbb25abf 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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.3.17-alpha.1",
-    "@budibase/frontend-core": "2.3.17-alpha.1",
-    "@budibase/string-templates": "2.3.17-alpha.1",
+    "@budibase/bbui": "2.3.17-alpha.2",
+    "@budibase/frontend-core": "2.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-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 f76fa2c3fe..89dd18fc02 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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.3.17-alpha.1",
+    "@budibase/bbui": "2.3.17-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f8b3d2544e..828fb83423 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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 a4c9c119f1..f5a2aba821 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.1",
-    "@budibase/client": "2.3.17-alpha.1",
+    "@budibase/backend-core": "2.3.17-alpha.2",
+    "@budibase/client": "2.3.17-alpha.2",
     "@budibase/pro": "2.3.17-alpha.1",
-    "@budibase/string-templates": "2.3.17-alpha.1",
-    "@budibase/types": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/types": "2.3.17-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 7dece7ded5..10976112d9 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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 3a0653632d..0c7f4e6b2b 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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 237ff94535..605fa2ec17 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.1",
+  "version": "2.3.17-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.3.17-alpha.1",
+    "@budibase/backend-core": "2.3.17-alpha.2",
     "@budibase/pro": "2.3.17-alpha.1",
-    "@budibase/string-templates": "2.3.17-alpha.1",
-    "@budibase/types": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/types": "2.3.17-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 8971a14865ec1611053290c4037a078b876d161b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 08:36:00 +0000
Subject: [PATCH 035/273] Update pro version to 2.3.17-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 f5a2aba821..eb543ac488 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.2",
     "@budibase/client": "2.3.17-alpha.2",
-    "@budibase/pro": "2.3.17-alpha.1",
+    "@budibase/pro": "2.3.17-alpha.2",
     "@budibase/string-templates": "2.3.17-alpha.2",
     "@budibase/types": "2.3.17-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 2465c4f498..a850816b1b 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.1.tgz#84bca579947d0369ef0cb50e86db8d182bfa48ff"
-  integrity sha512-yPU3DLD4JAaEtnBxxMZZUT/DDdy6vNAhKkW0t65NXLSXgqIii5JLi89TR0BbDXFNdSYAww+ashDXWbw7GhH7ng==
+"@budibase/backend-core@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.2.tgz#f8c7f06ee63e59149590143867a721f3ea2d3fb0"
+  integrity sha512-4IUilkKl1zBjVVe/cqSA+Wm8z7Dq+vNwVJxaxoSEEr0Vs+OaNi31LTO5ji4Vt5qinwmutvUorbP27tjrFuRauw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.1"
+    "@budibase/types" "2.3.17-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.1.tgz#348b5d98772b50240b51e0d14070b9a9ec793527"
-  integrity sha512-l4vmhqHwJ3Zi+EperCbWE7vj1/CL2+eZHKgUMgmQ7WORmzXPW2rubZW+kf9UBsr9TQ7ynewPg/CQF/N8eDtXOw==
+"@budibase/pro@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.2.tgz#e382819c0b3ef9ecfd660cd492bd9410a7dbe46a"
+  integrity sha512-AzoiLg1dQJD6MEka1eQLdYts0HG6ztVyrt7nl1xVNyFSg++rBrZ51kNulv32104ASOQ0TJfULvbZf13POkCxdQ==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.1"
-    "@budibase/types" "2.3.17-alpha.1"
+    "@budibase/backend-core" "2.3.17-alpha.2"
+    "@budibase/types" "2.3.17-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.1.tgz#c11a2bb579e31b5b10f168fbd09fc4244d2f0590"
-  integrity sha512-zpo9sH1TFNUY6MEWSKBLM5qmXc9NwoVl2HMZ01UOL7etXOR2cb2H9T5/DCX3rpCGVeWjf8zmvQXXAWhSIjLiPg==
+"@budibase/types@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.2.tgz#9b0d13b7a20951003ef84a99fbcb2650d7a9e5cc"
+  integrity sha512-VEECoGPuAY2ajgDcsUTzvaWZlWVwzprK58WnhnZdnhGLqtB4Fd6eGjGPecWA4l4RWEmg5FMy66M5mHAUC0KG7w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 605fa2ec17..5aa6982372 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.2",
-    "@budibase/pro": "2.3.17-alpha.1",
+    "@budibase/pro": "2.3.17-alpha.2",
     "@budibase/string-templates": "2.3.17-alpha.2",
     "@budibase/types": "2.3.17-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 7b67ba7ca9..766b5337f2 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.1.tgz#84bca579947d0369ef0cb50e86db8d182bfa48ff"
-  integrity sha512-yPU3DLD4JAaEtnBxxMZZUT/DDdy6vNAhKkW0t65NXLSXgqIii5JLi89TR0BbDXFNdSYAww+ashDXWbw7GhH7ng==
+"@budibase/backend-core@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.2.tgz#f8c7f06ee63e59149590143867a721f3ea2d3fb0"
+  integrity sha512-4IUilkKl1zBjVVe/cqSA+Wm8z7Dq+vNwVJxaxoSEEr0Vs+OaNi31LTO5ji4Vt5qinwmutvUorbP27tjrFuRauw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.1"
+    "@budibase/types" "2.3.17-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.1.tgz#348b5d98772b50240b51e0d14070b9a9ec793527"
-  integrity sha512-l4vmhqHwJ3Zi+EperCbWE7vj1/CL2+eZHKgUMgmQ7WORmzXPW2rubZW+kf9UBsr9TQ7ynewPg/CQF/N8eDtXOw==
+"@budibase/pro@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.2.tgz#e382819c0b3ef9ecfd660cd492bd9410a7dbe46a"
+  integrity sha512-AzoiLg1dQJD6MEka1eQLdYts0HG6ztVyrt7nl1xVNyFSg++rBrZ51kNulv32104ASOQ0TJfULvbZf13POkCxdQ==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.1"
-    "@budibase/types" "2.3.17-alpha.1"
+    "@budibase/backend-core" "2.3.17-alpha.2"
+    "@budibase/types" "2.3.17-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.1":
-  version "2.3.17-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.1.tgz#c11a2bb579e31b5b10f168fbd09fc4244d2f0590"
-  integrity sha512-zpo9sH1TFNUY6MEWSKBLM5qmXc9NwoVl2HMZ01UOL7etXOR2cb2H9T5/DCX3rpCGVeWjf8zmvQXXAWhSIjLiPg==
+"@budibase/types@2.3.17-alpha.2":
+  version "2.3.17-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.2.tgz#9b0d13b7a20951003ef84a99fbcb2650d7a9e5cc"
+  integrity sha512-VEECoGPuAY2ajgDcsUTzvaWZlWVwzprK58WnhnZdnhGLqtB4Fd6eGjGPecWA4l4RWEmg5FMy66M5mHAUC0KG7w==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b34b5fc5bb9399f65902bcada459aca5ffffb047 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 17 Feb 2023 09:16:11 +0000
Subject: [PATCH 036/273] Fix tenant creation on user save (#9725)

---
 packages/worker/src/sdk/users/users.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 8410d0b2e0..5124a5c5b1 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -264,6 +264,7 @@ export const save = async (
     builtUser._rev = response.rev
 
     await eventHelpers.handleSaveEvents(builtUser, dbUser)
+    await addTenant(tenantId, _id, email)
     await cache.user.invalidateUser(response.id)
 
     // let server know to sync user

From 1ad2f46766a9b9cb4fe5e454ace37926e47dc685 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 09:25:55 +0000
Subject: [PATCH 037/273] v2.3.17-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 ed684ccd66..01e2e63d21 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1805a07a09..66cbecaaa2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.2",
+    "@budibase/types": "2.3.17-alpha.3",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 09c199d0f3..b5407ade15 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.3.17-alpha.2",
+  "version": "2.3.17-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.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-alpha.3",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 54fa2e6f7c..baee82d246 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.2",
-    "@budibase/client": "2.3.17-alpha.2",
-    "@budibase/frontend-core": "2.3.17-alpha.2",
-    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/bbui": "2.3.17-alpha.3",
+    "@budibase/client": "2.3.17-alpha.3",
+    "@budibase/frontend-core": "2.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-alpha.3",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 610d617a0e..61a05b728a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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.3.17-alpha.2",
-    "@budibase/string-templates": "2.3.17-alpha.2",
-    "@budibase/types": "2.3.17-alpha.2",
+    "@budibase/backend-core": "2.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-alpha.3",
+    "@budibase/types": "2.3.17-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 65dbb25abf..69dec984d2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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.3.17-alpha.2",
-    "@budibase/frontend-core": "2.3.17-alpha.2",
-    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/bbui": "2.3.17-alpha.3",
+    "@budibase/frontend-core": "2.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-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 89dd18fc02..53ad0ec7bf 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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.3.17-alpha.2",
+    "@budibase/bbui": "2.3.17-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 828fb83423..1514665bc1 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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 eb543ac488..38d78d61f6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.2",
-    "@budibase/client": "2.3.17-alpha.2",
+    "@budibase/backend-core": "2.3.17-alpha.3",
+    "@budibase/client": "2.3.17-alpha.3",
     "@budibase/pro": "2.3.17-alpha.2",
-    "@budibase/string-templates": "2.3.17-alpha.2",
-    "@budibase/types": "2.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-alpha.3",
+    "@budibase/types": "2.3.17-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 10976112d9..6bd73b6587 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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 0c7f4e6b2b..97fe50d854 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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 5aa6982372..1d960cb970 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.2",
+  "version": "2.3.17-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.3.17-alpha.2",
+    "@budibase/backend-core": "2.3.17-alpha.3",
     "@budibase/pro": "2.3.17-alpha.2",
-    "@budibase/string-templates": "2.3.17-alpha.2",
-    "@budibase/types": "2.3.17-alpha.2",
+    "@budibase/string-templates": "2.3.17-alpha.3",
+    "@budibase/types": "2.3.17-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0e0c3d9067a1a593708635604ea5373ef19f6ba4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 09:30:40 +0000
Subject: [PATCH 038/273] Update pro version to 2.3.17-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 38d78d61f6..e197139aee 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.3",
     "@budibase/client": "2.3.17-alpha.3",
-    "@budibase/pro": "2.3.17-alpha.2",
+    "@budibase/pro": "2.3.17-alpha.3",
     "@budibase/string-templates": "2.3.17-alpha.3",
     "@budibase/types": "2.3.17-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index a850816b1b..d244837785 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.2.tgz#f8c7f06ee63e59149590143867a721f3ea2d3fb0"
-  integrity sha512-4IUilkKl1zBjVVe/cqSA+Wm8z7Dq+vNwVJxaxoSEEr0Vs+OaNi31LTO5ji4Vt5qinwmutvUorbP27tjrFuRauw==
+"@budibase/backend-core@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.3.tgz#9c30c40e0840931003ef696f7ea862c0fd1b5be4"
+  integrity sha512-dhMpC5ik/WxIxIqrX1tfeJbiCkvxtdIbHoMnbDhinDb9T+TA7IRbohalcCGhglvTC6zIi/5W7GYV7D/Uhwhf7w==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.2"
+    "@budibase/types" "2.3.17-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.2.tgz#e382819c0b3ef9ecfd660cd492bd9410a7dbe46a"
-  integrity sha512-AzoiLg1dQJD6MEka1eQLdYts0HG6ztVyrt7nl1xVNyFSg++rBrZ51kNulv32104ASOQ0TJfULvbZf13POkCxdQ==
+"@budibase/pro@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.3.tgz#4b0a5a083baefdc93548d0fd177e36430ecd69f6"
+  integrity sha512-X9KcDXN82rveXgjvnLfWL06bQyDHICAqSb4EtSgmVElNxyfVKKznPoEPKYt3WlMTx7rlVaSEjvTna1Jb5pcuMA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.2"
-    "@budibase/types" "2.3.17-alpha.2"
+    "@budibase/backend-core" "2.3.17-alpha.3"
+    "@budibase/types" "2.3.17-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.2.tgz#9b0d13b7a20951003ef84a99fbcb2650d7a9e5cc"
-  integrity sha512-VEECoGPuAY2ajgDcsUTzvaWZlWVwzprK58WnhnZdnhGLqtB4Fd6eGjGPecWA4l4RWEmg5FMy66M5mHAUC0KG7w==
+"@budibase/types@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.3.tgz#f490add0d9fc560177d429d1a1236dce16ded7fd"
+  integrity sha512-O1f5sBax377fpEMxkQYaeWp2odMUNIqxfl8aKE0XkczmfRpigjDrn27dOv+Uqlf/Qke0I8FA608yhV6fk3idTQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1d960cb970..7de217fdd6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.3",
-    "@budibase/pro": "2.3.17-alpha.2",
+    "@budibase/pro": "2.3.17-alpha.3",
     "@budibase/string-templates": "2.3.17-alpha.3",
     "@budibase/types": "2.3.17-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 766b5337f2..bc48f2cf5d 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.2.tgz#f8c7f06ee63e59149590143867a721f3ea2d3fb0"
-  integrity sha512-4IUilkKl1zBjVVe/cqSA+Wm8z7Dq+vNwVJxaxoSEEr0Vs+OaNi31LTO5ji4Vt5qinwmutvUorbP27tjrFuRauw==
+"@budibase/backend-core@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.3.tgz#9c30c40e0840931003ef696f7ea862c0fd1b5be4"
+  integrity sha512-dhMpC5ik/WxIxIqrX1tfeJbiCkvxtdIbHoMnbDhinDb9T+TA7IRbohalcCGhglvTC6zIi/5W7GYV7D/Uhwhf7w==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.2"
+    "@budibase/types" "2.3.17-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.2.tgz#e382819c0b3ef9ecfd660cd492bd9410a7dbe46a"
-  integrity sha512-AzoiLg1dQJD6MEka1eQLdYts0HG6ztVyrt7nl1xVNyFSg++rBrZ51kNulv32104ASOQ0TJfULvbZf13POkCxdQ==
+"@budibase/pro@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.3.tgz#4b0a5a083baefdc93548d0fd177e36430ecd69f6"
+  integrity sha512-X9KcDXN82rveXgjvnLfWL06bQyDHICAqSb4EtSgmVElNxyfVKKznPoEPKYt3WlMTx7rlVaSEjvTna1Jb5pcuMA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.2"
-    "@budibase/types" "2.3.17-alpha.2"
+    "@budibase/backend-core" "2.3.17-alpha.3"
+    "@budibase/types" "2.3.17-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.2":
-  version "2.3.17-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.2.tgz#9b0d13b7a20951003ef84a99fbcb2650d7a9e5cc"
-  integrity sha512-VEECoGPuAY2ajgDcsUTzvaWZlWVwzprK58WnhnZdnhGLqtB4Fd6eGjGPecWA4l4RWEmg5FMy66M5mHAUC0KG7w==
+"@budibase/types@2.3.17-alpha.3":
+  version "2.3.17-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.3.tgz#f490add0d9fc560177d429d1a1236dce16ded7fd"
+  integrity sha512-O1f5sBax377fpEMxkQYaeWp2odMUNIqxfl8aKE0XkczmfRpigjDrn27dOv+Uqlf/Qke0I8FA608yhV6fk3idTQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 8289da3f19395df9d65c52a6f391a0542192e3ad Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Fri, 17 Feb 2023 14:49:35 +0000
Subject: [PATCH 039/273] Add Fetch Row Button Action (#9653)

* Add Fetch Row Button Action

* PR feedback
---
 .../actions/FetchRow.svelte                   | 40 +++++++++++++++++++
 .../ButtonActionEditor/actions/index.js       |  1 +
 .../controls/ButtonActionEditor/manifest.json | 13 +++++-
 packages/client/src/utils/buttonActions.js    | 15 +++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
new file mode 100644
index 0000000000..fb8b8c3f90
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
@@ -0,0 +1,40 @@
+<script>
+  import { Select, Label } from "@budibase/bbui"
+  import { tables } from "stores/backend"
+  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+
+  export let parameters
+  export let bindings = []
+
+  $: tableOptions = $tables.list || []
+</script>
+
+<div class="root">
+  <Label>Table</Label>
+  <Select
+    bind:value={parameters.tableId}
+    options={tableOptions}
+    getOptionLabel={table => table.name}
+    getOptionValue={table => table._id}
+  />
+
+  <Label small>Row ID</Label>
+  <DrawerBindableInput
+    {bindings}
+    title="Row ID to Fetch"
+    value={parameters.rowId}
+    on:change={value => (parameters.rowId = value.detail)}
+  />
+</div>
+
+<style>
+  .root {
+    display: grid;
+    column-gap: var(--spacing-l);
+    row-gap: var(--spacing-s);
+    grid-template-columns: 60px 1fr;
+    align-items: center;
+    max-width: 800px;
+    margin: 0 auto;
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
index 90ce1607e4..eee7f5b757 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
@@ -1,3 +1,4 @@
+export { default as FetchRow } from "./FetchRow.svelte"
 export { default as NavigateTo } from "./NavigateTo.svelte"
 export { default as SaveRow } from "./SaveRow.svelte"
 export { default as DeleteRow } from "./DeleteRow.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
index 7497990304..97ac9aa0b6 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
@@ -27,6 +27,17 @@
       "type": "data",
       "component": "DeleteRow"
     },
+    {
+      "name": "Fetch Row",
+      "type": "data",
+      "component": "FetchRow",
+      "context": [
+        {
+          "label": "Fetched row",
+          "value": "row"
+        }
+      ]
+    },
     {
       "name": "Navigate To",
       "type": "application",
@@ -135,4 +146,4 @@
       "dependsOnFeature": "sidePanel"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 06bc6f356a..55bd4d987d 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -87,6 +87,20 @@ const duplicateRowHandler = async (action, context) => {
   }
 }
 
+const fetchRowHandler = async action => {
+  const { tableId, rowId } = action.parameters
+
+  if (tableId && rowId) {
+    try {
+      const row = await API.fetchRow({ tableId, rowId })
+
+      return { row }
+    } catch (error) {
+      return false
+    }
+  }
+}
+
 const deleteRowHandler = async action => {
   const { tableId, revId, rowId, notificationOverride } = action.parameters
   if (tableId && rowId) {
@@ -341,6 +355,7 @@ const CloseSidePanelHandler = () => {
 }
 
 const handlerMap = {
+  ["Fetch Row"]: fetchRowHandler,
   ["Save Row"]: saveRowHandler,
   ["Duplicate Row"]: duplicateRowHandler,
   ["Delete Row"]: deleteRowHandler,

From 22f8becb4d12430d9b6492ac60f56bb0d10a71e3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 14:56:34 +0000
Subject: [PATCH 040/273] v2.3.17-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 01e2e63d21..dda0b8dfc8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 66cbecaaa2..ff05f371bc 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-alpha.4",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.3",
+    "@budibase/types": "2.3.17-alpha.4",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b5407ade15..bf2782d843 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.3.17-alpha.3",
+  "version": "2.3.17-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.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-alpha.4",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index baee82d246..049b8d2a9f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.3",
-    "@budibase/client": "2.3.17-alpha.3",
-    "@budibase/frontend-core": "2.3.17-alpha.3",
-    "@budibase/string-templates": "2.3.17-alpha.3",
+    "@budibase/bbui": "2.3.17-alpha.4",
+    "@budibase/client": "2.3.17-alpha.4",
+    "@budibase/frontend-core": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-alpha.4",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 61a05b728a..1d92be8c84 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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.3.17-alpha.3",
-    "@budibase/string-templates": "2.3.17-alpha.3",
-    "@budibase/types": "2.3.17-alpha.3",
+    "@budibase/backend-core": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/types": "2.3.17-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 69dec984d2..b40f27f287 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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.3.17-alpha.3",
-    "@budibase/frontend-core": "2.3.17-alpha.3",
-    "@budibase/string-templates": "2.3.17-alpha.3",
+    "@budibase/bbui": "2.3.17-alpha.4",
+    "@budibase/frontend-core": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-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 53ad0ec7bf..c4222bd0e3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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.3.17-alpha.3",
+    "@budibase/bbui": "2.3.17-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 1514665bc1..bd6fa2a9d4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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 e197139aee..e18957a341 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.3",
-    "@budibase/client": "2.3.17-alpha.3",
+    "@budibase/backend-core": "2.3.17-alpha.4",
+    "@budibase/client": "2.3.17-alpha.4",
     "@budibase/pro": "2.3.17-alpha.3",
-    "@budibase/string-templates": "2.3.17-alpha.3",
-    "@budibase/types": "2.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/types": "2.3.17-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 6bd73b6587..fad3b4d59f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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 97fe50d854..a5441b58a2 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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 7de217fdd6..3630eb8cee 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.3",
+  "version": "2.3.17-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.3.17-alpha.3",
+    "@budibase/backend-core": "2.3.17-alpha.4",
     "@budibase/pro": "2.3.17-alpha.3",
-    "@budibase/string-templates": "2.3.17-alpha.3",
-    "@budibase/types": "2.3.17-alpha.3",
+    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/types": "2.3.17-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 7caeb2b09f09d8b9dfedaf23336086a194e93126 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 17 Feb 2023 15:00:44 +0000
Subject: [PATCH 041/273] Update pro version to 2.3.17-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 e18957a341..41edff055c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.4",
     "@budibase/client": "2.3.17-alpha.4",
-    "@budibase/pro": "2.3.17-alpha.3",
+    "@budibase/pro": "2.3.17-alpha.4",
     "@budibase/string-templates": "2.3.17-alpha.4",
     "@budibase/types": "2.3.17-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index d244837785..e6ca08aa71 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.3.tgz#9c30c40e0840931003ef696f7ea862c0fd1b5be4"
-  integrity sha512-dhMpC5ik/WxIxIqrX1tfeJbiCkvxtdIbHoMnbDhinDb9T+TA7IRbohalcCGhglvTC6zIi/5W7GYV7D/Uhwhf7w==
+"@budibase/backend-core@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.4.tgz#efe13cc2eb9a02223cff46228af8370a5a91db11"
+  integrity sha512-h9aCz+5uAQOvQiimULShKkXdQgyiwvgcxq3wqEvNHsAxmlslaJJouStWhvxBdsFiOW9K2CyI/8PeUBBRlAU0AQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.3"
+    "@budibase/types" "2.3.17-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.3.tgz#4b0a5a083baefdc93548d0fd177e36430ecd69f6"
-  integrity sha512-X9KcDXN82rveXgjvnLfWL06bQyDHICAqSb4EtSgmVElNxyfVKKznPoEPKYt3WlMTx7rlVaSEjvTna1Jb5pcuMA==
+"@budibase/pro@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.4.tgz#56e945bd960eca8c8b2a04a3dd606df392bf5792"
+  integrity sha512-DJtKCc5/XXAnrvI5sS+joVuDYOLgwFmDYwLbssJgSQzGXNqepN/ikGq6eFCKn/99fRYBGREfwXwAlxXveZxPWA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.3"
-    "@budibase/types" "2.3.17-alpha.3"
+    "@budibase/backend-core" "2.3.17-alpha.4"
+    "@budibase/types" "2.3.17-alpha.4"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.3.tgz#f490add0d9fc560177d429d1a1236dce16ded7fd"
-  integrity sha512-O1f5sBax377fpEMxkQYaeWp2odMUNIqxfl8aKE0XkczmfRpigjDrn27dOv+Uqlf/Qke0I8FA608yhV6fk3idTQ==
+"@budibase/types@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.4.tgz#63eb756160da7ace5459e303874f5e67425c6988"
+  integrity sha512-us/gGZPHimHsYNAnJ5yGdxeThT065wofJ2sfg0aD81P8nq3F2mevBoUmci/KRYdrQ9EsgpZ3Ou6CqnhnV8WmfA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3630eb8cee..68eab1c134 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.4",
-    "@budibase/pro": "2.3.17-alpha.3",
+    "@budibase/pro": "2.3.17-alpha.4",
     "@budibase/string-templates": "2.3.17-alpha.4",
     "@budibase/types": "2.3.17-alpha.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index bc48f2cf5d..8ab3be9c30 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.3.tgz#9c30c40e0840931003ef696f7ea862c0fd1b5be4"
-  integrity sha512-dhMpC5ik/WxIxIqrX1tfeJbiCkvxtdIbHoMnbDhinDb9T+TA7IRbohalcCGhglvTC6zIi/5W7GYV7D/Uhwhf7w==
+"@budibase/backend-core@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.4.tgz#efe13cc2eb9a02223cff46228af8370a5a91db11"
+  integrity sha512-h9aCz+5uAQOvQiimULShKkXdQgyiwvgcxq3wqEvNHsAxmlslaJJouStWhvxBdsFiOW9K2CyI/8PeUBBRlAU0AQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.3"
+    "@budibase/types" "2.3.17-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.3.tgz#4b0a5a083baefdc93548d0fd177e36430ecd69f6"
-  integrity sha512-X9KcDXN82rveXgjvnLfWL06bQyDHICAqSb4EtSgmVElNxyfVKKznPoEPKYt3WlMTx7rlVaSEjvTna1Jb5pcuMA==
+"@budibase/pro@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.4.tgz#56e945bd960eca8c8b2a04a3dd606df392bf5792"
+  integrity sha512-DJtKCc5/XXAnrvI5sS+joVuDYOLgwFmDYwLbssJgSQzGXNqepN/ikGq6eFCKn/99fRYBGREfwXwAlxXveZxPWA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.3"
-    "@budibase/types" "2.3.17-alpha.3"
+    "@budibase/backend-core" "2.3.17-alpha.4"
+    "@budibase/types" "2.3.17-alpha.4"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.3":
-  version "2.3.17-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.3.tgz#f490add0d9fc560177d429d1a1236dce16ded7fd"
-  integrity sha512-O1f5sBax377fpEMxkQYaeWp2odMUNIqxfl8aKE0XkczmfRpigjDrn27dOv+Uqlf/Qke0I8FA608yhV6fk3idTQ==
+"@budibase/types@2.3.17-alpha.4":
+  version "2.3.17-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.4.tgz#63eb756160da7ace5459e303874f5e67425c6988"
+  integrity sha512-us/gGZPHimHsYNAnJ5yGdxeThT065wofJ2sfg0aD81P8nq3F2mevBoUmci/KRYdrQ9EsgpZ3Ou6CqnhnV8WmfA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 6ec5e97ce936733466a7953477509557a223af71 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 17 Feb 2023 16:26:55 +0000
Subject: [PATCH 042/273] Required work to support the new lucene audit logs
 search indexing.

---
 packages/backend-core/src/constants/db.ts     |   5 +
 packages/backend-core/src/constants/misc.ts   |   1 +
 .../backend-core/src/context/mainContext.ts   |  12 +-
 packages/backend-core/src/db/lucene.ts        |  39 ++-
 .../src/api/controllers/row/internalSearch.ts |  10 +-
 packages/server/src/db/utils.ts               |   4 -
 packages/server/src/db/views/staticViews.ts   |   6 +-
 packages/types/src/sdk/events/event.ts        | 222 ++++++++++++------
 scripts/link-dependencies.sh                  |   3 +
 9 files changed, 211 insertions(+), 91 deletions(-)

diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index d41098c405..19f493fd8e 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -24,6 +24,11 @@ export enum ViewName {
   APP_BACKUP_BY_TRIGGER = "by_trigger",
 }
 
+export const SearchIndexes = {
+  ROWS: "rows",
+  AUDIT: "audit",
+}
+
 export const DeprecatedViews = {
   [ViewName.USER_BY_EMAIL]: [
     // removed due to inaccuracy in view doc filter logic
diff --git a/packages/backend-core/src/constants/misc.ts b/packages/backend-core/src/constants/misc.ts
index 0bf3df4094..e25c90575f 100644
--- a/packages/backend-core/src/constants/misc.ts
+++ b/packages/backend-core/src/constants/misc.ts
@@ -41,5 +41,6 @@ export enum Config {
   OIDC_LOGOS = "logos_oidc",
 }
 
+export const MIN_VALID_DATE = new Date(-2147483647000)
 export const MAX_VALID_DATE = new Date(2147483647000)
 export const DEFAULT_TENANT_ID = "default"
diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 1f14a20778..14b7547ea9 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -34,17 +34,19 @@ export function getAuditLogDBName(tenantId?: string) {
   if (!tenantId) {
     tenantId = getTenantId()
   }
-  return `${tenantId}${SEPARATOR}${StaticDatabases.AUDIT_LOGS.name}`
+  if (tenantId === DEFAULT_TENANT_ID) {
+    return StaticDatabases.AUDIT_LOGS.name
+  } else {
+    return `${tenantId}${SEPARATOR}${StaticDatabases.AUDIT_LOGS.name}`
+  }
 }
 
 export function baseGlobalDBName(tenantId: string | undefined | null) {
-  let dbName
   if (!tenantId || tenantId === DEFAULT_TENANT_ID) {
-    dbName = StaticDatabases.GLOBAL.name
+    return StaticDatabases.GLOBAL.name
   } else {
-    dbName = `${tenantId}${SEPARATOR}${StaticDatabases.GLOBAL.name}`
+    return `${tenantId}${SEPARATOR}${StaticDatabases.GLOBAL.name}`
   }
-  return dbName
 }
 
 export function isMultiTenant() {
diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
index 028750797f..374e30a10d 100644
--- a/packages/backend-core/src/db/lucene.ts
+++ b/packages/backend-core/src/db/lucene.ts
@@ -41,6 +41,8 @@ export class QueryBuilder {
   sortType: string
   includeDocs: boolean
   version?: string
+  indexBuilder?: () => Promise<any>
+  noEscaping = false
 
   constructor(dbName: string, index: string, base?: SearchFilters) {
     this.dbName = dbName
@@ -66,6 +68,14 @@ export class QueryBuilder {
     this.includeDocs = true
   }
 
+  disableEscaping() {
+    this.noEscaping = true
+  }
+
+  setIndexBuilder(builderFn: () => Promise<any>) {
+    this.indexBuilder = builderFn
+  }
+
   setVersion(version?: string) {
     if (version != null) {
       this.version = version
@@ -176,6 +186,14 @@ export class QueryBuilder {
     return this
   }
 
+  handleSpaces(input: string) {
+    if (this.noEscaping) {
+      return input
+    } else {
+      return input.replace(/ /g, "_")
+    }
+  }
+
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -192,7 +210,7 @@ export class QueryBuilder {
       value = value.toLowerCase ? value.toLowerCase() : value
     }
     // Escape characters
-    if (escape && originalType === "string") {
+    if (!this.noEscaping && escape && originalType === "string") {
       value = `${value}`.replace(/[ #+\-&|!(){}\]^"~*?:\\]/g, "\\$&")
     }
 
@@ -272,7 +290,7 @@ export class QueryBuilder {
       for (let [key, value] of Object.entries(structure)) {
         // check for new format - remove numbering if needed
         key = removeKeyNumbering(key)
-        key = builder.preprocess(key.replace(/ /g, "_"), {
+        key = builder.preprocess(builder.handleSpaces(key), {
           escape: true,
         })
         const expression = queryFn(key, value)
@@ -379,7 +397,7 @@ export class QueryBuilder {
     if (this.sort) {
       const order = this.sortOrder === "descending" ? "-" : ""
       const type = `<${this.sortType}>`
-      body.sort = `${order}${this.sort.replace(/ /g, "_")}${type}`
+      body.sort = `${order}${this.handleSpaces(this.sort)}${type}`
     }
     return body
   }
@@ -388,7 +406,16 @@ export class QueryBuilder {
     const { url, cookie } = dbCore.getCouchInfo()
     const fullPath = `${url}/${this.dbName}/_design/database/_search/${this.index}`
     const body = this.buildSearchBody()
-    return await runQuery(fullPath, body, cookie)
+    try {
+      return await runQuery(fullPath, body, cookie)
+    } catch (err: any) {
+      if (err.status === 404 && this.indexBuilder) {
+        await this.indexBuilder()
+        return await runQuery(fullPath, body, cookie)
+      } else {
+        throw err
+      }
+    }
   }
 }
 
@@ -407,6 +434,10 @@ const runQuery = async (url: string, body: any, cookie: string) => {
       Authorization: cookie,
     },
   })
+
+  if (response.status === 404) {
+    throw response
+  }
   const json = await response.json()
 
   let output: any = {
diff --git a/packages/server/src/api/controllers/row/internalSearch.ts b/packages/server/src/api/controllers/row/internalSearch.ts
index a250fe0429..f2abc91b14 100644
--- a/packages/server/src/api/controllers/row/internalSearch.ts
+++ b/packages/server/src/api/controllers/row/internalSearch.ts
@@ -1,4 +1,3 @@
-import { SearchIndexes } from "../../../db/utils"
 import { db as dbCore, context, SearchParams } from "@budibase/backend-core"
 import { SearchFilters } from "@budibase/types"
 
@@ -7,10 +6,15 @@ export async function paginatedSearch(
   params: SearchParams
 ) {
   const appId = context.getAppId()
-  return dbCore.paginatedSearch(appId!, SearchIndexes.ROWS, query, params)
+  return dbCore.paginatedSearch(
+    appId!,
+    dbCore.SearchIndexes.ROWS,
+    query,
+    params
+  )
 }
 
 export async function fullSearch(query: SearchFilters, params: SearchParams) {
   const appId = context.getAppId()
-  return dbCore.fullSearch(appId!, SearchIndexes.ROWS, query, params)
+  return dbCore.fullSearch(appId!, dbCore.SearchIndexes.ROWS, query, params)
 }
diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts
index ac5a6162b9..50341e4abc 100644
--- a/packages/server/src/db/utils.ts
+++ b/packages/server/src/db/utils.ts
@@ -9,10 +9,6 @@ export const AppStatus = {
   DEPLOYED: "published",
 }
 
-export const SearchIndexes = {
-  ROWS: "rows",
-}
-
 export const BudibaseInternalDB = {
   _id: "bb_internal",
   type: dbCore.BUDIBASE_DATASOURCE_TYPE,
diff --git a/packages/server/src/db/views/staticViews.ts b/packages/server/src/db/views/staticViews.ts
index 4bccfebeee..674dd20ec7 100644
--- a/packages/server/src/db/views/staticViews.ts
+++ b/packages/server/src/db/views/staticViews.ts
@@ -1,5 +1,5 @@
-import { context } from "@budibase/backend-core"
-import { DocumentType, SEPARATOR, ViewName, SearchIndexes } from "../utils"
+import { context, db as dbCore } from "@budibase/backend-core"
+import { DocumentType, SEPARATOR, ViewName } from "../utils"
 import { LinkDocument, Row } from "@budibase/types"
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
 
@@ -91,7 +91,7 @@ async function searchIndex(indexName: string, fnString: string) {
 
 export async function createAllSearchIndex() {
   await searchIndex(
-    SearchIndexes.ROWS,
+    dbCore.SearchIndexes.ROWS,
     function (doc: Row) {
       function idx(input: Row, prev?: string) {
         for (let key of Object.keys(input)) {
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index f7a2051dfc..4fb3e873ae 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -182,102 +182,180 @@ export enum Event {
   ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened",
 }
 
-export class AuditedEventFriendlyName {
+// all events that are not audited have been added to this record as undefined, this means
+// that Typescript can protect us against new events being added and auditing of those
+// events not being considered. This might be a little ugly, but provides a level of
+// Typescript build protection for the audit log feature, any new event also needs to be
+// added to this map, during which the developer will need to consider if it should be
+// a user facing event or not.
+export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   // USER
-  static USER_CREATED = "User {{ email }} created"
-  static USER_UPDATED = "User {{ email }} updated"
-  static USER_DELETED = "User {{ email }} deleted"
-  static USER_PERMISSION_ADMIN_ASSIGNED = "User {{ email }} admin role assigned"
-  static USER_PERMISSION_ADMIN_REMOVED = "User {{ email }} admin role removed"
-  static USER_PERMISSION_BUILDER_ASSIGNED =
-    "User {{ email }} builder role assigned"
-  static USER_PERMISSION_BUILDER_REMOVED =
-    "User {{ email }} builder role removed"
-  static USER_INVITED = "User {{ email }} invited"
-  static USER_INVITED_ACCEPTED = "User {{ email }} accepted invite"
-  static USER_PASSWORD_UPDATED = "User {{ email }} password updated"
-  static USER_PASSWORD_RESET_REQUESTED =
-    "User {{ email }} password reset requested"
-  static USER_PASSWORD_RESET = "User {{ email }} password reset"
-  static USER_GROUP_CREATED = "User group {{ name }} created"
-  static USER_GROUP_UPDATED = "User group {{ name }} updated"
-  static USER_GROUP_DELETED = "User group {{ name }} deleted"
-  static USER_GROUP_USERS_ADDED =
-    "User group {{ name }} {{ count }} users added"
-  static USER_GROUP_USERS_REMOVED =
-    "User group {{ name }} {{ count }} users removed"
-  static USER_GROUP_PERMISSIONS_EDITED =
-    "User group {{ name }} permissions edited"
+  [Event.USER_CREATED]: `User "{{ email }}" created`,
+  [Event.USER_UPDATED]: `User "{{ email }}" updated`,
+  [Event.USER_DELETED]: `User "{{ email }}" deleted`,
+  [Event.USER_PERMISSION_ADMIN_ASSIGNED]: `User "{{ email }}" admin role assigned`,
+  [Event.USER_PERMISSION_ADMIN_REMOVED]: `User "{{ email }}" admin role removed`,
+  [Event.USER_PERMISSION_BUILDER_ASSIGNED]: `User "{{ email }}" builder role assigned`,
+  [Event.USER_PERMISSION_BUILDER_REMOVED]: `User "{{ email }}" builder role removed`,
+  [Event.USER_INVITED]: `User "{{ email }} invited`,
+  [Event.USER_INVITED_ACCEPTED]: `User "{{ email }}" accepted invite`,
+  [Event.USER_PASSWORD_UPDATED]: `User "{{ email }}" password updated`,
+  [Event.USER_PASSWORD_RESET_REQUESTED]: `User "{{ email }}" password reset requested`,
+  [Event.USER_PASSWORD_RESET]: `User "{{ email }}" password reset`,
+  [Event.USER_GROUP_CREATED]: `User group "{{ name }}" created`,
+  [Event.USER_GROUP_UPDATED]: `User group "{{ name }}" updated`,
+  [Event.USER_GROUP_DELETED]: `User group "{{ name }}" deleted`,
+  [Event.USER_GROUP_USERS_ADDED]: `User group "{{ name }}" {{ count }} users added`,
+  [Event.USER_GROUP_USERS_REMOVED]: `User group "{{ name }}" {{ count }} users removed`,
+  [Event.USER_GROUP_PERMISSIONS_EDITED]: `User group "{{ name }}" permissions edited`,
+  [Event.USER_PASSWORD_FORCE_RESET]: undefined,
+  [Event.USER_GROUP_ONBOARDING]: undefined,
+  [Event.USER_ONBOARDING_COMPLETE]: undefined,
 
   // EMAIL
-  static EMAIL_SMTP_CREATED = "Email configuration created"
-  static EMAIL_SMTP_UPDATED = "Email configuration updated"
+  [Event.EMAIL_SMTP_CREATED]: `Email configuration created`,
+  [Event.EMAIL_SMTP_UPDATED]: `Email configuration updated`,
 
   // AUTH
-  static AUTH_SSO_CREATED = "SSO configuration created"
-  static AUTH_SSO_UPDATED = "SSO configuration updated"
-  static AUTH_SSO_ACTIVATED = "SSO configuration activated"
-  static AUTH_SSO_DEACTIVATED = "SSO configuration deactivated"
-  static AUTH_LOGIN = "User {{ email }} logged in"
-  static AUTH_LOGOUT = "User {{ email }} logged out"
+  [Event.AUTH_SSO_CREATED]: `SSO configuration created`,
+  [Event.AUTH_SSO_UPDATED]: `SSO configuration updated`,
+  [Event.AUTH_SSO_ACTIVATED]: `SSO configuration activated`,
+  [Event.AUTH_SSO_DEACTIVATED]: `SSO configuration deactivated`,
+  [Event.AUTH_LOGIN]: `User "{{ email }}" logged in`,
+  [Event.AUTH_LOGOUT]: `User "{{ email }}" logged out`,
 
   // ORG
-  static ORG_NAME_UPDATED = "Organisation name updated"
-  static ORG_LOGO_UPDATED = "Organisation logo updated"
-  static ORG_PLATFORM_URL_UPDATED = "Organisation platform URL updated"
+  [Event.ORG_NAME_UPDATED]: `Organisation name updated`,
+  [Event.ORG_LOGO_UPDATED]: `Organisation logo updated`,
+  [Event.ORG_PLATFORM_URL_UPDATED]: `Organisation platform URL updated`,
 
   // APP
-  static APP_CREATED = "App {{ name }} created"
-  static APP_UPDATED = "App {{ name }} updated"
-  static APP_DELETED = "App {{ name }} deleted"
-  static APP_PUBLISHED = "App {{ name }} published"
-  static APP_UNPUBLISHED = "App {{ name }} unpublished"
-  static APP_TEMPLATE_IMPORTED = "App {{ name }} template imported"
-  static APP_FILE_IMPORTED = "App {{ name }} file imported"
-  static APP_VERSION_UPDATED = "App {{ name }} version updated"
-  static APP_VERSION_REVERTED = "App {{ name }} version reverted"
-  static APP_REVERTED = "App {{ name }} reverted"
-  static APP_EXPORTED = "App {{ name }} exported"
-  static APP_BACKUP_RESTORED = "App backup {{ name }} restored"
-  static APP_BACKUP_TRIGGERED = "App backup {{ name }} triggered"
+  [Event.APP_CREATED]: `App "{{ name }}" created`,
+  [Event.APP_UPDATED]: `App "{{ name }}" updated`,
+  [Event.APP_DELETED]: `App "{{ name }}" deleted`,
+  [Event.APP_PUBLISHED]: `App "{{ name }}" published`,
+  [Event.APP_UNPUBLISHED]: `App "{{ name }}" unpublished`,
+  [Event.APP_TEMPLATE_IMPORTED]: `App "{{ name }}" template imported`,
+  [Event.APP_FILE_IMPORTED]: `App "{{ name }}" file imported`,
+  [Event.APP_VERSION_UPDATED]: `App "{{ name }}" version updated`,
+  [Event.APP_VERSION_REVERTED]: `App "{{ name }}" version reverted`,
+  [Event.APP_REVERTED]: `App "{{ name }}" reverted`,
+  [Event.APP_EXPORTED]: `App "{{ name }}" exported`,
+  [Event.APP_BACKUP_RESTORED]: `App backup "{{ name }}" restored`,
+  [Event.APP_BACKUP_TRIGGERED]: `App backup "{{ name }}" triggered`,
 
   // DATASOURCE
-  static DATASOURCE_CREATED = "Datasource created"
-  static DATASOURCE_UPDATED = "Datasource updated"
-  static DATASOURCE_DELETED = "Datasource deleted"
+  [Event.DATASOURCE_CREATED]: `Datasource created`,
+  [Event.DATASOURCE_UPDATED]: `Datasource updated`,
+  [Event.DATASOURCE_DELETED]: `Datasource deleted`,
 
   // QUERY
-  static QUERY_CREATED = "Query created"
-  static QUERY_UPDATED = "Query updated"
-  static QUERY_DELETED = "Query deleted"
-  static QUERY_IMPORT = "Query import"
+  [Event.QUERY_CREATED]: `Query created`,
+  [Event.QUERY_UPDATED]: `Query updated`,
+  [Event.QUERY_DELETED]: `Query deleted`,
+  [Event.QUERY_IMPORT]: `Query import`,
+  [Event.QUERIES_RUN]: undefined,
+  [Event.QUERY_PREVIEWED]: undefined,
 
   // TABLE
-  static TABLE_CREATED = "Table created"
-  static TABLE_UPDATED = "Table updated"
-  static TABLE_DELETED = "Table deleted"
-  static TABLE_EXPORTED = "Table exported"
-  static TABLE_IMPORTED = "Table imported"
-  static TABLE_DATA_IMPORTED = "Data imported to table"
+  [Event.TABLE_CREATED]: `Table created`,
+  [Event.TABLE_UPDATED]: `Table updated`,
+  [Event.TABLE_DELETED]: `Table deleted`,
+  [Event.TABLE_EXPORTED]: `Table exported`,
+  [Event.TABLE_IMPORTED]: `Table imported`,
+  [Event.TABLE_DATA_IMPORTED]: `Data imported to table`,
 
   // ROWS
-  static ROWS_CREATED = "Rows created"
-  static ROWS_IMPORTED = "Rows imported"
+  [Event.ROWS_CREATED]: `Rows created`,
+  [Event.ROWS_IMPORTED]: `Rows imported`,
 
   // AUTOMATION
-  static AUTOMATION_CREATED = "Automation created"
-  static AUTOMATION_DELETED = "Automation deleted"
+  [Event.AUTOMATION_CREATED]: `Automation created`,
+  [Event.AUTOMATION_DELETED]: `Automation deleted`,
+  [Event.AUTOMATION_TESTED]: undefined,
+  [Event.AUTOMATIONS_RUN]: undefined,
+  [Event.AUTOMATION_STEP_CREATED]: undefined,
+  [Event.AUTOMATION_STEP_DELETED]: undefined,
+  [Event.AUTOMATION_TRIGGER_UPDATED]: undefined,
 
   // SCREEN
-  static SCREEN_CREATED = "Screen created"
-  static SCREEN_DELETED = "Screen deleted"
+  [Event.SCREEN_CREATED]: `Screen created`,
+  [Event.SCREEN_DELETED]: `Screen deleted`,
 
   // COMPONENT
-  static COMPONENT_CREATED = "Component created"
-  static COMPONENT_DELETED = "Component deleted"
+  [Event.COMPONENT_CREATED]: `Component created`,
+  [Event.COMPONENT_DELETED]: `Component deleted`,
 
-  static ENVIRONMENT_VARIABLE_CREATED = "Environment variable created"
-  static ENVIRONMENT_VARIABLE_DELETED = "Environment variable deleted"
+  // ENVIRONMENT VARIABLE
+  [Event.ENVIRONMENT_VARIABLE_CREATED]: `Environment variable created`,
+  [Event.ENVIRONMENT_VARIABLE_DELETED]: `Environment variable deleted`,
+  [Event.ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED]: undefined,
+
+  // PLUGIN
+  [Event.PLUGIN_IMPORTED]: `Plugin imported`,
+  [Event.PLUGIN_DELETED]: `Plugin deleted`,
+  [Event.PLUGIN_INIT]: undefined,
+
+  // ROLE - NOT AUDITED
+  [Event.ROLE_CREATED]: undefined,
+  [Event.ROLE_UPDATED]: undefined,
+  [Event.ROLE_DELETED]: undefined,
+  [Event.ROLE_ASSIGNED]: undefined,
+  [Event.ROLE_UNASSIGNED]: undefined,
+
+  // LICENSE - NOT AUDITED
+  [Event.LICENSE_PLAN_CHANGED]: undefined,
+  [Event.LICENSE_TIER_CHANGED]: undefined,
+  [Event.LICENSE_ACTIVATED]: undefined,
+  [Event.LICENSE_PAYMENT_FAILED]: undefined,
+  [Event.LICENSE_PAYMENT_RECOVERED]: undefined,
+  [Event.LICENSE_CHECKOUT_OPENED]: undefined,
+  [Event.LICENSE_CHECKOUT_SUCCESS]: undefined,
+  [Event.LICENSE_PORTAL_OPENED]: undefined,
+
+  // ACCOUNT - NOT AUDITED
+  [Event.ACCOUNT_CREATED]: undefined,
+  [Event.ACCOUNT_DELETED]: undefined,
+  [Event.ACCOUNT_VERIFIED]: undefined,
+
+  // BACKFILL - NOT AUDITED
+  [Event.APP_BACKFILL_SUCCEEDED]: undefined,
+  [Event.APP_BACKFILL_FAILED]: undefined,
+  [Event.TENANT_BACKFILL_SUCCEEDED]: undefined,
+  [Event.TENANT_BACKFILL_FAILED]: undefined,
+  [Event.INSTALLATION_BACKFILL_SUCCEEDED]: undefined,
+  [Event.INSTALLATION_BACKFILL_FAILED]: undefined,
+
+  // LAYOUT - NOT AUDITED
+  [Event.LAYOUT_CREATED]: undefined,
+  [Event.LAYOUT_DELETED]: undefined,
+
+  // VIEW - NOT AUDITED
+  [Event.VIEW_CREATED]: undefined,
+  [Event.VIEW_UPDATED]: undefined,
+  [Event.VIEW_DELETED]: undefined,
+  [Event.VIEW_EXPORTED]: undefined,
+  [Event.VIEW_FILTER_CREATED]: undefined,
+  [Event.VIEW_FILTER_UPDATED]: undefined,
+  [Event.VIEW_FILTER_DELETED]: undefined,
+  [Event.VIEW_CALCULATION_CREATED]: undefined,
+  [Event.VIEW_CALCULATION_UPDATED]: undefined,
+  [Event.VIEW_CALCULATION_DELETED]: undefined,
+
+  // SERVED - NOT AUDITED
+  [Event.SERVED_BUILDER]: undefined,
+  [Event.SERVED_APP]: undefined,
+  [Event.SERVED_APP_PREVIEW]: undefined,
+
+  // ANALYTICS - NOT AUDITED
+  [Event.ANALYTICS_OPT_OUT]: undefined,
+  [Event.ANALYTICS_OPT_IN]: undefined,
+
+  // INSTALLATION - NOT AUDITED
+  [Event.INSTALLATION_VERSION_CHECKED]: undefined,
+  [Event.INSTALLATION_VERSION_UPGRADED]: undefined,
+  [Event.INSTALLATION_VERSION_DOWNGRADED]: undefined,
+  [Event.INSTALLATION_FIRST_STARTUP]: undefined,
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh
index d2a501162b..9926f3dd2b 100755
--- a/scripts/link-dependencies.sh
+++ b/scripts/link-dependencies.sh
@@ -44,6 +44,9 @@ if [ -d "../budibase-pro" ]; then
   echo "Linking types to pro"
   yarn link '@budibase/types'
 
+  echo "Linking string-templates to pro"
+  yarn link '@budibase/string-templates'
+
   cd ../../../budibase
 
   echo "Linking pro to worker"

From a1b47bbce375d734dcc2cb82d666f86e4e788703 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 17 Feb 2023 16:49:41 +0000
Subject: [PATCH 043/273] ensure table is pulling from search endpoint

---
 packages/bbui/src/Form/Core/Picker.svelte     |   1 -
 .../auditLogs/_components/TimeRenderer.svelte |  12 +
 .../auditLogs/_components/UserRenderer.svelte |   2 +-
 .../portal/account/auditLogs/index.svelte     | 213 ++++++++++++++----
 .../portal/settings/environment/index.svelte  |   1 -
 .../builder/src/stores/portal/auditLogs.js    |   2 +-
 packages/builder/src/stores/portal/index.js   |   1 +
 packages/frontend-core/src/api/auditLogs.js   |   6 +-
 8 files changed, 188 insertions(+), 50 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index acd3c5da61..fb0ce00824 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -32,7 +32,6 @@
   export let autocomplete = false
   export let sort = false
   export let fetchTerm = null
-  $: console.log(fieldText)
   const dispatch = createEventDispatcher()
 
   let searchTerm = null
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
new file mode 100644
index 0000000000..7ec044604e
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
@@ -0,0 +1,12 @@
+<script>
+  import dayjs from "dayjs"
+
+  export let row
+
+  import relativeTime from "dayjs/plugin/relativeTime"
+  dayjs.extend(relativeTime)
+</script>
+
+<div>
+  {dayjs(row.date).fromNow()}
+</div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 4baa24403e..c9a69b4316 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -3,4 +3,4 @@
   export let row
 </script>
 
-<Avatar size="M" initials={"PC"} />
+<Avatar size="M" initials={row.user[0]} />
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index a5d403491a..88f042d240 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -2,26 +2,28 @@
   import {
     Layout,
     Table,
-    Select,
     Search,
     Multiselect,
     notifications,
+    Icon,
+    clickOutside,
+    CoreTextArea,
+    DatePicker,
   } from "@budibase/bbui"
-  import { licensing, users, apps } from "stores/portal"
+  import { licensing, users, apps, auditLogs } from "stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
   import { createPaginationStore } from "helpers/pagination"
-  import { getContext, setContext } from "svelte"
-  import Portal from "svelte-portal"
+  import { setContext } from "svelte"
   import ViewDetailsRenderer from "./_components/ViewDetailsRenderer.svelte"
   import UserRenderer from "./_components/UserRenderer.svelte"
+  import TimeRenderer from "./_components/TimeRenderer.svelte"
 
-  const sidePanel = getContext("side-panel")
   const schema = {
-    name: {},
-    date: {},
-    user: { width: "auto" },
-    app: {},
-    event: {},
+    name: { width: "1fr" },
+    date: { width: "1.5fr" },
+    user: { width: "0.5fr" },
+    app: { width: "1fr" },
+    event: { width: "1fr" },
     view: { width: "auto", borderLeft: true, displayName: "" },
   }
 
@@ -34,18 +36,29 @@
       column: "user",
       component: UserRenderer,
     },
+    {
+      column: "date",
+      component: TimeRenderer,
+    },
   ]
 
-  let searchTerm = ""
-  let pageInfo = createPaginationStore()
-  let prevSearch = undefined
+  let userSearchTerm = ""
+  let logSearchTerm = ""
+  let userPageInfo = createPaginationStore()
+  let logsPageInfo = createPaginationStore()
+
+  let prevUserSearch = undefined
+  let prevLogSearch = undefined
   let selectedUsers = []
+  let selectedApps = []
   let selectedLog
+  let sidePanelVisible = false
+  let startDate, endDate
 
   let data = [
     {
       name: "User created",
-      date: "2021-03-01 12:00:00",
+      date: "2023-02-14T10:19:52.021Z",
       user: "Peter Clement",
       app: "School Admin Panel",
       event: "User added",
@@ -56,30 +69,61 @@
     },
   ]
 
-  $: fetchUsers(page, searchTerm)
-  $: page = $pageInfo.page
+  $: fetchUsers(userPage, userSearchTerm)
+  $: fetchLogs(logsPage, logSearchTerm)
+
+  $: userPage = $userPageInfo.page
+  $: logsPage = $logsPageInfo.page
+
   $: enrichedList = enrich($users.data || [], selectedUsers)
   $: sortedList = sort(enrichedList)
 
-  const fetchUsers = async (page, search) => {
-    if ($pageInfo.loading) {
+  const fetchUsers = async (userPage, search) => {
+    if ($userPageInfo.loading) {
       return
     }
     // need to remove the page if they've started searching
-    if (search && !prevSearch) {
-      pageInfo.reset()
-      page = undefined
+    if (search && !prevUserSearch) {
+      userPageInfo.reset()
+      userPage = undefined
     }
-    prevSearch = search
+    prevUserSearch = search
     try {
-      pageInfo.loading()
-      await users.search({ page, email: search })
-      pageInfo.fetched($users.hasNextPage, $users.nextPage)
+      userPageInfo.loading()
+      await users.search({ userPage, email: search })
+      userPageInfo.fetched($users.hasNextPage, $users.nextPage)
     } catch (error) {
       notifications.error("Error getting user list")
     }
   }
 
+  const fetchLogs = async (logsPage, search) => {
+    if ($logsPageInfo.loading) {
+      return
+    }
+    // need to remove the page if they've started searching
+    if (search && !prevLogSearch) {
+      logsPageInfo.reset()
+      logsPage = undefined
+    }
+    prevLogSearch = search
+    try {
+      logsPageInfo.loading()
+      await auditLogs.search({
+        logsPage,
+        startDate,
+        endDate,
+        metadataSearch: search,
+        userIds: selectedUsers,
+        appIds: selectedApps,
+      })
+      logsPageInfo.fetched($auditLogs.hasNextPage, $auditLogs.nextPage)
+    } catch (error) {
+      console.log(error)
+      notifications.error("Error getting audit logs")
+    }
+  }
+
   const enrich = (list, selected) => {
     return list.map(item => {
       return {
@@ -106,7 +150,21 @@
 
   const viewDetails = detail => {
     selectedLog = detail
-    sidePanel.open()
+    sidePanelVisible = true
+  }
+
+  const downloadLogs = async () => {
+    try {
+      await auditLogs.download({
+        startDate,
+        endDate,
+        metadataSearch: logSearchTerm,
+        userIds: selectedUsers,
+        appIds: selectedApps,
+      })
+    } catch (error) {
+      notifications.error(`Error downloading logs: ` + error.message)
+    }
   }
 
   setContext("auditLogs", {
@@ -123,14 +181,25 @@
     $licensing.goToUpgradePage()
   }}
 >
+  <div class="datepicker" />
+
   <div class="controls">
     <div class="search">
-      <div class="select">
-        <Select placeholder="All" label="Activity" />
+      <div>
+        <DatePicker
+          range={true}
+          label="Date Range"
+          on:change={e => {
+            if (e.detail[0].length > 1) {
+              startDate = e.detail[0][0].toISOString()
+              endDate = e.detail[0][1].toISOString()
+            }
+          }}
+        />
       </div>
       <div class="select">
         <Multiselect
-          bind:fetchTerm={searchTerm}
+          bind:fetchTerm={userSearchTerm}
           placeholder="All users"
           label="Users"
           autocomplete
@@ -147,13 +216,18 @@
           getOptionValue={app => app.appId}
           getOptionLabel={app => app.name}
           options={$apps}
+          bind:value={selectedApps}
         />
       </div>
       <div class="select">
         <Multiselect placeholder="All events" label="Event" />
       </div>
     </div>
-    <div style="width: 200px;">
+    <div style="padding-bottom: var(--spacing-s)">
+      <Icon on:click={() => downloadLogs()} name="Download" />
+    </div>
+
+    <div style="max-width: 150px; ">
       <Search placeholder="Search" value={""} />
     </div>
   </div>
@@ -171,30 +245,83 @@
 </LockedFeature>
 
 {#if selectedLog}
-  <Portal target="#side-panel">
-    <div>hello</div>
-  </Portal>
+  <div
+    id="side-panel"
+    class:visible={sidePanelVisible}
+    use:clickOutside={() => {
+      sidePanelVisible = false
+    }}
+  >
+    <div class="side-panel-header">
+      Audit Logs
+      <Icon
+        icon="Close"
+        on:click={() => {
+          sidePanelVisible = false
+        }}
+      />
+    </div>
+    <div style="padding-top: 10px; height: 95%">
+      <CoreTextArea
+        disabled={true}
+        minHeight={"300px"}
+        height={"100%"}
+        value={JSON.stringify(selectedLog.metadata, null, 2)}
+      />
+    </div>
+  </div>
 {/if}
 
 <style>
+  .side-panel-header {
+    display: flex;
+    gap: var(--spacing-s);
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  #side-panel {
+    position: absolute;
+    right: 0;
+    top: 0;
+    padding: 24px;
+    background: var(--background);
+    border-left: var(--border-light);
+    width: 320px;
+    max-width: calc(100vw - 48px - 48px);
+    overflow: auto;
+    overflow-x: hidden;
+    transform: translateX(100%);
+    transition: transform 130ms ease-in-out;
+    height: calc(100% - 48px);
+    z-index: 2;
+  }
+  #side-panel.visible {
+    transform: translateX(0);
+  }
+
+  .search :global(.spectrum-InputGroup) {
+    width: 100px;
+  }
+
   .controls {
     display: flex;
     flex-direction: row;
     gap: var(--spacing-l);
-    align-items: flex-end;
     flex-wrap: wrap;
+    align-items: flex-end;
+  }
+
+  .select {
+    flex-basis: 130px;
+    width: 0;
+    min-width: 100px;
   }
 
   .search {
-    display: flex;
-    gap: var(--spacing-m);
-    align-items: flex-start;
     flex: 1 1 auto;
-    max-width: 100%;
-  }
-  .select {
-    flex: 1 1 0;
-    max-width: 200px;
-    min-width: 80px;
+    display: flex;
+    gap: var(--spacing-xl);
+    align-items: flex-end;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index 013d6b8ff4..cff578febd 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -55,7 +55,6 @@
       notifications.error(`Error saving variable: ${err.message}`)
     }
   }
-  $: console.log($environment.variables)
 </script>
 
 <LockedFeature
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
index 9381bea86a..f866fcb3d7 100644
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -34,4 +34,4 @@ export function createAuditLogsStore() {
   }
 }
 
-export const environment = createAuditLogsStore()
+export const auditLogs = createAuditLogsStore()
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index 8d704a5e15..e8f7853165 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -13,3 +13,4 @@ export { backups } from "./backups"
 export { overview } from "./overview"
 export { environment } from "./environment"
 export { menu } from "./menu"
+export { auditLogs } from "./auditLogs"
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 9858a88c0b..35c5a59c1f 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -38,20 +38,20 @@ export const buildAuditLogsEndpoints = API => ({
    */
   searchAuditLogs: async opts => {
     return await API.post({
-      url: `/api/auditlogs/search`,
+      url: `/api/global/auditlogs/search`,
       body: buildOpts(opts),
     })
   },
 
   getEventDefinitions: async () => {
     return await API.get({
-      url: `/api/auditlogs/definitions`,
+      url: `/api/global/auditlogs/definitions`,
     })
   },
 
   downloadLogs: async opts => {
     return await API.post({
-      url: `/api/auditlogs/definitions`,
+      url: `/api/global/auditlogs/definitions`,
       body: buildOpts(opts),
     })
   },

From 0ee77aa9b0393d7feedc32a86a7b4989f47e2a3b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Fri, 17 Feb 2023 17:27:17 +0000
Subject: [PATCH 044/273] adding test ci command to ignore local .env

---
 qa-core/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qa-core/package.json b/qa-core/package.json
index 2ae04ece6c..7733e95d46 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -9,10 +9,11 @@
     "url": "https://github.com/Budibase/budibase.git"
   },
   "scripts": {
-    "test": "env-cmd jest --runInBand --json --outputFile=testResults.json",
+    "test": "env-cmd jest --runInBand",
     "test:watch": "env-cmd jest --watch",
     "test:debug": "DEBUG=1 jest",
     "test:notify": "node scripts/testResultsWebhook",
+    "test:ci": "jest --runInBand --json --outputFile=testResults.json",
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
     "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts",

From eca34d73edb091873f6deab0d8b9e7a3300c3186 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 17 Feb 2023 17:46:49 +0000
Subject: [PATCH 045/273] Finishing up search API, updating typing in lucene
 layer.

---
 packages/backend-core/src/db/lucene.ts        | 72 +++++++++++++------
 .../types/src/api/web/global/auditLogs.ts     | 30 ++++----
 2 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
index 374e30a10d..e984fcdfdb 100644
--- a/packages/backend-core/src/db/lucene.ts
+++ b/packages/backend-core/src/db/lucene.ts
@@ -4,14 +4,25 @@ import { SearchFilters, Row } from "@budibase/types"
 
 const QUERY_START_REGEX = /\d[0-9]*:/g
 
+interface SearchResponse<T> {
+  rows: T[] | any[]
+  bookmark: string
+}
+
+interface PaginatedSearchResponse<T> extends SearchResponse<T> {
+  hasNextPage: boolean
+}
+
 export type SearchParams = {
-  tableId: string
+  tableId?: string
   sort?: string
   sortOrder?: string
   sortType?: string
   limit?: number
   bookmark?: string
   version?: string
+  indexer?: () => Promise<any>
+  disableEscaping?: boolean
   rows?: Row[]
 }
 
@@ -30,7 +41,7 @@ export function removeKeyNumbering(key: any): string {
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
  */
-export class QueryBuilder {
+export class QueryBuilder<T> {
   dbName: string
   index: string
   query: SearchFilters
@@ -70,10 +81,12 @@ export class QueryBuilder {
 
   disableEscaping() {
     this.noEscaping = true
+    return this
   }
 
   setIndexBuilder(builderFn: () => Promise<any>) {
     this.indexBuilder = builderFn
+    return this
   }
 
   setVersion(version?: string) {
@@ -407,11 +420,11 @@ export class QueryBuilder {
     const fullPath = `${url}/${this.dbName}/_design/database/_search/${this.index}`
     const body = this.buildSearchBody()
     try {
-      return await runQuery(fullPath, body, cookie)
+      return await runQuery<T>(fullPath, body, cookie)
     } catch (err: any) {
       if (err.status === 404 && this.indexBuilder) {
         await this.indexBuilder()
-        return await runQuery(fullPath, body, cookie)
+        return await runQuery<T>(fullPath, body, cookie)
       } else {
         throw err
       }
@@ -426,7 +439,11 @@ export class QueryBuilder {
  * @param cookie The auth cookie for CouchDB
  * @returns {Promise<{rows: []}>}
  */
-const runQuery = async (url: string, body: any, cookie: string) => {
+async function runQuery<T>(
+  url: string,
+  body: any,
+  cookie: string
+): Promise<SearchResponse<T>> {
   const response = await fetch(url, {
     body: JSON.stringify(body),
     method: "POST",
@@ -470,7 +487,7 @@ const runQuery = async (url: string, body: any, cookie: string) => {
  *   rows {array|null} Current results in the recursive search
  * @returns {Promise<*[]|*>}
  */
-async function recursiveSearch(
+async function recursiveSearch<T>(
   dbName: string,
   index: string,
   query: any,
@@ -485,7 +502,7 @@ async function recursiveSearch(
   if (rows.length > params.limit - 200) {
     pageSize = params.limit - rows.length
   }
-  const page = await new QueryBuilder(dbName, index, query)
+  const page = await new QueryBuilder<T | Row>(dbName, index, query)
     .setVersion(params.version)
     .setTable(params.tableId)
     .setBookmark(bookmark)
@@ -525,7 +542,7 @@ async function recursiveSearch(
  *   bookmark {string} The bookmark to resume from
  * @returns {Promise<{hasNextPage: boolean, rows: *[]}>}
  */
-export async function paginatedSearch(
+export async function paginatedSearch<T>(
   dbName: string,
   index: string,
   query: SearchFilters,
@@ -536,12 +553,25 @@ export async function paginatedSearch(
     limit = 50
   }
   limit = Math.min(limit, 200)
-  const search = new QueryBuilder(dbName, index, query)
-    .setVersion(params.version)
-    .setTable(params.tableId)
-    .setSort(params.sort)
-    .setSortOrder(params.sortOrder)
-    .setSortType(params.sortType)
+  const search = new QueryBuilder<T | Row>(dbName, index, query)
+  if (params.version) {
+    search.setVersion(params.version)
+  }
+  if (params.tableId) {
+    search.setTable(params.tableId)
+  }
+  if (params.sort) {
+    search
+      .setSort(params.sort)
+      .setSortOrder(params.sortOrder)
+      .setSortType(params.sortType)
+  }
+  if (params.indexer) {
+    search.setIndexBuilder(params.indexer)
+  }
+  if (params.disableEscaping) {
+    search.disableEscaping()
+  }
   const searchResults = await search
     .setBookmark(params.bookmark)
     .setLimit(limit)
@@ -549,11 +579,11 @@ export async function paginatedSearch(
 
   // Try fetching 1 row in the next page to see if another page of results
   // exists or not
-  const nextResults = await search
-    .setTable(params.tableId)
-    .setBookmark(searchResults.bookmark)
-    .setLimit(1)
-    .run()
+  search.setBookmark(searchResults.bookmark).setLimit(1)
+  if (params.tableId) {
+    search.setTable(params.tableId)
+  }
+  const nextResults = await search.run()
 
   return {
     ...searchResults,
@@ -578,7 +608,7 @@ export async function paginatedSearch(
  *   limit {number} The desired number of results
  * @returns {Promise<{rows: *}>}
  */
-export async function fullSearch(
+export async function fullSearch<T>(
   dbName: string,
   index: string,
   query: SearchFilters,
@@ -589,6 +619,6 @@ export async function fullSearch(
     limit = 1000
   }
   params.limit = Math.min(limit, 1000)
-  const rows = await recursiveSearch(dbName, index, query, params)
+  const rows = await recursiveSearch<T | Row>(dbName, index, query, params)
   return { rows }
 }
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 443cd79aa1..480dbbfe2b 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -16,21 +16,23 @@ export interface SearchAuditLogsRequest
   extends PaginationRequest,
     AuditLogSearchParams {}
 
-export interface SearchAuditLogsResponse extends PaginationResponse {
-  data: {
-    app: {
-      _id: string
-      name: string
-    }
-    user: {
-      _id: string
-      name: string
-    }
-    event: Event
-    timestamp: string
+export interface AuditLogEnriched {
+  app: {
+    _id: string
     name: string
-    metadata: any
-  }[]
+  }
+  user: {
+    _id: string
+    name: string
+  }
+  event: Event
+  timestamp: string
+  name: string
+  metadata: any
+}
+
+export interface SearchAuditLogsResponse extends PaginationResponse {
+  data: AuditLogEnriched[]
 }
 
 export interface DefinitionsAuditLogsResponse {

From 70e525b92850628047d858d4353728fd058e84e8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 17 Feb 2023 19:00:45 +0000
Subject: [PATCH 046/273] Updating types for audit logs to correctly handle the
 deletion of resources like users or apps.

---
 packages/backend-core/src/db/lucene.ts         | 14 +++++++-------
 packages/backend-core/src/db/utils.ts          | 10 ++++++++++
 packages/types/src/api/web/global/auditLogs.ts | 15 +++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
index e984fcdfdb..4a44aaa073 100644
--- a/packages/backend-core/src/db/lucene.ts
+++ b/packages/backend-core/src/db/lucene.ts
@@ -13,7 +13,7 @@ interface PaginatedSearchResponse<T> extends SearchResponse<T> {
   hasNextPage: boolean
 }
 
-export type SearchParams = {
+export type SearchParams<T> = {
   tableId?: string
   sort?: string
   sortOrder?: string
@@ -23,7 +23,7 @@ export type SearchParams = {
   version?: string
   indexer?: () => Promise<any>
   disableEscaping?: boolean
-  rows?: Row[]
+  rows?: T | Row[]
 }
 
 export function removeKeyNumbering(key: any): string {
@@ -502,7 +502,7 @@ async function recursiveSearch<T>(
   if (rows.length > params.limit - 200) {
     pageSize = params.limit - rows.length
   }
-  const page = await new QueryBuilder<T | Row>(dbName, index, query)
+  const page = await new QueryBuilder<T>(dbName, index, query)
     .setVersion(params.version)
     .setTable(params.tableId)
     .setBookmark(bookmark)
@@ -546,14 +546,14 @@ export async function paginatedSearch<T>(
   dbName: string,
   index: string,
   query: SearchFilters,
-  params: SearchParams
+  params: SearchParams<T>
 ) {
   let limit = params.limit
   if (limit == null || isNaN(limit) || limit < 0) {
     limit = 50
   }
   limit = Math.min(limit, 200)
-  const search = new QueryBuilder<T | Row>(dbName, index, query)
+  const search = new QueryBuilder<T>(dbName, index, query)
   if (params.version) {
     search.setVersion(params.version)
   }
@@ -612,13 +612,13 @@ export async function fullSearch<T>(
   dbName: string,
   index: string,
   query: SearchFilters,
-  params: SearchParams
+  params: SearchParams<T>
 ) {
   let limit = params.limit
   if (limit == null || isNaN(limit) || limit < 0) {
     limit = 1000
   }
   params.limit = Math.min(limit, 1000)
-  const rows = await recursiveSearch<T | Row>(dbName, index, query, params)
+  const rows = await recursiveSearch<T>(dbName, index, query, params)
   return { rows }
 }
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index 233d044eaa..c22685b912 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -366,6 +366,16 @@ export async function getAllApps({
   }
 }
 
+export async function getAppsById(appIds: string[]) {
+  const settled = await Promise.allSettled(
+    appIds.map(appId => getAppMetadata(appId))
+  )
+  // have to list the apps which exist, some may have been deleted
+  return settled
+    .filter(promise => promise.status === "fulfilled")
+    .map(promise => (promise as PromiseFulfilledResult<App>).value)
+}
+
 /**
  * Utility function for getAllApps but filters to production apps only.
  */
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 480dbbfe2b..5a0cf4f398 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -1,5 +1,6 @@
 import { Event, AuditedEventFriendlyName } from "../../../sdk"
 import { PaginationResponse, PaginationRequest } from "../"
+import { User, App } from "../../../"
 
 export interface AuditLogSearchParams {
   userId?: string[]
@@ -16,15 +17,13 @@ export interface SearchAuditLogsRequest
   extends PaginationRequest,
     AuditLogSearchParams {}
 
+export enum AuditLogResourceStatus {
+  DELETED = "deleted",
+}
+
 export interface AuditLogEnriched {
-  app: {
-    _id: string
-    name: string
-  }
-  user: {
-    _id: string
-    name: string
-  }
+  app?: App | { _id: string; status: AuditLogResourceStatus }
+  user: User | { _id: string; status: AuditLogResourceStatus }
   event: Event
   timestamp: string
   name: string

From 246f5eb5e477f6d6aa716b50b0e8c6e1bb03a78e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 20 Feb 2023 10:15:29 +0000
Subject: [PATCH 047/273] bumping qa core types and backend core dependencies

---
 qa-core/package.json |   6 +-
 qa-core/yarn.lock    | 353 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 265 insertions(+), 94 deletions(-)

diff --git a/qa-core/package.json b/qa-core/package.json
index 7733e95d46..15246af294 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -38,7 +38,7 @@
     ]
   },
   "devDependencies": {
-    "@budibase/types": "1.3.4",
+    "@budibase/types": "^2.3.17",
     "@types/jest": "29.0.0",
     "@types/node-fetch": "2.6.2",
     "chance": "1.1.8",
@@ -53,8 +53,8 @@
     "typescript": "4.7.3"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.0.5",
+    "@budibase/backend-core": "^2.3.17",
     "form-data": "^4.0.0",
     "node-fetch": "2"
   }
-}
\ No newline at end of file
+}
diff --git a/qa-core/yarn.lock b/qa-core/yarn.lock
index b090ff872f..be6207bbad 100644
--- a/qa-core/yarn.lock
+++ b/qa-core/yarn.lock
@@ -297,27 +297,30 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.5.tgz#e720ad8a0fd0eb0157d8ec332e530b481fd5b912"
-  integrity sha512-uY/YQgZ1xTm3npzWNRgZQBY/nj2ZxSkGtGbgK4NyWwZzvVUwd9vfNAIdKf7crECMJncH1x4H9TalQoFXb/cmbA==
+"@budibase/backend-core@^2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
+  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
   dependencies:
-    "@budibase/types" "^2.0.5"
+    "@budibase/nano" "10.1.1"
+    "@budibase/types" "^2.3.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
+    aws-cloudfront-sign "2.2.0"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
     bcryptjs "2.4.3"
+    bull "4.10.1"
+    correlation-id "4.0.0"
     dotenv "16.0.1"
     emitter-listener "1.1.2"
     ioredis "4.28.0"
     joi "17.6.0"
-    jsonwebtoken "8.5.1"
+    jsonwebtoken "9.0.0"
     koa-passport "4.1.4"
     lodash "4.17.21"
     lodash.isarguments "3.1.0"
     node-fetch "2.6.7"
-    passport-google-auth "1.0.2"
     passport-google-oauth "2.0.0"
     passport-jwt "4.0.0"
     passport-local "1.0.0"
@@ -333,15 +336,22 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/types@1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4.tgz#25f087b024e843eb372e50c81f8f925fb39f1dfd"
-  integrity sha512-ndyWs8yeCS7cpZjApDB1HhY6UUM2SRBUgAMCZOZaWABG9JHeCbx7x0e/pA2SZjswdMXqS5WmnEd3br5wuvUzJw==
+"@budibase/nano@10.1.1":
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
+  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+  dependencies:
+    "@types/tough-cookie" "^4.0.2"
+    axios "^1.1.3"
+    http-cookie-agent "^4.0.2"
+    node-abort-controller "^3.0.1"
+    qs "^6.11.0"
+    tough-cookie "^4.1.2"
 
-"@budibase/types@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.5.tgz#852c86611f237640b59d8dc4ae0c8c5fec491cf1"
-  integrity sha512-MnnDEB22kbXRsztmHPgvFDSYavpb0qm6H6Y/3UHXKqyFEg/KRpiF1p7lYsN+FAUDAWxpFgI+kp2Yw6gWyA5FLQ==
+"@budibase/types@^2.3.17":
+  version "2.3.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
+  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -660,6 +670,36 @@
     semver "^7.3.5"
     tar "^6.1.11"
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.0.tgz#d31a238c943ffc34bab73ad6ce7a6466d65888ef"
+  integrity sha512-5qpnNHUyyEj9H3sm/4Um/bnx1lrQGhe8iqry/1d+cQYCRd/gzYA0YLeq0ezlk4hKx4vO+dsEsNyeowqRqslwQA==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.0.tgz#2f6fbbec3d3f0bbe9c6678c899f1c1a6e25ed980"
+  integrity sha512-ZphTFFd6SFweNAMKD+QJCrWpgkjf4qBuHltiMkKkD6FFrB3NOTRVmetAGTkJ57pa+s6J0yCH06LujWB9rZe94g==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.0.tgz#19875441da50b9aa8f8e726eb097a4cead435a3f"
+  integrity sha512-NEX6hdSvP4BmVyegaIbrGxvHzHvTzzsPaxXCsUt0mbLbPpEftsvNwaEVKOowXnLoeuGeD4MaqSwL3BUK2elsUA==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.0.tgz#3b855ac72cc16e89db2f72adf47ddc964c20a53d"
+  integrity sha512-ztKVV1dO/sSZyGse0PBCq3Pk1PkYjsA/dsEWE7lfrGoAK3i9HpS2o7XjGQ7V4va6nX+xPPOiuYpQwa4Bi6vlww==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.0.tgz#455f1d5bb00e87f78c67711f26e7bff9f1457684"
+  integrity sha512-9uvdAkZMOPCY7SPRxZLW8XGqBOVNVEhqlgffenN8shA1XR9FWVsSM13nr/oHtNgXg6iVyML7RwWPyqUeThlwxg==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.0.tgz#03c6bfcd3acb179ea69546c20d50895b9d623ada"
+  integrity sha512-Wg0+9615kHKlr9iLVcG5I+/CHnf6w3x5UADRv8Ad16yA0Bu5l9eVOROjV7aHPG6uC8ZPFIVVaoSjDChD+Y0pzg==
+
 "@shopify/jest-koa-mocks@5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
@@ -825,6 +865,11 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/tough-cookie@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
@@ -889,7 +934,7 @@ acorn@^8.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -987,18 +1032,18 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
-async@~2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
-  integrity sha512-+g/Ncjbx0JSq2Mk03WQkyKvNh5q9Qvyo/RIqIqnmC5feJY70PNl2ESwZU2BhAB+AZPkHNzzyC2Dq2AS5VnTKhQ==
-  dependencies:
-    lodash "^4.14.0"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
+aws-cloudfront-sign@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d"
+  integrity sha512-qG+rwZMP3KRTPPbVmWY8DlrT56AkA4iVOeo23vkdK2EXeW/brJFN2haSNKzVz+oYhFMEIzVVloeAcrEzuRkuVQ==
+  dependencies:
+    lodash "^3.6.0"
+
 aws-sdk@2.1030.0:
   version "2.1030.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1030.0.tgz#24a856af3d2b8b37c14a8f59974993661c66fd82"
@@ -1046,6 +1091,15 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.1.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.3.tgz#e7011384ba839b885007c9c9fae1ff23dceb295b"
+  integrity sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-jest@^28.1.3:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
@@ -1226,6 +1280,21 @@ buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+bull@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
+  integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
+  dependencies:
+    cron-parser "^4.2.1"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.28.5"
+    lodash "^4.17.21"
+    msgpackr "^1.5.2"
+    p-timeout "^3.2.0"
+    semver "^7.3.2"
+    uuid "^8.3.0"
+
 cache-content-type@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
@@ -1234,6 +1303,14 @@ cache-content-type@^1.0.0:
     mime-types "^2.1.18"
     ylru "^1.2.0"
 
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1438,11 +1515,25 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+correlation-id@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/correlation-id/-/correlation-id-4.0.0.tgz#c1d3038e5f30d7bfeae5728ff96f27a7506bc2c0"
+  integrity sha512-WvXtJBlovvOBKqTz/YwWP2gm6CXJZJArfGimp9s/ehmhJMPFbmnPMQe3K60Q9idGNixMvKojMjleyDhZEFdHfg==
+  dependencies:
+    uuid "^8.3.1"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cron-parser@^4.2.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.7.1.tgz#1e325a6a18e797a634ada1e2599ece0b6b5ed177"
+  integrity sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==
+  dependencies:
+    luxon "^3.2.1"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1478,6 +1569,11 @@ debug@4.3.2:
   dependencies:
     ms "2.1.2"
 
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -1820,7 +1916,7 @@ follow-redirects@^1.14.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
-follow-redirects@^1.14.4:
+follow-redirects@^1.14.4, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -1919,11 +2015,25 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
+  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -1953,47 +2063,11 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-google-auth-library@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-0.10.0.tgz#6e15babee85fd1dd14d8d128a295b6838d52136e"
-  integrity sha512-KM54Y9GhdAzfXUHmWEoYmaOykSLuMG7W4HvVLYqyogxOyE6px8oSS8W13ngqW0oDGZ915GFW3V6OM6+qcdvPOA==
-  dependencies:
-    gtoken "^1.2.1"
-    jws "^3.1.4"
-    lodash.noop "^3.0.1"
-    request "^2.74.0"
-
-google-p12-pem@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-0.1.2.tgz#33c46ab021aa734fa0332b3960a9a3ffcb2f3177"
-  integrity sha512-puhMlJ2+E/rgvxWaqgN/nC7x623OAE8MR9vBUqxF0inCE7HoVfCHvTeQ9+BR+rj9KM0fIg6XV6tmbt7XHHssoQ==
-  dependencies:
-    node-forge "^0.7.1"
-
-googleapis@^16.0.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-16.1.0.tgz#0f19f2d70572d918881a0f626e3b1a2fa8629576"
-  integrity sha512-5czmF7xkIlJKc1+/+5tltrI1skoR3HKtkDOld9rk+DOucTpZRjOhCoJzoSjxB3M8rP2tEb1VIr1TPyzR3V2PUQ==
-  dependencies:
-    async "~2.1.4"
-    google-auth-library "~0.10.0"
-    string-template "~1.0.0"
-
 graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-gtoken@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-1.2.3.tgz#5509571b8afd4322e124cf66cf68115284c476d8"
-  integrity sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==
-  dependencies:
-    google-p12-pem "^0.1.0"
-    jws "^3.0.0"
-    mime "^1.4.1"
-    request "^2.72.0"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -2017,7 +2091,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.2:
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -2054,6 +2128,13 @@ http-assert@^1.3.0:
     deep-equal "~1.0.1"
     http-errors "~1.8.0"
 
+http-cookie-agent@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69"
+  integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw==
+  dependencies:
+    agent-base "^6.0.2"
+
 http-errors@^1.6.3, http-errors@~1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
@@ -2150,6 +2231,23 @@ ioredis@4.28.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ioredis@^4.28.5:
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.5.tgz#5c149e6a8d76a7f8fa8a504ffc85b7d5b6797f9f"
+  integrity sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    lodash.isarguments "^3.1.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -2745,7 +2843,17 @@ json5@^2.2.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
-jsonwebtoken@8.5.1, jsonwebtoken@^8.2.0:
+jsonwebtoken@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
+jsonwebtoken@^8.2.0:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -2780,7 +2888,7 @@ jwa@^1.4.1:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jws@^3.0.0, jws@^3.1.4, jws@^3.2.2:
+jws@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
   integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
@@ -3017,11 +3125,6 @@ lodash.memoize@4.x:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
-lodash.noop@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c"
-  integrity sha512-TmYdmu/pebrdTIBDK/FDx9Bmfzs9x0sZG6QIJuMDTqEPfeciLcN13ij+cOd0i9vwJfBtbG9UQ+C7MkXgYxrIJg==
-
 lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -3032,11 +3135,16 @@ lodash.pick@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
 
-lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+lodash@^3.6.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -3049,6 +3157,11 @@ ltgt@2.2.1, ltgt@^2.1.2:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
+luxon@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.2.1.tgz#14f1af209188ad61212578ea7e3d518d18cee45f"
+  integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
+
 make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -3122,7 +3235,7 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24,
   dependencies:
     mime-db "1.52.0"
 
-mime@^1.3.4, mime@^1.4.1:
+mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -3179,6 +3292,27 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+msgpackr-extract@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.0.tgz#5b5c5fbfff25be5ee5b5a82a9cbe02e37f72bed0"
+  integrity sha512-oy6KCk1+X4Bn5m6Ycq5N1EWl9npqG/cLrE8ga8NX7ZqfqYUUBS08beCQaGq80fjbKBySur0E6x//yZjzNJDt3A==
+  dependencies:
+    node-gyp-build-optional-packages "5.0.7"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.0"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.0"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.0"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.0"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.0"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.0"
+
+msgpackr@^1.5.2:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.8.3.tgz#78c1b91359f72707f4abeaca40cc423bd2d75185"
+  integrity sha512-m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==
+  optionalDependencies:
+    msgpackr-extract "^3.0.0"
+
 napi-macros@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
@@ -3204,6 +3338,11 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+node-abort-controller@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
+  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
+
 node-addon-api@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
@@ -3221,10 +3360,10 @@ node-fetch@2.6.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-node-forge@^0.7.1:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
-  integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
+node-gyp-build-optional-packages@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
+  integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
 
 node-gyp-build@~4.1.0:
   version "4.1.1"
@@ -3301,6 +3440,11 @@ object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
+object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
 on-finished@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -3327,6 +3471,11 @@ only@~0.0.2:
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
   integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -3353,6 +3502,13 @@ p-map@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -3373,14 +3529,6 @@ parseurl@^1.3.2, parseurl@^1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-passport-google-auth@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/passport-google-auth/-/passport-google-auth-1.0.2.tgz#8b300b5aa442ef433de1d832ed3112877d0b2938"
-  integrity sha512-cfAqna6jZLyMEwUdd4PIwAh2mQKQVEDAaRIaom1pG6h4x4Gwjllf/Jflt3TkR1Sen5Rkvr3l7kSXCWE1EKkh8g==
-  dependencies:
-    googleapis "^16.0.0"
-    passport-strategy "1.x"
-
 passport-google-oauth1@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc"
@@ -3443,7 +3591,7 @@ passport-oauth2@1.x.x:
     uid2 "0.0.x"
     utils-merge "1.x.x"
 
-passport-strategy@1.x, passport-strategy@1.x.x, passport-strategy@^1.0.0:
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
@@ -3720,6 +3868,11 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -3755,6 +3908,13 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+qs@^6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@~6.5.2:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
@@ -3851,7 +4011,7 @@ remove-trailing-slash@^0.1.1:
   resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d"
   integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==
 
-request@^2.72.0, request@^2.74.0, request@^2.88.0:
+request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -3974,6 +4134,13 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.3.2, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4001,6 +4168,15 @@ shimmer@^1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -4123,11 +4299,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-template@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96"
-  integrity sha512-SLqR3GBUXuoPP5MmYtD7ompvXiG87QjT6lzOszyXjTM86Uu7At7vNnt2xgyTLq5o9T4IxTYFyGxcULqpsmsfdg==
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -4315,7 +4486,7 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0":
+"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
   integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
@@ -4486,7 +4657,7 @@ uuid@8.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
   integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
 
-uuid@8.3.2, uuid@^8.3.2:
+uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==

From 53f6b2b6e62443acfb6f79a17edcce6c18006842 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Mon, 20 Feb 2023 11:03:37 +0000
Subject: [PATCH 048/273] Null safety (#9746)

---
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index bf07cddf23..f56d7a78d4 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -254,8 +254,8 @@
               {:else if filter.type === "datetime"}
                 <DatePicker
                   disabled={filter.noValue}
-                  enableTime={!getSchema(filter).dateOnly}
-                  timeOnly={getSchema(filter).timeOnly}
+                  enableTime={!getSchema(filter)?.dateOnly}
+                  timeOnly={getSchema(filter)?.timeOnly}
                   bind:value={filter.value}
                 />
               {:else}

From b60013cbb86f9b4c9207fddc123dfcb250d3b11a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 20 Feb 2023 11:29:43 +0000
Subject: [PATCH 049/273] switching metadataSearch to fullSearch.

---
 .../server/src/api/controllers/row/internalSearch.ts     | 9 ++++++---
 packages/types/src/api/web/global/auditLogs.ts           | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/controllers/row/internalSearch.ts b/packages/server/src/api/controllers/row/internalSearch.ts
index f2abc91b14..bdb9379334 100644
--- a/packages/server/src/api/controllers/row/internalSearch.ts
+++ b/packages/server/src/api/controllers/row/internalSearch.ts
@@ -1,9 +1,9 @@
 import { db as dbCore, context, SearchParams } from "@budibase/backend-core"
-import { SearchFilters } from "@budibase/types"
+import { SearchFilters, Row } from "@budibase/types"
 
 export async function paginatedSearch(
   query: SearchFilters,
-  params: SearchParams
+  params: SearchParams<Row>
 ) {
   const appId = context.getAppId()
   return dbCore.paginatedSearch(
@@ -14,7 +14,10 @@ export async function paginatedSearch(
   )
 }
 
-export async function fullSearch(query: SearchFilters, params: SearchParams) {
+export async function fullSearch(
+  query: SearchFilters,
+  params: SearchParams<Row>
+) {
   const appId = context.getAppId()
   return dbCore.fullSearch(appId!, dbCore.SearchIndexes.ROWS, query, params)
 }
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 5a0cf4f398..dbd22b2bf2 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -8,7 +8,7 @@ export interface AuditLogSearchParams {
   event?: Event[]
   startDate?: string
   endDate?: string
-  metadataSearch?: string
+  fullSearch?: string
 }
 
 export interface DownloadAuditLogsRequest extends AuditLogSearchParams {}

From 1eb2307fed412287ee53c9552fb543a5caed0d68 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 20 Feb 2023 15:35:14 +0000
Subject: [PATCH 050/273] Fix for #9749 - static formulas would sometimes
 attempt to update the same row multiple times, filter down to just the unique
 row list which requires updating.

---
 packages/server/src/api/controllers/row/staticFormula.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index 47a5af8f5a..6ba44dc23a 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -38,7 +38,13 @@ export async function updateRelatedFormula(
         if (!relatedRows[relatedTableId]) {
           relatedRows[relatedTableId] = []
         }
-        relatedRows[relatedTableId] = relatedRows[relatedTableId].concat(field)
+        // filter down to the rows which are not already included in related
+        const currentIds = relatedRows[relatedTableId].map(row => row._id)
+        const uniqueRelatedRows = field.filter(
+          (row: Row) => !currentIds.includes(row._id)
+        )
+        relatedRows[relatedTableId] =
+          relatedRows[relatedTableId].concat(uniqueRelatedRows)
       }
     }
     for (let tableId of table.relatedFormula) {

From 6cc96f39b17ff3ac6a2fbd2185d7664c8e95a0ab Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 20 Feb 2023 17:20:42 +0000
Subject: [PATCH 051/273] Minor fixes for friendly audited events, and a new
 function for comparing app IDs.

---
 packages/backend-core/src/db/utils.ts          | 10 ++++++++++
 packages/types/src/api/web/global/auditLogs.ts |  2 +-
 packages/types/src/sdk/events/event.ts         |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index c22685b912..d9dbb809d1 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -392,6 +392,16 @@ export async function getDevAppIDs() {
   return apps.filter((id: any) => isDevAppID(id))
 }
 
+export function isSameAppID(
+  appId1: string | undefined,
+  appId2: string | undefined
+) {
+  if (appId1 == undefined || appId2 == undefined) {
+    return false
+  }
+  return getProdAppID(appId1) === getProdAppID(appId2)
+}
+
 export async function dbExists(dbName: any) {
   return doWithDB(
     dbName,
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index dbd22b2bf2..ef9927b89a 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -35,5 +35,5 @@ export interface SearchAuditLogsResponse extends PaginationResponse {
 }
 
 export interface DefinitionsAuditLogsResponse {
-  events: typeof AuditedEventFriendlyName
+  events: Record<string, string>
 }
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 4fb3e873ae..1be0ea2bdf 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -197,7 +197,7 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.USER_PERMISSION_ADMIN_REMOVED]: `User "{{ email }}" admin role removed`,
   [Event.USER_PERMISSION_BUILDER_ASSIGNED]: `User "{{ email }}" builder role assigned`,
   [Event.USER_PERMISSION_BUILDER_REMOVED]: `User "{{ email }}" builder role removed`,
-  [Event.USER_INVITED]: `User "{{ email }} invited`,
+  [Event.USER_INVITED]: `User "{{ email }}" invited`,
   [Event.USER_INVITED_ACCEPTED]: `User "{{ email }}" accepted invite`,
   [Event.USER_PASSWORD_UPDATED]: `User "{{ email }}" password updated`,
   [Event.USER_PASSWORD_RESET_REQUESTED]: `User "{{ email }}" password reset requested`,

From cacf275a997fa1274a05a98b3bc86637ec69a8dd Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Feb 2023 08:23:53 +0000
Subject: [PATCH 052/273] Prevent SSO users from setting / resetting a password
 (#9672)

* Prevent SSO users from setting / resetting a password

* Add support for ENABLE_SSO_MAINTENANCE_MODE

* Add typing to self api and build out user update sdk

* Integrate sso checks with user sdk. Integrate user sdk with self api

* Test fixes

* Move self update into SDK

* Lock down maintenance mode to admin user

* Fix typo

* Add health status response and return type signature to accounts.getStatus

* Remove some unnecessary comments

* Make sso save user function non optional

* Remove redundant check on sso auth details provider

* Update syncProfilePicture function name to getProfilePictureUrl

* Update packages/worker/src/sdk/users/events.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Add ENABLE_EMAIL_TEST_MODE flag

* Fix for logging in as sso user when existing user has password already

* Hide password update and force reset from ui for sso users

* Always disable sso maintenance mode in cloud

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
---
 .../src/{cloud => accounts}/accounts.ts       |  23 +-
 .../src/{cloud => accounts}/api.ts            |   0
 packages/backend-core/src/accounts/index.ts   |   1 +
 packages/backend-core/src/auth/auth.ts        |  50 +++-
 .../backend-core/src/auth/tests/auth.spec.ts  |  13 +
 .../backend-core/src/events/identification.ts |   6 +-
 .../middleware/passport/datasource/google.ts  |  11 +-
 .../src/middleware/passport/local.ts          |  56 +---
 .../middleware/passport/{ => sso}/google.ts   |  28 +-
 .../src/middleware/passport/{ => sso}/oidc.ts |  40 ++-
 .../src/middleware/passport/sso/sso.ts        | 165 +++++++++++
 .../passport/sso/tests/google.spec.ts         |  67 +++++
 .../passport/sso/tests/oidc.spec.ts           | 152 ++++++++++
 .../middleware/passport/sso/tests/sso.spec.ts | 196 +++++++++++++
 .../middleware/passport/tests/google.spec.js  |  79 -----
 .../middleware/passport/tests/oidc.spec.js    | 144 ----------
 .../tests/third-party-common.seq.spec.js      | 178 ------------
 .../passport/tests/utilities/mock-data.js     |  54 ----
 .../middleware/passport/third-party-common.ts | 177 ------------
 packages/backend-core/src/users.ts            |   6 +
 packages/backend-core/src/utils/utils.ts      |  45 +--
 .../tests/utilities/mocks/accounts.ts         |  13 -
 .../tests/utilities/mocks/index.ts            |   5 +-
 .../tests/utilities/structures/accounts.ts    |  36 ++-
 .../tests/utilities/structures/index.ts       |   4 +-
 .../tests/utilities/structures/sso.ts         | 100 +++++++
 .../tests/utilities/structures/users.ts       |  70 +++++
 .../portal/_components/UserDropdown.svelte    |   8 +-
 .../portal/users/users/[userId].svelte        |   9 +-
 packages/builder/src/stores/portal/auth.js    |   1 +
 packages/server/specs/openapi.json            |  12 +-
 packages/server/specs/openapi.yaml            |   6 +-
 .../src/integrations/tests/couchdb.spec.ts    |   2 -
 packages/types/src/api/account/index.ts       |   1 +
 packages/types/src/api/account/status.ts      |   7 +
 packages/types/src/api/web/auth.ts            |  25 ++
 packages/types/src/api/web/index.ts           |   1 +
 packages/types/src/api/web/user.ts            |  21 +-
 .../types/src/documents/account/account.ts    |  18 +-
 packages/types/src/documents/global/config.ts |  27 +-
 packages/types/src/documents/global/user.ts   |  63 ++--
 packages/types/src/sdk/index.ts               |   2 +
 packages/types/src/sdk/sso.ts                 |  37 +++
 packages/types/src/sdk/user.ts                |  12 +
 packages/worker/scripts/dev/manage.js         |   1 +
 .../worker/src/api/controllers/global/auth.ts | 147 +++++-----
 .../worker/src/api/controllers/global/self.ts |  70 ++---
 .../src/api/controllers/global/users.ts       |  43 ++-
 .../src/api/controllers/system/accounts.ts    |  12 +-
 packages/worker/src/api/routes/global/auth.ts |  17 +-
 .../src/api/routes/global/tests/auth.spec.ts  | 271 +++++++++++++++---
 .../src/api/routes/global/tests/self.spec.ts  |   7 +-
 .../api/routes/system/tests/accounts.spec.ts  |   8 +-
 packages/worker/src/environment.ts            |  16 +-
 packages/worker/src/index.ts                  |   6 +
 packages/worker/src/sdk/accounts/index.ts     |   3 +-
 .../sdk/accounts/{accounts.ts => metadata.ts} |   1 -
 packages/worker/src/sdk/auth/auth.ts          |  86 ++++++
 packages/worker/src/sdk/auth/index.ts         |   1 +
 packages/worker/src/sdk/users/events.ts       |   4 +
 packages/worker/src/sdk/users/index.ts        |   1 +
 .../worker/src/sdk/users/tests/users.spec.ts  |  52 ++++
 packages/worker/src/sdk/users/users.ts        |  97 ++++---
 .../worker/src/tests/TestConfiguration.ts     |   4 +-
 packages/worker/src/tests/api/auth.ts         |  60 ++--
 packages/worker/src/tests/structures/index.ts |   2 -
 packages/worker/src/tests/structures/users.ts |  37 ---
 packages/worker/src/utilities/email.ts        |   6 +-
 68 files changed, 1803 insertions(+), 1120 deletions(-)
 rename packages/backend-core/src/{cloud => accounts}/accounts.ts (69%)
 rename packages/backend-core/src/{cloud => accounts}/api.ts (100%)
 create mode 100644 packages/backend-core/src/accounts/index.ts
 create mode 100644 packages/backend-core/src/auth/tests/auth.spec.ts
 rename packages/backend-core/src/middleware/passport/{ => sso}/google.ts (76%)
 rename packages/backend-core/src/middleware/passport/{ => sso}/oidc.ts (85%)
 create mode 100644 packages/backend-core/src/middleware/passport/sso/sso.ts
 create mode 100644 packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
 create mode 100644 packages/backend-core/src/middleware/passport/sso/tests/oidc.spec.ts
 create mode 100644 packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
 delete mode 100644 packages/backend-core/src/middleware/passport/tests/google.spec.js
 delete mode 100644 packages/backend-core/src/middleware/passport/tests/oidc.spec.js
 delete mode 100644 packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js
 delete mode 100644 packages/backend-core/src/middleware/passport/tests/utilities/mock-data.js
 delete mode 100644 packages/backend-core/src/middleware/passport/third-party-common.ts
 delete mode 100644 packages/backend-core/tests/utilities/mocks/accounts.ts
 create mode 100644 packages/backend-core/tests/utilities/structures/sso.ts
 create mode 100644 packages/backend-core/tests/utilities/structures/users.ts
 create mode 100644 packages/types/src/api/account/status.ts
 create mode 100644 packages/types/src/api/web/auth.ts
 create mode 100644 packages/types/src/sdk/sso.ts
 create mode 100644 packages/types/src/sdk/user.ts
 rename packages/worker/src/sdk/accounts/{accounts.ts => metadata.ts} (99%)
 create mode 100644 packages/worker/src/sdk/auth/auth.ts
 create mode 100644 packages/worker/src/sdk/auth/index.ts
 create mode 100644 packages/worker/src/sdk/users/tests/users.spec.ts
 delete mode 100644 packages/worker/src/tests/structures/users.ts

diff --git a/packages/backend-core/src/cloud/accounts.ts b/packages/backend-core/src/accounts/accounts.ts
similarity index 69%
rename from packages/backend-core/src/cloud/accounts.ts
rename to packages/backend-core/src/accounts/accounts.ts
index 90fa7ab824..a16d0f1074 100644
--- a/packages/backend-core/src/cloud/accounts.ts
+++ b/packages/backend-core/src/accounts/accounts.ts
@@ -1,13 +1,24 @@
 import API from "./api"
 import env from "../environment"
 import { Header } from "../constants"
-import { CloudAccount } from "@budibase/types"
+import { CloudAccount, HealthStatusResponse } from "@budibase/types"
 
 const api = new API(env.ACCOUNT_PORTAL_URL)
 
+/**
+ * This client is intended to be used in a cloud hosted deploy only.
+ * Rather than relying on each consumer to perform the necessary environmental checks
+ * we use the following check to exit early with a undefined response which should be
+ * handled by the caller.
+ */
+const EXIT_EARLY = env.SELF_HOSTED || env.DISABLE_ACCOUNT_PORTAL
+
 export const getAccount = async (
   email: string
 ): Promise<CloudAccount | undefined> => {
+  if (EXIT_EARLY) {
+    return
+  }
   const payload = {
     email,
   }
@@ -29,6 +40,9 @@ export const getAccount = async (
 export const getAccountByTenantId = async (
   tenantId: string
 ): Promise<CloudAccount | undefined> => {
+  if (EXIT_EARLY) {
+    return
+  }
   const payload = {
     tenantId,
   }
@@ -47,7 +61,12 @@ export const getAccountByTenantId = async (
   return json[0]
 }
 
-export const getStatus = async () => {
+export const getStatus = async (): Promise<
+  HealthStatusResponse | undefined
+> => {
+  if (EXIT_EARLY) {
+    return
+  }
   const response = await api.get(`/api/status`, {
     headers: {
       [Header.API_KEY]: env.ACCOUNT_PORTAL_API_KEY,
diff --git a/packages/backend-core/src/cloud/api.ts b/packages/backend-core/src/accounts/api.ts
similarity index 100%
rename from packages/backend-core/src/cloud/api.ts
rename to packages/backend-core/src/accounts/api.ts
diff --git a/packages/backend-core/src/accounts/index.ts b/packages/backend-core/src/accounts/index.ts
new file mode 100644
index 0000000000..f2ae03040e
--- /dev/null
+++ b/packages/backend-core/src/accounts/index.ts
@@ -0,0 +1 @@
+export * from "./accounts"
diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index bbefb2933d..bee245a3ae 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -1,10 +1,11 @@
 const _passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
 const JwtStrategy = require("passport-jwt").Strategy
-import { getGlobalDB } from "../tenancy"
+import { getGlobalDB } from "../context"
 const refresh = require("passport-oauth2-refresh")
-import { Config } from "../constants"
+import { Config, Cookie } from "../constants"
 import { getScopedConfig } from "../db"
+import { getSessionsForUser, invalidateSessions } from "../security/sessions"
 import {
   jwt as jwtPassport,
   local,
@@ -15,8 +16,11 @@ import {
   google,
 } from "../middleware"
 import { invalidateUser } from "../cache/user"
-import { User } from "@budibase/types"
+import { PlatformLogoutOpts, User } from "@budibase/types"
 import { logAlert } from "../logging"
+import * as events from "../events"
+import * as userCache from "../cache/user"
+import { clearCookie, getCookie } from "../utils"
 export {
   auditLog,
   authError,
@@ -29,6 +33,7 @@ export {
   google,
   oidc,
 } from "../middleware"
+import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
 export const buildAuthMiddleware = authenticated
 export const buildTenancyMiddleware = tenancy
 export const buildCsrfMiddleware = csrf
@@ -71,7 +76,7 @@ async function refreshOIDCAccessToken(
     if (!enrichedConfig) {
       throw new Error("OIDC Config contents invalid")
     }
-    strategy = await oidc.strategyFactory(enrichedConfig)
+    strategy = await oidc.strategyFactory(enrichedConfig, ssoSaveUserNoOp)
   } catch (err) {
     console.error(err)
     throw new Error("Could not refresh OAuth Token")
@@ -103,7 +108,11 @@ async function refreshGoogleAccessToken(
 
   let strategy
   try {
-    strategy = await google.strategyFactory(config, callbackUrl)
+    strategy = await google.strategyFactory(
+      config,
+      callbackUrl,
+      ssoSaveUserNoOp
+    )
   } catch (err: any) {
     console.error(err)
     throw new Error(
@@ -161,6 +170,8 @@ export async function refreshOAuthToken(
   return refreshResponse
 }
 
+// TODO: Refactor to use user save function instead to prevent the need for
+// manually saving and invalidating on callback
 export async function updateUserOAuth(userId: string, oAuthConfig: any) {
   const details = {
     accessToken: oAuthConfig.accessToken,
@@ -188,3 +199,32 @@ export async function updateUserOAuth(userId: string, oAuthConfig: any) {
     console.error("Could not update OAuth details for current user", e)
   }
 }
+
+/**
+ * Logs a user out from budibase. Re-used across account portal and builder.
+ */
+export async function platformLogout(opts: PlatformLogoutOpts) {
+  const ctx = opts.ctx
+  const userId = opts.userId
+  const keepActiveSession = opts.keepActiveSession
+
+  if (!ctx) throw new Error("Koa context must be supplied to logout.")
+
+  const currentSession = getCookie(ctx, Cookie.Auth)
+  let sessions = await getSessionsForUser(userId)
+
+  if (keepActiveSession) {
+    sessions = sessions.filter(
+      session => session.sessionId !== currentSession.sessionId
+    )
+  } else {
+    // clear cookies
+    clearCookie(ctx, Cookie.Auth)
+    clearCookie(ctx, Cookie.CurrentApp)
+  }
+
+  const sessionIds = sessions.map(({ sessionId }) => sessionId)
+  await invalidateSessions(userId, { sessionIds, reason: "logout" })
+  await events.auth.logout()
+  await userCache.invalidateUser(userId)
+}
diff --git a/packages/backend-core/src/auth/tests/auth.spec.ts b/packages/backend-core/src/auth/tests/auth.spec.ts
new file mode 100644
index 0000000000..307f6a63c8
--- /dev/null
+++ b/packages/backend-core/src/auth/tests/auth.spec.ts
@@ -0,0 +1,13 @@
+import { structures, testEnv } from "../../../tests"
+import * as auth from "../auth"
+import * as events from "../../events"
+
+describe("platformLogout", () => {
+  it("should call platform logout", async () => {
+    await testEnv.withTenant(async () => {
+      const ctx = structures.koa.newContext()
+      await auth.platformLogout({ ctx, userId: "test" })
+      expect(events.auth.logout).toBeCalledTimes(1)
+    })
+  })
+})
diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index 8ac22b471c..7cade9e14b 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -16,6 +16,7 @@ import {
   InstallationGroup,
   UserContext,
   Group,
+  isSSOUser,
 } from "@budibase/types"
 import { processors } from "./processors"
 import * as dbUtils from "../db/utils"
@@ -166,7 +167,10 @@ const identifyUser = async (
   const type = IdentityType.USER
   let builder = user.builder?.global || false
   let admin = user.admin?.global || false
-  let providerType = user.providerType
+  let providerType
+  if (isSSOUser(user)) {
+    providerType = user.providerType
+  }
   const accountHolder = account?.budibaseUserId === user._id || false
   const verified =
     account && account?.budibaseUserId === user._id ? account.verified : false
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index 65620d7aa3..112f8d2096 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -1,10 +1,11 @@
-import * as google from "../google"
+import * as google from "../sso/google"
 import { Cookie, Config } from "../../../constants"
 import { clearCookie, getCookie } from "../../../utils"
 import { getScopedConfig, getPlatformUrl, doWithDB } from "../../../db"
 import environment from "../../../environment"
-import { getGlobalDB } from "../../../tenancy"
+import { getGlobalDB } from "../../../context"
 import { BBContext, Database, SSOProfile } from "@budibase/types"
+import { ssoSaveUserNoOp } from "../sso/sso"
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 
 type Passport = {
@@ -36,7 +37,11 @@ export async function preAuth(
   const platformUrl = await getPlatformUrl({ tenantAware: false })
 
   let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`
-  const strategy = await google.strategyFactory(googleConfig, callbackUrl)
+  const strategy = await google.strategyFactory(
+    googleConfig,
+    callbackUrl,
+    ssoSaveUserNoOp
+  )
 
   if (!ctx.query.appId || !ctx.query.datasourceId) {
     ctx.throw(400, "appId and datasourceId query params not present.")
diff --git a/packages/backend-core/src/middleware/passport/local.ts b/packages/backend-core/src/middleware/passport/local.ts
index 8b85d3734c..e198032532 100644
--- a/packages/backend-core/src/middleware/passport/local.ts
+++ b/packages/backend-core/src/middleware/passport/local.ts
@@ -1,15 +1,10 @@
 import { UserStatus } from "../../constants"
-import { compare, newid } from "../../utils"
-import env from "../../environment"
+import { compare } from "../../utils"
 import * as users from "../../users"
 import { authError } from "./utils"
-import { createASession } from "../../security/sessions"
-import { getTenantId } from "../../tenancy"
 import { BBContext } from "@budibase/types"
-const jwt = require("jsonwebtoken")
 
 const INVALID_ERR = "Invalid credentials"
-const SSO_NO_PASSWORD = "SSO user does not have a password set"
 const EXPIRED = "This account has expired. Please reset your password"
 
 export const options = {
@@ -35,50 +30,25 @@ export async function authenticate(
 
   const dbUser = await users.getGlobalUserByEmail(email)
   if (dbUser == null) {
-    return authError(done, `User not found: [${email}]`)
-  }
-
-  // check that the user is currently inactive, if this is the case throw invalid
-  if (dbUser.status === UserStatus.INACTIVE) {
+    console.info(`user=${email} could not be found`)
     return authError(done, INVALID_ERR)
   }
 
-  // check that the user has a stored password before proceeding
-  if (!dbUser.password) {
-    if (
-      (dbUser.account && dbUser.account.authType === "sso") || // root account sso
-      dbUser.thirdPartyProfile // internal sso
-    ) {
-      return authError(done, SSO_NO_PASSWORD)
-    }
+  if (dbUser.status === UserStatus.INACTIVE) {
+    console.info(`user=${email} is inactive`, dbUser)
+    return authError(done, INVALID_ERR)
+  }
 
-    console.error("Non SSO usser has no password set", dbUser)
+  if (!dbUser.password) {
+    console.info(`user=${email} has no password set`, dbUser)
     return authError(done, EXPIRED)
   }
 
-  // authenticate
-  if (await compare(password, dbUser.password)) {
-    const sessionId = newid()
-    const tenantId = getTenantId()
-
-    await createASession(dbUser._id!, { sessionId, tenantId })
-
-    const token = jwt.sign(
-      {
-        userId: dbUser._id,
-        sessionId,
-        tenantId,
-      },
-      env.JWT_SECRET
-    )
-    // Remove users password in payload
-    delete dbUser.password
-
-    return done(null, {
-      ...dbUser,
-      token,
-    })
-  } else {
+  if (!(await compare(password, dbUser.password))) {
     return authError(done, INVALID_ERR)
   }
+
+  // intentionally remove the users password in payload
+  delete dbUser.password
+  return done(null, dbUser)
 }
diff --git a/packages/backend-core/src/middleware/passport/google.ts b/packages/backend-core/src/middleware/passport/sso/google.ts
similarity index 76%
rename from packages/backend-core/src/middleware/passport/google.ts
rename to packages/backend-core/src/middleware/passport/sso/google.ts
index dd3dc8b86d..d26d7d6a8d 100644
--- a/packages/backend-core/src/middleware/passport/google.ts
+++ b/packages/backend-core/src/middleware/passport/sso/google.ts
@@ -1,18 +1,26 @@
-import { ssoCallbackUrl } from "./utils"
-import { authenticateThirdParty, SaveUserFunction } from "./third-party-common"
-import { ConfigType, GoogleConfig, Database, SSOProfile } from "@budibase/types"
+import { ssoCallbackUrl } from "../utils"
+import * as sso from "./sso"
+import {
+  ConfigType,
+  GoogleConfig,
+  Database,
+  SSOProfile,
+  SSOAuthDetails,
+  SSOProviderType,
+  SaveSSOUserFunction,
+} from "@budibase/types"
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 
-export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
+export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
   return (
     accessToken: string,
     refreshToken: string,
     profile: SSOProfile,
     done: Function
   ) => {
-    const thirdPartyUser = {
-      provider: profile.provider, // should always be 'google'
-      providerType: "google",
+    const details: SSOAuthDetails = {
+      provider: "google",
+      providerType: SSOProviderType.GOOGLE,
       userId: profile.id,
       profile: profile,
       email: profile._json.email,
@@ -22,8 +30,8 @@ export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
       },
     }
 
-    return authenticateThirdParty(
-      thirdPartyUser,
+    return sso.authenticate(
+      details,
       true, // require local accounts to exist
       done,
       saveUserFn
@@ -39,7 +47,7 @@ export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
 export async function strategyFactory(
   config: GoogleConfig["config"],
   callbackUrl: string,
-  saveUserFn?: SaveUserFunction
+  saveUserFn: SaveSSOUserFunction
 ) {
   try {
     const { clientID, clientSecret } = config
diff --git a/packages/backend-core/src/middleware/passport/oidc.ts b/packages/backend-core/src/middleware/passport/sso/oidc.ts
similarity index 85%
rename from packages/backend-core/src/middleware/passport/oidc.ts
rename to packages/backend-core/src/middleware/passport/sso/oidc.ts
index 7caa177cf0..1fb44b84a3 100644
--- a/packages/backend-core/src/middleware/passport/oidc.ts
+++ b/packages/backend-core/src/middleware/passport/sso/oidc.ts
@@ -1,22 +1,20 @@
 import fetch from "node-fetch"
-import { authenticateThirdParty, SaveUserFunction } from "./third-party-common"
-import { ssoCallbackUrl } from "./utils"
+import * as sso from "./sso"
+import { ssoCallbackUrl } from "../utils"
 import {
   ConfigType,
-  OIDCInnerCfg,
+  OIDCInnerConfig,
   Database,
   SSOProfile,
-  ThirdPartyUser,
-  OIDCConfiguration,
+  OIDCStrategyConfiguration,
+  SSOAuthDetails,
+  SSOProviderType,
+  JwtClaims,
+  SaveSSOUserFunction,
 } from "@budibase/types"
 const OIDCStrategy = require("@techpass/passport-openidconnect").Strategy
 
-type JwtClaims = {
-  preferred_username: string
-  email: string
-}
-
-export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
+export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
   /**
    * @param {*} issuer The identity provider base URL
    * @param {*} sub The user ID
@@ -39,10 +37,10 @@ export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
     params: any,
     done: Function
   ) => {
-    const thirdPartyUser: ThirdPartyUser = {
+    const details: SSOAuthDetails = {
       // store the issuer info to enable sync in future
       provider: issuer,
-      providerType: "oidc",
+      providerType: SSOProviderType.OIDC,
       userId: profile.id,
       profile: profile,
       email: getEmail(profile, jwtClaims),
@@ -52,8 +50,8 @@ export function buildVerifyFn(saveUserFn?: SaveUserFunction) {
       },
     }
 
-    return authenticateThirdParty(
-      thirdPartyUser,
+    return sso.authenticate(
+      details,
       false, // don't require local accounts to exist
       done,
       saveUserFn
@@ -104,8 +102,8 @@ function validEmail(value: string) {
  * @returns Dynamically configured Passport OIDC Strategy
  */
 export async function strategyFactory(
-  config: OIDCConfiguration,
-  saveUserFn?: SaveUserFunction
+  config: OIDCStrategyConfiguration,
+  saveUserFn: SaveSSOUserFunction
 ) {
   try {
     const verify = buildVerifyFn(saveUserFn)
@@ -119,14 +117,14 @@ export async function strategyFactory(
 }
 
 export async function fetchStrategyConfig(
-  enrichedConfig: OIDCInnerCfg,
+  oidcConfig: OIDCInnerConfig,
   callbackUrl?: string
-): Promise<OIDCConfiguration> {
+): Promise<OIDCStrategyConfiguration> {
   try {
-    const { clientID, clientSecret, configUrl } = enrichedConfig
+    const { clientID, clientSecret, configUrl } = oidcConfig
 
     if (!clientID || !clientSecret || !callbackUrl || !configUrl) {
-      //check for remote config and all required elements
+      // check for remote config and all required elements
       throw new Error(
         "Configuration invalid. Must contain clientID, clientSecret, callbackUrl and configUrl"
       )
diff --git a/packages/backend-core/src/middleware/passport/sso/sso.ts b/packages/backend-core/src/middleware/passport/sso/sso.ts
new file mode 100644
index 0000000000..2fc1184722
--- /dev/null
+++ b/packages/backend-core/src/middleware/passport/sso/sso.ts
@@ -0,0 +1,165 @@
+import { generateGlobalUserID } from "../../../db"
+import { authError } from "../utils"
+import * as users from "../../../users"
+import * as context from "../../../context"
+import fetch from "node-fetch"
+import {
+  SaveSSOUserFunction,
+  SaveUserOpts,
+  SSOAuthDetails,
+  SSOUser,
+  User,
+} from "@budibase/types"
+
+// no-op function for user save
+// - this allows datasource auth and access token refresh to work correctly
+// - prefer no-op over an optional argument to ensure function is provided to login flows
+export const ssoSaveUserNoOp: SaveSSOUserFunction = (
+  user: SSOUser,
+  opts: SaveUserOpts
+) => Promise.resolve(user)
+
+/**
+ * Common authentication logic for third parties. e.g. OAuth, OIDC.
+ */
+export async function authenticate(
+  details: SSOAuthDetails,
+  requireLocalAccount: boolean = true,
+  done: any,
+  saveUserFn: SaveSSOUserFunction
+) {
+  if (!saveUserFn) {
+    throw new Error("Save user function must be provided")
+  }
+  if (!details.userId) {
+    return authError(done, "sso user id required")
+  }
+  if (!details.email) {
+    return authError(done, "sso user email required")
+  }
+
+  // use the third party id
+  const userId = generateGlobalUserID(details.userId)
+
+  let dbUser: User | undefined
+
+  // try to load by id
+  try {
+    dbUser = await users.getById(userId)
+  } catch (err: any) {
+    // abort when not 404 error
+    if (!err.status || err.status !== 404) {
+      return authError(
+        done,
+        "Unexpected error when retrieving existing user",
+        err
+      )
+    }
+  }
+
+  // fallback to loading by email
+  if (!dbUser) {
+    dbUser = await users.getGlobalUserByEmail(details.email)
+  }
+
+  // exit early if there is still no user and auto creation is disabled
+  if (!dbUser && requireLocalAccount) {
+    return authError(
+      done,
+      "Email does not yet exist. You must set up your local budibase account first."
+    )
+  }
+
+  // first time creation
+  if (!dbUser) {
+    // setup a blank user using the third party id
+    dbUser = {
+      _id: userId,
+      email: details.email,
+      roles: {},
+      tenantId: context.getTenantId(),
+    }
+  }
+
+  let ssoUser = await syncUser(dbUser, details)
+  // never prompt for password reset
+  ssoUser.forceResetPassword = false
+
+  try {
+    // don't try to re-save any existing password
+    delete ssoUser.password
+    // create or sync the user
+    ssoUser = (await saveUserFn(ssoUser, {
+      hashPassword: false,
+      requirePassword: false,
+    })) as SSOUser
+  } catch (err: any) {
+    return authError(done, "Error saving user", err)
+  }
+
+  return done(null, ssoUser)
+}
+
+async function getProfilePictureUrl(user: User, details: SSOAuthDetails) {
+  const pictureUrl = details.profile?._json.picture
+  if (pictureUrl) {
+    const response = await fetch(pictureUrl)
+    if (response.status === 200) {
+      const type = response.headers.get("content-type") as string
+      if (type.startsWith("image/")) {
+        return pictureUrl
+      }
+    }
+  }
+}
+
+/**
+ * @returns a user that has been sync'd with third party information
+ */
+async function syncUser(user: User, details: SSOAuthDetails): Promise<SSOUser> {
+  let firstName
+  let lastName
+  let pictureUrl
+  let oauth2
+  let thirdPartyProfile
+
+  if (details.profile) {
+    const profile = details.profile
+
+    if (profile.name) {
+      const name = profile.name
+      // first name
+      if (name.givenName) {
+        firstName = name.givenName
+      }
+      // last name
+      if (name.familyName) {
+        lastName = name.familyName
+      }
+    }
+
+    pictureUrl = await getProfilePictureUrl(user, details)
+
+    thirdPartyProfile = {
+      ...profile._json,
+    }
+  }
+
+  // oauth tokens for future use
+  if (details.oauth2) {
+    oauth2 = {
+      ...details.oauth2,
+    }
+  }
+
+  return {
+    ...user,
+    provider: details.provider,
+    providerType: details.providerType,
+    firstName,
+    lastName,
+    thirdPartyProfile,
+    pictureUrl,
+    oauth2,
+  }
+}
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
new file mode 100644
index 0000000000..eb8ffc9b71
--- /dev/null
+++ b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
@@ -0,0 +1,67 @@
+import { generator, structures } from "../../../../../tests"
+import { SSOProviderType } from "@budibase/types"
+
+jest.mock("passport-google-oauth")
+const mockStrategy = require("passport-google-oauth").OAuth2Strategy
+
+jest.mock("../sso")
+import * as _sso from "../sso"
+const sso = jest.mocked(_sso)
+
+const mockSaveUserFn = jest.fn()
+const mockDone = jest.fn()
+
+import * as google from "../google"
+
+describe("google", () => {
+  describe("strategyFactory", () => {
+    const googleConfig = structures.sso.googleConfig()
+    const callbackUrl = generator.url()
+
+    it("should create successfully create a google strategy", async () => {
+      await google.strategyFactory(googleConfig, callbackUrl)
+
+      const expectedOptions = {
+        clientID: googleConfig.clientID,
+        clientSecret: googleConfig.clientSecret,
+        callbackURL: callbackUrl,
+      }
+
+      expect(mockStrategy).toHaveBeenCalledWith(
+        expectedOptions,
+        expect.anything()
+      )
+    })
+  })
+
+  describe("authenticate", () => {
+    const details = structures.sso.authDetails()
+    details.provider = "google"
+    details.providerType = SSOProviderType.GOOGLE
+
+    const profile = details.profile!
+    profile.provider = "google"
+
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it("delegates authentication to third party common", async () => {
+      const authenticate = await google.buildVerifyFn(mockSaveUserFn)
+
+      await authenticate(
+        details.oauth2.accessToken,
+        details.oauth2.refreshToken!,
+        profile,
+        mockDone
+      )
+
+      expect(sso.authenticate).toHaveBeenCalledWith(
+        details,
+        true,
+        mockDone,
+        mockSaveUserFn
+      )
+    })
+  })
+})
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/oidc.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/oidc.spec.ts
new file mode 100644
index 0000000000..a705739bd6
--- /dev/null
+++ b/packages/backend-core/src/middleware/passport/sso/tests/oidc.spec.ts
@@ -0,0 +1,152 @@
+import { generator, mocks, structures } from "../../../../../tests"
+import {
+  JwtClaims,
+  OIDCInnerConfig,
+  SSOAuthDetails,
+  SSOProviderType,
+} from "@budibase/types"
+import * as _sso from "../sso"
+import * as oidc from "../oidc"
+
+jest.mock("@techpass/passport-openidconnect")
+const mockStrategy = require("@techpass/passport-openidconnect").Strategy
+
+jest.mock("../sso")
+const sso = jest.mocked(_sso)
+
+const mockSaveUser = jest.fn()
+const mockDone = jest.fn()
+
+describe("oidc", () => {
+  const callbackUrl = generator.url()
+  const oidcConfig: OIDCInnerConfig = structures.sso.oidcConfig()
+  const wellKnownConfig = structures.sso.oidcWellKnownConfig()
+
+  function mockRetrieveWellKnownConfig() {
+    // mock the request to retrieve the oidc configuration
+    mocks.fetch.mockReturnValue({
+      ok: true,
+      json: () => wellKnownConfig,
+    })
+  }
+
+  beforeEach(() => {
+    mockRetrieveWellKnownConfig()
+  })
+
+  describe("strategyFactory", () => {
+    it("should create successfully create an oidc strategy", async () => {
+      const strategyConfiguration = await oidc.fetchStrategyConfig(
+        oidcConfig,
+        callbackUrl
+      )
+      await oidc.strategyFactory(strategyConfiguration, mockSaveUser)
+
+      expect(mocks.fetch).toHaveBeenCalledWith(oidcConfig.configUrl)
+
+      const expectedOptions = {
+        issuer: wellKnownConfig.issuer,
+        authorizationURL: wellKnownConfig.authorization_endpoint,
+        tokenURL: wellKnownConfig.token_endpoint,
+        userInfoURL: wellKnownConfig.userinfo_endpoint,
+        clientID: oidcConfig.clientID,
+        clientSecret: oidcConfig.clientSecret,
+        callbackURL: callbackUrl,
+      }
+      expect(mockStrategy).toHaveBeenCalledWith(
+        expectedOptions,
+        expect.anything()
+      )
+    })
+  })
+
+  describe("authenticate", () => {
+    const details: SSOAuthDetails = structures.sso.authDetails()
+    details.providerType = SSOProviderType.OIDC
+    const profile = details.profile!
+    const issuer = profile.provider
+
+    const sub = generator.string()
+    const idToken = generator.string()
+    const params = {}
+
+    let authenticateFn: any
+    let jwtClaims: JwtClaims
+
+    beforeEach(async () => {
+      jest.clearAllMocks()
+      authenticateFn = await oidc.buildVerifyFn(mockSaveUser)
+    })
+
+    async function authenticate() {
+      await authenticateFn(
+        issuer,
+        sub,
+        profile,
+        jwtClaims,
+        details.oauth2.accessToken,
+        details.oauth2.refreshToken,
+        idToken,
+        params,
+        mockDone
+      )
+    }
+
+    it("passes auth details to sso module", async () => {
+      await authenticate()
+
+      expect(sso.authenticate).toHaveBeenCalledWith(
+        details,
+        false,
+        mockDone,
+        mockSaveUser
+      )
+    })
+
+    it("uses JWT email to get email", async () => {
+      delete profile._json.email
+
+      jwtClaims = {
+        email: details.email,
+      }
+
+      await authenticate()
+
+      expect(sso.authenticate).toHaveBeenCalledWith(
+        details,
+        false,
+        mockDone,
+        mockSaveUser
+      )
+    })
+
+    it("uses JWT username to get email", async () => {
+      delete profile._json.email
+
+      jwtClaims = {
+        email: details.email,
+      }
+
+      await authenticate()
+
+      expect(sso.authenticate).toHaveBeenCalledWith(
+        details,
+        false,
+        mockDone,
+        mockSaveUser
+      )
+    })
+
+    it("uses JWT invalid username to get email", async () => {
+      delete profile._json.email
+
+      jwtClaims = {
+        preferred_username: "invalidUsername",
+      }
+
+      await expect(authenticate()).rejects.toThrow(
+        "Could not determine user email from profile"
+      )
+    })
+  })
+})
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
new file mode 100644
index 0000000000..ae42fc01ea
--- /dev/null
+++ b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
@@ -0,0 +1,196 @@
+import { structures, testEnv, mocks } from "../../../../../tests"
+import { SSOAuthDetails, User } from "@budibase/types"
+
+import { HTTPError } from "../../../../errors"
+import * as sso from "../sso"
+import * as context from "../../../../context"
+
+const mockDone = jest.fn()
+const mockSaveUser = jest.fn()
+
+jest.mock("../../../../users")
+import * as _users from "../../../../users"
+const users = jest.mocked(_users)
+
+const getErrorMessage = () => {
+  return mockDone.mock.calls[0][2].message
+}
+
+describe("sso", () => {
+  describe("authenticate", () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+      testEnv.singleTenant()
+    })
+
+    describe("validation", () => {
+      const testValidation = async (
+        details: SSOAuthDetails,
+        message: string
+      ) => {
+        await sso.authenticate(details, false, mockDone, mockSaveUser)
+
+        expect(mockDone.mock.calls.length).toBe(1)
+        expect(getErrorMessage()).toContain(message)
+      }
+
+      it("user id fails", async () => {
+        const details = structures.sso.authDetails()
+        details.userId = undefined!
+
+        await testValidation(details, "sso user id required")
+      })
+
+      it("email fails", async () => {
+        const details = structures.sso.authDetails()
+        details.email = undefined!
+
+        await testValidation(details, "sso user email required")
+      })
+    })
+
+    function mockGetProfilePicture() {
+      mocks.fetch.mockReturnValueOnce(
+        Promise.resolve({
+          status: 200,
+          headers: { get: () => "image/" },
+        })
+      )
+    }
+
+    describe("when the user doesn't exist", () => {
+      let user: User
+      let details: SSOAuthDetails
+
+      beforeEach(() => {
+        users.getById.mockImplementationOnce(() => {
+          throw new HTTPError("", 404)
+        })
+        mockGetProfilePicture()
+
+        user = structures.users.user()
+        delete user._rev
+        delete user._id
+
+        details = structures.sso.authDetails(user)
+        details.userId = structures.uuid()
+      })
+
+      describe("when a local account is required", () => {
+        it("returns an error message", async () => {
+          const details = structures.sso.authDetails()
+
+          await sso.authenticate(details, true, mockDone, mockSaveUser)
+
+          expect(mockDone.mock.calls.length).toBe(1)
+          expect(getErrorMessage()).toContain(
+            "Email does not yet exist. You must set up your local budibase account first."
+          )
+        })
+      })
+
+      describe("when a local account isn't required", () => {
+        it("creates and authenticates the user", async () => {
+          const ssoUser = structures.users.ssoUser({ user, details })
+          mockSaveUser.mockReturnValueOnce(ssoUser)
+
+          await sso.authenticate(details, false, mockDone, mockSaveUser)
+
+          // default roles for new user
+          ssoUser.roles = {}
+
+          // modified external id to match user format
+          ssoUser._id = "us_" + details.userId
+
+          // new sso user won't have a password
+          delete ssoUser.password
+
+          // new user isn't saved with rev
+          delete ssoUser._rev
+
+          // tenant id added
+          ssoUser.tenantId = context.getTenantId()
+
+          expect(mockSaveUser).toBeCalledWith(ssoUser, {
+            hashPassword: false,
+            requirePassword: false,
+          })
+          expect(mockDone).toBeCalledWith(null, ssoUser)
+        })
+      })
+    })
+
+    describe("when the user exists", () => {
+      let existingUser: User
+      let details: SSOAuthDetails
+
+      beforeEach(() => {
+        existingUser = structures.users.user()
+        existingUser._id = structures.uuid()
+        details = structures.sso.authDetails(existingUser)
+        mockGetProfilePicture()
+      })
+
+      describe("exists by email", () => {
+        beforeEach(() => {
+          users.getById.mockImplementationOnce(() => {
+            throw new HTTPError("", 404)
+          })
+          users.getGlobalUserByEmail.mockReturnValueOnce(
+            Promise.resolve(existingUser)
+          )
+        })
+
+        it("syncs and authenticates the user", async () => {
+          const ssoUser = structures.users.ssoUser({
+            user: existingUser,
+            details,
+          })
+          mockSaveUser.mockReturnValueOnce(ssoUser)
+
+          await sso.authenticate(details, true, mockDone, mockSaveUser)
+
+          // roles preserved
+          ssoUser.roles = existingUser.roles
+
+          // existing id preserved
+          ssoUser._id = existingUser._id
+
+          expect(mockSaveUser).toBeCalledWith(ssoUser, {
+            hashPassword: false,
+            requirePassword: false,
+          })
+          expect(mockDone).toBeCalledWith(null, ssoUser)
+        })
+      })
+
+      describe("exists by id", () => {
+        beforeEach(() => {
+          users.getById.mockReturnValueOnce(Promise.resolve(existingUser))
+        })
+
+        it("syncs and authenticates the user", async () => {
+          const ssoUser = structures.users.ssoUser({
+            user: existingUser,
+            details,
+          })
+          mockSaveUser.mockReturnValueOnce(ssoUser)
+
+          await sso.authenticate(details, true, mockDone, mockSaveUser)
+
+          // roles preserved
+          ssoUser.roles = existingUser.roles
+
+          // existing id preserved
+          ssoUser._id = existingUser._id
+
+          expect(mockSaveUser).toBeCalledWith(ssoUser, {
+            hashPassword: false,
+            requirePassword: false,
+          })
+          expect(mockDone).toBeCalledWith(null, ssoUser)
+        })
+      })
+    })
+  })
+})
diff --git a/packages/backend-core/src/middleware/passport/tests/google.spec.js b/packages/backend-core/src/middleware/passport/tests/google.spec.js
deleted file mode 100644
index c5580ea309..0000000000
--- a/packages/backend-core/src/middleware/passport/tests/google.spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Mock data
-
-const { data } = require("./utilities/mock-data")
-
-const TENANT_ID = "default"
-
-const googleConfig = {
-  clientID: data.clientID,
-  clientSecret: data.clientSecret,
-}
-
-const profile = {
-  id: "mockId",
-  _json: {
-    email : data.email
-  },
-  provider: "google"
-}
-
-const user = data.buildThirdPartyUser("google", "google", profile)
-
-describe("google", () => {
-  describe("strategyFactory", () => {  
-    // mock passport strategy factory
-    jest.mock("passport-google-oauth")
-    const mockStrategy = require("passport-google-oauth").OAuth2Strategy
-  
-    it("should create successfully create a google strategy", async () => {
-      const google = require("../google")
-
-      const callbackUrl = `/api/global/auth/${TENANT_ID}/google/callback`
-      await google.strategyFactory(googleConfig, callbackUrl)
-  
-      const expectedOptions = {
-        clientID: googleConfig.clientID,
-        clientSecret: googleConfig.clientSecret,
-        callbackURL: callbackUrl,
-      }
-
-      expect(mockStrategy).toHaveBeenCalledWith(
-        expectedOptions,
-        expect.anything()
-      )
-    })
-  })
-  
-  describe("authenticate", () => {    
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-
-    // mock third party common authentication
-    jest.mock("../third-party-common")
-    const authenticateThirdParty = require("../third-party-common").authenticateThirdParty
-
-    // mock the passport callback
-    const mockDone = jest.fn()
-
-    it("delegates authentication to third party common", async () => {
-      const google = require("../google")
-      const mockSaveUserFn = jest.fn()
-      const authenticate = await google.buildVerifyFn(mockSaveUserFn)
-
-      await authenticate(
-        data.accessToken,
-        data.refreshToken,
-        profile,
-        mockDone
-      )
-
-      expect(authenticateThirdParty).toHaveBeenCalledWith(
-        user,
-        true, 
-        mockDone,
-        mockSaveUserFn)
-    })
-  })
-})
-
diff --git a/packages/backend-core/src/middleware/passport/tests/oidc.spec.js b/packages/backend-core/src/middleware/passport/tests/oidc.spec.js
deleted file mode 100644
index 4c8aa94ddf..0000000000
--- a/packages/backend-core/src/middleware/passport/tests/oidc.spec.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// Mock data
-const mockFetch = require("node-fetch")
-const { data } = require("./utilities/mock-data")
-const issuer = "mockIssuer"
-const sub = "mockSub"
-const profile = {
-  id: "mockId",
-  _json: {
-    email : data.email
-  }
-}
-let jwtClaims = {}  
-const idToken = "mockIdToken"
-const params = {}
-
-const callbackUrl = "http://somecallbackurl"
-
-// response from .well-known/openid-configuration
-const oidcConfigUrlResponse = {
-  issuer: issuer,
-  authorization_endpoint: "mockAuthorizationEndpoint",
-  token_endpoint: "mockTokenEndpoint",
-  userinfo_endpoint: "mockUserInfoEndpoint"
-}
-
-const oidcConfig = {
-  configUrl: "http://someconfigurl",
-  clientID: data.clientID,
-  clientSecret: data.clientSecret,
-}
-
-const user = data.buildThirdPartyUser(issuer, "oidc", profile)
-
-describe("oidc", () => {
-  describe("strategyFactory", () => {  
-    // mock passport strategy factory
-    jest.mock("@techpass/passport-openidconnect")
-    const mockStrategy = require("@techpass/passport-openidconnect").Strategy
-    
-    // mock the request to retrieve the oidc configuration
-    mockFetch.mockReturnValue({
-      ok: true,
-      json: () => oidcConfigUrlResponse
-    })
-  
-    it("should create successfully create an oidc strategy", async () => {
-      const oidc = require("../oidc")
-      const enrichedConfig = await oidc.fetchStrategyConfig(oidcConfig, callbackUrl)
-      await oidc.strategyFactory(enrichedConfig, callbackUrl)
-  
-      expect(mockFetch).toHaveBeenCalledWith(oidcConfig.configUrl)
-
-      const expectedOptions = {
-        issuer: oidcConfigUrlResponse.issuer,
-        authorizationURL: oidcConfigUrlResponse.authorization_endpoint,
-        tokenURL: oidcConfigUrlResponse.token_endpoint,
-        userInfoURL: oidcConfigUrlResponse.userinfo_endpoint,
-        clientID: oidcConfig.clientID,
-        clientSecret: oidcConfig.clientSecret,
-        callbackURL: callbackUrl,
-      }
-      expect(mockStrategy).toHaveBeenCalledWith(
-        expectedOptions,
-        expect.anything()
-      )
-    })
-  })
-  
-  describe("authenticate", () => {    
-    afterEach(() => {
-      jest.clearAllMocks()
-    });
-
-    // mock third party common authentication
-    jest.mock("../third-party-common")
-    const authenticateThirdParty = require("../third-party-common").authenticateThirdParty
-    
-    // mock the passport callback
-    const mockDone = jest.fn()
-    const mockSaveUserFn = jest.fn()
-
-    async function doAuthenticate() {
-      const oidc = require("../oidc")
-      const authenticate = await oidc.buildVerifyFn(mockSaveUserFn)
-
-      await authenticate(
-        issuer,
-        sub,
-        profile,
-        jwtClaims,
-        data.accessToken,
-        data.refreshToken,
-        idToken,
-        params,
-        mockDone
-      )
-    }
-
-    async function doTest() {
-      await doAuthenticate()
-
-      expect(authenticateThirdParty).toHaveBeenCalledWith(
-        user,
-        false, 
-        mockDone,
-        mockSaveUserFn,
-      )
-    }
-
-    it("delegates authentication to third party common", async () => {
-      await doTest()
-    })
-
-    it("uses JWT email to get email", async () => {
-      delete profile._json.email
-      jwtClaims = {
-        email : "mock@budibase.com"
-      }
-
-      await doTest()
-    })
-  
-    it("uses JWT username to get email", async () => {
-      delete profile._json.email
-      jwtClaims = {
-        preferred_username : "mock@budibase.com"
-      }
-
-      await doTest()
-    })
-
-    it("uses JWT invalid username to get email", async () => {
-      delete profile._json.email
-
-      jwtClaims = {
-        preferred_username : "invalidUsername"
-      }
-
-      await expect(doAuthenticate()).rejects.toThrow("Could not determine user email from profile");
-    })
-  
-  })
-})
-
diff --git a/packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js b/packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js
deleted file mode 100644
index d377d602f1..0000000000
--- a/packages/backend-core/src/middleware/passport/tests/third-party-common.seq.spec.js
+++ /dev/null
@@ -1,178 +0,0 @@
-require("../../../../tests")
-const { authenticateThirdParty } = require("../third-party-common")
-const { data } = require("./utilities/mock-data")
-const { DEFAULT_TENANT_ID } = require("../../../constants")
-
-const { generateGlobalUserID } = require("../../../db/utils")
-const { newid } = require("../../../utils")
-const { doWithGlobalDB, doInTenant } = require("../../../tenancy")
-
-const done = jest.fn()
-
-const getErrorMessage = () => {
-  return done.mock.calls[0][2].message
-}
-
-const saveUser = async (user) => {
-  return doWithGlobalDB(DEFAULT_TENANT_ID, async db => {
-    return await db.put(user)
-  })
-}
-
-function authenticate(user, requireLocal, saveFn) {
-  return doInTenant(DEFAULT_TENANT_ID, () => {
-    return authenticateThirdParty(user, requireLocal, done, saveFn)
-  })
-}
-
-describe("third party common", () => {
-  describe("authenticateThirdParty", () => {
-    let thirdPartyUser
-
-    beforeEach(() => {
-      thirdPartyUser = data.buildThirdPartyUser()
-    })
-
-    afterEach(async () => {
-      return doWithGlobalDB(DEFAULT_TENANT_ID, async db => {
-        jest.clearAllMocks()
-        await db.destroy()
-      })
-    })
-
-    describe("validation", () => {
-      const testValidation = async (message) => {
-        await authenticate(thirdPartyUser, false, saveUser)
-        expect(done.mock.calls.length).toBe(1)
-        expect(getErrorMessage()).toContain(message)
-      }
-
-      it("provider fails", async () => {
-        delete thirdPartyUser.provider
-        await testValidation("third party user provider required")
-      })
-
-      it("user id fails", async () => {
-        delete thirdPartyUser.userId
-        await testValidation("third party user id required")
-      })
-
-      it("email fails", async () => {
-        delete thirdPartyUser.email
-        await testValidation("third party user email required")
-      })
-    })
-
-    const expectUserIsAuthenticated = () => {
-      const user = done.mock.calls[0][1]
-      expect(user).toBeDefined()
-      expect(user._id).toBeDefined()
-      expect(user._rev).toBeDefined()
-      expect(user.token).toBeDefined()
-      return user
-    }
-
-    const expectUserIsSynced = (user, thirdPartyUser) => {
-      expect(user.provider).toBe(thirdPartyUser.provider)
-      expect(user.firstName).toBe(thirdPartyUser.profile.name.givenName)
-      expect(user.lastName).toBe(thirdPartyUser.profile.name.familyName)
-      expect(user.thirdPartyProfile).toStrictEqual(thirdPartyUser.profile._json)
-      expect(user.oauth2).toStrictEqual(thirdPartyUser.oauth2)
-    }
-
-    describe("when the user doesn't exist", () => {
-      describe("when a local account is required", () => {
-        it("returns an error message", async () => {
-          await authenticate(thirdPartyUser, true, saveUser)
-          expect(done.mock.calls.length).toBe(1)
-          expect(getErrorMessage()).toContain("Email does not yet exist. You must set up your local budibase account first.")
-        })
-      })
-
-      describe("when a local account isn't required", () => {
-        it("creates and authenticates the user", async () => {
-          await authenticate(thirdPartyUser, false, saveUser)
-          const user = expectUserIsAuthenticated()
-          expectUserIsSynced(user, thirdPartyUser)
-          expect(user.roles).toStrictEqual({})
-        })
-      })
-    })
-
-    describe("when the user exists", () => {
-      let dbUser
-      let id
-      let email
-
-      const createUser = async () => {
-        return doWithGlobalDB(DEFAULT_TENANT_ID, async db => {
-          dbUser = {
-            _id: id,
-            email: email,
-          }
-          const response = await db.put(dbUser)
-          dbUser._rev = response.rev
-          return dbUser
-        })
-      }
-
-      const expectUserIsUpdated = (user) => {
-        // id is unchanged
-        expect(user._id).toBe(id)
-        // user is updated
-        expect(user._rev).not.toBe(dbUser._rev)
-      }
-
-      describe("exists by email", () => {
-        beforeEach(async () => {
-          id = generateGlobalUserID(newid()) // random id
-          email = thirdPartyUser.email //  matching email
-          await createUser()
-        })
-
-        it("syncs and authenticates the user", async () => {
-          await authenticate(thirdPartyUser, true, saveUser)
-
-          const user = expectUserIsAuthenticated()
-          expectUserIsSynced(user, thirdPartyUser)
-          expectUserIsUpdated(user)
-        })
-      })
-
-      describe("exists by email with different casing", () => {
-        beforeEach(async () => {
-          id = generateGlobalUserID(newid()) // random id
-          email = thirdPartyUser.email.toUpperCase() //  matching email except for casing
-          await createUser()
-        })
-
-        it("syncs and authenticates the user", async () => {
-          await authenticate(thirdPartyUser, true, saveUser)
-
-          const user = expectUserIsAuthenticated()
-          expectUserIsSynced(user, thirdPartyUser)
-          expectUserIsUpdated(user)
-          expect(user.email).toBe(thirdPartyUser.email.toUpperCase())
-        })
-      })
-
-
-      describe("exists by id", () => {
-        beforeEach(async () => {
-          id = generateGlobalUserID(thirdPartyUser.userId) // matching id
-          email = "test@test.com" // random email
-          await createUser()
-        })
-
-        it("syncs and authenticates the user", async () => {
-          await authenticate(thirdPartyUser, true, saveUser)
-
-          const user = expectUserIsAuthenticated()
-          expectUserIsSynced(user, thirdPartyUser)
-          expectUserIsUpdated(user)
-        })
-      })
-    })
-  })
-})
-
diff --git a/packages/backend-core/src/middleware/passport/tests/utilities/mock-data.js b/packages/backend-core/src/middleware/passport/tests/utilities/mock-data.js
deleted file mode 100644
index 00ae82e47e..0000000000
--- a/packages/backend-core/src/middleware/passport/tests/utilities/mock-data.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Mock Data
-
-const mockClientID = "mockClientID"
-const mockClientSecret = "mockClientSecret"
-
-const mockEmail = "mock@budibase.com"
-const mockAccessToken = "mockAccessToken"
-const mockRefreshToken = "mockRefreshToken"
-
-const mockProvider = "mockProvider"
-const mockProviderType = "mockProviderType"
-
-const mockProfile = {
-  id: "mockId",
-  name: {
-    givenName: "mockGivenName",
-    familyName: "mockFamilyName",
-  },
-  _json: {
-    email: mockEmail,
-  },
-}
-
-const buildOauth2 = (
-  accessToken = mockAccessToken,
-  refreshToken = mockRefreshToken
-) => ({
-  accessToken: accessToken,
-  refreshToken: refreshToken,
-})
-
-const buildThirdPartyUser = (
-  provider = mockProvider,
-  providerType = mockProviderType,
-  profile = mockProfile,
-  email = mockEmail,
-  oauth2 = buildOauth2()
-) => ({
-  provider: provider,
-  providerType: providerType,
-  userId: profile.id,
-  profile: profile,
-  email: email,
-  oauth2: oauth2,
-})
-
-exports.data = {
-  clientID: mockClientID,
-  clientSecret: mockClientSecret,
-  email: mockEmail,
-  accessToken: mockAccessToken,
-  refreshToken: mockRefreshToken,
-  buildThirdPartyUser,
-}
diff --git a/packages/backend-core/src/middleware/passport/third-party-common.ts b/packages/backend-core/src/middleware/passport/third-party-common.ts
deleted file mode 100644
index 9d7b93f370..0000000000
--- a/packages/backend-core/src/middleware/passport/third-party-common.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import env from "../../environment"
-import { generateGlobalUserID } from "../../db"
-import { authError } from "./utils"
-import { newid } from "../../utils"
-import { createASession } from "../../security/sessions"
-import * as users from "../../users"
-import { getGlobalDB, getTenantId } from "../../tenancy"
-import fetch from "node-fetch"
-import { ThirdPartyUser } from "@budibase/types"
-const jwt = require("jsonwebtoken")
-
-type SaveUserOpts = {
-  requirePassword?: boolean
-  hashPassword?: boolean
-  currentUserId?: string
-}
-
-export type SaveUserFunction = (
-  user: ThirdPartyUser,
-  opts: SaveUserOpts
-) => Promise<any>
-
-/**
- * Common authentication logic for third parties. e.g. OAuth, OIDC.
- */
-export async function authenticateThirdParty(
-  thirdPartyUser: ThirdPartyUser,
-  requireLocalAccount: boolean = true,
-  done: Function,
-  saveUserFn?: SaveUserFunction
-) {
-  if (!saveUserFn) {
-    throw new Error("Save user function must be provided")
-  }
-  if (!thirdPartyUser.provider) {
-    return authError(done, "third party user provider required")
-  }
-  if (!thirdPartyUser.userId) {
-    return authError(done, "third party user id required")
-  }
-  if (!thirdPartyUser.email) {
-    return authError(done, "third party user email required")
-  }
-
-  // use the third party id
-  const userId = generateGlobalUserID(thirdPartyUser.userId)
-  const db = getGlobalDB()
-
-  let dbUser
-
-  // try to load by id
-  try {
-    dbUser = await db.get(userId)
-  } catch (err: any) {
-    // abort when not 404 error
-    if (!err.status || err.status !== 404) {
-      return authError(
-        done,
-        "Unexpected error when retrieving existing user",
-        err
-      )
-    }
-  }
-
-  // fallback to loading by email
-  if (!dbUser) {
-    dbUser = await users.getGlobalUserByEmail(thirdPartyUser.email)
-  }
-
-  // exit early if there is still no user and auto creation is disabled
-  if (!dbUser && requireLocalAccount) {
-    return authError(
-      done,
-      "Email does not yet exist. You must set up your local budibase account first."
-    )
-  }
-
-  // first time creation
-  if (!dbUser) {
-    // setup a blank user using the third party id
-    dbUser = {
-      _id: userId,
-      email: thirdPartyUser.email,
-      roles: {},
-    }
-  }
-
-  dbUser = await syncUser(dbUser, thirdPartyUser)
-
-  // never prompt for password reset
-  dbUser.forceResetPassword = false
-
-  // create or sync the user
-  try {
-    await saveUserFn(dbUser, { hashPassword: false, requirePassword: false })
-  } catch (err: any) {
-    return authError(done, "Error saving user", err)
-  }
-
-  // now that we're sure user exists, load them from the db
-  dbUser = await db.get(dbUser._id)
-
-  // authenticate
-  const sessionId = newid()
-  const tenantId = getTenantId()
-  await createASession(dbUser._id, { sessionId, tenantId })
-
-  dbUser.token = jwt.sign(
-    {
-      userId: dbUser._id,
-      sessionId,
-    },
-    env.JWT_SECRET
-  )
-
-  return done(null, dbUser)
-}
-
-async function syncProfilePicture(
-  user: ThirdPartyUser,
-  thirdPartyUser: ThirdPartyUser
-) {
-  const pictureUrl = thirdPartyUser.profile?._json.picture
-  if (pictureUrl) {
-    const response = await fetch(pictureUrl)
-
-    if (response.status === 200) {
-      const type = response.headers.get("content-type") as string
-      if (type.startsWith("image/")) {
-        user.pictureUrl = pictureUrl
-      }
-    }
-  }
-
-  return user
-}
-
-/**
- * @returns a user that has been sync'd with third party information
- */
-async function syncUser(user: ThirdPartyUser, thirdPartyUser: ThirdPartyUser) {
-  // provider
-  user.provider = thirdPartyUser.provider
-  user.providerType = thirdPartyUser.providerType
-
-  if (thirdPartyUser.profile) {
-    const profile = thirdPartyUser.profile
-
-    if (profile.name) {
-      const name = profile.name
-      // first name
-      if (name.givenName) {
-        user.firstName = name.givenName
-      }
-      // last name
-      if (name.familyName) {
-        user.lastName = name.familyName
-      }
-    }
-
-    user = await syncProfilePicture(user, thirdPartyUser)
-
-    // profile
-    user.thirdPartyProfile = {
-      ...profile._json,
-    }
-  }
-
-  // oauth tokens for future use
-  if (thirdPartyUser.oauth2) {
-    user.oauth2 = {
-      ...thirdPartyUser.oauth2,
-    }
-  }
-
-  return user
-}
diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index 1720a79a83..ef76af390d 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -8,6 +8,7 @@ import {
 } from "./db"
 import { BulkDocsResponse, User } from "@budibase/types"
 import { getGlobalDB } from "./context"
+import * as context from "./context"
 
 export const bulkGetGlobalUsersById = async (userIds: string[]) => {
   const db = getGlobalDB()
@@ -24,6 +25,11 @@ export const bulkUpdateGlobalUsers = async (users: User[]) => {
   return (await db.bulkDocs(users)) as BulkDocsResponse
 }
 
+export async function getById(id: string): Promise<User> {
+  const db = context.getGlobalDB()
+  return db.get(id)
+}
+
 /**
  * Given an email address this will use a view to search through
  * all the users to find one with this email address.
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index c608686431..3731e134ad 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -2,23 +2,15 @@ import { getAllApps, queryGlobalView } from "../db"
 import { options } from "../middleware/passport/jwt"
 import {
   Header,
-  Cookie,
   MAX_VALID_DATE,
   DocumentType,
   SEPARATOR,
   ViewName,
 } from "../constants"
 import env from "../environment"
-import * as userCache from "../cache/user"
-import { getSessionsForUser, invalidateSessions } from "../security/sessions"
-import * as events from "../events"
 import * as tenancy from "../tenancy"
-import {
-  App,
-  Ctx,
-  PlatformLogoutOpts,
-  TenantResolutionStrategy,
-} from "@budibase/types"
+import * as context from "../context"
+import { App, Ctx, TenantResolutionStrategy } from "@budibase/types"
 import { SetOption } from "cookies"
 const jwt = require("jsonwebtoken")
 
@@ -38,7 +30,7 @@ export async function resolveAppUrl(ctx: Ctx) {
   const appUrl = ctx.path.split("/")[2]
   let possibleAppUrl = `/${appUrl.toLowerCase()}`
 
-  let tenantId: string | null = tenancy.getTenantId()
+  let tenantId: string | null = context.getTenantId()
   if (env.MULTI_TENANCY) {
     // always use the tenant id from the subdomain in multi tenancy
     // this ensures the logged-in user tenant id doesn't overwrite
@@ -49,7 +41,7 @@ export async function resolveAppUrl(ctx: Ctx) {
   }
 
   // search prod apps for a url that matches
-  const apps: App[] = await tenancy.doInTenant(tenantId, () =>
+  const apps: App[] = await context.doInTenant(tenantId, () =>
     getAllApps({ dev: false })
   )
   const app = apps.filter(
@@ -222,35 +214,6 @@ export async function getBuildersCount() {
   return builders.length
 }
 
-/**
- * Logs a user out from budibase. Re-used across account portal and builder.
- */
-export async function platformLogout(opts: PlatformLogoutOpts) {
-  const ctx = opts.ctx
-  const userId = opts.userId
-  const keepActiveSession = opts.keepActiveSession
-
-  if (!ctx) throw new Error("Koa context must be supplied to logout.")
-
-  const currentSession = getCookie(ctx, Cookie.Auth)
-  let sessions = await getSessionsForUser(userId)
-
-  if (keepActiveSession) {
-    sessions = sessions.filter(
-      session => session.sessionId !== currentSession.sessionId
-    )
-  } else {
-    // clear cookies
-    clearCookie(ctx, Cookie.Auth)
-    clearCookie(ctx, Cookie.CurrentApp)
-  }
-
-  const sessionIds = sessions.map(({ sessionId }) => sessionId)
-  await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  await events.auth.logout()
-  await userCache.invalidateUser(userId)
-}
-
 export function timeout(timeMs: number) {
   return new Promise(resolve => setTimeout(resolve, timeMs))
 }
diff --git a/packages/backend-core/tests/utilities/mocks/accounts.ts b/packages/backend-core/tests/utilities/mocks/accounts.ts
deleted file mode 100644
index e40d32b276..0000000000
--- a/packages/backend-core/tests/utilities/mocks/accounts.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-const mockGetAccount = jest.fn()
-const mockGetAccountByTenantId = jest.fn()
-const mockGetStatus = jest.fn()
-
-jest.mock("../../../src/cloud/accounts", () => ({
-  getAccount: mockGetAccount,
-  getAccountByTenantId: mockGetAccountByTenantId,
-  getStatus: mockGetStatus,
-}))
-
-export const getAccount = mockGetAccount
-export const getAccountByTenantId = mockGetAccountByTenantId
-export const getStatus = mockGetStatus
diff --git a/packages/backend-core/tests/utilities/mocks/index.ts b/packages/backend-core/tests/utilities/mocks/index.ts
index 401fd7d7a7..f5f45c0342 100644
--- a/packages/backend-core/tests/utilities/mocks/index.ts
+++ b/packages/backend-core/tests/utilities/mocks/index.ts
@@ -1,4 +1,7 @@
-export * as accounts from "./accounts"
+jest.mock("../../../src/accounts")
+import * as _accounts from "../../../src/accounts"
+export const accounts = jest.mocked(_accounts)
+
 export * as date from "./date"
 export * as licenses from "./licenses"
 export { default as fetch } from "./fetch"
diff --git a/packages/backend-core/tests/utilities/structures/accounts.ts b/packages/backend-core/tests/utilities/structures/accounts.ts
index f1718aecc0..6bfeedf196 100644
--- a/packages/backend-core/tests/utilities/structures/accounts.ts
+++ b/packages/backend-core/tests/utilities/structures/accounts.ts
@@ -1,6 +1,15 @@
 import { generator, uuid } from "."
 import * as db from "../../../src/db/utils"
-import { Account, AuthType, CloudAccount, Hosting } from "@budibase/types"
+import {
+  Account,
+  AccountSSOProvider,
+  AccountSSOProviderType,
+  AuthType,
+  CloudAccount,
+  Hosting,
+  SSOAccount,
+} from "@budibase/types"
+import _ from "lodash"
 
 export const account = (): Account => {
   return {
@@ -27,3 +36,28 @@ export const cloudAccount = (): CloudAccount => {
     budibaseUserId: db.generateGlobalUserID(),
   }
 }
+
+function providerType(): AccountSSOProviderType {
+  return _.sample(
+    Object.values(AccountSSOProviderType)
+  ) as AccountSSOProviderType
+}
+
+function provider(): AccountSSOProvider {
+  return _.sample(Object.values(AccountSSOProvider)) as AccountSSOProvider
+}
+
+export function ssoAccount(): SSOAccount {
+  return {
+    ...cloudAccount(),
+    authType: AuthType.SSO,
+    oauth2: {
+      accessToken: generator.string(),
+      refreshToken: generator.string(),
+    },
+    pictureUrl: generator.url(),
+    provider: provider(),
+    providerType: providerType(),
+    thirdPartyProfile: {},
+  }
+}
diff --git a/packages/backend-core/tests/utilities/structures/index.ts b/packages/backend-core/tests/utilities/structures/index.ts
index e74751e479..d0073ba851 100644
--- a/packages/backend-core/tests/utilities/structures/index.ts
+++ b/packages/backend-core/tests/utilities/structures/index.ts
@@ -5,8 +5,10 @@ export const generator = new Chance()
 
 export * as accounts from "./accounts"
 export * as apps from "./apps"
+export * as db from "./db"
 export * as koa from "./koa"
 export * as licenses from "./licenses"
 export * as plugins from "./plugins"
+export * as sso from "./sso"
 export * as tenant from "./tenants"
-export * as db from "./db"
+export * as users from "./users"
diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts
new file mode 100644
index 0000000000..ad5e8e87ef
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/sso.ts
@@ -0,0 +1,100 @@
+import {
+  GoogleInnerConfig,
+  JwtClaims,
+  OIDCInnerConfig,
+  OIDCWellKnownConfig,
+  SSOAuthDetails,
+  SSOProfile,
+  SSOProviderType,
+  User,
+} from "@budibase/types"
+import { uuid, generator, users, email } from "./index"
+import _ from "lodash"
+
+export function providerType(): SSOProviderType {
+  return _.sample(Object.values(SSOProviderType)) as SSOProviderType
+}
+
+export function ssoProfile(user?: User): SSOProfile {
+  if (!user) {
+    user = users.user()
+  }
+  return {
+    id: user._id!,
+    name: {
+      givenName: user.firstName,
+      familyName: user.lastName,
+    },
+    _json: {
+      email: user.email,
+      picture: "http://test.com",
+    },
+    provider: generator.string(),
+  }
+}
+
+export function authDetails(user?: User): SSOAuthDetails {
+  if (!user) {
+    user = users.user()
+  }
+
+  const userId = user._id || uuid()
+  const provider = generator.string()
+
+  const profile = ssoProfile(user)
+  profile.provider = provider
+  profile.id = userId
+
+  return {
+    email: user.email,
+    oauth2: {
+      refreshToken: generator.string(),
+      accessToken: generator.string(),
+    },
+    profile,
+    provider,
+    providerType: providerType(),
+    userId,
+  }
+}
+
+// OIDC
+
+export function oidcConfig(): OIDCInnerConfig {
+  return {
+    uuid: uuid(),
+    activated: true,
+    logo: "",
+    name: generator.string(),
+    configUrl: "http://someconfigurl",
+    clientID: generator.string(),
+    clientSecret: generator.string(),
+  }
+}
+
+// response from .well-known/openid-configuration
+export function oidcWellKnownConfig(): OIDCWellKnownConfig {
+  return {
+    issuer: generator.string(),
+    authorization_endpoint: generator.url(),
+    token_endpoint: generator.url(),
+    userinfo_endpoint: generator.url(),
+  }
+}
+
+export function jwtClaims(): JwtClaims {
+  return {
+    email: email(),
+    preferred_username: email(),
+  }
+}
+
+// GOOGLE
+
+export function googleConfig(): GoogleInnerConfig {
+  return {
+    activated: true,
+    clientID: generator.string(),
+    clientSecret: generator.string(),
+  }
+}
diff --git a/packages/backend-core/tests/utilities/structures/users.ts b/packages/backend-core/tests/utilities/structures/users.ts
new file mode 100644
index 0000000000..332c27ca12
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/users.ts
@@ -0,0 +1,70 @@
+import { generator } from "../"
+import {
+  AdminUser,
+  BuilderUser,
+  SSOAuthDetails,
+  SSOUser,
+  User,
+} from "@budibase/types"
+import { v4 as uuid } from "uuid"
+import * as sso from "./sso"
+
+export const newEmail = () => {
+  return `${uuid()}@test.com`
+}
+
+export const user = (userProps?: any): User => {
+  return {
+    email: newEmail(),
+    password: "test",
+    roles: { app_test: "admin" },
+    firstName: generator.first(),
+    lastName: generator.last(),
+    pictureUrl: "http://test.com",
+    ...userProps,
+  }
+}
+
+export const adminUser = (userProps?: any): AdminUser => {
+  return {
+    ...user(userProps),
+    admin: {
+      global: true,
+    },
+    builder: {
+      global: true,
+    },
+  }
+}
+
+export const builderUser = (userProps?: any): BuilderUser => {
+  return {
+    ...user(userProps),
+    builder: {
+      global: true,
+    },
+  }
+}
+
+export function ssoUser(
+  opts: { user?: any; details?: SSOAuthDetails } = {}
+): SSOUser {
+  const base = user(opts.user)
+  delete base.password
+
+  if (!opts.details) {
+    opts.details = sso.authDetails(base)
+  }
+
+  return {
+    ...base,
+    forceResetPassword: false,
+    oauth2: opts.details?.oauth2,
+    provider: opts.details?.provider!,
+    providerType: opts.details?.providerType!,
+    thirdPartyProfile: {
+      email: base.email,
+      picture: base.pictureUrl,
+    },
+  }
+}
diff --git a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
index d396edd4e2..935d69812f 100644
--- a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
@@ -30,9 +30,11 @@
     My profile
   </MenuItem>
   <MenuItem icon="Moon" on:click={() => themeModal.show()}>Theme</MenuItem>
-  <MenuItem icon="LockClosed" on:click={() => updatePasswordModal.show()}>
-    Update password
-  </MenuItem>
+  {#if !$auth.isSSO}
+    <MenuItem icon="LockClosed" on:click={() => updatePasswordModal.show()}>
+      Update password
+    </MenuItem>
+  {/if}
   <MenuItem icon="Key" on:click={() => apiKeyModal.show()}>
     View API key
   </MenuItem>
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index b14e3420cc..1c26273a8d 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -81,6 +81,7 @@
   let user
   let loaded = false
 
+  $: isSSO = !!user?.provider
   $: readonly = !$auth.isAdmin
   $: fullName = user?.firstName ? user?.firstName + " " + user?.lastName : ""
   $: privileged = user?.admin?.global || user?.builder?.global
@@ -246,9 +247,11 @@
             <span slot="control">
               <Icon hoverable name="More" />
             </span>
-            <MenuItem on:click={resetPasswordModal.show} icon="Refresh">
-              Force password reset
-            </MenuItem>
+            {#if !isSSO}
+              <MenuItem on:click={resetPasswordModal.show} icon="Refresh">
+                Force password reset
+              </MenuItem>
+            {/if}
             <MenuItem on:click={deleteModal.show} icon="Delete">
               Delete
             </MenuItem>
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index b10cd05e00..d039bb6eec 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -41,6 +41,7 @@ export function createAuthStore() {
       initials,
       isAdmin,
       isBuilder,
+      isSSO: !!$store.user?.provider,
     }
   })
 
diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index 9a0d69e352..cf4eef75a9 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -817,7 +817,6 @@
                       "type": "string",
                       "enum": [
                         "string",
-                        "barcodeqr",
                         "longform",
                         "options",
                         "number",
@@ -829,7 +828,8 @@
                         "formula",
                         "auto",
                         "json",
-                        "internal"
+                        "internal",
+                        "barcodeqr"
                       ],
                       "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                     },
@@ -1021,7 +1021,6 @@
                           "type": "string",
                           "enum": [
                             "string",
-                            "barcodeqr",
                             "longform",
                             "options",
                             "number",
@@ -1033,7 +1032,8 @@
                             "formula",
                             "auto",
                             "json",
-                            "internal"
+                            "internal",
+                            "barcodeqr"
                           ],
                           "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                         },
@@ -1236,7 +1236,6 @@
                             "type": "string",
                             "enum": [
                               "string",
-                              "barcodeqr",
                               "longform",
                               "options",
                               "number",
@@ -1248,7 +1247,8 @@
                               "formula",
                               "auto",
                               "json",
-                              "internal"
+                              "internal",
+                              "barcodeqr"
                             ],
                             "description": "Defines the type of the column, most explain themselves, a link column is a relationship."
                           },
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index 69e44d881c..414efe7adb 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -603,7 +603,6 @@ components:
                     type: string
                     enum:
                       - string
-                      - barcodeqr
                       - longform
                       - options
                       - number
@@ -616,6 +615,7 @@ components:
                       - auto
                       - json
                       - internal
+                      - barcodeqr
                     description: Defines the type of the column, most explain themselves, a link
                       column is a relationship.
                   constraints:
@@ -766,7 +766,6 @@ components:
                         type: string
                         enum:
                           - string
-                          - barcodeqr
                           - longform
                           - options
                           - number
@@ -779,6 +778,7 @@ components:
                           - auto
                           - json
                           - internal
+                          - barcodeqr
                         description: Defines the type of the column, most explain themselves, a link
                           column is a relationship.
                       constraints:
@@ -936,7 +936,6 @@ components:
                           type: string
                           enum:
                             - string
-                            - barcodeqr
                             - longform
                             - options
                             - number
@@ -949,6 +948,7 @@ components:
                             - auto
                             - json
                             - internal
+                            - barcodeqr
                           description: Defines the type of the column, most explain themselves, a link
                             column is a relationship.
                         constraints:
diff --git a/packages/server/src/integrations/tests/couchdb.spec.ts b/packages/server/src/integrations/tests/couchdb.spec.ts
index 0d744cd343..66735d7b74 100644
--- a/packages/server/src/integrations/tests/couchdb.spec.ts
+++ b/packages/server/src/integrations/tests/couchdb.spec.ts
@@ -1,5 +1,3 @@
-import { DatabaseWithConnection } from "@budibase/backend-core/src/db"
-
 jest.mock("@budibase/backend-core", () => {
   const core = jest.requireActual("@budibase/backend-core")
   return {
diff --git a/packages/types/src/api/account/index.ts b/packages/types/src/api/account/index.ts
index 0cbc487bcc..4be610d1b3 100644
--- a/packages/types/src/api/account/index.ts
+++ b/packages/types/src/api/account/index.ts
@@ -1,2 +1,3 @@
 export * from "./user"
 export * from "./license"
+export * from "./status"
diff --git a/packages/types/src/api/account/status.ts b/packages/types/src/api/account/status.ts
new file mode 100644
index 0000000000..f6a0db7a5e
--- /dev/null
+++ b/packages/types/src/api/account/status.ts
@@ -0,0 +1,7 @@
+export interface HealthStatusResponse {
+  passing: boolean
+  checks: {
+    login: boolean
+    search: boolean
+  }
+}
diff --git a/packages/types/src/api/web/auth.ts b/packages/types/src/api/web/auth.ts
new file mode 100644
index 0000000000..e31a151c48
--- /dev/null
+++ b/packages/types/src/api/web/auth.ts
@@ -0,0 +1,25 @@
+export interface LoginRequest {
+  username: string
+  password: string
+}
+
+export interface PasswordResetRequest {
+  email: string
+}
+
+export interface PasswordResetUpdateRequest {
+  resetCode: string
+  password: string
+}
+
+export interface UpdateSelfRequest {
+  firstName?: string
+  lastName?: string
+  password?: string
+  forceResetPassword?: boolean
+}
+
+export interface UpdateSelfResponse {
+  _id: string
+  _rev: string
+}
diff --git a/packages/types/src/api/web/index.ts b/packages/types/src/api/web/index.ts
index 9688a89c7b..8ed5b0aad4 100644
--- a/packages/types/src/api/web/index.ts
+++ b/packages/types/src/api/web/index.ts
@@ -1,4 +1,5 @@
 export * from "./analytics"
+export * from "./auth"
 export * from "./user"
 export * from "./errors"
 export * from "./schedule"
diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index 6acaf6912d..a435808f7e 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -1,6 +1,6 @@
 import { User } from "../../documents"
 
-export interface CreateUserResponse {
+export interface SaveUserResponse {
   _id: string
   _rev: string
   email: string
@@ -58,6 +58,25 @@ export interface CreateAdminUserRequest {
   tenantId: string
 }
 
+export interface CreateAdminUserResponse {
+  _id: string
+  _rev: string
+  email: string
+}
+
+export interface AcceptUserInviteRequest {
+  inviteCode: string
+  password: string
+  firstName: string
+  lastName: string
+}
+
+export interface AcceptUserInviteResponse {
+  _id: string
+  _rev: string
+  email: string
+}
+
 export interface SyncUserRequest {
   previousUser?: User
 }
diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts
index a8684f8427..cacdc4e9a2 100644
--- a/packages/types/src/documents/account/account.ts
+++ b/packages/types/src/documents/account/account.ts
@@ -79,14 +79,24 @@ export const isSelfHostAccount = (account: Account) =>
 export const isSSOAccount = (account: Account): account is SSOAccount =>
   account.authType === AuthType.SSO
 
-export interface SSOAccount extends Account {
-  pictureUrl?: string
-  provider?: string
-  providerType?: string
+export enum AccountSSOProviderType {
+  GOOGLE = "google",
+}
+
+export enum AccountSSOProvider {
+  GOOGLE = "google",
+}
+
+export interface AccountSSO {
+  provider: AccountSSOProvider
+  providerType: AccountSSOProviderType
   oauth2?: OAuthTokens
+  pictureUrl?: string
   thirdPartyProfile: any // TODO: define what the google profile looks like
 }
 
+export type SSOAccount = (Account | CloudAccount) & AccountSSO
+
 export enum AuthType {
   SSO = "sso",
   PASSWORD = "password",
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 9b05069c9a..99dec534b6 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -27,15 +27,17 @@ export interface SettingsConfig extends Config {
   }
 }
 
-export interface GoogleConfig extends Config {
-  config: {
-    clientID: string
-    clientSecret: string
-    activated: boolean
-  }
+export interface GoogleInnerConfig {
+  clientID: string
+  clientSecret: string
+  activated: boolean
 }
 
-export interface OIDCConfiguration {
+export interface GoogleConfig extends Config {
+  config: GoogleInnerConfig
+}
+
+export interface OIDCStrategyConfiguration {
   issuer: string
   authorizationURL: string
   tokenURL: string
@@ -45,7 +47,7 @@ export interface OIDCConfiguration {
   callbackURL: string
 }
 
-export interface OIDCInnerCfg {
+export interface OIDCInnerConfig {
   configUrl: string
   clientID: string
   clientSecret: string
@@ -57,10 +59,17 @@ export interface OIDCInnerCfg {
 
 export interface OIDCConfig extends Config {
   config: {
-    configs: OIDCInnerCfg[]
+    configs: OIDCInnerConfig[]
   }
 }
 
+export interface OIDCWellKnownConfig {
+  issuer: string
+  authorization_endpoint: string
+  token_endpoint: string
+  userinfo_endpoint: string
+}
+
 export const isSettingsConfig = (config: Config): config is SettingsConfig =>
   config.type === ConfigType.SETTINGS
 
diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts
index aef36c3469..2ef13a7412 100644
--- a/packages/types/src/documents/global/user.ts
+++ b/packages/types/src/documents/global/user.ts
@@ -1,37 +1,44 @@
 import { Document } from "../document"
 
-export interface SSOProfile {
-  id: string
-  name?: {
-    givenName?: string
-    familyName?: string
-  }
-  _json: {
-    email: string
-    picture: string
-  }
-  provider?: string
+// SSO
+
+export interface SSOProfileJson {
+  email?: string
+  picture?: string
 }
 
-export interface ThirdPartyUser extends Document {
-  thirdPartyProfile?: SSOProfile["_json"]
-  firstName?: string
-  lastName?: string
-  pictureUrl?: string
-  profile?: SSOProfile
-  oauth2?: any
-  provider?: string
-  providerType?: string
-  email: string
-  userId?: string
-  forceResetPassword?: boolean
-  userGroups?: string[]
+export interface OAuth2 {
+  accessToken: string
+  refreshToken?: string
 }
 
-export interface User extends ThirdPartyUser {
+export enum SSOProviderType {
+  OIDC = "oidc",
+  GOOGLE = "google",
+}
+
+export interface UserSSO {
+  provider: string // the individual provider e.g. Okta, Auth0, Google
+  providerType: SSOProviderType
+  oauth2?: OAuth2
+  thirdPartyProfile?: SSOProfileJson
+}
+
+export type SSOUser = User & UserSSO
+
+export function isSSOUser(user: User): user is SSOUser {
+  return !!(user as SSOUser).providerType
+}
+
+// USER
+
+export interface User extends Document {
   tenantId: string
   email: string
   userId?: string
+  firstName?: string
+  lastName?: string
+  pictureUrl?: string
   forceResetPassword?: boolean
   roles: UserRoles
   builder?: {
@@ -44,9 +51,7 @@ export interface User extends ThirdPartyUser {
   status?: string
   createdAt?: number // override the default createdAt behaviour - users sdk historically set this to Date.now()
   dayPassRecordedAt?: string
-  account?: {
-    authType: string
-  }
+  userGroups?: string[]
   onboardedAt?: string
 }
 
@@ -54,7 +59,7 @@ export interface UserRoles {
   [key: string]: string
 }
 
-// utility types
+// UTILITY TYPES
 
 export interface BuilderUser extends User {
   builder: {
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index f8f9d9cb97..be12d45527 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -12,3 +12,5 @@ export * from "./db"
 export * from "./middleware"
 export * from "./featureFlag"
 export * from "./environmentVariables"
+export * from "./sso"
+export * from "./user"
diff --git a/packages/types/src/sdk/sso.ts b/packages/types/src/sdk/sso.ts
new file mode 100644
index 0000000000..2141204ccb
--- /dev/null
+++ b/packages/types/src/sdk/sso.ts
@@ -0,0 +1,37 @@
+import {
+  OAuth2,
+  SSOProfileJson,
+  SSOProviderType,
+  SSOUser,
+  User,
+} from "../documents"
+import { SaveUserOpts } from "./user"
+
+export interface JwtClaims {
+  preferred_username?: string
+  email?: string
+}
+
+export interface SSOAuthDetails {
+  oauth2: OAuth2
+  provider: string
+  providerType: SSOProviderType
+  userId: string
+  email?: string
+  profile?: SSOProfile
+}
+
+export interface SSOProfile {
+  id: string
+  name?: {
+    givenName?: string
+    familyName?: string
+  }
+  _json: SSOProfileJson
+  provider?: string
+}
+
+export type SaveSSOUserFunction = (
+  user: SSOUser,
+  opts: SaveUserOpts
+) => Promise<User>
diff --git a/packages/types/src/sdk/user.ts b/packages/types/src/sdk/user.ts
new file mode 100644
index 0000000000..1602eeb6c8
--- /dev/null
+++ b/packages/types/src/sdk/user.ts
@@ -0,0 +1,12 @@
+export interface UpdateSelf {
+  firstName?: string
+  lastName?: string
+  password?: string
+  forceResetPassword?: boolean
+}
+
+export interface SaveUserOpts {
+  hashPassword?: boolean
+  requirePassword?: boolean
+  currentUserId?: string
+}
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index 01cdef08ff..21a9eab9c6 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -29,6 +29,7 @@ async function init() {
       SERVICE: "worker-service",
       DEPLOYMENT_ENVIRONMENT: "development",
       TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR",
+      ENABLE_EMAIL_TEST_MODE: 1,
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 738b67c553..948a98cf3a 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -1,49 +1,55 @@
 import {
-  auth,
+  auth as authCore,
   constants,
   context,
   db as dbCore,
   events,
   tenancy,
-  users as usersCore,
-  utils,
+  utils as utilsCore,
 } from "@budibase/backend-core"
-import { EmailTemplatePurpose } from "../../../constants"
-import { isEmailConfigured, sendEmail } from "../../../utilities/email"
-import { checkResetPasswordCode } from "../../../utilities/redis"
+import {
+  ConfigType,
+  User,
+  Ctx,
+  LoginRequest,
+  SSOUser,
+  PasswordResetRequest,
+  PasswordResetUpdateRequest,
+} from "@budibase/types"
 import env from "../../../environment"
-import sdk from "../../../sdk"
-import { ConfigType, User } from "@budibase/types"
 
-const { setCookie, getCookie, clearCookie, hash, platformLogout } = utils
+import * as authSdk from "../../../sdk/auth"
+import * as userSdk from "../../../sdk/users"
+
 const { Cookie, Header } = constants
-const { passport, ssoCallbackUrl, google, oidc } = auth
+const { passport, ssoCallbackUrl, google, oidc } = authCore
+const { setCookie, getCookie, clearCookie } = utilsCore
 
-export async function googleCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.GOOGLE)
-}
+// LOGIN / LOGOUT
 
-export async function oidcCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.OIDC)
-}
-
-async function authInternal(ctx: any, user: any, err: any = null, info = null) {
+async function passportCallback(
+  ctx: Ctx,
+  user: User,
+  err: any = null,
+  info: { message: string } | null = null
+) {
   if (err) {
     console.error("Authentication error")
     console.error(err)
     console.trace(err)
     return ctx.throw(403, info ? info : "Unauthorized")
   }
-
   if (!user) {
     console.error("Authentication error - no user provided")
     return ctx.throw(403, info ? info : "Unauthorized")
   }
 
+  const token = await authSdk.loginUser(user)
+
   // set a cookie for browser access
-  setCookie(ctx, user.token, Cookie.Auth, { sign: false })
+  setCookie(ctx, token, Cookie.Auth, { sign: false })
   // set the token in a header as well for APIs
-  ctx.set(Header.TOKEN, user.token)
+  ctx.set(Header.TOKEN, token)
   // get rid of any app cookies on login
   // have to check test because this breaks cypress
   if (!env.isTest()) {
@@ -51,11 +57,18 @@ async function authInternal(ctx: any, user: any, err: any = null, info = null) {
   }
 }
 
-export const authenticate = async (ctx: any, next: any) => {
+export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
+  const email = ctx.request.body.username
+
+  const user = await userSdk.getUserByEmail(email)
+  if (user && (await userSdk.isPreventSSOPasswords(user))) {
+    ctx.throw(400, "SSO user cannot login using password")
+  }
+
   return passport.authenticate(
     "local",
     async (err: any, user: User, info: any) => {
-      await authInternal(ctx, user, err, info)
+      await passportCallback(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
         await events.auth.login("local")
       })
@@ -64,6 +77,15 @@ export const authenticate = async (ctx: any, next: any) => {
   )(ctx, next)
 }
 
+export const logout = async (ctx: any) => {
+  if (ctx.user && ctx.user._id) {
+    await authSdk.logout({ ctx, userId: ctx.user._id })
+  }
+  ctx.body = { message: "User logged out." }
+}
+
+// INIT
+
 export const setInitInfo = (ctx: any) => {
   const initInfo = ctx.request.body
   setCookie(ctx, initInfo, Cookie.Init)
@@ -79,32 +101,16 @@ export const getInitInfo = (ctx: any) => {
   }
 }
 
+// PASSWORD MANAGEMENT
+
 /**
  * Reset the user password, used as part of a forgotten password flow.
  */
-export const reset = async (ctx: any) => {
+export const reset = async (ctx: Ctx<PasswordResetRequest>) => {
   const { email } = ctx.request.body
-  const configured = await isEmailConfigured()
-  if (!configured) {
-    ctx.throw(
-      400,
-      "Please contact your platform administrator, SMTP is not configured."
-    )
-  }
-  try {
-    const user = (await usersCore.getGlobalUserByEmail(email)) as User
-    // only if user exists, don't error though if they don't
-    if (user) {
-      await sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, {
-        user,
-        subject: "{{ company }} platform password reset",
-      })
-      await events.user.passwordResetRequested(user)
-    }
-  } catch (err) {
-    console.log(err)
-    // don't throw any kind of error to the user, this might give away something
-  }
+
+  await authSdk.reset(email)
+
   ctx.body = {
     message: "Please check your email for a reset link.",
   }
@@ -113,32 +119,21 @@ export const reset = async (ctx: any) => {
 /**
  * Perform the user password update if the provided reset code is valid.
  */
-export const resetUpdate = async (ctx: any) => {
+export const resetUpdate = async (ctx: Ctx<PasswordResetUpdateRequest>) => {
   const { resetCode, password } = ctx.request.body
   try {
-    const { userId } = await checkResetPasswordCode(resetCode)
-    const db = tenancy.getGlobalDB()
-    const user = await db.get(userId)
-    user.password = await hash(password)
-    await db.put(user)
+    await authSdk.resetUpdate(resetCode, password)
     ctx.body = {
       message: "password reset successfully.",
     }
-    // remove password from the user before sending events
-    delete user.password
-    await events.user.passwordReset(user)
   } catch (err) {
-    console.error(err)
+    console.warn(err)
+    // hide any details of the error for security
     ctx.throw(400, "Cannot reset password.")
   }
 }
 
-export const logout = async (ctx: any) => {
-  if (ctx.user && ctx.user._id) {
-    await platformLogout({ ctx, userId: ctx.user._id })
-  }
-  ctx.body = { message: "User logged out." }
-}
+// DATASOURCE
 
 export const datasourcePreAuth = async (ctx: any, next: any) => {
   const provider = ctx.params.provider
@@ -166,6 +161,12 @@ export const datasourceAuth = async (ctx: any, next: any) => {
   return handler.postAuth(passport, ctx, next)
 }
 
+// GOOGLE SSO
+
+export async function googleCallbackUrl(config?: { callbackURL?: string }) {
+  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.GOOGLE)
+}
+
 /**
  * The initial call that google authentication makes to take you to the google login screen.
  * On a successful login, you will be redirected to the googleAuth callback route.
@@ -181,7 +182,7 @@ export const googlePreAuth = async (ctx: any, next: any) => {
   const strategy = await google.strategyFactory(
     config,
     callbackUrl,
-    sdk.users.save
+    userSdk.save
   )
 
   return passport.authenticate(strategy, {
@@ -191,7 +192,7 @@ export const googlePreAuth = async (ctx: any, next: any) => {
   })(ctx, next)
 }
 
-export const googleAuth = async (ctx: any, next: any) => {
+export const googleCallback = async (ctx: any, next: any) => {
   const db = tenancy.getGlobalDB()
 
   const config = await dbCore.getScopedConfig(db, {
@@ -202,14 +203,14 @@ export const googleAuth = async (ctx: any, next: any) => {
   const strategy = await google.strategyFactory(
     config,
     callbackUrl,
-    sdk.users.save
+    userSdk.save
   )
 
   return passport.authenticate(
     strategy,
     { successRedirect: "/", failureRedirect: "/error" },
-    async (err: any, user: User, info: any) => {
-      await authInternal(ctx, user, err, info)
+    async (err: any, user: SSOUser, info: any) => {
+      await passportCallback(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
         await events.auth.login("google-internal")
       })
@@ -218,6 +219,12 @@ export const googleAuth = async (ctx: any, next: any) => {
   )(ctx, next)
 }
 
+// OIDC SSO
+
+export async function oidcCallbackUrl(config?: { callbackURL?: string }) {
+  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.OIDC)
+}
+
 export const oidcStrategyFactory = async (ctx: any, configId: any) => {
   const db = tenancy.getGlobalDB()
   const config = await dbCore.getScopedConfig(db, {
@@ -233,7 +240,7 @@ export const oidcStrategyFactory = async (ctx: any, configId: any) => {
     chosenConfig,
     callbackUrl
   )
-  return oidc.strategyFactory(enrichedConfig, sdk.users.save)
+  return oidc.strategyFactory(enrichedConfig, userSdk.save)
 }
 
 /**
@@ -265,15 +272,15 @@ export const oidcPreAuth = async (ctx: any, next: any) => {
   })(ctx, next)
 }
 
-export const oidcAuth = async (ctx: any, next: any) => {
+export const oidcCallback = async (ctx: any, next: any) => {
   const configId = getCookie(ctx, Cookie.OIDC_CONFIG)
   const strategy = await oidcStrategyFactory(ctx, configId)
 
   return passport.authenticate(
     strategy,
     { successRedirect: "/", failureRedirect: "/error" },
-    async (err: any, user: any, info: any) => {
-      await authInternal(ctx, user, err, info)
+    async (err: any, user: SSOUser, info: any) => {
+      await passportCallback(ctx, user, err, info)
       await context.identity.doInUserContext(user, async () => {
         await events.auth.login("oidc")
       })
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 06906f1e8e..889a3e6a27 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -1,18 +1,22 @@
-import sdk from "../../../sdk"
+import * as userSdk from "../../../sdk/users"
 import {
-  events,
   featureFlags,
   tenancy,
   constants,
   db as dbCore,
   utils,
-  cache,
   encryption,
+  auth as authCore,
 } from "@budibase/backend-core"
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
-const { hash, platformLogout, getCookie, clearCookie, newid } = utils
-const { user: userCache } = cache
+import {
+  UpdateSelfRequest,
+  UpdateSelfResponse,
+  UpdateSelf,
+  UserCtx,
+} from "@budibase/types"
+const { getCookie, clearCookie, newid } = utils
 
 function newTestApiKey() {
   return env.ENCRYPTED_TEST_PUBLIC_API_KEY
@@ -93,17 +97,6 @@ const addSessionAttributesToUser = (ctx: any) => {
   ctx.body.csrfToken = ctx.user.csrfToken
 }
 
-const sanitiseUserUpdate = (ctx: any) => {
-  const allowed = ["firstName", "lastName", "password", "forceResetPassword"]
-  const resp: { [key: string]: any } = {}
-  for (let [key, value] of Object.entries(ctx.request.body)) {
-    if (allowed.includes(key)) {
-      resp[key] = value
-    }
-  }
-  return resp
-}
-
 export async function getSelf(ctx: any) {
   if (!ctx.user) {
     ctx.throw(403, "User not logged in")
@@ -116,7 +109,7 @@ export async function getSelf(ctx: any) {
   checkCurrentApp(ctx)
 
   // get the main body of the user
-  const user = await sdk.users.getUser(userId)
+  const user = await userSdk.getUser(userId)
   ctx.body = await groups.enrichUserRolesFromGroups(user)
 
   // add the feature flags for this tenant
@@ -126,39 +119,30 @@ export async function getSelf(ctx: any) {
   addSessionAttributesToUser(ctx)
 }
 
-export async function updateSelf(ctx: any) {
-  const db = tenancy.getGlobalDB()
-  const user = await db.get(ctx.user._id)
-  let passwordChange = false
+export async function updateSelf(
+  ctx: UserCtx<UpdateSelfRequest, UpdateSelfResponse>
+) {
+  const body = ctx.request.body
+  const update: UpdateSelf = {
+    firstName: body.firstName,
+    lastName: body.lastName,
+    password: body.password,
+    forceResetPassword: body.forceResetPassword,
+  }
 
-  const userUpdateObj = sanitiseUserUpdate(ctx)
-  if (userUpdateObj.password) {
-    // changing password
-    passwordChange = true
-    userUpdateObj.password = await hash(userUpdateObj.password)
+  const user = await userSdk.updateSelf(ctx.user._id!, update)
+
+  if (update.password) {
     // Log all other sessions out apart from the current one
-    await platformLogout({
+    await authCore.platformLogout({
       ctx,
-      userId: ctx.user._id,
+      userId: ctx.user._id!,
       keepActiveSession: true,
     })
   }
 
-  const response = await db.put({
-    ...user,
-    ...userUpdateObj,
-  })
-  await userCache.invalidateUser(user._id)
   ctx.body = {
-    _id: response.id,
-    _rev: response.rev,
-  }
-
-  // remove the old password from the user before sending events
-  user._rev = response.rev
-  delete user.password
-  await events.user.updated(user)
-  if (passwordChange) {
-    await events.user.passwordUpdated(user)
+    _id: user._id!,
+    _rev: user._rev!,
   }
 }
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 43ec23eade..c722d27faa 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -2,15 +2,21 @@ import { checkInviteCode } from "../../../utilities/redis"
 import * as userSdk from "../../../sdk/users"
 import env from "../../../environment"
 import {
+  AcceptUserInviteRequest,
+  AcceptUserInviteResponse,
   BulkUserRequest,
   BulkUserResponse,
   CloudAccount,
   CreateAdminUserRequest,
+  CreateAdminUserResponse,
+  Ctx,
   InviteUserRequest,
   InviteUsersRequest,
   MigrationType,
+  SaveUserResponse,
   SearchUsersRequest,
   User,
+  UserCtx,
 } from "@budibase/types"
 import {
   accounts,
@@ -25,10 +31,18 @@ import { checkAnyUserExists } from "../../../utilities/users"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 
-export const save = async (ctx: any) => {
+export const save = async (ctx: UserCtx<User, SaveUserResponse>) => {
   try {
     const currentUserId = ctx.user._id
-    ctx.body = await userSdk.save(ctx.request.body, { currentUserId })
+    const requestUser = ctx.request.body
+
+    const user = await userSdk.save(requestUser, { currentUserId })
+
+    ctx.body = {
+      _id: user._id!,
+      _rev: user._rev!,
+      email: user.email,
+    }
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
   }
@@ -71,9 +85,10 @@ const parseBooleanParam = (param: any) => {
   return !(param && param === "false")
 }
 
-export const adminUser = async (ctx: any) => {
-  const { email, password, tenantId } = ctx.request
-    .body as CreateAdminUserRequest
+export const adminUser = async (
+  ctx: Ctx<CreateAdminUserRequest, CreateAdminUserResponse>
+) => {
+  const { email, password, tenantId } = ctx.request.body
 
   if (await platform.tenants.exists(tenantId)) {
     ctx.throw(403, "Organisation already exists.")
@@ -131,7 +146,11 @@ export const adminUser = async (ctx: any) => {
       }
       await events.identification.identifyTenantGroup(tenantId, account)
 
-      ctx.body = finalUser
+      ctx.body = {
+        _id: finalUser._id!,
+        _rev: finalUser._rev!,
+        email: finalUser.email,
+      }
     } catch (err: any) {
       ctx.throw(err.status || 400, err)
     }
@@ -236,12 +255,14 @@ export const checkInvite = async (ctx: any) => {
   }
 }
 
-export const inviteAccept = async (ctx: any) => {
+export const inviteAccept = async (
+  ctx: Ctx<AcceptUserInviteRequest, AcceptUserInviteResponse>
+) => {
   const { inviteCode, password, firstName, lastName } = ctx.request.body
   try {
     // info is an extension of the user object that was stored by global
     const { email, info }: any = await checkInviteCode(inviteCode)
-    ctx.body = await tenancy.doInTenant(info.tenantId, async () => {
+    const user = await tenancy.doInTenant(info.tenantId, async () => {
       const saved = await userSdk.save({
         firstName,
         lastName,
@@ -254,6 +275,12 @@ export const inviteAccept = async (ctx: any) => {
       await events.user.inviteAccepted(user)
       return saved
     })
+
+    ctx.body = {
+      _id: user._id,
+      _rev: user._rev,
+      email: user.email,
+    }
   } catch (err: any) {
     if (err.code === errors.codes.USAGE_LIMIT_EXCEEDED) {
       // explicitly re-throw limit exceeded errors
diff --git a/packages/worker/src/api/controllers/system/accounts.ts b/packages/worker/src/api/controllers/system/accounts.ts
index 0aa5f25785..10b809c0b5 100644
--- a/packages/worker/src/api/controllers/system/accounts.ts
+++ b/packages/worker/src/api/controllers/system/accounts.ts
@@ -1,21 +1,23 @@
 import { Account, AccountMetadata } from "@budibase/types"
-import sdk from "../../../sdk"
+import * as accounts from "../../../sdk/accounts"
 
 export const save = async (ctx: any) => {
   const account = ctx.request.body as Account
   let metadata: AccountMetadata = {
-    _id: sdk.accounts.formatAccountMetadataId(account.accountId),
+    _id: accounts.metadata.formatAccountMetadataId(account.accountId),
     email: account.email,
   }
 
-  metadata = await sdk.accounts.saveMetadata(metadata)
+  metadata = await accounts.metadata.saveMetadata(metadata)
 
   ctx.body = metadata
   ctx.status = 200
 }
 
 export const destroy = async (ctx: any) => {
-  const accountId = sdk.accounts.formatAccountMetadataId(ctx.params.accountId)
-  await sdk.accounts.destroyMetadata(accountId)
+  const accountId = accounts.metadata.formatAccountMetadataId(
+    ctx.params.accountId
+  )
+  await accounts.metadata.destroyMetadata(accountId)
   ctx.status = 204
 }
diff --git a/packages/worker/src/api/routes/global/auth.ts b/packages/worker/src/api/routes/global/auth.ts
index b13cef2fc6..503182a418 100644
--- a/packages/worker/src/api/routes/global/auth.ts
+++ b/packages/worker/src/api/routes/global/auth.ts
@@ -33,7 +33,7 @@ router
   .post(
     "/api/global/auth/:tenantId/login",
     buildAuthValidation(),
-    authController.authenticate
+    authController.login
   )
   .post("/api/global/auth/logout", authController.logout)
   .post(
@@ -68,21 +68,24 @@ router
 
   // GOOGLE - MULTI TENANT
   .get("/api/global/auth/:tenantId/google", authController.googlePreAuth)
-  .get("/api/global/auth/:tenantId/google/callback", authController.googleAuth)
+  .get(
+    "/api/global/auth/:tenantId/google/callback",
+    authController.googleCallback
+  )
 
   // GOOGLE - SINGLE TENANT - DEPRECATED
-  .get("/api/global/auth/google/callback", authController.googleAuth)
-  .get("/api/admin/auth/google/callback", authController.googleAuth)
+  .get("/api/global/auth/google/callback", authController.googleCallback)
+  .get("/api/admin/auth/google/callback", authController.googleCallback)
 
   // OIDC - MULTI TENANT
   .get(
     "/api/global/auth/:tenantId/oidc/configs/:configId",
     authController.oidcPreAuth
   )
-  .get("/api/global/auth/:tenantId/oidc/callback", authController.oidcAuth)
+  .get("/api/global/auth/:tenantId/oidc/callback", authController.oidcCallback)
 
   // OIDC - SINGLE TENANT - DEPRECATED
-  .get("/api/global/auth/oidc/callback", authController.oidcAuth)
-  .get("/api/admin/auth/oidc/callback", authController.oidcAuth)
+  .get("/api/global/auth/oidc/callback", authController.oidcCallback)
+  .get("/api/admin/auth/oidc/callback", authController.oidcCallback)
 
 export default router
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index ee753d49dc..84f8ce1b0a 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -1,13 +1,27 @@
-jest.mock("nodemailer")
-import { TestConfiguration, mocks } from "../../../../tests"
-const sendMailMock = mocks.email.mock()
-import { events, tenancy } from "@budibase/backend-core"
-import { structures } from "@budibase/backend-core/tests"
+import { CloudAccount, SSOUser, User } from "@budibase/types"
 
-const expectSetAuthCookie = (res: any) => {
-  expect(
-    res.get("Set-Cookie").find((c: string) => c.startsWith("budibase:auth"))
-  ).toBeDefined()
+jest.mock("nodemailer")
+import {
+  TestConfiguration,
+  mocks,
+  structures,
+  generator,
+} from "../../../../tests"
+const sendMailMock = mocks.email.mock()
+import { events, constants } from "@budibase/backend-core"
+import { Response } from "superagent"
+
+import * as userSdk from "../../../../sdk/users"
+
+function getAuthCookie(response: Response) {
+  return response.headers["set-cookie"]
+    .find((s: string) => s.startsWith(`${constants.Cookie.Auth}=`))
+    .split("=")[1]
+    .split(";")[0]
+}
+
+const expectSetAuthCookie = (response: Response) => {
+  expect(getAuthCookie(response).length > 1).toBe(true)
 }
 
 describe("/api/global/auth", () => {
@@ -25,60 +39,247 @@ describe("/api/global/auth", () => {
     jest.clearAllMocks()
   })
 
+  async function createSSOUser() {
+    return config.doInTenant(async () => {
+      return userSdk.save(structures.users.ssoUser(), {
+        requirePassword: false,
+      })
+    })
+  }
+
   describe("password", () => {
     describe("POST /api/global/auth/:tenantId/login", () => {
-      it("should login", () => {})
+      it("logs in with correct credentials", async () => {
+        const tenantId = config.tenantId!
+        const email = config.user?.email!
+        const password = config.userPassword
+
+        const response = await config.api.auth.login(tenantId, email, password)
+
+        expectSetAuthCookie(response)
+        expect(events.auth.login).toBeCalledTimes(1)
+      })
+
+      it("should return 403 with incorrect credentials", async () => {
+        const tenantId = config.tenantId!
+        const email = config.user?.email!
+        const password = "incorrect"
+
+        const response = await config.api.auth.login(
+          tenantId,
+          email,
+          password,
+          { status: 403 }
+        )
+        expect(response.body).toEqual({
+          message: "Invalid credentials",
+          status: 403,
+        })
+      })
+
+      it("should return 403 when user doesn't exist", async () => {
+        const tenantId = config.tenantId!
+        const email = "invaliduser@test.com"
+        const password = "password"
+
+        const response = await config.api.auth.login(
+          tenantId,
+          email,
+          password,
+          { status: 403 }
+        )
+        expect(response.body).toEqual({
+          message: "Invalid credentials",
+          status: 403,
+        })
+      })
+
+      describe("sso user", () => {
+        let user: User
+
+        async function testSSOUser() {
+          const tenantId = user.tenantId!
+          const email = user.email
+          const password = "test"
+
+          const response = await config.api.auth.login(
+            tenantId,
+            email,
+            password,
+            { status: 400 }
+          )
+
+          expect(response.body).toEqual({
+            message: "SSO user cannot login using password",
+            status: 400,
+          })
+        }
+
+        describe("budibase sso user", () => {
+          it("should prevent user from logging in", async () => {
+            user = await createSSOUser()
+            await testSSOUser()
+          })
+        })
+
+        describe("root account sso user", () => {
+          it("should prevent user from logging in", async () => {
+            user = await config.createUser()
+            const account = structures.accounts.ssoAccount() as CloudAccount
+            mocks.accounts.getAccount.mockReturnValueOnce(
+              Promise.resolve(account)
+            )
+
+            await testSSOUser()
+          })
+        })
+      })
     })
 
     describe("POST /api/global/auth/logout", () => {
       it("should logout", async () => {
-        await config.api.auth.logout()
+        const response = await config.api.auth.logout()
         expect(events.auth.logout).toBeCalledTimes(1)
 
-        // TODO: Verify sessions deleted
+        const authCookie = getAuthCookie(response)
+        expect(authCookie).toBe("")
       })
     })
 
     describe("POST /api/global/auth/:tenantId/reset", () => {
       it("should generate password reset email", async () => {
-        await tenancy.doInTenant(config.tenant1User!.tenantId, async () => {
-          const userEmail = structures.email()
-          const { res, code } = await config.api.auth.requestPasswordReset(
+        const user = await config.createUser()
+
+        const { res, code } = await config.api.auth.requestPasswordReset(
+          sendMailMock,
+          user.email
+        )
+
+        expect(res.body).toEqual({
+          message: "Please check your email for a reset link.",
+        })
+        expect(sendMailMock).toHaveBeenCalled()
+        expect(code).toBeDefined()
+        expect(events.user.passwordResetRequested).toBeCalledTimes(1)
+        expect(events.user.passwordResetRequested).toBeCalledWith(user)
+      })
+
+      describe("sso user", () => {
+        let user: User
+
+        async function testSSOUser() {
+          const { res } = await config.api.auth.requestPasswordReset(
             sendMailMock,
-            userEmail
+            user.email,
+            { status: 400 }
           )
-          const user = await config.getUser(userEmail)
 
           expect(res.body).toEqual({
-            message: "Please check your email for a reset link.",
+            message: "SSO user cannot reset password",
+            status: 400,
+            error: {
+              code: "http",
+              type: "generic",
+            },
           })
-          expect(sendMailMock).toHaveBeenCalled()
+          expect(sendMailMock).not.toHaveBeenCalled()
+        }
 
-          expect(code).toBeDefined()
-          expect(events.user.passwordResetRequested).toBeCalledTimes(1)
-          expect(events.user.passwordResetRequested).toBeCalledWith(user)
+        describe("budibase sso user", () => {
+          it("should prevent user from generating password reset email", async () => {
+            user = await createSSOUser()
+            await testSSOUser()
+          })
+        })
+
+        describe("root account sso user", () => {
+          it("should prevent user from generating password reset email", async () => {
+            user = await config.createUser(structures.users.user())
+            const account = structures.accounts.ssoAccount() as CloudAccount
+            mocks.accounts.getAccount.mockReturnValueOnce(
+              Promise.resolve(account)
+            )
+
+            await testSSOUser()
+          })
         })
       })
     })
 
     describe("POST /api/global/auth/:tenantId/reset/update", () => {
       it("should reset password", async () => {
-        await tenancy.doInTenant(config.tenant1User!.tenantId, async () => {
-          const userEmail = structures.email()
-          const { code } = await config.api.auth.requestPasswordReset(
-            sendMailMock,
-            userEmail
+        let user = await config.createUser()
+        const { code } = await config.api.auth.requestPasswordReset(
+          sendMailMock,
+          user.email
+        )
+        delete user.password
+
+        const newPassword = "newpassword"
+        const res = await config.api.auth.updatePassword(code!, newPassword)
+
+        user = await config.getUser(user.email)
+        delete user.password
+
+        expect(res.body).toEqual({ message: "password reset successfully." })
+        expect(events.user.passwordReset).toBeCalledTimes(1)
+        expect(events.user.passwordReset).toBeCalledWith(user)
+
+        // login using new password
+        await config.api.auth.login(user.tenantId, user.email, newPassword)
+      })
+
+      describe("sso user", () => {
+        let user: User | SSOUser
+
+        async function testSSOUser(code: string) {
+          const res = await config.api.auth.updatePassword(
+            code!,
+            generator.string(),
+            { status: 400 }
           )
-          const user = await config.getUser(userEmail)
-          delete user.password
 
-          const res = await config.api.auth.updatePassword(code)
+          expect(res.body).toEqual({
+            message: "Cannot reset password.",
+            status: 400,
+          })
+        }
 
-          expect(res.body).toEqual({ message: "password reset successfully." })
-          expect(events.user.passwordReset).toBeCalledTimes(1)
-          expect(events.user.passwordReset).toBeCalledWith(user)
+        describe("budibase sso user", () => {
+          it("should prevent user from generating password reset email", async () => {
+            user = await config.createUser()
+            const { code } = await config.api.auth.requestPasswordReset(
+              sendMailMock,
+              user.email
+            )
+
+            // convert to sso now that password reset has been requested
+            const ssoUser = user as SSOUser
+            ssoUser.providerType = structures.sso.providerType()
+            delete ssoUser.password
+            await config.doInTenant(() => userSdk.save(ssoUser))
+
+            await testSSOUser(code!)
+          })
+        })
+
+        describe("root account sso user", () => {
+          it("should prevent user from generating password reset email", async () => {
+            user = await config.createUser()
+            const { code } = await config.api.auth.requestPasswordReset(
+              sendMailMock,
+              user.email
+            )
+
+            // convert to account owner now that password has been requested
+            const account = structures.accounts.ssoAccount() as CloudAccount
+            mocks.accounts.getAccount.mockReturnValueOnce(
+              Promise.resolve(account)
+            )
+
+            await testSSOUser(code!)
+          })
         })
-        // TODO: Login using new password
       })
     })
   })
@@ -153,7 +354,7 @@ describe("/api/global/auth", () => {
         const location: string = res.get("location")
         expect(
           location.startsWith(
-            "http://localhost/auth?response_type=code&client_id=clientId&redirect_uri=http%3A%2F%2Flocalhost%3A10000%2Fapi%2Fglobal%2Fauth%2Fdefault%2Foidc%2Fcallback&scope=openid%20profile%20email%20offline_access"
+            `http://localhost/auth?response_type=code&client_id=clientId&redirect_uri=http%3A%2F%2Flocalhost%3A10000%2Fapi%2Fglobal%2Fauth%2F${config.tenantId}%2Foidc%2Fcallback&scope=openid%20profile%20email%20offline_access`
           )
         ).toBe(true)
       })
diff --git a/packages/worker/src/api/routes/global/tests/self.spec.ts b/packages/worker/src/api/routes/global/tests/self.spec.ts
index d253a7f24e..74d24c7c31 100644
--- a/packages/worker/src/api/routes/global/tests/self.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/self.spec.ts
@@ -30,7 +30,7 @@ describe("/api/global/self", () => {
       user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.updated).toBeCalledWith(user)
+      expect(events.user.updated).toBeCalledWith(dbUser)
       expect(events.user.passwordUpdated).not.toBeCalled()
     })
 
@@ -44,12 +44,11 @@ describe("/api/global/self", () => {
       const dbUser = await config.getUser(user.email)
       user._rev = dbUser._rev
       user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
-      delete user.password
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toBeCalledTimes(1)
-      expect(events.user.updated).toBeCalledWith(user)
+      expect(events.user.updated).toBeCalledWith(dbUser)
       expect(events.user.passwordUpdated).toBeCalledTimes(1)
-      expect(events.user.passwordUpdated).toBeCalledWith(user)
+      expect(events.user.passwordUpdated).toBeCalledWith(dbUser)
     })
   })
 })
diff --git a/packages/worker/src/api/routes/system/tests/accounts.spec.ts b/packages/worker/src/api/routes/system/tests/accounts.spec.ts
index fd54dd2b0a..7df2950212 100644
--- a/packages/worker/src/api/routes/system/tests/accounts.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/accounts.spec.ts
@@ -1,4 +1,4 @@
-import sdk from "../../../../sdk"
+import * as accounts from "../../../../sdk/accounts"
 import { TestConfiguration, structures } from "../../../../tests"
 import { v4 as uuid } from "uuid"
 
@@ -24,8 +24,8 @@ describe("accounts", () => {
 
         const response = await config.api.accounts.saveMetadata(account)
 
-        const id = sdk.accounts.formatAccountMetadataId(account.accountId)
-        const metadata = await sdk.accounts.getMetadata(id)
+        const id = accounts.metadata.formatAccountMetadataId(account.accountId)
+        const metadata = await accounts.metadata.getMetadata(id)
         expect(response).toStrictEqual(metadata)
       })
     })
@@ -37,7 +37,7 @@ describe("accounts", () => {
 
         await config.api.accounts.destroyMetadata(account.accountId)
 
-        const deleted = await sdk.accounts.getMetadata(account.accountId)
+        const deleted = await accounts.metadata.getMetadata(account.accountId)
         expect(deleted).toBe(undefined)
       })
 
diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts
index 52fec210bc..71fd89f276 100644
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@@ -26,6 +26,8 @@ function parseIntSafe(number: any) {
   }
 }
 
+const selfHosted = !!parseInt(process.env.SELF_HOSTED || "")
+
 const environment = {
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
@@ -49,7 +51,7 @@ const environment = {
   CLUSTER_PORT: process.env.CLUSTER_PORT,
   // flags
   NODE_ENV: process.env.NODE_ENV,
-  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED || ""),
+  SELF_HOSTED: selfHosted,
   LOG_LEVEL: process.env.LOG_LEVEL,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
@@ -65,6 +67,18 @@ const environment = {
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
+  /**
+   * Mock the email service in use - links to ethereal hosted emails are logged instead.
+   */
+  ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
+  /**
+   * Enable to allow an admin user to login using a password.
+   * This can be useful to prevent lockout when configuring SSO.
+   * However, this should be turned OFF by default for security purposes.
+   */
+  ENABLE_SSO_MAINTENANCE_MODE: selfHosted
+    ? process.env.ENABLE_SSO_MAINTENANCE_MODE
+    : false,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 1eff6c06fb..1e3ff3cbdf 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -25,6 +25,12 @@ const koaSession = require("koa-session")
 const logger = require("koa-pino-logger")
 import destroyable from "server-destroy"
 
+if (env.ENABLE_SSO_MAINTENANCE_MODE) {
+  console.warn(
+    "Warning: ENABLE_SSO_MAINTENANCE_MODE is set. It is recommended this flag is disabled if maintenance is not in progress"
+  )
+}
+
 // this will setup http and https proxies form env variables
 bootstrap()
 
diff --git a/packages/worker/src/sdk/accounts/index.ts b/packages/worker/src/sdk/accounts/index.ts
index f2ae03040e..72db8c3d85 100644
--- a/packages/worker/src/sdk/accounts/index.ts
+++ b/packages/worker/src/sdk/accounts/index.ts
@@ -1 +1,2 @@
-export * from "./accounts"
+export * as metadata from "./metadata"
+export { accounts as api } from "@budibase/backend-core"
diff --git a/packages/worker/src/sdk/accounts/accounts.ts b/packages/worker/src/sdk/accounts/metadata.ts
similarity index 99%
rename from packages/worker/src/sdk/accounts/accounts.ts
rename to packages/worker/src/sdk/accounts/metadata.ts
index e43285087b..64065e8b78 100644
--- a/packages/worker/src/sdk/accounts/accounts.ts
+++ b/packages/worker/src/sdk/accounts/metadata.ts
@@ -2,7 +2,6 @@ import { AccountMetadata } from "@budibase/types"
 import {
   db,
   StaticDatabases,
-  HTTPError,
   DocumentType,
   SEPARATOR,
 } from "@budibase/backend-core"
diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts
new file mode 100644
index 0000000000..15a4f3c7e7
--- /dev/null
+++ b/packages/worker/src/sdk/auth/auth.ts
@@ -0,0 +1,86 @@
+import {
+  auth as authCore,
+  tenancy,
+  utils as coreUtils,
+  sessions,
+  events,
+  HTTPError,
+} from "@budibase/backend-core"
+import { PlatformLogoutOpts, User } from "@budibase/types"
+import jwt from "jsonwebtoken"
+import env from "../../environment"
+import * as userSdk from "../users"
+import * as emails from "../../utilities/email"
+import * as redis from "../../utilities/redis"
+import { EmailTemplatePurpose } from "../../constants"
+
+// LOGIN / LOGOUT
+
+export async function loginUser(user: User) {
+  const sessionId = coreUtils.newid()
+  const tenantId = tenancy.getTenantId()
+  await sessions.createASession(user._id!, { sessionId, tenantId })
+  const token = jwt.sign(
+    {
+      userId: user._id,
+      sessionId,
+      tenantId,
+    },
+    env.JWT_SECRET!
+  )
+  return token
+}
+
+export async function logout(opts: PlatformLogoutOpts) {
+  // TODO: This should be moved out of core and into worker only
+  // account-portal can call worker endpoint
+  return authCore.platformLogout(opts)
+}
+
+// PASSWORD MANAGEMENT
+
+/**
+ * Reset the user password, used as part of a forgotten password flow.
+ */
+export const reset = async (email: string) => {
+  const configured = await emails.isEmailConfigured()
+  if (!configured) {
+    throw new HTTPError(
+      "Please contact your platform administrator, SMTP is not configured.",
+      400
+    )
+  }
+
+  const user = await userSdk.core.getGlobalUserByEmail(email)
+  // exit if user doesn't exist
+  if (!user) {
+    return
+  }
+
+  // exit if user has sso
+  if (await userSdk.isPreventSSOPasswords(user)) {
+    throw new HTTPError("SSO user cannot reset password", 400)
+  }
+
+  // send password reset
+  await emails.sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, {
+    user,
+    subject: "{{ company }} platform password reset",
+  })
+  await events.user.passwordResetRequested(user)
+}
+
+/**
+ * Perform the user password update if the provided reset code is valid.
+ */
+export const resetUpdate = async (resetCode: string, password: string) => {
+  const { userId } = await redis.checkResetPasswordCode(resetCode)
+
+  let user = await userSdk.getUser(userId)
+  user.password = password
+  user = await userSdk.save(user)
+
+  // remove password from the user before sending events
+  delete user.password
+  await events.user.passwordReset(user)
+}
diff --git a/packages/worker/src/sdk/auth/index.ts b/packages/worker/src/sdk/auth/index.ts
new file mode 100644
index 0000000000..306751af96
--- /dev/null
+++ b/packages/worker/src/sdk/auth/index.ts
@@ -0,0 +1 @@
+export * from "./auth"
diff --git a/packages/worker/src/sdk/users/events.ts b/packages/worker/src/sdk/users/events.ts
index 17c4748dff..7d86182a3c 100644
--- a/packages/worker/src/sdk/users/events.ts
+++ b/packages/worker/src/sdk/users/events.ts
@@ -84,6 +84,10 @@ export const handleSaveEvents = async (
     ) {
       await events.user.passwordForceReset(user)
     }
+
+    if (user.password !== existingUser.password) {
+      await events.user.passwordUpdated(user)
+    }
   } else {
     await events.user.created(user)
   }
diff --git a/packages/worker/src/sdk/users/index.ts b/packages/worker/src/sdk/users/index.ts
index 056d6e5675..2eaa0e68a2 100644
--- a/packages/worker/src/sdk/users/index.ts
+++ b/packages/worker/src/sdk/users/index.ts
@@ -1 +1,2 @@
 export * from "./users"
+export { users as core } from "@budibase/backend-core"
diff --git a/packages/worker/src/sdk/users/tests/users.spec.ts b/packages/worker/src/sdk/users/tests/users.spec.ts
new file mode 100644
index 0000000000..41d9298997
--- /dev/null
+++ b/packages/worker/src/sdk/users/tests/users.spec.ts
@@ -0,0 +1,52 @@
+import { structures } from "../../../tests"
+import * as users from "../users"
+import env from "../../../environment"
+import { mocks } from "@budibase/backend-core/tests"
+import { CloudAccount } from "@budibase/types"
+
+describe("users", () => {
+  describe("isPreventSSOPasswords", () => {
+    it("returns true for sso account user", async () => {
+      const user = structures.users.user()
+      mocks.accounts.getAccount.mockReturnValue(
+        Promise.resolve(structures.accounts.ssoAccount() as CloudAccount)
+      )
+      const result = await users.isPreventSSOPasswords(user)
+      expect(result).toBe(true)
+    })
+
+    it("returns true for sso user", async () => {
+      const user = structures.users.ssoUser()
+      const result = await users.isPreventSSOPasswords(user)
+      expect(result).toBe(true)
+    })
+
+    describe("sso maintenance mode", () => {
+      beforeEach(() => {
+        env._set("ENABLE_SSO_MAINTENANCE_MODE", true)
+      })
+
+      afterEach(() => {
+        env._set("ENABLE_SSO_MAINTENANCE_MODE", false)
+      })
+
+      describe("non-admin user", () => {
+        it("returns true", async () => {
+          const user = structures.users.ssoUser()
+          const result = await users.isPreventSSOPasswords(user)
+          expect(result).toBe(true)
+        })
+      })
+
+      describe("admin user", () => {
+        it("returns false", async () => {
+          const user = structures.users.ssoUser({
+            user: structures.users.adminUser(),
+          })
+          const result = await users.isPreventSSOPasswords(user)
+          expect(result).toBe(false)
+        })
+      })
+    })
+  })
+})
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 1d05f6d84f..7d4a2f04f0 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -6,12 +6,11 @@ import {
   cache,
   constants,
   db as dbUtils,
-  deprovisioning,
   events,
   HTTPError,
-  migrations,
   sessions,
   tenancy,
+  platform,
   users as usersCore,
   utils,
   ViewName,
@@ -21,21 +20,22 @@ import {
   AllDocsResponse,
   BulkUserResponse,
   CloudAccount,
-  CreateUserResponse,
   InviteUsersRequest,
   InviteUsersResponse,
-  MigrationType,
+  isSSOAccount,
+  isSSOUser,
   PlatformUser,
   PlatformUserByEmail,
   RowResponse,
   SearchUsersRequest,
+  UpdateSelf,
   User,
-  ThirdPartyUser,
-  isUser,
+  SaveUserOpts,
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
 import { EmailTemplatePurpose } from "../../constants"
 import { groups as groupsSdk } from "@budibase/pro"
+import * as accountSdk from "../accounts"
 
 const PAGE_LIMIT = 8
 
@@ -94,26 +94,23 @@ export const paginatedUsers = async ({
   })
 }
 
+export async function getUserByEmail(email: string) {
+  return usersCore.getGlobalUserByEmail(email)
+}
+
 /**
  * Gets a user by ID from the global database, based on the current tenancy.
  */
 export const getUser = async (userId: string) => {
-  const db = tenancy.getGlobalDB()
-  let user = await db.get(userId)
+  const user = await usersCore.getById(userId)
   if (user) {
     delete user.password
   }
   return user
 }
 
-export interface SaveUserOpts {
-  hashPassword?: boolean
-  requirePassword?: boolean
-  currentUserId?: string
-}
-
 const buildUser = async (
-  user: User | ThirdPartyUser,
+  user: User,
   opts: SaveUserOpts = {
     hashPassword: true,
     requirePassword: true,
@@ -121,11 +118,13 @@ const buildUser = async (
   tenantId: string,
   dbUser?: any
 ): Promise<User> => {
-  let fullUser = user as User
-  let { password, _id } = fullUser
+  let { password, _id } = user
 
   let hashedPassword
   if (password) {
+    if (await isPreventSSOPasswords(user)) {
+      throw new HTTPError("SSO user cannot set password", 400)
+    }
     hashedPassword = opts.hashPassword ? await utils.hash(password) : password
   } else if (dbUser) {
     hashedPassword = dbUser.password
@@ -135,10 +134,10 @@ const buildUser = async (
 
   _id = _id || dbUtils.generateGlobalUserID()
 
-  fullUser = {
+  const fullUser = {
     createdAt: Date.now(),
     ...dbUser,
-    ...fullUser,
+    ...user,
     _id,
     password: hashedPassword,
     tenantId,
@@ -189,10 +188,36 @@ const validateUniqueUser = async (email: string, tenantId: string) => {
   }
 }
 
+export async function isPreventSSOPasswords(user: User) {
+  // when in maintenance mode we allow sso users with the admin role
+  // to perform any password action - this prevents lockout
+  if (env.ENABLE_SSO_MAINTENANCE_MODE && user.admin?.global) {
+    return false
+  }
+
+  // Check local sso
+  if (isSSOUser(user)) {
+    return true
+  }
+
+  // Check account sso
+  const account = await accountSdk.api.getAccount(user.email)
+  return !!(account && isSSOAccount(account))
+}
+
+export async function updateSelf(id: string, data: UpdateSelf) {
+  let user = await getUser(id)
+  user = {
+    ...user,
+    ...data,
+  }
+  return save(user)
+}
+
 export const save = async (
-  user: User | ThirdPartyUser,
+  user: User,
   opts: SaveUserOpts = {}
-): Promise<CreateUserResponse> => {
+): Promise<User> => {
   // default booleans to true
   if (opts.hashPassword == null) {
     opts.hashPassword = true
@@ -264,7 +289,7 @@ export const save = async (
     builtUser._rev = response.rev
 
     await eventHelpers.handleSaveEvents(builtUser, dbUser)
-    await addTenant(tenantId, _id, email)
+    await platform.users.addUser(tenantId, builtUser._id!, builtUser.email)
     await cache.user.invalidateUser(response.id)
 
     // let server know to sync user
@@ -272,11 +297,8 @@ export const save = async (
 
     await Promise.all(groupPromises)
 
-    return {
-      _id: response.id,
-      _rev: response.rev,
-      email,
-    }
+    // finally returned the saved user from the db
+    return db.get(builtUser._id!)
   } catch (err: any) {
     if (err.status === 409) {
       throw "User exists already"
@@ -286,21 +308,6 @@ export const save = async (
   }
 }
 
-export const addTenant = async (
-  tenantId: string,
-  _id: string,
-  email: string
-) => {
-  if (env.MULTI_TENANCY) {
-    const afterCreateTenant = () =>
-      migrations.backPopulateMigrations({
-        type: MigrationType.GLOBAL,
-        tenantId,
-      })
-    await tenancy.tryAddTenant(tenantId, _id, email, afterCreateTenant)
-  }
-}
-
 const getExistingTenantUsers = async (emails: string[]): Promise<User[]> => {
   const lcEmails = emails.map(email => email.toLowerCase())
   const params = {
@@ -432,7 +439,7 @@ export const bulkCreate = async (
   for (const user of usersToBulkSave) {
     // TODO: Refactor to bulk insert users into the info db
     // instead of relying on looping tenant creation
-    await addTenant(tenantId, user._id, user.email)
+    await platform.users.addUser(tenantId, user._id, user.email)
     await eventHelpers.handleSaveEvents(user, undefined)
     await apps.syncUserInApps(user._id)
   }
@@ -566,7 +573,7 @@ export const destroy = async (id: string, currentUser: any) => {
     }
   }
 
-  await deprovisioning.removeUserFromInfoDB(dbUser)
+  await platform.users.removeUser(dbUser)
 
   await db.remove(userId, dbUser._rev)
 
@@ -579,7 +586,7 @@ export const destroy = async (id: string, currentUser: any) => {
 
 const bulkDeleteProcessing = async (dbUser: User) => {
   const userId = dbUser._id as string
-  await deprovisioning.removeUserFromInfoDB(dbUser)
+  await platform.users.removeUser(dbUser)
   await eventHelpers.handleDeleteEvents(dbUser)
   await cache.user.invalidateUser(userId)
   await sessions.invalidateSessions(userId, { reason: "bulk-deletion" })
diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts
index 7d075e7fef..3004d0aed4 100644
--- a/packages/worker/src/tests/TestConfiguration.ts
+++ b/packages/worker/src/tests/TestConfiguration.ts
@@ -22,7 +22,7 @@ import {
   env as coreEnv,
 } from "@budibase/backend-core"
 import structures, { CSRF_TOKEN } from "./structures"
-import { CreateUserResponse, User, AuthToken } from "@budibase/types"
+import { SaveUserResponse, User, AuthToken } from "@budibase/types"
 import API from "./api"
 
 class TestConfiguration {
@@ -226,7 +226,7 @@ class TestConfiguration {
       user = structures.users.user()
     }
     const response = await this._req(user, null, controllers.users.save)
-    const body = response as CreateUserResponse
+    const body = response as SaveUserResponse
     return this.getUser(body.email)
   }
 
diff --git a/packages/worker/src/tests/api/auth.ts b/packages/worker/src/tests/api/auth.ts
index ccbf747273..bd0471ca74 100644
--- a/packages/worker/src/tests/api/auth.ts
+++ b/packages/worker/src/tests/api/auth.ts
@@ -1,21 +1,39 @@
-import structures from "../structures"
 import TestConfiguration from "../TestConfiguration"
-import { TestAPI } from "./base"
+import { TestAPI, TestAPIOpts } from "./base"
 
 export class AuthAPI extends TestAPI {
   constructor(config: TestConfiguration) {
     super(config)
   }
 
-  updatePassword = (code: string) => {
+  updatePassword = (
+    resetCode: string,
+    password: string,
+    opts?: TestAPIOpts
+  ) => {
     return this.request
       .post(`/api/global/auth/${this.config.getTenantId()}/reset/update`)
       .send({
-        password: "newpassword",
-        resetCode: code,
+        password,
+        resetCode,
       })
       .expect("Content-Type", /json/)
-      .expect(200)
+      .expect(opts?.status ? opts.status : 200)
+  }
+
+  login = (
+    tenantId: string,
+    email: string,
+    password: string,
+    opts?: TestAPIOpts
+  ) => {
+    return this.request
+      .post(`/api/global/auth/${tenantId}/login`)
+      .send({
+        username: email,
+        password: password,
+      })
+      .expect(opts?.status ? opts.status : 200)
   }
 
   logout = () => {
@@ -25,25 +43,31 @@ export class AuthAPI extends TestAPI {
       .expect(200)
   }
 
-  requestPasswordReset = async (sendMailMock: any, userEmail: string) => {
+  requestPasswordReset = async (
+    sendMailMock: any,
+    email: string,
+    opts?: TestAPIOpts
+  ) => {
     await this.config.saveSmtpConfig()
     await this.config.saveSettingsConfig()
-    await this.config.createUser({
-      ...structures.users.user(),
-      email: userEmail,
-    })
+
     const res = await this.request
       .post(`/api/global/auth/${this.config.getTenantId()}/reset`)
       .send({
-        email: userEmail,
+        email: email,
       })
       .expect("Content-Type", /json/)
-      .expect(200)
-    const emailCall = sendMailMock.mock.calls[0][0]
-    const parts = emailCall.html.split(
-      `http://localhost:10000/builder/auth/reset?code=`
-    )
-    const code = parts[1].split('"')[0].split("&")[0]
+      .expect(opts?.status ? opts.status : 200)
+
+    let code: string | undefined
+    if (res.status === 200) {
+      const emailCall = sendMailMock.mock.calls[0][0]
+      const parts = emailCall.html.split(
+        `http://localhost:10000/builder/auth/reset?code=`
+      )
+      code = parts[1].split('"')[0].split("&")[0]
+    }
+
     return { code, res }
   }
 }
diff --git a/packages/worker/src/tests/structures/index.ts b/packages/worker/src/tests/structures/index.ts
index dad055f7a7..bec15df6dd 100644
--- a/packages/worker/src/tests/structures/index.ts
+++ b/packages/worker/src/tests/structures/index.ts
@@ -1,6 +1,5 @@
 import { structures } from "@budibase/backend-core/tests"
 import * as configs from "./configs"
-import * as users from "./users"
 import * as groups from "./groups"
 import { v4 as uuid } from "uuid"
 
@@ -11,7 +10,6 @@ const pkg = {
   ...structures,
   uuid,
   configs,
-  users,
   TENANT_ID,
   CSRF_TOKEN,
   groups,
diff --git a/packages/worker/src/tests/structures/users.ts b/packages/worker/src/tests/structures/users.ts
deleted file mode 100644
index 3348670b7d..0000000000
--- a/packages/worker/src/tests/structures/users.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export const email = "test@test.com"
-import { AdminUser, BuilderUser, User } from "@budibase/types"
-import { v4 as uuid } from "uuid"
-
-export const newEmail = () => {
-  return `${uuid()}@test.com`
-}
-
-export const user = (userProps?: any): User => {
-  return {
-    email: newEmail(),
-    password: "test",
-    roles: { app_test: "admin" },
-    ...userProps,
-  }
-}
-
-export const adminUser = (userProps?: any): AdminUser => {
-  return {
-    ...user(userProps),
-    admin: {
-      global: true,
-    },
-    builder: {
-      global: true,
-    },
-  }
-}
-
-export const builderUser = (userProps?: any): BuilderUser => {
-  return {
-    ...user(userProps),
-    builder: {
-      global: true,
-    },
-  }
-}
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index 7ec3447707..66e860edcb 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -26,7 +26,7 @@ type SendEmailOpts = {
   automation?: boolean
 }
 
-const TEST_MODE = false
+const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
 const TYPE = TemplateType.EMAIL
 
 const FULL_EMAIL_PURPOSES = [
@@ -62,8 +62,8 @@ function createSMTPTransport(config: any) {
       host: "smtp.ethereal.email",
       secure: false,
       auth: {
-        user: "don.bahringer@ethereal.email",
-        pass: "yCKSH8rWyUPbnhGYk9",
+        user: "wyatt.zulauf29@ethereal.email",
+        pass: "tEwDtHBWWxusVWAPfa",
       },
     }
   }

From bd16f3a55dfe802cc11bc2c7ecac8434494cb0fc Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Feb 2023 09:03:29 +0000
Subject: [PATCH 053/273] Re-add maxWorkers=2 to worker tests

---
 packages/worker/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1ae0327441..0248199341 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -22,7 +22,7 @@
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
-    "test": "jest --coverage",
+    "test": "jest --coverage --maxWorkers=2",
     "test:watch": "jest --watch",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",

From 3c5d5f4c25ea45663edb2c26afc8ebf1bc6879c9 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 09:42:56 +0000
Subject: [PATCH 054/273] Fix relation get test to test expected behaviour

---
 packages/server/src/integration-test/postgres.spec.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index ecfb532e7f..32d4204ea1 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -419,14 +419,16 @@ describe("row api - postgres", () => {
 
     describe("given a row with relation data", () => {
       let row: Row
+      let foreignRow: Row
       beforeEach(async () => {
         let [createdRow] = await populatePrimaryRows(1, {
           createForeignRow: true,
         })
         row = createdRow.row
+        foreignRow = createdRow.foreignRow!
       })
 
-      it("foreign key fields are not retrieved", async () => {
+      it("only foreign keys are retrieved", async () => {
         const res = await getRow(primaryPostgresTable._id, row.id)
 
         expect(res.status).toBe(200)
@@ -436,7 +438,12 @@ describe("row api - postgres", () => {
           _id: expect.any(String),
           _rev: expect.any(String),
         })
-        expect(res.body.foreignField).toBeUndefined()
+        expect(
+          res.body[`fk_${auxPostgresTable.name}_foreignField`]
+        ).toBeDefined()
+        expect(res.body[`fk_${auxPostgresTable.name}_foreignField`]).toBe(
+          foreignRow.id
+        )
       })
     })
   })

From 483f15a5d6a08337d52c149d566c00fc4c1ef451 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 09:51:07 +0000
Subject: [PATCH 055/273] Add explicit check for the foreign field

---
 packages/server/src/integration-test/postgres.spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 32d4204ea1..c688600e8d 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -438,6 +438,9 @@ describe("row api - postgres", () => {
           _id: expect.any(String),
           _rev: expect.any(String),
         })
+
+        expect(res.body.foreignField).toBeUndefined()
+
         expect(
           res.body[`fk_${auxPostgresTable.name}_foreignField`]
         ).toBeDefined()

From dc691bcaf7881c41c68bd33d218c7f45d8b117a1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 21 Feb 2023 10:48:55 +0000
Subject: [PATCH 056/273] integrate properly with audit log search api

---
 packages/bbui/src/Form/Core/Picker.svelte     |  4 +-
 .../_components/AppColumnRenderer.svelte      |  5 ++
 .../auditLogs/_components/TimeRenderer.svelte |  7 +-
 .../auditLogs/_components/UserRenderer.svelte | 10 ++-
 .../portal/account/auditLogs/index.svelte     | 75 ++++++++++++-------
 .../builder/src/stores/portal/auditLogs.js    | 20 +++--
 6 files changed, 80 insertions(+), 41 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index fb0ce00824..ace41aa35b 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -145,7 +145,8 @@
     {#if autocomplete}
       <Search
         value={fetchTerm ? fetchTerm : searchTerm}
-        on:change={event => (fetchTerm = event.detail)}
+        on:change={event =>
+          fetchTerm ? (fetchTerm = event.detail) : (searchTerm = event.detail)}
         {disabled}
         placeholder="Search"
       />
@@ -265,7 +266,6 @@
   .popover-content :global(.spectrum-Search) {
     margin-top: -1px;
     margin-left: -1px;
-    width: calc(100% + 2px);
   }
   .popover-content :global(.spectrum-Search input) {
     height: auto;
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
new file mode 100644
index 0000000000..f6665dff28
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
@@ -0,0 +1,5 @@
+<script>
+  export let value
+</script>
+
+<div>{value.name}</div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
index 7ec044604e..b6c0262b47 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
@@ -1,12 +1,11 @@
 <script>
   import dayjs from "dayjs"
-
-  export let row
-
   import relativeTime from "dayjs/plugin/relativeTime"
   dayjs.extend(relativeTime)
+
+  export let row
 </script>
 
 <div>
-  {dayjs(row.date).fromNow()}
+  {dayjs(row.timestamp).fromNow()}
 </div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index c9a69b4316..07551da3bc 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -1,6 +1,14 @@
 <script>
   import { Avatar } from "@budibase/bbui"
   export let row
+
+  const getInitials = user => {
+    let initials = ""
+    initials += user.firstName ? user.firstName[0] : ""
+    initials += user.lastName ? user.lastName[0] : ""
+
+    return initials === "" ? user.email[0] : initials
+  }
 </script>
 
-<Avatar size="M" initials={row.user[0]} />
+<Avatar size="M" initials={getInitials(row.user)} />
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 88f042d240..09b8466d8e 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -13,17 +13,17 @@
   import { licensing, users, apps, auditLogs } from "stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
   import { createPaginationStore } from "helpers/pagination"
-  import { setContext } from "svelte"
+  import { onMount, setContext } from "svelte"
   import ViewDetailsRenderer from "./_components/ViewDetailsRenderer.svelte"
   import UserRenderer from "./_components/UserRenderer.svelte"
   import TimeRenderer from "./_components/TimeRenderer.svelte"
+  import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
 
   const schema = {
-    name: { width: "1fr" },
-    date: { width: "1.5fr" },
+    date: { width: "0.8fr" },
     user: { width: "0.5fr" },
-    app: { width: "1fr" },
-    event: { width: "1fr" },
+    app: { width: "1fr", fieldName: "name" },
+    name: { width: "1fr" },
     view: { width: "auto", borderLeft: true, displayName: "" },
   }
 
@@ -40,6 +40,10 @@
       column: "date",
       component: TimeRenderer,
     },
+    {
+      column: "app",
+      component: AppColumnRenderer,
+    },
   ]
 
   let userSearchTerm = ""
@@ -55,22 +59,15 @@
   let sidePanelVisible = false
   let startDate, endDate
 
-  let data = [
-    {
-      name: "User created",
-      date: "2023-02-14T10:19:52.021Z",
-      user: "Peter Clement",
-      app: "School Admin Panel",
-      event: "User added",
-      metadata: {
-        name: "Peter Clement",
-        email: "",
-      },
-    },
-  ]
-
   $: fetchUsers(userPage, userSearchTerm)
-  $: fetchLogs(logsPage, logSearchTerm)
+  $: fetchLogs(
+    logsPage,
+    logSearchTerm,
+    startDate,
+    endDate,
+    selectedUsers,
+    selectedApps
+  )
 
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
@@ -97,7 +94,14 @@
     }
   }
 
-  const fetchLogs = async (logsPage, search) => {
+  const fetchLogs = async (
+    logsPage,
+    search,
+    startDate,
+    endDate,
+    selectedUsers,
+    selectedApps
+  ) => {
     if ($logsPageInfo.loading) {
       return
     }
@@ -117,7 +121,10 @@
         userIds: selectedUsers,
         appIds: selectedApps,
       })
-      logsPageInfo.fetched($auditLogs.hasNextPage, $auditLogs.nextPage)
+      logsPageInfo.fetched(
+        $auditLogs.logs.hasNextPage,
+        $auditLogs.logs.nextPage
+      )
     } catch (error) {
       console.log(error)
       notifications.error("Error getting audit logs")
@@ -170,6 +177,10 @@
   setContext("auditLogs", {
     viewDetails,
   })
+
+  onMount(async () => {
+    await auditLogs.getEventDefinitions()
+  })
 </script>
 
 <LockedFeature
@@ -211,16 +222,24 @@
       </div>
       <div class="select">
         <Multiselect
+          autocomplete
           placeholder="All apps"
           label="App"
-          getOptionValue={app => app.appId}
+          getOptionValue={app => "app_dev_" + app.appId}
           getOptionLabel={app => app.name}
           options={$apps}
           bind:value={selectedApps}
         />
       </div>
       <div class="select">
-        <Multiselect placeholder="All events" label="Event" />
+        <Multiselect
+          autocomplete
+          getOptionValue={event => event[0]}
+          getOptionLabel={event => event[1]}
+          options={Object.entries($auditLogs.events)}
+          placeholder="All events"
+          label="Event"
+        />
       </div>
     </div>
     <div style="padding-bottom: var(--spacing-s)">
@@ -228,14 +247,14 @@
     </div>
 
     <div style="max-width: 150px; ">
-      <Search placeholder="Search" value={""} />
+      <Search placeholder="Search" bind:value={logSearchTerm} />
     </div>
   </div>
   <Layout noPadding>
     <Table
       {customRenderers}
       on:click={viewDetails}
-      {data}
+      data={$auditLogs.logs.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
@@ -255,7 +274,8 @@
     <div class="side-panel-header">
       Audit Logs
       <Icon
-        icon="Close"
+        hoverable
+        name="Close"
         on:click={() => {
           sidePanelVisible = false
         }}
@@ -263,7 +283,6 @@
     </div>
     <div style="padding-top: 10px; height: 95%">
       <CoreTextArea
-        disabled={true}
         minHeight={"300px"}
         height={"100%"}
         value={JSON.stringify(selectedLog.metadata, null, 2)}
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
index f866fcb3d7..3454aab95c 100644
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -3,23 +3,31 @@ import { API } from "api"
 import { licensing } from "stores/portal"
 
 export function createAuditLogsStore() {
-  const { subscribe, set } = writable({
-    logs: [],
+  const { subscribe, update } = writable({
+    events: {},
+    logs: {},
   })
 
   async function search(opts = {}) {
     if (get(licensing).auditLogsEnabled) {
       const paged = await API.searchAuditLogs(opts)
-      set({
-        ...paged,
-        ...opts,
+
+      update(state => {
+        return { ...state, logs: { ...paged, opts } }
       })
+
       return paged
     }
   }
 
   async function getEventDefinitions() {
-    return await API.getEventDefinitions()
+    const events = await API.getEventDefinitions()
+
+    update(state => {
+      return { ...state, ...events }
+    })
+
+    console.log(events)
   }
 
   async function downloadLogs(opts = {}) {

From 0c838196e4751ffea9ace440ebb8d357f69393e8 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Feb 2023 10:52:11 +0000
Subject: [PATCH 057/273] Enable mock redis for integration tests

---
 packages/builder/setup.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/setup.js b/packages/builder/setup.js
index 744c20896a..b3fd96877b 100644
--- a/packages/builder/setup.js
+++ b/packages/builder/setup.js
@@ -19,6 +19,7 @@ process.env.COUCH_DB_USER = "budibase"
 process.env.COUCH_DB_PASSWORD = "budibase"
 process.env.INTERNAL_API_KEY = "budibase"
 process.env.ALLOW_DEV_AUTOMATIONS = 1
+process.env.MOCK_REDIS = 1
 
 // Stop info logs polluting test outputs
 process.env.LOG_LEVEL = "error"

From e6d7c22efa0a82c65020ef37602131508bf51b83 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 11:22:46 +0000
Subject: [PATCH 058/273] v2.3.17-alpha.5

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 dda0b8dfc8..63e9ac45f9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 75c16447ba..ceafebcbc5 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.4",
+    "@budibase/types": "2.3.17-alpha.5",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index bf2782d843..da9fdbca60 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.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-alpha.5",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 049b8d2a9f..00fe30b057 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.4",
-    "@budibase/client": "2.3.17-alpha.4",
-    "@budibase/frontend-core": "2.3.17-alpha.4",
-    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/bbui": "2.3.17-alpha.5",
+    "@budibase/client": "2.3.17-alpha.5",
+    "@budibase/frontend-core": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.5",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1d92be8c84..036120eac5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.4",
-    "@budibase/string-templates": "2.3.17-alpha.4",
-    "@budibase/types": "2.3.17-alpha.4",
+    "@budibase/backend-core": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/types": "2.3.17-alpha.5",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index b40f27f287..97ebc2b2e0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.4",
-    "@budibase/frontend-core": "2.3.17-alpha.4",
-    "@budibase/string-templates": "2.3.17-alpha.4",
+    "@budibase/bbui": "2.3.17-alpha.5",
+    "@budibase/frontend-core": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.5",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index c4222bd0e3..7a42ba09db 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.4",
+    "@budibase/bbui": "2.3.17-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index bd6fa2a9d4..36328c51d8 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 0388465ce4..3888c55f46 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.4",
-    "@budibase/client": "2.3.17-alpha.4",
+    "@budibase/backend-core": "2.3.17-alpha.5",
+    "@budibase/client": "2.3.17-alpha.5",
     "@budibase/pro": "2.3.17-alpha.4",
-    "@budibase/string-templates": "2.3.17-alpha.4",
-    "@budibase/types": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/types": "2.3.17-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fad3b4d59f..d5eb7e3f04 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index a5441b58a2..0b1ee30b2e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0248199341..b6bc942add 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.4",
+  "version": "2.3.17-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.4",
+    "@budibase/backend-core": "2.3.17-alpha.5",
     "@budibase/pro": "2.3.17-alpha.4",
-    "@budibase/string-templates": "2.3.17-alpha.4",
-    "@budibase/types": "2.3.17-alpha.4",
+    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/types": "2.3.17-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From cbddc7ee4f537e78f01450eeb4c62b82e2882c9f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 11:26:45 +0000
Subject: [PATCH 059/273] Update pro version to 2.3.17-alpha.5

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 3888c55f46..c647378d54 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.5",
     "@budibase/client": "2.3.17-alpha.5",
-    "@budibase/pro": "2.3.17-alpha.4",
+    "@budibase/pro": "2.3.17-alpha.5",
     "@budibase/string-templates": "2.3.17-alpha.5",
     "@budibase/types": "2.3.17-alpha.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3fa6a84ad9..2d6ad91005 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.4.tgz#efe13cc2eb9a02223cff46228af8370a5a91db11"
-  integrity sha512-h9aCz+5uAQOvQiimULShKkXdQgyiwvgcxq3wqEvNHsAxmlslaJJouStWhvxBdsFiOW9K2CyI/8PeUBBRlAU0AQ==
+"@budibase/backend-core@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.5.tgz#5bd380c9bf3835694729f1c68c44a77aec7b66dd"
+  integrity sha512-Nv/BsmItQcdi30oHvNEeRRkDxooMR3shZksb14NDWfdP9gxjVOkUltA2HELujL2ZEg4mismau/0oy9kZy5z3Og==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.4"
+    "@budibase/types" "2.3.17-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.4.tgz#56e945bd960eca8c8b2a04a3dd606df392bf5792"
-  integrity sha512-DJtKCc5/XXAnrvI5sS+joVuDYOLgwFmDYwLbssJgSQzGXNqepN/ikGq6eFCKn/99fRYBGREfwXwAlxXveZxPWA==
+"@budibase/pro@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.5.tgz#4007ab38a5a88cedc1c0ba48543fcbfdf0c58a2a"
+  integrity sha512-pR7i7ehpoJ08Pq4Xs5vFJcZLvLkfCDS3AvJV1e0j9IDPD73kqiqCxgOF9rE27NTLf0BvbPK5Vj4Z7RPCxIJv7g==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.4"
-    "@budibase/types" "2.3.17-alpha.4"
+    "@budibase/backend-core" "2.3.17-alpha.5"
+    "@budibase/types" "2.3.17-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.4.tgz#63eb756160da7ace5459e303874f5e67425c6988"
-  integrity sha512-us/gGZPHimHsYNAnJ5yGdxeThT065wofJ2sfg0aD81P8nq3F2mevBoUmci/KRYdrQ9EsgpZ3Ou6CqnhnV8WmfA==
+"@budibase/types@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.5.tgz#a8c31f49ac9f8b312317fd6fe547ea76d89d059b"
+  integrity sha512-qp51pVnOaUf42plQjPlCXZVMTIFKrkkhiJ+XaClnekRmyAYaz7JUIex+QTDbmUF4i0WbZRc0MgUCVQxlKkWotA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b6bc942add..c1a1a8a001 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.5",
-    "@budibase/pro": "2.3.17-alpha.4",
+    "@budibase/pro": "2.3.17-alpha.5",
     "@budibase/string-templates": "2.3.17-alpha.5",
     "@budibase/types": "2.3.17-alpha.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3c12fd53b6..5c534eefe1 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.4.tgz#efe13cc2eb9a02223cff46228af8370a5a91db11"
-  integrity sha512-h9aCz+5uAQOvQiimULShKkXdQgyiwvgcxq3wqEvNHsAxmlslaJJouStWhvxBdsFiOW9K2CyI/8PeUBBRlAU0AQ==
+"@budibase/backend-core@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.5.tgz#5bd380c9bf3835694729f1c68c44a77aec7b66dd"
+  integrity sha512-Nv/BsmItQcdi30oHvNEeRRkDxooMR3shZksb14NDWfdP9gxjVOkUltA2HELujL2ZEg4mismau/0oy9kZy5z3Og==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.4"
+    "@budibase/types" "2.3.17-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.4.tgz#56e945bd960eca8c8b2a04a3dd606df392bf5792"
-  integrity sha512-DJtKCc5/XXAnrvI5sS+joVuDYOLgwFmDYwLbssJgSQzGXNqepN/ikGq6eFCKn/99fRYBGREfwXwAlxXveZxPWA==
+"@budibase/pro@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.5.tgz#4007ab38a5a88cedc1c0ba48543fcbfdf0c58a2a"
+  integrity sha512-pR7i7ehpoJ08Pq4Xs5vFJcZLvLkfCDS3AvJV1e0j9IDPD73kqiqCxgOF9rE27NTLf0BvbPK5Vj4Z7RPCxIJv7g==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.4"
-    "@budibase/types" "2.3.17-alpha.4"
+    "@budibase/backend-core" "2.3.17-alpha.5"
+    "@budibase/types" "2.3.17-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.4":
-  version "2.3.17-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.4.tgz#63eb756160da7ace5459e303874f5e67425c6988"
-  integrity sha512-us/gGZPHimHsYNAnJ5yGdxeThT065wofJ2sfg0aD81P8nq3F2mevBoUmci/KRYdrQ9EsgpZ3Ou6CqnhnV8WmfA==
+"@budibase/types@2.3.17-alpha.5":
+  version "2.3.17-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.5.tgz#a8c31f49ac9f8b312317fd6fe547ea76d89d059b"
+  integrity sha512-qp51pVnOaUf42plQjPlCXZVMTIFKrkkhiJ+XaClnekRmyAYaz7JUIex+QTDbmUF4i0WbZRc0MgUCVQxlKkWotA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 9ed759580f436e598070dc44fbdd3b520491e4f3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 11:52:45 +0000
Subject: [PATCH 060/273] v2.3.17-alpha.6

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

diff --git a/lerna.json b/lerna.json
index 63e9ac45f9..80460af875 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ceafebcbc5..68323e05ac 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.5",
+    "@budibase/types": "2.3.17-alpha.6",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index da9fdbca60..ccaadf77b1 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.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.6",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 00fe30b057..761f17dd6d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.5",
-    "@budibase/client": "2.3.17-alpha.5",
-    "@budibase/frontend-core": "2.3.17-alpha.5",
-    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/bbui": "2.3.17-alpha.6",
+    "@budibase/client": "2.3.17-alpha.6",
+    "@budibase/frontend-core": "2.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.6",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 036120eac5..a4c21bef29 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.5",
-    "@budibase/string-templates": "2.3.17-alpha.5",
-    "@budibase/types": "2.3.17-alpha.5",
+    "@budibase/backend-core": "2.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.6",
+    "@budibase/types": "2.3.17-alpha.6",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 97ebc2b2e0..8b52e19c87 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.5",
-    "@budibase/frontend-core": "2.3.17-alpha.5",
-    "@budibase/string-templates": "2.3.17-alpha.5",
+    "@budibase/bbui": "2.3.17-alpha.6",
+    "@budibase/frontend-core": "2.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.6",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 7a42ba09db..0ef09e42e2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.5",
+    "@budibase/bbui": "2.3.17-alpha.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 36328c51d8..fc95ba8106 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c647378d54..5c887c1a5b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.5",
-    "@budibase/client": "2.3.17-alpha.5",
+    "@budibase/backend-core": "2.3.17-alpha.6",
+    "@budibase/client": "2.3.17-alpha.6",
     "@budibase/pro": "2.3.17-alpha.5",
-    "@budibase/string-templates": "2.3.17-alpha.5",
-    "@budibase/types": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.6",
+    "@budibase/types": "2.3.17-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d5eb7e3f04..b53eaf887e 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 0b1ee30b2e..c913fea299 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c1a1a8a001..a7b280f203 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.5",
+  "version": "2.3.17-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.5",
+    "@budibase/backend-core": "2.3.17-alpha.6",
     "@budibase/pro": "2.3.17-alpha.5",
-    "@budibase/string-templates": "2.3.17-alpha.5",
-    "@budibase/types": "2.3.17-alpha.5",
+    "@budibase/string-templates": "2.3.17-alpha.6",
+    "@budibase/types": "2.3.17-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e093ab5ef4992058e4a74181638793ac4b6edd98 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 11:56:26 +0000
Subject: [PATCH 061/273] Update pro version to 2.3.17-alpha.6

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 5c887c1a5b..1d852473f2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.6",
     "@budibase/client": "2.3.17-alpha.6",
-    "@budibase/pro": "2.3.17-alpha.5",
+    "@budibase/pro": "2.3.17-alpha.6",
     "@budibase/string-templates": "2.3.17-alpha.6",
     "@budibase/types": "2.3.17-alpha.6",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 2d6ad91005..72f2bc4db2 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.5.tgz#5bd380c9bf3835694729f1c68c44a77aec7b66dd"
-  integrity sha512-Nv/BsmItQcdi30oHvNEeRRkDxooMR3shZksb14NDWfdP9gxjVOkUltA2HELujL2ZEg4mismau/0oy9kZy5z3Og==
+"@budibase/backend-core@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.6.tgz#b083b3899d435694105d37a1ec817ec6cdc9bb07"
+  integrity sha512-8ljXZnK6Db3Mexk+MyIsrQBFFu6aV3eRtiw5pwHl9BobxR+6s79YmUgLfjZCfpgzMXqnT73FnV7g8K7KPTNC3g==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.5"
+    "@budibase/types" "2.3.17-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.5.tgz#4007ab38a5a88cedc1c0ba48543fcbfdf0c58a2a"
-  integrity sha512-pR7i7ehpoJ08Pq4Xs5vFJcZLvLkfCDS3AvJV1e0j9IDPD73kqiqCxgOF9rE27NTLf0BvbPK5Vj4Z7RPCxIJv7g==
+"@budibase/pro@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.6.tgz#2d24afa48003ff5928f667efeff16735bed24e0c"
+  integrity sha512-yVxKCHiDE4yoARDLZ3IqktUuWgNZoEVlmWo9rS8+bxPcsf5sw7Rj7TXTCMQX7F0cekMVtG+KkpH/8bFrqfR6OA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.5"
-    "@budibase/types" "2.3.17-alpha.5"
+    "@budibase/backend-core" "2.3.17-alpha.6"
+    "@budibase/types" "2.3.17-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.5.tgz#a8c31f49ac9f8b312317fd6fe547ea76d89d059b"
-  integrity sha512-qp51pVnOaUf42plQjPlCXZVMTIFKrkkhiJ+XaClnekRmyAYaz7JUIex+QTDbmUF4i0WbZRc0MgUCVQxlKkWotA==
+"@budibase/types@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.6.tgz#85b148334312a41cfbf01b6a20417b5e20485f3f"
+  integrity sha512-BgPvLdNQKJSnJmHNo1OfKSHEeVhdTwcNSr2cwHjUpJk394rJiZfsOV7it8M9dLtAtpdsNR3ns7L6biW+pfjYoQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a7b280f203..d595623fa4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.6",
-    "@budibase/pro": "2.3.17-alpha.5",
+    "@budibase/pro": "2.3.17-alpha.6",
     "@budibase/string-templates": "2.3.17-alpha.6",
     "@budibase/types": "2.3.17-alpha.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5c534eefe1..3273b78d68 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.5.tgz#5bd380c9bf3835694729f1c68c44a77aec7b66dd"
-  integrity sha512-Nv/BsmItQcdi30oHvNEeRRkDxooMR3shZksb14NDWfdP9gxjVOkUltA2HELujL2ZEg4mismau/0oy9kZy5z3Og==
+"@budibase/backend-core@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.6.tgz#b083b3899d435694105d37a1ec817ec6cdc9bb07"
+  integrity sha512-8ljXZnK6Db3Mexk+MyIsrQBFFu6aV3eRtiw5pwHl9BobxR+6s79YmUgLfjZCfpgzMXqnT73FnV7g8K7KPTNC3g==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.5"
+    "@budibase/types" "2.3.17-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.5.tgz#4007ab38a5a88cedc1c0ba48543fcbfdf0c58a2a"
-  integrity sha512-pR7i7ehpoJ08Pq4Xs5vFJcZLvLkfCDS3AvJV1e0j9IDPD73kqiqCxgOF9rE27NTLf0BvbPK5Vj4Z7RPCxIJv7g==
+"@budibase/pro@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.6.tgz#2d24afa48003ff5928f667efeff16735bed24e0c"
+  integrity sha512-yVxKCHiDE4yoARDLZ3IqktUuWgNZoEVlmWo9rS8+bxPcsf5sw7Rj7TXTCMQX7F0cekMVtG+KkpH/8bFrqfR6OA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.5"
-    "@budibase/types" "2.3.17-alpha.5"
+    "@budibase/backend-core" "2.3.17-alpha.6"
+    "@budibase/types" "2.3.17-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.5":
-  version "2.3.17-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.5.tgz#a8c31f49ac9f8b312317fd6fe547ea76d89d059b"
-  integrity sha512-qp51pVnOaUf42plQjPlCXZVMTIFKrkkhiJ+XaClnekRmyAYaz7JUIex+QTDbmUF4i0WbZRc0MgUCVQxlKkWotA==
+"@budibase/types@2.3.17-alpha.6":
+  version "2.3.17-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.6.tgz#85b148334312a41cfbf01b6a20417b5e20485f3f"
+  integrity sha512-BgPvLdNQKJSnJmHNo1OfKSHEeVhdTwcNSr2cwHjUpJk394rJiZfsOV7it8M9dLtAtpdsNR3ns7L6biW+pfjYoQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e223fae02a47704814481d0feb6c15a7f4125bcc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Feb 2023 12:24:43 +0000
Subject: [PATCH 062/273] Updating types to plurals after discussion about API
 design.

---
 packages/types/src/api/web/global/auditLogs.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index ef9927b89a..41bb5f022a 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -3,9 +3,9 @@ import { PaginationResponse, PaginationRequest } from "../"
 import { User, App } from "../../../"
 
 export interface AuditLogSearchParams {
-  userId?: string[]
-  appId?: string[]
-  event?: Event[]
+  userIds?: string[]
+  appIds?: string[]
+  events?: Event[]
   startDate?: string
   endDate?: string
   fullSearch?: string

From 0f26f55019679014dc9de10872a15eea2edbb3c0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 21 Feb 2023 12:31:21 +0000
Subject: [PATCH 063/273] some style updates for the sidebar

---
 .../_components/ViewDetailsRenderer.svelte    |  2 +-
 .../portal/account/auditLogs/index.svelte     | 61 +++++++++++++++----
 packages/frontend-core/src/api/auditLogs.js   |  6 +-
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
index a222871966..b62ee48cb8 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/ViewDetailsRenderer.svelte
@@ -10,4 +10,4 @@
   }
 </script>
 
-<ActionButton size="S" on:click={onClick}>Edit</ActionButton>
+<ActionButton size="S" on:click={onClick}>Details</ActionButton>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 09b8466d8e..821e504774 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -55,8 +55,10 @@
   let prevLogSearch = undefined
   let selectedUsers = []
   let selectedApps = []
+  let selectedEvents = []
   let selectedLog
   let sidePanelVisible = false
+  let wideSidePanel = false
   let startDate, endDate
 
   $: fetchUsers(userPage, userSearchTerm)
@@ -66,7 +68,8 @@
     startDate,
     endDate,
     selectedUsers,
-    selectedApps
+    selectedApps,
+    selectedEvents
   )
 
   $: userPage = $userPageInfo.page
@@ -100,7 +103,8 @@
     startDate,
     endDate,
     selectedUsers,
-    selectedApps
+    selectedApps,
+    selectedEvents
   ) => {
     if ($logsPageInfo.loading) {
       return
@@ -120,6 +124,7 @@
         metadataSearch: search,
         userIds: selectedUsers,
         appIds: selectedApps,
+        events: selectedEvents,
       })
       logsPageInfo.fetched(
         $auditLogs.logs.hasNextPage,
@@ -225,7 +230,7 @@
           autocomplete
           placeholder="All apps"
           label="App"
-          getOptionValue={app => "app_dev_" + app.appId}
+          getOptionValue={app => app.instance._id}
           getOptionLabel={app => app.name}
           options={$apps}
           bind:value={selectedApps}
@@ -239,6 +244,7 @@
           options={Object.entries($auditLogs.events)}
           placeholder="All events"
           label="Event"
+          bind:value={selectedEvents}
         />
       </div>
     </div>
@@ -266,23 +272,35 @@
 {#if selectedLog}
   <div
     id="side-panel"
+    class:wide={wideSidePanel}
     class:visible={sidePanelVisible}
     use:clickOutside={() => {
       sidePanelVisible = false
     }}
   >
     <div class="side-panel-header">
-      Audit Logs
-      <Icon
-        hoverable
-        name="Close"
-        on:click={() => {
-          sidePanelVisible = false
-        }}
-      />
+      Audit Log
+      <div class="side-panel-icons">
+        <Icon
+          size="S"
+          hoverable
+          name={wideSidePanel ? "Minimize" : "Maximize"}
+          on:click={() => {
+            wideSidePanel = !wideSidePanel
+          }}
+        />
+        <Icon
+          hoverable
+          name="Close"
+          on:click={() => {
+            sidePanelVisible = false
+          }}
+        />
+      </div>
     </div>
     <div style="padding-top: 10px; height: 95%">
       <CoreTextArea
+        disabled
         minHeight={"300px"}
         height={"100%"}
         value={JSON.stringify(selectedLog.metadata, null, 2)}
@@ -319,6 +337,22 @@
     transform: translateX(0);
   }
 
+  #side-panel.wide {
+    width: 500px;
+  }
+
+  #side-panel :global(textarea) {
+    min-height: 202px !important;
+    background-color: var(
+      --spectrum-textfield-m-background-color,
+      var(--spectrum-global-color-gray-50)
+    );
+    color: var(
+      --spectrum-textfield-m-text-color,
+      var(--spectrum-alias-text-color)
+    );
+  }
+
   .search :global(.spectrum-InputGroup) {
     width: 100px;
   }
@@ -331,6 +365,11 @@
     align-items: flex-end;
   }
 
+  .side-panel-icons {
+    display: flex;
+    gap: var(--spacing-l);
+  }
+
   .select {
     flex-basis: 130px;
     width: 0;
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 35c5a59c1f..745bfbc742 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -4,7 +4,7 @@ const buildOpts = ({
   startDate,
   endDate,
   metadataSearch,
-  event,
+  events,
 }) => {
   const opts = {}
 
@@ -17,8 +17,8 @@ const buildOpts = ({
     opts.metadataSearch = metadataSearch
   }
 
-  if (event) {
-    opts.event = event
+  if (events) {
+    opts.event = events
   }
 
   if (userIds) {

From a84665c1999a7b683f42794b8fe11c1714ece7d5 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Feb 2023 13:36:14 +0000
Subject: [PATCH 064/273] Re-order deprovisioning sequence to fix platform user
 removal

---
 packages/worker/src/sdk/tenants/tenants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/sdk/tenants/tenants.ts b/packages/worker/src/sdk/tenants/tenants.ts
index 3ba9c3f3a7..829b144c75 100644
--- a/packages/worker/src/sdk/tenants/tenants.ts
+++ b/packages/worker/src/sdk/tenants/tenants.ts
@@ -5,9 +5,9 @@ import { quotas } from "@budibase/pro"
 export async function deleteTenant(tenantId: string) {
   await quotas.bustCache()
   await platform.tenants.removeTenant(tenantId)
-  await removeGlobalDB(tenantId)
   await removeTenantUsers(tenantId)
   await removeTenantApps(tenantId)
+  await removeGlobalDB(tenantId)
 }
 
 async function removeGlobalDB(tenantId: string) {

From a3dfaf2c3ff6beca2e4a6a86a444cd2461610b7b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 14:39:55 +0000
Subject: [PATCH 065/273] v2.3.17-alpha.7

---
 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 80460af875..2d1b05887b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 68323e05ac..f991cb07bf 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.6",
+    "@budibase/types": "2.3.17-alpha.7",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ccaadf77b1..e925115c81 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.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "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.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.7",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 761f17dd6d..71d498f06e 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.6",
-    "@budibase/client": "2.3.17-alpha.6",
-    "@budibase/frontend-core": "2.3.17-alpha.6",
-    "@budibase/string-templates": "2.3.17-alpha.6",
+    "@budibase/bbui": "2.3.17-alpha.7",
+    "@budibase/client": "2.3.17-alpha.7",
+    "@budibase/frontend-core": "2.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.7",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a4c21bef29..539612b58e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "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.3.17-alpha.6",
-    "@budibase/string-templates": "2.3.17-alpha.6",
-    "@budibase/types": "2.3.17-alpha.6",
+    "@budibase/backend-core": "2.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.7",
+    "@budibase/types": "2.3.17-alpha.7",
     "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 8b52e19c87..deea461e50 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "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.3.17-alpha.6",
-    "@budibase/frontend-core": "2.3.17-alpha.6",
-    "@budibase/string-templates": "2.3.17-alpha.6",
+    "@budibase/bbui": "2.3.17-alpha.7",
+    "@budibase/frontend-core": "2.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.7",
     "@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 0ef09e42e2..662771e3bf 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.6",
+    "@budibase/bbui": "2.3.17-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index fc95ba8106..18a46b71ed 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 1d852473f2..75b8af44e8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.6",
-    "@budibase/client": "2.3.17-alpha.6",
+    "@budibase/backend-core": "2.3.17-alpha.7",
+    "@budibase/client": "2.3.17-alpha.7",
     "@budibase/pro": "2.3.17-alpha.6",
-    "@budibase/string-templates": "2.3.17-alpha.6",
-    "@budibase/types": "2.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.7",
+    "@budibase/types": "2.3.17-alpha.7",
     "@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 b53eaf887e..8a1024ea0d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "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 c913fea299..77b9fba3ca 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "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 d595623fa4..220bfa239a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.6",
+  "version": "2.3.17-alpha.7",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.6",
+    "@budibase/backend-core": "2.3.17-alpha.7",
     "@budibase/pro": "2.3.17-alpha.6",
-    "@budibase/string-templates": "2.3.17-alpha.6",
-    "@budibase/types": "2.3.17-alpha.6",
+    "@budibase/string-templates": "2.3.17-alpha.7",
+    "@budibase/types": "2.3.17-alpha.7",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 91941a538f926f5b9db5bf8032787855cfa13256 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 14:43:54 +0000
Subject: [PATCH 066/273] Update pro version to 2.3.17-alpha.7

---
 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 75b8af44e8..2a2c12e9ba 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.7",
     "@budibase/client": "2.3.17-alpha.7",
-    "@budibase/pro": "2.3.17-alpha.6",
+    "@budibase/pro": "2.3.17-alpha.7",
     "@budibase/string-templates": "2.3.17-alpha.7",
     "@budibase/types": "2.3.17-alpha.7",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 72f2bc4db2..0576daf213 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.6.tgz#b083b3899d435694105d37a1ec817ec6cdc9bb07"
-  integrity sha512-8ljXZnK6Db3Mexk+MyIsrQBFFu6aV3eRtiw5pwHl9BobxR+6s79YmUgLfjZCfpgzMXqnT73FnV7g8K7KPTNC3g==
+"@budibase/backend-core@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.7.tgz#a7040a54d9efe6f7e377f06ccdd37c39bafb6098"
+  integrity sha512-LG6/hP7MH9rkCHhW5D9Awst//tm8fn5Fus1b9nJSFVnNsuobRl0TaVs9A1HOrKr+0yHlLg5OrgLyRuFRxWVP6A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.6"
+    "@budibase/types" "2.3.17-alpha.7"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.6.tgz#2d24afa48003ff5928f667efeff16735bed24e0c"
-  integrity sha512-yVxKCHiDE4yoARDLZ3IqktUuWgNZoEVlmWo9rS8+bxPcsf5sw7Rj7TXTCMQX7F0cekMVtG+KkpH/8bFrqfR6OA==
+"@budibase/pro@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.7.tgz#adee25699d0a03f4093256686508c3505fecdeaf"
+  integrity sha512-mzK3z8v4jJkzUm3v6YeWoMBfFc9lhfk2RXcL3Yn9syCR5eoH+j/b1PVqzb8oHu833MWVHgxEQTguORVciCinig==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.6"
-    "@budibase/types" "2.3.17-alpha.6"
+    "@budibase/backend-core" "2.3.17-alpha.7"
+    "@budibase/types" "2.3.17-alpha.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.6.tgz#85b148334312a41cfbf01b6a20417b5e20485f3f"
-  integrity sha512-BgPvLdNQKJSnJmHNo1OfKSHEeVhdTwcNSr2cwHjUpJk394rJiZfsOV7it8M9dLtAtpdsNR3ns7L6biW+pfjYoQ==
+"@budibase/types@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.7.tgz#4bad29002bbb01c5987a30ef5c98b7b075a07339"
+  integrity sha512-mszQPykRp7dPC6MSGZKTeH59Nx282WeqXnTCGi79Kd+Qdrkex5v7fJCdMoGy/gpScVghC0rEDkMTE2BKk6/jMQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 220bfa239a..f738df4780 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.7",
-    "@budibase/pro": "2.3.17-alpha.6",
+    "@budibase/pro": "2.3.17-alpha.7",
     "@budibase/string-templates": "2.3.17-alpha.7",
     "@budibase/types": "2.3.17-alpha.7",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3273b78d68..d80f39be2c 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.6.tgz#b083b3899d435694105d37a1ec817ec6cdc9bb07"
-  integrity sha512-8ljXZnK6Db3Mexk+MyIsrQBFFu6aV3eRtiw5pwHl9BobxR+6s79YmUgLfjZCfpgzMXqnT73FnV7g8K7KPTNC3g==
+"@budibase/backend-core@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.7.tgz#a7040a54d9efe6f7e377f06ccdd37c39bafb6098"
+  integrity sha512-LG6/hP7MH9rkCHhW5D9Awst//tm8fn5Fus1b9nJSFVnNsuobRl0TaVs9A1HOrKr+0yHlLg5OrgLyRuFRxWVP6A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.6"
+    "@budibase/types" "2.3.17-alpha.7"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.6.tgz#2d24afa48003ff5928f667efeff16735bed24e0c"
-  integrity sha512-yVxKCHiDE4yoARDLZ3IqktUuWgNZoEVlmWo9rS8+bxPcsf5sw7Rj7TXTCMQX7F0cekMVtG+KkpH/8bFrqfR6OA==
+"@budibase/pro@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.7.tgz#adee25699d0a03f4093256686508c3505fecdeaf"
+  integrity sha512-mzK3z8v4jJkzUm3v6YeWoMBfFc9lhfk2RXcL3Yn9syCR5eoH+j/b1PVqzb8oHu833MWVHgxEQTguORVciCinig==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.6"
-    "@budibase/types" "2.3.17-alpha.6"
+    "@budibase/backend-core" "2.3.17-alpha.7"
+    "@budibase/types" "2.3.17-alpha.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.6":
-  version "2.3.17-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.6.tgz#85b148334312a41cfbf01b6a20417b5e20485f3f"
-  integrity sha512-BgPvLdNQKJSnJmHNo1OfKSHEeVhdTwcNSr2cwHjUpJk394rJiZfsOV7it8M9dLtAtpdsNR3ns7L6biW+pfjYoQ==
+"@budibase/types@2.3.17-alpha.7":
+  version "2.3.17-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.7.tgz#4bad29002bbb01c5987a30ef5c98b7b075a07339"
+  integrity sha512-mszQPykRp7dPC6MSGZKTeH59Nx282WeqXnTCGi79Kd+Qdrkex5v7fJCdMoGy/gpScVghC0rEDkMTE2BKk6/jMQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b48acd8cf4ad375eb7ae37d219795eb481421cfc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Feb 2023 14:56:38 +0000
Subject: [PATCH 067/273] Some DB type updates (typing dump function) and
 adding in main audit log event publishers.

---
 .../src/events/publishers/auditLog.ts         | 26 +++++++++++++++++++
 .../src/events/publishers/index.ts            |  1 +
 .../types/src/api/web/global/auditLogs.ts     |  9 +++++--
 packages/types/src/api/web/pagination.ts      |  7 +++--
 packages/types/src/sdk/db.ts                  | 15 ++++++++++-
 packages/types/src/sdk/events/auditLog.ts     | 10 +++++++
 packages/types/src/sdk/events/event.ts        |  8 ++++++
 packages/types/src/sdk/events/index.ts        |  1 +
 8 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 packages/backend-core/src/events/publishers/auditLog.ts
 create mode 100644 packages/types/src/sdk/events/auditLog.ts

diff --git a/packages/backend-core/src/events/publishers/auditLog.ts b/packages/backend-core/src/events/publishers/auditLog.ts
new file mode 100644
index 0000000000..b72c135799
--- /dev/null
+++ b/packages/backend-core/src/events/publishers/auditLog.ts
@@ -0,0 +1,26 @@
+import {
+  Event,
+  AuditLogSearchParams,
+  AuditLogFilterEvent,
+  AuditLogDownloadEvent,
+} from "@budibase/types"
+import { publishEvent } from "../events"
+
+async function filtered(search: AuditLogSearchParams) {
+  const properties: AuditLogFilterEvent = {
+    filters: search,
+  }
+  await publishEvent(Event.AUDIT_LOG_FILTER, properties)
+}
+
+async function download(search: AuditLogSearchParams) {
+  const properties: AuditLogDownloadEvent = {
+    filters: search,
+  }
+  await publishEvent(Event.AUDIT_LOG_DOWNLOAD, properties)
+}
+
+export default {
+  filtered,
+  download,
+}
diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts
index 34e47b2990..87a34bf3f1 100644
--- a/packages/backend-core/src/events/publishers/index.ts
+++ b/packages/backend-core/src/events/publishers/index.ts
@@ -21,3 +21,4 @@ export { default as group } from "./group"
 export { default as plugin } from "./plugin"
 export { default as backup } from "./backup"
 export { default as environmentVariable } from "./environmentVariable"
+export { default as auditLog } from "./auditLog"
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 41bb5f022a..8ce0e742d2 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -1,5 +1,9 @@
 import { Event, AuditedEventFriendlyName } from "../../../sdk"
-import { PaginationResponse, PaginationRequest } from "../"
+import {
+  PaginationResponse,
+  PaginationRequest,
+  BasicPaginationRequest,
+} from "../"
 import { User, App } from "../../../"
 
 export interface AuditLogSearchParams {
@@ -9,12 +13,13 @@ export interface AuditLogSearchParams {
   startDate?: string
   endDate?: string
   fullSearch?: string
+  bookmark?: string
 }
 
 export interface DownloadAuditLogsRequest extends AuditLogSearchParams {}
 
 export interface SearchAuditLogsRequest
-  extends PaginationRequest,
+  extends BasicPaginationRequest,
     AuditLogSearchParams {}
 
 export enum AuditLogResourceStatus {
diff --git a/packages/types/src/api/web/pagination.ts b/packages/types/src/api/web/pagination.ts
index ca640d58db..ae4c56971a 100644
--- a/packages/types/src/api/web/pagination.ts
+++ b/packages/types/src/api/web/pagination.ts
@@ -8,9 +8,12 @@ export enum SortType {
   number = "number",
 }
 
-export interface PaginationRequest {
-  limit?: number
+export interface BasicPaginationRequest {
   bookmark?: string
+}
+
+export interface PaginationRequest extends BasicPaginationRequest {
+  limit?: number
   sort?: {
     order: SortOrder
     column: string
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 35d198ccb2..092253d63a 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -1,5 +1,6 @@
 import Nano from "@budibase/nano"
 import { AllDocsResponse, AnyDocument, Document } from "../"
+import { Writable } from "stream"
 
 export type PouchOptions = {
   inMemory?: boolean
@@ -63,6 +64,18 @@ export const isDocument = (doc: any): doc is Document => {
   return typeof doc === "object" && doc._id && doc._rev
 }
 
+export interface DatabaseDumpOpts {
+  filter?: (doc: AnyDocument) => boolean
+  batch_size?: number
+  batch_limit?: number
+  style?: "main_only" | "all_docs"
+  timeout?: number
+  doc_ids?: string[]
+  query_params?: any
+  view?: string
+  selector?: any
+}
+
 export interface Database {
   name: string
 
@@ -87,7 +100,7 @@ export interface Database {
   compact(): Promise<Nano.OkResponse | void>
   // these are all PouchDB related functions that are rarely used - in future
   // should be replaced by better typed/non-pouch implemented methods
-  dump(...args: any[]): Promise<any>
+  dump(stream: Writable, opts?: DatabaseDumpOpts): Promise<any>
   load(...args: any[]): Promise<any>
   createIndex(...args: any[]): Promise<any>
   deleteIndex(...args: any[]): Promise<any>
diff --git a/packages/types/src/sdk/events/auditLog.ts b/packages/types/src/sdk/events/auditLog.ts
new file mode 100644
index 0000000000..c5e3208536
--- /dev/null
+++ b/packages/types/src/sdk/events/auditLog.ts
@@ -0,0 +1,10 @@
+import { BaseEvent } from "./event"
+import { AuditLogSearchParams } from "../../api"
+
+export interface AuditLogFilterEvent extends BaseEvent {
+  filters: AuditLogSearchParams
+}
+
+export interface AuditLogDownloadEvent extends BaseEvent {
+  filters: AuditLogSearchParams
+}
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 1be0ea2bdf..119ae4ad7a 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -180,6 +180,10 @@ export enum Event {
   ENVIRONMENT_VARIABLE_CREATED = "environment_variable:created",
   ENVIRONMENT_VARIABLE_DELETED = "environment_variable:deleted",
   ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened",
+
+  // AUDIT LOG
+  AUDIT_LOG_FILTER = "audit_log:filter",
+  AUDIT_LOG_DOWNLOAD = "audit_log:download",
 }
 
 // all events that are not audited have been added to this record as undefined, this means
@@ -356,6 +360,10 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.INSTALLATION_VERSION_UPGRADED]: undefined,
   [Event.INSTALLATION_VERSION_DOWNGRADED]: undefined,
   [Event.INSTALLATION_FIRST_STARTUP]: undefined,
+
+  // AUDIT LOG - NOT AUDITED
+  [Event.AUDIT_LOG_FILTER]: undefined,
+  [Event.AUDIT_LOG_DOWNLOAD]: undefined,
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/types/src/sdk/events/index.ts b/packages/types/src/sdk/events/index.ts
index 009d9beac4..745f84d2a3 100644
--- a/packages/types/src/sdk/events/index.ts
+++ b/packages/types/src/sdk/events/index.ts
@@ -22,3 +22,4 @@ export * from "./userGroup"
 export * from "./plugin"
 export * from "./backup"
 export * from "./environmentVariable"
+export * from "./auditLog"

From e64e3a9e458c9f27d2d6a73b8f4821f8120d94d5 Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:03:58 +0000
Subject: [PATCH 068/273] New Onboarding URL Validation (#9507)

* New Onboarding URL Validation

* linting

* PR Feedback
---
 .../src/components/start/CreateAppModal.svelte   | 16 ++++++++++++++--
 .../src/components/start/UpdateAppModal.svelte   | 15 +++++++++++++--
 packages/builder/src/constants/index.js          |  2 +-
 .../builder/src/helpers/validation/yup/app.js    |  4 +---
 .../apps/onboarding/_components/NamePanel.svelte |  5 +++++
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 9ebc046cdc..e3ce048a89 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -26,7 +26,15 @@
 
   const values = writable({ name: "", url: null })
   const validation = createValidationStore()
-  $: validation.check($values)
+
+  $: {
+    const { name, url } = $values
+
+    validation.check({
+      name,
+      url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+    })
+  }
 
   onMount(async () => {
     const lastChar = $auth.user?.firstName
@@ -87,7 +95,11 @@
     appValidation.url(validation, { apps: applications })
     appValidation.file(validation, { template })
     // init validation
-    validation.check($values)
+    const { name, url } = $values
+    validation.check({
+      name,
+      url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+    })
   }
 
   async function createNewApp() {
diff --git a/packages/builder/src/components/start/UpdateAppModal.svelte b/packages/builder/src/components/start/UpdateAppModal.svelte
index a41ebccaeb..4385175816 100644
--- a/packages/builder/src/components/start/UpdateAppModal.svelte
+++ b/packages/builder/src/components/start/UpdateAppModal.svelte
@@ -23,14 +23,25 @@
   })
   const validation = createValidationStore()
 
-  $: validation.check($values)
+  $: {
+    const { name, url } = $values
+
+    validation.check({
+      name,
+      url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+    })
+  }
 
   const setupValidation = async () => {
     const applications = svelteGet(apps)
     appValidation.name(validation, { apps: applications, currentApp: app })
     appValidation.url(validation, { apps: applications, currentApp: app })
     // init validation
-    validation.check($values)
+    const { name, url } = $values
+    validation.check({
+      name,
+      url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+    })
   }
 
   async function updateApp() {
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index 803cafcffb..f68202f81e 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -46,7 +46,7 @@ export const LAYOUT_NAMES = {
 // one or more word characters and whitespace
 export const APP_NAME_REGEX = /^[\w\s]+$/
 // zero or more non-whitespace characters
-export const APP_URL_REGEX = /^\S*$/
+export const APP_URL_REGEX = /^[0-9a-zA-Z-_]+$/
 
 export const DefaultAppTheme = {
   primaryColor: "var(--spectrum-global-color-blue-600)",
diff --git a/packages/builder/src/helpers/validation/yup/app.js b/packages/builder/src/helpers/validation/yup/app.js
index 4e41576d46..8498255cc9 100644
--- a/packages/builder/src/helpers/validation/yup/app.js
+++ b/packages/builder/src/helpers/validation/yup/app.js
@@ -62,11 +62,9 @@ export const url = (validation, { apps, currentApp } = { apps: [] }) => {
         }
         // make it clear that this is a url path and cannot be a full url
         return (
-          value.startsWith("/") &&
           !value.includes("http") &&
           !value.includes("www") &&
-          !value.includes(".") &&
-          value.length > 1 // just '/' is not valid
+          !value.includes(".")
         )
       })
   )
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
index 730cfbe4a2..1264b63531 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
@@ -1,6 +1,7 @@
 <script>
   import { Button, FancyForm, FancyInput } from "@budibase/bbui"
   import PanelHeader from "./PanelHeader.svelte"
+  import { APP_URL_REGEX } from "constants"
 
   export let name = ""
   export let url = ""
@@ -25,6 +26,10 @@
     if (url.length < 1) {
       return "URL must be provided"
     }
+
+    if (!APP_URL_REGEX.test(url)) {
+      return "Invalid URL"
+    }
   }
 </script>
 

From 5e7305b4dd302180b179145c89239778d60b7286 Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:04:37 +0000
Subject: [PATCH 069/273] Fix Automation Bindings Panel Requiring a Double
 Click (#9688)

* Fix Automation Bindings Panel Requiring a Double Click

* PR Feedback

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
---
 .../builder/src/components/common/bindings/BindingPanel.svelte   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 7daf2173a7..3a1c6c4fee 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -183,6 +183,7 @@
     bind:this={popover}
     anchor={popoverAnchor}
     maxWidth={300}
+    dismissible={false}
   >
     <Layout gap="S">
       <div class="helper">

From 9fadc42a2e62d472aeea4fdd7fd5c141319b9818 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 15:20:48 +0000
Subject: [PATCH 070/273] v2.3.17-alpha.8

---
 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 2d1b05887b..5530ace9f0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index f991cb07bf..18fcb3d696 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.17-alpha.7",
+    "@budibase/types": "2.3.17-alpha.8",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index e925115c81..3144341c74 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.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "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.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.8",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 71d498f06e..54b6994eb7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.7",
-    "@budibase/client": "2.3.17-alpha.7",
-    "@budibase/frontend-core": "2.3.17-alpha.7",
-    "@budibase/string-templates": "2.3.17-alpha.7",
+    "@budibase/bbui": "2.3.17-alpha.8",
+    "@budibase/client": "2.3.17-alpha.8",
+    "@budibase/frontend-core": "2.3.17-alpha.8",
+    "@budibase/string-templates": "2.3.17-alpha.8",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 539612b58e..83b9440102 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "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.3.17-alpha.7",
-    "@budibase/string-templates": "2.3.17-alpha.7",
-    "@budibase/types": "2.3.17-alpha.7",
+    "@budibase/backend-core": "2.3.17-alpha.8",
+    "@budibase/string-templates": "2.3.17-alpha.8",
+    "@budibase/types": "2.3.17-alpha.8",
     "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 deea461e50..a0ea947f18 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "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.3.17-alpha.7",
-    "@budibase/frontend-core": "2.3.17-alpha.7",
-    "@budibase/string-templates": "2.3.17-alpha.7",
+    "@budibase/bbui": "2.3.17-alpha.8",
+    "@budibase/frontend-core": "2.3.17-alpha.8",
+    "@budibase/string-templates": "2.3.17-alpha.8",
     "@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 662771e3bf..6ddf874931 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.17-alpha.7",
+    "@budibase/bbui": "2.3.17-alpha.8",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 18a46b71ed..cd007bac7e 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 2a2c12e9ba..3436419c98 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.7",
-    "@budibase/client": "2.3.17-alpha.7",
+    "@budibase/backend-core": "2.3.17-alpha.8",
+    "@budibase/client": "2.3.17-alpha.8",
     "@budibase/pro": "2.3.17-alpha.7",
-    "@budibase/string-templates": "2.3.17-alpha.7",
-    "@budibase/types": "2.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.8",
+    "@budibase/types": "2.3.17-alpha.8",
     "@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 8a1024ea0d..e7a72c35e5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "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 77b9fba3ca..8db1b0708c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "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 f738df4780..ecb62ceeb5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.7",
+  "version": "2.3.17-alpha.8",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.17-alpha.7",
+    "@budibase/backend-core": "2.3.17-alpha.8",
     "@budibase/pro": "2.3.17-alpha.7",
-    "@budibase/string-templates": "2.3.17-alpha.7",
-    "@budibase/types": "2.3.17-alpha.7",
+    "@budibase/string-templates": "2.3.17-alpha.8",
+    "@budibase/types": "2.3.17-alpha.8",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 1ada790d507b76e4d2cb133a98465dc07b0b1b36 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 15:21:00 +0000
Subject: [PATCH 071/273] Fix postgres update for relationships

---
 packages/server/src/integrations/base/sql.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index e66795a6db..c722891910 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -502,9 +502,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.update(parsedBody)
     } else {
-      return query
-        .update(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.update(parsedBody).returning("*")
     }
   }
 

From fcab5884ac85d21067c85b15fc8782825bb36838 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 15:24:40 +0000
Subject: [PATCH 072/273] Update pro version to 2.3.17-alpha.8

---
 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 3436419c98..63629b425a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.17-alpha.8",
     "@budibase/client": "2.3.17-alpha.8",
-    "@budibase/pro": "2.3.17-alpha.7",
+    "@budibase/pro": "2.3.17-alpha.8",
     "@budibase/string-templates": "2.3.17-alpha.8",
     "@budibase/types": "2.3.17-alpha.8",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0576daf213..be01941673 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.7.tgz#a7040a54d9efe6f7e377f06ccdd37c39bafb6098"
-  integrity sha512-LG6/hP7MH9rkCHhW5D9Awst//tm8fn5Fus1b9nJSFVnNsuobRl0TaVs9A1HOrKr+0yHlLg5OrgLyRuFRxWVP6A==
+"@budibase/backend-core@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.8.tgz#c1bd7bb9ac581bd4ea9eb0e7883553219e3bcd9f"
+  integrity sha512-31zNXAwukBpbcHSvobtdTLBtrZsfIsq0NilxHzFJpaMEeGSq47fpwGPkzvzoekhgn0oGs0X4m4uRNaFKEDifeQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.7"
+    "@budibase/types" "2.3.17-alpha.8"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.7.tgz#adee25699d0a03f4093256686508c3505fecdeaf"
-  integrity sha512-mzK3z8v4jJkzUm3v6YeWoMBfFc9lhfk2RXcL3Yn9syCR5eoH+j/b1PVqzb8oHu833MWVHgxEQTguORVciCinig==
+"@budibase/pro@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.8.tgz#f88416061c097c12ed133fac59200da408223c1c"
+  integrity sha512-d8VVdaH6X1e/GrQB4xA09pN5ANk6mxbXJ861KEniex3uEl1YFBJ75JJvoPLf2ynRIVqqsix18AXoO76ug7m9zA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.7"
-    "@budibase/types" "2.3.17-alpha.7"
+    "@budibase/backend-core" "2.3.17-alpha.8"
+    "@budibase/types" "2.3.17-alpha.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.7.tgz#4bad29002bbb01c5987a30ef5c98b7b075a07339"
-  integrity sha512-mszQPykRp7dPC6MSGZKTeH59Nx282WeqXnTCGi79Kd+Qdrkex5v7fJCdMoGy/gpScVghC0rEDkMTE2BKk6/jMQ==
+"@budibase/types@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.8.tgz#3ac692eec686c7b1ca728774a5a7e171644a9388"
+  integrity sha512-Ubt1vsa2OJY9NYqIxKrrvokAkWNs9snHR69czBkyigYnRrQ8axXijn3s3DoxhXg0KEyaFeMcOnq1yxEyHXPDBg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ecb62ceeb5..e7fe5de7f4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.17-alpha.8",
-    "@budibase/pro": "2.3.17-alpha.7",
+    "@budibase/pro": "2.3.17-alpha.8",
     "@budibase/string-templates": "2.3.17-alpha.8",
     "@budibase/types": "2.3.17-alpha.8",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d80f39be2c..fdf89c6b1c 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.7.tgz#a7040a54d9efe6f7e377f06ccdd37c39bafb6098"
-  integrity sha512-LG6/hP7MH9rkCHhW5D9Awst//tm8fn5Fus1b9nJSFVnNsuobRl0TaVs9A1HOrKr+0yHlLg5OrgLyRuFRxWVP6A==
+"@budibase/backend-core@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17-alpha.8.tgz#c1bd7bb9ac581bd4ea9eb0e7883553219e3bcd9f"
+  integrity sha512-31zNXAwukBpbcHSvobtdTLBtrZsfIsq0NilxHzFJpaMEeGSq47fpwGPkzvzoekhgn0oGs0X4m4uRNaFKEDifeQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.17-alpha.7"
+    "@budibase/types" "2.3.17-alpha.8"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.7.tgz#adee25699d0a03f4093256686508c3505fecdeaf"
-  integrity sha512-mzK3z8v4jJkzUm3v6YeWoMBfFc9lhfk2RXcL3Yn9syCR5eoH+j/b1PVqzb8oHu833MWVHgxEQTguORVciCinig==
+"@budibase/pro@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17-alpha.8.tgz#f88416061c097c12ed133fac59200da408223c1c"
+  integrity sha512-d8VVdaH6X1e/GrQB4xA09pN5ANk6mxbXJ861KEniex3uEl1YFBJ75JJvoPLf2ynRIVqqsix18AXoO76ug7m9zA==
   dependencies:
-    "@budibase/backend-core" "2.3.17-alpha.7"
-    "@budibase/types" "2.3.17-alpha.7"
+    "@budibase/backend-core" "2.3.17-alpha.8"
+    "@budibase/types" "2.3.17-alpha.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17-alpha.7":
-  version "2.3.17-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.7.tgz#4bad29002bbb01c5987a30ef5c98b7b075a07339"
-  integrity sha512-mszQPykRp7dPC6MSGZKTeH59Nx282WeqXnTCGi79Kd+Qdrkex5v7fJCdMoGy/gpScVghC0rEDkMTE2BKk6/jMQ==
+"@budibase/types@2.3.17-alpha.8":
+  version "2.3.17-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17-alpha.8.tgz#3ac692eec686c7b1ca728774a5a7e171644a9388"
+  integrity sha512-Ubt1vsa2OJY9NYqIxKrrvokAkWNs9snHR69czBkyigYnRrQ8axXijn3s3DoxhXg0KEyaFeMcOnq1yxEyHXPDBg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e0b3976ee4338b543765bf6952726bae509606df Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 15:57:04 +0000
Subject: [PATCH 073/273] Add return select statement back on update

---
 packages/server/src/integrations/base/sql.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index c722891910..e66795a6db 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -502,7 +502,9 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.update(parsedBody)
     } else {
-      return query.update(parsedBody).returning("*")
+      return query
+        .update(parsedBody)
+        .returning(generateSelectStatement(json, knex))
     }
   }
 

From be81767a465af3edd7c90514f42c0b8f28d2b0d0 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 15:57:56 +0000
Subject: [PATCH 074/273] Replace maps for foreach

---
 packages/server/src/api/controllers/row/ExternalRequest.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 2faff95595..6e79971aa2 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -293,7 +293,7 @@ export class ExternalRequest {
         // we're not inserting a doc, will be a bunch of update calls
         const otherKey: string = field.throughFrom || linkTablePrimary
         const thisKey: string = field.throughTo || tablePrimary
-        row[key].map((relationship: any) => {
+        row[key].forEach((relationship: any) => {
           manyRelationships.push({
             tableId: field.through || field.tableId,
             isUpdate: false,
@@ -309,7 +309,7 @@ export class ExternalRequest {
         const thisKey: string = "id"
         // @ts-ignore
         const otherKey: string = field.fieldName
-        row[key].map((relationship: any) => {
+        row[key].forEach((relationship: any) => {
           manyRelationships.push({
             tableId: field.tableId,
             isUpdate: true,

From e0242d08832bfa25167c050780f5ed16b76405b2 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Tue, 21 Feb 2023 16:29:18 +0000
Subject: [PATCH 075/273] Fix the many to one updates

---
 packages/server/src/api/controllers/row/ExternalRequest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 6e79971aa2..f62e7fe2d0 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -316,7 +316,7 @@ export class ExternalRequest {
             key: otherKey,
             [thisKey]: breakRowIdField(relationship)[0],
             // leave the ID for enrichment later
-            [otherKey]: `{{ literal ${tablePrimary} }}`,
+            [otherKey]: `{{ literal [${table.name}.${tablePrimary}] }}`,
           })
         })
       }

From ccc17f55994c05226d8bca3a437494a4201f3a82 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 17:03:45 +0000
Subject: [PATCH 076/273] v2.3.18-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 cfbed56e23..a881722de6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 32961a060b..c03600f5da 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.3.17",
+    "@budibase/types": "2.3.18-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 8c9629b314..9e3aea5fea 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.3.17",
+  "version": "2.3.18-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/string-templates": "2.3.18-alpha.0",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5e968c23a3..f8f6ac289d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
-    "@budibase/client": "^2.3.17",
-    "@budibase/frontend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/bbui": "2.3.18-alpha.0",
+    "@budibase/client": "2.3.18-alpha.0",
+    "@budibase/frontend-core": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index fb08c290fc..f2044f9c8b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/backend-core": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/types": "2.3.18-alpha.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 78df2b67f7..a784cfa6bc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
-    "@budibase/frontend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/bbui": "2.3.18-alpha.0",
+    "@budibase/frontend-core": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 502df0fbd4..b0d39ed450 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
+    "@budibase/bbui": "2.3.18-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d8a5c44c5b..597c3dff84 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 0ddf85f40f..8fe938e72c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.17",
-    "@budibase/client": "^2.3.17",
+    "@budibase/backend-core": "2.3.18-alpha.0",
+    "@budibase/client": "2.3.18-alpha.0",
     "@budibase/pro": "2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/types": "2.3.18-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 87b7c69dbb..edae9518ca 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 8417cadc06..3153bad674 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index cd25468c6b..1584019514 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17",
+  "version": "2.3.18-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.17",
+    "@budibase/backend-core": "2.3.18-alpha.0",
     "@budibase/pro": "2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/types": "2.3.18-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 1742055c3cee7c91b5b27489066db5e827d8a07b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 17:07:51 +0000
Subject: [PATCH 077/273] Update pro version to 2.3.18-alpha.0

---
 packages/server/package.json |  2 +-
 packages/server/yarn.lock    | 45 ++++++++++++++++++----------
 packages/worker/package.json |  2 +-
 packages/worker/yarn.lock    | 58 ++++++++++++++++++------------------
 4 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 8fe938e72c..5812a84717 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.0",
     "@budibase/client": "2.3.18-alpha.0",
-    "@budibase/pro": "2.3.17",
+    "@budibase/pro": "2.3.18-alpha.0",
     "@budibase/string-templates": "2.3.18-alpha.0",
     "@budibase/types": "2.3.18-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 95d377f24a..4d31641d3f 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,13 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
-  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
+"@budibase/backend-core@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.0.tgz#c0a64a150c1fef9cc69f95f0aece4e857d64438d"
+  integrity sha512-ugD+WMoFwpXm+moSLHUgaBOu4XpX0+5UhmMWcNeRtH0Yd9GpDh2QzwtoN8BtXq8k5gkVEyoNSz+6oxKfNkNVdQ==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.17"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.18-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1309,7 +1310,6 @@
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
-    pouchdb-replication-stream "1.2.9"
     redlock "4.2.0"
     sanitize-s3-objectkey "0.0.1"
     semver "7.3.7"
@@ -1379,13 +1379,26 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
-  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
   dependencies:
-    "@budibase/backend-core" "2.3.17"
-    "@budibase/types" "2.3.17"
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/pro@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.0.tgz#e87a2449d9e2453766c0ea77539af359bf5a81ff"
+  integrity sha512-nKLhCdLxmBX+VY7LF6daH0/AItcHoQTmBB3tc0SP7y4OLcJZfBEYidoWqWJKCgdz6LScWWogLgbDIAC8t+LNzg==
+  dependencies:
+    "@budibase/backend-core" "2.3.18-alpha.0"
+    "@budibase/types" "2.3.18-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1411,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
-  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
+"@budibase/types@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.0.tgz#14480e760c9e7931e884e9e0f8b1d5dd7e5d91c9"
+  integrity sha512-d+OcW2sNYw7VthMGrOBRY2Bz6iPQVWOnJ94XfYlBRJVIoYwBgudbYkOXPz/vQmHyjSUQFobrvs6UDeZ/3VJTaA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1584019514..9fd2843ae4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.0",
-    "@budibase/pro": "2.3.17",
+    "@budibase/pro": "2.3.18-alpha.0",
     "@budibase/string-templates": "2.3.18-alpha.0",
     "@budibase/types": "2.3.18-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5c73052232..83417a2e84 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,13 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
-  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
+"@budibase/backend-core@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.0.tgz#c0a64a150c1fef9cc69f95f0aece4e857d64438d"
+  integrity sha512-ugD+WMoFwpXm+moSLHUgaBOu4XpX0+5UhmMWcNeRtH0Yd9GpDh2QzwtoN8BtXq8k5gkVEyoNSz+6oxKfNkNVdQ==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.17"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.18-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -506,7 +507,6 @@
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
-    pouchdb-replication-stream "1.2.9"
     redlock "4.2.0"
     sanitize-s3-objectkey "0.0.1"
     semver "7.3.7"
@@ -526,13 +526,26 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
-  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
   dependencies:
-    "@budibase/backend-core" "2.3.17"
-    "@budibase/types" "2.3.17"
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/pro@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.0.tgz#e87a2449d9e2453766c0ea77539af359bf5a81ff"
+  integrity sha512-nKLhCdLxmBX+VY7LF6daH0/AItcHoQTmBB3tc0SP7y4OLcJZfBEYidoWqWJKCgdz6LScWWogLgbDIAC8t+LNzg==
+  dependencies:
+    "@budibase/backend-core" "2.3.18-alpha.0"
+    "@budibase/types" "2.3.18-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -540,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
-  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
+"@budibase/types@2.3.18-alpha.0":
+  version "2.3.18-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.0.tgz#14480e760c9e7931e884e9e0f8b1d5dd7e5d91c9"
+  integrity sha512-d+OcW2sNYw7VthMGrOBRY2Bz6iPQVWOnJ94XfYlBRJVIoYwBgudbYkOXPz/vQmHyjSUQFobrvs6UDeZ/3VJTaA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -6780,19 +6793,6 @@ pouchdb-promise@6.4.3, pouchdb-promise@^6.0.4:
   dependencies:
     lie "3.1.1"
 
-pouchdb-replication-stream@1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.9.tgz#aa4fa5d8f52df4825392f18e07c7e11acffc650a"
-  integrity sha512-hM8XRBfamTTUwRhKwLS/jSNouBhn9R/4ugdHNRD1EvJzwV8iImh6sDYbCU9PGuznjyOjXz6vpFRzKeI2KYfwnQ==
-  dependencies:
-    argsarray "0.0.1"
-    inherits "^2.0.3"
-    lodash.pick "^4.0.0"
-    ndjson "^1.4.3"
-    pouch-stream "^0.4.0"
-    pouchdb-promise "^6.0.4"
-    through2 "^2.0.0"
-
 pouchdb-selector-core@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"

From 940de8b6a0a6e013b95852e7d8268b205150f371 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 21 Feb 2023 17:13:24 +0000
Subject: [PATCH 078/273] Run CI steps in parallel (#9760)

* Parallel CI

* Add build to integration test

* Add checkout to top of each run

* Revert branch update for ci job

* Experiment with --runInBand for CI

* Fix intermittent backend-core migration test failure

* Fix hanging worker redis connection

* Update naming from reset to newTenant
---
 .github/workflows/budibase_ci.yml             |  94 ++++++++------
 .husky/pre-commit                             |   2 -
 packages/backend-core/jest.config.ts          |  10 +-
 packages/backend-core/package.json            |   2 +-
 .../passport/sso/tests/google.spec.ts         |   2 +-
 .../backend-core/src/migrations/migrations.ts | 116 +++++++++---------
 ...x.spec.js.snap => migrations.spec.ts.snap} |   0
 .../src/migrations/tests/index.spec.js        |  57 ---------
 .../src/migrations/tests/migrations.spec.ts   |  64 ++++++++++
 packages/backend-core/src/redis/init.ts       |   6 +-
 packages/backend-core/src/redis/redis.ts      |   5 +
 .../tests/utilities/DBTestConfiguration.ts    |   4 +
 packages/server/jest.config.ts                |  21 ++--
 packages/server/package.json                  |   2 +-
 packages/server/specs/resources/query.js      |   2 +-
 packages/server/specs/resources/table.js      |   2 +-
 .../src/api/routes/tests/static.spec.js       |  12 --
 .../server/src/api/routes/tests/user.spec.js  |   5 +-
 packages/server/src/utilities/redis.ts        |   2 +
 packages/worker/jest.config.ts                |  25 ++--
 packages/worker/package.json                  |   2 +-
 packages/worker/src/utilities/redis.ts        |   2 +
 22 files changed, 227 insertions(+), 210 deletions(-)
 rename packages/backend-core/src/migrations/tests/__snapshots__/{index.spec.js.snap => migrations.spec.ts.snap} (100%)
 delete mode 100644 packages/backend-core/src/migrations/tests/index.spec.js
 create mode 100644 packages/backend-core/src/migrations/tests/migrations.spec.ts

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index c07f9b2c28..e0263546ff 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -11,7 +11,6 @@ on:
     branches:
       - master
       - develop 
-      - release 
  workflow_dispatch:
 
 env:
@@ -20,9 +19,53 @@ env:
   PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js 14.x
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14.x
+    - run: yarn
+    - run: yarn lint
+
   build:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - name: Install Pro
+        run: yarn install:pro $BRANCH $BASE_BRANCH
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn build
 
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - name: Install Pro
+        run: yarn install:pro $BRANCH $BASE_BRANCH
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn test
+      - uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+          files: ./packages/server/coverage/clover.xml,./packages/worker/coverage/clover.xml,./packages/backend-core/coverage/clover.xml
+          name: codecov-umbrella
+          verbose: true
+
+  integration-test:
+    runs-on: ubuntu-latest
     services:
       couchdb:
         image: ibmcom/couchdb3
@@ -31,39 +74,18 @@ jobs:
           COUCHDB_USER: budibase
         ports:
           - 4567:5984
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: Install Pro
-      run: yarn install:pro $BRANCH $BASE_BRANCH
-
-    - run: yarn
-    - run: yarn bootstrap
-    - run: yarn lint
-    - run: yarn build
-    - run: yarn test
-      env:
-        CI: true
-        name: Budibase CI
-    - uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-        files: ./packages/server/coverage/clover.xml,./packages/worker/coverage/clover.xml,./packages/backend-core/coverage/clover.xml
-        name: codecov-umbrella
-        verbose: true 
-
-    - name: QA Core Integration Tests
-      run: | 
-        cd qa-core
-        yarn
-        yarn api:test:ci
\ No newline at end of file
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - name: Install Pro
+        run: yarn install:pro $BRANCH $BASE_BRANCH
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn build
+      - run: |
+          cd qa-core
+          yarn
+          yarn api:test:ci
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3b614330e0..6700f51282 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,2 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
-
-yarn run lint
diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts
index 0483fb073a..1e69797e71 100644
--- a/packages/backend-core/jest.config.ts
+++ b/packages/backend-core/jest.config.ts
@@ -9,15 +9,9 @@ const baseConfig: Config.InitialProjectOptions = {
   transform: {
     "^.+\\.ts?$": "@swc/jest",
   },
-}
-
-if (!process.env.CI) {
-  // use sources when not in CI
-  baseConfig.moduleNameMapper = {
+  moduleNameMapper: {
     "@budibase/types": "<rootDir>/../types/src",
-  }
-} else {
-  console.log("Running tests with compiled dependency sources")
+  },
 }
 
 const config: Config.InitialOptions = {
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c03600f5da..a32f5fd4dd 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -18,7 +18,7 @@
     "build:pro": "../../scripts/pro/build.sh",
     "postbuild": "yarn run build:pro",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "test": "jest --coverage",
+    "test": "jest --coverage --runInBand",
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
index eb8ffc9b71..d0689a1f0a 100644
--- a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
@@ -19,7 +19,7 @@ describe("google", () => {
     const callbackUrl = generator.url()
 
     it("should create successfully create a google strategy", async () => {
-      await google.strategyFactory(googleConfig, callbackUrl)
+      await google.strategyFactory(googleConfig, callbackUrl, mockSaveUserFn)
 
       const expectedOptions = {
         clientID: googleConfig.clientID,
diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 79c7eb55ea..2e3524775f 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -4,7 +4,7 @@ import {
   StaticDatabases,
   getAllApps,
   getGlobalDBName,
-  doWithDB,
+  getDB,
 } from "../db"
 import environment from "../environment"
 import * as platform from "../platform"
@@ -86,66 +86,65 @@ export const runMigration = async (
     count++
     const lengthStatement = length > 1 ? `[${count}/${length}]` : ""
 
-    await doWithDB(dbName, async (db: any) => {
-      try {
-        const doc = await getMigrationsDoc(db)
+    const db = getDB(dbName)
+    try {
+      const doc = await getMigrationsDoc(db)
 
-        // the migration has already been run
-        if (doc[migrationName]) {
-          // check for force
-          if (
-            options.force &&
-            options.force[migrationType] &&
-            options.force[migrationType].includes(migrationName)
-          ) {
-            log(
-              `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Forcing`
-            )
-          } else {
-            // no force, exit
-            return
-          }
-        }
-
-        // check if the migration is not a no-op
-        if (!options.noOp) {
+      // the migration has already been run
+      if (doc[migrationName]) {
+        // check for force
+        if (
+          options.force &&
+          options.force[migrationType] &&
+          options.force[migrationType].includes(migrationName)
+        ) {
           log(
-            `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Running ${lengthStatement}`
-          )
-
-          if (migration.preventRetry) {
-            // eagerly set the completion date
-            // so that we never run this migration twice even upon failure
-            doc[migrationName] = Date.now()
-            const response = await db.put(doc)
-            doc._rev = response.rev
-          }
-
-          // run the migration
-          if (migrationType === MigrationType.APP) {
-            await context.doInAppContext(db.name, async () => {
-              await migration.fn(db)
-            })
-          } else {
-            await migration.fn(db)
-          }
-
-          log(
-            `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Complete`
+            `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Forcing`
           )
+        } else {
+          // no force, exit
+          return
         }
-
-        // mark as complete
-        doc[migrationName] = Date.now()
-        await db.put(doc)
-      } catch (err) {
-        console.error(
-          `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Error: `,
-          err
-        )
-        throw err
       }
-    })
+
+      // check if the migration is not a no-op
+      if (!options.noOp) {
+        log(
+          `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Running ${lengthStatement}`
+        )
+
+        if (migration.preventRetry) {
+          // eagerly set the completion date
+          // so that we never run this migration twice even upon failure
+          doc[migrationName] = Date.now()
+          const response = await db.put(doc)
+          doc._rev = response.rev
+        }
+
+        // run the migration
+        if (migrationType === MigrationType.APP) {
+          await context.doInAppContext(db.name, async () => {
+            await migration.fn(db)
+          })
+        } else {
+          await migration.fn(db)
+        }
+
+        log(
+          `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Complete`
+        )
+      }
+
+      // mark as complete
+      doc[migrationName] = Date.now()
+      await db.put(doc)
+    } catch (err) {
+      console.error(
+        `[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Error: `,
+        err
+      )
+      throw err
+    }
   }
 }
 
@@ -185,7 +184,10 @@ export const runMigrations = async (
     // for all migrations
     for (const migration of migrations) {
       // run the migration
-      await context.doInTenant(tenantId, () => runMigration(migration, options))
+      await context.doInTenant(
+        tenantId,
+        async () => await runMigration(migration, options)
+      )
     }
   }
   console.log("Migrations complete")
diff --git a/packages/backend-core/src/migrations/tests/__snapshots__/index.spec.js.snap b/packages/backend-core/src/migrations/tests/__snapshots__/migrations.spec.ts.snap
similarity index 100%
rename from packages/backend-core/src/migrations/tests/__snapshots__/index.spec.js.snap
rename to packages/backend-core/src/migrations/tests/__snapshots__/migrations.spec.ts.snap
diff --git a/packages/backend-core/src/migrations/tests/index.spec.js b/packages/backend-core/src/migrations/tests/index.spec.js
deleted file mode 100644
index c1915510c3..0000000000
--- a/packages/backend-core/src/migrations/tests/index.spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-require("../../../tests")
-const { runMigrations, getMigrationsDoc } = require("../index")
-const { getGlobalDBName, getDB } = require("../../db")
-
-const { structures, testEnv } = require("../../../tests")
-testEnv.multiTenant()
-
-let db
-
-describe("migrations", () => {
-
-  const migrationFunction = jest.fn()
-
-  const MIGRATIONS = [{
-    type: "global",
-    name: "test",
-    fn: migrationFunction
-  }]
-
-  let tenantId
-
-  beforeEach(() => {
-    tenantId = structures.tenant.id()
-    db = getDB(getGlobalDBName(tenantId))
-  })
-
-  afterEach(async () => {
-    jest.clearAllMocks()
-    await db.destroy()
-  })
-
-  const migrate = () => {
-    return runMigrations(MIGRATIONS, { tenantIds: [tenantId]})
-  }
-
-  it("should run a new migration", async () => {
-    await migrate()
-    expect(migrationFunction).toHaveBeenCalled()
-    const doc = await getMigrationsDoc(db)
-    expect(doc.test).toBeDefined()
-  })
-
-  it("should match snapshot", async () => {
-    await migrate()
-    const doc = await getMigrationsDoc(db)
-    expect(doc).toMatchSnapshot()
-  })
-
-  it("should skip a previously run migration", async () => {
-    await migrate()
-    const previousMigrationTime = await getMigrationsDoc(db).test
-    await migrate()
-    const currentMigrationTime = await getMigrationsDoc(db).test
-    expect(migrationFunction).toHaveBeenCalledTimes(1)
-    expect(currentMigrationTime).toBe(previousMigrationTime)
-  })
-})
\ No newline at end of file
diff --git a/packages/backend-core/src/migrations/tests/migrations.spec.ts b/packages/backend-core/src/migrations/tests/migrations.spec.ts
new file mode 100644
index 0000000000..c74ab816c1
--- /dev/null
+++ b/packages/backend-core/src/migrations/tests/migrations.spec.ts
@@ -0,0 +1,64 @@
+import { testEnv, DBTestConfiguration } from "../../../tests"
+import * as migrations from "../index"
+import * as context from "../../context"
+import { MigrationType } from "@budibase/types"
+
+testEnv.multiTenant()
+
+describe("migrations", () => {
+  const config = new DBTestConfiguration()
+
+  const migrationFunction = jest.fn()
+
+  const MIGRATIONS = [
+    {
+      type: MigrationType.GLOBAL,
+      name: "test" as any,
+      fn: migrationFunction,
+    },
+  ]
+
+  beforeEach(() => {
+    config.newTenant()
+  })
+
+  afterEach(async () => {
+    jest.clearAllMocks()
+  })
+
+  const migrate = () => {
+    return migrations.runMigrations(MIGRATIONS, {
+      tenantIds: [config.tenantId],
+    })
+  }
+
+  it("should run a new migration", async () => {
+    await config.doInTenant(async () => {
+      await migrate()
+      expect(migrationFunction).toHaveBeenCalled()
+      const db = context.getGlobalDB()
+      const doc = await migrations.getMigrationsDoc(db)
+      expect(doc.test).toBeDefined()
+    })
+  })
+
+  it("should match snapshot", async () => {
+    await config.doInTenant(async () => {
+      await migrate()
+      const doc = await migrations.getMigrationsDoc(context.getGlobalDB())
+      expect(doc).toMatchSnapshot()
+    })
+  })
+
+  it("should skip a previously run migration", async () => {
+    await config.doInTenant(async () => {
+      const db = context.getGlobalDB()
+      await migrate()
+      const previousDoc = await migrations.getMigrationsDoc(db)
+      await migrate()
+      const currentDoc = await migrations.getMigrationsDoc(db)
+      expect(migrationFunction).toHaveBeenCalledTimes(1)
+      expect(currentDoc.test).toBe(previousDoc.test)
+    })
+  })
+})
diff --git a/packages/backend-core/src/redis/init.ts b/packages/backend-core/src/redis/init.ts
index 00329ffb84..485268edad 100644
--- a/packages/backend-core/src/redis/init.ts
+++ b/packages/backend-core/src/redis/init.ts
@@ -20,13 +20,17 @@ async function init() {
   ).init()
 }
 
-process.on("exit", async () => {
+export async function shutdown() {
   if (userClient) await userClient.finish()
   if (sessionClient) await sessionClient.finish()
   if (appClient) await appClient.finish()
   if (cacheClient) await cacheClient.finish()
   if (writethroughClient) await writethroughClient.finish()
   if (lockClient) await lockClient.finish()
+}
+
+process.on("exit", async () => {
+  await shutdown()
 })
 
 export async function getUserClient() {
diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index 2669cd816a..951369496a 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -91,6 +91,11 @@ function init(selectDb = DEFAULT_SELECT_DB) {
   }
   // attach handlers
   client.on("end", (err: Error) => {
+    if (env.isTest()) {
+      // don't try to re-connect in test env
+      // allow the process to exit
+      return
+    }
     connectionError(selectDb, timeout, err)
   })
   client.on("error", (err: Error) => {
diff --git a/packages/backend-core/tests/utilities/DBTestConfiguration.ts b/packages/backend-core/tests/utilities/DBTestConfiguration.ts
index cad62e2979..e5e57a99a3 100644
--- a/packages/backend-core/tests/utilities/DBTestConfiguration.ts
+++ b/packages/backend-core/tests/utilities/DBTestConfiguration.ts
@@ -12,6 +12,10 @@ class DBTestConfiguration {
     this.tenantId = structures.tenant.id()
   }
 
+  newTenant() {
+    this.tenantId = structures.tenant.id()
+  }
+
   // TENANCY
 
   doInTenant(task: any) {
diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index 41558d4c8e..331912aa19 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -11,22 +11,17 @@ const baseConfig: Config.InitialProjectOptions = {
   transform: {
     "^.+\\.ts?$": "@swc/jest",
   },
-}
-
-if (!process.env.CI) {
-  // use sources when not in CI
-  baseConfig.moduleNameMapper = {
+  moduleNameMapper: {
     "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
     "@budibase/backend-core": "<rootDir>/../backend-core/src",
     "@budibase/types": "<rootDir>/../types/src",
-  }
-  // add pro sources if they exist
-  if (fs.existsSync("../../../budibase-pro")) {
-    baseConfig.moduleNameMapper["@budibase/pro"] =
-      "<rootDir>/../../../budibase-pro/packages/pro/src"
-  }
-} else {
-  console.log("Running tests with compiled dependency sources")
+  },
+}
+
+// add pro sources if they exist
+if (fs.existsSync("../../../budibase-pro")) {
+  baseConfig.moduleNameMapper["@budibase/pro"] =
+    "<rootDir>/../../../budibase-pro/packages/pro/src"
 }
 
 const config: Config.InitialOptions = {
diff --git a/packages/server/package.json b/packages/server/package.json
index 5812a84717..3eb133e272 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -14,7 +14,7 @@
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-    "test": "jest --coverage --maxWorkers=2",
+    "test": "jest --coverage --runInBand",
     "test:watch": "jest --watch",
     "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
     "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
diff --git a/packages/server/specs/resources/query.js b/packages/server/specs/resources/query.js
index 10544ee7eb..1442e46a04 100644
--- a/packages/server/specs/resources/query.js
+++ b/packages/server/specs/resources/query.js
@@ -1,6 +1,6 @@
 const Resource = require("./utils/Resource")
 const { object } = require("./utils")
-const { BaseQueryVerbs } = require("../../dist/constants")
+const { BaseQueryVerbs } = require("../../src/constants")
 
 const query = {
   _id: "query_datasource_plus_4d8be0c506b9465daf4bf84d890fdab6_454854487c574d45bc4029b1e153219e",
diff --git a/packages/server/specs/resources/table.js b/packages/server/specs/resources/table.js
index 9bc57daf42..523a3a9dfd 100644
--- a/packages/server/specs/resources/table.js
+++ b/packages/server/specs/resources/table.js
@@ -2,7 +2,7 @@ const {
   FieldTypes,
   RelationshipTypes,
   FormulaTypes,
-} = require("../../dist/constants")
+} = require("../../src/constants")
 const { object } = require("./utils")
 const Resource = require("./utils/Resource")
 
diff --git a/packages/server/src/api/routes/tests/static.spec.js b/packages/server/src/api/routes/tests/static.spec.js
index a0532f12fb..13d963d057 100644
--- a/packages/server/src/api/routes/tests/static.spec.js
+++ b/packages/server/src/api/routes/tests/static.spec.js
@@ -13,18 +13,6 @@ describe("/static", () => {
     app = await config.init()
   })
 
-  describe("/builder", () => {
-    it("should serve the builder", async () => {
-      const res = await request
-        .get("/builder/portal")
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /text\/html/)
-        .expect(200)
-
-      expect(res.text).toContain("<title>Budibase</title>")
-    })
-  })
-
   describe("/app", () => {
     beforeEach(() => {
       jest.clearAllMocks()
diff --git a/packages/server/src/api/routes/tests/user.spec.js b/packages/server/src/api/routes/tests/user.spec.js
index bae784cf3d..6b674a8479 100644
--- a/packages/server/src/api/routes/tests/user.spec.js
+++ b/packages/server/src/api/routes/tests/user.spec.js
@@ -1,4 +1,4 @@
-const { roles, utils } = require("@budibase/backend-core")
+const { roles } = require("@budibase/backend-core")
 const { checkPermissionsEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
 const { BUILTIN_ROLE_IDS } = roles
@@ -21,8 +21,7 @@ describe("/users", () => {
 
   afterAll(setup.afterAll)
 
-  // For some reason this cannot be a beforeAll or the test "should be able to update the user" fail
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
   })
 
diff --git a/packages/server/src/utilities/redis.ts b/packages/server/src/utilities/redis.ts
index 1b7a3ce64c..dc37baae58 100644
--- a/packages/server/src/utilities/redis.ts
+++ b/packages/server/src/utilities/redis.ts
@@ -21,6 +21,8 @@ export async function shutdown() {
   if (devAppClient) await devAppClient.finish()
   if (debounceClient) await debounceClient.finish()
   if (flagClient) await flagClient.finish()
+  // shutdown core clients
+  await redis.clients.shutdown()
   console.log("Redis shutdown")
 }
 
diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts
index 8b0514211b..cdacfa411a 100644
--- a/packages/worker/jest.config.ts
+++ b/packages/worker/jest.config.ts
@@ -12,24 +12,19 @@ const config: Config.InitialOptions = {
   transform: {
     "^.+\\.ts?$": "@swc/jest",
   },
-}
-
-if (!process.env.CI) {
-  // use sources when not in CI
-  config.moduleNameMapper = {
+  moduleNameMapper: {
     "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
     "@budibase/backend-core": "<rootDir>/../backend-core/src",
     "@budibase/types": "<rootDir>/../types/src",
-  }
-  // add pro sources if they exist
-  if (fs.existsSync("../../../budibase-pro")) {
-    config.moduleNameMapper["@budibase/pro/(.*)"] =
-      "<rootDir>/../../../budibase-pro/packages/pro/$1"
-    config.moduleNameMapper["@budibase/pro"] =
-      "<rootDir>/../../../budibase-pro/packages/pro/src"
-  }
-} else {
-  console.log("Running tests with compiled dependency sources")
+  },
+}
+
+// add pro sources if they exist
+if (fs.existsSync("../../../budibase-pro")) {
+  config.moduleNameMapper["@budibase/pro/(.*)"] =
+    "<rootDir>/../../../budibase-pro/packages/pro/$1"
+  config.moduleNameMapper["@budibase/pro"] =
+    "<rootDir>/../../../budibase-pro/packages/pro/src"
 }
 
 export default config
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9fd2843ae4..0fb3abe53b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -22,7 +22,7 @@
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
-    "test": "jest --coverage --maxWorkers=2",
+    "test": "jest --coverage --runInBand",
     "test:watch": "jest --watch",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index 893ec9f0a8..9171fe97ee 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -54,6 +54,8 @@ export async function init() {
 export async function shutdown() {
   if (pwResetClient) await pwResetClient.finish()
   if (invitationClient) await invitationClient.finish()
+  // shutdown core clients
+  await redis.clients.shutdown()
   console.log("Redis shutdown")
 }
 

From 41eb0c3964727861937f36ac30930547c76031f9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Feb 2023 17:22:23 +0000
Subject: [PATCH 079/273] Updating worker db config to have replication
 available (for audit logs).

---
 packages/server/src/db/index.ts |  4 ++--
 packages/worker/src/db/index.ts | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/db/index.ts b/packages/server/src/db/index.ts
index fa8027dcc1..157c2f4fb3 100644
--- a/packages/server/src/db/index.ts
+++ b/packages/server/src/db/index.ts
@@ -1,4 +1,4 @@
-import { init as coreInit } from "@budibase/backend-core"
+import * as core from "@budibase/backend-core"
 import env from "../environment"
 
 export function init() {
@@ -12,5 +12,5 @@ export function init() {
     dbConfig.allDbs = true
   }
 
-  coreInit({ db: dbConfig })
+  core.init({ db: dbConfig })
 }
diff --git a/packages/worker/src/db/index.ts b/packages/worker/src/db/index.ts
index d74d00d910..157c2f4fb3 100644
--- a/packages/worker/src/db/index.ts
+++ b/packages/worker/src/db/index.ts
@@ -1,10 +1,16 @@
 import * as core from "@budibase/backend-core"
 import env from "../environment"
 
-export const init = () => {
-  const dbConfig: any = {}
+export function init() {
+  const dbConfig: any = {
+    replication: true,
+    find: true,
+  }
+
   if (env.isTest() && !env.COUCH_DB_URL) {
     dbConfig.inMemory = true
+    dbConfig.allDbs = true
   }
+
   core.init({ db: dbConfig })
 }

From deb76ca7f38ffccebc0d8c7a343f9cbcb7247f1e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 17:33:47 +0000
Subject: [PATCH 080/273] v2.3.18-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 a881722de6..64c2e16b71 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a32f5fd4dd..a5603730de 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.0",
+    "@budibase/types": "2.3.18-alpha.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9e3aea5fea..d45ce99270 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.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.1",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f8f6ac289d..b8b9c2e79c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.0",
-    "@budibase/client": "2.3.18-alpha.0",
-    "@budibase/frontend-core": "2.3.18-alpha.0",
-    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/bbui": "2.3.18-alpha.1",
+    "@budibase/client": "2.3.18-alpha.1",
+    "@budibase/frontend-core": "2.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f2044f9c8b..1b675c1f37 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.0",
-    "@budibase/string-templates": "2.3.18-alpha.0",
-    "@budibase/types": "2.3.18-alpha.0",
+    "@budibase/backend-core": "2.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.1",
+    "@budibase/types": "2.3.18-alpha.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index a784cfa6bc..b3f8734aff 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.0",
-    "@budibase/frontend-core": "2.3.18-alpha.0",
-    "@budibase/string-templates": "2.3.18-alpha.0",
+    "@budibase/bbui": "2.3.18-alpha.1",
+    "@budibase/frontend-core": "2.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index b0d39ed450..1753a0ecbd 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.0",
+    "@budibase/bbui": "2.3.18-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 597c3dff84..8b58c801fb 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 3eb133e272..d88c41f056 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.0",
-    "@budibase/client": "2.3.18-alpha.0",
+    "@budibase/backend-core": "2.3.18-alpha.1",
+    "@budibase/client": "2.3.18-alpha.1",
     "@budibase/pro": "2.3.18-alpha.0",
-    "@budibase/string-templates": "2.3.18-alpha.0",
-    "@budibase/types": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.1",
+    "@budibase/types": "2.3.18-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index edae9518ca..c2e06902e2 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 3153bad674..d378335af8 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0fb3abe53b..b2c7d93f94 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.0",
+  "version": "2.3.18-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.0",
+    "@budibase/backend-core": "2.3.18-alpha.1",
     "@budibase/pro": "2.3.18-alpha.0",
-    "@budibase/string-templates": "2.3.18-alpha.0",
-    "@budibase/types": "2.3.18-alpha.0",
+    "@budibase/string-templates": "2.3.18-alpha.1",
+    "@budibase/types": "2.3.18-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 1e0e3ce19ef74e7f62afd78c0986e7ade013d38a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 21 Feb 2023 17:37:00 +0000
Subject: [PATCH 081/273] Update pro version to 2.3.18-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 d88c41f056..c8c48044ab 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.1",
     "@budibase/client": "2.3.18-alpha.1",
-    "@budibase/pro": "2.3.18-alpha.0",
+    "@budibase/pro": "2.3.18-alpha.1",
     "@budibase/string-templates": "2.3.18-alpha.1",
     "@budibase/types": "2.3.18-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4d31641d3f..125ca007dd 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.0.tgz#c0a64a150c1fef9cc69f95f0aece4e857d64438d"
-  integrity sha512-ugD+WMoFwpXm+moSLHUgaBOu4XpX0+5UhmMWcNeRtH0Yd9GpDh2QzwtoN8BtXq8k5gkVEyoNSz+6oxKfNkNVdQ==
+"@budibase/backend-core@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.1.tgz#af5110dd16dd6a1bf378e4fadd312f920afadd3e"
+  integrity sha512-p5oNTWYjHMj2HdKrAP2vrVWCiU8tTQ978jgyvwgtBC8TfElowHN5Ly7HLu67v8IeSGK9BGZ7sz6kcS6ApcZa8Q==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.0"
+    "@budibase/types" "2.3.18-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.0.tgz#e87a2449d9e2453766c0ea77539af359bf5a81ff"
-  integrity sha512-nKLhCdLxmBX+VY7LF6daH0/AItcHoQTmBB3tc0SP7y4OLcJZfBEYidoWqWJKCgdz6LScWWogLgbDIAC8t+LNzg==
+"@budibase/pro@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.1.tgz#de1b7b271102fc3c62138dfdd130bf9af9f4c53f"
+  integrity sha512-mqyqsE0jg0kBbNrACti69iMfaVO/GgfHYsRizrN9xMwNRUamiwYROLvWYWouyCJYJAkTCTjll6Wex8CpinllCA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.0"
-    "@budibase/types" "2.3.18-alpha.0"
+    "@budibase/backend-core" "2.3.18-alpha.1"
+    "@budibase/types" "2.3.18-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.0.tgz#14480e760c9e7931e884e9e0f8b1d5dd7e5d91c9"
-  integrity sha512-d+OcW2sNYw7VthMGrOBRY2Bz6iPQVWOnJ94XfYlBRJVIoYwBgudbYkOXPz/vQmHyjSUQFobrvs6UDeZ/3VJTaA==
+"@budibase/types@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.1.tgz#d917e512d8644d94d71d0c8cb0d2e9cacecee720"
+  integrity sha512-35cX1NJfDwRb8DX3RkWVx46yT9+0fMndWSpOX+183ps0BTMyQ0UJBb80pNSsKMGjlgE+loQEXf0LymZ6vr9ucQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b2c7d93f94..90c7a2773d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.1",
-    "@budibase/pro": "2.3.18-alpha.0",
+    "@budibase/pro": "2.3.18-alpha.1",
     "@budibase/string-templates": "2.3.18-alpha.1",
     "@budibase/types": "2.3.18-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 83417a2e84..358d122930 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.0.tgz#c0a64a150c1fef9cc69f95f0aece4e857d64438d"
-  integrity sha512-ugD+WMoFwpXm+moSLHUgaBOu4XpX0+5UhmMWcNeRtH0Yd9GpDh2QzwtoN8BtXq8k5gkVEyoNSz+6oxKfNkNVdQ==
+"@budibase/backend-core@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.1.tgz#af5110dd16dd6a1bf378e4fadd312f920afadd3e"
+  integrity sha512-p5oNTWYjHMj2HdKrAP2vrVWCiU8tTQ978jgyvwgtBC8TfElowHN5Ly7HLu67v8IeSGK9BGZ7sz6kcS6ApcZa8Q==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.0"
+    "@budibase/types" "2.3.18-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.0.tgz#e87a2449d9e2453766c0ea77539af359bf5a81ff"
-  integrity sha512-nKLhCdLxmBX+VY7LF6daH0/AItcHoQTmBB3tc0SP7y4OLcJZfBEYidoWqWJKCgdz6LScWWogLgbDIAC8t+LNzg==
+"@budibase/pro@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.1.tgz#de1b7b271102fc3c62138dfdd130bf9af9f4c53f"
+  integrity sha512-mqyqsE0jg0kBbNrACti69iMfaVO/GgfHYsRizrN9xMwNRUamiwYROLvWYWouyCJYJAkTCTjll6Wex8CpinllCA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.0"
-    "@budibase/types" "2.3.18-alpha.0"
+    "@budibase/backend-core" "2.3.18-alpha.1"
+    "@budibase/types" "2.3.18-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.0":
-  version "2.3.18-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.0.tgz#14480e760c9e7931e884e9e0f8b1d5dd7e5d91c9"
-  integrity sha512-d+OcW2sNYw7VthMGrOBRY2Bz6iPQVWOnJ94XfYlBRJVIoYwBgudbYkOXPz/vQmHyjSUQFobrvs6UDeZ/3VJTaA==
+"@budibase/types@2.3.18-alpha.1":
+  version "2.3.18-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.1.tgz#d917e512d8644d94d71d0c8cb0d2e9cacecee720"
+  integrity sha512-35cX1NJfDwRb8DX3RkWVx46yT9+0fMndWSpOX+183ps0BTMyQ0UJBb80pNSsKMGjlgE+loQEXf0LymZ6vr9ucQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 22f42ef898ce57b42cf6ac158cfb748fbc0d445c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Feb 2023 19:14:57 +0000
Subject: [PATCH 082/273] Adding new mechanism to get the ipAddress and
 userAgent of call for audit logs.

---
 packages/backend-core/src/context/identity.ts | 13 ++++-
 packages/backend-core/src/events/events.ts    | 52 +++++++++++++++----
 .../backend-core/src/events/identification.ts |  1 +
 .../src/middleware/authenticated.ts           |  6 +--
 packages/backend-core/src/queue/constants.ts  |  1 +
 packages/frontend-core/src/api/auditLogs.js   |  6 +--
 packages/server/package.json                  |  1 +
 packages/server/src/app.ts                    |  2 +
 packages/server/yarn.lock                     | 12 +++++
 packages/types/src/sdk/auditLogs.ts           |  3 +-
 packages/types/src/sdk/context.ts             |  3 +-
 .../types/src/sdk/events/identification.ts    |  6 +++
 packages/worker/package.json                  |  1 +
 .../worker/src/api/controllers/global/auth.ts |  6 +--
 packages/worker/src/index.ts                  |  3 ++
 packages/worker/yarn.lock                     | 12 +++++
 16 files changed, 104 insertions(+), 24 deletions(-)

diff --git a/packages/backend-core/src/context/identity.ts b/packages/backend-core/src/context/identity.ts
index 648dd1b5fd..84de3b68c9 100644
--- a/packages/backend-core/src/context/identity.ts
+++ b/packages/backend-core/src/context/identity.ts
@@ -5,6 +5,8 @@ import {
   isCloudAccount,
   Account,
   AccountUserContext,
+  UserContext,
+  Ctx,
 } from "@budibase/types"
 import * as context from "."
 
@@ -16,15 +18,22 @@ export function doInIdentityContext(identity: IdentityContext, task: any) {
   return context.doInIdentityContext(identity, task)
 }
 
-export function doInUserContext(user: User, task: any) {
-  const userContext: any = {
+// used in server/worker
+export function doInUserContext(user: User, ctx: Ctx, task: any) {
+  const userContext: UserContext = {
     ...user,
     _id: user._id as string,
     type: IdentityType.USER,
+    hostInfo: {
+      ipAddress: ctx.request.ip,
+      // filled in by koa-useragent package
+      userAgent: ctx.userAgent._agent.source,
+    },
   }
   return doInIdentityContext(userContext, task)
 }
 
+// used in account portal
 export function doInAccountContext(account: Account, task: any) {
   const _id = getAccountUserId(account)
   const tenantId = account.tenantId
diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index ba4b0a7448..6176fb6724 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -1,13 +1,37 @@
-import { Event, IdentityType, AuditLogFn } from "@budibase/types"
+import { AuditLogFn, Event, IdentityType, HostInfo } from "@budibase/types"
 import { processors } from "./processors"
 import identification from "./identification"
 import { getAppId } from "../context"
 import * as backfill from "./backfill"
+import { createQueue, JobQueue } from "../queue"
+import BullQueue from "bull"
 
-let writeAuditLogs: AuditLogFn | undefined
+type AuditLogEvent = {
+  event: Event
+  properties: any
+  opts: {
+    timestamp?: string | number
+    userId?: string
+    appId?: string
+    hostInfo?: HostInfo
+  }
+}
+
+let auditLogsEnabled = false
+let auditLogQueue: BullQueue.Queue<AuditLogEvent>
 
 export const configure = (fn: AuditLogFn) => {
-  writeAuditLogs = fn
+  auditLogsEnabled = true
+  const writeAuditLogs = fn
+  auditLogQueue = createQueue<AuditLogEvent>(JobQueue.AUDIT_LOG)
+  return auditLogQueue.process(async job => {
+    await writeAuditLogs(job.data.event, job.data.properties, {
+      userId: job.data.opts.userId,
+      timestamp: job.data.opts.timestamp,
+      appId: job.data.opts.appId,
+      hostInfo: job.data.opts.hostInfo,
+    })
+  })
 }
 
 export const publishEvent = async (
@@ -21,16 +45,22 @@ export const publishEvent = async (
   const backfilling = await backfill.isBackfillingEvent(event)
   // no backfill - send the event and exit
   if (!backfilling) {
-    // only audit log actual events, don't include backfills
-    const userId = identity.type === IdentityType.USER ? identity.id : undefined
-    if (writeAuditLogs) {
-      await writeAuditLogs(event, properties, {
-        userId,
-        timestamp,
-        appId: getAppId(),
+    await processors.processEvent(event, identity, properties, timestamp)
+    if (auditLogsEnabled) {
+      // only audit log actual events, don't include backfills
+      const userId =
+        identity.type === IdentityType.USER ? identity.id : undefined
+      // add to event queue, rather than just writing immediately
+      await auditLogQueue.add({
+        event,
+        properties,
+        opts: {
+          userId,
+          timestamp,
+          appId: getAppId(),
+        },
       })
     }
-    await processors.processEvent(event, identity, properties, timestamp)
     return
   }
 
diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index 7cade9e14b..e18d96bbe0 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -89,6 +89,7 @@ const getCurrentIdentity = async (): Promise<Identity> => {
       installationId,
       tenantId,
       environment,
+      hostInfo: userContext.host,
     }
   } else {
     throw new Error("Unknown identity type")
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 4bb2aaba76..cce27823c0 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -8,7 +8,7 @@ import { getGlobalDB, doInTenant } from "../context"
 import { decrypt } from "../security/encryption"
 import * as identity from "../context/identity"
 import env from "../environment"
-import { BBContext, EndpointMatcher } from "@budibase/types"
+import { Ctx, EndpointMatcher } from "@budibase/types"
 
 const ONE_MINUTE = env.SESSION_UPDATE_PERIOD
   ? parseInt(env.SESSION_UPDATE_PERIOD)
@@ -73,7 +73,7 @@ export default function (
   }
 ) {
   const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : []
-  return async (ctx: BBContext | any, next: any) => {
+  return async (ctx: Ctx | any, next: any) => {
     let publicEndpoint = false
     const version = ctx.request.headers[Header.API_VER]
     // the path is not authenticated
@@ -148,7 +148,7 @@ export default function (
       finalise(ctx, { authenticated, user, internal, version, publicEndpoint })
 
       if (user && user.email) {
-        return identity.doInUserContext(user, next)
+        return identity.doInUserContext(user, ctx, next)
       } else {
         return next()
       }
diff --git a/packages/backend-core/src/queue/constants.ts b/packages/backend-core/src/queue/constants.ts
index e8323dacb8..9261ed1176 100644
--- a/packages/backend-core/src/queue/constants.ts
+++ b/packages/backend-core/src/queue/constants.ts
@@ -1,4 +1,5 @@
 export enum JobQueue {
   AUTOMATION = "automationQueue",
   APP_BACKUP = "appBackupQueue",
+  AUDIT_LOG = "auditLogQueue",
 }
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 745bfbc742..ee8f1b5520 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -18,15 +18,15 @@ const buildOpts = ({
   }
 
   if (events) {
-    opts.event = events
+    opts.events = events
   }
 
   if (userIds) {
-    opts.userId = userIds
+    opts.userIds = userIds
   }
 
   if (appIds) {
-    opts.appId = appIds
+    opts.appIds = appIds
   }
 
   return opts
diff --git a/packages/server/package.json b/packages/server/package.json
index 3eb133e272..98b69d4b61 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -87,6 +87,7 @@
     "koa-send": "5.0.0",
     "koa-session": "5.12.0",
     "koa-static": "5.0.0",
+    "koa-useragent": "^4.1.0",
     "koa2-ratelimit": "1.1.1",
     "lodash": "4.17.21",
     "memorystream": "0.3.1",
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 6779b35457..86b2783533 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -33,6 +33,7 @@ import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 const Sentry = require("@sentry/node")
 const destroyable = require("server-destroy")
+const { userAgent } = require("koa-useragent")
 
 // configure events to use the pro audit log write
 // can't integrate directly into backend-core due to cyclic issues
@@ -58,6 +59,7 @@ app.use(
 )
 
 app.use(middleware.logging)
+app.use(userAgent)
 
 if (env.isProd()) {
   env._set("NODE_ENV", "production")
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index eb0a7c4def..383c3f1bff 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -6976,6 +6976,11 @@ expose-loader@^3.1.0:
   resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-3.1.0.tgz#7a0bdecb345b921ca238a8c4715a4ea7e227213f"
   integrity sha512-2RExSo0yJiqP+xiUue13jQa2IHE8kLDzTI7b6kn+vUlBVvlzNSiLDzo4e5Pp5J039usvTUnxZ8sUOhv0Kg15NA==
 
+express-useragent@^1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/express-useragent/-/express-useragent-1.0.15.tgz#cefda5fa4904345d51d3368b117a8dd4124985d9"
+  integrity sha512-eq5xMiYCYwFPoekffMjvEIk+NWdlQY9Y38OsTyl13IvA728vKT+q/CSERYWzcw93HGBJcIqMIsZC5CZGARPVdg==
+
 ext-list@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
@@ -10236,6 +10241,13 @@ koa-static@5.0.0, koa-static@^5.0.0:
     debug "^3.1.0"
     koa-send "^5.0.0"
 
+koa-useragent@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/koa-useragent/-/koa-useragent-4.1.0.tgz#d3f128b552c6da3e5e9e9e9c887b2922b16e4468"
+  integrity sha512-x/HUDZ1zAmNNh5hA9hHbPm9p3UVg2prlpHzxCXQCzbibrNS0kmj7MkCResCbAbG7ZT6FVxNSMjR94ZGamdMwxA==
+  dependencies:
+    express-useragent "^1.0.15"
+
 koa-views@^7.0.1:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/koa-views/-/koa-views-7.0.2.tgz#c96fd9e2143ef00c29dc5160c5ed639891aa723d"
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index 9f8eb3825c..dea36b0164 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -1,9 +1,10 @@
-import { Event } from "./events"
+import { Event, HostInfo } from "./events"
 
 export type AuditWriteOpts = {
   appId?: string
   timestamp?: string | number
   userId?: string
+  hostInfo?: HostInfo
 }
 
 export type AuditLogFn = (
diff --git a/packages/types/src/sdk/context.ts b/packages/types/src/sdk/context.ts
index b3403df8af..c8345de196 100644
--- a/packages/types/src/sdk/context.ts
+++ b/packages/types/src/sdk/context.ts
@@ -1,5 +1,5 @@
 import { User, Account } from "../documents"
-import { IdentityType } from "./events"
+import { IdentityType, HostInfo } from "./events"
 
 export interface BaseContext {
   _id: string
@@ -16,6 +16,7 @@ export interface UserContext extends BaseContext, User {
   _id: string
   tenantId: string
   account?: Account
+  hostInfo: HostInfo
 }
 
 export type IdentityContext = BaseContext | AccountUserContext | UserContext
diff --git a/packages/types/src/sdk/events/identification.ts b/packages/types/src/sdk/events/identification.ts
index 3f4e7ec9d4..bbbf74d33e 100644
--- a/packages/types/src/sdk/events/identification.ts
+++ b/packages/types/src/sdk/events/identification.ts
@@ -34,6 +34,11 @@ export enum IdentityType {
   INSTALLATION = "installation",
 }
 
+export interface HostInfo {
+  ipAddress: string
+  userAgent: string
+}
+
 export interface Identity {
   id: string
   type: IdentityType
@@ -41,6 +46,7 @@ export interface Identity {
   environment: string
   installationId?: string
   tenantId?: string
+  hostInfo: HostInfo
 }
 
 export interface UserIdentity extends Identity {
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0fb3abe53b..c1912054c4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -60,6 +60,7 @@
     "koa-send": "5.0.1",
     "koa-session": "5.13.1",
     "koa-static": "5.0.0",
+    "koa-useragent": "^4.1.0",
     "node-fetch": "2.6.7",
     "nodemailer": "6.7.2",
     "passport-google-oauth": "2.0.0",
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 1e55d4de0d..318f69c7ad 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -69,7 +69,7 @@ export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
     "local",
     async (err: any, user: User, info: any) => {
       await passportCallback(ctx, user, err, info)
-      await context.identity.doInUserContext(user, async () => {
+      await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("local", user.email)
       })
       ctx.status = 200
@@ -211,7 +211,7 @@ export const googleCallback = async (ctx: any, next: any) => {
     { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, user: SSOUser, info: any) => {
       await passportCallback(ctx, user, err, info)
-      await context.identity.doInUserContext(user, async () => {
+      await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("google-internal", user.email)
       })
       ctx.redirect("/")
@@ -281,7 +281,7 @@ export const oidcCallback = async (ctx: any, next: any) => {
     { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, user: SSOUser, info: any) => {
       await passportCallback(ctx, user, err, info)
-      await context.identity.doInUserContext(user, async () => {
+      await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("oidc", user.email)
       })
       ctx.redirect("/")
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 69cd900637..750ae0055d 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -24,6 +24,8 @@ import * as redis from "./utilities/redis"
 const Sentry = require("@sentry/node")
 const koaSession = require("koa-session")
 const logger = require("koa-pino-logger")
+const { userAgent } = require("koa-useragent")
+
 import destroyable from "server-destroy"
 
 // configure events to use the pro audit log write
@@ -48,6 +50,7 @@ app.use(koaBody({ multipart: true }))
 app.use(koaSession(app))
 app.use(middleware.logging)
 app.use(logger(logging.pinoSettings()))
+app.use(userAgent)
 
 // authentication
 app.use(auth.passport.initialize())
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 83417a2e84..35af60204e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -3653,6 +3653,11 @@ expect@^28.1.3:
     jest-message-util "^28.1.3"
     jest-util "^28.1.3"
 
+express-useragent@^1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/express-useragent/-/express-useragent-1.0.15.tgz#cefda5fa4904345d51d3368b117a8dd4124985d9"
+  integrity sha512-eq5xMiYCYwFPoekffMjvEIk+NWdlQY9Y38OsTyl13IvA728vKT+q/CSERYWzcw93HGBJcIqMIsZC5CZGARPVdg==
+
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@@ -5467,6 +5472,13 @@ koa-static@5.0.0:
     debug "^3.1.0"
     koa-send "^5.0.0"
 
+koa-useragent@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/koa-useragent/-/koa-useragent-4.1.0.tgz#d3f128b552c6da3e5e9e9e9c887b2922b16e4468"
+  integrity sha512-x/HUDZ1zAmNNh5hA9hHbPm9p3UVg2prlpHzxCXQCzbibrNS0kmj7MkCResCbAbG7ZT6FVxNSMjR94ZGamdMwxA==
+  dependencies:
+    express-useragent "^1.0.15"
+
 koa@2.13.4, koa@^2.13.4:
   version "2.13.4"
   resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e"

From 6a88cfc32db9b4211d96e4450ea7b21529794c55 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 22 Feb 2023 08:32:03 +0000
Subject: [PATCH 083/273] Update locks error logging (#9768)

* Fix intermittent backend-core migration test failure

* Update lock logging
---
 packages/backend-core/src/redis/redlock.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/redis/redlock.ts b/packages/backend-core/src/redis/redlock.ts
index 2021da2b56..136d7f5d33 100644
--- a/packages/backend-core/src/redis/redlock.ts
+++ b/packages/backend-core/src/redis/redlock.ts
@@ -85,17 +85,20 @@ export const doWithLock = async (opts: LockOptions, task: any) => {
     const result = await task()
     return result
   } catch (e: any) {
-    console.log("lock error")
+    console.warn("lock error")
     // lock limit exceeded
     if (e.name === "LockError") {
       if (opts.type === LockType.TRY_ONCE) {
         // don't throw for try-once locks, they will always error
         // due to retry count (0) exceeded
+        console.warn(e)
         return
       } else {
+        console.error(e)
         throw e
       }
     } else {
+      console.error(e)
       throw e
     }
   } finally {

From 288f853208f748b4a80d59f65c1e45c85e1146ab Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 08:40:11 +0000
Subject: [PATCH 084/273] v2.3.18-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 64c2e16b71..fe2aecb942 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a5603730de..03bf98ed05 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-alpha.2",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.1",
+    "@budibase/types": "2.3.18-alpha.2",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d45ce99270..f223d0fecd 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.3.18-alpha.1",
+  "version": "2.3.18-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.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.2",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b8b9c2e79c..f6252a4928 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-alpha.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.1",
-    "@budibase/client": "2.3.18-alpha.1",
-    "@budibase/frontend-core": "2.3.18-alpha.1",
-    "@budibase/string-templates": "2.3.18-alpha.1",
+    "@budibase/bbui": "2.3.18-alpha.2",
+    "@budibase/client": "2.3.18-alpha.2",
+    "@budibase/frontend-core": "2.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-alpha.2",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1b675c1f37..0595259f56 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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.3.18-alpha.1",
-    "@budibase/string-templates": "2.3.18-alpha.1",
-    "@budibase/types": "2.3.18-alpha.1",
+    "@budibase/backend-core": "2.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-alpha.2",
+    "@budibase/types": "2.3.18-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 b3f8734aff..7154228c2c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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.3.18-alpha.1",
-    "@budibase/frontend-core": "2.3.18-alpha.1",
-    "@budibase/string-templates": "2.3.18-alpha.1",
+    "@budibase/bbui": "2.3.18-alpha.2",
+    "@budibase/frontend-core": "2.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-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 1753a0ecbd..30a202dd19 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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.3.18-alpha.1",
+    "@budibase/bbui": "2.3.18-alpha.2",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 8b58c801fb..a20fd61d9b 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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 c8c48044ab..caf3d09f76 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.1",
-    "@budibase/client": "2.3.18-alpha.1",
+    "@budibase/backend-core": "2.3.18-alpha.2",
+    "@budibase/client": "2.3.18-alpha.2",
     "@budibase/pro": "2.3.18-alpha.1",
-    "@budibase/string-templates": "2.3.18-alpha.1",
-    "@budibase/types": "2.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.2",
+    "@budibase/types": "2.3.18-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 c2e06902e2..810eff7712 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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 d378335af8..a5cfd06cbd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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 90c7a2773d..fdd5edcfc5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.1",
+  "version": "2.3.18-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.3.18-alpha.1",
+    "@budibase/backend-core": "2.3.18-alpha.2",
     "@budibase/pro": "2.3.18-alpha.1",
-    "@budibase/string-templates": "2.3.18-alpha.1",
-    "@budibase/types": "2.3.18-alpha.1",
+    "@budibase/string-templates": "2.3.18-alpha.2",
+    "@budibase/types": "2.3.18-alpha.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From faaf01cd5355f09ce7141592d33a15d82e2a9935 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 08:43:41 +0000
Subject: [PATCH 085/273] Update pro version to 2.3.18-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 caf3d09f76..e550a9ca38 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.2",
     "@budibase/client": "2.3.18-alpha.2",
-    "@budibase/pro": "2.3.18-alpha.1",
+    "@budibase/pro": "2.3.18-alpha.2",
     "@budibase/string-templates": "2.3.18-alpha.2",
     "@budibase/types": "2.3.18-alpha.2",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 125ca007dd..67db7d2d28 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.1.tgz#af5110dd16dd6a1bf378e4fadd312f920afadd3e"
-  integrity sha512-p5oNTWYjHMj2HdKrAP2vrVWCiU8tTQ978jgyvwgtBC8TfElowHN5Ly7HLu67v8IeSGK9BGZ7sz6kcS6ApcZa8Q==
+"@budibase/backend-core@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.2.tgz#a18b075234d184961b03ca89c7ae4b8229cbf279"
+  integrity sha512-rWI/GGphASPRu3HdPDVPpzbvBBLdFWnD5FyGVJ1/lZ5s0A/npegXl7noaFAgVjrAPGOKWDsDv43sscMzl8ZWLw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.1"
+    "@budibase/types" "2.3.18-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.1.tgz#de1b7b271102fc3c62138dfdd130bf9af9f4c53f"
-  integrity sha512-mqyqsE0jg0kBbNrACti69iMfaVO/GgfHYsRizrN9xMwNRUamiwYROLvWYWouyCJYJAkTCTjll6Wex8CpinllCA==
+"@budibase/pro@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.2.tgz#50456af8151b4e2832c3f518ad10e381f2f4e70f"
+  integrity sha512-x0X4LjFsqgi4OMm+Mlk3NAVHFA3bakVTvOSoKz/7LLa5XN9DaD1AOj7Vwh6iNVuoMmarIS9lj9NlripFzMs1EQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.1"
-    "@budibase/types" "2.3.18-alpha.1"
+    "@budibase/backend-core" "2.3.18-alpha.2"
+    "@budibase/types" "2.3.18-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.1.tgz#d917e512d8644d94d71d0c8cb0d2e9cacecee720"
-  integrity sha512-35cX1NJfDwRb8DX3RkWVx46yT9+0fMndWSpOX+183ps0BTMyQ0UJBb80pNSsKMGjlgE+loQEXf0LymZ6vr9ucQ==
+"@budibase/types@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.2.tgz#06ac9e16d0aff7eced989cd2133a26cee9d540ee"
+  integrity sha512-vNSu+E98jmBrQ0hx0Mza2whKScmW5O6mRmvyuJor6R/AhMHYn6k8ChuZsbLmx5C8oRdFT8rquaQxcbENl7I4eA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fdd5edcfc5..97f4444361 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.2",
-    "@budibase/pro": "2.3.18-alpha.1",
+    "@budibase/pro": "2.3.18-alpha.2",
     "@budibase/string-templates": "2.3.18-alpha.2",
     "@budibase/types": "2.3.18-alpha.2",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 358d122930..5949e5e5f8 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.1.tgz#af5110dd16dd6a1bf378e4fadd312f920afadd3e"
-  integrity sha512-p5oNTWYjHMj2HdKrAP2vrVWCiU8tTQ978jgyvwgtBC8TfElowHN5Ly7HLu67v8IeSGK9BGZ7sz6kcS6ApcZa8Q==
+"@budibase/backend-core@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.2.tgz#a18b075234d184961b03ca89c7ae4b8229cbf279"
+  integrity sha512-rWI/GGphASPRu3HdPDVPpzbvBBLdFWnD5FyGVJ1/lZ5s0A/npegXl7noaFAgVjrAPGOKWDsDv43sscMzl8ZWLw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.1"
+    "@budibase/types" "2.3.18-alpha.2"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.1.tgz#de1b7b271102fc3c62138dfdd130bf9af9f4c53f"
-  integrity sha512-mqyqsE0jg0kBbNrACti69iMfaVO/GgfHYsRizrN9xMwNRUamiwYROLvWYWouyCJYJAkTCTjll6Wex8CpinllCA==
+"@budibase/pro@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.2.tgz#50456af8151b4e2832c3f518ad10e381f2f4e70f"
+  integrity sha512-x0X4LjFsqgi4OMm+Mlk3NAVHFA3bakVTvOSoKz/7LLa5XN9DaD1AOj7Vwh6iNVuoMmarIS9lj9NlripFzMs1EQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.1"
-    "@budibase/types" "2.3.18-alpha.1"
+    "@budibase/backend-core" "2.3.18-alpha.2"
+    "@budibase/types" "2.3.18-alpha.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.1":
-  version "2.3.18-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.1.tgz#d917e512d8644d94d71d0c8cb0d2e9cacecee720"
-  integrity sha512-35cX1NJfDwRb8DX3RkWVx46yT9+0fMndWSpOX+183ps0BTMyQ0UJBb80pNSsKMGjlgE+loQEXf0LymZ6vr9ucQ==
+"@budibase/types@2.3.18-alpha.2":
+  version "2.3.18-alpha.2"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.2.tgz#06ac9e16d0aff7eced989cd2133a26cee9d540ee"
+  integrity sha512-vNSu+E98jmBrQ0hx0Mza2whKScmW5O6mRmvyuJor6R/AhMHYn6k8ChuZsbLmx5C8oRdFT8rquaQxcbENl7I4eA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e7f8a8a8015e2d66a21c92da227b8f114a3019c1 Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Wed, 22 Feb 2023 10:03:11 +0000
Subject: [PATCH 086/273] Backups UI Changes (#9726)

* Backups UI Changes

* PR Feedback

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
---
 packages/builder/src/helpers/userInitials.js  | 13 +++++
 .../_components/ActionsRenderer.svelte        | 41 ++------------
 .../_components/CreateBackupModal.svelte      | 22 --------
 .../backups/_components/NameRenderer.svelte   |  8 ---
 .../_components/TimeAgoRenderer.svelte        | 10 ++++
 .../backups/_components/UserRenderer.svelte   | 15 ++---
 .../overview/[appId]/backups/index.svelte     | 55 ++++++++++---------
 packages/builder/src/stores/portal/auth.js    | 12 +---
 packages/builder/src/stores/portal/backups.js |  4 +-
 packages/frontend-core/src/api/backups.js     |  3 +-
 10 files changed, 67 insertions(+), 116 deletions(-)
 create mode 100644 packages/builder/src/helpers/userInitials.js
 delete mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/CreateBackupModal.svelte
 delete mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/NameRenderer.svelte
 create mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte

diff --git a/packages/builder/src/helpers/userInitials.js b/packages/builder/src/helpers/userInitials.js
new file mode 100644
index 0000000000..c87d38c494
--- /dev/null
+++ b/packages/builder/src/helpers/userInitials.js
@@ -0,0 +1,13 @@
+const getUserInitials = user => {
+  if (user.firstName && user.lastName) {
+    return user.firstName[0] + user.lastName[0]
+  } else if (user.firstName) {
+    return user.firstName[0]
+  } else if (user.email) {
+    return user.email[0]
+  }
+
+  return "U"
+}
+
+export default getUserInitials
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/ActionsRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/ActionsRenderer.svelte
index 7dc302186a..4787112760 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/ActionsRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/ActionsRenderer.svelte
@@ -3,31 +3,26 @@
     ActionMenu,
     MenuItem,
     Icon,
-    Input,
     Heading,
     Body,
     Modal,
   } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
-  import { createEventDispatcher, onMount } from "svelte"
+  import { createEventDispatcher } from "svelte"
 
   export let row
 
   let deleteDialog
   let restoreDialog
-  let updateDialog
-  let name
   let restoreBackupModal
 
   const dispatch = createEventDispatcher()
 
-  const onClickRestore = name => {
+  const onClickRestore = () => {
     dispatch("buttonclick", {
       type: "backupRestore",
-      name,
       backupId: row._id,
-      restoreBackupName: name,
     })
   }
 
@@ -38,21 +33,9 @@
     })
   }
 
-  const onClickUpdate = () => {
-    dispatch("buttonclick", {
-      type: "backupUpdate",
-      backupId: row._id,
-      name,
-    })
-  }
-
   async function downloadExport() {
     window.open(`/api/apps/${row.appId}/backups/${row._id}/file`, "_blank")
   }
-
-  onMount(() => {
-    name = row.name
-  })
 </script>
 
 <div class="cell">
@@ -66,12 +49,11 @@
       <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
       <MenuItem on:click={downloadExport} icon="Download">Download</MenuItem>
     {/if}
-    <MenuItem on:click={updateDialog.show} icon="Edit">Rename</MenuItem>
   </ActionMenu>
 </div>
 
 <Modal bind:this={restoreBackupModal}>
-  <CreateRestoreModal confirm={name => onClickRestore(name)} />
+  <CreateRestoreModal confirm={onClickRestore} />
 </Modal>
 
 <ConfirmDialog
@@ -80,9 +62,7 @@
   onOk={onClickDelete}
   title="Confirm Deletion"
 >
-  Are you sure you wish to delete the backup
-  <i>{row.name}?</i>
-  This action cannot be undone.
+  Are you sure you wish to delete this backup? This action cannot be undone.
 </ConfirmDialog>
 
 <ConfirmDialog
@@ -92,21 +72,10 @@
   title="Confirm restore"
   warning={false}
 >
-  <Heading size="S">{row.name || "Backup"}</Heading>
+  <Heading size="S">Backup</Heading>
   <Body size="S">{new Date(row.timestamp).toLocaleString()}</Body>
 </ConfirmDialog>
 
-<ConfirmDialog
-  bind:this={updateDialog}
-  disabled={!name}
-  okText="Confirm"
-  onOk={onClickUpdate}
-  title="Update Backup"
-  warning={false}
->
-  <Input onlabel="Backup name" bind:value={name} />
-</ConfirmDialog>
-
 <style>
   .cell {
     display: flex;
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/CreateBackupModal.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/CreateBackupModal.svelte
deleted file mode 100644
index 4701115640..0000000000
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/CreateBackupModal.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script>
-  import { ModalContent, Input } from "@budibase/bbui"
-  import { auth } from "stores/portal"
-
-  export let createManualBackup
-
-  let templateName = $auth.user.firstName
-    ? `${$auth.user.firstName}'s Backup`
-    : "New Backup"
-  let name = templateName
-</script>
-
-<ModalContent
-  onConfirm={() => createManualBackup(name)}
-  title="Create new backup"
-  diabled={!name}
-  confirmText="Create"
-  ><Input label="Backup name" bind:value={name} /></ModalContent
->
-
-<style>
-</style>
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/NameRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/NameRenderer.svelte
deleted file mode 100644
index 93eda410fe..0000000000
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/NameRenderer.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-  import { truncate } from "lodash"
-
-  export let value
-  $: truncatedValue = truncate(value, { length: 12 })
-</script>
-
-{truncatedValue}
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte
new file mode 100644
index 0000000000..fd67b4010b
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte
@@ -0,0 +1,10 @@
+<script>
+  import dayjs from "dayjs"
+  import relativeTime from "dayjs/plugin/relativeTime"
+
+  dayjs.extend(relativeTime)
+
+  export let value
+</script>
+
+<span title={value}>{dayjs(value).fromNow()}</span>
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte
index abab314d05..a9aabae857 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte
@@ -1,17 +1,14 @@
 <script>
+  import getUserInitials from "helpers/userInitials.js"
+  import { Avatar } from "@budibase/bbui"
+
   export let value
 
-  let firstName = value?.firstName
-  let lastName = value?.lastName || ""
-
-  $: username =
-    firstName && lastName ? `${firstName} ${lastName}` : value?.email
+  $: initials = getUserInitials(value)
 </script>
 
-<div class="cell">
-  {#if value != null}
-    <div>{username}</div>
-  {/if}
+<div title={value.email} class="cell">
+  <Avatar size="M" {initials} />
 </div>
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
index c15f944601..f2592ec805 100644
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
@@ -4,7 +4,6 @@
     DatePicker,
     Divider,
     Layout,
-    Modal,
     notifications,
     Pagination,
     Select,
@@ -16,25 +15,22 @@
   } from "@budibase/bbui"
   import { backups, licensing, auth, admin, overview } from "stores/portal"
   import { createPaginationStore } from "helpers/pagination"
-  import DateRenderer from "components/common/renderers/DateTimeRenderer.svelte"
+  import TimeAgoRenderer from "./_components/TimeAgoRenderer.svelte"
   import AppSizeRenderer from "./_components/AppSizeRenderer.svelte"
-  import CreateBackupModal from "./_components/CreateBackupModal.svelte"
   import ActionsRenderer from "./_components/ActionsRenderer.svelte"
   import UserRenderer from "./_components/UserRenderer.svelte"
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import TypeRenderer from "./_components/TypeRenderer.svelte"
-  import NameRenderer from "./_components/NameRenderer.svelte"
   import BackupsDefault from "assets/backups-default.png"
   import { BackupTrigger, BackupType } from "constants/backend/backups"
   import { onMount } from "svelte"
 
+  let loading = true
   let backupData = null
-  let modal
   let pageInfo = createPaginationStore()
   let filterOpt = null
   let startDate = null
   let endDate = null
-  let loaded = false
   let filters = [
     {
       label: "Manual backup",
@@ -44,10 +40,6 @@
       label: "Published backup",
       value: { type: BackupType.BACKUP, trigger: BackupTrigger.PUBLISH },
     },
-    {
-      label: "Scheduled backup",
-      value: { type: BackupType.BACKUP, trigger: BackupTrigger.SCHEDULED },
-    },
     {
       label: "Pre-restore backup",
       value: { type: BackupType.BACKUP, trigger: BackupTrigger.RESTORING },
@@ -71,10 +63,6 @@
       displayName: "Date",
       width: "auto",
     },
-    name: {
-      displayName: "Name",
-      width: "auto",
-    },
     appSize: {
       displayName: "App size",
       width: "auto",
@@ -96,11 +84,10 @@
   const customRenderers = [
     { column: "appSize", component: AppSizeRenderer },
     { column: "actions", component: ActionsRenderer },
-    { column: "createdAt", component: DateRenderer },
+    { column: "createdAt", component: TimeAgoRenderer },
     { column: "createdBy", component: UserRenderer },
     { column: "status", component: StatusRenderer },
     { column: "type", component: TypeRenderer },
-    { column: "name", component: NameRenderer },
   ]
 
   function flattenBackups(backups) {
@@ -126,11 +113,11 @@
     backupData = flattenBackups(response.data)
   }
 
-  async function createManualBackup(name) {
+  async function createManualBackup() {
     try {
+      loading = true
       let response = await backups.createManualBackup({
         appId: app.instance._id,
-        name,
       })
       await fetchBackups(filterOpt, page)
       notifications.success(response.message)
@@ -139,6 +126,20 @@
     }
   }
 
+  const poll = backupData => {
+    if (backupData === null) {
+      return
+    }
+
+    if (backupData.some(datum => datum.status === "started")) {
+      setTimeout(() => fetchBackups(filterOpt, page), 2000)
+    } else {
+      loading = false
+    }
+  }
+
+  $: poll(backupData)
+
   async function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
       await backups.deleteBackup({
@@ -165,7 +166,7 @@
 
   onMount(async () => {
     await fetchBackups(filterOpt, page, startDate, endDate)
-    loaded = true
+    loading = false
   })
 </script>
 
@@ -206,7 +207,7 @@
         View plans
       </Button>
     </div>
-  {:else if !backupData?.length && loaded && !filterOpt && !startDate}
+  {:else if !backupData?.length && !loading && !filterOpt && !startDate}
     <div class="center">
       <Layout noPadding gap="S" justifyItems="center">
         <img height="130px" src={BackupsDefault} alt="BackupsDefault" />
@@ -215,11 +216,13 @@
           <Body>You can manually back up your app any time</Body>
         </Layout>
         <div>
-          <Button on:click={modal.show} cta>Create backup</Button>
+          <Button cta disabled={loading} on:click={createManualBackup}>
+            Create backup
+          </Button>
         </div>
       </Layout>
     </div>
-  {:else if loaded}
+  {:else}
     <Layout noPadding gap="M" alignContent="start">
       <div class="controls">
         <div class="search">
@@ -245,7 +248,9 @@
           />
         </div>
         <div>
-          <Button cta on:click={modal.show}>Create new backup</Button>
+          <Button cta disabled={loading} on:click={createManualBackup}
+            >Create new backup</Button
+          >
         </div>
       </div>
       <div class="table">
@@ -275,10 +280,6 @@
   {/if}
 </Layout>
 
-<Modal bind:this={modal}>
-  <CreateBackupModal {createManualBackup} />
-</Modal>
-
 <style>
   .title {
     display: flex;
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index d039bb6eec..d11033c142 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -2,6 +2,7 @@ import { derived, writable, get } from "svelte/store"
 import { API } from "api"
 import { admin } from "stores/portal"
 import analytics from "analytics"
+import getUserInitials from "helpers/userInitials.js"
 
 export function createAuthStore() {
   const auth = writable({
@@ -18,16 +19,7 @@ export function createAuthStore() {
     let isBuilder = false
     if ($store.user) {
       const user = $store.user
-      if (user.firstName) {
-        initials = user.firstName[0]
-        if (user.lastName) {
-          initials += user.lastName[0]
-        }
-      } else if (user.email) {
-        initials = user.email[0]
-      } else {
-        initials = "Unknown"
-      }
+      initials = getUserInitials(user)
       isAdmin = !!user.admin?.global
       isBuilder = !!user.builder?.global
     }
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index 328a9d37cc..6ac70ef36c 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -30,8 +30,8 @@ export function createBackupsStore() {
     return API.deleteBackup({ appId, backupId })
   }
 
-  async function createManualBackup(appId, name) {
-    return API.createManualBackup(appId, name)
+  async function createManualBackup(appId) {
+    return API.createManualBackup(appId)
   }
 
   async function updateBackup({ appId, backupId, name }) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 8658815b15..7663ae09af 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -21,10 +21,9 @@ export const buildBackupsEndpoints = API => ({
     })
   },
 
-  createManualBackup: async ({ appId, name }) => {
+  createManualBackup: async ({ appId }) => {
     return await API.post({
       url: `/api/apps/${appId}/backups`,
-      body: { name },
     })
   },
 

From 7bb98291658f2f5ad4261c70870bc2e12fef2eb1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 22 Feb 2023 10:09:15 +0000
Subject: [PATCH 087/273] update sidebar styling and fix bugs

---
 .../_components/AppColumnRenderer.svelte      |  2 +-
 .../auditLogs/_components/UserRenderer.svelte | 35 +++++++++-
 .../portal/account/auditLogs/index.svelte     | 67 ++++++++++++++-----
 .../builder/src/stores/portal/auditLogs.js    |  2 -
 packages/frontend-core/src/api/auditLogs.js   | 25 ++++---
 5 files changed, 99 insertions(+), 32 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
index f6665dff28..2ad3997f79 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
@@ -2,4 +2,4 @@
   export let value
 </script>
 
-<div>{value.name}</div>
+<div>{value?.name || "N/A"}</div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 07551da3bc..5d3d8fa28a 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -1,7 +1,8 @@
 <script>
-  import { Avatar } from "@budibase/bbui"
+  import { Avatar, Tooltip } from "@budibase/bbui"
   export let row
 
+  let showTooltip
   const getInitials = user => {
     let initials = ""
     initials += user.firstName ? user.firstName[0] : ""
@@ -11,4 +12,34 @@
   }
 </script>
 
-<Avatar size="M" initials={getInitials(row.user)} />
+<div
+  class="container"
+  on:mouseover={() => (showTooltip = true)}
+  on:focus={() => (showTooltip = true)}
+  on:mouseleave={() => (showTooltip = false)}
+>
+  <Avatar size="M" initials={getInitials(row.user)} />
+</div>
+{#if showTooltip}
+  <div class="tooltip">
+    <Tooltip textWrapping text={row.user.email} direction="bottom" />
+  </div>
+{/if}
+
+<style>
+  .container {
+    position: relative;
+  }
+  .tooltip {
+    z-index: 1;
+    position: absolute;
+    top: 85%;
+    left: calc(90% - 8px);
+    transform: translateX(-100%) translateY(-50%);
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    width: 130px;
+    pointer-events: none;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 821e504774..47c93d23d1 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -9,6 +9,8 @@
     clickOutside,
     CoreTextArea,
     DatePicker,
+    Pagination,
+    Divider,
   } from "@budibase/bbui"
   import { licensing, users, apps, auditLogs } from "stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
@@ -62,16 +64,15 @@
   let startDate, endDate
 
   $: fetchUsers(userPage, userSearchTerm)
-  $: fetchLogs(
+  $: fetchLogs({
     logsPage,
     logSearchTerm,
     startDate,
     endDate,
     selectedUsers,
     selectedApps,
-    selectedEvents
-  )
-
+    selectedEvents,
+  })
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
@@ -97,38 +98,38 @@
     }
   }
 
-  const fetchLogs = async (
+  const fetchLogs = async ({
     logsPage,
-    search,
+    logSearchTerm,
     startDate,
     endDate,
     selectedUsers,
     selectedApps,
-    selectedEvents
-  ) => {
+    selectedEvents,
+  }) => {
     if ($logsPageInfo.loading) {
       return
     }
     // need to remove the page if they've started searching
-    if (search && !prevLogSearch) {
+    if (logSearchTerm && !prevLogSearch) {
       logsPageInfo.reset()
       logsPage = undefined
     }
-    prevLogSearch = search
+    prevLogSearch = logSearchTerm
     try {
       logsPageInfo.loading()
       await auditLogs.search({
-        logsPage,
+        bookmark: logsPage,
         startDate,
         endDate,
-        metadataSearch: search,
+        fullSearch: logSearchTerm,
         userIds: selectedUsers,
         appIds: selectedApps,
         events: selectedEvents,
       })
       logsPageInfo.fetched(
         $auditLogs.logs.hasNextPage,
-        $auditLogs.logs.nextPage
+        $auditLogs.logs.bookmark
       )
     } catch (error) {
       console.log(error)
@@ -161,6 +162,7 @@
   }
 
   const viewDetails = detail => {
+    console.log(detail)
     selectedLog = detail
     sidePanelVisible = true
   }
@@ -206,9 +208,15 @@
           range={true}
           label="Date Range"
           on:change={e => {
-            if (e.detail[0].length > 1) {
+            console.log(e)
+            if (e.detail[0]?.length === 1) {
+              startDate = e.detail[0][0].toISOString()
+            } else if (e.detail[0]?.length > 1) {
               startDate = e.detail[0][0].toISOString()
               endDate = e.detail[0][1].toISOString()
+            } else {
+              startDate = null
+              endDate = null
             }
           }}
         />
@@ -258,14 +266,23 @@
   </div>
   <Layout noPadding>
     <Table
+      on:click={({ detail }) => viewDetails(detail)}
       {customRenderers}
-      on:click={viewDetails}
       data={$auditLogs.logs.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
       {schema}
     />
+    <div class="pagination">
+      <Pagination
+        page={$logsPageInfo.pageNumber}
+        hasPrevPage={$logsPageInfo.loading ? false : $logsPageInfo.hasPrevPage}
+        hasNextPage={$logsPageInfo.loading ? false : $logsPageInfo.hasNextPage}
+        goToPrevPage={logsPageInfo.prevPage}
+        goToNextPage={logsPageInfo.nextPage}
+      />
+    </div>
   </Layout>
 </LockedFeature>
 
@@ -298,7 +315,9 @@
         />
       </div>
     </div>
-    <div style="padding-top: 10px; height: 95%">
+    <Divider />
+
+    <div class="side-panel-body">
       <CoreTextArea
         disabled
         minHeight={"300px"}
@@ -312,16 +331,28 @@
 <style>
   .side-panel-header {
     display: flex;
+    padding: 20px 10px 10px 10px;
     gap: var(--spacing-s);
     justify-content: space-between;
     align-items: center;
   }
 
+  .pagination {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    margin-top: var(--spacing-xl);
+  }
+
+  .side-panel-body {
+    padding: 10px;
+    height: 95%;
+  }
   #side-panel {
     position: absolute;
     right: 0;
     top: 0;
-    padding: 24px;
+    padding-bottom: 24px;
     background: var(--background);
     border-left: var(--border-light);
     width: 320px;
@@ -330,7 +361,7 @@
     overflow-x: hidden;
     transform: translateX(100%);
     transition: transform 130ms ease-in-out;
-    height: calc(100% - 48px);
+    height: calc(100% - 25px);
     z-index: 2;
   }
   #side-panel.visible {
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
index 3454aab95c..165e4b5ec5 100644
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -26,8 +26,6 @@ export function createAuditLogsStore() {
     update(state => {
       return { ...state, ...events }
     })
-
-    console.log(events)
   }
 
   async function downloadLogs(opts = {}) {
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 745bfbc742..867644c23c 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -1,32 +1,39 @@
 const buildOpts = ({
+  bookmark,
   userIds,
   appIds,
   startDate,
   endDate,
-  metadataSearch,
+  fullSearch,
   events,
 }) => {
   const opts = {}
 
+  if (bookmark) {
+    opts.bookmark = bookmark
+  }
+
   if (startDate && endDate) {
     opts.startDate = startDate
     opts.endDate = endDate
+  } else if (startDate && !endDate) {
+    opts.startDate = startDate
   }
 
-  if (metadataSearch) {
-    opts.metadataSearch = metadataSearch
+  if (fullSearch) {
+    opts.fullSearch = fullSearch
   }
 
-  if (events) {
-    opts.event = events
+  if (events.length) {
+    opts.events = events
   }
 
-  if (userIds) {
-    opts.userId = userIds
+  if (userIds.length) {
+    opts.userIds = userIds
   }
 
-  if (appIds) {
-    opts.appId = appIds
+  if (appIds.length) {
+    opts.appIds = appIds
   }
 
   return opts

From a03fe900c654f7a7fe576bb7f7e2227aa434b07b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 10:10:27 +0000
Subject: [PATCH 088/273] v2.3.18-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 fe2aecb942..3e05b82a1e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 03bf98ed05..bc8ec58a7f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.2",
+    "@budibase/types": "2.3.18-alpha.3",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f223d0fecd..c247e32e50 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.3.18-alpha.2",
+  "version": "2.3.18-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.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-alpha.3",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f6252a4928..ed6fc08ac5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.2",
-    "@budibase/client": "2.3.18-alpha.2",
-    "@budibase/frontend-core": "2.3.18-alpha.2",
-    "@budibase/string-templates": "2.3.18-alpha.2",
+    "@budibase/bbui": "2.3.18-alpha.3",
+    "@budibase/client": "2.3.18-alpha.3",
+    "@budibase/frontend-core": "2.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-alpha.3",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0595259f56..ce9aa90b8f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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.3.18-alpha.2",
-    "@budibase/string-templates": "2.3.18-alpha.2",
-    "@budibase/types": "2.3.18-alpha.2",
+    "@budibase/backend-core": "2.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-alpha.3",
+    "@budibase/types": "2.3.18-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 7154228c2c..e0320f52ab 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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.3.18-alpha.2",
-    "@budibase/frontend-core": "2.3.18-alpha.2",
-    "@budibase/string-templates": "2.3.18-alpha.2",
+    "@budibase/bbui": "2.3.18-alpha.3",
+    "@budibase/frontend-core": "2.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-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 30a202dd19..9a9843af3b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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.3.18-alpha.2",
+    "@budibase/bbui": "2.3.18-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index a20fd61d9b..d9d83c7889 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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 e550a9ca38..326d231dd1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.2",
-    "@budibase/client": "2.3.18-alpha.2",
+    "@budibase/backend-core": "2.3.18-alpha.3",
+    "@budibase/client": "2.3.18-alpha.3",
     "@budibase/pro": "2.3.18-alpha.2",
-    "@budibase/string-templates": "2.3.18-alpha.2",
-    "@budibase/types": "2.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-alpha.3",
+    "@budibase/types": "2.3.18-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 810eff7712..48081eda83 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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 a5cfd06cbd..66959cf7c8 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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 97f4444361..8be3ffb91e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.2",
+  "version": "2.3.18-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.3.18-alpha.2",
+    "@budibase/backend-core": "2.3.18-alpha.3",
     "@budibase/pro": "2.3.18-alpha.2",
-    "@budibase/string-templates": "2.3.18-alpha.2",
-    "@budibase/types": "2.3.18-alpha.2",
+    "@budibase/string-templates": "2.3.18-alpha.3",
+    "@budibase/types": "2.3.18-alpha.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 8e07033ec2e64851d39fa331f3ed1bd362d7c7a4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 10:13:25 +0000
Subject: [PATCH 089/273] Update pro version to 2.3.18-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 326d231dd1..2eedd09fc9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.3",
     "@budibase/client": "2.3.18-alpha.3",
-    "@budibase/pro": "2.3.18-alpha.2",
+    "@budibase/pro": "2.3.18-alpha.3",
     "@budibase/string-templates": "2.3.18-alpha.3",
     "@budibase/types": "2.3.18-alpha.3",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 67db7d2d28..3f6682875e 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.2.tgz#a18b075234d184961b03ca89c7ae4b8229cbf279"
-  integrity sha512-rWI/GGphASPRu3HdPDVPpzbvBBLdFWnD5FyGVJ1/lZ5s0A/npegXl7noaFAgVjrAPGOKWDsDv43sscMzl8ZWLw==
+"@budibase/backend-core@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.3.tgz#e10f4071cb43a178293b1ad37bcd1d4f45d358a1"
+  integrity sha512-MbaYwhvV1V9XrJTUP0wBy9fT9FtaJuAi1pOHJNWw3kvUEo7h5AiSp2hOGBoPJwoloeWQfZsJpglSOMA9HJf8fQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.2"
+    "@budibase/types" "2.3.18-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.2.tgz#50456af8151b4e2832c3f518ad10e381f2f4e70f"
-  integrity sha512-x0X4LjFsqgi4OMm+Mlk3NAVHFA3bakVTvOSoKz/7LLa5XN9DaD1AOj7Vwh6iNVuoMmarIS9lj9NlripFzMs1EQ==
+"@budibase/pro@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.3.tgz#73a759ee17600a340c41cb0c4f8d289bf66be66f"
+  integrity sha512-xNwzB7l5ZvxcqXMZgsaUVvPKufk3mgI/4TBGXB9IpYQRsGFFxrpNMRtQsMfWUEUrXBvFuyr/DPtQJekhrCcMxg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.2"
-    "@budibase/types" "2.3.18-alpha.2"
+    "@budibase/backend-core" "2.3.18-alpha.3"
+    "@budibase/types" "2.3.18-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.2.tgz#06ac9e16d0aff7eced989cd2133a26cee9d540ee"
-  integrity sha512-vNSu+E98jmBrQ0hx0Mza2whKScmW5O6mRmvyuJor6R/AhMHYn6k8ChuZsbLmx5C8oRdFT8rquaQxcbENl7I4eA==
+"@budibase/types@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.3.tgz#a04a46784e833989f4cc7d4c45366a3cefb01f53"
+  integrity sha512-gkwJdM6zRXulwXQhjSsaDAjJyhbDMVhuFVDcQvS2oZBBrRtBFHfOqLw/dkTC6Zgq9ttu/00B1QihB+uliYRFLQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8be3ffb91e..f28a153247 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.3",
-    "@budibase/pro": "2.3.18-alpha.2",
+    "@budibase/pro": "2.3.18-alpha.3",
     "@budibase/string-templates": "2.3.18-alpha.3",
     "@budibase/types": "2.3.18-alpha.3",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5949e5e5f8..123362b958 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.2.tgz#a18b075234d184961b03ca89c7ae4b8229cbf279"
-  integrity sha512-rWI/GGphASPRu3HdPDVPpzbvBBLdFWnD5FyGVJ1/lZ5s0A/npegXl7noaFAgVjrAPGOKWDsDv43sscMzl8ZWLw==
+"@budibase/backend-core@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.3.tgz#e10f4071cb43a178293b1ad37bcd1d4f45d358a1"
+  integrity sha512-MbaYwhvV1V9XrJTUP0wBy9fT9FtaJuAi1pOHJNWw3kvUEo7h5AiSp2hOGBoPJwoloeWQfZsJpglSOMA9HJf8fQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.2"
+    "@budibase/types" "2.3.18-alpha.3"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.2.tgz#50456af8151b4e2832c3f518ad10e381f2f4e70f"
-  integrity sha512-x0X4LjFsqgi4OMm+Mlk3NAVHFA3bakVTvOSoKz/7LLa5XN9DaD1AOj7Vwh6iNVuoMmarIS9lj9NlripFzMs1EQ==
+"@budibase/pro@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.3.tgz#73a759ee17600a340c41cb0c4f8d289bf66be66f"
+  integrity sha512-xNwzB7l5ZvxcqXMZgsaUVvPKufk3mgI/4TBGXB9IpYQRsGFFxrpNMRtQsMfWUEUrXBvFuyr/DPtQJekhrCcMxg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.2"
-    "@budibase/types" "2.3.18-alpha.2"
+    "@budibase/backend-core" "2.3.18-alpha.3"
+    "@budibase/types" "2.3.18-alpha.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.2":
-  version "2.3.18-alpha.2"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.2.tgz#06ac9e16d0aff7eced989cd2133a26cee9d540ee"
-  integrity sha512-vNSu+E98jmBrQ0hx0Mza2whKScmW5O6mRmvyuJor6R/AhMHYn6k8ChuZsbLmx5C8oRdFT8rquaQxcbENl7I4eA==
+"@budibase/types@2.3.18-alpha.3":
+  version "2.3.18-alpha.3"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.3.tgz#a04a46784e833989f4cc7d4c45366a3cefb01f53"
+  integrity sha512-gkwJdM6zRXulwXQhjSsaDAjJyhbDMVhuFVDcQvS2oZBBrRtBFHfOqLw/dkTC6Zgq9ttu/00B1QihB+uliYRFLQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b9c54b6fe6a2da69a39004851850d967c2f5b299 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 22 Feb 2023 10:54:55 +0000
Subject: [PATCH 090/273] Update many to many

---
 .../src/api/controllers/row/ExternalRequest.ts      | 13 ++++++-------
 packages/server/src/api/controllers/row/external.ts |  2 +-
 packages/server/src/integrations/base/sql.ts        |  4 +---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index f62e7fe2d0..22a4a90865 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -629,10 +629,7 @@ export class ExternalRequest {
    * Creating the specific list of fields that we desire, and excluding the ones that are no use to us
    * is more performant and has the added benefit of protecting against this scenario.
    */
-  buildFields(
-    table: Table,
-    includeRelations: IncludeRelationship = IncludeRelationship.INCLUDE
-  ) {
+  buildFields(table: Table, includeRelations: boolean) {
     function extractRealFields(table: Table, existing: string[] = []) {
       return Object.entries(table.schema)
         .filter(
@@ -691,6 +688,10 @@ export class ExternalRequest {
     }
     filters = buildFilters(id, filters || {}, table)
     const relationships = this.buildRelationships(table)
+
+    const includeSqlRelationships =
+      config.includeSqlRelationships === IncludeRelationship.INCLUDE
+
     // clean up row on ingress using schema
     const processed = this.inputProcessing(row, table)
     row = processed.row
@@ -708,9 +709,7 @@ export class ExternalRequest {
       },
       resource: {
         // have to specify the fields to avoid column overlap (for SQL)
-        fields: isSql
-          ? this.buildFields(table, config.includeSqlRelationships)
-          : [],
+        fields: isSql ? this.buildFields(table, includeSqlRelationships) : [],
       },
       filters,
       sort,
diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 6120c3cdcb..1b2301f139 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -58,7 +58,7 @@ export async function patch(ctx: BBContext) {
   return handleRequest(Operation.UPDATE, tableId, {
     id: breakRowIdField(id),
     row: inputs,
-    includeSqlRelationships: IncludeRelationship.EXCLUDE,
+    includeSqlRelationships: IncludeRelationship.INCLUDE,
   })
 }
 
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index e66795a6db..c722891910 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -502,9 +502,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.update(parsedBody)
     } else {
-      return query
-        .update(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.update(parsedBody).returning("*")
     }
   }
 

From e350f6b166ca69edfd9dfb24e37f7e47e824f812 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 22 Feb 2023 11:02:32 +0000
Subject: [PATCH 091/273] Undo literal changes

---
 packages/server/src/api/controllers/row/ExternalRequest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 22a4a90865..56e54e299e 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -316,7 +316,7 @@ export class ExternalRequest {
             key: otherKey,
             [thisKey]: breakRowIdField(relationship)[0],
             // leave the ID for enrichment later
-            [otherKey]: `{{ literal [${table.name}.${tablePrimary}] }}`,
+            [otherKey]: `{{ literal ${tablePrimary} }}`,
           })
         })
       }

From ffee41aea320947ae4f50654e3a61b87c82bc202 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 22 Feb 2023 12:31:04 +0000
Subject: [PATCH 092/273] custom popover height and sidebar styling

---
 .../bbui/src/Form/Core/Multiselect.svelte     |  2 +
 packages/bbui/src/Form/Core/Picker.svelte     |  3 +
 packages/bbui/src/Form/Multiselect.svelte     |  2 +
 packages/bbui/src/Form/Select.svelte          |  2 +
 packages/bbui/src/Popover/Popover.svelte      |  2 +
 .../_components/AppColumnRenderer.svelte      |  2 +-
 .../auditLogs/_components/UserRenderer.svelte |  4 +-
 .../portal/account/auditLogs/index.svelte     | 58 ++++++++++++++++---
 8 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index a315f44a65..8860fcbf0b 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,6 +15,7 @@
   export let sort = false
   export let autoWidth = false
   export let fetchTerm = null
+  export let customPopoverHeight
 
   const dispatch = createEventDispatcher()
 
@@ -91,4 +92,5 @@
   onSelectOption={toggleOption}
   {sort}
   {autoWidth}
+  {customPopoverHeight}
 />
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index ace41aa35b..5cef0f9213 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -32,6 +32,7 @@
   export let autocomplete = false
   export let sort = false
   export let fetchTerm = null
+  export let customPopoverHeight
   const dispatch = createEventDispatcher()
 
   let searchTerm = null
@@ -136,6 +137,7 @@
   on:close={() => (open = false)}
   useAnchorWidth={!autoWidth}
   maxWidth={autoWidth ? 400 : null}
+  customHeight={customPopoverHeight}
 >
   <div
     class="popover-content"
@@ -266,6 +268,7 @@
   .popover-content :global(.spectrum-Search) {
     margin-top: -1px;
     margin-left: -1px;
+    width: calc(100% + 2px);
   }
   .popover-content :global(.spectrum-Search input) {
     height: auto;
diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index d28401b608..2237cd1dce 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -17,6 +17,7 @@
   export let autoWidth = false
   export let autocomplete = false
   export let fetchTerm = null
+  export let customPopoverHeight
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -38,6 +39,7 @@
     {getOptionValue}
     {autoWidth}
     {autocomplete}
+    {customPopoverHeight}
     bind:fetchTerm
     on:change={onChange}
     on:click
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 4f30318282..76fe613c92 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -21,6 +21,7 @@
   export let sort = false
   export let tooltip = ""
   export let autocomplete = false
+  export let customPopoverHeight
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -53,6 +54,7 @@
     {getOptionColour}
     {isOptionEnabled}
     {autocomplete}
+    {customPopoverHeight}
     on:change={onChange}
     on:click
   />
diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte
index 8f6ef06591..081e3a34df 100644
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@@ -18,6 +18,7 @@
   export let useAnchorWidth = false
   export let dismissible = true
   export let offset = 5
+  export let customHeight
 
   $: target = portalTarget || getContext(Context.PopoverRoot) || ".spectrum"
 
@@ -74,6 +75,7 @@
       on:keydown={handleEscape}
       class="spectrum-Popover is-open"
       role="presentation"
+      style="height: {customHeight}"
       transition:fly|local={{ y: -20, duration: 200 }}
     >
       <slot />
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
index 2ad3997f79..08260ecc5c 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/AppColumnRenderer.svelte
@@ -2,4 +2,4 @@
   export let value
 </script>
 
-<div>{value?.name || "N/A"}</div>
+<div>{value?.name || ""}</div>
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 5d3d8fa28a..1dfb425965 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -18,11 +18,11 @@
   on:focus={() => (showTooltip = true)}
   on:mouseleave={() => (showTooltip = false)}
 >
-  <Avatar size="M" initials={getInitials(row.user)} />
+  <Avatar size="M" initials={getInitials(row?.user)} />
 </div>
 {#if showTooltip}
   <div class="tooltip">
-    <Tooltip textWrapping text={row.user.email} direction="bottom" />
+    <Tooltip textWrapping text={row?.user.email} direction="bottom" />
   </div>
 {/if}
 
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 47c93d23d1..4459eb12a5 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -10,6 +10,7 @@
     CoreTextArea,
     DatePicker,
     Pagination,
+    Helpers,
     Divider,
   } from "@budibase/bbui"
   import { licensing, users, apps, auditLogs } from "stores/portal"
@@ -185,6 +186,11 @@
     viewDetails,
   })
 
+  const copyToClipboard = async value => {
+    await Helpers.copyToClipboard(value)
+    notifications.success("Copied")
+  }
+
   onMount(async () => {
     await auditLogs.getEventDefinitions()
   })
@@ -246,6 +252,7 @@
       </div>
       <div class="select">
         <Multiselect
+          customPopoverHeight="500px"
           autocomplete
           getOptionValue={event => event[0]}
           getOptionLabel={event => event[1]}
@@ -318,6 +325,12 @@
     <Divider />
 
     <div class="side-panel-body">
+      <div
+        on:click={() => copyToClipboard(JSON.stringify(selectedLog.metadata))}
+        class="copy-icon"
+      >
+        <Icon name="Copy" size="S" />
+      </div>
       <CoreTextArea
         disabled
         minHeight={"300px"}
@@ -329,6 +342,34 @@
 {/if}
 
 <style>
+  .copy-icon {
+    right: 16px;
+    top: 80px;
+    z-index: 10;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    box-sizing: border-box;
+
+    border: 1px solid var(--spectrum-alias-border-color);
+    border-radius: var(--spectrum-alias-border-radius-regular);
+    width: 31px;
+    color: var(--spectrum-alias-text-color);
+    background-color: var(--spectrum-global-color-gray-75);
+    transition: background-color
+        var(--spectrum-global-animation-duration-100, 130ms),
+      box-shadow var(--spectrum-global-animation-duration-100, 130ms),
+      border-color var(--spectrum-global-animation-duration-100, 130ms);
+    height: calc(var(--spectrum-alias-item-height-m) - 2px);
+    position: absolute;
+  }
+  .copy-icon:hover {
+    cursor: pointer;
+    color: var(--spectrum-alias-text-color-hover);
+    background-color: var(--spectrum-global-color-gray-50);
+    border-color: var(--spectrum-alias-border-color-hover);
+  }
   .side-panel-header {
     display: flex;
     padding: 20px 10px 10px 10px;
@@ -346,7 +387,7 @@
 
   .side-panel-body {
     padding: 10px;
-    height: 95%;
+    height: calc(100% - 67px);
   }
   #side-panel {
     position: absolute;
@@ -357,11 +398,11 @@
     border-left: var(--border-light);
     width: 320px;
     max-width: calc(100vw - 48px - 48px);
-    overflow: auto;
-    overflow-x: hidden;
     transform: translateX(100%);
     transition: transform 130ms ease-in-out;
-    height: calc(100% - 25px);
+    height: calc(100% - 24px);
+    overflow-y: hidden;
+    overflow-x: hidden;
     z-index: 2;
   }
   #side-panel.visible {
@@ -373,15 +414,14 @@
   }
 
   #side-panel :global(textarea) {
-    min-height: 202px !important;
+    min-height: 100% !important;
     background-color: var(
       --spectrum-textfield-m-background-color,
       var(--spectrum-global-color-gray-50)
     );
-    color: var(
-      --spectrum-textfield-m-text-color,
-      var(--spectrum-alias-text-color)
-    );
+    padding-top: var(--spacing-l);
+    padding-left: var(--spacing-l);
+    font-size: 13px;
   }
 
   .search :global(.spectrum-InputGroup) {

From 9d6d7812449471dd1d917ae543cfa88e7ad241da Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 22 Feb 2023 13:04:16 +0000
Subject: [PATCH 093/273] Use `--runInBand` in CI only (#9771)

* Use  in CI only

* Use scripts instead of ternary to pick up correct bash syntax
---
 packages/backend-core/package.json    |  2 +-
 packages/backend-core/scripts/test.sh | 12 ++++++++++++
 packages/server/package.json          |  2 +-
 packages/server/scripts/test.sh       | 12 ++++++++++++
 packages/worker/package.json          |  2 +-
 packages/worker/scripts/test.sh       | 12 ++++++++++++
 6 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 packages/backend-core/scripts/test.sh
 create mode 100644 packages/server/scripts/test.sh
 create mode 100644 packages/worker/scripts/test.sh

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bc8ec58a7f..a554ab09f1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -18,7 +18,7 @@
     "build:pro": "../../scripts/pro/build.sh",
     "postbuild": "yarn run build:pro",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "test": "jest --coverage --runInBand",
+    "test": "bash scripts/test.sh",
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
diff --git a/packages/backend-core/scripts/test.sh b/packages/backend-core/scripts/test.sh
new file mode 100644
index 0000000000..4bf1900984
--- /dev/null
+++ b/packages/backend-core/scripts/test.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ -n $CI ]]
+then
+  # --runInBand performs better in ci where resources are limited
+  echo "jest --coverage --runInBand"
+  jest --coverage --runInBand
+else
+  # --maxWorkers performs better in development
+  echo "jest --coverage"
+  jest --coverage
+fi
\ No newline at end of file
diff --git a/packages/server/package.json b/packages/server/package.json
index 2eedd09fc9..4dc6951979 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -14,7 +14,7 @@
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-    "test": "jest --coverage --runInBand",
+    "test": "bash scripts/test.sh",
     "test:watch": "jest --watch",
     "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
     "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
diff --git a/packages/server/scripts/test.sh b/packages/server/scripts/test.sh
new file mode 100644
index 0000000000..2f3f54cb25
--- /dev/null
+++ b/packages/server/scripts/test.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ -n $CI ]]
+then
+  # --runInBand performs better in ci where resources are limited
+  echo "jest --coverage --runInBand"
+  jest --coverage --runInBand
+else
+  # --maxWorkers performs better in development
+  echo "jest --coverage --maxWorkers=2"
+  jest --coverage --maxWorkers=2
+fi
\ No newline at end of file
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f28a153247..61be3f8fdd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -22,7 +22,7 @@
     "build:docker": "docker build . -t worker-service --label version=$BUDIBASE_RELEASE_VERSION",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon",
-    "test": "jest --coverage --runInBand",
+    "test": "bash scripts/test.sh",
     "test:watch": "jest --watch",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",
diff --git a/packages/worker/scripts/test.sh b/packages/worker/scripts/test.sh
new file mode 100644
index 0000000000..2f3f54cb25
--- /dev/null
+++ b/packages/worker/scripts/test.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ -n $CI ]]
+then
+  # --runInBand performs better in ci where resources are limited
+  echo "jest --coverage --runInBand"
+  jest --coverage --runInBand
+else
+  # --maxWorkers performs better in development
+  echo "jest --coverage --maxWorkers=2"
+  jest --coverage --maxWorkers=2
+fi
\ No newline at end of file

From bfe07563738b441f4f80c8238d273dc4434c021b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:11:38 +0000
Subject: [PATCH 094/273] v2.3.18-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 3e05b82a1e..ce8b6c3658 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a554ab09f1..53f24e87a3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-alpha.4",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.3",
+    "@budibase/types": "2.3.18-alpha.4",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c247e32e50..37b8294514 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.3.18-alpha.3",
+  "version": "2.3.18-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.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-alpha.4",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index ed6fc08ac5..d364f93fb7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.3",
-    "@budibase/client": "2.3.18-alpha.3",
-    "@budibase/frontend-core": "2.3.18-alpha.3",
-    "@budibase/string-templates": "2.3.18-alpha.3",
+    "@budibase/bbui": "2.3.18-alpha.4",
+    "@budibase/client": "2.3.18-alpha.4",
+    "@budibase/frontend-core": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-alpha.4",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ce9aa90b8f..a319c9d188 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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.3.18-alpha.3",
-    "@budibase/string-templates": "2.3.18-alpha.3",
-    "@budibase/types": "2.3.18-alpha.3",
+    "@budibase/backend-core": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/types": "2.3.18-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 e0320f52ab..8c9294ead6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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.3.18-alpha.3",
-    "@budibase/frontend-core": "2.3.18-alpha.3",
-    "@budibase/string-templates": "2.3.18-alpha.3",
+    "@budibase/bbui": "2.3.18-alpha.4",
+    "@budibase/frontend-core": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-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 9a9843af3b..7166498db9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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.3.18-alpha.3",
+    "@budibase/bbui": "2.3.18-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d9d83c7889..047222af56 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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 4dc6951979..66e07e1381 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.3",
-    "@budibase/client": "2.3.18-alpha.3",
+    "@budibase/backend-core": "2.3.18-alpha.4",
+    "@budibase/client": "2.3.18-alpha.4",
     "@budibase/pro": "2.3.18-alpha.3",
-    "@budibase/string-templates": "2.3.18-alpha.3",
-    "@budibase/types": "2.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/types": "2.3.18-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 48081eda83..92c4712572 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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 66959cf7c8..9f31a18c75 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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 61be3f8fdd..9b51533697 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.3",
+  "version": "2.3.18-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.3.18-alpha.3",
+    "@budibase/backend-core": "2.3.18-alpha.4",
     "@budibase/pro": "2.3.18-alpha.3",
-    "@budibase/string-templates": "2.3.18-alpha.3",
-    "@budibase/types": "2.3.18-alpha.3",
+    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/types": "2.3.18-alpha.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 52c362884618bdb6b43363ca0136551e09c667b3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:14:32 +0000
Subject: [PATCH 095/273] Update pro version to 2.3.18-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 66e07e1381..b479c0219d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.4",
     "@budibase/client": "2.3.18-alpha.4",
-    "@budibase/pro": "2.3.18-alpha.3",
+    "@budibase/pro": "2.3.18-alpha.4",
     "@budibase/string-templates": "2.3.18-alpha.4",
     "@budibase/types": "2.3.18-alpha.4",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3f6682875e..2b76c672fb 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.3.tgz#e10f4071cb43a178293b1ad37bcd1d4f45d358a1"
-  integrity sha512-MbaYwhvV1V9XrJTUP0wBy9fT9FtaJuAi1pOHJNWw3kvUEo7h5AiSp2hOGBoPJwoloeWQfZsJpglSOMA9HJf8fQ==
+"@budibase/backend-core@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.4.tgz#b797aae1e91ce88c965b91d3607dc1c52b3e0ea5"
+  integrity sha512-FeHIFkLnZI6+iqNx93YUaLSsmnMkea6IsMPt34ljI8wspPRA5UP5fwGpeG5UPAD8uT8lETiBEEuFZWcdUVzx2g==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.3"
+    "@budibase/types" "2.3.18-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.3.tgz#73a759ee17600a340c41cb0c4f8d289bf66be66f"
-  integrity sha512-xNwzB7l5ZvxcqXMZgsaUVvPKufk3mgI/4TBGXB9IpYQRsGFFxrpNMRtQsMfWUEUrXBvFuyr/DPtQJekhrCcMxg==
+"@budibase/pro@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.4.tgz#6ddeae46abc170380e6d53fda433509799878275"
+  integrity sha512-OoPtm+I25VAh8CZol7UzOChLqy40SGdyp8QNuKxpCoBKXNYiorJkIgllPUGgjHXQxeBJkSMMvKU+ie6/xlPQWg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.3"
-    "@budibase/types" "2.3.18-alpha.3"
+    "@budibase/backend-core" "2.3.18-alpha.4"
+    "@budibase/types" "2.3.18-alpha.4"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.3.tgz#a04a46784e833989f4cc7d4c45366a3cefb01f53"
-  integrity sha512-gkwJdM6zRXulwXQhjSsaDAjJyhbDMVhuFVDcQvS2oZBBrRtBFHfOqLw/dkTC6Zgq9ttu/00B1QihB+uliYRFLQ==
+"@budibase/types@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.4.tgz#53b551af697bfc7f26123f92e6cac1c1615684c3"
+  integrity sha512-j0Y8IsWZ+6M+QvEex91YQQhb/uKmcxT7kWbMgRn4yrHFPYR/8mSlU0xLh5BhHB6DdIRjpaAyqMxLAe9FtSyigg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9b51533697..fff469ff82 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.4",
-    "@budibase/pro": "2.3.18-alpha.3",
+    "@budibase/pro": "2.3.18-alpha.4",
     "@budibase/string-templates": "2.3.18-alpha.4",
     "@budibase/types": "2.3.18-alpha.4",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 123362b958..927ef329ff 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.3.tgz#e10f4071cb43a178293b1ad37bcd1d4f45d358a1"
-  integrity sha512-MbaYwhvV1V9XrJTUP0wBy9fT9FtaJuAi1pOHJNWw3kvUEo7h5AiSp2hOGBoPJwoloeWQfZsJpglSOMA9HJf8fQ==
+"@budibase/backend-core@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.4.tgz#b797aae1e91ce88c965b91d3607dc1c52b3e0ea5"
+  integrity sha512-FeHIFkLnZI6+iqNx93YUaLSsmnMkea6IsMPt34ljI8wspPRA5UP5fwGpeG5UPAD8uT8lETiBEEuFZWcdUVzx2g==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.3"
+    "@budibase/types" "2.3.18-alpha.4"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.3.tgz#73a759ee17600a340c41cb0c4f8d289bf66be66f"
-  integrity sha512-xNwzB7l5ZvxcqXMZgsaUVvPKufk3mgI/4TBGXB9IpYQRsGFFxrpNMRtQsMfWUEUrXBvFuyr/DPtQJekhrCcMxg==
+"@budibase/pro@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.4.tgz#6ddeae46abc170380e6d53fda433509799878275"
+  integrity sha512-OoPtm+I25VAh8CZol7UzOChLqy40SGdyp8QNuKxpCoBKXNYiorJkIgllPUGgjHXQxeBJkSMMvKU+ie6/xlPQWg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.3"
-    "@budibase/types" "2.3.18-alpha.3"
+    "@budibase/backend-core" "2.3.18-alpha.4"
+    "@budibase/types" "2.3.18-alpha.4"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.3":
-  version "2.3.18-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.3.tgz#a04a46784e833989f4cc7d4c45366a3cefb01f53"
-  integrity sha512-gkwJdM6zRXulwXQhjSsaDAjJyhbDMVhuFVDcQvS2oZBBrRtBFHfOqLw/dkTC6Zgq9ttu/00B1QihB+uliYRFLQ==
+"@budibase/types@2.3.18-alpha.4":
+  version "2.3.18-alpha.4"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.4.tgz#53b551af697bfc7f26123f92e6cac1c1615684c3"
+  integrity sha512-j0Y8IsWZ+6M+QvEex91YQQhb/uKmcxT7kWbMgRn4yrHFPYR/8mSlU0xLh5BhHB6DdIRjpaAyqMxLAe9FtSyigg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From fee091b081b112554ec80970f1d09388807bc9e2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 22 Feb 2023 13:22:59 +0000
Subject: [PATCH 096/273] Allow updating nested settings via conditional UI
 (#9748)

* Allow updating nested settings via conditional UI

* Tidy up comments

* Improve safety when generating conditions

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
---
 .../client/src/components/Component.svelte    | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index a846a315bc..d94199bc49 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -72,6 +72,9 @@
   // These are a combination of the enriched, nested and conditional settings.
   let cachedSettings
 
+  // Conditional UI expressions, enriched and ready to evaluate
+  let conditions
+
   // Latest timestamp that we started a props update.
   // Due to enrichment now being async, we need to avoid overwriting newer
   // settings with old ones, depending on how long enrichment takes.
@@ -150,9 +153,7 @@
   $: enrichComponentSettings($context, settingsDefinitionMap)
 
   // Evaluate conditional UI settings and store any component setting changes
-  // which need to be made. This is broken into 2 lines to avoid svelte
-  // reactivity re-evaluating conditions more often than necessary.
-  $: conditions = enrichedSettings?._conditions
+  // which need to be made
   $: evaluateConditions(conditions)
 
   // Determine and apply settings to the component
@@ -297,7 +298,7 @@
     let newStaticSettings = { ...settings }
     let newDynamicSettings = { ...settings }
 
-    // Attach some internal properties
+    // Attach some internal properties which we assume always need enriched
     newDynamicSettings["_conditions"] = instance._conditions
     newDynamicSettings["_css"] = instance._styles?.custom
 
@@ -336,6 +337,24 @@
     }
   }
 
+  // Generates the array of conditional UI expressions, accounting for both
+  // nested and non-nested settings, extracting a mixture of values from both
+  // the un-enriched and enriched settings
+  const generateConditions = () => {
+    if (!enrichedSettings?._conditions) {
+      conditions = []
+      return
+    }
+    conditions = enrichedSettings._conditions.map(condition => {
+      const raw = instance._conditions?.find(x => x.id === condition.id)
+      if (settingsDefinitionMap[condition.setting]?.nested && raw) {
+        return { ...condition, settingValue: raw.settingValue }
+      } else {
+        return condition
+      }
+    })
+  }
+
   // Enriches any string component props using handlebars
   const enrichComponentSettings = (
     context,
@@ -364,7 +383,11 @@
       return
     }
 
+    // Store new enriched settings
     enrichedSettings = newEnrichedSettings
+
+    // Once settings have been enriched, re-evaluate conditions
+    generateConditions()
   }
 
   // Evaluates the list of conditional UI conditions and determines any setting

From 46c015491a5affeb98575650bcd3d6397e9c5e9c Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:33:55 +0000
Subject: [PATCH 097/273] v2.3.18-alpha.5

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 ce8b6c3658..2f560e521a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 53f24e87a3..0bee6e9490 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.4",
+    "@budibase/types": "2.3.18-alpha.5",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 37b8294514..11d0ccf6a4 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.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-alpha.5",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d364f93fb7..6ee5567a7c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.4",
-    "@budibase/client": "2.3.18-alpha.4",
-    "@budibase/frontend-core": "2.3.18-alpha.4",
-    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/bbui": "2.3.18-alpha.5",
+    "@budibase/client": "2.3.18-alpha.5",
+    "@budibase/frontend-core": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.5",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a319c9d188..2cb2476bee 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.4",
-    "@budibase/string-templates": "2.3.18-alpha.4",
-    "@budibase/types": "2.3.18-alpha.4",
+    "@budibase/backend-core": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/types": "2.3.18-alpha.5",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 8c9294ead6..06c2e9e0f4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.4",
-    "@budibase/frontend-core": "2.3.18-alpha.4",
-    "@budibase/string-templates": "2.3.18-alpha.4",
+    "@budibase/bbui": "2.3.18-alpha.5",
+    "@budibase/frontend-core": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.5",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 7166498db9..8fd8942b0f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.4",
+    "@budibase/bbui": "2.3.18-alpha.5",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 047222af56..4e148980a4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b479c0219d..663cf09bf9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.4",
-    "@budibase/client": "2.3.18-alpha.4",
+    "@budibase/backend-core": "2.3.18-alpha.5",
+    "@budibase/client": "2.3.18-alpha.5",
     "@budibase/pro": "2.3.18-alpha.4",
-    "@budibase/string-templates": "2.3.18-alpha.4",
-    "@budibase/types": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/types": "2.3.18-alpha.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 92c4712572..ab2525db46 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 9f31a18c75..b51b39b842 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fff469ff82..c632a630ca 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.4",
+  "version": "2.3.18-alpha.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.4",
+    "@budibase/backend-core": "2.3.18-alpha.5",
     "@budibase/pro": "2.3.18-alpha.4",
-    "@budibase/string-templates": "2.3.18-alpha.4",
-    "@budibase/types": "2.3.18-alpha.4",
+    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/types": "2.3.18-alpha.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e04c72331e5697b68a3859d3f56b264bb627a07b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:37:06 +0000
Subject: [PATCH 098/273] Update pro version to 2.3.18-alpha.5

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 663cf09bf9..aae4598e91 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.5",
     "@budibase/client": "2.3.18-alpha.5",
-    "@budibase/pro": "2.3.18-alpha.4",
+    "@budibase/pro": "2.3.18-alpha.5",
     "@budibase/string-templates": "2.3.18-alpha.5",
     "@budibase/types": "2.3.18-alpha.5",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 2b76c672fb..18ed4f5844 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.4.tgz#b797aae1e91ce88c965b91d3607dc1c52b3e0ea5"
-  integrity sha512-FeHIFkLnZI6+iqNx93YUaLSsmnMkea6IsMPt34ljI8wspPRA5UP5fwGpeG5UPAD8uT8lETiBEEuFZWcdUVzx2g==
+"@budibase/backend-core@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.5.tgz#8f93a64114d9dc7a513b2eb9dbd6e91a0c087c76"
+  integrity sha512-jZEVbU/L2Dyuwgtr4qhph1BFSUCkj14UIIV7WrC+CkmMixxQZHuO3pim9n7/kJ5GLE859sI42kOu+quS8YmqKA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.4"
+    "@budibase/types" "2.3.18-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.4.tgz#6ddeae46abc170380e6d53fda433509799878275"
-  integrity sha512-OoPtm+I25VAh8CZol7UzOChLqy40SGdyp8QNuKxpCoBKXNYiorJkIgllPUGgjHXQxeBJkSMMvKU+ie6/xlPQWg==
+"@budibase/pro@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.5.tgz#7dd0fab4dc7e55e7cc86ec61df6fe9ff72eae525"
+  integrity sha512-a0pSR/BgWCI1u7AMOrfGeiEq9YZeMWq5ASU3yzZsH9HRP35diEdDWMiiMoGjVZvJpzHQb3caTSNCbMWjfW4aQg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.4"
-    "@budibase/types" "2.3.18-alpha.4"
+    "@budibase/backend-core" "2.3.18-alpha.5"
+    "@budibase/types" "2.3.18-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.4.tgz#53b551af697bfc7f26123f92e6cac1c1615684c3"
-  integrity sha512-j0Y8IsWZ+6M+QvEex91YQQhb/uKmcxT7kWbMgRn4yrHFPYR/8mSlU0xLh5BhHB6DdIRjpaAyqMxLAe9FtSyigg==
+"@budibase/types@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.5.tgz#2dc82d2899ae3b320a16fbad47ce6226a68efb52"
+  integrity sha512-zjHGgIZwZbMzeOn+RoMxD+PTxG7Iebi4iyMRvhPN1cBi89SBdS1SLnCm0thcZ9yEvgGdjLSEtV71oIBnapbQqA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c632a630ca..5e75cb0783 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.5",
-    "@budibase/pro": "2.3.18-alpha.4",
+    "@budibase/pro": "2.3.18-alpha.5",
     "@budibase/string-templates": "2.3.18-alpha.5",
     "@budibase/types": "2.3.18-alpha.5",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 927ef329ff..3ac7f166ac 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.4.tgz#b797aae1e91ce88c965b91d3607dc1c52b3e0ea5"
-  integrity sha512-FeHIFkLnZI6+iqNx93YUaLSsmnMkea6IsMPt34ljI8wspPRA5UP5fwGpeG5UPAD8uT8lETiBEEuFZWcdUVzx2g==
+"@budibase/backend-core@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.5.tgz#8f93a64114d9dc7a513b2eb9dbd6e91a0c087c76"
+  integrity sha512-jZEVbU/L2Dyuwgtr4qhph1BFSUCkj14UIIV7WrC+CkmMixxQZHuO3pim9n7/kJ5GLE859sI42kOu+quS8YmqKA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.4"
+    "@budibase/types" "2.3.18-alpha.5"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.4.tgz#6ddeae46abc170380e6d53fda433509799878275"
-  integrity sha512-OoPtm+I25VAh8CZol7UzOChLqy40SGdyp8QNuKxpCoBKXNYiorJkIgllPUGgjHXQxeBJkSMMvKU+ie6/xlPQWg==
+"@budibase/pro@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.5.tgz#7dd0fab4dc7e55e7cc86ec61df6fe9ff72eae525"
+  integrity sha512-a0pSR/BgWCI1u7AMOrfGeiEq9YZeMWq5ASU3yzZsH9HRP35diEdDWMiiMoGjVZvJpzHQb3caTSNCbMWjfW4aQg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.4"
-    "@budibase/types" "2.3.18-alpha.4"
+    "@budibase/backend-core" "2.3.18-alpha.5"
+    "@budibase/types" "2.3.18-alpha.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.4":
-  version "2.3.18-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.4.tgz#53b551af697bfc7f26123f92e6cac1c1615684c3"
-  integrity sha512-j0Y8IsWZ+6M+QvEex91YQQhb/uKmcxT7kWbMgRn4yrHFPYR/8mSlU0xLh5BhHB6DdIRjpaAyqMxLAe9FtSyigg==
+"@budibase/types@2.3.18-alpha.5":
+  version "2.3.18-alpha.5"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.5.tgz#2dc82d2899ae3b320a16fbad47ce6226a68efb52"
+  integrity sha512-zjHGgIZwZbMzeOn+RoMxD+PTxG7Iebi4iyMRvhPN1cBi89SBdS1SLnCm0thcZ9yEvgGdjLSEtV71oIBnapbQqA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 4b85583f5f0697d1b86a516750e803890c122f6e Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 22 Feb 2023 13:39:31 +0000
Subject: [PATCH 099/273] Update builder and authorized middleware to be more
 strict towards unauthenticated (#9774)

* Update builder and authorized middleware to be more strict towards unauthenticated

* Remove unnecessary variable
---
 packages/server/src/middleware/authorized.ts | 10 ++++++----
 packages/server/src/middleware/builder.ts    | 11 ++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/middleware/authorized.ts b/packages/server/src/middleware/authorized.ts
index d3fd4de81d..6268163fb2 100644
--- a/packages/server/src/middleware/authorized.ts
+++ b/packages/server/src/middleware/authorized.ts
@@ -79,10 +79,6 @@ export default (
       return ctx.throw(403, "No user info found")
     }
 
-    // check general builder stuff, this middleware is a good way
-    // to find API endpoints which are builder focused
-    await builderMiddleware(ctx, permType)
-
     // get the resource roles
     let resourceRoles: any = []
     let otherLevelRoles: any = []
@@ -112,6 +108,12 @@ export default (
       return ctx.throw(403, "Session not authenticated")
     }
 
+    // check general builder stuff, this middleware is a good way
+    // to find API endpoints which are builder focused
+    if (permType === permissions.PermissionType.BUILDER) {
+      await builderMiddleware(ctx)
+    }
+
     try {
       // check authorized
       await checkAuthorized(ctx, resourceRoles, permType, permLevel)
diff --git a/packages/server/src/middleware/builder.ts b/packages/server/src/middleware/builder.ts
index 7df6c7ad33..5174f618a0 100644
--- a/packages/server/src/middleware/builder.ts
+++ b/packages/server/src/middleware/builder.ts
@@ -64,13 +64,18 @@ async function updateAppUpdatedAt(ctx: BBContext) {
   })
 }
 
-export default async function builder(ctx: BBContext, permType: string) {
+export default async function builder(ctx: BBContext) {
   const appId = ctx.appId
   // this only functions within an app context
   if (!appId) {
     return
   }
-  const isBuilderApi = permType === permissions.PermissionType.BUILDER
+
+  // check authenticated
+  if (!ctx.isAuthenticated) {
+    return ctx.throw(403, "Session not authenticated")
+  }
+
   const referer = ctx.headers["referer"]
 
   const overviewPath = "/builder/portal/overview/"
@@ -82,7 +87,7 @@ export default async function builder(ctx: BBContext, permType: string) {
   const hasAppId = !referer ? false : referer.includes(appId)
   const editingApp = referer ? hasAppId : false
   // check this is a builder call and editing
-  if (!isBuilderApi || !editingApp) {
+  if (!editingApp) {
     return
   }
   // check locks

From 8cb9d5067beba8153d0d2c751e1a6ea6587c7221 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:56:31 +0000
Subject: [PATCH 100/273] v2.3.18-alpha.6

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

diff --git a/lerna.json b/lerna.json
index 2f560e521a..0a3d923d6c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0bee6e9490..479a54bd94 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.5",
+    "@budibase/types": "2.3.18-alpha.6",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 11d0ccf6a4..6cfeb44a7b 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.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.6",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6ee5567a7c..77b09fdbf3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.5",
-    "@budibase/client": "2.3.18-alpha.5",
-    "@budibase/frontend-core": "2.3.18-alpha.5",
-    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/bbui": "2.3.18-alpha.6",
+    "@budibase/client": "2.3.18-alpha.6",
+    "@budibase/frontend-core": "2.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.6",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2cb2476bee..49f7a6ab6b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.5",
-    "@budibase/string-templates": "2.3.18-alpha.5",
-    "@budibase/types": "2.3.18-alpha.5",
+    "@budibase/backend-core": "2.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.6",
+    "@budibase/types": "2.3.18-alpha.6",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 06c2e9e0f4..b848ae691e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.5",
-    "@budibase/frontend-core": "2.3.18-alpha.5",
-    "@budibase/string-templates": "2.3.18-alpha.5",
+    "@budibase/bbui": "2.3.18-alpha.6",
+    "@budibase/frontend-core": "2.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.6",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 8fd8942b0f..8328865966 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.5",
+    "@budibase/bbui": "2.3.18-alpha.6",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4e148980a4..a44a61274d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index aae4598e91..d85bb6db2c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.5",
-    "@budibase/client": "2.3.18-alpha.5",
+    "@budibase/backend-core": "2.3.18-alpha.6",
+    "@budibase/client": "2.3.18-alpha.6",
     "@budibase/pro": "2.3.18-alpha.5",
-    "@budibase/string-templates": "2.3.18-alpha.5",
-    "@budibase/types": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.6",
+    "@budibase/types": "2.3.18-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index ab2525db46..82b97419ef 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index b51b39b842..f1a9adfa2f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5e75cb0783..e6df349624 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.5",
+  "version": "2.3.18-alpha.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.5",
+    "@budibase/backend-core": "2.3.18-alpha.6",
     "@budibase/pro": "2.3.18-alpha.5",
-    "@budibase/string-templates": "2.3.18-alpha.5",
-    "@budibase/types": "2.3.18-alpha.5",
+    "@budibase/string-templates": "2.3.18-alpha.6",
+    "@budibase/types": "2.3.18-alpha.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 96dfa32c0b531d1fbc173c46cc85caafa5a8fea1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 22 Feb 2023 13:59:23 +0000
Subject: [PATCH 101/273] Update pro version to 2.3.18-alpha.6

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

diff --git a/packages/server/package.json b/packages/server/package.json
index d85bb6db2c..c183a808b8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.6",
     "@budibase/client": "2.3.18-alpha.6",
-    "@budibase/pro": "2.3.18-alpha.5",
+    "@budibase/pro": "2.3.18-alpha.6",
     "@budibase/string-templates": "2.3.18-alpha.6",
     "@budibase/types": "2.3.18-alpha.6",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 18ed4f5844..04d1b7759f 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.5.tgz#8f93a64114d9dc7a513b2eb9dbd6e91a0c087c76"
-  integrity sha512-jZEVbU/L2Dyuwgtr4qhph1BFSUCkj14UIIV7WrC+CkmMixxQZHuO3pim9n7/kJ5GLE859sI42kOu+quS8YmqKA==
+"@budibase/backend-core@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.6.tgz#e6b3304e96b9469f3ca0f4fcfda8cf234c37e2d7"
+  integrity sha512-To0kFbB9nZ6p0UO4ScS4PJ0gbqI1PrMWRXJLTv/6GU3PxnsqvH1tbpcleLMz2zeE04e5xdwt6W1oPViELom2gg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.5"
+    "@budibase/types" "2.3.18-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.5.tgz#7dd0fab4dc7e55e7cc86ec61df6fe9ff72eae525"
-  integrity sha512-a0pSR/BgWCI1u7AMOrfGeiEq9YZeMWq5ASU3yzZsH9HRP35diEdDWMiiMoGjVZvJpzHQb3caTSNCbMWjfW4aQg==
+"@budibase/pro@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.6.tgz#7c5c221da7da79af79605a00aacac5c60f209bf6"
+  integrity sha512-YWPxmZn+z3tm5GZ+2UZSkOAhamlue/dmki+FCML5pIp3dCw8KsXnpzYXHRc1F8yXMTmA/8KBb/YkjQ2WK3Rk7A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.5"
-    "@budibase/types" "2.3.18-alpha.5"
+    "@budibase/backend-core" "2.3.18-alpha.6"
+    "@budibase/types" "2.3.18-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.5.tgz#2dc82d2899ae3b320a16fbad47ce6226a68efb52"
-  integrity sha512-zjHGgIZwZbMzeOn+RoMxD+PTxG7Iebi4iyMRvhPN1cBi89SBdS1SLnCm0thcZ9yEvgGdjLSEtV71oIBnapbQqA==
+"@budibase/types@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.6.tgz#9438ee64008668bbcb3d688b189cc649e03dfd60"
+  integrity sha512-16YtXwSODS8UDhdxCP2piGDWELP05EZuPbwLsOUFLX3Gt0+Wwkme+XWw4pTPE+GoK/mTVkDxzSc4cvuXWtfxxA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e6df349624..2854f35441 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.6",
-    "@budibase/pro": "2.3.18-alpha.5",
+    "@budibase/pro": "2.3.18-alpha.6",
     "@budibase/string-templates": "2.3.18-alpha.6",
     "@budibase/types": "2.3.18-alpha.6",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 3ac7f166ac..7d296fe01b 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.5.tgz#8f93a64114d9dc7a513b2eb9dbd6e91a0c087c76"
-  integrity sha512-jZEVbU/L2Dyuwgtr4qhph1BFSUCkj14UIIV7WrC+CkmMixxQZHuO3pim9n7/kJ5GLE859sI42kOu+quS8YmqKA==
+"@budibase/backend-core@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.6.tgz#e6b3304e96b9469f3ca0f4fcfda8cf234c37e2d7"
+  integrity sha512-To0kFbB9nZ6p0UO4ScS4PJ0gbqI1PrMWRXJLTv/6GU3PxnsqvH1tbpcleLMz2zeE04e5xdwt6W1oPViELom2gg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.5"
+    "@budibase/types" "2.3.18-alpha.6"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.5.tgz#7dd0fab4dc7e55e7cc86ec61df6fe9ff72eae525"
-  integrity sha512-a0pSR/BgWCI1u7AMOrfGeiEq9YZeMWq5ASU3yzZsH9HRP35diEdDWMiiMoGjVZvJpzHQb3caTSNCbMWjfW4aQg==
+"@budibase/pro@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.6.tgz#7c5c221da7da79af79605a00aacac5c60f209bf6"
+  integrity sha512-YWPxmZn+z3tm5GZ+2UZSkOAhamlue/dmki+FCML5pIp3dCw8KsXnpzYXHRc1F8yXMTmA/8KBb/YkjQ2WK3Rk7A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.5"
-    "@budibase/types" "2.3.18-alpha.5"
+    "@budibase/backend-core" "2.3.18-alpha.6"
+    "@budibase/types" "2.3.18-alpha.6"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.5":
-  version "2.3.18-alpha.5"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.5.tgz#2dc82d2899ae3b320a16fbad47ce6226a68efb52"
-  integrity sha512-zjHGgIZwZbMzeOn+RoMxD+PTxG7Iebi4iyMRvhPN1cBi89SBdS1SLnCm0thcZ9yEvgGdjLSEtV71oIBnapbQqA==
+"@budibase/types@2.3.18-alpha.6":
+  version "2.3.18-alpha.6"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.6.tgz#9438ee64008668bbcb3d688b189cc649e03dfd60"
+  integrity sha512-16YtXwSODS8UDhdxCP2piGDWELP05EZuPbwLsOUFLX3Gt0+Wwkme+XWw4pTPE+GoK/mTVkDxzSc4cvuXWtfxxA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 63af59a5b0038f1517ac6c8381a5fe5ffe1e3230 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 22 Feb 2023 14:59:42 +0100
Subject: [PATCH 102/273] Handle link fields

---
 .../src/api/controllers/row/ExternalRequest.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 56e54e299e..a262df8d69 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -177,9 +177,14 @@ function getEndpoint(tableId: string | undefined, operation: string) {
 function basicProcessing(row: Row, table: Table): Row {
   const thisRow: Row = {}
   // filter the row down to what is actually the row (not joined)
-  for (let fieldName of Object.keys(table.schema)) {
+  for (let field of Object.values(table.schema)) {
+    const fieldName = field.name
+
     const pathValue = row[`${table.name}.${fieldName}`]
-    const value = pathValue != null ? pathValue : row[fieldName]
+    const value =
+      pathValue != null || field.type === FieldTypes.LINK
+        ? pathValue
+        : row[fieldName]
     // all responses include "select col as table.col" so that overlaps are handled
     if (value != null) {
       thisRow[fieldName] = value
@@ -572,11 +577,18 @@ export class ExternalRequest {
       if (!linkTable || !linkPrimary) {
         return
       }
+
+      const linkSecondary =
+        linkTable?.primary &&
+        linkTable?.primary?.length > 1 &&
+        linkTable?.primary[1]
+
       const rows = related[key]?.rows || []
       const found = rows.find(
         (row: { [key: string]: any }) =>
           row[linkPrimary] === relationship.id ||
-          row[linkPrimary] === body?.[linkPrimary]
+          (row[linkPrimary] === body?.[linkPrimary] &&
+            (!linkSecondary || row[linkSecondary] === body?.[linkSecondary]))
       )
       const operation = isUpdate ? Operation.UPDATE : Operation.CREATE
       if (!found) {

From c6dadaa4ff524005a719a6d3fbe00f1e2044fd4c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 22 Feb 2023 16:10:54 +0000
Subject: [PATCH 103/273] Some work to make sure the user agent and ip address
 are always passed correctly to audit logs.

---
 packages/backend-core/src/events/events.ts    | 28 +++++++++----------
 .../backend-core/src/events/identification.ts |  2 +-
 packages/backend-core/src/events/index.ts     |  2 +-
 packages/types/src/sdk/auditLogs.ts           |  6 ++++
 .../types/src/sdk/events/identification.ts    |  2 +-
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index 6176fb6724..d3d32384aa 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -1,4 +1,10 @@
-import { AuditLogFn, Event, IdentityType, HostInfo } from "@budibase/types"
+import {
+  AuditLogFn,
+  Event,
+  IdentityType,
+  AuditedEventFriendlyName,
+  AuditLogQueueEvent,
+} from "@budibase/types"
 import { processors } from "./processors"
 import identification from "./identification"
 import { getAppId } from "../context"
@@ -6,24 +12,17 @@ import * as backfill from "./backfill"
 import { createQueue, JobQueue } from "../queue"
 import BullQueue from "bull"
 
-type AuditLogEvent = {
-  event: Event
-  properties: any
-  opts: {
-    timestamp?: string | number
-    userId?: string
-    appId?: string
-    hostInfo?: HostInfo
-  }
+export function isAudited(event: Event) {
+  return !!AuditedEventFriendlyName[event]
 }
 
 let auditLogsEnabled = false
-let auditLogQueue: BullQueue.Queue<AuditLogEvent>
+let auditLogQueue: BullQueue.Queue<AuditLogQueueEvent>
 
 export const configure = (fn: AuditLogFn) => {
   auditLogsEnabled = true
   const writeAuditLogs = fn
-  auditLogQueue = createQueue<AuditLogEvent>(JobQueue.AUDIT_LOG)
+  auditLogQueue = createQueue<AuditLogQueueEvent>(JobQueue.AUDIT_LOG)
   return auditLogQueue.process(async job => {
     await writeAuditLogs(job.data.event, job.data.properties, {
       userId: job.data.opts.userId,
@@ -46,11 +45,11 @@ export const publishEvent = async (
   // no backfill - send the event and exit
   if (!backfilling) {
     await processors.processEvent(event, identity, properties, timestamp)
-    if (auditLogsEnabled) {
+    if (auditLogsEnabled && isAudited(event)) {
       // only audit log actual events, don't include backfills
       const userId =
         identity.type === IdentityType.USER ? identity.id : undefined
-      // add to event queue, rather than just writing immediately
+      // add to the event queue, rather than just writing immediately
       await auditLogQueue.add({
         event,
         properties,
@@ -58,6 +57,7 @@ export const publishEvent = async (
           userId,
           timestamp,
           appId: getAppId(),
+          hostInfo: identity.hostInfo,
         },
       })
     }
diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index e18d96bbe0..dcb2ebb4ab 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -89,7 +89,7 @@ const getCurrentIdentity = async (): Promise<Identity> => {
       installationId,
       tenantId,
       environment,
-      hostInfo: userContext.host,
+      hostInfo: userContext.hostInfo,
     }
   } else {
     throw new Error("Unknown identity type")
diff --git a/packages/backend-core/src/events/index.ts b/packages/backend-core/src/events/index.ts
index 7aa4d06e58..15f6dde835 100644
--- a/packages/backend-core/src/events/index.ts
+++ b/packages/backend-core/src/events/index.ts
@@ -3,7 +3,7 @@ export * as processors from "./processors"
 export * as analytics from "./analytics"
 export { default as identification } from "./identification"
 export * as backfillCache from "./backfill"
-export { configure } from "./events"
+export { configure, isAudited } from "./events"
 
 import { processors } from "./processors"
 
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index dea36b0164..e5d0c77d90 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -12,3 +12,9 @@ export type AuditLogFn = (
   metadata: any,
   opts: AuditWriteOpts
 ) => Promise<any>
+
+export type AuditLogQueueEvent = {
+  event: Event
+  properties: any
+  opts: AuditWriteOpts
+}
diff --git a/packages/types/src/sdk/events/identification.ts b/packages/types/src/sdk/events/identification.ts
index bbbf74d33e..8b6b7ddf44 100644
--- a/packages/types/src/sdk/events/identification.ts
+++ b/packages/types/src/sdk/events/identification.ts
@@ -46,7 +46,7 @@ export interface Identity {
   environment: string
   installationId?: string
   tenantId?: string
-  hostInfo: HostInfo
+  hostInfo?: HostInfo
 }
 
 export interface UserIdentity extends Identity {

From f00994af7f015d4792e14450178f23a0d55c7f94 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 22 Feb 2023 17:18:05 +0100
Subject: [PATCH 104/273] Fix wrong relationship mapping

---
 .../server/src/api/controllers/row/ExternalRequest.ts    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index a262df8d69..1510e31881 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -384,6 +384,15 @@ export class ExternalRequest {
       ) {
         continue
       }
+
+      if (
+        relationship.from &&
+        row[fromColumn] === undefined &&
+        row[relationship.from] === null
+      ) {
+        continue
+      }
+
       let linked = basicProcessing(row, linkedTable)
       if (!linked._id) {
         continue

From 647e643439d12899b9a00293db0d8e91f84f7505 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 22 Feb 2023 17:25:24 +0000
Subject: [PATCH 105/273] start download work

---
 .../portal/account/auditLogs/index.svelte     | 27 +++++++++++++++----
 packages/frontend-core/src/api/auditLogs.js   |  6 ++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 4459eb12a5..125a67a03d 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -21,6 +21,7 @@
   import UserRenderer from "./_components/UserRenderer.svelte"
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
+  import download from "downloadjs"
 
   const schema = {
     date: { width: "0.8fr" },
@@ -167,16 +168,29 @@
     selectedLog = detail
     sidePanelVisible = true
   }
+  async function exportView() {
+    try {
+      const data = await API.exportView({
+        viewName: view,
+        format: exportFormat,
+      })
+    } catch (error) {
+      notifications.error(`Unable to export ${exportFormat.toUpperCase()} data`)
+    }
+  }
 
   const downloadLogs = async () => {
     try {
-      await auditLogs.download({
+      let response = await auditLogs.downloadLogs({
         startDate,
         endDate,
-        metadataSearch: logSearchTerm,
+        fullSearch: logSearchTerm,
         userIds: selectedUsers,
         appIds: selectedApps,
+        events: selectedEvents,
       })
+
+      // DO SOMETHING HERE???????????
     } catch (error) {
       notifications.error(`Error downloading logs: ` + error.message)
     }
@@ -193,6 +207,7 @@
 
   onMount(async () => {
     await auditLogs.getEventDefinitions()
+    await licensing.init()
   })
 </script>
 
@@ -214,7 +229,6 @@
           range={true}
           label="Date Range"
           on:change={e => {
-            console.log(e)
             if (e.detail[0]?.length === 1) {
               startDate = e.detail[0][0].toISOString()
             } else if (e.detail[0]?.length > 1) {
@@ -263,8 +277,11 @@
         />
       </div>
     </div>
-    <div style="padding-bottom: var(--spacing-s)">
-      <Icon on:click={() => downloadLogs()} name="Download" />
+    <div
+      on:click={() => downloadLogs()}
+      style="padding-bottom: var(--spacing-s)"
+    >
+      <Icon name="Download" />
     </div>
 
     <div style="max-width: 150px; ">
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 867644c23c..08e14328a1 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -8,7 +8,7 @@ const buildOpts = ({
   events,
 }) => {
   const opts = {}
-
+  
   if (bookmark) {
     opts.bookmark = bookmark
   }
@@ -35,7 +35,7 @@ const buildOpts = ({
   if (appIds.length) {
     opts.appIds = appIds
   }
-
+  console.log(opts)
   return opts
 }
 
@@ -58,7 +58,7 @@ export const buildAuditLogsEndpoints = API => ({
 
   downloadLogs: async opts => {
     return await API.post({
-      url: `/api/global/auditlogs/definitions`,
+      url: `/api/global/auditlogs/download`,
       body: buildOpts(opts),
     })
   },

From 01076bd35f896d12a539dcb8b39ad858fe3c87be Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 22 Feb 2023 18:50:27 +0000
Subject: [PATCH 106/273] Getting downloading working correctly, some minor UI
 updates, adding a new middleware for converting a query string to a body
 (useful for when a GET has to be used).

---
 .../src/middleware/downloadBody.ts            | 22 ++++++++
 packages/backend-core/src/middleware/index.ts |  1 +
 .../portal/account/auditLogs/index.svelte     | 50 +++++++++----------
 .../builder/src/stores/portal/auditLogs.js    |  6 +--
 packages/frontend-core/src/api/auditLogs.js   | 10 ++--
 .../api/routes/global/tests/auditLogs.spec.ts |  5 ++
 6 files changed, 60 insertions(+), 34 deletions(-)
 create mode 100644 packages/backend-core/src/middleware/downloadBody.ts
 create mode 100644 packages/worker/src/api/routes/global/tests/auditLogs.spec.ts

diff --git a/packages/backend-core/src/middleware/downloadBody.ts b/packages/backend-core/src/middleware/downloadBody.ts
new file mode 100644
index 0000000000..a7050e08c5
--- /dev/null
+++ b/packages/backend-core/src/middleware/downloadBody.ts
@@ -0,0 +1,22 @@
+import { Ctx } from "@budibase/types"
+
+/**
+ * Expects a standard "query" query string property which is the JSON body
+ * of the request, which has to be sent via query string due to the requirement
+ * of making an endpoint a GET request e.g. downloading a file stream.
+ */
+export default function (ctx: Ctx, next: any) {
+  const queryString = ctx.request.query?.query as string | undefined
+  if (!queryString) {
+    return next()
+  }
+  const decoded = decodeURIComponent(queryString)
+  let json
+  try {
+    json = JSON.parse(decoded)
+  } catch (err) {
+    return next()
+  }
+  ctx.request.body = json
+  return next()
+}
diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts
index de609f9a3e..0c4c2f6b94 100644
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@@ -17,4 +17,5 @@ export { default as builderOrAdmin } from "./builderOrAdmin"
 export { default as builderOnly } from "./builderOnly"
 export { default as logging } from "./logging"
 export { default as errorHandling } from "./errorHandling"
+export { default as downloadBody } from "./downloadBody"
 export * as joiValidator from "./joi-validator"
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 125a67a03d..944ed87d1a 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -21,13 +21,13 @@
   import UserRenderer from "./_components/UserRenderer.svelte"
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
-  import download from "downloadjs"
+  import { cloneDeep } from "lodash"
 
   const schema = {
     date: { width: "0.8fr" },
     user: { width: "0.5fr" },
-    app: { width: "1fr", fieldName: "name" },
-    name: { width: "1fr" },
+    app: { width: "0.75fr", fieldName: "name" },
+    name: { width: "1.5fr" },
     view: { width: "auto", borderLeft: true, displayName: "" },
   }
 
@@ -134,8 +134,7 @@
         $auditLogs.logs.bookmark
       )
     } catch (error) {
-      console.log(error)
-      notifications.error("Error getting audit logs")
+      notifications.error(`Error getting audit logs - ${error}`)
     }
   }
 
@@ -164,24 +163,13 @@
   }
 
   const viewDetails = detail => {
-    console.log(detail)
     selectedLog = detail
     sidePanelVisible = true
   }
-  async function exportView() {
-    try {
-      const data = await API.exportView({
-        viewName: view,
-        format: exportFormat,
-      })
-    } catch (error) {
-      notifications.error(`Unable to export ${exportFormat.toUpperCase()} data`)
-    }
-  }
 
   const downloadLogs = async () => {
     try {
-      let response = await auditLogs.downloadLogs({
+      window.location = auditLogs.getDownloadUrl({
         startDate,
         endDate,
         fullSearch: logSearchTerm,
@@ -189,8 +177,6 @@
         appIds: selectedApps,
         events: selectedEvents,
       })
-
-      // DO SOMETHING HERE???????????
     } catch (error) {
       notifications.error(`Error downloading logs: ` + error.message)
     }
@@ -205,6 +191,20 @@
     notifications.success("Copied")
   }
 
+  function cleanupMetadata(log) {
+    const cloned = cloneDeep(log)
+    cloned.userId = cloned.user._id
+    if (cloned.app) {
+      cloned.appId = cloned.app.appId
+    }
+    // remove props that are confused/not returned in download
+    delete cloned._id
+    delete cloned._rev
+    delete cloned.app
+    delete cloned.user
+    return cloned
+  }
+
   onMount(async () => {
     await auditLogs.getEventDefinitions()
     await licensing.init()
@@ -277,15 +277,15 @@
         />
       </div>
     </div>
+    <div style="max-width: 150px; ">
+      <Search placeholder="Search" bind:value={logSearchTerm} />
+    </div>
+
     <div
       on:click={() => downloadLogs()}
       style="padding-bottom: var(--spacing-s)"
     >
-      <Icon name="Download" />
-    </div>
-
-    <div style="max-width: 150px; ">
-      <Search placeholder="Search" bind:value={logSearchTerm} />
+      <Icon name="Download" hoverable />
     </div>
   </div>
   <Layout noPadding>
@@ -352,7 +352,7 @@
         disabled
         minHeight={"300px"}
         height={"100%"}
-        value={JSON.stringify(selectedLog.metadata, null, 2)}
+        value={JSON.stringify(cleanupMetadata(selectedLog), null, 2)}
       />
     </div>
   </div>
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
index 165e4b5ec5..9abf8ec11b 100644
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ b/packages/builder/src/stores/portal/auditLogs.js
@@ -28,15 +28,15 @@ export function createAuditLogsStore() {
     })
   }
 
-  async function downloadLogs(opts = {}) {
-    return await API.downloadLogs(opts)
+  function getDownloadUrl(opts = {}) {
+    return API.getDownloadUrl(opts)
   }
 
   return {
     subscribe,
     search,
     getEventDefinitions,
-    downloadLogs,
+    getDownloadUrl,
   }
 }
 
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index 08e14328a1..b8ad16a722 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -8,7 +8,7 @@ const buildOpts = ({
   events,
 }) => {
   const opts = {}
-  
+
   if (bookmark) {
     opts.bookmark = bookmark
   }
@@ -56,10 +56,8 @@ export const buildAuditLogsEndpoints = API => ({
     })
   },
 
-  downloadLogs: async opts => {
-    return await API.post({
-      url: `/api/global/auditlogs/download`,
-      body: buildOpts(opts),
-    })
+  getDownloadUrl: opts => {
+    const query = encodeURIComponent(JSON.stringify(opts))
+    return `/api/global/auditlogs/download?query=${query}`
   },
 })
diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
new file mode 100644
index 0000000000..5e7ed31263
--- /dev/null
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -0,0 +1,5 @@
+import { mocks } from "@budibase/backend-core/tests"
+
+mocks.licenses.useEnvironmentVariables()
+
+describe("/api/global/auditlogs", () => {})

From 83649f1959e35d894b50cc44097c9a2f9520e749 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Wed, 22 Feb 2023 22:40:50 +0100
Subject: [PATCH 107/273] Setup o2m and m2m relationships

---
 .tool-versions                                |   2 +-
 .../api/controllers/row/ExternalRequest.ts    |  32 ++---
 .../src/integration-test/postgres.spec.ts     | 134 +++++++++++-------
 3 files changed, 100 insertions(+), 68 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 8a1af3c071..6ee8cc60be 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 14.19.3
-python 3.11.1
\ No newline at end of file
+python 3.10.0
\ No newline at end of file
diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 1510e31881..79a598edf0 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -142,7 +142,11 @@ function cleanupConfig(config: RunConfig, table: Table): RunConfig {
   return config
 }
 
-function generateIdForRow(row: Row | undefined, table: Table): string {
+function generateIdForRow(
+  row: Row | undefined,
+  table: Table,
+  isLinked: boolean = false
+): string {
   const primary = table.primary
   if (!row || !primary) {
     return ""
@@ -151,7 +155,10 @@ function generateIdForRow(row: Row | undefined, table: Table): string {
   let idParts = []
   for (let field of primary) {
     // need to handle table name + field or just field, depending on if relationships used
-    const fieldValue = row[`${table.name}.${field}`] || row[field]
+    let fieldValue = row[`${table.name}.${field}`]
+    if (!fieldValue && !isLinked) {
+      fieldValue = row[field]
+    }
     if (fieldValue) {
       idParts.push(fieldValue)
     }
@@ -174,23 +181,20 @@ function getEndpoint(tableId: string | undefined, operation: string) {
   }
 }
 
-function basicProcessing(row: Row, table: Table): Row {
+function basicProcessing(row: Row, table: Table, isLinked: boolean): Row {
   const thisRow: Row = {}
   // filter the row down to what is actually the row (not joined)
   for (let field of Object.values(table.schema)) {
     const fieldName = field.name
 
     const pathValue = row[`${table.name}.${fieldName}`]
-    const value =
-      pathValue != null || field.type === FieldTypes.LINK
-        ? pathValue
-        : row[fieldName]
+    const value = pathValue != null || isLinked ? pathValue : row[fieldName]
     // all responses include "select col as table.col" so that overlaps are handled
     if (value != null) {
       thisRow[fieldName] = value
     }
   }
-  thisRow._id = generateIdForRow(row, table)
+  thisRow._id = generateIdForRow(row, table, isLinked)
   thisRow.tableId = table._id
   thisRow._rev = "rev"
   return processFormulas(table, thisRow)
@@ -385,15 +389,7 @@ export class ExternalRequest {
         continue
       }
 
-      if (
-        relationship.from &&
-        row[fromColumn] === undefined &&
-        row[relationship.from] === null
-      ) {
-        continue
-      }
-
-      let linked = basicProcessing(row, linkedTable)
+      let linked = basicProcessing(row, linkedTable, true)
       if (!linked._id) {
         continue
       }
@@ -441,7 +437,7 @@ export class ExternalRequest {
         )
         continue
       }
-      const thisRow = fixArrayTypes(basicProcessing(row, table), table)
+      const thisRow = fixArrayTypes(basicProcessing(row, table, false), table)
       if (thisRow._id == null) {
         throw "Unable to generate row ID for SQL rows"
       }
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index c688600e8d..cc8760023f 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -23,11 +23,19 @@ jest.setTimeout(30000)
 
 jest.unmock("pg")
 
+interface RandomForeignKeyConfig {
+  createOne2Many?: boolean
+  createMany2One?: number
+  createMany2Many?: number
+}
+
 describe("row api - postgres", () => {
   let makeRequest: MakeRequestResponse,
     postgresDatasource: Datasource,
     primaryPostgresTable: Table,
-    auxPostgresTable: Table
+    o2mInfo: { table: Table; fieldName: string },
+    m2oInfo: { table: Table; fieldName: string },
+    m2mInfo: { table: Table; fieldName: string }
 
   let host: string
   let port: number
@@ -67,31 +75,46 @@ describe("row api - postgres", () => {
       },
     })
 
-    auxPostgresTable = await config.createTable({
-      name: generator.word({ length: 10 }),
-      type: "external",
-      primary: ["id"],
-      schema: {
-        id: {
-          name: "id",
-          type: FieldType.AUTO,
-          constraints: {
-            presence: true,
+    async function createAuxTable(prefix: string) {
+      return await config.createTable({
+        name: `${prefix}_${generator.word({ length: 6 })}`,
+        type: "external",
+        primary: ["id"],
+        schema: {
+          id: {
+            name: "id",
+            type: FieldType.AUTO,
+            constraints: {
+              presence: true,
+            },
+          },
+          title: {
+            name: "title",
+            type: FieldType.STRING,
+            constraints: {
+              presence: true,
+            },
           },
         },
-        title: {
-          name: "title",
-          type: FieldType.STRING,
-          constraints: {
-            presence: true,
-          },
-        },
-      },
-      sourceId: postgresDatasource._id,
-    })
+        sourceId: postgresDatasource._id,
+      })
+    }
+
+    o2mInfo = {
+      table: await createAuxTable("o2m"),
+      fieldName: "oneToManyRelation",
+    }
+    m2oInfo = {
+      table: await createAuxTable("m2o"),
+      fieldName: "manyToOneRelation",
+    }
+    m2mInfo = {
+      table: await createAuxTable("m2m"),
+      fieldName: "manyToManyRelation",
+    }
 
     primaryPostgresTable = await config.createTable({
-      name: generator.word({ length: 10 }),
+      name: `p_${generator.word({ length: 6 })}`,
       type: "external",
       primary: ["id"],
       schema: {
@@ -117,25 +140,45 @@ describe("row api - postgres", () => {
           name: "value",
           type: FieldType.NUMBER,
         },
-        linkedField: {
+        oneToManyRelation: {
           type: FieldType.LINK,
           constraints: {
             type: "array",
             presence: false,
           },
-          fieldName: "foreignField",
-          name: "linkedField",
+          fieldName: o2mInfo.fieldName,
+          name: "oneToManyRelation",
           relationshipType: RelationshipTypes.ONE_TO_MANY,
-          tableId: auxPostgresTable._id,
+          tableId: o2mInfo.table._id,
+        },
+        manyToOneRelation: {
+          type: FieldType.LINK,
+          constraints: {
+            type: "array",
+            presence: false,
+          },
+          fieldName: m2oInfo.fieldName,
+          name: "manyToOneRelation",
+          relationshipType: RelationshipTypes.MANY_TO_ONE,
+          tableId: m2oInfo.table._id,
+        },
+        manyToManyRelation: {
+          type: FieldType.LINK,
+          constraints: {
+            type: "array",
+            presence: false,
+          },
+          fieldName: m2mInfo.fieldName,
+          name: "manyToManyRelation",
+          relationshipType: RelationshipTypes.MANY_TO_MANY,
+          tableId: m2mInfo.table._id,
         },
       },
       sourceId: postgresDatasource._id,
     })
   })
 
-  afterAll(async () => {
-    await config.end()
-  })
+  afterAll(config.end)
 
   function generateRandomPrimaryRowData() {
     return {
@@ -153,19 +196,20 @@ describe("row api - postgres", () => {
 
   async function createPrimaryRow(opts: {
     rowData: PrimaryRowData
-    createForeignRow?: boolean
+    createForeignRows?: RandomForeignKeyConfig
   }) {
     let { rowData } = opts
     let foreignRow: Row | undefined
-    if (opts?.createForeignRow) {
+
+    if (opts?.createForeignRows?.createOne2Many) {
       foreignRow = await config.createRow({
-        tableId: auxPostgresTable._id,
+        tableId: o2mInfo.table._id,
         title: generator.name(),
       })
 
       rowData = {
         ...rowData,
-        [`fk_${auxPostgresTable.name}_foreignField`]: foreignRow.id,
+        [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]: foreignRow.id,
       }
     }
 
@@ -197,9 +241,7 @@ describe("row api - postgres", () => {
 
   async function populatePrimaryRows(
     count: number,
-    opts?: {
-      createForeignRow?: boolean
-    }
+    opts?: RandomForeignKeyConfig
   ) {
     return await Promise.all(
       Array(count)
@@ -210,7 +252,7 @@ describe("row api - postgres", () => {
             rowData,
             ...(await createPrimaryRow({
               rowData,
-              createForeignRow: opts?.createForeignRow,
+              createForeignRows: opts,
             })),
           }
         })
@@ -295,7 +337,7 @@ describe("row api - postgres", () => {
     describe("given than a row exists", () => {
       let row: Row
       beforeEach(async () => {
-        let rowResponse = _.sample(await populatePrimaryRows(10))!
+        let rowResponse = _.sample(await populatePrimaryRows(1))!
         row = rowResponse.row
       })
 
@@ -422,7 +464,7 @@ describe("row api - postgres", () => {
       let foreignRow: Row
       beforeEach(async () => {
         let [createdRow] = await populatePrimaryRows(1, {
-          createForeignRow: true,
+          createOne2Many: true,
         })
         row = createdRow.row
         foreignRow = createdRow.foreignRow!
@@ -437,16 +479,10 @@ describe("row api - postgres", () => {
           ...row,
           _id: expect.any(String),
           _rev: expect.any(String),
+          [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]: foreignRow.id,
         })
 
-        expect(res.body.foreignField).toBeUndefined()
-
-        expect(
-          res.body[`fk_${auxPostgresTable.name}_foreignField`]
-        ).toBeDefined()
-        expect(res.body[`fk_${auxPostgresTable.name}_foreignField`]).toBe(
-          foreignRow.id
-        )
+        expect(res.body[o2mInfo.fieldName]).toBeUndefined()
       })
     })
   })
@@ -672,7 +708,7 @@ describe("row api - postgres", () => {
       beforeEach(async () => {
         const rowsInfo = await createPrimaryRow({
           rowData: generateRandomPrimaryRowData(),
-          createForeignRow: true,
+          createForeignRows: { createOne2Many: true },
         })
 
         row = rowsInfo.row
@@ -687,7 +723,7 @@ describe("row api - postgres", () => {
         expect(foreignRow).toBeDefined()
         expect(res.body).toEqual({
           ...row,
-          linkedField: [
+          [o2mInfo.fieldName]: [
             {
               ...foreignRow,
             },

From 70689c03690ba9440df4c0f8bee3c0d7ceaa074d Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 23 Feb 2023 00:06:57 +0100
Subject: [PATCH 108/273] Fix tests

---
 .../src/integration-test/postgres.spec.ts     | 257 ++++++++++++++----
 1 file changed, 204 insertions(+), 53 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index cc8760023f..1707e596fd 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -23,19 +23,25 @@ jest.setTimeout(30000)
 
 jest.unmock("pg")
 
-interface RandomForeignKeyConfig {
-  createOne2Many?: boolean
-  createMany2One?: number
-  createMany2Many?: number
+interface ForeignTableInfo {
+  table: Table
+  fieldName: string
+  relationshipType: RelationshipTypes
+}
+
+interface ForeignRowsInfo {
+  row: Row
+  foreignKey: string
+  relationshipType: RelationshipTypes
 }
 
 describe("row api - postgres", () => {
   let makeRequest: MakeRequestResponse,
     postgresDatasource: Datasource,
     primaryPostgresTable: Table,
-    o2mInfo: { table: Table; fieldName: string },
-    m2oInfo: { table: Table; fieldName: string },
-    m2mInfo: { table: Table; fieldName: string }
+    o2mInfo: ForeignTableInfo,
+    m2oInfo: ForeignTableInfo,
+    m2mInfo: ForeignTableInfo
 
   let host: string
   let port: number
@@ -103,14 +109,17 @@ describe("row api - postgres", () => {
     o2mInfo = {
       table: await createAuxTable("o2m"),
       fieldName: "oneToManyRelation",
+      relationshipType: RelationshipTypes.ONE_TO_MANY,
     }
     m2oInfo = {
       table: await createAuxTable("m2o"),
       fieldName: "manyToOneRelation",
+      relationshipType: RelationshipTypes.MANY_TO_ONE,
     }
     m2mInfo = {
       table: await createAuxTable("m2m"),
       fieldName: "manyToManyRelation",
+      relationshipType: RelationshipTypes.MANY_TO_MANY,
     }
 
     primaryPostgresTable = await config.createTable({
@@ -196,21 +205,43 @@ describe("row api - postgres", () => {
 
   async function createPrimaryRow(opts: {
     rowData: PrimaryRowData
-    createForeignRows?: RandomForeignKeyConfig
+    createForeignRows?: {
+      createOne2Many?: boolean
+      createMany2One?: number
+      createMany2Many?: number
+    }
   }) {
     let { rowData } = opts
-    let foreignRow: Row | undefined
+    let foreignRows: ForeignRowsInfo[] = []
 
-    if (opts?.createForeignRows?.createOne2Many) {
-      foreignRow = await config.createRow({
-        tableId: o2mInfo.table._id,
+    async function createForeignRow(tableInfo: ForeignTableInfo) {
+      const foreignRow = await config.createRow({
+        tableId: tableInfo.table._id,
         title: generator.name(),
       })
 
+      const foreignKey = `fk_${tableInfo.table.name}_${tableInfo.fieldName}`
       rowData = {
         ...rowData,
-        [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]: foreignRow.id,
+        [foreignKey]: foreignRow.id,
       }
+      foreignRows.push({
+        row: foreignRow,
+        foreignKey,
+        relationshipType: tableInfo.relationshipType,
+      })
+    }
+
+    if (opts?.createForeignRows?.createOne2Many) {
+      await createForeignRow(o2mInfo)
+    }
+
+    for (let i = 0; i < (opts?.createForeignRows?.createMany2One || 0); i++) {
+      await createForeignRow(m2oInfo)
+    }
+
+    for (let i = 0; i < (opts?.createForeignRows?.createMany2Many || 0); i++) {
+      await createForeignRow(m2mInfo)
     }
 
     const row = await config.createRow({
@@ -218,7 +249,7 @@ describe("row api - postgres", () => {
       ...rowData,
     })
 
-    return { row, foreignRow }
+    return { row, foreignRows }
   }
 
   async function createDefaultPgTable() {
@@ -241,7 +272,11 @@ describe("row api - postgres", () => {
 
   async function populatePrimaryRows(
     count: number,
-    opts?: RandomForeignKeyConfig
+    opts?: {
+      createOne2Many?: boolean
+      createMany2One?: number
+      createMany2Many?: number
+    }
   ) {
     return await Promise.all(
       Array(count)
@@ -461,28 +496,134 @@ describe("row api - postgres", () => {
 
     describe("given a row with relation data", () => {
       let row: Row
-      let foreignRow: Row
-      beforeEach(async () => {
-        let [createdRow] = await populatePrimaryRows(1, {
-          createOne2Many: true,
+      let rowData: {
+        name: string
+        description: string
+        value: number
+      }
+      let foreignRows: ForeignRowsInfo[]
+
+      describe("with all relationship types", () => {
+        beforeEach(async () => {
+          let [createdRow] = await populatePrimaryRows(1, {
+            createOne2Many: true,
+            createMany2One: 3,
+            createMany2Many: 2,
+          })
+          row = createdRow.row
+          rowData = createdRow.rowData
+          foreignRows = createdRow.foreignRows
+        })
+
+        it("only one to many foreign keys are retrieved", async () => {
+          const res = await getRow(primaryPostgresTable._id, row.id)
+
+          expect(res.status).toBe(200)
+
+          const one2ManyForeignRows = foreignRows.filter(
+            x => x.relationshipType === RelationshipTypes.ONE_TO_MANY
+          )
+          expect(one2ManyForeignRows).toHaveLength(1)
+
+          expect(res.body).toEqual({
+            ...rowData,
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+            [one2ManyForeignRows[0].foreignKey]: one2ManyForeignRows[0].row.id,
+          })
+
+          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
         })
-        row = createdRow.row
-        foreignRow = createdRow.foreignRow!
       })
 
-      it("only foreign keys are retrieved", async () => {
-        const res = await getRow(primaryPostgresTable._id, row.id)
-
-        expect(res.status).toBe(200)
-
-        expect(res.body).toEqual({
-          ...row,
-          _id: expect.any(String),
-          _rev: expect.any(String),
-          [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]: foreignRow.id,
+      describe("with only one to many", () => {
+        beforeEach(async () => {
+          let [createdRow] = await populatePrimaryRows(1, {
+            createOne2Many: true,
+          })
+          row = createdRow.row
+          rowData = createdRow.rowData
+          foreignRows = createdRow.foreignRows
         })
 
-        expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+        it("only one to many foreign keys are retrieved", async () => {
+          const res = await getRow(primaryPostgresTable._id, row.id)
+
+          expect(res.status).toBe(200)
+
+          expect(foreignRows).toHaveLength(1)
+
+          expect(res.body).toEqual({
+            ...rowData,
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+            [foreignRows[0].foreignKey]: foreignRows[0].row.id,
+          })
+
+          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+        })
+      })
+
+      describe("with only many to one", () => {
+        beforeEach(async () => {
+          let [createdRow] = await populatePrimaryRows(1, {
+            createMany2One: 3,
+          })
+          row = createdRow.row
+          rowData = createdRow.rowData
+          foreignRows = createdRow.foreignRows
+        })
+
+        it("only one to many foreign keys are retrieved", async () => {
+          const res = await getRow(primaryPostgresTable._id, row.id)
+
+          expect(res.status).toBe(200)
+
+          expect(foreignRows).toHaveLength(3)
+
+          expect(res.body).toEqual({
+            ...rowData,
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+          })
+
+          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+        })
+      })
+
+      describe("with only many to many", () => {
+        beforeEach(async () => {
+          let [createdRow] = await populatePrimaryRows(1, {
+            createMany2Many: 2,
+          })
+          row = createdRow.row
+          rowData = createdRow.rowData
+          foreignRows = createdRow.foreignRows
+        })
+
+        it("only one to many foreign keys are retrieved", async () => {
+          const res = await getRow(primaryPostgresTable._id, row.id)
+
+          expect(res.status).toBe(200)
+
+          expect(foreignRows).toHaveLength(2)
+
+          expect(res.body).toEqual({
+            ...rowData,
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+          })
+
+          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+        })
       })
     })
   })
@@ -703,31 +844,41 @@ describe("row api - postgres", () => {
     const getAll = (tableId: string | undefined, rowId: string | undefined) =>
       makeRequest("get", `/api/${tableId}/${rowId}/enrich`)
     describe("given a row with relation data", () => {
-      let row: Row, foreignRow: Row | undefined
+      let row: Row, rowData: PrimaryRowData, foreignRows: ForeignRowsInfo[]
 
-      beforeEach(async () => {
-        const rowsInfo = await createPrimaryRow({
-          rowData: generateRandomPrimaryRowData(),
-          createForeignRows: { createOne2Many: true },
+      describe("only with one to many data", () => {
+        beforeEach(async () => {
+          rowData = generateRandomPrimaryRowData()
+          const rowsInfo = await createPrimaryRow({
+            rowData,
+            createForeignRows: { createOne2Many: true },
+          })
+
+          row = rowsInfo.row
+          foreignRows = rowsInfo.foreignRows
         })
 
-        row = rowsInfo.row
-        foreignRow = rowsInfo.foreignRow
-      })
+        it("enrich populates the foreign field", async () => {
+          const res = await getAll(primaryPostgresTable._id, row.id)
 
-      it("enrich populates the foreign field", async () => {
-        const res = await getAll(primaryPostgresTable._id, row.id)
+          expect(res.status).toBe(200)
 
-        expect(res.status).toBe(200)
-
-        expect(foreignRow).toBeDefined()
-        expect(res.body).toEqual({
-          ...row,
-          [o2mInfo.fieldName]: [
-            {
-              ...foreignRow,
-            },
-          ],
+          expect(foreignRows).toHaveLength(1)
+          expect(res.body).toEqual({
+            ...rowData,
+            [foreignRows[0].foreignKey]: foreignRows[0].row.id,
+            [o2mInfo.fieldName]: [
+              {
+                ...foreignRows[0].row,
+                _id: expect.any(String),
+                _rev: expect.any(String),
+              },
+            ],
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+          })
         })
       })
     })
@@ -750,7 +901,7 @@ describe("row api - postgres", () => {
       const rowsCount = 6
       let rows: {
         row: Row
-        foreignRow: Row | undefined
+        foreignRows: ForeignRowsInfo[]
         rowData: PrimaryRowData
       }[]
       beforeEach(async () => {

From 8047a0fc4cc5f7d198705ccc24554c551984b337 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 23 Feb 2023 08:09:18 +0000
Subject: [PATCH 109/273] Fix error being thrown when attempting to change
 query parameters (#9782)

---
 .../controls/ButtonActionEditor/actions/ExecuteQuery.svelte | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 840a639fb4..ba72fd2ed7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -20,6 +20,12 @@
     x =>
       x._id !== BUDIBASE_INTERNAL_DB_ID && x.type !== BUDIBASE_DATASOURCE_TYPE
   )
+  // Ensure query params exist so they can be bound
+  $: {
+    if (!parameters.queryParams) {
+      parameters.queryParams = {}
+    }
+  }
 
   function fetchQueryDefinition(query) {
     const source = $datasources.list.find(

From 9e0d003038b594219abaa130d77807145541c47f Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 23 Feb 2023 10:28:24 +0100
Subject: [PATCH 110/273] Fix creation

---
 packages/server/src/api/controllers/row/ExternalRequest.ts | 1 +
 packages/server/src/integrations/base/sql.ts               | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 79a598edf0..74d48cb93e 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -741,6 +741,7 @@ export class ExternalRequest {
         table,
       },
     }
+
     // can't really use response right now
     const response = await getDatasourceAndQuery(json)
     // handle many to many relationships now if we know the ID (could be auto increment)
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index c722891910..6871d7b0ba 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -415,9 +415,7 @@ class InternalBuilder {
     if (opts.disableReturning) {
       return query.insert(parsedBody)
     } else {
-      return query
-        .insert(parsedBody)
-        .returning(generateSelectStatement(json, knex))
+      return query.insert(parsedBody).returning("*")
     }
   }
 

From 7868fc657d5bf31c4cc7a9bef5eb2b77bfb2bf34 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 23 Feb 2023 10:39:16 +0100
Subject: [PATCH 111/273] Fix many-to-one tests

---
 .../src/integration-test/postgres.spec.ts     | 115 +++++++++++++++---
 1 file changed, 95 insertions(+), 20 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 1707e596fd..b9f356ded1 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -23,18 +23,6 @@ jest.setTimeout(30000)
 
 jest.unmock("pg")
 
-interface ForeignTableInfo {
-  table: Table
-  fieldName: string
-  relationshipType: RelationshipTypes
-}
-
-interface ForeignRowsInfo {
-  row: Row
-  foreignKey: string
-  relationshipType: RelationshipTypes
-}
-
 describe("row api - postgres", () => {
   let makeRequest: MakeRequestResponse,
     postgresDatasource: Datasource,
@@ -86,10 +74,12 @@ describe("row api - postgres", () => {
         name: `${prefix}_${generator.word({ length: 6 })}`,
         type: "external",
         primary: ["id"],
+        primaryDisplay: "title",
         schema: {
           id: {
             name: "id",
             type: FieldType.AUTO,
+            autocolumn: true,
             constraints: {
               presence: true,
             },
@@ -130,6 +120,7 @@ describe("row api - postgres", () => {
         id: {
           name: "id",
           type: FieldType.AUTO,
+          autocolumn: true,
           constraints: {
             presence: true,
           },
@@ -159,6 +150,7 @@ describe("row api - postgres", () => {
           name: "oneToManyRelation",
           relationshipType: RelationshipTypes.ONE_TO_MANY,
           tableId: o2mInfo.table._id,
+          main: true,
         },
         manyToOneRelation: {
           type: FieldType.LINK,
@@ -170,6 +162,7 @@ describe("row api - postgres", () => {
           name: "manyToOneRelation",
           relationshipType: RelationshipTypes.MANY_TO_ONE,
           tableId: m2oInfo.table._id,
+          main: true,
         },
         manyToManyRelation: {
           type: FieldType.LINK,
@@ -181,6 +174,7 @@ describe("row api - postgres", () => {
           name: "manyToManyRelation",
           relationshipType: RelationshipTypes.MANY_TO_MANY,
           tableId: m2mInfo.table._id,
+          main: true,
         },
       },
       sourceId: postgresDatasource._id,
@@ -203,6 +197,17 @@ describe("row api - postgres", () => {
     value: number
   }
 
+  type ForeignTableInfo = {
+    table: Table
+    fieldName: string
+    relationshipType: RelationshipTypes
+  }
+
+  type ForeignRowsInfo = {
+    row: Row
+    relationshipType: RelationshipTypes
+  }
+
   async function createPrimaryRow(opts: {
     rowData: PrimaryRowData
     createForeignRows?: {
@@ -211,33 +216,61 @@ describe("row api - postgres", () => {
       createMany2Many?: number
     }
   }) {
-    let { rowData } = opts
+    let { rowData } = opts as any
     let foreignRows: ForeignRowsInfo[] = []
 
     async function createForeignRow(tableInfo: ForeignTableInfo) {
+      const foreignKey = `fk_${tableInfo.table.name}_${tableInfo.fieldName}`
+
       const foreignRow = await config.createRow({
         tableId: tableInfo.table._id,
         title: generator.name(),
       })
 
-      const foreignKey = `fk_${tableInfo.table.name}_${tableInfo.fieldName}`
       rowData = {
         ...rowData,
         [foreignKey]: foreignRow.id,
       }
       foreignRows.push({
         row: foreignRow,
-        foreignKey,
+
         relationshipType: tableInfo.relationshipType,
       })
     }
 
     if (opts?.createForeignRows?.createOne2Many) {
-      await createForeignRow(o2mInfo)
+      const foreignKey = `fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`
+
+      const foreignRow = await config.createRow({
+        tableId: o2mInfo.table._id,
+        title: generator.name(),
+      })
+
+      rowData = {
+        ...rowData,
+        [foreignKey]: foreignRow.id,
+      }
+      foreignRows.push({
+        row: foreignRow,
+        relationshipType: o2mInfo.relationshipType,
+      })
     }
 
     for (let i = 0; i < (opts?.createForeignRows?.createMany2One || 0); i++) {
-      await createForeignRow(m2oInfo)
+      const foreignRow = await config.createRow({
+        tableId: m2oInfo.table._id,
+        title: generator.name(),
+      })
+
+      rowData = {
+        ...rowData,
+        [m2oInfo.fieldName]: rowData[m2oInfo.fieldName] || [],
+      }
+      rowData[m2oInfo.fieldName].push(foreignRow._id)
+      foreignRows.push({
+        row: foreignRow,
+        relationshipType: RelationshipTypes.MANY_TO_ONE,
+      })
     }
 
     for (let i = 0; i < (opts?.createForeignRows?.createMany2Many || 0); i++) {
@@ -531,7 +564,8 @@ describe("row api - postgres", () => {
             tableId: row.tableId,
             _id: expect.any(String),
             _rev: expect.any(String),
-            [one2ManyForeignRows[0].foreignKey]: one2ManyForeignRows[0].row.id,
+            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+              one2ManyForeignRows[0].row.id,
           })
 
           expect(res.body[o2mInfo.fieldName]).toBeUndefined()
@@ -561,7 +595,8 @@ describe("row api - postgres", () => {
             tableId: row.tableId,
             _id: expect.any(String),
             _rev: expect.any(String),
-            [foreignRows[0].foreignKey]: foreignRows[0].row.id,
+            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+              foreignRows[0].row.id,
           })
 
           expect(res.body[o2mInfo.fieldName]).toBeUndefined()
@@ -866,7 +901,8 @@ describe("row api - postgres", () => {
           expect(foreignRows).toHaveLength(1)
           expect(res.body).toEqual({
             ...rowData,
-            [foreignRows[0].foreignKey]: foreignRows[0].row.id,
+            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+              foreignRows[0].row.id,
             [o2mInfo.fieldName]: [
               {
                 ...foreignRows[0].row,
@@ -881,6 +917,45 @@ describe("row api - postgres", () => {
           })
         })
       })
+
+      describe("only with many to one data", () => {
+        beforeEach(async () => {
+          rowData = generateRandomPrimaryRowData()
+          const rowsInfo = await createPrimaryRow({
+            rowData,
+            createForeignRows: {
+              createMany2One: 2,
+            },
+          })
+
+          row = rowsInfo.row
+          foreignRows = rowsInfo.foreignRows
+        })
+
+        it("enrich populates the foreign field", async () => {
+          const res = await getAll(primaryPostgresTable._id, row.id)
+
+          expect(res.status).toBe(200)
+
+          expect(res.body).toEqual({
+            ...rowData,
+            [m2oInfo.fieldName]: [
+              {
+                ...foreignRows[0].row,
+                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+              },
+              {
+                ...foreignRows[1].row,
+                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+              },
+            ],
+            id: row.id,
+            tableId: row.tableId,
+            _id: expect.any(String),
+            _rev: expect.any(String),
+          })
+        })
+      })
     })
   })
 

From 5207f5108035d01cfed3ab4f0f9d242d9149f8fa Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Thu, 23 Feb 2023 10:50:18 +0100
Subject: [PATCH 112/273] Test enrich for all relationship types

---
 .../src/integration-test/postgres.spec.ts     | 91 ++++++++++---------
 1 file changed, 47 insertions(+), 44 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index b9f356ded1..df0e4bac15 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -274,7 +274,20 @@ describe("row api - postgres", () => {
     }
 
     for (let i = 0; i < (opts?.createForeignRows?.createMany2Many || 0); i++) {
-      await createForeignRow(m2mInfo)
+      const foreignRow = await config.createRow({
+        tableId: m2mInfo.table._id,
+        title: generator.name(),
+      })
+
+      rowData = {
+        ...rowData,
+        [m2mInfo.fieldName]: rowData[m2mInfo.fieldName] || [],
+      }
+      rowData[m2mInfo.fieldName].push(foreignRow._id)
+      foreignRows.push({
+        row: foreignRow,
+        relationshipType: RelationshipTypes.MANY_TO_MANY,
+      })
     }
 
     const row = await config.createRow({
@@ -513,7 +526,7 @@ describe("row api - postgres", () => {
       let rows: { row: Row; rowData: PrimaryRowData }[]
 
       beforeEach(async () => {
-        rows = await populatePrimaryRows(10)
+        rows = await populatePrimaryRows(5)
       })
 
       it("a single row can be retrieved successfully", async () => {
@@ -881,50 +894,15 @@ describe("row api - postgres", () => {
     describe("given a row with relation data", () => {
       let row: Row, rowData: PrimaryRowData, foreignRows: ForeignRowsInfo[]
 
-      describe("only with one to many data", () => {
-        beforeEach(async () => {
-          rowData = generateRandomPrimaryRowData()
-          const rowsInfo = await createPrimaryRow({
-            rowData,
-            createForeignRows: { createOne2Many: true },
-          })
-
-          row = rowsInfo.row
-          foreignRows = rowsInfo.foreignRows
-        })
-
-        it("enrich populates the foreign field", async () => {
-          const res = await getAll(primaryPostgresTable._id, row.id)
-
-          expect(res.status).toBe(200)
-
-          expect(foreignRows).toHaveLength(1)
-          expect(res.body).toEqual({
-            ...rowData,
-            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
-              foreignRows[0].row.id,
-            [o2mInfo.fieldName]: [
-              {
-                ...foreignRows[0].row,
-                _id: expect.any(String),
-                _rev: expect.any(String),
-              },
-            ],
-            id: row.id,
-            tableId: row.tableId,
-            _id: expect.any(String),
-            _rev: expect.any(String),
-          })
-        })
-      })
-
-      describe("only with many to one data", () => {
+      describe("with all relationship types", () => {
         beforeEach(async () => {
           rowData = generateRandomPrimaryRowData()
           const rowsInfo = await createPrimaryRow({
             rowData,
             createForeignRows: {
-              createMany2One: 2,
+              createOne2Many: true,
+              createMany2One: 3,
+              createMany2Many: 2,
             },
           })
 
@@ -932,22 +910,47 @@ describe("row api - postgres", () => {
           foreignRows = rowsInfo.foreignRows
         })
 
-        it("enrich populates the foreign field", async () => {
+        it("enrich populates the foreign fields", async () => {
           const res = await getAll(primaryPostgresTable._id, row.id)
 
           expect(res.status).toBe(200)
 
+          const foreignRowsByType = _.groupBy(
+            foreignRows,
+            x => x.relationshipType
+          )
           expect(res.body).toEqual({
             ...rowData,
+            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+              foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row.id,
+            [o2mInfo.fieldName]: [
+              {
+                ...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
+                _id: expect.any(String),
+                _rev: expect.any(String),
+              },
+            ],
             [m2oInfo.fieldName]: [
               {
-                ...foreignRows[0].row,
+                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][0].row,
                 [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
               },
               {
-                ...foreignRows[1].row,
+                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][1].row,
                 [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
               },
+              {
+                ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][2].row,
+                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+              },
+            ],
+            [m2mInfo.fieldName]: [
+              {
+                ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
+              },
+              {
+                ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][1].row,
+              },
             ],
             id: row.id,
             tableId: row.tableId,

From b4c88bd545b1edea79f95deded40b35ae96c86e1 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 23 Feb 2023 10:38:03 +0000
Subject: [PATCH 113/273] Merge commit to dev

---
 packages/types/src/api/web/user.ts            |   1 +
 .../src/api/controllers/global/users.ts       | 119 +++++++++++++++++-
 packages/worker/src/sdk/users/users.ts        |   6 +-
 packages/worker/src/utilities/redis.ts        |  40 ++++++
 4 files changed, 159 insertions(+), 7 deletions(-)

diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index 6acaf6912d..18f98048c4 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -16,6 +16,7 @@ export interface BulkUserRequest {
     userIds: string[]
   }
   create?: {
+    roles?: any[]
     users: User[]
     groups: any[]
   }
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 817480151d..f8cb4b2103 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -1,4 +1,8 @@
-import { checkInviteCode } from "../../../utilities/redis"
+import {
+  checkInviteCode,
+  getInviteCodes,
+  updateInviteCode,
+} from "../../../utilities/redis"
 import sdk from "../../../sdk"
 import env from "../../../environment"
 import {
@@ -6,7 +10,6 @@ import {
   BulkUserResponse,
   CloudAccount,
   CreateAdminUserRequest,
-  InviteUserRequest,
   InviteUsersRequest,
   SearchUsersRequest,
   User,
@@ -19,6 +22,7 @@ import {
   tenancy,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
+import { isEmailConfigured } from "src/utilities/email"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 
@@ -186,9 +190,54 @@ export const tenantUserLookup = async (ctx: any) => {
   }
 }
 
+/* 
+  Encapsulate the app user onboarding flows here.
+*/
+export const onboardUsers = async (ctx: any) => {
+  const request = ctx.request.body as InviteUsersRequest | BulkUserRequest
+  const isBulkCreate = "create" in request
+
+  const emailConfigured = await isEmailConfigured()
+
+  let onboardingResponse
+
+  if (isBulkCreate) {
+    // @ts-ignore
+    const { users, groups, roles } = request.create
+    const assignUsers = users.map((user: User) => (user.roles = roles))
+    onboardingResponse = await sdk.users.bulkCreate(assignUsers, groups)
+    ctx.body = onboardingResponse
+  } else if (emailConfigured) {
+    onboardingResponse = await invite(ctx)
+  } else if (!emailConfigured) {
+    const inviteRequest = ctx.request.body as InviteUsersRequest
+    const users: User[] = inviteRequest.map(invite => {
+      let password = Math.random().toString(36).substring(2, 22)
+
+      return {
+        email: invite.email,
+        password,
+        forceResetPassword: true,
+        roles: invite.userInfo.apps,
+        admin: { global: false },
+        builder: { global: false },
+        tenantId: tenancy.getTenantId(),
+      }
+    })
+    let bulkCreateReponse = await sdk.users.bulkCreate(users, [])
+    onboardingResponse = {
+      ...bulkCreateReponse,
+      created: true,
+    }
+    ctx.body = onboardingResponse
+  } else {
+    ctx.throw(400, "User onboarding failed")
+  }
+}
+
 export const invite = async (ctx: any) => {
-  const request = ctx.request.body as InviteUserRequest
-  const response = await sdk.users.invite([request])
+  const request = ctx.request.body as InviteUsersRequest
+  const response = await sdk.users.invite(request)
 
   // explicitly throw for single user invite
   if (response.unsuccessful.length) {
@@ -202,6 +251,8 @@ export const invite = async (ctx: any) => {
 
   ctx.body = {
     message: "Invitation has been sent.",
+    successful: response.successful,
+    unsuccessful: response.unsuccessful,
   }
 }
 
@@ -223,19 +274,75 @@ export const checkInvite = async (ctx: any) => {
   }
 }
 
+export const getUserInvites = async (ctx: any) => {
+  let invites
+  try {
+    // Restricted to the currently authenticated tenant
+    invites = await getInviteCodes([ctx.user.tenantId])
+  } catch (e) {
+    ctx.throw(400, "There was a problem fetching invites")
+  }
+  ctx.body = invites
+}
+
+export const updateInvite = async (ctx: any) => {
+  const { code } = ctx.params
+  let updateBody = { ...ctx.request.body }
+
+  delete updateBody.email
+
+  let invite
+  try {
+    invite = await checkInviteCode(code, false)
+    if (!invite) {
+      throw new Error("The invite could not be retrieved")
+    }
+  } catch (e) {
+    ctx.throw(400, "There was a problem with the invite")
+  }
+
+  let updated = {
+    ...invite,
+  }
+
+  if (!updateBody?.apps || !Object.keys(updateBody?.apps).length) {
+    updated.info.apps = []
+  } else {
+    updated.info = {
+      ...invite.info,
+      apps: {
+        ...invite.info.apps,
+        ...updateBody.apps,
+      },
+    }
+  }
+
+  await updateInviteCode(code, updated)
+  ctx.body = { ...invite }
+}
+
 export const inviteAccept = async (ctx: any) => {
   const { inviteCode, password, firstName, lastName } = ctx.request.body
   try {
     // info is an extension of the user object that was stored by global
     const { email, info }: any = await checkInviteCode(inviteCode)
     ctx.body = await tenancy.doInTenant(info.tenantId, async () => {
-      const saved = await sdk.users.save({
+      let request = {
         firstName,
         lastName,
         password,
         email,
+        roles: info.apps,
+      }
+
+      delete info.apps
+
+      request = {
+        ...request,
         ...info,
-      })
+      }
+
+      const saved = await sdk.users.save(request)
       const db = tenancy.getGlobalDB()
       const user = await db.get(saved._id)
       await events.user.inviteAccepted(user)
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 5124a5c5b1..db49e801c3 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -203,7 +203,7 @@ export const save = async (
   const tenantId = tenancy.getTenantId()
   const db = tenancy.getGlobalDB()
 
-  let { email, _id, userGroups = [] } = user
+  let { email, _id, userGroups = [], roles } = user
 
   if (!email && !_id) {
     throw new Error("_id or email is required")
@@ -245,6 +245,10 @@ export const save = async (
     builtUser.roles = dbUser.roles
   }
 
+  if (!dbUser && roles?.length) {
+    builtUser.roles = { ...roles }
+  }
+
   // make sure we set the _id field for a new user
   // Also if this is a new user, associate groups with them
   let groupPromises = []
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index 893ec9f0a8..a05b043054 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -29,6 +29,20 @@ async function writeACode(db: string, value: any) {
   return code
 }
 
+async function updateACode(db: string, code: string, value: any) {
+  const client = await getClient(db)
+  await client.store(code, value, getExpirySecondsForDB(db))
+}
+
+/**
+ * Given an invite code and invite body, allow the update an existing/valid invite in redis
+ * @param {string} inviteCode The invite code for an invite in redis
+ * @param {object} value The body of the updated user invitation
+ */
+export async function updateInviteCode(inviteCode: string, value: string) {
+  await updateACode(redis.utils.Databases.INVITATIONS, inviteCode, value)
+}
+
 async function getACode(db: string, code: string, deleteCode = true) {
   const client = await getClient(db)
   const value = await client.get(code)
@@ -111,3 +125,29 @@ export async function checkInviteCode(
     throw "Invitation is not valid or has expired, please request a new one."
   }
 }
+
+/** 
+  Get all currently available user invitations.
+  @return {Object[]} A
+**/
+export async function getInviteCodes(
+  tenantIds?: string[] //should default to the current tenant of the user session.
+) {
+  const client = await getClient(redis.utils.Databases.INVITATIONS)
+  const invites: any[] = await client.scan()
+
+  const results = invites.map(invite => {
+    return {
+      ...invite.value,
+      code: invite.key,
+    }
+  })
+  return results.reduce((acc, invite) => {
+    if (tenantIds?.length && tenantIds.includes(invite.info.tenantId)) {
+      acc.push(invite)
+    } else {
+      acc.push(invite)
+    }
+    return acc
+  }, [])
+}

From 6efb0f4997986a419952996c0f1edd8e42c4a6c8 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 10:57:50 +0000
Subject: [PATCH 114/273] update table width

---
 .../builder/portal/account/auditLogs/index.svelte    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 944ed87d1a..34c50f3354 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -1,3 +1,7 @@
+<!-- If working on this file, you may notice that if you click the download button in the UI
+     hot reload will stop working due to the use of window.location. You'll need to reload the pag
+     to get it working again.
+-->
 <script>
   import {
     Layout,
@@ -24,10 +28,10 @@
   import { cloneDeep } from "lodash"
 
   const schema = {
-    date: { width: "0.8fr" },
-    user: { width: "0.5fr" },
-    app: { width: "0.75fr", fieldName: "name" },
-    name: { width: "1.5fr" },
+    date: { width: "auto" },
+    user: { width: "auto" },
+    app: { width: "auto" },
+    name: { width: "0.8fr" },
     view: { width: "auto", borderLeft: true, displayName: "" },
   }
 

From 0bc340052c394c0ad20ca557246a61259f79ed46 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 23 Feb 2023 11:28:18 +0000
Subject: [PATCH 115/273] Adding the ability to cleanup users from get
 functions (default is old behaviour).

---
 packages/backend-core/src/users.ts | 67 +++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index ef76af390d..4c1c9ad464 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -10,14 +10,35 @@ import { BulkDocsResponse, User } from "@budibase/types"
 import { getGlobalDB } from "./context"
 import * as context from "./context"
 
-export const bulkGetGlobalUsersById = async (userIds: string[]) => {
+type GetOpts = { cleanup?: boolean }
+
+function cleanupUsers(users: User | User[]) {
+  if (Array.isArray(users)) {
+    return users.map(user => {
+      delete user.password
+      return user
+    })
+  } else {
+    delete users.password
+    return users
+  }
+}
+
+export const bulkGetGlobalUsersById = async (
+  userIds: string[],
+  opts?: GetOpts
+) => {
   const db = getGlobalDB()
-  return (
+  let users = (
     await db.allDocs({
       keys: userIds,
       include_docs: true,
     })
   ).rows.map(row => row.doc) as User[]
+  if (opts?.cleanup) {
+    users = cleanupUsers(users) as User[]
+  }
+  return users
 }
 
 export const bulkUpdateGlobalUsers = async (users: User[]) => {
@@ -25,9 +46,13 @@ export const bulkUpdateGlobalUsers = async (users: User[]) => {
   return (await db.bulkDocs(users)) as BulkDocsResponse
 }
 
-export async function getById(id: string): Promise<User> {
+export async function getById(id: string, opts?: GetOpts): Promise<User> {
   const db = context.getGlobalDB()
-  return db.get(id)
+  let user = await db.get(id)
+  if (opts?.cleanup) {
+    user = cleanupUsers(user)
+  }
+  return user
 }
 
 /**
@@ -36,7 +61,8 @@ export async function getById(id: string): Promise<User> {
  * @param {string} email the email to lookup the user by.
  */
 export const getGlobalUserByEmail = async (
-  email: String
+  email: String,
+  opts?: GetOpts
 ): Promise<User | undefined> => {
   if (email == null) {
     throw "Must supply an email address to view"
@@ -52,10 +78,19 @@ export const getGlobalUserByEmail = async (
     throw new Error(`Multiple users found with email address: ${email}`)
   }
 
-  return response
+  let user = response as User
+  if (opts?.cleanup) {
+    user = cleanupUsers(user) as User
+  }
+
+  return user
 }
 
-export const searchGlobalUsersByApp = async (appId: any, opts: any) => {
+export const searchGlobalUsersByApp = async (
+  appId: any,
+  opts: any,
+  getOpts?: GetOpts
+) => {
   if (typeof appId !== "string") {
     throw new Error("Must provide a string based app ID")
   }
@@ -67,7 +102,11 @@ export const searchGlobalUsersByApp = async (appId: any, opts: any) => {
   if (!response) {
     response = []
   }
-  return Array.isArray(response) ? response : [response]
+  let users: User[] = Array.isArray(response) ? response : [response]
+  if (getOpts?.cleanup) {
+    users = cleanupUsers(users) as User[]
+  }
+  return users
 }
 
 export const getGlobalUserByAppPage = (appId: string, user: User) => {
@@ -80,7 +119,11 @@ export const getGlobalUserByAppPage = (appId: string, user: User) => {
 /**
  * Performs a starts with search on the global email view.
  */
-export const searchGlobalUsersByEmail = async (email: string, opts: any) => {
+export const searchGlobalUsersByEmail = async (
+  email: string,
+  opts: any,
+  getOpts?: GetOpts
+) => {
   if (typeof email !== "string") {
     throw new Error("Must provide a string to search by")
   }
@@ -95,5 +138,9 @@ export const searchGlobalUsersByEmail = async (email: string, opts: any) => {
   if (!response) {
     response = []
   }
-  return Array.isArray(response) ? response : [response]
+  let users: User[] = Array.isArray(response) ? response : [response]
+  if (getOpts?.cleanup) {
+    users = cleanupUsers(users) as User[]
+  }
+  return users
 }

From 4c70b7fd9b9f5ece06df8437349d9ed7fc44857c Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Thu, 23 Feb 2023 12:06:55 +0000
Subject: [PATCH 116/273] Improve Add Screen Modal (#9759)

* Improve Add Screen Modal

* lint

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
---
 .../screens/_components/NewScreenModal.svelte |  80 ++++++++++++------
 .../_components/blankScreenPreview.png        | Bin 0 -> 71063 bytes
 .../screens/_components/listScreenPreview.png | Bin 0 -> 108488 bytes
 3 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/blankScreenPreview.png
 create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/listScreenPreview.png

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
index b5cd28c702..e3a974b344 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
@@ -1,11 +1,13 @@
 <script>
   import { tables } from "stores/backend"
   import { ModalContent, Body, Layout, Icon, Heading } from "@budibase/bbui"
+  import blankScreenPreview from "./blankScreenPreview.png"
+  import listScreenPreview from "./listScreenPreview.png"
 
   export let onConfirm
   export let onCancel
 
-  let autoCreateModeKey = "autoCreate"
+  let listScreenModeKey = "autoCreate"
   let blankScreenModeKey = "blankScreen"
 
   let selectedScreenMode
@@ -23,61 +25,77 @@
     onConfirm={confirmScreenSelection}
     {onCancel}
     disabled={!selectedScreenMode}
-    size="L"
+    size="M"
   >
     <Layout noPadding gap="S">
       <div
-        class="screen-type item"
+        class="screen-type item blankView"
         class:selected={selectedScreenMode == blankScreenModeKey}
         on:click={() => {
           selectedScreenMode = blankScreenModeKey
         }}
       >
         <div class="content screen-type-wrap">
-          <Icon name="WebPage" />
+          <img
+            alt="blank screen preview"
+            class="preview"
+            src={blankScreenPreview}
+          />
           <div class="screen-type-text">
             <Heading size="XS">Blank screen</Heading>
-            <Body size="S">Add a blank screen</Body>
+            <Body size="S">Add an empty blank screen</Body>
           </div>
         </div>
         <div
           style="color: var(--spectrum-global-color-green-600); float: right"
         >
-          {#if selectedScreenMode == blankScreenModeKey}
-            <div class="checkmark-spacing">
-              <Icon size="S" name="CheckmarkCircle" />
-            </div>
-          {/if}
+          <div
+            class={`checkmark-spacing ${
+              selectedScreenMode == blankScreenModeKey ? "visible" : ""
+            }`}
+          >
+            <Icon size="S" name="CheckmarkCircle" />
+          </div>
         </div>
       </div>
 
+      <div class="listViewTitle">
+        <Heading size="XS">Quickly create a screen from your data</Heading>
+      </div>
+
       <div
         class="screen-type item"
-        class:selected={selectedScreenMode == autoCreateModeKey}
+        class:selected={selectedScreenMode == listScreenModeKey}
         on:click={() => {
-          selectedScreenMode = autoCreateModeKey
+          selectedScreenMode = listScreenModeKey
         }}
         class:disabled={!$tables.list.filter(table => table._id !== "ta_users")
           .length}
       >
         <div class="content screen-type-wrap">
-          <Icon name="WebPages" />
+          <img
+            alt="list screen preview"
+            class="preview"
+            src={listScreenPreview}
+          />
           <div class="screen-type-text">
-            <Heading size="XS">Autogenerated screens</Heading>
+            <Heading size="XS">List view</Heading>
             <Body size="S">
-              Add autogenerated screens with CRUD functionality to get a working
-              app quickly! (Requires a datasource)
+              Create, edit and view your data in a list view screen with side
+              panel
             </Body>
           </div>
         </div>
         <div
           style="color: var(--spectrum-global-color-green-600); float: right"
         >
-          {#if selectedScreenMode == autoCreateModeKey}
-            <div class="checkmark-spacing">
-              <Icon size="S" name="CheckmarkCircle" />
-            </div>
-          {/if}
+          <div
+            class={`checkmark-spacing ${
+              selectedScreenMode == listScreenModeKey ? "visible" : ""
+            }`}
+          >
+            <Icon size="S" name="CheckmarkCircle" />
+          </div>
         </div>
       </div>
     </Layout>
@@ -85,9 +103,6 @@
 </div>
 
 <style>
-  .screen-type.item {
-    padding: var(--spectrum-alias-item-padding-xl);
-  }
   .screen-type-wrap {
     display: flex;
     flex-direction: row;
@@ -99,6 +114,7 @@
   }
   .checkmark-spacing {
     margin-right: var(--spacing-m);
+    opacity: 0;
   }
   .content {
     letter-spacing: 0px;
@@ -106,7 +122,6 @@
   .item {
     cursor: pointer;
     grid-gap: var(--spectrum-alias-grid-margin-xsmall);
-    padding: var(--spectrum-alias-item-padding-s);
     background: var(--spectrum-alias-background-color-secondary);
     transition: 0.3s all;
     border: 1px solid var(--spectrum-global-color-gray-300);
@@ -132,4 +147,19 @@
   .screen-type-wrap :global(.spectrum-Heading) {
     padding-bottom: var(--spectrum-alias-item-padding-s);
   }
+  .preview {
+    width: 140px;
+  }
+
+  .listViewTitle {
+    margin-top: 35px;
+  }
+
+  .blankView {
+    margin-top: 10px;
+  }
+
+  .visible {
+    opacity: 1;
+  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/blankScreenPreview.png b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/blankScreenPreview.png
new file mode 100644
index 0000000000000000000000000000000000000000..0511e2f4fe2293df2cd32157a6b54bdeedc8959f
GIT binary patch
literal 71063
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

literal 0
HcmV?d00001

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/listScreenPreview.png b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/listScreenPreview.png
new file mode 100644
index 0000000000000000000000000000000000000000..b98210d90cb42e1a78648a15911e07cff476fc20
GIT binary patch
literal 108488
zcmZ^~1z23Ywm&=+cW7}NiWiC(m%%9oic3p@;_j}46xUL;6sNdT+}+*X-EGjB`RIAi
zz4v_gx&J-Ses(6wFDq+jWl549ru<PB8-ol3003aiy_Zr20A4Tw00^CED9<@Pf?Q7k
z0G7Cgq@=Q(q$IVnqn)XRwFv<5J}f~CRa<R<C|xHmR!jn&nwtKaA@n^uHT^dtF;9Fc
zdO8FNbWS|=<NoXbD`L#~aSi;QkJYrUL_NVim6_Qk5y(xK49LzaTCIF*d~UGEu@v|(
z0k_>%AwWUKdU%gO0ScfY`-PlB1<2@&Dp%k&QY-@YK0xtn&(2Q7Cl!?qKw<~vY-a`A
zuYa)^hpQ9}fzM?R5N}@r#ImVBZtYz;z7|CT==Hpk#{f_dx?jCPHY5!uG?)MChsPef
zfrVTaxA6{nm8C8$!a#Bv!!MjHiDdxb=Sq4RDWQilop~dEOt*<C4JhEIh7631Y)SsY
zsKow*FZp)LEDxIb<AQJG&uc|CJ|i@iT^e>~gidb<9JfVyN;F*8(J41jwB)PCQ2e*<
z{#~pqS8gG8h2R<LQ^McUQW7P|7pSlGZE-n248#X_vmC2P>WPx?V(m*DckiKm6Sqcl
zh-G4=`7)6I8#9m}uZu9?BO#IfCiQHfyFWFEL(`&KE{-_oI%qaue*P^zIGW}AW5RtS
z`$)9en;U&I4E_&3k(%+ONobtNh7l455=h<eLMgARjk@A_jl#JW@B?{YT139}#SAq<
z%Ki!t64gv*Ll0M3OxoGS9VK3hf3q#cbO8$(uE&%1t<a>>q5}QGbp1qa*n@kBcG(w%
zI~v4}hNeDD>BWH8)5q*08jAU3L}26)&d>P4A|@5xF~Fpmw43cdsB*B<T>{}tEQXJ;
z?iW15{LokIgPXxJZ#FxU0_@vS5d08wEAsq>W0Aj|v|zWKf1G%QR4?{|%MZZMl+uA8
zc1eZb+#5i1&M5UF7W8gZf0YFg6bl#ZW-h~_)?L+M0)EF%7yE_TDTdRWG$<Pu+)VG+
z7mE+;5+c^5isVDp`~+{?LtQw-!sOccAS1Z{JxkPF4vP*2Pcl?oN@p2x+tG4v?|u_F
zLu$536?k=LtK=@RPc2OMh0z(`R`Df~yl=SU+x>tC@xd>-&}7VI49mt%SUsP5$Y4F2
zEr7zFct0fQQDUqt)`Vp%(In{N2V~9kylYB%@q1c7lLyH{jP=#k`=68}F7KrikAPP>
zp*%KBYsXpX8PIBQzbLTQ0HkAxS%EnJ>6p%yN+^H_fZ|GF)xB7e!zKKuk!nb5F0+or
zLwG@1_6`>usHB-V;GO?DpDLd{y!Azg`hpNy#Z~tdU1#L*3lvOWd?c*s&^`WujpOZO
zEWhK&Y<HiQutYE)-b(G+ax(~UE-K2wVSgt?>`CG0b87#{=d)*>d_I+h(cZw2uC7|J
zZod!&SbKSBpMQX8^cBZ?-TRk6`S}Z9YP@d&@9|LM+NDT*7{2Vi<Uk$<IElYuLY41e
zuE4QI(rL%3AU{UMUPt3cAN7k^=c>m!ZJ(LK*7FlR$MKfI`}R#4Uobl+nL064WHXWj
zA4rFXE^8P|M@KjyCKXDM;y)}o_<g5e(3o2_@L2L^?2mqrT*QVTVKL9xxqe0h$r)vv
zX|x&%*=&XQpx`WreWZ7YX^})(^!tX+*q@_LC5|S3>`Pw@E(W!VJ#zXL8a5`s+4bY(
z<RuEDH#$g0N)1XdAk^m34B_e8^Cmp%^sJ2G$IsuwT1F^a#}lU7+xT(u>5j&mvK6ts
zPv@fe4zU>*E|d8Z3mt-_^df{KI#xVcf{9)ouNEH%|6^Cnw4%E#-Ak9SSt+-A;vb=(
zx(~XgyKlNhx?gqUY|<Kn!lWh{7k)I$eWzn9^i%)vS$<Jk@MELIA%l;yiUy~OgC@GF
zoF;xDL9u$lvARH>qx4SUpjj2lLfo-jG~Ly}RKI+`&cMjF{I>0-SvW(_&rQX!9AlMT
z)mi03ru;W<Z|u}HG)B}#)N?d~ik#Hv3Qjdd@*l)*a(*WMOe51_l~ydO)wXF`M6c1Y
zv@1|ABAki&slb}amN%=cq;jSP8sC2>OBT|bKa!_0d1#?!&OS46n0Wa1ChSo9knj+7
zn!WJWGM1<0-8|Wss83`GWQt^IWYC|^BPu_?|7`df@y^XMea<^ida`N~V|vpn!Q5s-
z@b^t<^u)-4wP1{BOlyMg&(%`J>Dt*{b2E!1tFu|#xznkMNrwr!@suL9LMQcndE%*>
z$({Y(eYS~}axcl-DUKY25`zE(%#a!ECa&X_ReKSTh`(OSDpkvoXT~+@ga5<A!_YPP
z^%?0piYv+liW(L#$uHi0$}*8<D}Foog>z_^9eH-JYcOZ<6m}g+Eh&VYlpL8nENYf4
zjq8wSmIuN;%B5%FJzU@S&34m>=G`X?$K`DS$&e1iZH`%v&!j$i!FjLqRHsJrPVzEF
zN=7zE!bc#<E8O|X+#^#XT0iTOZ$Bk#N7f`8s8~5H#aR#h8UFLd#$)!fC80(md&avM
zrPyrNbC%+W=IHZL6R$eCe(C`44DXzESgpd6_0mmk(uuN=R+B>0hbDPQK}%}OxNnP3
zA6h3`41PBL46PvLG=(-!5KavaE`<wa7i9z`IfZ`oACeSd$A$iC+BSg(!5w}ZmqzXn
zR_gl&n<^tYdO}MASHD=&%A@k4amYlxoVWJ1*dS~#lCatMbPvjmboZKS>wR6E+<w&0
zG~Cqd)aN&9HMnurq^Jx_4?9sI;eulpsAPpjJsUlU+)r<xhK4#=maOvUsySzkkc?`h
zJ+^IjM{ZV+S9ZG2<!%<Xr*^Ckhi*zCKKo{;eYZ=yxA7)JgN7%DE!S?BNq4|Y@EF8+
z%s2zB{Y3!c;EP4XnipG$bI7Z>T$qDsMc9X!uGr~R-ZbCvUJ_Nk&HZ82z2RWV?~`?!
z#Vx7RHQj00H5(*?Rfn1MjW0&JFF0D46Jq<#<Qr4=>z7iFG+I)t5mnJYDO~t}l28)r
zl0xZB)rTXKt1GYP<tl}Y)_U&ySi_oL*}Y<qvXfI*dM{TX=bk|lTQ6K`wcPK(-KVR-
z_5LLT55teRS8;Xpw=uXBZI<3{;Z`3k2BXktU*&z|2Tgo69PQ5eG0o_}Nco;Vmm%*|
z0oob0t?BeQ#c!cu;Ummz$8(0f7Sk5DMte^5mRMNv_M?6}>}{8jk+h6bo}H<*X?ZN`
z7e?;{!nhjFBOg~|2;|uRSNAWG2Ihvs21OcHmD&QHF@8Hsy^wjmFU+Suj|DttwngQV
zjdeuhK(E^>#mHg(b#gYjZSR2u4+NS-zR7VMJMHQth1rERQ^$F%zaW2@3ij&`?wnVz
z6G`*9cSqehe(*S5y*1WcEJ<A0t(G@+8$(a8Hexfeg)FZ{q=hFDx1}ZVmp6157=Ikd
z(GLI@vi?r^@Ih$LYh<k+pili}yw(1?vj(#*;bMp_UMN8;9{j0W$9ZE;rLFAV<*UQP
zCWPKrp7$+18zE~;<*?gA^v=(rh(yq5PFHE@hu*=e1UoIo&n~T<zYVu62Q3c{%Xl`d
z$mTwm=r%%z8i!rxSfDJo>ZF>iC7x~RZLmR<Hf$I2DBeW7r$2J_2fMrLBR4aeGlV*!
zIv91r3qLDvj_romENe-vS=JyfP3B&6(aDshJf}Q7LfCF>h0<2PYebq<U3FI}E1D`t
zvuv-ZRz!BZI`j@!_a0SmSLT7WZ99M~u@&*5K#h?7kio<64;D8**eTe$QF2j~idl-R
zBYGntI6_pbzTMaFcU01H<fB!h6DY{}^_-jG-|nQ&1|omNd}gRw7T`IZu9@ARg-jXb
zkENjtIvu_}I=*mP-HZNpE4=3H?~%2Uz0~u-J69{&)&%n{SSf9R#XbJ+9imD~73y`S
zXxjAJ*`Dz$HY;-|(`}}5XxWl^ib_p;lcvje&zG?>*l=^`x^Xh*w!2Kf%-WRiP`=r^
z0X+m+!{?`VW?inu+XHJuDsj(*H$^-z_~92xr*VwajD$*x>9fL4zOK291$&oQ7h_HO
zq59sZtWdS9v7#hic3jxbt(MMOee0=KoEBm^amxg_8d^HEln5(;J)SwP`S|KX#Nl1h
zF~c!tAbMZV2aiGG$s`_qn>JoB=A)|{wcA&*;RO4gwihHN=AMFp@;XE@#TR}!V`lLe
z;a3^W)ZyI46#npUgl1A64v3jJur}G-&bHK#0Elf+AA3Q0`U^1vLO*_7zi28Eb<{D-
zOQ+u@cpCy=)w<{YEWbOq3*Q{Rms|$biRB%>@U?{_n+SMYsOZKlKF1V^CfahQii!Z{
z=QJ7s8Q~=W@i~R?`~x760g(Td1^_-FkpFjD6@lsBbzT4fAr=6nf7ki^{QP^xKHtyi
ze?Jl9f&r+{|6V@d-!fnPSM3)}nTY?DM(BJl1Bk0h%E>)H)r=fXOl+OZ?VL*!$m5?g
z(Cy!UasmK|=>Ogba;kLa&q2|Wg}S!0wxWWdk(~{jfw7&T37fl({oi%~!tR34NgESq
z18R30Yg;ElcM+O@)ewA6|IKEnq5fADXDbmJZAE2jNjpaqYF;)DHVzt53~Fj>VMk+A
zK~*W4f5V^uiO`rkJKGDgv%9&uvAJ=x**TiAa|#Fuuyb&+b8)dg*I;$>uyr<YXSH>r
z{il)tYDdb%$;i>d-r2&=milkI28MPn&LT84e+m8f^-n)d+%5ixlC9If*?MM>{cj07
zCmRR*{{?flF#UhP{+9d$`xjsTkQ4sfn4pG}iKC>Qjg5(|v*`c4ap8Ya`u`RFPe1<w
zDqFalSZhmJJR_Z+c@pK};rch~f0z89$WQ-+e8=<dKau}Y@*l{*EC{NaIN4dd{C$NQ
zwieE!&jkOk?Ej6@{vVhq=eu|8od1UXXa4`jeENT2{xko7W0V{%p5LOu-|mV27mfeS
z`*(d|_P@jbAL8(jto<wZS=dA|gxUXFa78hCR6NoE05O1^l(@P(!f^{U&bZ<GPEyJW
zZ53$#%V6Zl#-KG5MEJ)p&o#qi->A-h%Ddc@;oLOapVqDqUe+_81lydJ5u}WbO*A!p
z8I?(i{kk@AK=%B2e6~_)@F@`dD7Bhz&+Mb!=$Bl`?(x&{=F`Z+Z}Y;gi``=h_-b<@
z+u+z(aXIp~W0|iVotl<IMuu)UMcMf1gquJAw<Og@TPQiW0j0GHYFFMy33h#2c~t7_
zvW_jcfw#C{1^)<$!$GAW<7bcM|B#&bl3YfQg4dBh3;Gnm>(m&NqTaX-=*+-j4^5>=
zG7y;i9@K?iRSWxyN<j`k0pIz@%|#A*K~L_s?3pv>FWk;R<yP<+d`XoGT0oCzmc9Ep
zXmRb1O&0m%)wnb(b7}}IUY)U=x#vS(fwe`$k*bYOo8SB$Dq`k5Ov@@bp=NF^8gv;z
z3GUN-L9qO1?Q!gA9(?10{i8I(P43?R%=0?>6Dp=?S)rk5+yEyXbb5yIRYT;%gLEh%
z2#EY!J7Rb{qFUZIbAIUS;sYOS2@ZLX_glCKF$WMqRUP`)THwYW{j3Bm&^=nRrQ*Y|
z40Z?j4*qv<x-H4@$eE3f{KT?|cZuQR7^)s_Nkl;2b~zt*WTFi6Ny_&3-jQ8SjD-hA
zRD>n8^|nw^C_?aLFZeNIPVYYO3r%qeMol>6!H67}O9)0+b$Zuyn~_ute?W+@cY8tY
zMc)yl_D$)s$ZG7}h}+sx8Cqq>Bl8!R@%r&<dL(Qg+xTsYPw2J%7flHA^6Np<$E;3A
zYj<|=r6apOptQ{M`)#@fw!JnW_c3|26L~$v>F@MS@&$c42KZX}-J0^td&M--{r<4D
z?X8eOfeLk>cga)U(8B0w4$X-t+i8>MwuXAnzny?TD|tcRR2|=SS&qxER&1TEg7p?)
zsfZt3kxzrRE4~w|pyFs8=8)M@HaBSb@5xg;@n?;u1eO!&D>f8wN=81=9SDd15?q%8
zRMq;@B1L|+;&)lN!>!virKqs}r?ZBpvt7|`-AJgz_$;dPk1@D)eivA`YZS`wDpyHN
z5Y@h9^sA?LeM^!kMFFyD;~yp<rg_fvsw~Nt{^ZB<MSTCor+CmM!E<ZndH61I;#zWl
zar)Ln*&U=ak8jLS7cNjq{>tyz&>FbmEX&5<&1j%dl`NltHHbogUT|6_C!FG)cVE}=
z7k>NtmndtL=-j}S`WzfOVGf~>jis;Tbb~cs*81jreai>?S_zFYshrdQV$hdC3BHAO
z`5qRC8M}XfEXQF&e{x|?p8551&|VBpf9=}Oal)%$$vN+qwf0*y5oU&6)d8T><~{;b
z^h-$osLaUxgD1Z(-}(E6hbV~+NsldD3_7s|Slt}Zw_*zy%~{*T<@m0cZ@~-hk@(1d
zi+)7VOAJ2h&T<*Wj%s!a@pq&mxd>y;SeWL1X<3qQ;`B3+xUxT6(Pd!k&(V2DpTPJs
z8&UmNjf~PYF~Ddq_y#|z4jxrgHJ33Lx`vA{>-yBe!yNr$B)aXG-xps90;7GGz6U#6
zB57sGekG^yRZrjpN6WVEXna#%zK)Y})+YigsjQAqs~y^!$de{J+M!@X>ErKAtfx&k
zc25pS%QW{85PPK9i?^PnDJ?M9r$VS(pMGg*3%q$As)b7Maj8m)5eE{4B(BSIAgtDz
zcVPCuf94c`4l-%H?A7#X*pgWDHC;4&75d@abId=a>NmAmc`1m*=BW<uVPpQOA`bGf
zbYa$~@0!*Ezq4&;SpmZjGTI>QlTPXdQ(=4x`heb$(BEO)At{VH?uePbvb<Qkf!|-G
z48rsrrsAi%MJRTZ>wFEqQUfF{w%CPVgsu!E?^hWjMbW`8#oZq>+VR9turirq3!CRM
z{LB?Fa{jIJBo5K4qDjI@0bQPj_KwON9(t#5U=LG7xLF_3Nk0bhV2^H;h7DGu8-G!R
zRMQHcJld;v&+n{8qu=9}KMedZRTUzcKPSjjz^{Wvfm$a%W_dsAmyRGOw!lIug<yY2
zxQ~zp0+U>yZlp&4vDXOSy`qd<cM_%tKXrPZg#{OQ*vTl2at5+QJ_V&Tw@Fx=e+XV+
z>XI+(_4b}tm0o&4?)<Ayh|q?@U9z{W|LW>ZoO%?M+A@9&utVZs8NHf>=-b*4E_eh>
zeJnEs3NqbRGv0x|w7RppzbRP7wwTPR{=}?!idd?loq0y~8p9{aSEeUQ2j08(@eee{
zC9bA+4p=Gv)mgZZ8Od()Sy7$$>RyXF_UR{%o+q`y0n*;x8L>=_Rl)J;L$G2*jAH$a
zYkO_w36ufAaX)*@AQO<TAfiByv0-_*NbMRNb=(_An|+~tswN6A<|LR)_(Y`eObq-W
z-7pSmYh0<H%gE`E24N%!!Cq2AU{{|Z`rzJ8Kr+dCAWC2OP8V@Tt+y{ig5a0PoMiKc
zo#ZYwrDd8T3s(k}Oc%^Q@<in9zf1M^t)EUX9l}n)UeE=~%~#zdrMPQ5D;JCg)oU1M
zcR~=dGfpq~h32IyM8BuQI@(2Zyu)90SpJR4%60*w3}mt~WxuP39K6OablmVT6_ZN)
zri1k0Ucjr50y*{E?%6bc;h^g5;L!_l%l!kzefw898STzppKd%0LOW8ITHxodDCz{<
z`tvX^e{tcA#Zj<t%0ZvDZF2L(9>*&8lLwWKOf<udf)y`5kk_1+Cx({@{4TdK)%kmS
zJ5w$5GlgeESyF_-;RVH~K%@JH*5dlKaG^C?aSOD`vCe(Amo4koDp}u?mG$Qe*F1mw
z2Yz#u?2;}<zWfc!Q4!}^W4$n-bCD%-w@~)7O?>;gdnmhF;d@eI>Dn!X4+cSJ`)lQX
z0QoiT7yizwhK^ORHdgNQXnG1ora-Aa@}%p{6n5h6ON=(9IKjpue(?@({b>2Tf+NX@
z!*W3VVbS7*oLSg!6T6_yS<=g#<Jnty?y#OpW9-?D?9=>nn`?{o52K6Ew&EJ5V>fe!
zO@S&!DR#%k18l(~SldsmK8T0zmssr(QLx7KZUith665d-bcmgg#9we&OTAAI`V3e*
z<MjA%gZ8X#7pNexA3hU0^tZ2?<sr5QEkB0jSHRGbuRtkBK@PyxQKx|M_$gvY41r6m
zas%v@$~mX?pF7de@hXL{Q$XCl-IA9B(4_~>!l79p7FHt1^4$_QQXizvH>Y9_XlLer
za`$7V@~?SozG>ZuYI$XS#QUY1u#^0{Z;zI!JmB4JFFGa&Wg55bawGs&(aTggvmxno
zkY0`)F1b1GPk}@0$)zRDFSYb<A7beuB=i&K^E8p{(BXMRPC9<~tjcvC%SAUgpp6Wm
z^i0~okCeiIp{#5i0)APT3Hprz!%*QvMCw-9E9j2eR+6EQS<zyq4wu$lEi4KSX={Ns
zzdE_A-eM=0<qd0rZ~Hv4tb*B{sfG#zgF3!vou%IqNQ{q1fL3f7cjin4tO;}l#_%Nz
zxj$my_4)_-9@rHPE;sHfG~Zwn8`WII*iAR}oqz)ZdDM=q%R$RVeL%2g>(-ez@v8Xq
ztW&+!haySi;E4M1Q+d{@GgS->UQ*bAWIJ(7eus2Pi|BM3<TS==8OHdJ<_o~;Wlhe6
zk`^OpdJW8uaDS46DYAd{z^b8R#b)K8rk-d}b0Mwo>0N55Tr3(x$*XK>Hi9?^?A819
zD_HRl35Ge;kmfKqvE(1aS8v{8P|{!Tx(dqLP)ldFP<F>8#rr*>YMy@x=BoRYBG+gQ
zm3c|Q2YX>~!|4&?ZTGmQ2mY%^pFJlYUe7s_Z%K{tL)!Ezd@q)Uf+&BY43Kxeqy`Vc
z+w3c>fuG$LrWfPer!G|*L8=+@GFhwGQho6?H-Q-lSh?ijN6MrVaL3obI@Gi~H`jeb
ztnsfnY~n0qpX)tD-s<~g<u#K5^-p8Z;pBHL(c=k@yZz!_Uik`Vd#atB<$Dxf-y*?z
zWTHIM@`GmH-CK_dFYJ#p+HIbMdI#NV;U_m*7ZNPSeL%zg=r-#HFSx-FAjIS>y(u((
z&|ToM-1pG;{)@kp<ihdzy5mO!kG(<MvYi~V#jzWt2+F*U0SCo3CQW}3r3Bu07KIxT
zV067t$k!uWPe9GZ+Oy-3G1nChazuLUjBZ=-nwNbZ#6`%OFx?VWCNk%lxxL<A_o#m^
zam3=tE3=JA1F8o#)wJfKn)b|;P2s1a)FdJ#BFrAq*RPe}wZ2&u7a1@^V28;zDRW=O
zIcI`8;~LD21jY2z*RNYM+k7|y0~X~ViotP`a!T+ZXLHrR{Hv`~5G*`8P`$H}SJJY@
zkn*s`Ub;A2iRse7eNri6Nht78n583PJYRk-AfUX>boeY+&k<4D+fYV%z=3_L&bMNp
z_|Ep(;8zyJA67K}_3DLSvj&!DAf#a826#Gr3Jh(`o7-SVMadvfexe|&UnG=y?IKD+
zqwIKRzido=(Z}bfaoMjhRvGBljPi=h=7X9Vvp}7~p|TLhLG?{w*R!R378iCJ7+%;-
z-4>9e+3#*Gb$u1SJ$+UOukM@Uq(iRw<AnAlLfuC=GkENdpW9=DfuDL?BIMQT+`dx|
z-ChYl2~D3HVz$A)jVsz;tMv%9GA(b@A_RvP3&C1S?#g|l&0B9l_U>)aHB^Gz*`79m
zjd0EIkM!T(<Iqu1drKxDtLNjcwXAPv8{fd@O$%d!m-jLU{U_N$*hRi*dXuxj5^=9*
zXYj9repVqI4O`{e{(ke1O1vX;RdC<qD+JzZVq^L9*DnNdCg2<TYXTdlp$h`_ce;9q
zzXVnbB-g8_8@J0a%t&#lXO=eac;j*3uuFr1hniQ=k>A2TzSYoSgnAjj39?ufK$pZg
zsx0eb5uz~2cw13q<!JFv{xs_DAM<lt1$zSJnR1%Zo3VPWSe{gsg?%p(Gyeu~dd#kx
z^SV)4+Tl6M(7UGpT})d(STysX)L<MY;NW}IX7xnbzxI@U?=JtehYeQb<=zu0Mqhrk
zgS!^S0!UuYPcw2Q45h7v28Q?x;x<Y2V-wzRDdx&7QKMQQQVtl(1Eh>#`oQjH0Q4!Q
zIT`->1blMUcCrQouRJjFV^FRk3xtDhKW%2vhK6SS7`u~Srca!F|8$~#7&Y?8+@U<Y
zt$(1~8j2eQhKvl8Hl~E8S69Mkay`>6iy*LwDGXNsP9I!Cfp>KIA1r>UB3VY`F8E?M
zhU@YFNfz*VOcm6_7mb$C0xJa!E;~$|rQ7HC6uOAIL2pj?XBO>ZzRO+@PX5|ES!YRs
z+q5NKrNfV&*2LpT`b$ZDZwqnh2;rf>yLI|L5q{#K1c$Yb{~+I`P#xY8v!)R)U0ara
zT6sVqj094Fi+v6rGkhE#GW=Sr@5*Or4021tKb<sE0)x+QPL!BnY2FyNQz@;{x1a27
z&wGGe<_M0dmzxqSA&wbQ=@Gu?<9Dy5)H{e)cq+HrP#&$)^-iAb9$OM`pT_E4xnKt)
zgQ+n7d|n112{SBB>uIYc>-{A&On^>?Ln@&1L6v6G>HPhtICY4D6v67<NMd5g039bU
zYO4Kt+cbCCRfK*wTFiA(n@iH$KOV~FOAq4W2a@NgCUO<j0~2RfzcMhv##LI4;tdt9
z3*L=>EkoCuDZ_EjE-4SsvG@J2y!L)p$-}STdyL}S-_!kSbQf0uBjAW7@w&;r^|5%x
z(tMby(D=tXvq2YWs$SFp3cE9{yr@|?yI+Lh>aSeE8)xCHP&k*+cOz2#F<HbLmlEM{
zFis?Y{L71q7|QPVb`rA|=%ylsU`pi!4+3!5Z)Z<F=*{<uS#Zc5i|Oh+_!fubAGpU@
zR&|`uhD)!$2ptQmnY2CESePUoklq|!tfQck$nK*bh2az4ps`xa6Q8LkI5sdwdgiSP
z(J1jD$wG=BV<|}X(~_QMGuz`3VujCAc_C`d+&0_`7WJ&qL1(rbbOUPY3QY8iZ>YlK
zQ;E4@Ddd9D^eA%)YJ$;i^cvRI-kakLni(W18Lp?QZXlpH+GJZO4YIXE^n(0Tji`*4
z!^iI{RfSG_Lg*<Ya%f4p@--br)v+f<kfahI7Pn%@8pF}+;dy;!LL4U;LfGev89L)=
zG7W~{hBwV=V;)jm`&V3jEa4!*%<VrmA;t-4$Qe5TJ@`{4Hls5`A2pG3ya9WA3LqSC
zmVT}y@j#f$$jw3Phtulr|K;;K?a^Fz9dw={g5P}M{jth-WLw#+FN%1Ti9M8zs_4FR
z2T78tk40ne<I8K>uBSxLlc<ig*e*4oJiIbh&jDW@9Nqs>AG|R5=|nCXN%m;$yMN74
zBdaKgn<l{PK}<~eeWU?=Zb0HlH|R5bBSdyG7FP*%_I=im4^r9lB2Iji2gIc}#UX8f
zzCz>ib7=?Bp~r+4#A8;IF_j9A8|9NJt+_wYg*r33(qN3MCRAT%GwhK+$8k=hk6o3=
zfKgx^p70siD+ZTAZ$?;?r{Yr#h_V+hph&cbKP~nFrnUkfdyWoo<g569<4^sba7qit
zQx_aT1j+?>e%9d(I+Pbjr@n;vhwGU_?)L}w_lRtUO}fb#ZtyI-jrI++%X%J4PJl9r
zx@X34%w)I?9Q6*)k_IltU(VYC>L7#!M1uutL${b<JTb5-+YnMzgG!D1Hz}K+H*qa@
zQz@)m>Ki|Sd+U1FjG+B82PZd8eJs=Eq`DBaaJ#My$?z$iy*3Y=3%;5?{e~kZ76@8d
z@pjk4BqSr|Bz|5y6~8vn-yybVAQjKr+nmVavMP3;_LL^N@h)?s*JAl<8g0%pXDH`r
z4}><EX?3TaeQ0yCx54PXHs)(R_D1D_{>93yoi@f24M(e}>`3KH+uSv$<Wbw4kE%U)
zS14i_=H#C*HEoXU;Kat6n)c+xkB<25wp(^dRY2rotz&S>$|cck#$1|rx0QkmP)l7v
z4_p@UfH_tYt{<IOQ>cnO_h-v0P7eN!(dy;EfE(AorR6NBii@00iUK;rn1OXeGQiWS
z|MIHraIAi{2*j+{>U(O62FKjN8Lvu3nw9gz{E6r>M#_!<v@ff5QJ<W?{AtWCq!0vF
zxK?@DV61Yk-xPW?W!qv|4WyQkdc;Cjt)V;`Gv(gP_&Bp7V%G*AIQ5zw+Y^%WD>uGn
zMJ!Am+*VfUG|r>ZBDt5>zl33MQb<$zsoYW&aFUzI6P_6zn%%4x03+-X@Myx7X)P7<
z30}kTv$r>rVX~vqiJu*3paN_-5w??24_zp?5nbS=wmo>mecPO1-Oi_&Fu!PUjc5zR
zqfVTLmO;6|y`9gpN<gFfM5}2#ijVBHM9=`GaY>yBVd7kOCZkgO_gxxIt-EyA1Tokz
zZG#ZT<oN!u)&6<z;4VFUzP`eWv2G>6OKL;I0^kQHd8(xfAk*Pz3J~iG4@ap@&9i4-
zIYf(+2Vg~Tfrfs>m92=G4Ia80kh&B4JQRI-!L>Dzu>*@pn=1i>=;R+8L@^_}thg|0
zyk`p}kr+ji10pWp_MqgXu5)Q0+C?Il5No>eir72;Y%+EVQ8}2ncG}yPfx33pE!y=x
z`^_C2y641tZ=-rOw({?6?}pBxq*ssYZO@ZizZ`xM9H<z;F+g)I=sa8^RLE9bx|z|o
zB3Yud1=RJC&)KP0`O}|QPFy4SI{LEVy6T|PaLhyW_r4lP@Ez9x$B&!hQ=HO_*6$vl
z+ZOQ^fVZ#830q8|2-J6|O0yu2Bf6?#@Wz;FaV?+Vu>G9Lrjo$ClSw*%f!>{y=t;HV
z^%FT5>Ak28^EzQ+>U+B()tpz;_F=f1`1b6(qYnqijt5}oM>`a^6WAVnWM1!VEsfpE
zrsO2-;w>3z_h!2})(xh5BGP^6yU$a-JTJb4EFkMrNw)nuGKKEEv#VTVT;(;<UJjx*
z<Sso%Ux3d)dpmXKpwhymMp*j6Q#Jmt57uN>j!}xTQnMhf)125;E$j{a!p*hqoSxFt
zUw6fgO(868b#eVKQx2=>Jaa-uSVdw<4#&?Z6(S|U1GT@-t6nKVE$s~GS+;%&dZMu_
zwt-}{&+VFoKr)%*uk<W0-jwfw+{*l7L=uMXWtj_B$0yyU$-tDZ&2UG6BZxa{2z^q8
zoZ<wmI)`YC7gGsem1u*rrz5q`zoflqh|ryv`lUwlrjW2geK4=&rHuqO^V<dy9^cTE
zkJ)B)N2(hWsN1nr(jeM0gfHc5GF}d45bo*_NFP_(nMvC(ls?Q49r6W@IHI$xY0zJo
zH?w2Q;{w&H&O}H?7T+$UCNj0tFa1GP*LFv!A$P{HOLu)bweXt<qm%2R!OxS6PES)O
z51-3XkJ=ELt6-NCesi`%+aqzWeDmEi!QKkvRAE$!f^Wvs3EG}Tm|8Gi1Jq1K?AQ#W
z#XkH3HyIdLVremLj#Unw`D9Zjp{xqIyy;VixOPzs2mG|geeJB_hf(rMq~3D!@LuMp
z`PG;;UTtA#7+%|_QCi%-yCtP=iO9SkduyUSy2Nq?cQH>cuu}5RGJ6z0xt#Dn@@*%|
zDVlc~gRqPkcWXLCqjfHE<U!6JzG|1wmx`I)fJLLCjvLmZ%%mUL+XdjrVMDc<=;h+K
zz?1ktA+vTuixQD0aYk2v+VXG5eTC2AcWZF|bBj0gZi1y0Rt*gfhx;LpKXWMa_lz&o
zHthxmw4!U4zx)#e9A!9r2Icm61vD^Z+!BUxdXC0x51`BdgXm$ETF{j>=!!AH^Gd_q
z4j8@!zHhr8P^8rJKAhMcgmsBuZsxE&KF2gyTYj$N*EizGYhJdG?2^5SqKdzk!Ba(c
z;ttter*An#%`h<<CFTx>BedoRqLzCTMCqyuOWp{y-krY)@o@RxZjP^?0Q}PC-yjF-
zD=vnZod^9882rPWF>3v^o(_?3Eo|X0-nF(5%fb0TBdvOY9i~ywyY#^Lt{86fwDhA&
zKx^dFV28~kkR{ZuJbx?WoV0_ed)tW6C=^^RXXi|3L|rT~=ml+)fj3PD)<K9!GlY~2
z+cvCpcSu{{g6Hh85H*n{=$xjJq2Yz%BbW-uHGi?+J1H!KS@J!)>PHqohtK}r10pnx
ztF&USxC!xH@42yy%v$nRTDl|DRP$^sF4D-@@*Fzwc6N6zUq8^J;ZvxT&&5m@Kaff-
z#h~?0zv*H5##IvIyHV>~qV{?xQI*H6!~H~DfUL9bhR-%?s25B<sm#9yo3r;*DoxiZ
z2hA=B+f!3p{qV`1%RIw>gbDo-3~Jv~WV&D<izsLlk}E)otK?u-o%wZg1KP9BCir|9
zCDI=x>P3)6mYxoOq$N!GZg+Kkw}o&lZ<AW5&P$ofAVl4s={z71Oa~s)N?G#VQF4LL
z*o!>Wowkwi-0A~msX3!;45{Alj|fZHR1@nv+@ui}O1-IjBm1J?8Sl->A2NFk!DXqz
zad-Fw&k^5IM(qZDZD_>cly64kAW6-el=8CIe<&{J?L1S3Dl8?=`IK}o%dE5B%Uxpy
zPt@Na_5?&TlKtI4T0<=XxrQ&|*|V3+efR$A@FX8e{SzPlKyB1^Wd^zcZHBZ|gK!s*
z+6;;B=vbR#(AfoHH$(wz`?a4t3DF2JE=&1bURc~lz&nPnf<K7j^|hU|*6x1COU9PZ
zWvqg8#bMp1LEwT#_NIkF!=`Vy>Td#~?mwiR5ODl5Yo7k8b3+$6OQ>w3!nPlfq2wp>
z{;<C&I;Onstx#3QS<8|kZbF=uT^)FyQ15GHif*ZQ4H!MAhddAe`ZG#ryr%CV>a)_7
z^#f|~!RjNuWyIpQN?-)~E3l-yq?<D?_csnU&7Ldwx+OY@7UfIZ52_pv$o0^6V-h|X
z;N@E~B}?`d_|uoTl0RvU_HI!lLaRO8@)Cj2q`f5Pf*>lmQIl<MC*?ItWTEH~wC-4N
z5iCI5?Y@L*?2VWoSuTmPe%G#Yo~r?1&*wES;5hbUlSsP1V>C;656RYO+G*Ef_Y{uy
zjhYTriO%8h_1kog$QciQl>jZG=Uo19dg>U;I>rztx}+g4H-$sautINd70h2W;Ir^R
z9)`RY1<JIBb7Q=qVVf-OuURSsU5wm}J#6vNyFAfqeq+W7eUWk70NXQr2&Jt#p77Cu
z?k^pIUYQ>k&o6L4hpVZM=`a)mnB#!%D{E%>IThUts}!LRA+SE!w3sp2qxG>|0rH~r
zuInn~BNmP0hb!YQWa_GA%1Mf8KiLx77-|^fkTN+Fufw>)tv9kJ1>hivtO5#u<t`O>
zwg13VUj_1Y81%(rdL%AS&a8!Y1pVBwqNYxoN^wG>oSQ~M4AV1p9dY4v2!ri@GdSYI
z_`;0L$V?8GFsPs26j*`}>c{D}!DjE0Qb)qTGcn|Yv{dFkhjZf9a(Ji-6ui#b6V*&l
z=ENby<qJ_@K*`a~9j0`X%`DGcPeg{z(^Zn{Hkt>D^vBMPE-wINlh&PdR1KB{|6bvW
z0?A+RKqXrsBpcnUhYu#!{Q~_tM0#Pm`;7+Am<P8#AjWb5X=7dg1sG^rutz@SUzlj}
zkTVy_ToLP~BH;!qQ|N#8^Qid_=KMrH>h_6C<SO?OvW?b%EX*CAY1c?C(n_@m{LBRq
znYm_dATlcZLc=-NuW<kE#XuqNQS#>Z_>`50j!vigiwqpYy0A0*G`;B^WxYIj=>@yN
z+f?*)nkGVALD;?7xbzkKhpWi6fU=cP#K=v3cC)Dyv;OysN4P*wkqcDd0K&KXr1FaL
z>CQ{obIj;Sz7|rQ8kDcyjN4--RtjNvdxHb93-f+>WZ&|BgcYyFSlRPSqs6y+O@?4D
z-WQJuz_akho|kRE{<CUJ=HkDCO0Cw@Un(EX6O*4Yv67o18GlSSKVPU`tE>H;E?hO5
zVaoTrrl=(0$NGs>Qyu;0tnpnLtphbE4tF<yQ1cDqTyNX2&adhz3LjO|O*bKJZePIb
z`8Q`#zi}S!nHcN!9!A45HGWYGP+8&#njRv=cY_Q=^~m9F-JndO+R@(M_+ZVWH8-hE
z)F(bPSaP4Q`2L(;_!-mK&yiI!_||k>j}5Tc<)jKP<w6O&VrR2!bZQA~R|h|`Ra2}4
zIC9o04Dx>}1p52uWYBJ~Nq7PP>v3})qb7%P02K7^(Bd$Z3og4i{KwBT4javBtq4f|
z@`E8*00*~$^$o+GrBPBX+ak<XYChni0%*GUGbVee#~~`bw9SFJzJTg?6ewLC=MVI3
z_Gm0w0Oqf2NO>{lCMSiS9gSnD$tD5(Fl<!PgPYSCY(ZfNc_=4r>;^Nf&-i|r*hwOW
zdoxXlZgv&%N;$S!+6~}Da3df*+Tm~>*LXMeagb&l%dLNlpcIqUh#aSc5ALP+!n_`#
z`oB0w5yuqckpYne`~W7=Q_YX|9F*PhZze`Fh7#0vDM+y65QJ<r^Ok*pVr@6gx@~Jv
ztVd!NbYX8cCYFajmx`lWbUA-Stm3NmsnXzWKT#gPwpWrV+d2vBYY+aGTXt(5q&QD+
z6HdT=^~R;o-UEyhCGkd!+>G^oU!Ntb(pBD89rxx&G^Xm?=WWb)LM@{3F3eqn8i*`~
zwDKJ&Q61sz5~24Imns43mW_f+x#`E2q(AeiyJVrkJQm9&=2^9m-cFB!@pH>Qm@G4S
zs+IiS6~f-|XFY7b{#xG6tl;1+tz#}_&5$)lf93b`-mNSH_}*~yUAOhA-JG2nDa5PD
zB%*gWFwFRFpV=eOEP1gPxJ#m5zVN%!FQM01Lohb2mMEL-L2mH#>V8sUmzA5w>QlUF
zgC|Sz<RHl>9(b8Gw8MA{<ZXU8lC_s`#uO-Ce&D3E1P_&pmT7r?w^H(kE4%mfUa8@;
zHSqa}vBqxIW^^0XhbJeBEb+I?qgsg{xcWc7Dwx(`sA+)(gk7+^$ECHtuxw!{QR;&W
zGvJgw6!dvvIhBrl2Yah-@O4M(-^kw^P=zShM84jNovOV*jo41Rpyqu#f`yQ5UygBU
zoV;i~&@}hdaIAb9)5UoLmF$BQHs9X6HNcNBdFTmk-j+;0$kZhQ@{X|j0D~`MRy^u7
z^9M%-ApIZU3ZmYp@<sz&v{Xct!D}_X*r&SJOZ#Me2)V46@mw-GEA^p=Mg=2QhPUYg
zybG|{&%0mGIW>8xNys$xNlPCyUAUy4Uc>RCmrKE0?6>Vc37T~nS!A_v59p5HYhz{@
zX?e~aF;*BxC-=}$NNlfbKVaQ6`ivO;+bOC!<-4QTi|NTx@Zw1DFZ#>3jIG%seMkw?
zdp<Qj7;EQLfG8jIBDdci>w#efbdM%GC*W1Ee7Xtm;%x(*D_Ce5exr7~<%A8gS=~dn
ziwYv>-P_p<r@S-Y195EXN7^|92%K*i{VY-`Tn>#8ygIl9l$1e6SMq^<cnOujt`p|M
zdh|;N=F@AHtv_x2<i;AQb$$W%u_czus`B2iwhXq`EmKySZ-9Y<M^Q7q`lo?i3g*X3
zCz1|j(|RRv{P18X^FBL%nF{}BIO<bH{?%{8&vs18p3u^>#6U)$53VG{P?pURXy-*=
zv)DWepP&Z#HRM)Ks`qk=kvCPyb&+_UOjWDHD_8h=OSI-1CRuo^-(LAxK-&PG(cLj?
zf)ApUlal@jF&6JG_)5SKhb2wzuW5`JdhsXuZRS2^n}_9qN|`7=juHSeP_ZZ+%b2B)
zc$xh4#$kgxpHl_<4wr#~AM@Ksli0hFIpe(_FWF{vwcS%qI@*%y#D~?q2lyN#5(mb!
zO}BEtSv_x3Zc#45o4M-GCpY<{!FbRnWh0L_mxOkk83L1^gefGnQ+)Dg&Kwn$ys!HP
zn5vtjK+1wH8yejp#a0};yWq7;FSP`4MPGq+qeHvg;qPJmjAiY@ysCN&dvX^h+q`4J
zKL};_8N0C53#xJuSej8sH*$SeO(9n=*kSMMJX7)W(Ikx7Vw{(6mp#Q_fyDBeNQN%%
z()e*AT6>Tu4LvL$yrkCG0g|U#;i|5Gbb0Y;IpzzmEI=|SVVkP-?!CT&$}PA%e@Y19
z9oqFOYY(^%m@+5ezdO2iI^ezw#@6n|qoyV&=zX=@Ec;O!Wl&8%e-d8uootY-p@(m~
zD3j<aBvR+z`C?KArS%XKnVwHwbch@Fb08@)l?KXKPM)Rt^t**8Sw5i@82>HU-@-Xu
z##ERw&n*mO%e}oJw3RBb!#EiYzHq=DFwrfnf}c~DLdOUuHocADE{qDr_kBv~Q!w(S
z_EukwS>Ql?<?@?;;)uQ6pqVG14r3Q3d2l+)d9x%(#o_6XpPuKOIA=`jyP8OQFON7j
zud{w%i)8vz85=2=uHn|of$|sYgHm~1drRr`)<or5k#rH6Y%KPhPx{C!?dddRC{wCs
zeor#hi{3SPWVym;m+oiv3v8aWaI3Gd!HY1y*|wzkIgnMkJ|Utxoqd$EAgmHXp&6fX
zBtXR2*Vg|U#z`tU*$cnv0qML&y~v2h9aQ_SG$3-!v#21Tz0L?BO#X7-^Q?U$(170E
zW*!wuZK5+!;>XHo`JHJNp1lgGH2-0+ThhJ}*kkUFm+31SOM=Yyp+`P~&whse8(Zdu
zTI<Kr?+K#);s{ll6crN;ozSBgR*Kv_Se2Z){p6og%Ny~C=dW{cG*PnM6^Bgv3p>Rr
za@;0X)RK(QSAZ7tz-T#a@J-ci2e+D2?doV(mT%8j^v3wy*O`x!^AAx0Y_Ag5HJ&*}
z*r(=EJ#kA5k*gOWhEKJdJ-vQsx&A;~<S}zM%kGQUIPh7K5`NhmJloB8nqxoLeHO99
z2g5}qlpOr=LMb=uQV%SqLPE^kQLOBRa5UyN)!fie`fEtp5oGUwRxxo6!{n3Gy4Wsz
zzvJ3<2ecXmRTcRfK{slzy;L91noi)NnO{*Xd`M6u@p>Gvgaq8(FJ=z{qkql6M^WB+
zTUHc<;`Ec9nnwN|x{WX2;U)irh$nV%Sad1YsGHW{8xo+K-}<qR$+%~!wnUh}Z?YJB
z6ogp!7m!QC=CGXYlpOZu(Uy?17S>*SQJ0Do$)fdS`UtFWM?Q#4a7Jb-y`YdD-iV^*
z^cPFI%O`1PQ1$+$^<J-r5I!#^wnQFgp!9SU^}BxM?9ikfJ{(o%upp!5@mWve=}KG@
zWl@b^_)qCWL5OazLt2EsJG!s7UX$?xc+1Wu&)*|dexvZLjjD?M2)49`E3@W=i&cq^
zca6co97&rJ-Wg>|L}6U<do*S1d<!=;_wzDAR5K>qLo|{Grr0d)QMqJjpPG@OJwYHc
z?Qt;eV``*`mg)kb^NMB0_4BD}(Fr>Ck&pm0n<LP98~QMYc>?(y`dzR7xB`E)z3L6m
zz5e}Z;oTM?yDTkg#RJMtD0n&ShV`HUmmqQAa#`+vEfkCl?S%tae%Xp$#zB=*nab=>
zGe|T$7^B9I&FU8`)_N{XR~4N*Xd_S;8{v(ju|6`7c4KW(@lk`ITFTYrYNQoY08*r*
zWR`0aj>t7?x_9efDHF`h5UB8t-v=?DG#i2GpjY}$I}MU&sbx)yUdyAh$L+&}VUG1!
zC5(%@ZjwY^Ai&13*_|*9>rB~zO51$jIJk^I=H?(!c*}y+;D~BNNa!&Jeiu^>eyjrv
zJs#u(UDks$>Z~k-#G@(q;;(pMCR&_KuW~r&NN&o`e&~ZeAx&%0{AzvZA-L*S>NR&!
zBt5qgEL->+^m*|H-tlDDol!Ex1G8`M2lw}~#=R}%Th%^S-pnX_r(sPk4|H_j&*5RB
zT#n!1Q+e+NMUSlOZu{DOv(p1Sovv)?_o7gtTp`DSx-TKOsX1O$E<G^?IK0HUBUQ8v
z%O5PKfMfr-f5j6E+5#=LPtAj^ctv;@oFbt5yH(*F?;40-`))L1a{a2sAlB%%nJy+W
zco>ZVY1dq1bJy7pn{&8ST=a(ZUwe^2Q{GXL2>xC(`r3R?4l#0Bvio9yM!>9rpr+CF
zlWxLHI+v(ObxHIg*x|iuLe~KNY7KT)4Fo?;R5%cHzfSu~Y@2_98-dDyPOON3-3RoI
z9frF?uEyXw$)C40pay7^pEj(0YofE>zKbc4>Kb2BRQ-KeR|!5s^+&Pa0<!CPmxjC5
z!RQ9KE~ZLc%Q-VR?!-JV^goi;z?gRNvIE>7Ed2Grq6O`lH+}5hrc>*Rq=hG0XC+Y<
zz#tL0c+thruPZB0ptrE@_DEgP*YI|y%L^Ku1YYwC%w3=@lm)G7tO(d@a+{?qs_9j0
z5_4DXyZdS@=d|rCU%&WwDGo)BWtYV(JX3W2K%_b_V@80G#p_f~9kZdV8NL+l=@*Ba
z0YMl_X;D8bZ*J@xVPX&RCw_?V&{qQ*$?G4Ap*y%MlZgcxlX%*W>LIK8YI<~<@a)hS
zAx0>eYdnI_nsg{@x%iG2!<rEoP5Bh|BgqU7TZ8L=?%Gntb$<SMgxzCTq<J~%SzrV~
z<nRW~(+Rj|)KXy$eWdiY?@_s#O&Mrl;z0;B#qRV*F%|MKRMMJ#H#NrlwMwrGvA|8)
z223DXNy-2L-lZl`U_45m#u2z-Y8*MugKh8<XX?G6_xu?cXRi#)?$x`k8Izo{x!F<i
zp*!o@y^S^t$q%o!Z+|P6oEITB`gr~k)@2q!hThYqT+FJp8y(+DMSj_Nx5R);$%Rt8
z!5pXH8dm!W*Qe!YVPl{x($mwGl56ccyDx%nAJ#=)bllNJ3{Jcg)3uFQp<xyH>A;M|
z28WpxHjP_qhdw%CX5E^ntyr{N`LC&A0F9a9*aF(ojDu5e_L}IPC<;_p)eFXtB$09G
zOK{iR{qq+g4~Uhyb41{CQi0$|GjNA21}X(A9DpZ)Au91*%bU{#)tBr<>dq1gN!A$u
zfVF?&ndiBi5Zzx>6$^Eo-dcXrq!A|ZtXfxMStHmXAN^1evG#{iD|>$0lo`K9^`zZ%
z45nem_I>6!vPtq~h#!`QR`9+`9vbDf0z{gC9FW#4YO0*e`mXF_wUJulscCJODh4bx
zRG}>XzO_1y=+oS0jNhaks-}`gU)_&jNNA?uF4zLo=cRC`S1s65en2py{suEN3RLWe
z{DPzyG1Z()@dR%0P1Oe_M6R{?jlz|bpY}8^$Sdh)kMQv0f^*USMy0k#PQ_|m-DczP
zxp;Z8#qY-EJ$UpUC>f;wbS2AHoB5G}&5JuaBYv;c?es!h55jWVjuo)k2+{Xu@{LDX
znuNizAo_-j?HLYBdTWR0iUc)Q2w_xs&IuE~^%1tb6=L>tej8?A+O<#O&RSd3a^ouf
z3y|z*(PLaV04<UG&r2Q76Jz@#GBT!bN%X~r_5x)gQ-s{shR55D?Z>c+4wC5kjA)CL
zxi^TmRKY**rfA)>;@)Kng@LcH`{Y^!RbLU1>wGZY5xi+)OQdqb2=V!{Wtg{c%XYl>
z5Y+xxBjWO%^29K%^*n4PcRm~?d>1}T5ovI}yqWwZy>tctdIjtT;=orC!xC17L;x#t
zDx*xE?5_QDL4u+`F;CRvsWqSSX}7!A_Nw59?Mt^{-%S@X2BQPRM;C!P8-_YdKI@-j
z%=TgHT$Jj2y0YnP!D><igDH5T{$KP9xte~5;o1YW!6+jnzngEIs0%rh1S~`7=j+3o
z@Xqh4Y)Uwk++yE{=O7bSYkt&-HhrA2P9L4FHcnP(IPc3MExKvqY|g(3;iP1M^}l4*
z6bv~MgxXF81#J+xys3jtmkbj3vXHUo)3&}XT3T46c|Ka#=ChFwjj7qG$-W7Oles+I
zn?o-$S>!v1vYmvU$lyh3_A0l=v4gTQ%Zp<V6~U_0pCT2!G}|HY&Nt&o1V4!4zhEKu
zOgMJm=5EH^zVvz9ug3)eouprq_JVwmem~)6yU|#`9Ptuo^2lKhUcT9~IbI$zeF6(U
z+U=rBUU$YCfQ;TgO6R5A?4eGtglXhUAl2&<4ojmE(=Xm|v1<IlPA5!2SzONNKL`w|
zc)!vWWf)*uIjB~UIOzp{fL=i&iSxxhP?A;3Abe?@KzcRd^WUY|Z}f0T=QGqj1{_O|
z*-=cg%N{Jy-XQDKGCrgPrC!J?V9^h`D;?#x>_vzsWLH^@p7r^Ltv+bEVeOK`5!Z4Y
z`Cv&k+#4E&Ph%I@(yxE7Th-6q%rzet#otJSd=(+aPgWLMvmk6QC}DtK3PFF<?vw4V
zzG}3|nh=b_T|oVP%`K49<N|Rp8$!wdsE+&p(e>7EQM~d0FM@(fsYu6S(5ZB}gwld^
zOLs{LNUVs2q|!(%A>ADcONU5F=MvJnG#fMDeSgm9ob$uE&VMl1T=(2F^Ljj=kK3L8
z$t##kB%CV+$&QcU)F$SZ{R#eoyJW{*Ge1-u@_Nc5(DHF@M2+&TpPtZDx&Guj@@Qk(
z=|0lQ7Y_@ac_XMLZk2mYm$rZM>@*1GBlV#CVP49_qY9-C-;S>r_Jc8fy5AifJ9aVT
zl#Qc9gvfGy=<6)jqF`${cRD2{N<*(_bWRY+;dA-pHK*LrF2uPgfIHwKJ~$dyBX}&F
zSzY?PhxR}bC!%lf4Ex88`w`)a0MO>6!B?n=Ix$2}Y${^kuHl#r=S&|`w2A23(BP$6
zH}CoDE~XHxb0@(Ph4?u!>W&EndbjM&0f5pT9(dxMA$sh5K9ZmK?dj4gHua6YEzCLn
zdO9Alcn45I*_*+P!1oK~WhXv3zqY01^Hl00zd~e9hh-W)@upPeABZl04-HVCTmA%2
z`mpb8N~Ccd#&D-ao6dgX0&%OAc(CP}Q%=uW@zoH?a$pY@_9OLo&(HWPK?RY1A=8iV
zUnIWCSlhT(s@F=Hne{yunc8T2$M!|(snc(}8^$%_P-<8_7A)BZ=ZOVhSyX?}J^RZ|
z>J_b(EF6|BdY{bnJmk~EMzquWrH=Rc->jdrDt|)1C2W>}Xu_Btq3J0SN1kpz9lCmV
z+r(K(i>O<(3*eU&z)*g9R<pmq9A@Fgt^{T4Dg9bhNB`$>o^IvUgwl&5e(YJiHtH8O
z?3ocQHtVHe1txybDf}N4cQ!F+4xR|uBZDwYa~lE@D{UFUM$k>@b4?6HTZ9hhZ))n~
z0<i-Z&QGn4kpQO29)?Q=CrE0h)4%c0U@~EorlBBR=QK3;-41RB>53ag-8aiL?m$fc
z@c|(EOsU!DcFGNmGYF~qy@*i-N#y{5gh_4}w}t%V#NYn`F?w!qwjbdaS2)}L@Te=w
z2i%#s1@RYbBpWhat0R?s@i*hx&~4{+=c=~!;nPjagtY7~U?Csc24Eji)9eX{7jVzB
z?$_i_+UUCeeoNUo!AfT5(J7(fd7oPFRlKQ(a=aJ~_3D;Tk)TXvFzCmaXs~Xj%W(iX
z+FgCq6{*U_e{<W+XC$mzc;}XL5_Q|pa`Zvi($Q1E<InvwVu0;+x(Fk_C36(^jHI|d
z0XHm$+=jlGko{2oSo>ESuqI$a0Js9amlsG4DA=+fh74rR_wli^k|f74Muib*8f1C-
zH(etrKz-;xO1+9|@z&OJTKSn(Fc|0$|LQ#t{#^2)nq~vWj|$HbTL|W64`PL{Ws}3D
zh0XUYc1peYXNIAFRIPUS^(UH`^$UD+kQlP4z?Fe!PciA>o;RFx?woaETr`70;W)C;
zi|$pMv#VsarOL$=0YC|(GY3Py2aXxt+$n5J$P?$>zTSVTAtpLMkb(+&m|tP>+<`y^
zeoK<mt&GM7otVHmw0WkCmbpnE5tK#eN<RE!mW7Fe!NCU+I>Ki6w{`M*ds<bpD*Lt>
zs-H@xod|0({0N|@Bpjb^u4*_tH8ghLVta6?kl-ZaM-96IFh<bt;PE)-06lZv-`ofN
zaD)UFc0m>sIqMo&$IH$$w|%rjj$kXlX>RYV@f$mQofl;;(G)yp_?5X=i>@M3TZS0$
zU55e2#mSuL9Rlc?p1L;^uT_mLcL0;M)g=}ppJyEEKl|p)&D6{ie|ZvuKNo8yVVu~4
zU&xHy@3_>f{<P;0H<3@yBAFQV&drFQ2~)-{XVAWd*znq4G$FsFEU~uDTwNwz!VW^8
z-(0WJ-}zhA*FjX#1l4eVHnz`At1j=3EqsC9)g-0*`XF=lpsKA@r9<>%d>K;o{EaX_
zj9B^b*>2vy_}FvOW>;waVORPMH6?~#eqrr*K2;47KQuf&nAWS%)Y$y{xK4zkMMKQP
z$r5!O?Zw&g`L+YJ0P#cO^mt6?<%w4KAti6w_$Oo~Bt;@g0at`Oayx+e;>i5wV+zV}
zdoB!~bc&X1ApfcReV>}j3YY~2?`0VH6AjP*ghh@L2?}lwMkEG{%AT4Z^-!)serZGi
zke|n6=@(ei=+u8;EgJ^DnQiX4o}T3C09EI+E_v_-byMk{OyU4kyOMe-6*m*~dj?-0
zad!T#;Ue`G_JQRM>0qL{T^*y?y)hrifauVgPj^1$7hVfmOIhx(ZKPig+0E)R6r&~e
zuDQ1R+p`1Vis87t-^3&|`}Wgi!|aw)Kbi`Yts7vfQJU1ii1x@T5mqGJ8D)^s_Ve7E
zqGv#B>FLgk4$uzwY-p(a&o}Jmz8D<l2G3=Ve(@3t?))1Dd|?;JA7C9akm2g4?E>Uy
zsD=X<yuFg?NEH0$OAXuRYdD=~H5f@+H{ve)TC3j>ri%yY->y&2Va4D^k*p9^+xW+&
zPV|r!{~s}+Y7V?TbakifkNft9B)(A?Z<#;1+#O=O554-jZCYoStTy0*^--sp2?59V
z@EnguCJcA!x_6Wpl92w~WDw4`&3wa_pYGOeuF`wm{6X=Y>KzhD=16+hoi~ghXe!tg
zNg3U0q}gy}5>#+TwZ`s?nep<0M#;@LWcog4x2MJ`w^HOKKIXX>meQvxU`>RpS=Qh$
zu&rJG(k5gpkalNOMCXUX3w1hNj&0lo19Q@SwS^-DR{L6sU%}r1Cvo;_3WfC&3ct*r
z?!A?tKim7W8f-)h2-CF>PLv!JvA{Ldwndc1!j~0!`9e~|DLatdG`U=FA3bzCI)stA
zss5A%1zy8kVzVG?u$Jh@j<=tF<pi$XqV~R%NW89(%#r`S!DA+b@>zx4yc=s^fuLme
zd|>(%HA-PcInZ8woqF`IQ!APIs&{BPlU(%xb>GTpF_z~JG|}Q+pdF?vB0g3P>r4H>
zuJKFo&*kV6mxke->2F4iR@J4$KV@I0#QW^XvUSi(bet11F+lX7MPsZT$sy0{PJjG%
zI6W5_565}!U&%{%h0VG@kgh@UE!kR3eV)z+mSstRZxn9ROJ*^!*l#HE^kSRLK@+I9
zypH2>W3>V<#%fk2>@$#bHnpHR(vI#2&-a@UxY%~)R1!E+1qx<0Q=x^zFJ9<K1GCel
zCmII`IjH##W=#wsf$6VmudQI&wSw(Z{apFGT|6c03ml%tW1ChrF=KMiZkp?q*VuOT
z|Dv9RNP{Gjy8bHYqi!%V-J-{Pb`<&!*Jgut&8Ydl$8*sLr&g+Z=7-;M`sV%efKk!!
z4UuBH<#F~`s@S9EG@|HT?t4^z^y%|3C2uacYDVQGEoK2E(`R-wCaJc4nv^sP_5oCZ
zPYzcv!FbmSMRQ~os>4u&pgZS^1&SbD^@QGvA>W`8Ri^!T<0gk>8M5VYX+Wa@9YjV@
zS72F}y?gZzEyF}ffMdz2olSJKs%yZhGrliAOyq9ia|LEQ&pU#LsP8{YUR<8~ZGbV5
z?u;>Um+iGrqJlL`JAF2J?y2(61yeb3`4kXjHI;Zp{X2py%;CdX20ocC^>xV<9(=Mh
z2gP>7DKIhL@A8~Zl}ZeI_9%6$p8Oo4Li1U)ln1H5c+8~7G4v%o**goM7WiBd6q9f#
zR=>fw;e@giw&yM=lMD$*yxa~|931<xA+SdoH4XXxi>4*APvpv1xcJ(KC)NnYt@jtS
z%xvoMH!x8Ezg~kz2!*pIM3C3T625y&RVe*cY6dasB(UoCrr%uA*r`8Fou|JyyRlH&
zV?Fc=Qki2Rq!zpnD?vkn?fkmYvziP1^V2<7gym28OHu_5X<o~WFcT8lhxP=1^13j;
zE|iO4ANDSvvk5-Eufpjl-@J)YIYi99dH=~O<lPcLDHA=K)#dv5xs%sjaq;F<-9eIH
zoNKC=%~dwX5vH^+XE<y7U)H*Zl`e6wmZeHXp}(T(Y4tDtYC>Qd;R^b7Cq1@Ot$a`G
zJW5!&$GJ{SHGCY4p1r(GXLiili@nHDNwvlb-5vb;%$4#n2Vgr#j^6rO-QxTQr}g{Y
z>rB^2dB}^0qb?Cld5#g}1~#rZ^07X|x9Y@qEj(aieASV$dla++>^qNu?+JK>zGb^6
z!h!ZUig9z`B()9(9wE{1KK--krp{_I1bb}IQyXvhFAXcdKu49K5ku|>oG*AmMbiE4
zumh|Gdq7WF8&It_V<qG9wsG)}JJut*?qEiDPRMl=X~*hG45;Z2_R<{b*;4gY>}lH4
zul~GA$4uleD9ZX{PCtrOgZYoGXizcjyEFBZiQ9+KPhsK29ZWVqh$P7RiWH74@?;u=
zHS^fvt7bLkjIBGZ)!VK&0#!siC*`y{l}DXf^<boT^Yi5|b4wPw0vSN*)ce?p%X=`i
zC_o)Zw{izdm0US9D$Q1ch&E*z0q~#>%mMn%9w>}V%f?7jgUi;q`?o&e{9`$Qplvh;
z?QXtRIVgv1!=W#8p`AmhS>G>*-GKAjsMi!2js0hi`>Bi?xr_z<Gn8F!dAHTev7n!%
zza0F(T>x+g_RM+MCct>9T0R>20GxY!9By9&T5Xw(K#YAd4eGCNKI&wv+PYzgWG=a7
z8+XGwBwZ4FC?NZ>{|m6)piXUg*~X<{Fa=d70<HH(SAIXDn{h(y&a!I$`C$#;O}28a
zd=pXj<FCsG-)g8|ga7XavUP|tja;>8%r3k{vJdjoEAkktGH58PbcHO2#|eIub}=_q
zcXYg~FsEB#K&?Eo@86K#$XSmwfpyoQnihI|n+v@!ff?U>n`os829P`E8S&5E;k~2Q
ztIJ#f?DmDyeTl)h#t&v-YwoXjDnx*#2;59Be5)LZxIul%V;-Yqr!gc|rEzSDrDCMi
z+{$S@M4X8I(8nqnA3?vCBpxG}UKF2Ker%e~7}%-@m#aa{!c+~DLZ{Xt(Sx^PVfD4a
zsc_J7d@SU)njz>ZJlIvyu2{#KJitpJoTKo@shdy(kSPt$va0i4<0QM)zk{-Zs^r&K
zaPu>|8hiR6?c!M(5*C{n$1TNlGb#iyJG!oc#eRgar#E5Ze3K6}RuL2vqtYP~CsXed
z0l^fCGjFZydMmcneK)Ku245+5_9YmLMaUf73l~SqZt-J}Hm|nk=t$K>z?$%?K4_h7
z#D!F?@ea%7QaQq8TOeuroYHam#9lYS+WaR8#=IV&<2XxNUIJ?enbzRd>DLyBv&AHA
zH%^J=rF8$T$&cW-;s9>@PVevVeIOtdMA5~@9^d$EB~ZG|cJ_n%-}_zELyr&i_7-;p
z+2hpKKP$tpzJ?06zsi+{MiI+xWQUMUkA9@<91~D`p4UuDycX;V6Z!DR)Wz3KiZNEN
z8n@(NyF<PBJJ`=my2?H7BUeWV6s`BqHX_F2hxom4o#e3=<0SsC;%`Es^_no;7lw@c
z<eN-b68XiS;-zYrFG;x0of*2Vd>X?fcN+nDyLHe8TeYUy&n3O^0&`<8Ua!;H42*+8
zwn6D?mD)goHe)mXpN{4B%6n)87qDD_BU>xj0f+73w^mw-PYBy<iHP;4uSuu?XKF*7
z-KhiUcpvp*s&XHCI{Wwz$2#~`>&gUnz4-bR(PuZh{NxCf<mzdWIcCaRUzE9F+&uS?
zT2=fD`B{iu)#K_f3_e8AG;hDti@Q^ej2t{dDyjWb5T)W83yrx@pP2OA$_vWSrQp+B
z9(+T2C7<79={$S-3S2r0w(s{cUxyc+#iN>}&87cx`F<Onle`_R)jtlNK|!|@|C<Kq
zGadL3PL1EC!t-w29T4({>SEsYz28n?%^&<0;SO)+0PEBUJ(k6iF}>y}8DK)=JJKDe
zhfQR%GG8+<d6&|A%nyJC!4cbQYx(89s|*QLT0*H<ADkvGKT(`w-Mt|)*x;fmd<xhq
zf%l7@GQP=fHZiLfo_HW_W?Abv7ESc%U~}9SFeSnkUBHVAXtTq}9@vfw*pdoe4;~>7
zm@h!8Ey|!C9Z`P8mhIOia^#UKa*S2&6%Xl}RkcHU`Cg@x268JOvsxSwMmHMrC5aY9
zOe0m(4Uq-+I(>Bq93PHbpER4@&1%#siPdItOH&QM=9}s&tAC!2+ciK)Vn$)u^|>PW
zu3H4jB>Ks%bP=KGKouv;FzCo==4s7{Jv{jR1p<qLnp{|zw(@?G?#i50WwmDIat<)o
zV~DF1o-Vr<I@v5+#^1qPlqnBngZ3!#QL_LPlmzXm`<%8a7G@OPWCYuPc%O&-WR)VI
zdk;AQUNh%GVdq<Q0_|5_2!)4RhM$=$VDt2M&@$O9%04Xu7%4#77e|Z!j&ct>Hvq4a
z+wIEJ%AammY6?&DoKiYt2-!sX236y@(bk}4!oYs;zYq7poQ;HXsJ;tBrcA}CD;OI~
zhu4NV<AVMu(XJ1$^<S{_y#Qd;z!6P*paMxC%ROws4R0C;mo?sB>)s=Yd=G9$F8)z9
zZ_X*9grFuJcTi`HH1Q*dfUe_ec;-`#jPbH4R|ENt(anhK(rc%eciURBEu6njiMLSD
z!_N22;W!);^cZ-vXVa|zuGx6K!KG<z6wA+`_D)52b5noJNeV%P!Mg)Mg=>i0eh->*
z-}Cq-KkWKV?5gGISX3{V%LNH~(rM5S9r|0x6&HFcZVgBo!d#MIYrc^menkT@PKq?%
zEY-~SQhsZ@ctrdt6{$J3WASHbZ8^=~Eak6ItMR8)(Q~%i8kRm0_V(IR8rCy2PPIB^
zNhs#x!c<?)Ko*8F9`dwtIE9~-ztPS4*d~%KwDkb2Tj#pWaJZTbo1rUnmm1sRIzrT(
z7UImIK8QsFt?__p@|2eB_&Wpzz;~X_Qw2e+5F^@&+H{(btmA9O6UxMMfvMb;@$<dv
ze}lG>wus?(XCdMT@oWrUbm47j?d)B2Tr+3J3nT-NMXMg=DJbYM8!MKUxZ-ji<xq5T
z^{^K%N#m*v=Lh);nx9WGf;0QD&s~;?yJ)q~CNhpjU{Cbao#=yvw9=Eos|f4?tl{34
zvB=?y*fFKr6U1~j3~LSP8QX_7ek;9%*Uk=`Y8*k&E&)bC-dF{l){+i5rTD|#gzOa{
zp!@m><>03~0&}ZW<c-B$(3n%I4%;Wrq^uwLj#zsX%&-3FnDB4xQmq~veh=9b4ZTc5
zyMB#GK{{(?S#H@3rG?(?^Dp<josnTo7sZoY3v*1r5PO<XZFS52Gq?NLK<bJ1BAUoh
zLEg2uG?y%E@5hh$U4CA#DPBhK6ZuC5%MG<>Z~R3b3e4F!aN6UuCTc#k*|!0*_*A?J
z4P-_8YK8k7gKJr+D)e9f*{45e#nFv>$52Z<P<vs8FKJA39-w6+8zX2t)=pFo+4aYm
zU#Pm!6Z?aX;2x9UuP3oM`x<kzC3e}br@WWQM!3o?{EDg>HXk3<wV(H|6}Jri;IR0-
zIP|-+Vz2a0gvEHz(3fF>sqOhukB%90ueFlfxaHVgtCilI=A_F0u_L)0_^Kd#Jf}oq
zGk>d+1Ob`B{MHrU(;iFc$tvrkWYy!BmiGrT|K$Fy0rKs<>UB>V%>5Wa{Dz6lwi3{?
z#g}PcI^2$4zY>~ZY0^!?CkzRwyxG*A<*h?dm2HROz`;4#iW4~OQay9(>D-rk-_JhB
z^YbyK@de};Uw|;~%(osaojZ#I`+>{J3*`EFQ#KTP9S%*n@ic*g^4iK{>J=fof{4JH
zqPlTy390aT+e5?i{F=Ark!Lfd^#e;;3+mj4B;2~e>bRS`(h?P&+wr3}i0DF{ixUD?
zY;V1%=I#y4d?UqSC_%oU^Xg?o^P9iXO@4HL5{N;0XRam0`TKT!f93!$SJ?bO^fmw7
zmkBm~Zoa>R+>^+O3Wt69xecVmr&Pcfbe8wrd!Pc2BxwUYt8Kw*<w7L++|&!&dsf(=
zn9J59JoxA+P5v6Ebm0pVi>ns8%MLknKWA&eG%b%b0rCg8VT-*l^zQ|LH-vZ58scrW
z2;#Y`{K$*C6cxseD~Q=TY<K7P9gr&ip>zq3mMU%r`2jdK`TU&T1Z5i<N*zvegHCfe
z+)Io5t+BcRPX4D<&dz`B=C!Jy6#wN)zIt{jX56N%gneHhB`|@$?+IoR`JMJGU$cO$
zX`(v+E_GEYJw~UV+s3>9_fM$aS%kHAw|U!#^KShT2^04%M}34<^-VKXZQmoinWkV1
zf?UN06!)YkaFKZaSGfV{!@{z9VT#oxIyxU!sAXyH8$tJzVl}2tt0bSkEiC$zdRMsz
znpzsv1KrhrlWp^s->z)_EsWrX{Qo3V+9J<6OwRfxxyr2gDNWP*Mnd7mkKx||4xka@
z=MY|IbFHNRihhrhg(oV7qXn!Ksz5d3f`H<HG&(|>@XraFY;RRx30d4Oo*-e~Bjvwg
zG;Qy}r9?M)%d7S7yWkz*4)=FtY^!usaBTiWNHBXA@s<bSDIfNLM|2`JrGC>}IsfNw
zZKNUnaH^<T#4lTo6}sgjPn0+#R_SpCUu;T+nm5y_mbo{%KPh=!1&p8xMfp&m7rbgq
zEGIYH6Mbhz==^b5L7*Q|e#b32(Nu~WTny$03XoHKwbK`99zPoO4)m=a2oR9!((|ll
z-2)r{h1T{Cf6(n`zH^%JbzD=X?~-JX&u=h$3~<i(l$eDzysyp}k7p(|IBxCuAo#eb
zT0BhCInOg8)b!ovVK?ea=-~@6d6C$xjT4QTuQsHtWqAuLv3tlc@hw=VMVL6II)G^o
z`ET5wFKIDnk9d85i0l6wBM}2o1v~Hfhj;I5RQ&;e`)c$;s{AAvBzO|s-?i5FK#>XA
z7+FhtGR=O3@d6|GC0VUaBh+j~!gRLoB6A(i+a2#W$hvT65EFl!PJ-+;8%dqtBOLZi
z`1fD&pR%w5@!Y&-xlj~tMuFF)X2h_^1`hR<-HA0?bQ4PbJ>r!{@Zgdq$L7^$_}w02
z;yY%!<=<;v_Q_b|HXhXJkm(mZPuf1f2A}889L3Qok#kUd<vyS{>07N85bU?y{*d<9
zy5N;JTJ};m>Ba7n^`ohGvMw7An*+wz!|(r?^c)vZ{-`i7=3jBeu5*$;t?CCAv1Ock
zBV#B5L|7N!1Kb@}(NEZ$c@(^pa;3}z#U)m(K^{8&2rT=-TUeC@P<?=MrAB_ME2ATi
z^kno;)L_1PxU9fcSzsELgo4ENuB}<f3k-#1za8=P|BI>0A2Ec*m{&bdSlpa@sq<<O
z`A<8wL&-p7!l;*k)?)FFs#<twlUO&|irl^68$;Y24H~S6Cr`HfX<Vwal+ZQp2crt+
zR>i9m)`iL{X5KI3CgnqNG2SeFmBYb&to&k0kL%K!fROL9b5~9MvvPL5v-Re#pfh}j
zDJK&8o1i3g<H6AE-4E0ZN(~!G53B;QN*8|had@7~tAK|J0#>9<YV!(_WPPukhGpI+
zF4oR~pT5}lRNu@AulmZJ23N%P_DjDA%#&6rv;kLD*@y)(xts!Cbzx)t@`E8om*$r+
zMT~%=DLw)I@vpv6BEdR6A3=$QUqh$X!5eI-&%;F(dr2YU;}iuR_&&O)*r=uXo@aKF
zB%?@vNXl^n{LT+g1bUsI;{9&wyy~n@Xx`+jh7?L_NJ7GVQfVQAA=mz~wgyJ7iY3zD
zWS&lyv^;Rn{KniB#82Dc<~N)#2Dva}PN>1>6o#pZJpY<k!y`*;ivJ12e)G$%uZHv>
z(53;EJ2Zw#r6U&!5r6XQXTZAyLdKxFsauc(Wr+vm3cmk9EszzXi6O#J^2;+n%bmGj
zcww%yP|@SN0@HK>nMr%YlRRb(e6k+2CYUHr%5~7CT-)G6&kt|kLkqD8Pfth^SwrVP
z5zqJBt&-$ST;mO9JxB_UFN61cpgFt5We#mv?D~dgU1J<YZ}*A*Qul;;joB5e5*rzF
zX!<HC-1*3}LJ>@=J<K$0_o&nbCtuj<_&J)@k71Acx-fmn&+Wf@<|?@maLoRgkt8lx
zwBpqo1m6f9m)Dot8+AA6e_qa4G`|LW0*q^M8PJv?@vXBp7=;*f9qNfy8wGC-;+K;8
zRiyucK+-WZ^7yCftM(7uFu<ZmrneliRSj0|;j5}xR1NuA4R5qI4GDo!U*4{bsqV8^
zM}!2_kAQpcYfG}KUgcJH{1`4Sl{JbDWEQBsPw=sR>09uQWCi5a2XdT)9aFkoAGt#8
zKta-KsF1)*LH#~=jLiE;Rkw1{-2-JdM(wEajaL3h*5Qtn59VcaQx%XLQD6Z)^u#&J
zI9Ym-%<g5*7CumVK*PIH4kjJIyvK(q1x`fc={VlM7-0wevOeIVvm*>&>S>G6dcE<l
zItSM^p>W*6p8H5Uhzh_RvoRz~e~$SXp-ZHd&q-!j-ky;~?0ed4UA0;=JSrzH=-+Yw
z1=<GZLE;!_750_36kJ<d+dmzJN?}fhpqVI$$fxy)a%i<k{htUqwdGL}t!}9SsREaZ
z6AAy#jQFmch@9ijo!6`NB$RS`A078$I^9`^2nLa5KLZTn7mWe2S4icv{)c9+egwJX
z0|eA{%KQ__;{?ryE2Wq8DN_*pj%XLUywIq(!qPWzF`qj9W4O=PevG_q!gc%kZFk+u
z_d<z8%IVY+wZ37hL43%teaq``{7CAdN3%t2XwV+*Lq_l<c1LOfG^|N>YXMdu&dY8E
zhB>o+_Glxp`Fr!jD&vdWW*qB~AWQovUQIPARMy6-u@iHd3I@FoqMZ2uy!c=2icYON
zY6ma&PrwO+${u71#K=W9_=TM3SiD{yIzHMt4rJ=hS<J!-$blK={G;udi=TA}?0J<v
zlr&&rl6Ev!pzlzBFaG-W?)Mn1`8yI|tK}=9=C}EDbAvRlZ}}q!ZD1agr+8heOe#)H
z)b`J;g+Tc!$+Twozdc!t|MDP%$O>X%@~+>HEj;JaRDMW9iusth$}=PbuiQu>|Dvqk
zOP*SJKx+Yt$1Fy3=ArdChFrO46e9aM|5CVrb2nI;?CacEHsUEVK5);r3Tv_%OZ;qI
zI3``nJQy1_=etK~(=TqT<&Is4Y#5Nto#o0OPhCMQ2WnJN6oF*X{LJ9&<m#i9B__~9
zoy0~ldo53s9gqCXVW&-XYOddl){k<7osP52sbF7VmyV#?U)c4KfW7%%W%3qnx3an*
zt>7W|Q>kx^C0UW6)yJYsXtqiX=ty$DW8hlaw1Owe?|lVu%hn=<7v=%!?B^2ui0<IN
z%4gOT?>#JWsLs?cs5Nde9f&%E{f348jWx&GPNA`a5K%E2j-c5`^~wq**@ekWRe5@L
zpVJW3TnJ}efxfs3)raS@)JeJ!bXkiu-+>RawDT5=*Qw!qDxUsewi#m>swfv_9LZ<(
z$Q4KUgjGW~?%i)-tmn5F(8n{@5UP3G$OSc)+?Z5$^&BfuQzp|xF?AuP<-cZp+lA!E
ztmebO_^Toy<%D7nj5vZ-FJF#p_8)Ey%aJ}oL;8TNN-zS_E_SiEp@4;{OO1YWczja$
z@XL4FsR$QpY0dVR7~a2E*}#maGb^9a2WOm^)-_$CQkuu&762dh9qXn=CkLXf#zZ*n
zyDI7F{lbSurW?8wy%M6Cgj!uh2R;~8wr*TFs_88}*|9gAokV;cB1kXWAuqLndS~YB
zQ$;+8=`}8RV=B>1M{WL+Cb1?u;aFs4lIGE2-UnZDFY|8kg|x(pLFr-6!V1U_hI>(J
z{x`;Tr&6bHtq6`Z#)5=PpLAAdWWVeTUL&=zgN)yzT$E4(q)9C!g$Yvqv&EMI#H`cg
zMfZmb_tvnX2TFrdyGkBybn7vQ0qs_IjCm3uO9L&I5ZSrdgMh#7DcB0u;*a8NKCs;%
z)9oDY1BjB_Tb&-y#c`6nb>Irnf0UqG<L8%K@?s0gWUz?{w{BSmqsUuo5_mpcM?XGU
zhOF|OknGIdxuNx(PEF6HAj#|d>Fwh1DQnalT}`;#no?w`1l9<#(_eZ_OeywChPLX1
z$cyj6`?s8+4OOenaf2-U>-pL`j{_ES{@lUvbgCSwcueVjE3@)`&2w{N*#MQ^5cYK5
z|MsxwS9csy9KLnn0`3)9_ebhX=H+?f&{E9cua!1{H%g7`-OJ)D5_$~^-r%9B(2vTy
zBRz;WPuZUplnzdAUmU`Q(IED8bOJ+z=DV9qf-;z&5<`iV9t{Dhg^+zE^w%p=;JYgj
zGQJ2a7KDluQ58)~@?A0RmKKs2T&)RZuem*oZ~YB^#ha8@VM)oG*rKhS>mqX8eM<?N
zNV|q)@Db$*W)^J79;-}5_}a{j(Pogv#N?4PgqFS9swLTD|KZ?4Be&1LvzGn)85iZv
zf^YAM-k$YO9zo)*Pozg?yPI9}dFd{wg5=4l6m?ZS9?2fzqYH|bW2DoBT-YVHX6DJS
z;{IH|r=0ws8<uSNO~8+Y!eq5~v&zN~UYB+V(znV<l%y+pJSsn6_rl9bIc4)bj!a|S
z3^G(G!x3G4p%Q=Lqv+fj0{X?lD}#)fn`uIM;m^MC?Cz61{^=1FWB}sd8v>&vP}S|}
z$fU{%bBFoLX@U213TkTtOaI-a0#H5;c8w9ZWmxb$-Z+ZX@<G|R#&VeZqtf|`f9s1r
z9pD;=_n(;W@t)TZO1Gw}75n-Hq%OOjca3TMkA?Bx+q7Ulu4EtKE(NpjB;Zt|7q|P_
zY5OtBzr0L-O!|Mr6nTkae1GNlXdHs=cz(0!AtG4Uf0NLC?}OjkkK(Thnn!wX^$n+f
zRq}Xvm-*kwKhL@NBc?(HT#ke!<kWcVvHwFQOYf|t2Q#&jkkDB)<s+?%PAM184`O#a
zw3x!=z9+>ZY8-f_V8UR=9#lah2DX1Qj*<jbMI7)Dd_JeFQZHoC+am%5MdAXd&dZ=M
zpNn2v^X<g+c*XLDKabMng$pMeVgh0jbTg<U{sZ^eQ8OqV43#19`5KxXbW+l8_lte~
zK&?1m{4PFOX1K2U)P4o-v{C2A@^Z(g8cfkW8deCM&7K3IgI;{3Hth$tka8$OT~g^(
z$#Htw<nBxptxQ8K<mTfs0Sb1uMMPA;3F-K*8KuZ!@w)|~OeZrtyTHKD!Zg=ydow@O
zVDK_yMC!X+EaXNC<A%EZeJo8#;T_tm<*O2>=1+3_@IbfQ4&3i=*sHY^bj?&KpKOJ{
zGCViV<}WOfam{@%p#c9|xKikfV+60dE)Z`;`u8-?jrsAl`RUByv-}yTw%<2H*vnR+
zMzjj*{@_|KT5S#fc?)XbQ=i*yT6oj~z$z4e!-2D+&@_uq1OAE4?%RK3iq<rn*xc`A
zDI9oiMaWFg|E@{N*z(_j=Z`S88(@=1kI9pLG+iTBR+N7cmH;oi?lXaPCvSVdIJKP8
zf<lmX_V#X^SQ8_QFPLn0R0HnKY4SY{dH(09N_0@U<1)UBvw!VVkKweC9{;7CJ63(L
zFwI0q(eyQqKC6<r?2B8tn?;SVz=k1(hk7{-hWoz4PGa{%AB_EysbKP8IaO0vlLw2_
z(^3X*4GAl0U#jkL%Ov4P-ZkfxHhK<E#eggI+*RHUzrRD5h>Uf(V6!MtGJN#mLzWN!
z%R2+*Z<X&9hIy{=_fVV5wmOYyhu>|>$PzPWn9$#tF#1s7S_Oub-{o>PaQ=8Jp{U&W
z)11tT`%*gT#eZ|T#CS70ql;`E3}yFln$WT}sPH`CJOo_jI_aE^xheteKw7W?7^VB_
zbdLuig`*u9$x#cTGyyI=7zAIE)z|jP5(8?;C%SSXv1b32JviuA3*-)1z|!7~;6dG{
zvmc><pX>^pKEF*I#@vXAvx}*aej-{@nS|PEy;quRHp(XwyOz9ND^6}E<l*t7kWyx+
z;hffmC^Z(8{gL~w9aptV05_H)*%LT$T(zr4#1aXS$KBA?mX3k#tOxX*hQysc(I`h%
zt*vw6zGbJ7y{iHx?88W}7>niKJ(vD@m7x%URWH2P?;3?A8_H>Uxzyedn21(k;xEk6
zkD>#YV8fcJQ{Y`TwGVliD#bus@X~`o(vE?Xn^*J^tu+A|YtpIN!7_bsVq2@|5#hJP
z7vY6O)R#)(Gn`?Bv=vz_Ixs7x{mV!u7b_T(qAT}1?LUq+v4h*s?no&`byyxdIC_!j
zzb5!%)L7rw5~e!vl`7ng3;nnCoFv1uIYeFI7fJx>DEprTgy_CI>k}aPlJj)leSit%
zR;>OIp{eo_%U?-y`sGT@&t$d_ffDG?^mu>ots(Yw(jGuj?-y+@j_9~vG4l-p>nZcF
zbu;f6c;Rb<T@U#q%6k3t!2^W4$AYH63~aI@A#mB2szLBn{j<gWkWsVOMf(ekl~c8K
z;^t)P26IzJEB`d4`yXrD$rIh4N+`1iQ}B@kQ$%0)OMAnz;N%(vhq?d4++xj5m+7Y}
z>`A#!lEpOs4X|X|Wro<}ZDBQf_ldz7Q6i>Cp&L1^=ZvYb2&P=7tp*J8mD>^nrGP|l
zWe@Z)KGLPQ_Fc2++qT1j301iu<TIc_`n=NczT?1-u$m57A{yWG$NHrdK%m>Lb)8=c
zi|s@^n_ihyR$W3h9=3skSz|lvp^6^sENA&`7|ckg6dH-IF)(0!(6Ldp@QUbkqSEIH
z?<pv5X(|Y1lj@W?@;;Yys;|w_*}Tvh;r_P&iX$CwD8*;IO%0dUdx-%FdWyM!81-3;
zOJzobc^*B=DS2VLuv@%!%qhod?`H}2x}rzyWG}Vm(Il)?8UO1aXk((B89|}fWmk(K
z$QCZ3VPXpQc+UwNUuJVVu%GH|Tfl>;F(I%V`JnkFxQlnOi!lfY0k+^5(Eli@=%SzD
zJyoF2O|vb)T3P&8kH?xw(gL{uX}9JIj*)J|r9KL%NP0b6T?tLL{e1L59na#Y8@rtL
zS_tk#oCjT~IQ~QNMKy=fFOdEO79Yza-08^>zjw7Bp=!<p9*A5wCTdxmFI446?X=$W
zUMy8(a|wa5|7IU?ei`Mu+6}M``>KSt80+~q4Q#Y3-}xNz(BtJrGsQQx(F&Lxyu{Ik
z*pLzSgjJf1Je77IL?b`ejm$AjpCkGZi!K`2=zz1nZw&1dD1nR;<hD1qF8+~;O91Xx
zZEJhud8$}PIp1{h+j&+>oTf09#sSm|WSboA7O?08-wFJrADIR&buZ2L1Bb2^%HmF=
zK55>2U~2qBnqY6jh>z2Y%#ifY<f<?Di6m_i(w0&}xYth0=B>9kZcNQ$1S2j&Ia;vb
zX?r+{8C8~w{d_lxKtsDcvprUKahEj46>+W4rJUx;N7U~mqQ4g1q8+uZLXMgK&sAIm
zu5fqM;sl}<XUY!8QJN^X9;mFzx_Q{MoU{3Ty#<s2w0MPmt?2GdFG2?$&~<?(`MI)n
z$C_ckW229KbFI*cv@ka_ZKY@fOzY46EaG1cuEO&CK|Zh)M^X!9vTh7R_1r59CuYPK
z@nZ}pP^KELSAB>my`jR}|7Nr1kj0PMZr*Z7$1T|GelhDwKUBl*WB5(BC)=OOGL_K;
zHl_3FOe=xjILTi2_f!ra3Go!YQI5g(&#jzU-I;f@6*L$=hm#ifA$g^%(6^_Gm1ev|
zT0}vmNJ~+hh+pT7wOz&Ro)$MhU)1Hf;N@|)4ao-0o?h7Qwg=$5r&7tdU0tkKnnga_
zeQ>3!9*6(X7N!3sAFKr^O{3sAPjrl`N7Fp4r<djKYjXd(szMqOQdD!%FOdI2Xm<TH
zqMeYhEGdv6cQ(2-|5v*&NekXJpmK5cu4=x@Yo2s$ERliZ<wa=W*a$y0SrR7WS$sL%
z$X2-<XpZFcpe3`BXuydq(ixhrGAEBu-&#Pf7^choWyVY9CZ+=)I+O9V1hlq@E5g_N
ztme^j#T|23b;rMjPS``Df?Rxry*dn7jLlk$GL}?#zV}&upaBe|Wcy3}V)i|;*0{0(
z=PxkBgHYuF+Rv)8JMTBjaB(oaP-Djj4FMbOwy$;{jsp|?H=kp>J1H*V8JEaM3L11W
zzlXN6=K-k;gfYz7#p+Cwi;nnWXOWMv*%R`d#)hWg<#m><m{sfBUb0B+w?4Fv1Q>FU
zoRH>yl)l{qYTp1}+y-$?C@NWojOy{a@d0H%qq~os=}@i10^<GavI9*IS8w|N(6x8i
zmLwt81iC%hwS3j2kTm3iXV%qkPTEV}eL*}0?)UzaQ$me8kJJ8A(<a>bGiBcctyrZ8
zRm19Hp@P3EuQ-Zo6fAuYV8n7Z?q79}5%~ABYqKE*e@eb2U=QXk1{a?kLw|fZ6b(Jl
zXq7$$0uqCRdO|%|I1D%zwqD<lO!AHrdQI#3Hpt}5=2MUFMhC_N{G{ZUI$_%D&+qci
zTk$DId%{U3@l;wGp=PB%ZO%@Pp?5X;_qIsDHR<GC_q5@g@JB|;`h8B$k4m3&K3G>P
zVbeX}+^hVZ0sqUJs&A`jO#h_(*w=QClARG;Rp@q)Gac1q*b@ml+(9EhG+X>)Ic-33
zyw|m1@|#^D-q6K93HJ`DlAI!OB&2?MiRR(3lE2GjOFq%T=fM2dvE1Nv!Yie$sh0b7
zC*KYW>e7se(hl`_3Ue%*IF(Aj2MirAR^~^%x*`;bpl^boK=<9Pf3mWDRcG<M8&wN+
z4a@SgSU-P*0s8~JpT(K}QYe=DHC{1H+JHJ1AnLLU@4akj^B-~?*qT}Svoa*1*{FO^
z@tqJ)kmIMq7lA$bP#u=nh}_F<Y?~KxD2^qWzZRLl;hLzuKtLntKiuI$*uyq=V>@ee
zghVOSr95@IU^d#5&DMMO>Dsh_Fl8tGu^pQmmN9#TM0NqJ6?Ddh#8d4dX6j}T07sUS
zdY_hJaKT-de^aJ}2@-%&is=3R&X)V>AjL6wy#*g>2he+Ukl-sh#O~5~$r%su6kz}J
zm!VF2mre!S@Q6-JQK*?)+roYO3Nkp0#LI(uVB*bxkJxrVe7<47ZWIc|bf+Sqn16|y
zu9p$L<}4WmNQ-@$Z|D%PKqgzrI=whuY@>}*$o5yC_f;cNQ1%HBUDRU`4kqIo3q~O5
z5{x95MOM_Z$xdX;n6486r^gWIp4z>=J2XH#U%BbV<ZdUN{bS?cc+m?*dD1xS0NTg!
zIV)Mwe$gSyKV||je1IX3qqlsaE)FTlD8lv5u$ImLx|P&RlUkQ@-`MF32g9-D`u6nm
zpZ<IHo~iXHh(&#s3rO|!bKWX9x8E1GzFUI&e`|p+w0n=sZ~3aI>s;Gl6#x=6GF~zh
zyCDF2UMyWAcdUz^S?t+l>cIY_?;-r!s0ss_U`NwHYAz%Ofw?fT1ZL{s!RV3;{0!oT
z=*Y9mw!&8bHFMrBX#GBH(^~Qus4KARJ_p-A!ZlH(R(m<9icwz$P+*S8@j9)9TU2jr
zM|^d4e{?}V4j8z;KAR`J4N>oLXF+QdGGBTq)+EsDHVPBXxMp*H_m>F|{`6|+a`?d%
zeIxP~CrA3@b!mNxm*pOOWWC9%Kezts%H-U9pz_XgHTDe`g%VxLe;iuQa~;WlgW<sF
z-+^kbS60%Q)>2qllhNCJ&{9gk((`|S^EU>UX@s9W*4eLDP>{OPg=w+%oxHfp3+F&R
z$S+5F9dA-Bcrh&YBJG|#U*Fo#uFRBRF-7-!o8fAY*Ep*@s6bRS{>O!~8VuXn(wGu6
zhw12?TcS7u3S=J75+Se!sH04OsYTd#Gjv$hg0OE4`*Y{lp*R)n)Qe3hZdnveiPlWw
zjfw!`e=!vJAL=6zc~r#}uSg>qHi9jS9UN&SLc=(44)!*96GDliFY=S;eU8iRSM6hb
zDlel#QU~HIkf9bGWD(E&Uk*O&^%-}yozv27iUTUg1@JLunQ4=-xloR~s|WhOmq0_P
ztLoCe)#a0;@Da8K1AM{co~Yy}=XLWD8(JqQH$ytEB*@VWbmNUXRC?i`vEFip2P)}}
zUTUv)Do~n@2G}Rr62z^f&M&T5VX?5U&>pZI1OmQnUtwr)4M09J{KrfrqE>V1Xc(X^
z1~HI!66K;5#c%%YZD7CI%Fzq;PruR8=B!jZOO+?JU=E*awzTWuI1(e!#<xcR^J9g!
z;Vx%EE5=44;|)N$k2RWo>%633&#ta*?^T7-<9l`g7vbh?-@E<(W97dpy*t;F-T`X2
z_HI|kmqH>|PPGd&p@+f5g2Xd#*e*MU?(Tm|)UEiUGr3bbd9m)ZN|yDzxNHo!WE_-R
z>3Ce#Q-NS5m5dG8!q1++AHclYR-b*cE$5()TSvA6(K1--(S7f?4a)erz*RPU;mtB2
zwgykFC;AftT$+Gqttv1`^}|j2c#>@SHTU0__MqA{GW*%OZ-3TE01&?pb+dugL95Lp
zWjS`y-$XXKFwW9X0M0y|K;3On67;qOH(rOFM~|T+z%NR7c{lO15W0YU*xq$Fi!S>@
zXe_nz9kT9Ff|w$^hs~T{C<OQl%K}$Nr@eQd$w=2nJo4QB%=?3>`jP5qk{ReQ%Kl>o
zd@vp-?UeM)dMnUi;A3Jqvz~aQwV|<hnY^N}^sZ*ZGv=(E^r{bY7<IbT3g{c*!>kDI
zMNuHUi{*!!|6gh_<hT?UpT=SC;r&<P!+WMFBk&DQV`@*+NBNh!X1W0N*GL$@9wrht
zS+Jsj0!=AhmNlT?ZC=Mli^rY3alU%&pH{!rf)mgLx8Om<+9V~Yz2*u3w9j(SJ}Mp?
z+^OBh=Yu0i_|>hqIyH627hi)^uzuK;<Nx68k(c!7)tWqqLF~l(odd+P(2)7;M#Lz@
zr>EjQy?aLUZwB>MapK{RCC7yt5brY~#(&<l&@Ppbe9}!}<`wK;9Mxx01fvhio#ON9
z>e)=1RzQxqV)LMXW=_PWY3c>_f>g}m^vJga#i5B_e=*2EQb1u@Ug7U?J3goZ*_s3T
zyTlEZ)iy5nj!bXxIqS@{l4quMFz5<T&Z}XEzV8d*1=QStzmhmLn6k?JFty>uzLCS4
zEtz@n^#(nXw?zwKoB3A&bLJ}oEZ5)!)WK^dNEQw_0tM~%gVrgb?(kUgyfv?V=nAES
zx`xEZ=MFx7x@?Q4@t5YU-%9PNHHJZ|d6<xmIpqaX5+?XzU9L~N+JmmtfXOh-R_Dx-
z{Oyg~^ue<dUjOnRa61#8B`oBW(Y|`2;ZaLqBl8Q;KCnD9Sa*3dCra!<MrU~`UW*vq
zdFRdd^OKvm2Xpr1{%{d`494j<-3SnY86CoDYRk<U9cJIB)?C~1vYiveNtO<(pXY6y
z;>f2B#!P-b)M(R>trvp05l_utgfaSP2ZnF|4bH(q>{cBTxF8Km?1o}jt^!1|1s^JA
zXKY$eP#rX)E<^Xl9*mlUN|I^V&1eC9ePDOg9uA-rznjk$T-)B28E)5|NG@Mj)ok{}
zoo7+%JaX*5#Yf6?!WsGE0)Dp65_$fFBxnebYW=`eggv@Ab>EqGwWP0$qHF+RE)B$e
zV>cN)v=ua5>2#FHG<ebL|K3-c<N(<X#7CibNT<7+zstoWO_>{klWrfW<*?Z4y9a`4
zl?*at0Wh?PrAXbj*x28wU>*)<9KBf|q0+cQr0Z$N<IQh9h7Q7a4s&H)9qJ>f6)ta^
zM{<$SpEjurx#Ro>@#hSsc@~O07-UB9ya<K3fhN<)NNA^RIcz$;`k#;|_&ssAr&gLn
z7K`bHY+VU?e+o^cce*C=F;=a8Y`vTu#0g+o`tf5i$`q!yJrM?j-@LviTaFUtuif@X
zxlP0sJswU|aGNVdR4hnp&U70)ES(6S+w(oEGMLbF?$QfNLh&&}Bzrz|vT#4zS4(P6
zTtPmfB0pOQ_%-@><{?(|S0L}rS3x;N=lHZ51HPU-59vemEZEdmOow@;#^mXEmL~mD
zOB~w&G%8Z1aC{7H_)iF5r%{HI{9FkLqO2Y_w{7TY=%8g90r4ADf5dSH)~DMMIREY2
zQe<I<W%q2hjRy&QUip*imAFEJCY+TS<XgwoEZ(``ZuR!TP<O5k17etM^c%sYW*`#A
zYY?(&QIcm(Rlf+^)^qqeXNo-%2Rbzqs-s|64r@_1Qi7+2F_T`YUv|H5{A}Z>7NLwA
z_rc(a{8o3zt%dNansRhvB;qQqKVR+oLFIiY9>^2fT_|Y1-LxakHT#@Eq<Mrm1Y<7D
zW10`Kxl{i?K%R6i#;BDqLLX^k^;npPmNxTnrKC<vh{55Gz;(JT_hlKBV$7*1xTK=T
z(D_YLYw`3+?wW$Oc82!UnZc7YAQ*EGHd{twwVWdAZ(?;)0qeD1N8qXqVorz^UR5D8
zrvD!x??ciXq_*<-(g~{oMaer_LL*`4Ef=N}eAS$KSqE&C=}L}OAoW-KdLUi=g$(ON
z_6`^H7&=$bcqMxQPwEx0yDE9YekR#92{=1l-@na#g``@5S-+<LY%6kzmrslo;ekAz
z%?qQrISqb{a!MHKe?<Ox@;@R^0XbC5FkICm@%H)@<~|@w&W9)RL^_aHbVdDHF~+f}
zH4AhTF85+wo1>my`u@KL1?4-kiXCP@3WjIw>Nxcp0mA2VeNge)>whe<{k#6JLxm1c
zzvC!{?Xat_Uy4%De4nqUxsHr*o<=x43e5&mX17@eo{ZCAm9Y8w+Foy#uSmYlJOGbN
z@Ba^thot8eQ1Tv#3F>HM1odLscRy9Jpy5!uX9)E65uO$9p{+fx$cj2KbXz|Oc~y;-
z8zkiKs5efqXDA#I5<VQxJ08xqdY#5&L~f&R;dhfRm-UP3uS1MDx{XsByIpmEE|Z1L
zn!Ii7p1vCfoC|<6n`H2|@r>?N6{8pRrXmk3p|xQJPG4Y8a%2P_Y!W&sUfh;OQNOz(
z=*CaLPoQaWGseZ7pz$-COXtl;nx$XgJn``f{kQvE@4<Oi_h~?O!{fE37GJyUqkn^K
zr&9MhPJ^E4mm9*e4e#?@{PaCsCk^$G?QOD6ZveZ^QGY^M)-0|4^b|F@d8W=QU?EzO
zF4$DrIn)*#@ng-mFos-_WbjPBTR6_AFHUwRpK(A^YZ54W^rfv114kRfj$pSJ_7HLe
z<f$!zp}rHCc5O4*1_pWMOil8}3g6)JHA0k#5Z=k?f$vI(J&EH6u7;iqlEv-3y9w_z
zztdKLjizceG0c>LZGT*g;53GNnp4c$R|Z}c5?>2FB_sLV^~WdN({IAC+RmkIWMKa6
z=1p;%?t9F__xf;XbPeIUOTJSlAy}gg{_1SD)Zl07zE$Lf@(H1r^Dgx>@#2$|o<H!v
z;~tMcSm388(>e|9Wmw|gG_)&l9kE`OGSj^mZ!0`4?Njj>i2m9F%2B0W@Kj0p6`L-C
zbflDAY`=_hbE6;cI;K0%%2@3@D`Dzy?(J3g+J6gr#ksu)^^OHK<A`p3cOF4}ndq@<
zy}tSIAP#C}Z8ZG^d_eM2PCRi4y?(Q&^prw+(&X~Cm5m+QbC=%Oe=u0@$~*N4@{YXW
zjo5b54z)iY!#7RIQ_*Jj1pI?uIsB32nUFC-^&oe@CkCN^Ml6CQ7AGHzRvU~VGa~tT
zaJD~isbR#u;z@Jt%};`QS1eJQ-hL+cM4Al1j3UET>QTC*XDpLzue2n-W!&)Er-R{5
zyd=L?bedV*s1(-ANu#IP%u3)ZttgU|FJ{NoJ2#6=;-HO>j`Ze_s*#0ze=(2@Nog0q
z_#>F0oh&pFwH$s=Wz(2J!);ft2;+rc8|mA}cRAVlI9nuZ7-cvDn`mLr?=jlaiGi=m
z)-~xTNl5PR{q(yXB?5XQB2q#B-Bj!zr%p$EI93XqnkY@z#f)9+LZ42sU<Q8c^q$-8
zhN@8Q%v9ZqEE*&pl}#l^FB)aWJd*zpw0|p1&g9t<Xi!m1n;I#J3U#Ad(ziZUp_ksX
z5Yp`1*L+<bFz8uEo~}T)CgaLywTeG@O;I+pICG^QMJr5vBl2!0Gb}Fkv&Kawy=bY~
zEXV-;dxLE+-t5?UAI1Q|B|J|yIUIxQk54P^2H;2|K8klrbe`zXfU_64C1y{ePft|G
z*&uz3@BMg#hq<%Ng#cqW`oGWfn@)VFd?2DC{~9kQc1AHg>O4pJrB`QR?azOU{U4^@
z`md?~5C11rRFEzuCZHhQ9YZNmBoqWCMu&7a1Cfvp1t~`;9nu2A=<W`2bl0ejvF&{J
zdVjv3+wJ=Y?1yu<o%47;uIqkX6)m>iCm}CV!tWf4cy2#plC||>`y!}g+E$j+S0rfQ
zWH^~vkDf*(#fBx&wCJ^>sd64NXDL*Q(gH0vGF&Q99F&~+zynrUqAEPQBPCKedzs;B
z^JrTISiDAA-@s~G*%|AL&8dW^;-c=szHTPTE&w%0?;K^5HU>oh2DEMy4ezm&zo|<A
zBYd&Jmq?AEO~t4|PVKl-Po15a(aKvEQm0ha-A1MiPCvNzx()10xH?sjJ{T$d5h)Gk
zzhXKw(Vm4J>PKnc{>>SMr0;6_LMJ=2YVdm}W-9Vo_tA5>lHAg=Et~L@a+0PLZ8p&d
z*P~gX@>PW(sN!l3ndjeLo2*!8iIwqJVQZAjCMWQ_xVZ21(yuPeA#s%s5$2d{K901h
zXSa+-+&mD3-8c(0cOE(SvM($-w^&VW{S+e)2mCt%$$vc&`q?f|vaci2@8)5Sd|4?)
z!ugY|7Kq>!U3gQPVLb4G&9hd)ZKT%>AdOwY#H>L)HQF{nt84HFEN41G`C*286;3%=
z6&cZw{6TkwWsKiO*icI4m#M&;siD&bE{}nRi|siW;zvp?9!~7m4)$qRnsFa;9gE((
z(2X7Sb}N1M)sR+*#>S$z%flN<_OXzibo3klJ}SLW)W5;=H#IcFCtq33mhrZW_OI#b
zad&TT=jK#$j!hOrvUGkLSB_*ZNn4q^;mid6mnAH#PWaT2)Fvk!>D_Vrzt@%8s4~}e
zDrGVWRb7YjVqa7-LH|Zr3pGA~$_Y?Yh*c}LkNlaVYRxV@JHQ)isuzq5B=rCX{P_ac
zu$Gqx?fL@jQ7+=F?{(Yq(0!8GU_b1=c=%`zCI40b8~?TAZ_wPE=~j5&2YI=8N{-_C
zX4XpfMO<@>>t`^=^)aCI1qfb|CfY1vOI<o@cl@ffeD%f3PVJ!Jn{KI%!!PXoXHjym
zk4nL9>fvDVtWut$1;~5&1+Pp1RVSoeaLV4cGeYOu)e;i7M9W<u$9K5+TYS2;;>WSz
znJU;mp`+*zqlEXpws-gIBlzpmW>6JyYMD`>7sz6VdgAPOSy5oIFcg{CvyiO-g#}=%
zbMX6i=%m@e;!wS0bkg1*!}E>>Q;w3ESk%1U`B7a;ikO4xzC1-`V|m+Le+4kLrXxV}
zf*#Qic9;!r80oU!Z9LQQQw%R;^KkB23@hxQ>5wcST;v);Wt$2IQ4q^i<8BcJa`<k!
z{Z7%)3lV=lx^9-eY2K+@kFD_gQ>Uy=oXe=A?{{!t`$9-u{GU>QD6Ym7b8Rw%QS`1y
z_FG?t0~!AsmV`6U?*$#>O7>b>V7LRj-iJmj;-pVEjhK&7CEi7<&>z|^PLnOkmZFuj
zuzwFWnVg*i?N@(}#yR1LL}_k14)#L(5N~Ed0RKtTMf$e@PZYzo*)bb~-SO{zY2%Nx
zzdoURGVIqYM}3dsHQ#*C9UsH5_i)RJ1e#}&CVH|QT4m8l+j#E9QL~F`jRuaZLcCFS
zVBl&Qf<1*iZ)1JZ5<r1+{eXqfK$Fl*2;9*!)dgG*ssXrL`b?kxk?s%s<@?<CvXb2?
z25?+McqUJaejy3?TA4jjC4_%wGg6|M5U#T2+{R^b2eWADHOaD!3>blLy~!Qd8O^+s
zPGpI;@KF4D1}k_`mr!Lq1Yi#Ac=|jL{6gMAt1m4?*b~WVt=_>L+=JyD=e!4gFe}K!
zeU4!0|3yD8oeNH-gZ06D7F2IWaL>@i0^d!7h9V2I_C5r9{z@%WF3QFnYxwVya9VXh
zo4<`9Ij}$1Iq`%HIN1CGGX3X_%-?y;kZtn;A(&-23pKaL5#^<W9SBkJRS1Nl9NDz-
zi7?#x5fdC8L8%T2_PM5t>VV*TgpWcnQ?LiID_*;D>l`iK$U8bJILQ-@XD<)0A0MWQ
z7X$=k80>8zB!LZQrht?{p-otKTyN}!7vQP=tSwxVaq+n+-}d4x%OIR;6W+M-cIAn1
zQ0cnm118o9Hqbk(+&fn}Fq)El#v(}`_ssLo+rn%gw%x{xlb$k!S~NYz&8L2z`%LGF
z?847Y#D(v4K-E{cpW52ZbV8S@y*hv!%l?2r^CtY3^2x8T$X5%5aze`3azevhd8}bI
z-sAM-`*uV{$<V<n@z3{dHi?SkGv@N4$2u1q8`5wjx7A?T3Djsz$;Tf6l5od4W?F<p
zE%bd#cmnZm=`n7jLvidQI3;C@Q+)3|Z%*EJ2n0BRcq*R4PAT5#EV{*Cra+T+#*{mi
zO|O_F``6mGAiz&vC#KV}iY>^ypkr*Z9XNm8c6~2>|JkT6vq&iQ?fru8kQ!Q<n{`bU
zq(mP=7jG&^a+SOYi=7pkn|5s(gc@&jsbh88`{fK|O1A1^#1-E0vG;yQgCOf7{ph(@
zGyfzHsLQMCiZ+SZ(M*-i?|kR~gQpVUhD~^*)A~Zk!&tFdu=n7+-Q@YL$%2rpA;{4M
zWFLU+2v!m(eC9v7X|H}`)b?7>xR8x*Lqd`qKRW8K*(Y6%EvcPyfFRWGy;NhR7=f!k
z#Y<S*X-m)x5Xt@L`<G|JN%g?=+*u#`JsxiylHm1d3A<c>Ywyd4+g<}2eI)%vy|lZ=
zci-jQ7+Q`PtB(GXK_t%fvNFtYMmX?<$F>4rmH;STHQNmaE*2qPCAO@|?}HykzmZwF
zo&e<Pidh)Lwwc%6xqU1?UhST`8ka>5&Vo!RZp}Mm$I8JZHhqYTSx~I8XVT9=BcSz~
z8vg4Sp10dQz4Gva>JthD?;Ri_>wYRH0j7n1YQVo8_e^b|XQlrxAs&_i+@1<#v~K@0
z3Qw3C1V@K!Q=T*x5Gs4ucaD(>IfUW+H)Aj15uYegc_F`TA`7rEuvi{j;zCQaf574^
zRvhfV{86hSAs0#sz;QjB!~N(u<ywf<c1~R>gHX|5Jie%<TB&!|y$AYGI>>spQ5%k-
zzh96j%7ahTP5zY@b+QYMXG~MQj}HWK=E?2-`c!0cUTo41&LR9Q;anWa>1CGoeF*1r
z@T~01)>(|v!nnboLB|q1Zl>lt2eKncI1(`s_0Iz|yyg1Hl`K|$AT&JwP6w#m7Mw#q
z+DAz!vphp*eSX>fTejyDS|2w6UI220e+DZ+H0Yb2-Z14)_%SfpZF*&w`84W1wixr^
zRJd(^_Vmv7EViim50dv@_IfVRs7m#`QSmKE89ii^t;OROr-f|EW9)JR|0iyLp;RfP
zZ2Kxn^JuaDB2Y^5>YMKvl<kSuoZ6Gu7gg1Itt3&&_m}W?;!PWH=^Rxz?x><ivnuv{
z<>%<pLJ@;P&w;MWmBjxxYdYU#l<Du?*h~P!Z;a;?$Cp(RqNs6Wn#uL?7ACeCI-0rS
zu%YbcL7O8m7`;k$gnpSerie!bAuo@jz*yX!AMWH0>v9jBwZg<&6;D)<pmhP;<ZD%&
ze@1Bs1Kp$kb-Zu}clHptTX&6P^{Y|hD}qxv${~FXC?s68f*aoL3#n1It-}+|Q(`07
z=!d5zU|`XGC6qQK(U8s0ggMcSwB)XTV>n53=EcN&0~ujcJ!qVjlrv@mnn7mT@`78D
zJ?df_s!-~shu@~~7y#}HSW^KJsCIBOCs#8Cm+s<p1^BiBRwiExPZ`e!brKOUK9<-<
z!F1qwp+o3!^7frG{eZ`B8V#8LQCxN~Av*$nQJcPPf362~@GD2YZ9s5vR~Hle*eJ5;
z01W@BGZ_K|!aY%B;H%I0VYD!D*6M>2j8Z#^5VN)!)!C*B@;KS^t&%SM)@jkIe_rzz
z*j6uR6mDa%3F@CHYQYYzlD?GVH&?j?D=CvdOkX=LJU!;R0?1V?$K3UWPWP5|&+mo_
z^vNEsHge0|dF>3elSvTwsC4Oic%}BEF!C<pcV}?@yKo}f31x72h-z?j$X`ByaALUc
zXt)MiJE1}mqNZO3_Cr-OVH~tq+IaX)jo1?did+Qe*eZnfXqAf4rJ#wU|BrstvDWp$
z5>}Ic>~eN@g=qd?7QhnJ=$wA`zW3$LW9T@?sY<I^X2c_<OO^imy9>ZD8I5S1Cd^k`
z{5qvAS!=bRxGM6zUl@)ZU54Ncfe*<#a^m)8Gb7}J$25fv^yQh;6gx`qr+HBqQU7db
zzIoe=yD{P3?1PV>WvAB|7%4DIolf3!34XI6fWkJ0;7vZ`VE&?DGKQE>M2$OG7Wd9P
zhFjm%E`KL8brx}0IeijS-h6yk<=jm@*tb6id#Le^>7hZWTQ&D?zcD#Z_AVtu1^W*Y
zmz(}n&UY+7Sv$R~e7aF(G`-yuVuN$y_Q|>z9V2ilIFZZke8r=5z38;%)#&IGj6{fe
zg>@_StWqpm;ZYn3$?7xc0to$32AXS0Dk7DmzzO%!a{V}I9$EC$J>p{fLX)}1#nC+g
zH)lpz0Drh-HB47K5UmF>_#fI-7X|0h-TG<(XK=<5_tu`CqR${@B32vlDeN0@hoKq(
zwgqbfYCCe4fT*}dKmm~4PTT~M#ZElEdub{S?EgsmY1QRVQ<cK|GKW-?@-fL^)s1J3
zNEzMXNA4j{xbOzs;&c-a%`Kw(2F<5kFU($o8y1|LI@(VAB%BNbFW_-fweMn~7hn?P
zNYvcqi3IR6Tb-La9Q-84<0CNZ`pt`2aKwn)`JWn-H4BuqcKw+5now^CUj+Ot`tZ-<
ze6mXy?;S(Qn&rDDvQpx*E=TZDA5Ju!F6pEx119G&WV)yoYbqaqDeTK67uM_y;<1lH
z*qg8Tt$L5PVdr9lf&WBaIro+YM(g5c&xF6P6RM4euT)$W^v9)zME0dKn!}q@e#;3A
zTg_wUI5lskAs+Mn;FOA;Ru}ofFYsPcQ6P?Sr!;)c=DhJW_iWUAr_$Uw=R<JC^iYkt
z4e_3M?E~ckxemi`fnUP!{ab}b%8U;}U8t_%7vW>Q;EuNzR;oVOJGTbo%fVu5TN?Z(
zEH8zxtMvqodux)rqZWa`{X^ES6pDz}nNL?6FYItq;BdQE_5HW?i(ZVf#?Y|hCGqvK
z3C`5&1ItWSkO2Lo;Ws~F!&KE>)6+MaAy3;TzYQc*&80!v!Z(-PYS(l?J8T?#5z7^*
zfV!^yJ)c>HmCtW!<v(+I3A)N$KF@=5gF?L3wFlM(*}2(PT$RBMVN`VTPJ+Oa2ezm^
z3ixXg3DngAS4p%A;?yHxY&z>T<n`!|>s8a($}%RRS=k|IR(2ju&Tz9of#CL>dk1Ag
zf$cce%D3!~etq7i={rd5`!|rZs|dp0HrJUrc}qvXQ#{FL4A87H6zjx*U9*TnP7%?g
zU3eXkD0RW2#Hs7^jaByDU8xKj%rC1EaMZV@F*w6lyD<=^^m?=D?snv}PM0Q^=b=5L
zm$0TuKpkf8Kvdqn^PGx26hs^sZL+%a1|<G8k*KX9gpE;TY3mE%L;CUa6yV31)wMEq
zQOJbQ*Xo1b*wuh*01h2<_=2@)IN7&5xaa|Jsy@#nLe3erOk|UCR2`Bmf(<HNiyu9J
zIuW-HlxC*0Rz3>Zg$&Xz=NC%O0@a>zgd~4O6vA==b8OM$W9bLE0X=;flL9E{NaR32
z%>EtO48mLdIdlEUvE^tVS<*S?*bnEqs#2Lk_h$q>XVgM7SSU@n@kt~FS<Zj&vSput
z+-XhRV<ajA+cz5#<?dX4Du`VhpD*-luRmYn$VxkQ)MJ@y&(oS_(?G_yD5O_R0de&z
z?9@uo`TCpl9jk|H(1C6gIi70{5j$B!Nbn@gcXQSFbGb(mJ+CGxJ43oGL4gtSHTV%R
z#^(1ggG<yieG488JB!sdEXeY%E@BAb0v<oPEQb|gq6gR|)Nr}2^9Iaz4y)2j^NMGJ
zI%DI@-6*Yw2a3Sf`%|6XCKg6jStTx_1$N>JYdys+F!D>MP96d@(G%_SQHQZltuD>#
zMU1yD9dB=Es=G`Yl2rj43w^NYO5Bkiap$T6U-0x|;pMknQ$u)syZNx_qS22?=(?60
z&E|JtMekA=zkWOc-Jt)_1!c<^LxWm(j*IwfqPT7LrESIWQh0g1ix<uxVkHSef&1T$
zImrlofD{+UMT8WOUAS^XYFu9n0<n86)7BKI##=89t@g=&?ytbSI<(GB9G_)V1)5nJ
zd+5&09KYkPivFV1ySx1e5bLa*!NPhG6`P3DVOtmhlEz0OQmU8M^iGFCjKnH~p_6{M
z^v&0zNoY0qNM2bX?tH;a8iC#>t$@oWWBQ*f{(Idc7bj!2!y7DI4w|{zs5{?}@`aEv
zUp}I+U-F?47M@JM+yje-0oh#tc02`y0^&A(9x&1X7R|>%DU3s<?7}!&Xd8(joJQpF
zb+#^+xN493*RA+^V1Qe#h{-EpTK}gHlbnP8eTGIdsITxeJLKv)rgMX5M!)YLi=154
zp9-J{X~%+Mhn#I-yM9c}`jUu94^(9=Y>?8-VY%><fY>y2lec*r^65K316?D4Yo3Ii
zlO1Rf7|kVG%a5UxdOko-5RAPah!nJ|{q);KcD}i;s3CyR!3Fe)<gcRtH(!5#hi<j!
zLdW-8eI5wB28F6vVTa3T@5dm0%rC&5CkV-FK?oJT==cvXxm&$=v8sL#7s^)<^xB88
zqPw7zAY?`3eXuk%jkS1Mm=$m)W($#J>^C(67C5*iv66%P@Fq`J?QP*?%y+YR{#!4{
ze?Gd$p~&7j>q_sHQGBE7+2OmBu}300RzkXc1TlE(dm+^1b50Ww3%}^nkv5_ISdLGb
z5d}_iSCgR3?kZQ(F6K{0DS&INo-ncuGP=Z5iF=f1e~W_H8)N>EM=Iv&Tg493!wC!R
zvzw|1)D>~=8m8DB&}xt@&RyocA&_BM+{SZzQ6l;rSsb@EOLkQ?fpPf5srHEYLypP5
zsJ_Tk(vC97I^h{V)eBCpT~E9an@dG;<+^YF#dC$=f=(~CajV(*;U%2otasf0zlg|}
zT-U{B2^gvDBllptpFdI`gk1kyj=Iiw>^HVwBeXdOK$xHe)R|S4B;@5Vp6VoDp!1sA
z@+cG9o4tkjK5w(v?Jb0Nc>*k!n2c^h%Rw|RpDfD$A>%sIPg7f+$}G;_c*vCPk8x{W
zyMJ^B8E_t#jNx-F`b~hG%?OZl!+nJh@@UA`D~ex9gcSwuw^MHi^Vhpp!yUPMfz80|
zlia3oUEIwDVxR)@+XZ_kQJip+nwf=3rz;p-PRCt9-gvvVeE=*NC8d@b#kRZ~B&vF>
z77v*J)J}R7b<T^+zIIfqf6>5CzNBA!0S(4Rw1r>>G{)3U6RB@)5PLn4W#%RqNw9l3
zo5;GQaSc%_{Y7!{CnpwOv<-TxqW3j@6p+pJvP`3i?20Zi>$fqz&mfL=)4R_>r7uw$
zR`bcFTXa-Vb6+5oX#c%@h#KzqP7$4!@^C#OZ%NSP&A^Y>Jk(hF=Mq@o`A?dyxAnSe
zIFlOvzHdR@zn1qRsNP^{^-?Ap34sLZgtGHQwLF{c&diqT3!c~j+_rq4Lt}h(^T=2N
z&HKHBZ(p`{K449*Mz)4J2|%<B1p$a=7F?0EBrj=(fuNJ@P^VR%HL0#z;)%1))K8<#
z)0SCBrCRd-@A!l$x#MbBO-f}OxR8<A6Uc2*mogvHE9uquczGckN7;epqXjhr<~+7h
z;~4kEt}LeDo|bu+g&gnN#Z<BgsUP)?=fvcewgq7L)fqSX+5NX|p&<%S%Piz3#=37Q
zEi2|(Cc&<vz%nVw!`TVwJk8+m8EF2a_41{pb|&XC;FBduxjuoyfN~Kcre^0LZ;wm>
zg?~CF1Q|QZH!f*`)}(ooAAU9S&cJ#s#Z<s~BJlT}9i6fHz`l7e3Qa2$!v?&$I5ox(
zyRd$*N~k_P_5Gi-K%j^Q`xMlCZ1e1t0>}A<)lUwP6Ef4o_k4bNMM$G><qjn-ByC#s
z`Ln-Q8S(`GJ&2F}huvLup^}!(@%<<*txvX_hsGS+n*UQ#chcuzMD~qEcrAt5bshP8
zN#n1NuBq5UzOJc+U=7DQprYk*pN*`#RwQWhsWdaZZ>u&B%_5$M-a~2xuEQf|65x(i
zgcW?%zqw0R*&s(#J8|ag-h(PXsbl18+4AUNuR%FL_Ybs$E`avw-l|gEB8EJHFmTYN
zYk*!vNV-Ph5UFozlCe{l8xP-j@>=eAe=5N`e$XjXUG~5$-pY=1A@rvID=N1BrlC&x
z9^D<fBviRg%GFEr@Z3sar9@|+B5og98)hl+=Rt0k*W)Y7g~GheW{kI2O1x~0IgiVN
z*&bgt(~`S7+*^EI5xB3JtQyvt%Ji9>kDc&tq0fi~oH*~8sH^EY*AkBOgxw_nd#ER<
z1UJ?aW9ZEYuUwE`;4(Vq#pi1nZks)uVjbBMk_=cE3`i7dv|k<#ZdIR~rJ@v$f)|x+
zYfY_Y=aatNf>Q}(G-kdwwqxPY$J$vAFuZiR{BrtbG_I{R5*x@1K*PvF_VZKnaim0D
zU(F-m9^ImAy-TD|DT=4=wH8lm?_nzUqZGKSZctoyR&nb^*@JPl%W4tLg-?kS!auh!
z3ZBDNz?r{Pq@F_)sGB<dDCW-aXEDoAgYdt6aj_v6-VbF%=|hPMwJ9GW!Qt3abumAZ
zo1DFG>wE1NUl%Y7|05je;Ojc%+jJFRGk?C$wAP2-Qc9OnX|;$xU!_nY!F>d`KLKB+
zO17yk`#d~j-vEB`vrr<<(K~A`;1IN9cZ?|lUtcT(Cy9i$EBML|-h5pP21b?*AsJ3A
z>m)vQ0P@=`<l`Z^_du=xK@{hr^fDp@xpjnsq8g9zi}1_MWdsHlvVBAaJ#|KQ(BWpo
zywlQy`3+2C-+uL2CcVFUT8)QG;mjRj_i}#~2YzP?g^aKLd+c3M>91$q22_}rP(2mX
ziCh?7{nYuVxqx3J9;;E{C#o(Lry}ZJrc~!0R@;M|6BPamcq<P$43U$o*hGwZ$W%f@
zmLhME-$rspzK+Uqiu1&1)ISs$=QHXtbjn{BW5Rjxix8g585}sjm`$6Qzj^GXJQdhJ
zom#Ov6Z^gdd|$=G+b-rRL|<CE0P6AqxrjeU9SBAS{8|?~Zn5EicUAbhZvnTRF$;1`
ze)SYpyPsI`CW`nipX2p!KvXsAE5)mt&{Y33%yt{2=&bg%Kwk7gOo^598P*OMf&Ihb
zplI^lNxUwpeg#J>FsuCoAN`T(4)q6M${ZhVWWNCD{*?28p5c$S|GV7?;7a%y-vP$N
zwtz7xcp$0|dadE!MG{=?6y5b&*_|BMQ#l$z`q-e5B603#-w&}LnQ;F}=|1)!h~kjG
z6uoxM)-Q7vo|LJ@z{4@&pjSNLvO{59`R97$T%y}Iau7?Dy-4sCd5rpd{NW}fJMEAm
z3Jp|Z<+H&?@3gAel9|{Gq`IZwn;y+5`~7~N5c9ivl&BsTV}^2zdGhYZ`xqVLprmK?
zwc_6p&jbbITR-9n)a%d-=zRyE8rI<cq!x4uzr~83izdeh(oIoYJ^mA(a)%VUMO{n;
zxMMAbLq7wvaHNj4`{PCI%Ri1dI%C2lW*GeOVy<|5X15ubk%-HZkrd1T(HP9vy%~sW
za(Vq5KMExr)<tAiJ;%qDUY*u39z6o1FC1|nl1Mp6;=V&`(c(1DklOaHl{TAU#I*+e
z&$T=-1AACZ5y>%Q#NE6&qxsmUTde-CzekpsLc3Lruqg+u|DL($!TyA>#)+C|=SY-F
zA56@idjM(A-C~ISTZ-s9bUPJxSH@omu%9OG5LU<IV@8*xPQ(tTE*yZTQMDdhv|@+U
zYvqlE9=^RBEK`#b3)Cz-r%6iWeA>OgUe`rGb1(Xq`>y<`L|<nYcaC{kp~b7>#d5R7
z!Cc>aY3pI3WBEO*CkjW<?yu?Qy}cw8Iu3Wq7j=bK5dU@i!k#Z6`#k&!737`<*Xoxk
z??(uTPo8N2&NnO2nN30V3Id=Yfv5h&U3j@m&?R33l^!k2uM(dc0Mm2-n(9wIU`-S-
zZ~7?jyn_4T74!;0kW*klBlLsE{x8uHKe17d$X|QbfT8<7Db7{$FQgW~>T?WGALwn_
zpbKN%-@D})$faMU-`MgRj@oO?gt|)>7EUUa*zlZ2hpV@Zt7848C}+(#mu;=h6YeqK
zEqRi7DR=I6J`wRB3}<@lO=1+RF0Exa3EA4HePqN*%EskW5`YBBJx%(0tKe^c*r&0j
z_Fa_!A^I;fwd@H+>ZT5$xWbNK_;YuG4lC$JC^kDrTTM8)2Hf0F3|4Nax#<V2r!dkR
zET;xI-{JPu3*2qJE&}6bmci&K__R{KbV70oc@v>hp_AC`lK0;J)AN$brEwVU=0;}Y
zw<tEr+ZXy)>I3G-A)Y7{z7H~=_LgqMQsK?;R9s3rTg{yZBIl(Ec?QFJm@KJdi|p4Y
zTS1~a;xW66m=0J_m}Wy07Bxk4yUSeix%i$A{?6daSRb(hP};@*elPi*QLzQm^3?P&
z0~)ja;;OL@F$BFywoPe5W8@dJYI2fhY`5o?vDK!W=i~ch2v)0Xm6{5l+I^DlHQkY4
zeQad#Wb(NFd|lXLIrgvf0_<j@vji<#fy6VaWRK<BrXVw=fKtCh^pG0BpxOoe`i?@}
zbtXw;E=_TcZ3wX<k$PB<L?C?~2|kZ~?;*9Un7Qib+T2GbLVI4&V~|y?iJw017$|}m
zF^ZYnXf==o`@O!gC$#5A01yZ1=mKg0^Lthn5ER^PXRs{5@8$PK$BnG8;Inw8Y<^>X
zt*Lqg;qJXp>;BkAC!wwh!(vE7s_>O>Hzeea+qT&lJiw781$y$8rUNE>r{-^&#`5>X
z*eik`hy1Fs0!;8B_KN@8$ziv%?iB6OW?^nR?5AhR=`N4iA1Rlb$tK$skmY>vWciLQ
z^kK2ws`QE)yf6gnpB>cAbCBN+Oh*C-AwGXxMg&~03(9b8c&2cdDd<3w&>2%&e^5UZ
zZOZJ$2vi^l$t1qmYF!swod3*hTmJ1$agHt-SJIv&mMju?Eo97b>eKfH>o9CBB&+l7
z4G<YsFOn~-(`WU4qM_9RxHPe~H#|8R*EdqQ>r(O}1*?+VsDxQgzXSw~%RQT#<vu&d
zJ!!~aZ03la^j&I7TEut!I_c!b3zZ1nkZazRPhT2$WwlAbr6($UwbRaB(tnpJ+i}N@
zQu!_{jDa4_B8MJqu^}|BdRTl%MtwIPfK%mwu^+pLz7#Ph7$3Q@JtWLD!GqPczov;W
zce$U09Q+8JqSoU$l2@dM+Vae3wSPTdx*=;QYQFTVQOi@l4Td=ulJz|Y>xwMePkTGt
z{M`c&8bi<7k&TqGZ(Kt-sr8J3XvwG~VHQAgjrOxHMFOc?AI!Yp(#iswav?qLlj4dk
z@cP7CJK^JJ`<oR760Z|M;;(?StnX$EBjzJc7oI44*C&$e=bz&lab8dJjU@3!yN=%*
zym+we*)63?(hrs4&`Pl5_sQ80j^A2SU)Q}|^u4DeyJ*E9c*0w?yIe9skj%p+c;{wZ
zu|re{My!ewh6=3Bdg|(b^DxPgf0j}LseWV5-e?XG+=k|;SWArZh@BQGZHm?Tz^05N
z0%eVL@3!L4BvjF<8_j3WVAXMhIZ8w??!$C778x#<iX75{Iu^BDKTH!??@c)j2>izf
zx9xw(>?<QKhc6;{dh(d(^4|O@80`=&R(Vlzp~1JlyU$?^|22=MW8}Rtk^s*#g5vIk
zBdx8Lfe+0JhOOTeJ-z&BnG%vR<4JD_I5CX(hP(AE0*{1%NT#-s$+c=u<yrwggI+w(
zgDqQO)eOI(kYmH7T>or7Q}ud&@daDMdsZk;i)G+wfUd>iK~h`XvD`H*p4`8rA(CZU
zcnVE^e~=fiBy-y-fa?CnBjAVOx+G5yRFRwb<ilx|ok1kZDQ62DeE9}6qbJP!m3HN|
z&gsx~rXPj5n@7di^lv4lvX7x1TuE%>Yqms8cjBxi%R<O8wc~?gWZKtb8$%FmJG3hD
z4KQ=W5S!&bTmJ^YJsDGMe*Wk^`uegDnVt|!sJ&)^YP?oUW6Ii>$KOp~gjP1=Ychnc
zA+z9XHIKUuHGOWcavpeR3BR@_7=x%nP{!o(A>IM5AHk=8ie~UbGRLO%+nH={87^Vo
zz|i{`{I`SnG46}7zEfs_2G9=qUv{BtIfZ@v@hT_uH_-o~BsdZ4Irnv4{aoBML(&2S
z*x`G~PIQi%zCdZkhxy?rjj$BE-DZN^^%AEDyrmH!yi^Ic4YW3MmniFbpgewmy;C!R
zh$P9KMywqvq@h?WTVZ3<<gD(;uyoD>H;DBko)>d{4sGJeIx`;#5h=mcSD1UAfcRW!
zt$p5Bc-$rvM#FODkHJ)=*g56fx9pX-&1Nc~@$h)CJ7FQsP!3-N(N(`6Fa0q}@w#-=
z*b=L3$hFj-)dIh)g7yWbq-LXA!4AOZPX~?XHp=xs!Pkxb2k@Vh*U&@pS7!iSxSARS
z1w*p29>k`cMgfsd)p<?qrQDiTpPTC9nUey1-wriK;p|jBUi7v};jDo4s$K-;<Gx42
zlX(rO5R28%bS0;W3tyo~mUn-*Tj+)xd&AcwuwC8%Eb%>6K@Ha5!EOsTr8OQVJ4LW6
z`8-^(Q<_;$?)doRmdm~T2%3fa=EUdMbI(ilR$>MYOe#wd<ki?lH6^ERK<h{On~2m8
z+GS$%cqS?<{^$d0Vsps)$po~XAW@$iTRG?q5i6Y7)y25XvRx8}+v8Wf)%EMg7v<oJ
z&1%DQ%TfHcw^@4im_+gg<N{t&m4&MQ65K1Xq2F2RbL`+W`LC;+HdB2XzfKbyH<S4<
z-7n%W-}n+P1;YV2!u-Dvcr54!iD>98r}_yNFa-Sos*55tU)^qF$2j%H?=@Z_iN)oC
zE0>lss=os?FY)d=n}}6Yi%ca`2Vs1;o}{Y~AZB+6-E#d7-YZUlw<A^gMQi5oXaxm9
z5S7pAHwv=0UW@yZ*L|$q)z(clm;c=}WRcKKKC3uAG!$+24nEui^Q*&D$>C8O`~S9d
zj?l|qjqOL}K<Gp5)zD)NV1GQ{#i(5bz5O+L--g4-1*d4N9yA<l%mNUW(FCpjuh}2U
zDQ_GqppcaDIB&Z3zVegiBPcrc_%Ch(fex{^w0&%JpxF~B6I|~q+D-;T&g?wUy^K5F
z&|Na750qXG&|9=@wR>tCR}4LuZnHDC&rt1&2-9cI@UUmR+Q%ezGYBtMX~Q}A9(ql&
z;7BV*;iGh4p(ny;PsW%;6b(0_nshR^nVSEax+nmH>VF#RYg%wT+xHoG;O8;*Dh4wi
zDIs$Vx1vSM_VD8V-g>zcDti}+w@pz|wF*yCSJa9cG*4!#$YSIQ_immC3fZ(cC-or5
z(!R=`4%m@#E8x&CWiP<&t57zfyRo}a3m$m1Se;Cy7jpGp$k#rsbgGasluNJLTJ^vE
zsEakOdi331{cPW0WaXM^VMC_s=`-mt#iIK)kWa@)M{x8K_|J7CFe2P_lU$`%uZ$Cz
z5<f2}M|`&st`gYBkqv~D<)R*mi_`OVOzP-NA2B%sqwtH(Wf0H@u45E({>f14{Dv8%
zk`^MTa{f&=i4w<dV|t2+dwlIhaX6O`zA8Ft1UBIGU8*kBPv>H|h;4^$@i`*nd5qvv
zg4Z%uxS>9%vq=&t5poTBLHb3eA4p@So^(!BBf1T3qOh`OB1q<|b%OV=G(|{75_Nub
zC6y$)+Pu2)*~c08{S_lSd%sYjH(J>B|BB|qPSaF)6(```>F>h*`#|f?&Ku;$pDCGr
z4hcgXKi+?y0juamm`wRcS!M1<6Mij?_;0CZz^GKYb0ME2xXg&Zjn-%Dm+$?6p6%UD
zF%*m)1p$hnS4UtBRhv9Y2z+TrR{1SjZ0IDF?%bS~sj{c{)?u@BT`JDbeim=#`454M
zn!NJ;xwK}S9v_pVKcPFg)^$ST5ipWJG<N~i@3~?<b?I#5;fdTUV+uEihG`TOff=e!
zY_vsw2A1^CIKknQH3*kMw_mN3*RWP@A2NOTa4lj%#eX}DKArepU&+&n-*U$r#>mdE
z!m<-lb{9`3h~$qM<L0e+zYgETp6zKobqY?wU&g9@#-&utiFi4f-2QY!lkw~g)~;3l
z_80~xJ&cthZwP&$5DyQc7K|17eM#}@!X5iRrwh1ZNn;M?lk2&km~Qp2VGCnr_ZyB!
zs}TFNzt1}Wzv#yoYL|d8nv+*FdLBWWX6s(4woc}|*5VQ3hA8wiLbYZpXxH;0yzTlJ
zj|9Wl$^YUH06cK?4;T4;QGQQ11vhA`R=6WLgX#euX}^1%IRaEP`hwAhZ6{Hl0Kwpc
zUk2fye*b&!7x#Gp`Qw32i(CPbRQinKZO}TD-`@ZeLFSs%8e9es<peyU8D>YrbDv_P
zFC$%coHmj^F@%U2n5W@#R<w1-o?IoW3=Ts-JW3K=nc9M6oN-*ClCi)|j%e}v7=0A2
zeoI$$Y5R^cnT+r58t8#C>FrWZeu|m#SDaVu$sr0m)?>E^>KeAEg}p&PAX1Hhe~~uh
z0)u>%1Vi5Rh)C9D67c&5EB(XAM(C=gyn5jFD;A;Sd>(ZAr$DsITov>+xCc4|9J&Ty
zAGN^GmRsQGhr-8g=-EcGS-Q;y-+Sb*leX_n<jD1emNzDO-}8-s7e$#MVnbZ%VP&B<
z+Sz(HPkRAFzSDM-(KP(6MZ+^`na(;SgsUR#1vb#Vwz9R4uw09OMmvym3%pQ;p6c^0
zUv56T`z`OdZE#59_$wzil1c6)8b5PgC9uw>^U`saQ;&acFMld{pWTZ5*Q>Ao;$O)(
zpeP>1Y}G#(-tQ9&3==R<ys-ePSYa73Oc1HSz?PsJY$&*4E(|=U@5Iccqeyl4$+Iv1
zZz(rnEYs1N%&bMbJTPwIs4<7eUhZP%+-J;f`uO_zd6g?a9K`F_iv1|V<GTMa3hZO6
zTRgvdh~h;@Rwwr5OusRe2j@PBqMJZ}@Rz$5wsPB8IG2`6+}oZ>4w~5wJ4qwP^mtL{
zy_V6RGY0+b?zHYIw4@Ze`=vQ!v`3*?85Q=;{56{v`zc71y)4lBV|;?}y}}2(&`d(<
zW-FrQ`tUe-tmYSg_~ZMlvte}(#)oNMrQdjcir#-Y*G?eM=}D_MP>?e7mR?$_K-8|h
zT(v%U4H<AeCOC%bbY*XDe@2oK7)mcy&V>tafDVEu$J|yoZRmb*li0%B(UTQ01M2&1
zpGKF}AEJHZs={38!&hFoXe~S6C}Fs$tNrHU3|IiDA-!$b;#dxpp6av%Ux_S|yN1K+
zrtu&{ejpR2M3EyV2Qc&Afj$8!1jq_EVEda;?YmMp?cy?B^jpwfdbiXfg$863=rb*S
zQmTkJ9yUM1sjMjH^BeGsf9^H7C|KU&<_ls@(#u=@x?>&+^?y3EWBo=iYG@C7Ps%i@
z<jM;$Zbn*`d!0e@RKPumKU6!wL}ExCtM&&DW@y%1ra)J)VG9*&O@~@zX~i<t>}q0U
z1%hA)lYhwPQVD{7r{#`fs^`k2s{+;HsU<JLm(;w2c<C?29>G9$ud#>LyLeAF3KOp^
z^j|Cam!V)w6h_)7lz3j^e2CmPRau7t%$rxKjb9!EAJOw)MG-r^@eLBC4Kq;3a@_O5
zC@eGwI_(yXmT3M|ZT^mKe2hBPp^(bzeeSj!tc?pe5kH9IHm&G;`q_edO?62b%I-6{
zpq9Ov0g^Iui?6*ZH3W)(*-QT2@St=Mu0XIq=WWO6#=fe5Vr6`-!+-INyWxE(X1M%T
z5$(*KwoK1Nk6#^2%F{{S9!Q)804oGgAt=;Q8+J53Hh7a1vozkb5i!9kTk=&U^cgX1
z`u($dZ5N6%#FpJgdAiARsnpHJ;utXDEs<M;1c^$l6|UQ~PQ8PRZwd7wij1HW2)UnO
zieAj749mA19z4+T!OlI}yS!%%ggES9nbkxu2K(ifP3o+L&vWnv4a8$xCZm7+&w0>#
zYp`+Ewg;{>E}!=NU)e{Mh+`Cr>!$?&cFmWYu9^pr%mmgiBdrqYPv=CoG`<HaN=|l#
zvxpL5@9p$Somg0wEX|(61-FNvhEV}cUG`>sFC7T2z3;ljNhh#f(1B{;@n#%84c5{)
zsc`|_9)j*31tI`55;LFrI15XVd&b9lUz_tnx1F4n?m0YFhT~0G_xOjm)wcVD)Zuj~
z9nz2nqqSc(2lU`v`=CCtV?MYurVJSvR=TE(1HVJ3Q<3;jWuS;7IV#Zl(#nrHk4k<P
ze=T<^%-!+@n7+p5jRgvhdCN%C(`vt}WTBPUj@M8x7seoVUY=hWs@!GE0e6~*?q;zD
z?{(1zJlbC*0QYXp=Gs@sn!QR(GPpz@Bxq^mc;dlJq%u|`DdaqMeitlw`w+~RfYuS2
z7@NnIg>foY0*&w?=~rS>HhZqm7V>Np6e_LT55zo&`upo@;ETVLbSedF`&@8ExuZT-
zJtl#jw&{A#6r{*r5UbKVY&AU@zI11MzZ~9#r@Im-sK*>|>33yi_oaeos+tE0>Uz??
z^ke)$xR&23tTlfZTie}5dKHBng}<Xno4qOo>n>3-QzFTdxByk~Bl2G%jg}xO|C^5}
z-;oRF0N&k64CbA}Gu3|Cch$H#O1pYX5emP``mBi!ZnNl!zV(dzd?FL852G+<|5#Om
zpzMJ{dsUsaNTbB`d}lVYt6wXx9G`=&4$H|tje+jE5I^mXODY5&pAiGe`^Pp8?{vli
zg1t>p&=DE;jau|W%SSw)DKQn(5y7tzIb%;R+&D0vZ@W#1e0L^@RAE|%ggzRn8~t%5
z^$&`_6Qqp(s_C2~C^gs%XOS@nH;eiaH!xxrQ^N+_`jdR0Wx|dY82I{$?P>ZG4!{e0
zk@MXO@8A<Zt&4I{@G!H%I|Cgn!<e&1==~qhKEs_f7tK|<c-|WXKNA(vo><}O;EYc1
z-iO$)9XEzjnB8QD4W2*{vO`_;ZpL$x=S#OKdRY%%+gMWDS*8b^tgnFY;R3Md2q<@2
zbamZIl>WdLaSU!Q*+6At3)$R&uk+WmTO&my2%83gSJajxeNDvY-mw#$U&iDH%EMh_
z*)Dh#Fc)ZX(7E3B(`&?&IIbg-ccNc&A-!0TsK5JEpl#Ua8cqpd2;Vq|a2|n|mv|34
zANf1tWKr-R<mYulyS_^HCYBoi`5Y3zZh($<t+GQnMVjWW$kmb4_`nCy#x$tT9Adcj
zqM|0`Wg(B|fH>maT?$^(7wfyRzf+x_a%vic+6y44bRiEM+mqUtm~jp^?tVh$UD0#K
z&kQGZRyI?o#3HY@=pBtkD)R=HBgM~zwsAb%Coo(zFsM+DPBeMJhXh}|!5ZS?%(MG^
zPM+2|@4iE7KzlaZVNTS`?DiG~6)*hLwd27hzh%)afq9qc*(F~v??+d{EL-JXVEzE<
zMf%^>x>f>yvX|g0L01v!O=uNFXTl6%C?UPwsPU)L-K2INebF|DdU*{Q<xGL_WkZ=&
zvxMJG30_I2q*AG#;~{C$;Oqf7#RWNJq5|@17QCjTK)87KOD|l-HkI8taT}lZ{KLm0
z6jUT`-_!I~@?ZZs|5ho5U?8y%Ks@R3wYH(~&<z!MLMDY#^>fEfvBAmaF-R`__Sxhi
zRQsnG{rX}19`w^H+>uyIDT19)!`ai7-Xe-Jy1=*<M20AT)l=e?$2^1o0NfHfXd{iE
z303z#f|M?KV-q7%AK)L@;B48_x13sosk#XA11NcAym<j_HTFg%&=(VZAw35Up#zXI
zkY59B9s;c)!-uz6|NB(^9D?T0&60n<7<Tp5x4I9Wn%*7Yu;Z*~W9k5_n{WTR*&4Lc
zDIqo{3bbo7U%a8Yeq`qPIpIHZ#41>9VjQ{6%|$Q~4030Eb}p?02x0K)=<_wQ_TO7?
z?o_(5hTFDN>lRVn@~|w39>Qk){g6oMImt(z{P_L-^@L^<H7IMtO)}gtzdnMF)#7fl
z68qQqv^^aZq~Kx-o6MO)RIgom!OSNmN|t#~&Fo|>+hh`P>Y<Tu_oQYfE`iJNeKN~>
zGc=FGK^4A7!?J5|tatWbO#nm#t2l>YdD(H@)r51cOt5l(=cv;EjPA?~>WK;<w4+M7
zALA5z4)xZkN}t4fZmh~#74!c!(K&N<JrI;;Icq|<<Y8L`LRIiHiyf}z((HeY?)p$3
zck~<W)I53|`f*s3(xW4zh^pv5Q(g!T;=$q-pFg<7D>UoLhWoi_ds2M30?n{Xj3>U0
zJl=tWG)H8Z3tn4jvA>Vcy(R)G^qT*lHzMl7O6`i_*eMNn-ZRoH0gIwX#prG+4c9z3
zjTY%kuGqM!*wl_7EcP<o=yl^$Gb0XTWVGnE;(^*8NZ8<mvoGVfpdkjUda}OnL4>v=
z4<Dec1aU^C{PN0V4MG@DwqN&sdl<Tb<sxxkpC`_g@DO=LFGg@pBtSRX3$dw$Y<QJC
zSUh}b04`M>)Fa<CB@~F;44wSkbUpl739+t4O%YDTq_lLx@cVIfn3&0Ov@K)6q};6=
zMsv#FJP59dXlI}LVNIeNJUd5S9tMBYT0`#sc+0;1!Tg)R$i1N$<$r7bnLv+0%>yV{
zOD{K%RNzjx#>G%deK!HAc1cu`FwTM}{Rr=j+dNt-R-YXNV;sAk$c8>Yk<>K3<%)ai
z7-qfh`rPaxz88NMw?9UgvGAxN5O-#m`GpOD9b<S7uevH(gYJbF5a+Ld<hhe0TKw43
z%kZ)HT2%T^LN<Kolc6x}VS_I3`tfbKfbPSF5Bdae>FSg#?=CjnX=p<za%YhLR3`^G
zWFI`UdsXugJoTdGZJLEG%YDNsTk6A03Sq3*qhTWUDx%lzADMfw_XA(yv>sf_Yl(Qz
z_Xa((H#z%MYUr~KA>raWfrWjU`TtB5NLH*JYfwWzhBH=ID>PzL6Z7~3<3^$6uRis3
zFR!wz-q1XMxBdq9rf~_kQu<)2?sE0|MtpDiF>#@B{1lPXI%HLf8gm1g{z~5czd_>?
zUQYNr;RhgGt43?|ht4S9dhJWBG<ECQy-!MnO7Ud6%W7(HSjeSci-wjycXD8Y!Z9GR
z242j&HluztHZJ^Me*Bs6-zr{Ut@|goiu6U`t4Y1qET3$3o_}8FdE_qazJ=pO;yKCW
zD}qrWP_MMl<K=&X%f9aa&u7ul#x(n%&*JBwbGx-_b|^Q}f{<8^dhij87S<#Kdd8Ik
zjly=@4~W#Gm3}zRa!|XZU!zre&AwVvsofhIuONZf3C2~xXl&lka97<~f1O_%U&Lz+
zce5AK_r^M5+0vz1paaaA()p;XS&)U>Jg^sh*i<N|8}oW(0kZ$jLwm>!%FkJ44_K_7
z?x?K3^#QHvgnWK1nuMJ~D&sj+?f*xv>*FQsyIurEp<Al4EUtqb3j8gk8vl5Tr%c%I
zf1c6m{q=WSJ@cpEL*<=5zwvjl+560MOW<2E)h8c_n*DFy110$k{NCT2o6uz3eDX2p
zn_b{g|9tGBOaY=f1Nj|@`|&(Kdnj-|B<oi%3_}H+!(J(bk*n+J_hs|!X-KQB4^h3Z
z{?Pi2f&9aCi%SGPpSNFf@Z+>tneg&Y^&1jH%oZP;3#yNeff&Avcqny~8I~q>tO+l-
z_KxNAbu}>a!9GC|fI+bQj}{%sqC8_L1wI2xzr6moYvt%|fR_1yM_>90W{k)yhAo6Q
zZq*P5#xi&5+<YE`lpzWYUwZeVS52bvobRFXQ|bum{GF3~-(J2YUARNRe#esUHRnYp
zhK=5a&^xZ?Q&iDCJD!LqU9$o1TX!_mDW{m?HDaF|U`t<jp8mYHWU?}93b5WKGvpP-
z3hxVdR3HkndV?<ngp}FNbgX!*Id9DUoTm+<>7gqQ@qG(AFb3Km?Sy>}yZ?%hu8m=L
zpystH0xc|ZH~CJk^0geYNYj7zB0a~mn?RXs?S2Pt5lfhComV9PYpws3nSRZm2q5S9
zPP>TpQ2#FSK7LYB^L-&hXSkjfKT;f*izScj5Y0}TxpwXQznr;UgE4a)HhlSVK}Xk1
zT@Oj-soFSZvgrl=Jq61%mwEV2-W**<(%(u#6nB5WPqXws3n|EK|5Kk_(npb_xw%9J
zBgk)hMs(s=%=R6hu56RYT{|3sJd;_{(Y>2n0Hj%Kg~Jm;ABGqc5+ofcE;ckBoPtf@
z_XM%`NB-)rS-rd?IOiq-icw$wy3XAA`?qkmNxDet;y7VB1l8yi>;+k1|L%_kMy-M1
z3;Zq%(2QbQ@}<#MJWFz9ul)DqwKYa2QmN{|NqkXg=-BJJiIzgvuBf-kUyQV*c{2&x
zbbjR$-yK6Kd;JgrCSEq^RyxUlAbX<=$=R*bD(5=DM`d<kTn>un*Pe;9@?cDL@boVL
zgOIfRE4g72O#}~v>frytbJnpNPeM48TzPA-_DMwT6>0~(zdwdh()`}g{2zGU7qYl@
z*NX0Ak0Rh0YW)g$y!H{;A-i>U_t+Cnr+<=rLNGDtcg*^H%3Ml@<nTz#H^rI9k-gKJ
zIT{!Vm1Vp(Z3yWQ8J|ZZ+^~uOX6nxzhKJ-&qe0|z)#(p%f2Rw4Ftwj9G5nz<uard{
zo({~2=(7Dsm^T6g%1#H^uCm}`U@%unrg#k6#{2)bA}pk1mztcmKoi0nusm3G%)4%m
z^dZ3wDEP2C@e!ASi7VH&`J^i5!jY_d%9_WO)RcX4dvwj3f+k<>!Hal_iVYJ@Xvr(F
z-f|yp16HrvorVWlL!O;swCuWmf1&8W>~NKDMt5CFOK3l@l62=mQv^6hhA>P|e~|>6
z+J9xdeqC|v<B?DWeCcmdSh$?Cm*6>FTLt77^Np1SwES}yKKyrIoT5LlZ$H29DnQ<M
zD}BryxIgvp8hqmzGf2M3-TSXJ#y8#uLhu#9(x3va%h3OU<|A`xX+4w$-BcHANzfn`
zron2z>iLLIDcHix0rkqU@xG{ngSee!`N5~5We~cWReUdh@^nQlchUbk|7VQPW1LL_
zqOVJz!Ygh(%#%457{Bw;`aS9*?2%5w%B(+Cs6?;yQ1tEVSH|!YEnvid3`#<28!OX+
zkSf`(3Av}po3<V+H||QF^)T~Z`BNKOLC@k=H%7Wfkx?ZlIS9cX@L%*|DREx&G!ykJ
zgTP%=BFgoHCA9FkpbSIEy)WO6dJqHnGxz=DVNBnH-NrlH=f_vDvwAJd^_e%)8O0Iq
zm#yE?JZ-1nRs8kNj*GZ{+Z6pS?pSz70K&YkGO|yj*R%wz@5sm#ETOk~X)TZ^Z?}iR
zJ)X3Hjkap`1}t}&p#!U`x39q|M86PURR-a?p*mopU{L?{^%$4Bv9fr1Lr-CGj_7hv
zI<<i>nz%uJU{L#nx_IySb@r#^AVnN{|4zE%xAlg&LM2=kZ!-93B{GUsyf5j=u}4zv
zlx6b{xOowZEXnRe+|`S0FnMtqj#>Tbr;Bj#^Vv=AM{lS@+z5E(Mx70A#N+om^lNeH
z6`1zr4q<|ZFQWrzFXo0mZoWjWjYr^wzqI0&P&k6^@7n!RYfbn{gE-&m=<hntutUG-
zCJ@n_dB4LuVR!lKxRtR_w&^hVljSxnP5}g*=RqSyyl*?=!$`J^`T@DzT+=FSPV(|I
z7{gYpkRTr>*TO_lZqB*9#YtL+)};F=Q;5ApUMR0Gp-C{)CL-h&4u2{ml~_X#`n9A~
zDuvw+(}`~S4F361;Gh4mmNcuKa|qXuSUkEa##(6u&c&ogAr}jL4)No4hQx_l=sVcF
zcNRW4K_v|@<=LcZ*_VdPs`S+d6#dGZenNqng*?AdaKdUlZ*{^do?%jvTpN--3x=xi
zF2S}TeZcm8K%1l7`=g2M$D-2%;B%^ZXM&58Wa3rPHJxFrw{peujE6kFCZY8If$3iO
zlR$x6xeE1GgU^m`GkO?RmLZA+LL>fFRqmFRN8AScOtw1MJ|39bc9cMi%a_=aRQ^D4
z_sf!z_m-O5Wo-EbfiDoImP!~`CdGh&?Dy9&_cGv#D{dmN8zCp4+IscWXz(4*OR}r{
z)r*P6fwuJL0f~?515T<7c9xq;bLuKDf{o^CFl`r1BrN}jt+)Pb^8FvTQ4~;0q!Ad1
ziU>-VfFlJ&L6NRWw}5nBAV`OZfG9GgJCv@8ba!`m3>b{D?Yigd_5OT6@B9AVf53j(
z9@};9Jf6q#1kF|Q#+qGsy>igL`>3$^sXgf*)4YPf9Js4~F?{ybUxM(`C;6a)3!y)w
z5drmWta4;rm;}ksXRUAjbPaANApNT$uE%6lUB!C756>Av_Q${`>t%y}-@|Q3Mvh3|
z{OppJ<jK~&Kb4%lU2!YVF<zz7E)9bkl>NWw0gu8*L2LnWuSHq;OBbG0^8Ad-eTohK
z%;JvQwl|E!uUy4qA9YAdUABI@0=qb^Qs=BFj0|xZSD5$44mqjoiQGn%z{fN+?7w4H
z=>314X#we*<x8TJGPam$6ko*$K&$>IO8n+6F!t+A3}Qo{AXj^56rs=39>6y;Acd}_
zh!uP?*%tjV<s7ie4sa?g$(Fw@3Ro)GOh5Z5r+%d2BdR5sh*jvNF>l_lT!l&TxA?Ye
zOu(O9<i~C2iSI|0gB8~f(|064`X_Y|k#J97p2zI0{9?&arkB1vMXotZv3NTua8nay
zI2Z@)f#{J(%qd;g!SQ400|&ot#Pkz~Db<*5-}ZXPPkvBzoH}aT`B(x!>_P+fU}BEV
zsH>i1Ga&|Mk7cG5NEz=dzE?pOp>H?Xj7j)@^Ku~6-)Zy<-0m1l;h&6Qq;`Q_HtTWF
z1b{E$S0)EcWbuZ_8uK2emd=Nr2esG)(acSn9b3HIkv+lnE=E)z6X`~@QWJ02uSX}$
zUcJJxa@&Ff(er9R7E_VbyI#e-luew@y!a}fxPZtZW!u#=w~lw4|IDHgqT6aJMvt4;
zagah&(~Dmdk}A}Z3<+k$avwfAA826$MQ^;nL^4P`$c%*yF06>wgevfSRvH?N7V|y{
z`68)4uo{_KA)LEJ=07y7y-<x0C9b&M7=sA>5-%EG`xI*#VAl7m7%_r^U96-5>jvQq
zgIM#S@TVGsxpRa~;rzy2piZo+NxFh$n=f!g&2U6F7ZF@X7}DEOi0*3a`RGJGOMbqg
zb6h&>yuD`T<koD-IIL2?NpQSN*1J6~dKc_Gt+u&&w?7P|f94}{7DHt`hf0rWE$<UC
zu@w7PsGRcWL4B36)s%lZ`ju#m)>78jkq7;U7WrOf?16Q%$}b-g_S}?C*N3v@c+G8o
zTSmsuU5dD|Lv@jfaqP}m*khM+aJ;P3`?#S+gF0jp{<c|Q8||^V*HpYva|NP(>t_t~
zQs!{rtUA^-p0;xmusaP0PMgHe?MngP-`<G~9#Z&@lB3F7vq*3-ttzbPWFG~|VxI;n
zU;-gAxa6b*c3uB=W7J)+rUTiLO1EE`o28*U9TiYh;O%<OST+r8@0@4GK1kK-)_y1t
z6}-WLM$a$2?cfMOlQA+=MjM_y{7}??d1L<%Tr1*pN*Q0Ldb8+Z0mky)e8=<{Foq;_
z%sqQQIK5j@#X31%yEkvxZ~%?|#KC%q+XUDQMk%8#RTeKirQt*0>+CfKsUbp<@aZ2B
zvLj!q`)_|OQS1A@!1Y1DO-NJb5PqtEAh$FQ1e&iL+&5SOr;)kh2DDRO^WsbZ#tG=3
zY^wpVuMdpsfLG67zcLq&u;am7P+stRXB<(R5`P!{8#0&rJ}BPuz_<D_!7A)QdX8av
zXZW|oAE*aB<$g<**R6`tuOy_*xegTx5_rP%e<64RNl%;ww@l@W_oV?cFGrI{HCX?Z
zz|k9K5~~Skj|c>OYxD~(xI%-sk6t4oAaGR=El%F@R@2{M;)b8PA_Lr>jz@x-n6|(G
zW1K><bjAag*caHjL(3n!z9ine-x~@(%w_RFTZ<ujAxfqq$RNU|@{U+vJwo9&U4sc2
zXvF*Aga<HN+{NaWgrk7V{D^(`&qoEg7jfV!d>8Cbp3dLNOLcrdNhddv0z@;1F$Rws
zMzgrxS?}L~&-5U^I2iVD`{^Acw%>K;iloK_;}>qqaLjoa_=m(HjM|lJuCa2x#@bRu
znbyFii3DVyk-ifMB`|Fg`n_q4%#W{rz4aRiD!QDVKRM>q-EQ0T64AYrr_gU(cL_k7
zNWLwh<@HSh&~8=<to3b!QrEvngqe(&?yF2BMp9P4r?>)U_vYRSuJsu^6?ilPva>KU
z)LO;vy0G15Y$`@@p7^gUlncJkK72J}Z1ltwD|3b!F>9wqux{Z7!anT+4IKJCX&^5_
zL}yCw`<b&b(h4)lxqS<PD!k%73n~dO8R0oYnR1a>t)jNYRmdMT=uOkmnSKQN==ZsT
ze%x^+1L8Z$qr0k4{;PXlv2^Bj>9X{rXysDN0{QtprEA77fEQBOiE+rvmlxjxPGIYD
z6N=WuNGEoyVLK3c|63liN8lKK2L1NMQn;k-D~3xZEbxsZ(_O)wv}MF*M`BH8<n;^|
zK>NT`nX#zqI-vvni2S~wNMTJO=C<%>;p+sk4+!f^IplbI(|IBiVQmb=?E=0ylmqu2
zAMQ-|;&Z1c6Gg-yoJ`ow(+~yx>n2O6JN}{815kE6jy#L?iH(O2nMZ7~@;_>KGvFsd
z@Z2WGkgUpGT&V5FoA(s3uXB6->iJ&M8=qx8mHid26>TN=Al{!SlIlh9y)d_aMB#Qa
ztc#6RMBu}3Ti+Q@eP++LmrqQqf&L5V<VSt{S?77uK-hVlXfuQkG90JrRq*-y+?6x8
zTexM)Hf6qow+7~+ue9?GSu)wYUGZZyE`(~-hZ)7UD?k+T42|!gc;bi~OZ%kD7@$<O
zLCAZGDO5c*UAp5s3;x<0R!-H1ljcAAN#kY~e+Bhx;ppTc|EVaS!o)MJ`FD6xhA-X$
zxGjy3dsS@im5hnP(I1Bw=9-686E%KXUy--xjGQ>{WZdMTWV-FYOw0Tgj8yUjEuX6%
zo2z3?^q?gAd(nYE$*cvWx3X}#v;mQlHL1u2>AJzbAO`S<%sQ|_mqKv`SW+8%cMos(
zmBHlOj~<*E)-eJjVAkx_3vF=_(X7{N32Hd~lj!kELrSf89BO5=0u&;3cfi_l_=Hb!
zoG88#e}*ai&dIN7>$P+K{1igi>0R{<;-PV*;q-%}1#xk1y$`0ZA3u}u6}I|JUd|v>
zr`s!&1dPuv4(axTkE@tM@AR{p-Q;UgRksVw&}vsL+H^7AXABC+{DCjWYYhM#7GIuw
z!e70oF`XELncgsT&c!yHg{Q5yfkM+B-%!zD4Drn?`rh{`;^P)cvHUJ(&p6)WZe5}#
zSocwwwwbGGr)}8rg~r(t`vgs6DdRJ^u4V#JPfdqQN*PN0Pi46S_SVPiUw1m-xgoM+
zc=44BuJMJRvF-Q{_S-(=V4X?H0d#y9MNPKTKwv2cK%~&+7YJ6?m-b_Iy`_a5`2IEc
zWZV6X+3R}SvHY!%0;16hEJs_u93V%dq9#4B*yJbQ^9~(;%u4I=_JpCd<>2z?LZL|Z
zoe9A{5#yTUnOQRN#{X#n#3gDK-&Pkcgct2DiK<iD#q{J&B3Z1i(yVQhZ&&N^SRP?N
zUp_8IINF0Q4^Z;$dac`A2#vdTH~rk#Z{cUENiqnA_H57zc0J3D3gq7G=*2uNZ`n8H
zO&oTbw%|)*$gqmt5-Xb8Y}E6~+waqG9JjA{t8K{4RkgklQw;q=_PgDA(c|sS&7y_%
z1vD%cVGRQ|2v~Vg&{liM@#DIp<x@|r?v0&)$f@1l|4mMdp*lk%xARwaD%W78K}U`?
z`bhAqlkpX1cVviS^x+W>k6jSNA}JlmSvd~Rrq$;!$6R2A1%%N@p?^#097h7Y=3DP`
z1pQv=Tkh{{4U7l6<Lg~}TY!DKb0>RmhabaFm~IKU-1SN^t*ro4O<aDpl;O?{jZPuh
zJ4J~ZkXpJEesq`;Ru2`9hn^$w1Aid6W~doC@Oe_;%2svaBW;Jh^Ef%94Xkfx_IYw|
z?_WIvfkPMG-FKf<3qp6iJ4FPP|4~yhc{g|pCG`6paZMvIVoQyz0MD~T@bM;Y&MCcK
z<09Mwi&lm{Z2<J+ZN0o>?8KP9S?HkDNhr5))>{<hy5kj(4c;w~605((wZF-@<EE2N
zaTqURuzVqby>RqxWAe?$(>R_Nne~05`)IgjxN-BzRehV;C0BdB+{VU^*?0IDc-$J`
zKj#0P?od^`!(%qCBa|u}?f$q_AzF5fTMymwlJSey{Mco(-_iC|3^kF~ms!X!x(Rsp
z&%FWfb0>l{#W5(>m)5y1aHVvcMoqZuA4%Lx635RP3g$^*py?SIa1PeJ_!BzZ{fRhY
z=}ZT>*zB%xYDk&VPmH0X?IZj}`8|<qfBxt>Tj8&UPQ58UTEw<UWB=N`9cb<+1j8i;
zs<f+IL^uh%wtf6+)bL2_oAEteC$C7)U1&%DvYg`Mx{LYidoSj<BkgxI78}X%t8#Qa
zNfn?kiH#3vyuK2IZSmSzxDuT0-h`Y{yy@xzaz7i#o!tT5Y$l(W%aL3c8TA^9>He`G
z8dC6ii+UeiH#{2P!W?r>RmqZ^E1El+MCu$MewUYTi&Iy1Dvm8({u21zSCmtmr-!TW
zw>vzjCI?^6)orvC8vNyZf@80^Qoq&kYVGcKd<zA<`EV|wgD(vQnVQoTVjd_(Yaqim
z50q^6KV8(|J6YoV&C(OmBMTL3X{bv45iDBhN~t-Fu%?%`MELk1DEgJ$lOv<&uU?qn
zA=<6N%UfM$X|Q?iwt!yH!FrpB$mkQ64))T^Y#)xcSpoOUbAB@QZZ^8L0>$*9ad(G<
zYxq&wEIJ-3m2UR&l68h&YFab9<W9fbuqme9tlf&!m`kTChi6ln*>tC?@OkheHfI+R
z!Mkp{SXy_X`1@;Tk)-7|+MVa>62V;emJ>&Gnydr6(7|U6W9InyCsCjX#(Ui2m-&y~
zk5x63I_5PtVwaW8_@vDvqbVYO1+;~>;A}=06IUA8H;~p(nkhz5sDEg0W+MUizK_z|
zKc{BLpwL^;TSNcltUKv<9{(Z_l?eg8ai>?89-JLolLZ{rZ!2fpoUKEyoxHMR@4zZ_
z0D`^1A*audxCKXfJ0a9Y-vJSR=0LmGDxT0~e5tf@MdrqKBZ`{ZNdH)0!{m;0JwGD@
z-G_^!0n~;%ECX)0#b4m`(vh*)B;xL?T|;P%5h)nb^BD2<#zBV+fBC};=dniqmZaL}
zkd>3y$cgi08js?2xP;^`lnZPHTWL<y;W{%6EX_hIaf?fYO<i)g2Thj2+LMd(Pmr$k
z#M>+Wc3V{{jwQUcdE)nmzhym=5<UGMz2<KiYA(<gSH5a$;M0&D>E2q}aCh|YL-hAW
zJQJo|A0uqaH1RsIo|0g_hbb$ADZId2Qhf|-1bH0NCU@x>mKsS1YC{z=K0Ldl7wuSI
zw9u5g%<umEPzk#QJixyb5jMd0&|N%gW844;C>Vi3n^V40Uxq}E_phN!$25@x@7Z}%
z+=UHA3Zf%tf)VwMc5%w$*$0i_Cu6FWF(yZCA3u_d$j>F{C+LBfzJ5D<gq<>Z-xmk)
zJ2C;ij0x!^j{e+NGe5zC9gc#+=LZb$`H%hrg+!3K@o#^#&l~n5YMj4<<HupbHnq{E
zPk1g-y<uX%BJ#!~HR>7iayDbyv{T~Tr56XcveB_c(Q;JRKT@y#ehMdhA~1NNi7_{D
zSZbpb+k^zP0(XrjR;*1D!>_HJe<(~{Qpl#mdiFW0N}=IREM@^wKSBrC3r!$zM+d1f
znaXa;u+8KXT_dUs5<G)zE5zlaG2!UZ4pPIxV#J|H8Br08zKJ^Qn#l^V0{W~R3}fnR
z@Euqw)^^JxL<p%aPTekpd%^|7l*w&fTHh3=wDRop-A&C;p&|KQOFWPN!NzMiYYO*l
z!b<XmmTVV8#1Db@brKhsqMQX|OazvR8FR{yPx0Td#N0ETUJpnR0e#v(v3Cojv*MPe
zz7M@iIIr&G^PK_vLDWsS3D)^p#(Gi6F&`OL<V`_C=?E#YWcjPzrfo9F-Ydb}Eusw=
zyX);j^jv<A_6ffj>xppbngXd@Dp~xK`2v<=>LUUzc3l8jm1gzhIL%&PE&5H4Pf1Y2
z^yH=T{jN)D{tc(Tml$AUynlh{MMPVsUD&2%Q-Ncz@KOvnRN8O^6%G0d`63dU)R&F&
z)Fa*)hwQ94=$|eqsU+EyG~$`&t*`!~!oO~gR?EG+c~dpluc8|NCUfVvYx9+mB+BER
z<$;NrUuV^kY1B;z59;~8j}^`cf+61s*AaUWj<v6xtw2H}S8Y;Tauu>hg>A>slt2IQ
zy~S66P|)B@_+v^T#4Xu*`0d4~Bb^Acu*;iwtK}x{7c_idHoMg6<NcQ>uWFcUf5?NG
z50S7C^Q}Uf)IpqzU3-vnFS+^AV7Gex$`;-*)6KQxHvavtD#mnqVgROoIB|#lFzm%z
z19-Rd=d&z_#gW-G@MoBcnIGGDOAU&AOc;qk0&~cXN=;-bCae_D5t6Sd${y#rQ~cd+
z;ty}t)K|=lZ)}CX1t0v(k)N<S4$*kgrFQn}(7_QGh7}L;zKoaGf%a#|2;V`F(OuG4
zFd-=U*IetQ8xEDJSdy_)q4LmbQ03edEWM<XT=N5DI06|bTT~VAb$IUz6V(Q1(NgD_
zmj_7HBG0e0KS4riN8&n=35Cpm2E5`ig&xJZLbnzwZ{Is^Obxgjt%RUvNn@G{+L{%(
z#yVW|SR&-D^x;J-P+pjN44Wi+-`#@WxG#QUe#Jl}33_-Wt=}+BnCjyN*7)s>PB@qJ
zbO!EeypC(A5E8yNw+!jcd?&PfQ|9R2PeXv%les(wD%F!4jVRi&;hc|nw$2qdvVpO0
z@+no{IpWoTLr+Ry2rdNwsVSAl&*|<m!y+CrW7eSI7u&||laSLN4`jfEVP5nww&U5y
zTA0D~?ls+Z4(}btr@DV2mH0AV`jjQsf_yU#YZI?eiwB&vF;fTU@6s%bcvfM^qpBNp
zF+pj6e<^;B1av49r(>;P-562OW&dW1T<u8KI$xjhTd6NS{tP_YS1w1)um{P<Q3MM_
z-iZl|fHAj|dQgbW71OF3hq<5B9(AEst{LoYL<BTAfs}j=KSe=xT!%>{5evR0_GNo9
zVeO0m)9Os}CL1-F1x=*h((NSftuQCL)f~YxC-1RW!=wvE73<BMxVweCZ%Nut!cBLm
z={~$zDMubiZ2Ml$Ca`IW^yF}aMj74?XTA0lf3g#k!f5&V6wQEzj}x941J9wp4Y}XH
z<UP-DKI}ih!Jl?09Z^rLl70B35Eh{QjLKXJyy+?o+RRR2TbxNY&c2>A-g>k(VOL(g
zmbX1uu_EGZRK0EUF&$05lUJkRWbs8Xu$t8e_wifAjh9Xf@9Khc`=9nr5*`o;?k4Fn
zNcO^UC=$IOrnwV<nmt3DyYoL;?Eq9CqxnNmr&?wO#3<B>xD-p9dLLi;vv)*?6PU(p
zCd=L*OVWI2-dk2*gxu6W3v|gB)pC@6p+EQjCyG2J2Eny!wZc!nKQ#fdUoHd3E~Z^y
zu<7)f09QL&!*FMQ-jx^Bp~w4|#MhqJ`-MZDzOH#5X_(96gWzIj@*7^aB@+QIFEfvD
z#H}6#GKck#a4;wJ?icVr;+D6CMfD<Wu!h?Wqcb(aJp>t!iTd%*zXkQs*eB(G3NO{!
z`h7b1==k+f0Jm;0U8``v(5MG)WP9WHs4~rNwEBWg;={>UVWuzNB=^sqt}!fEf4oAJ
z#!MgQ<gJo)#fH!WSpKI6z~-8k2g#?45%;idD?qXMkhav(pBQS6JBc}z*VN^izS>lQ
ze|He-HAHZdEyt|3!#i!Bv)-kGjH|TK;7n+FtucO%Rn}3^D}A_wl?j+Hw*pFm&{|&e
zc3oUD0n(lO&H;T~#L{)MtMAVMz~Zt2MDOw2vWJ`K>uPK8kejt;T`}tc{^y>?0DA0v
zp+f>n&%x8aLPSLM)|!Wzk+|&x==z7Epb(DO4eArGO8GP<>v1_)d1dmt=Izz5m`0wY
zIW&x6>U-5qLxs3+dr%IOQ@9*Mk<_I-Q)@s)xK>-~gS$mdCzF?M>6EbRW16*}krQr|
z)tq<EHgjBHGEw9&JFp{q&x**J-Fd36z!Z^J3KqVPkzR~L1+MwLF?;hgp*zG$$>(R0
z)`U2oJX+r3^8LXkb*!ysnmf*NgB7`O0eM}w@lOz4(%(MI)9K-l^)-C=3cT9LhfRuO
zmHLcuE`(v&9-s?v#zx;-;G=rAh)n+ehKZF?zY+AnCJq{QBTjGChctIW)j!KAlG3Rg
zo{%#MPX8y0F2ff}{Jxer6uR<k|Ee>kX%U1w-^zi)&#Rc0eMk2CpBfkps`IANQR|`J
zB2;G^&OJ%#`i?mVj)Df9t~dbcl|+v*PO9y0n~Gvp&Tg#e4yw=X;~gljsf16F8=-c7
z4m|rs<iAL-Yqtt*m;94E_g`AA3z-^+AqRG^axMu6+NWPU5foAKletGv?Xce3+z#q5
zQ!~MRaoz`mSmCf;dYNQj{Iw->J_Xwl7H+-&;@z+|d}iQp^_BFPdC`r9UD}8?x8r-H
zjt5xv$E^jJ`xHf3VyY2vA`#e&#KloR{m~D>M~*CgNj2WUQo^M>9El$Y1`-Jy8CwTV
zOXpnPen0v9-1Xje_Q8v$?8x|+N8~k?;WAfs2M0KBk9YnYhCS`Jk}}+1c21!peldN9
zWu(j?;A*AXMJOhyxnVd=qV=6Ec4~A{ZfOPGl4r&#*57x<eN}g(>qWz+i031|XbScs
zZT%Xf@8-$_<NTW>ES32V*kF~mu_ZC{`*PeTCWOKWfa^*&0MR>*ecTB$V6_BzttB}Y
zYOCb30WsP01$9Y^gUK9)rz(~=ba3o%WfOp|rd61-ejCJoE9v;)5He#ayuZlEcm#)^
zPAZEL6DW1glP@Ci0XTy|udk^J6cfX;aH*&SK?{|K!!PZ!Z0~M7!>BomDfHTHXtl|S
zN4+ilzGeK{bAO32DMj<mC5@HJ>4x_$mBj6cBXYF(gaQFjtB_*q1|K{;%{HLCGG}Z6
zRM%<{le)jDc<)Jw!jnG=E(@$ddQwPgm9PT?_4u>~@LJH!A*>K>(HF~@la^gafUpe{
z;Fs2j(QE3-rwE$UMo>W@V|wnc`J0)MU!DKq)ur5Dak*<roDWC*8o|HB`gOg7J<XBr
z$p()8&DuZ2`bTN>(Z9sHBRX~Lu#)z!C$QM@t~W30Sx+!ykln^!RMLa##FJ!66lL+x
zVAY5O5i>r#g7wXtw);E8`f04q#mDUCYw1oDxp}4t+a1QVErjI3`9MgE0}VIYFx}_T
zj`CKyUMzn`CR{BmY=~t1i%>*TSl*mM)XHy(i?S`hzs|bt4rx9~$hIa-Rz!O*+w+n{
z^e?9sglzSq7FzVBSsf$5eKF8cj1b;|*b~TN>Ih;3=${aZh|$%Uv&dj*pE~ndhNHWE
zsn(SG5b)T=r0>faB-Yj_Zg8+o&p1&<MR|0I;-Nd2IWrA`R?EL8;A*?q>dT1Ua-$Q^
zoLF1`F}9SYBV6q<;w0la)k=PWiNTs8d-?Qb*K>K;a~junS-D7r@#m)rmy)WqH<zza
z2NmESwW&^i*ByyNq&ZIoOTO)~*&YETMw1Azn#A(WI@3)hm{D$%MDc|ZI5dVACMv(Q
z7mlDeV8@tWNmM=wyNey|c%$aYFK7Agm;r8^Celu?T&-(zJP_;reofOL=)kB7A8N4z
z7$VP#c1js9^&}4?2k?xM<6VyD3m(%=RX{1&tF!XTRs8Mll(tYQqzo(veWATfe;M{=
z_s7org81QAxgQAE)z=!0HkeLmjrWJzPK|n@HzNY*zP?^LRC=Lo)7n9Dr%HNqYs9h-
zc)5w8JBOXq?fI-7L>pn$Oo7Idi~ph6HV?GCKP}$2Hy*j#V!L?LXZOoYhQ7|`#OMKk
zocZzndI9G8J+9a55f$ezp2N|vZ!(EGvhS9xF+IjjkacB3@rAdQsL!bp<iY*RKn8R+
zFzu$fRyBR_yqU1-KD&aD)5G)=F2{VTbqY4!Nh2ThIKKpu=?YZ-lE~vE%-<^eK$Z#A
zeo(a3i{v=()aJ4FUx!@{4JEMc7=`Q#D;SOC6zE`bG3;6H#cJN`Y$KN+t3~?j>wo(0
zMn}L=bx1L!hRWtjRvNFtoJ;|^>7ICs+M%b(E5hniHfi@aphl{|N83;xl)?S$a6#~k
z95|Fp5ja=5KQZ?;8J!90932qK<%mVkcYGRqUuHd&4{1KWqs}FlJ3iU^+VuV!O~7u*
zF}Yi6_v}9qJTu?t-B(;T$`GDf$W+#$XP8sVwxEIYOwP>m7Y%6=AYgD7I!~X)zal&+
z2}UTMK@I^GsQ+u-3Ct6pnZFFYon6%qwP>z9RPU-SMTo5v{->6SCiyR*887p*{be>^
z1}!V?OYfYz_F4EoJZU)d9{>~A0V41=W~yhZo2RK9%+)`e64Q9EEGcVrPBTSgVXy)5
zf*Il~`$$3zmN*wM*dJ0h?qMeB7o$wcmx|*csq;QvS4(BTCP0?23&iAxF=FyBd3aq6
zydAsyrUh`so#wxYH<lJ%hGdQA?dZa0d`=+ziyPHTbj>AyQijls2j1UG1>QSu(jDZ%
z2p5Jb*SRLx-<cqoLdWx=CPU)B4=X=Jq}drdj1L|Pzkt=JeW*H&vm?ywKQ&ufc;#A;
z^b7zm22sf<ICpm>aFBoG{RmV3m{5=12jGN<6y*<4{xfk~T{-4MVFocP)xT1@0{v?o
zFzx-kZQ8yI;b9Vb#_nB*Kbg|-*HUi$j=juUvMi0jSkXT1F((R6u=metM<Mkohcd6T
z2kl<vc}wCP|64`p*LHO}1e^wuxyEAg|1aKcI@yKJ=Up2GpxtVW*JG}NTgxkGwGJi1
zAYEKRRn&MSaH630+}cXo(ltrs9$r2&YdPvLLwjY{aR*-JfTfj@S4@n}vM0DR20$1J
z-dEw*^bjnK0j+Zv%HfTH*f8)ra8yOk%T>FfiN9vGdM9A%z<)d?*%)Vn-%91RihyGv
zaR3t53q3=bU$|}oQq<0C=@61p&pu{u$;)I&)kKNYzoNOf!KdDJv3}pcRH4C68c3T#
zEBWsvo}=N{5XPq1fZeXv3zrWRv>zfyOC7I%3kF}NNTIlYjy?$c-|G1af<#{6_aq5R
z{u6x!>FQ0teC6D$Jq>ygj7`cv7~Ei^%RVDCw8@4LGjBZ6vE7~|Tw${LH0h=qbK-B7
z41o?i2X43tJkvudJahvEJq50|bRrVX$!=NSnx4N%0Q7F-DXvqDCIS(L7A|m&jZrIB
zLfxD?_v@zq$=O>s^YexEPI}4OJ2yWSe-x%$EA(G?s+1Cr;MUVV3jIMIB}lBO3T-sW
z)Vgj|;Zd6tFr$s1xeXCp2JUH&=l@X^&DBnA2A55DBS7TX4|CRBu%OX?a*LWIrirJM
z4K1vxB>oTd7A9F=Jn)EPs}j4!YsEIdluIgqs8Rif38km!A-~rY_y+8oRj9)MDY-O-
zUU-HT<WlE=)Z%YqRHS}^d*}t^K{gzvQFH^W@bf&>f}a_WC1Y38x)J7{rC*-GODd9a
z$#b<|#gl<+p{MY=g-3ZP-M9xwj1uaC+lREom)^%6?99CA5<1_EthJlcPvs}c`DWox
z=j^$pQJ~oUyfg6S_j&s_Kr-2ii4kJgG{bzn0OpQ8=$c@2UHUe=*W;{4uim(UWh~uP
zyxs)Cl`2HlnU+)V_<*q+!f$e66B!$FxI@lNbUxcxGLho*MZS!!y3yHl8O<-+d|YG1
zpe-E5PWKi^Dj|lC%@D<xvH?DsqVdHMm`#+Y3y#ak?i9N)i$!>0y?2Ub2V>BMNy{4J
zW#A|72jC5{L4DyTHgwe^*ZhTxetH(JjIF|^0(c0Kb8cuRtvIRH+8tcc^!wZ&G+r6H
zK_67_p)krJB^Ro}Ysx<p(x&e<>mu0iZ>w!{Q%RpU`C|6M=7d;}x_lXF)9|O~qo7v^
z$nyH=24UvQaxqVy!M_%LXr(5kKNQ#BX@CT@5KPk6oh_vFqtWjJ=tpAN67~&F>L19F
z>V)6@w!KU4vcn%Jh9@d-4P&Wh08GpYQ`0-;I8xw#TnT_3)qvWv@m`E$<D|S+r|Xie
zKh5j_%bI~#OMJh`d2Qp9u`TQxRf-(v{B5T44w32hZSh5AoXdp1RA0Kn!vHOR%5z4T
zgZ()jIQNn?PEjKE{4>dYx6X(2%K{p8Kjap-`IC_}Z!dGdqX$@8%$d`mQ8yv7&y+3f
zQ+#wXcD6CdXR?#ozW6g+`ZTl?e{_rry@U(9*#*4KuM6PE{M$Jv^RO}b^A~OdA||7y
z`(N^S>2En+WhTR`5o+cnuBd`NQ==SEM&uFSyFS*bmB)&Y{0sqw&5L$~x%m~frOc}O
z8oxh(hoW-ZqPYVk<=>lvu2rUvBh8jcGN5i6FhF_S-0-HyEUwTfjURs`q+R#m9@$4i
z=iL9_&iQWhtT#F_A`u|tmnH-+-aY`Adx$rvEoDsj$*>$*`LD*;h|8XQAA2v<5m@>A
z`HVGdJEQdPRpe&nb8U&6rx_t7R{j+_iM%^;F1`1X;OJ5@x4j1`ZaMx0!u{Z4@0GI+
zsC*f^1BeOsu%pQjf`BaLr)5=4`Zr!{AW4UY<9J<^>FE_k@dfh-v5)i|>7V&Z8#BB#
zv(a(UMJZX`x2F3$Kt%OTcu8*d&SD8YFa@UB;>v;U?*zMNygN{VcN2q$-2w-mL6@3;
zgvcy?1jC_2sQ~YT|3=(I&AXsq;OP%^eLmLr5b|qn;2r)DrrY7ldN;1q@1rwAQFfLg
z{OEY^r-1Bg7?9P@l2P9wAN~gZ&suK_VaeZJh%#eUsD_3EFDd17PUqE$Lr9dR<t%-0
z%8Qm0FXsiYIrO<)WCOe8!qK?^n63WK;2Fi^Qb;ytPt(JLc6OxChF)CWCH%Gf2#auU
zG}@QXRymC`(>I#mL@@Cl?O%$Yv6r-bfW(FA0n?Zf?D88EV++twr#}{C1675l8h=fA
z;9q^_@#ti99nk9Y%`@u`$|k!Fmwl~lvRlZjFcEoXm_~L7o}Geq<vLGxU+P=L5>{@=
zM#;62-Y96yd)%{mu+QPCxmGGA^e6LuvR84-|3$ug6H(?j?oonks@N80iUE&d{76c`
znaK%(d2@Uq=EN)b_JZvZe{17~46j83mg5{c>?N4rRWX74t>KojGc#3Z_gh((ow}ZA
z$De-a|7o=|;J^|a13I?DECV+T0F#}s&N}TZ1hv=~H`f1~YU4Y%uI>a|sE>=$q?vrv
zpuT|)ws^DqZ-M+xIdwhvd9L&;;ICfm3MPmAx&S|NN@psc9i5kBf31_mHNC@6lwaj=
zmQ7|gdtf0{f2Z}1($(wS<sX^j7jC1U8+AsXGb-bWIa@3i=BzEZPbPP^O9jFo3MKeQ
z-qd~f%oqnJ8~r1>0#H`5%H^z&;P_ow5@jjy>G!*@;n!ty7rwgwsP`A-jkyuYOR3Qn
zWHMJKe*fmnZL1Bg%3{P)NsQ&nLZH^F5fm?d_e#Mjf_VW_j!$wIIfWK;o;DGdu4dFW
zfqK6tpd3ZVLOTNpkf)nW1ozHawpe@T4{ST@2CzYx+hbl!HN2!Yhs@sRlt<A3Dhf}Q
zo$iCn=K@=QGvr97TzM5rdWF@jD~dO6hftBz=0kXgzTfV@991o1#K@AAO;XuzsijxZ
zW)RJQ8pas%By4cgPim>2Z$gXFTAh4Wg#*22Jm9saKeL&K3r(UoL|cOx(r3XkP-8HT
z4P|H+Hdl~0m|{5AUG{NgLVmQ{oaMNpLGUfJP=Sor*?O+nj;H}aosI^fzE1C%I$}j^
zlSbXc5k3V6Kv{lM+voX7>vbxQ+l-nTs#cnp6`vAOh4GV+vPK)x3DN^^9dONxL}H=D
z)t4}uKYj&#16BYjJbM$qWDnT=VLn`tF~iXp(XF_TF69{C6E_6$Bjd-77BrQFUE#Xf
z@K(}t1ugU^Lqu_gt)gbfgl-SQg!rG1Im~I3O|6wcQ2h|l1KKT*aU&|0OB(($w>6WG
zVhAoV#{NiK?&<1h=_Z1DK#XP_jB{LEIg6|)UIPqcK{~YaH!1ZtewJSqpmzf6f2GW`
zLcSVuV_TMrPhQ|+wU{>poxDdHra03iTezRDZ%j%tTRgu&M6$X2O%qN)RD>%U8rG0k
z?whA9$mFrLiETk@L%<Y=!XRqF##B(ENK>GuX#(*^LUH5D{h1jW{$QPC@iXYWnA{;Z
z7_&>TW46q{TWI>&`DwW*RPoTf@R4Zz*`$YO8%zW%2x@U@9W1TT`R)BU8PTg()Hjl=
zKVGL3-2`(y%MMHBgc7`fkY=J0amgdAVSJ7RhksoF8^d9rb@36r>e{`>ce+KTBf!c2
zmG~1O**0S20$VG@=(f1L`<d!})GshNF*4x2^R=q1YSadkaIgN!%rp1TY<6O$s0=HQ
zlv+`13xg?`qfuwBea~+B2xvBoAvKE`YlnT5CiD*-tg*aJY|HvVDP?eDFapa=I6~{e
zr0~SKOC`pCYQ6|y@=n-qni;?Vkdu1Z`9D_iq6;@DFn=!oM$cg57UKCGL0sU{4S-1U
zNaIA|C(({4@2P2mo!;k#fdRs&;$X-TyiQBWOigB_|58i`w;nOIXwBaKT3Exec62Uh
zfTAf3wzn<pH8AQFW_J4k`CE>l6pJm0N?IGz-?(ylgaH&Dr}CCXV{@_?oDU&Wdq7vi
z3c_ViSxU2Q>(CJ=P;&JukD%=sjIHl7`=i-pj3#B_(0!A)2|twj`c<zbPnT#F{hs7A
z1e!@?X-5b$u^2u^ooHwL=Ialu6eUkj=m4VbQpMCWXgJ;^j}tGmqapTDVp7BChWb#d
zWYbtxL)&<>5M2b2&p%d1xZqWx*n6+7!2EbZwTr3J*qa^Sl^7dt%6^`^QhJ~V^g{be
z&XcM46QmRsERr<PjMj``U*#%1T3A~44nCi;t8+N<%R_ywxN~Lc&@=Os3$DjZLHTs^
z`mBt$VfSuBc`W&)nLE;>xsez~b>x|v>>;Wn)k`<DiLuLPmzfHxk0^?0o^+@vCkqQ3
z$@#YP2YA&3U~NI<*(NmopQ5^c>EELIy2j(gdNgc%fTQ=1S)_yNU3S6NlC9;~{SUU7
zhVcz-GKcG_#Qsjrp#zQ<Uc!7=R1DwRY2Uiw4XW}9zXqIeg2OuqojGqXxM2fyUq^_^
zQD`Es7he=X-+^j%vK~FUvL8K9girF~S?RugN;d5=N&8z`{|qpj>Q{pBm4mUP18-d4
ztl`3ggJcUkL6_|T(x^2*`Zuedwc%1-3}&C|eveH;E@wB1jCXxC#p@-0tft_3^QefJ
zz5x0fdMVyhy@zSt@W~Z{X#2c()k|win8VG@e*){~O<V2`j8Al)N>S=A1L4-7E{-CC
z;X(WxLGeR^eVjcR1-yaBld*o%;yEyI5L6x1Bmw2^d1RVUr~W(qqhfgB`EW?H(6VY`
zEF^54tp1gt_hJ25G65ua7%wc`0tlm`uDE1>6T&xP_mlXS<Rb*qmjO>mb)+iMQP3~<
zL$5si%a>mzU|B3a5e(!26J9y&(sR6N9+c2uUx9_hg1Y?(315@HySkYxj803ILMSya
zw;Xb$UlP7<q@@_fc)#&b3oO~CvhkU_pN+A%T#v{lx%5Pn$|3s3(g-2GjwOA)(-DV;
zpQ%Z`Y5kUa`M)G&lBZn1gcHH7%!U773ppDxaF=D(rMOdUYuWd)zmiXK+K8?3@x=Wd
zr~TQ#sNB~_w1kOIF8Py4$cY!3A>!4bWyZ~h>y<H3BDQB-V=fbC0@td~+TkRp7%=g#
zp3IOAb?rFg{E==Yw7xZcsxXOkqNDn!)LtD9oM%9mD;l2NI1D8p>6GpukY!Vmv}d#;
z7*XA>qvRr?PfsEb+@6wqOC!(Z33RztY-$F7cAklE&1HlVwTr@^HGGczkBf|vxi!mt
z``}ki0c9WCdY0uP(Ez0Bq515q<lN1;ma4^cxc7%`-}hY4Ifpwke-2@IKv4r|jBZx=
z9ogapdzsM47xZNg>Fv;CH#MNAhb<y4yi-T`ajcQ;!(%un`z^fDg)K9-QTL1cq4IEp
z(AynSYOXxBkEvvR)9uj7&Bx2O&5E-A7FZcO9OXzO)My4=kA~Psl@bKyi#OmUTnZZG
z!JPYC+*$4oI3SIH-b+K55)BqpbFP<+kec_OSBodzb!&Bhh*wll;;niUZz2GiH^!_z
z^_rHXfKcTL#ac+vc&NYoxD>|5x}MxCyZI^iLDEdRJ)O3Rx=VTB#wP!m81aQ8w<4}?
zo&c0@EdPIivfY(A4YX6ta35RLHmwEp2SlyAv@Nr@qe7^1{rKbZ(*wR=qBwC!kLT;J
z>}zQWCj8=aiR=08sxOvO_PNS_RU)CgP}(mv?!Sf!yS=HAy5{=kIV0mvpU8lC`7m_C
z&cM6UJwUX2Bvq(#j}Mn)pn{qyDmXX?Cb9gRu{@@DC<UN89_MPi6ZF?xe%)WH#v=KJ
z`#SE<hj6Xr<NJPUcs2zYyaBdR9nbct;Js(NG(lR%jZl!}q%v|6t@aB99>3J#OW%Cc
ze8KC53<jBpNNI1L4qA~2$`5&k*6t@UN_QUVTi+MRTSG>p^>AOyzUrS4E-w$lzkCrs
z$&L81^jpj3r}#HQ6Wu+ZV|5qd=bH>Rdv7YIh#ax7K@Nq~82}gv;E%y>3PFS1_Ng2R
z(tf|PuNTtB8rUHwb-T~(G`P7b{6%b9xh7L120;+gBO(;Fl}C8nAU~pH^i(3ULn?GH
z^nka27TvoP`oZDuZ}>_c{2*7~At4Z-0qSc0IIbTBH(=l=DwndSg}*iIHS5@WdKVh4
zViR{MlC!h>(wr?RK2_s4mIf*=`by?AE6I1#c={R+?*z|&-u+S=(&C*|9!q;vYL=Az
zA>D@J<fP<+|EHq+qdbY~`Auhm!hxT5Cz7DFFzCAfN&g*HVcrI5+-Q!LK=Or2;NlYS
zuGhiH*(;V)S)XaebU8U<5vdbI&&GW59EW~i{QNbJ0z}Tc?LX(EI6AHa(a&iX4j~?^
zLT^zEueeNxQ1(NkY<%H?>Rrc-Mb1H3S`6|*fGx)}9jsb4%9D-uWyPiwD9GtQONh@4
z>}ZM&X_}+|zDdA0w3@S21OGA{^-|3(hR}Po#Qnl+ew`u@r%(8lvu(VU2$kStw;CVk
z(;HPfnY!^R#xAbWGx|lxN0D}S%N=Sl;vcXMxXk?Fw&uk>L)Y<Zx-89*6NRD1=PIc~
z|4PuM9dX!97d31nAwn2o_-}H)=2B>V=%fov<KgfSNAt=-SMIXhv#h7FA2OQnhM7PK
ztGn-<TzIN`I*(4}F&i#$?`RNJ)N0Oq%&-@AjH@;r0LMEf3Lhb0vl|LVvG*%1QJysC
zkK@VKwMhLi*&5?V$gt=}mWDFO;aSJ$>wp?hdx@^=7^G*|Wdh)xBb*5lPFPf(S?#O|
zu+2)S${;e{qhO`>)-O1-Ct$C9a6@a$Hrwq>CXz)qyCOVEqm=QV4u8(wp&1=FKed|0
z=t`_({fO|-SxecSU-zF-ShRc)xF;xj;)+!<1wX*WihfMc<QzF&nIM{@x&Wir7Q9|l
zEu}PnB=zV$(Aj&+&OG%H-74_LWls6$zf78ASrp=?ci$MBC>#8wa*1AB9C?S(rZ=B;
zMY+Ctc7L*R(%5A4-VBm-rUzM%U*S=@dG(nIRX(GZbkiDra!@M%SHvCXOxkq&Z@#&B
zT6|U3Av{e{(m#&}{O0uqpuyct*k5m(ug5##s5s1?LKR!W!5HXAy6Xjb*Z`!bBW?f{
zHqa-CvkpVbhpeIwx)-0rOZ%)i?XJjneC@DGFFAQ(JXCAa@@2^ov|c*c+L0V_lgK^v
zARYjgvo`t~zUHI=UvwzVSY#4cBhB%}&xy^~A#7%$IPK#DPOx*ZANr*IywvQInRF84
z>8v{a^_p$i*=8xx3VD39-_H=Lg}_=1(T_bA93lBC5u?`Io-aTDFOKFH=>}vQ_MpMn
z8A(4{1jn~4Mr~_jbz?%-)Xv&&x0k)61Wtl^FTV%<aV%0N!gY}ay2#{NL2x`ae>0A9
z2v%%~$E_Ei^+WFw?k9lvzwf?ULxES9sS_Gm<}2~7(&Mn3ozC89r^xCXcCNS&^AknC
zD>9(@d}fN*0xgYD&GQ&t|Ij8Re@gb79aub-n2~P5&a@YIbO!bgzF~FvT?3~N*8xua
z=N8O5;;~E)FMjsgtGaUw?t87#&OVQP@h}N+Ied?SgbQCbgU7rg1@^inB`?iAab4>Z
z7ws%H6=c29%O>FUZ0*c|s3ufkJT5^?Sd8RJ!}zs0caE#3v+z;~Z`r(90R!J5gcmhH
zyBjK5OEEI#`w072qaOP|8g-bug*mx$M-Z?pOHioQ5bZPVO)JLTub{)%!J~zhL*2TZ
zfY*YzF<VuBb3FjvZ_)JyoFO8fR&SQ)7EtDVa^I^4XhtWDwVa%l0QX=Y&Ih)anvxV%
zI<DP_spDmrAfXW4C+D89{FeN6aA=~k7(y1OM=~1mV+KNy`0PtBIiBdbPJ)%7Pui$l
zWX^yTBA9AkZ#O6xC!Wd-J=SRZ-aa=AJmbz_d&vKZ@Ke@o-?7T~W(qKF+NzhBwU-@{
z+ZRgSFA*k6UX^@l%@clKUz#=@9U<G4-FcKLcbVv{3zMQ~^zQd(kg&%4KQ{GSG>n)E
zuhvQl4pCFIKl6gMz|-H8esEfWVNxIiWS&&|@xAns08Jfwz_i84wC)Q~ZU6v`S2d*r
zqgFQ{TGLnyBw^bIxWI{L9br3Z_5AP{`Q!{?Kxd%l3etA8VQAr&sE77BN$m0>IZVTr
z2JL)CC80svo5;Z-vy?&$z&6GZyllItPg@?>4x{~(dV=qPUCe{@YVJ3FINoEfT!-(U
zIp0b}@8BkW5hhnqvz<@{1Qv1uEmJ}B{*|n&<M>FljpF?6R%-;qPj(pJ+)qd@m(^pA
zed5W$ZJs*!%p{KBSW6Qe>%?;;AfZb&P3)Kd7V9u@jqI7%{00;&)Bi=Xoa@e{l3C5$
zC6E{6xWk5>0nrt`0LgfR8O$&U+!lFs^rL&>J6H@QdW-$gQU^9zU~yPX+^x#)Mk_lu
z6n=y}-1h=VFOC_d<sBuzQ{c+=V-1n&`lAvREPq-gzoLq!t|Z{=L+J-<HecIk3zqc_
z*WGot{9yR<26w#S-_72A6UYh0xv&?%Nkbnrf`B4^;4D4;!x>HI19+1~5v<8}CDF5B
zCh)GKOBHASbrsM(u-S*#GA1IpYW|%|^m2VDF1z|Su)$TDlovZN97husz*0qz6Em3?
z)R)GV!_3C1;o1|`%$ux1T+u{V-NWbMCT2H4MjDxFtZweWZKv~tI5PC%ZPjr|aneO7
z9sn;EejcdDe+)QZf57<6u4xu{8z+~{mi)O{nwKD7M<md%UekDSaA)=k>gUQQp|<Gh
zcJKyZa?n`RD0}teI56*<SJ?}z+P2P3S2vA9t1SdCCynPK4ix=C%a4!ayUyUh2hK8A
zr8G6I2bHkC=0(i%HXlNr>`Ld_KG0k7=}aX5Na&OCA2NP!2-@O`iTF7J=<vG-3wR_#
zT3JUIgLAv`9_A-o&(bZ4Z=$8D7<IQkP)Y0NWn{20kSC?FyQes6bLPjb2u}pcx42J!
zQS5!7W-fSKnPl$Wnim?dE5L|x<GjY(UC1TQ;Org-3$5vs&=JX%-hQxoacOaVwB{3P
z3NsYOzuCcBZ7G7<LNubd1U%nBJ*dCM)ZWJ|i%E4Tt>u85c3_Lo9B_?D4j1^DpX7uR
zN24EXmr8oe_-vd)%zFP6Ha0BCz0)aXfQGf5s&-`MakaLg3Ch+K+WLh%7L9L3`)*=(
zlzty&dkwprg5*j&tCd(MDM#20RBT5G<43r~=lJA}i@?R<U_-y5i)rU!B<FHBV-P+&
zZcAqu`6)C;OKM&}5SD@ut2V6g5ly<C2uB<WwZW*0e5xUo8gJ<(_cn|&dNzleXtPLZ
z!$&ykx#)pJVEJnJW_%s-J)Z`?IflNU^1$E5JLNa!sk_t;)&5$J=z%S+*4b9LrX0h8
z^rSJpUd<B%>E6otOS)6eu%2`o;c~i2=vG*=85ibl3@3eKj%YsvK;6~AX5jqXWcz;z
zbkr-Rm8t+)&8{P%M=^`-u$mJLGtoo6Aj4qMe-U+0G1~VKGqOsVIQ-RL>9ZyH%UkBa
zpE0UKu$>}|;WIPuXuYo%<DY3Kp=3jROVRD5q%u@+$0bUIiqK^u-oY4qrsSM9=WBR%
zPCFkkfodMniib;d*?71e=X>`;=csY4R5}*5CGLp*@rG6cPWl8K5K`}?h)a1&W*s8r
z|JdI9`3t$MQsj1`flXgU?@N0u&x<I^y1-Df$Gmr6C0)Dk0xw>`tfmHEZP6;L`X~2J
z;M`y0@H0wrY3#WSwW8aLe<`;pSll8%`VA72Z8WB#E8IJsMOXZN*Eb^TOhvPh6e1Nl
z|GjWpb;n>K%>7~Efg!+IhJ=QO7_doq#FDlxWKKYyS`8eBjHfX@V=a@~Q(N%Ff;7kh
zlTyc-Ht|#NNcwClbaysgFbr!*{-@TPkE#o2cFqXye}}qJU3$17<CQ28biX5NRC8iU
z&B07-Y5K<cYKO}`f4{6G7wiu>OKMOf^fc>#>~8pf?CuGob5b7BZOoXxhcbw~91xJa
zlFAk&oQW*;zc9(YF|DoihmhJmc#Pi^=jLOHhfS1j=jK+b<B*X}Q@-Pn`#ug{FBCMs
zHhIX9J1#-SN*r)8t?h`+b@!D6!5#h`z%R7Vx4<tgDxioE6^Xro-OkeOb*ck9Wu9;<
zATLzbe|ADjBB@luDBg8Lx5m8Mv_QBA`|I*k?W59PkrW5a&{AmQ*=whtulUs>|0%GK
zi5m(SuoE+-8Zj#@iOm-Z-ajO>;8$_^qWd?&E~tZ}KOvau2jbmHi79^P?;(H1?o*f}
zq-xiK(~RR0_AIl(?Z==2T7z++9rpO`GGGX3RT@|5{OffKC&;+<erj)pMaTRHbZ`F)
zx|J>RhvQFn(HD6r&q?rSO42}NIO7pGg$7+PGG|ldSklI-&VH!()Q808W-i3Uk%j;l
zH<BDU_|@OAyUlo>>soS_$=HoJ8(;ABYiV2}AZ|kBb?Y~c?2WMFUmt_OFj%H3s}rR*
zAoOj<%7TcE$nk0v1M+g2Wn{z2Xnis~6XGj`3^1Yz+k=i2-<xE`hDCn6<Nc57oqh{X
z>s5{2Fr_%?5xZwZBtvA}48{gf@N$Z>M&g{qLai#gGPzrOU3~88u4a9gq*UIFN-Dw3
zt2rg+{H;U6KjzuDr8vQF0oNurfk}*1DL4(uwCn)k4fqax=^LhV-3#gR_y*Z90_E;P
z(2FJldIEl5Ki8l*+gEP3WrV;v#s5-n!*lL~J&AR=^*UhW!5LE#g?Ba9VP-I{364h`
zBZL!f3aJn8;4csT(Tiplz$_tIvNabkTP0g>56shmj`7sD2ou%$PyVyX8x50YquZl!
zyRv5Hmjf2yY$i>w|0Uh*kg2Oe0?M9~3!_f28E|jUCIxk0{3iTu@kDP0-N24KWO~ZB
zK-D-`jk=Y*m}#d_h2(yt#qx0?0?PO9GV=wjj~zKMKXDJ-LpfcQC>{P|(g99tH+ck0
z;UUu_r-RA!jricvM%=*RRfWk(!1jFKWz2e38+H`u`vAOmAtZp#)tKP_3|uP2<u?6|
zp?}s`oK$)!ukIl2^G6vV4J74kRj%oj2rX=O5A$ZuyQ1ddxx}S?+w$JiEUBxvhPZc<
zQ=YpO8RK+~OX=6M*^IjL>6^OPs9iD}?|$)eL=FS8H*%eSpJjsXHk?&_MaYeFipi~N
zk%oN86AL<Mr2_4x9MOdnZZ~85eJl%)B7KjF_9r!!%84gCGWTaO)Xs!Bm8d<o6iHWf
zdDyxQZesJ|j@mhYDdO7>WJ&Ya2Dr8kj;v@14qiwSN}Sqy_y5=MPQYe9VQJfQlV3=G
zDOZy<!A^CcwgF3tK0AeZ5Q5**naiumCiRl(54g9gTS6;xZ~h~B%Ve2=;e+l_+cK=m
zX-?*ULg$zij7;*+Ik8SNKO1UfaM!7t)CrH!Q;4}bzJm)}+H&>si7>8oDE5JczMq@K
z_Dj74`85)}+pD+RxdV$&p$%^}f270OD$F~w>O%+mZuq{~S8Fwj4k|<4B2;_5#PC6!
z6S`5*aWvNitn~lT?=dXIHQ~)3eH_vkC(Z)-1>Obk;8Xc4Uq^53JXc<WxM;C<v40ae
zcCw05&H78dao5io6CCZ&L#XZXy2kV9&th!YsALIgj=594D}jf}Jzj!^5C0$5-aH)2
zfdBU=%D!b^CsayyS;LfFiiGSYge--StdnHlLiR0Gb|QOa$i9W_>)7{gtTSU~?%%DR
z=lMR*^*i5l&UMcDyDQh#rJCFQ`n+E6%PO`)ZM*Gz#v!L&Bt!|F_%ho&XB*!m%$JqS
z5cc{BvF<N9IH&%sd<Wmx;37y#7eR2L;{<^e@Ucpbj=qzG(tqg5A$?jgff-QPq9pM6
zm?0YYEsO-E)3llQVBNSIo?<dK?WRqKh|u<6wdbfo2u%ZR92IgDNsnzr?T)iGKSUR7
zi-<tj&fdS8_P$zxYWM&LIhRi%TK2-eglq-C^Rc;faavYvI0Ba%;fxzCzqsTEu=c%m
z!i2I}XS5&aSFi*nfaDvm`Ig=C7D&D`4?-(>R+)tZZqb<EjsH$Os!Qg0C)K9O^zmmJ
zL<bf9oST(`kFY-T{&Ug0YmTF4PKMr<1hx+6$-_KAg0A7Jd_oNTKrG?WX{^SCYBVe)
z6=(n^T7}Zxf=7lS>vE)|PA%8M#X;#d7h<#!BPbZ=h%@}L^)K)(RnDUFHR4;5sDw&=
z?qg7N@)|d%pj)^~d{T1uNaSk+Ol_9i-{Kv-#a?RP2RA#sj%D7#jgeziJp16?wOjeW
z5W#oB?e3C`lxJ?Y=O4FQW?}c!{w^m5nOzpMDtniwFrO?@Ownz>K^KF`W(uU_gW`Gy
zFNZVoZiuCwFH}7yz9xT@X7Y;`D0vnIWLhWOB4+}L_oU^-3g3<G8`R5;FHct+fS_pJ
zWq53cC<d1S7&GF;H?jiW|J47qwRN>Fe`<}@<(iVU-WlwUD!M!Kn{B%@{h&N14E*Ma
zPG5b&2^d8oYEPhcd;VY(?>)|Q9?^M>+eP==b&g&W%6JlU3a_!ihJD>QxHO_B{YFP9
z{zJgA+5QW{_}CX}iyL~FZp@hR<CUYM{MbuV+g!H`j&omxFg(Ogb1&%>eNRy2r#Ge2
z`~FL#@wTo*6a6}4cIN=@I?D{cD@9<l<I=r-;@%i3KG~r8s^x4n7w32>52$tzAW3%w
zR|e0^lbPZ|kCT9C{U;LixWV$G<$Ji1sQX5T#ZF9%5GtE-iH_}OQ<1YKCA^JH-rK>V
z+nkwKo^F!m|0Mq)LttkAu+Z5vG9vY}fVCr<o(iMB+TRM&Z;eu@dH7N4P8N8;sR)$I
z0LF(}s1A6kvNQUNZ#R^=Yoi}3jkY1Ao<c9&5=b>Vr`z+|IFe`P#>#9rbaQrTQ1{IB
zezHEk$7L;{doP8OES~EwDHBM$*SlO8hz2j~bzt=sfxr(|5;OjfF60Gdmmq##s_DFU
zTxi_Jj0_?sV1C>r37nKIM<Zn~fy-8*ltN1+ZQS78cFM&tP|a79n|GOY0)6k`=LR(j
zGRk7rzR!Mx(7VAZDDt^sdZx=Tc&}F{&C(B0n%+jDsS*U*{v~{~jv^O2#(}Dk6)f@q
z%7A8Egz2e&SWgZLTBN&eFwZD-y%kxFOR!XzTYc0d4;8nZQF*(;Pk5&eUD#cMd`#9X
znmx@<1r0J?_Tjq6Oi6Ori5cF$)(pkxO%*2p5?K)Hf2GypnZr=gln)<)3JOhH3#(I|
zI^#><cOB?cIv0I(P6!367W8?)rj#m4Mt;Hxpf`F~_0TRzjxdge+f)yB5WB#wLmLfz
z(zsQvprFUfqiPAErNe6a>KFH9bbB}#lX&wcRXkk+9KTxTc@|H0v;D8|HShlozJ?UA
z|IhICz609_wf{|gE%yHiU$;S6hNrQ?M`N473gHC2tXN{Ae!hJq%0@dl5jRidMq2)g
z`E9cfxAmGs<KrQ11v#ca3_A>p9f%(k4)QZ4-oV{j=bb7OO@fnoEJL@I;A_P@$zz_f
zGVeRGIL2rwzO0=QY@L4*?1v-E8f?^J{t5gppSN8iNPg#Uj#&|Z^&b@kwl9z}<^!n9
z1e;s28oxOa`M}OQaAg`N`qA&=UHle6%7~AHdcIzo!n#LUId``rC~QO1`XWW>ZkBsG
z|FZ><Vqy23ojvstOI9=$#^YJ4;>%5Fko?pc#lEB3bnhvbA-4)e1zikOc&ZQ<vKCqm
zE+y`g`4-*VhVI$noPZX@?32<mg`0mW+4<O5i7n&qQN(M#uc*yah&TO*1RzTM{?DsF
zCF#8O=@v8Lk;r-eJ4uw$kSmvl{M%w#dl4=f(EY0>^b1C_y#gFM!54mKH#O@s18&a1
z^7p5%m=79#3f0RG%f%VM6KzrA5qt7%Fpxc;a_=_<EtxnC*QDRrQpU59rA5*7N4S3D
zTT8_A?w~R9_M7pW_B?9ku8--k!Cz>V!;{LY60dcQV^dRjq1wa%%<o@F+sW_x3W-Z(
znt#GYFrEFd;+)M_XZ(3iBH<6BBe$zjE}G|zYm-t0FWb9H<>sSF9t2!j5I-Z?m;a4q
z*GHBH*<uGrv5oIqK$V7<qGrZa?0%@*u47$R?Abs#Uxffk7nB?B-?4L6&+bEHxMffC
za`1h{bqt0)d0w`XjS*O!zW*Q`zM&>j>2bwQ`^>Utj3wFsL$WD6o#Mo+3Qj~rB9orS
z*?=Tl13H>ew`n9Caz?Ukt&|C6z*G7->p9lYZGR>Ol|S>~%~#Fd-zuvUZus$i52COD
zC9si1HzD(Y&g<Y3o4f=Jg$#Lo4-vF1LP*9Asyg7WH7ip-ba<jP@<QW;HfG^w?WQ|n
zUW@&}g*T!06b!a{E+RF*TjMfMvSFa=v~~n5rp0U$$h^y;FDZDJo7UE@amef%xa(pv
zkF!5g`8fegP;U)ri>_3BXpq`IpYw$F?+#gf#=a=OP>)AZ2imt92eMogjq`??Ek6Dp
zUt2!G@5`$T_l*~;6pffuWOK*;1w04ezk-vWZH5atiC@#(uw~+<tA$7wT5}gXz^7s<
z!oItkwu>P%tfSAjOBvMP3hRzMoR6zx1;QzCt6T^7%Wb}m!)32~Q~`zAc-WC7pJ{>W
zxhh}m4G}VeDqcRm{b}*T+3NA>=sSj<oVbLW1!pvSM!*wY3(in;0^uE0t>BN>NOQnM
z$_5yEVGp!m4ht~nz#K_iL;cpX5-szPA3+j@ij8Cb$P=vSu+CXc`)BQ?mjvRQlUN-}
z^(%-AXG`KgfZBW50`RzFID7v+*P^KM;#p3+6=H391z7m${kN$7VnS~XB-;Bw_bw5w
zI<TJ?5zKATj$JQ;m&>$mc;>y|pi@~ABRA2M`y#IVR(A|KV>KEQa1}~e#e+rdEXvLY
zQMDw+07D2+c3!NDnwx9=LtA;MsF%&oKla3z5>*bx>eMAtU|MPDA%V*EvW+(-!!yO&
zbq#Qj^a1yVhb^$Y5_rs~(GAmo6P=mj1MQpXezqg8aXp~044%|zhxle$k9->vJ<H|y
zBwGR{B-h6e=tRCA5{Q@k!{BPK1I7h3gow_$)QLs+y7xj|FRCvV-o*VUyw={Q<F~v9
z)TG+FobH-mBiqpR^Ffh3Ha~DUXQUZ6K%F88A6X9y4Cue$71DW1YE+$5-;z;9%{6Bt
zTuJ}^ef}EES#~XXduLy<*-AgMGg`xziT_Za;8YbLf-jd5A2f;0v1a7B$$7@E-Ct<K
zOEzvK`S87S{L$!jGS5>lUUrKmO%q=gHv5Y?iHBM7X+5~829z_vkySai&(^S1VD<9+
zF5TEM!q%IssK=C3nI-Mj2{!%Pn9&Rzy=xI4CW!%y+OgrRwr(*B=Aa%PoW3asJlY$5
zPDip|-j@BeAnaO-IW0!F;*=5t*?cA>lk~>_=idBl!9~r_MQm#;m&xkqdWS;4c90(-
zfq!Vw84GW2C)$I|dQkL~j*#B1X5LOjh4DH>#(uQpiqb0-yGmE8K7fA<<|SvQ?-VHA
zdD#Rs29#VwEM)doW;fQEB%eWRO9qLHZ8su^gUQ{wCL;1(guMj8&#k_<d9NKahJ~EL
z=v$hY3l72pKQHLitFO$7!x#o@EKfV&hp{%DBlz;q0sT-S;bq-$`2Ftz8QR=7Z;0X#
zV#!;hZOESf?rgrP*D0G7C`*VVN#ECncTKTT;vLWUbal9`*lbtk%ZW`<viCZ@Gxj1V
z43GVr$83Ie1qmiR1)3@(wsj2*eL{yHJ*mmRlm&_{hhyCsrnVeY6Nt!l24+H+i|T}Z
z5B9V;liFpSe?D<osVpI1x{`H*ftg<^Mx8+115~ect@*|Vm{cYi|CIW<?G|R|bif+#
z{8`MV{#3dsu6jR~z#%@>{DSZ9{fEiTX7B;iOA~0$c-=5W1)$)H_vVvKZ+%$~_z4`w
z08npy!ZFUyh_-R|Li7dI-AIM5wWvG7zIi)EA9Zkh_Jwt_DPr9(J}|nExLODw*2nO;
zeJkZ)?hb>a56$k%1DB>G>LYm@_E|9+tMG53`+nawS(fZg9mcvPdY$<f9Ve-CXR_vl
zvt!<}H!U*XrZlF{OM%*C7iMd<1cXw2rkzTOC5?8<dT`XegVTQegp?rpt`bXkOPReE
zE1DGqL<RLfGB{J0DZYI9u8mObdox{i;dp#4KIXX;l1=O;9qq&@KWo|roy6S!kd%>v
z<56VFkz$iau^Y$hXSf^F7nC9N@QEtMd^%HjHDJ4Z5y0941BB$?ge?qNtomXs7^{1w
zdrMp|Rh39~|2r_WR;NjD;}LupZ@<Qxvm{n?AS!;6xG$<R-3^!uZ+ix7$!yC;>wI5d
zQ(>J}*twUZYcJ2w+GHk#|6aMtm}j?q>Sa0o=C891Y7zpoqc(-_lLOd|&zlLL8UgA+
z*r$+7;9KC;IRx9IcGZ#!E7vsg!E}#4c~ZWa<%{r64Sdei65F*$fzW9u6`LrGM97U#
zOP}28k_vL?9lAGIm=?h|GxO1KzTM@8-5_wf`OH|}oD^LJk7XymJ2Ivp91x#EIPH1-
zuQ87{dY|daQv7QtpxYG(7h^c3XS}tZoY9T=oCKkkZ$*M^*yiW;)xG|hWzPu5r8oxK
zz}MnJC-rf5*Lle4vEn=)qu)F)v>)xq%HtNHTtowl34Q`g))nIYBmIHba~_Xb%N#FM
z-Q8+Cet`pr7VgHW$|a9|+1$Ph&Xq^>+|~iKtSQW^H1xRLXA7Y(p8Zg*lBzEs8|~+&
zn=-4GsQ=8G?6UGyI`UzjK;v4e%O+WRG`ypQ!}~se!9}J1C}@fI64q&V1$QfO&Z)G0
z<rNK3u>ju6m|%b0Kh7$=?W!{vc;(auVqEExQft@YP8#?lmFNY1+>NAZ>h~})plp*4
zfyK>tumuR-ei+q3eEYebIQ#iy6QJP};#`!d>V*SkChkUJ_b$gv$z8X}_2VuU_7CrV
zxb_W&5URZO>`F}tkBqmMs0i`GGl1QoPWJU>&L}n+oRL`@+)&%N(E}!AO?_i*PXk)V
zHz$nekv=NN(pS~QL8Rg>5;<mT6E_;1Gp$uq&k0TWQ$Gic{M{c%!a~Z^)K8j=N?~=*
zI0zS<vOBa4v6aD3@CEokdf{ZqKg>(i#zJlIvAR9iR=DUrcP$`-nz9B_4>r1riw>B|
zLMpxYyL7~;W7fZv%z{_4ch_z#!?-GDem-7;2;4n!9sV5~flT2iI~P;-q5(O*e)2$!
zi=I+!jJ<pQKGAD&8@#NRl#R_CNrvZ78*a@zY$vOm9h4=a=9E-m%m9Bt`prs5q~)-f
z(9s`|u`6)x{J<bwTjFywvV*SLHu7=mU-P*3XlmeR_Fyl~6{VW@121Sa4sxCjTgb(@
zMMj?f?DC|LETr*2dna)jd{km+2j98O-eLmKeU_+hLXT>q@%YP~BV^dko3p4WCf3?I
zwlCo`-;SZ@N&S*?LC1KRZMG`nW2<$8cU(}7SHQV0d}CW!H<bE`vur|-9f9G8^RkkM
z+3dlAi(f?FF+_I*7kDxxE@u`nKIMW%hxt;;vSk*}Z^)AjuapOT5DD{lMV;Owy6=yC
z#UFejHM1FaZYSYLGQ2`PDG_A3&Y#IRD;^z*N%I<y=ZpXxmrRD>;dS%Sf7r%OBcD(L
z1)yy_^$*+lexbNHlMMKIvT-NB-rdTo?&A&51QrpamfN0(8R(jTIkQFN{jk&`(ur2x
z!)Rc&6}dQ;{pe09e3azt>@Hm=_8Nj#=BOYuAlJGd*yRS&oL3MBbh}z8Lb>@vvN(cB
zmNQLTe<@aRnm7Tca(o5wNiIb5$5_e%v_OT0^dfD58!v!yi1okBUbx^RdDQ$d{BU#Z
z+&}8r9Bc0OZW1BXpYCz~sbim!+xrqt|ARXA)L9){Ahabt_=)r75Gwjmf>!0*n=YH8
zLyz6(-;ofmd)A6-;39LzeHvLDBaJnO)W;mRety^(MP7Q{(+*(@gCpw>m2Z9m`%7e#
zlbU#O)XDhK$qrsuM3y6K2k}6md|S5-=pTlD&a5RS2e`V!o-UuS)^L_l=;7)U%-rpP
zCXF%nVV&x2HG6Kt`r(Y85NXfp4MH3S$d1qcd8+9w>Xq62YJaGm>f1)h<&(M>HN*zQ
zCgHILJt}0lKpTS(ciy&Iv=Dx4JZL<KTXdy8uY~vi7!YNAIP|4d_UYm>cY-a@V|>~_
zWzc4(tL$2a-_;cr4+A2@vdjoU6cy+sfDrcHRcdq;a!+{dx63Bb4<`gAGXhmBhRU*H
z0ViDQd@pJ8LIEjNA==(I{NZZu0vc#hgrvyElOi?mrFSMTur+79Bi9JuXEjPL_ESD6
z1rXzO26c?U>~&>{9vB=ilhf}rYKrD<1S+qx@v}n>?6>Irmn9JcXgm@)5bcK+`@WyO
z#QPzy!B5|Jo5v=??Jny1po)N5q?3BrW^ydqP|@Q}z!f)vMBo?U>;Wwn=+kv_(*0Qb
zhcwGv;QwQBx)x3ysm*R_Mj}F*2AcOI`P9#Yo9er}ozU`lz$D~lM<}(SJ4ZyQTwj+Y
ze%wmr<?vqEIQP0ev5^=0{M)HVIgzi=-=@R{6lBJ67*#5nL9xc8|75msVLyAM?Bnh)
zseO?ZP&@ParTb^9atoWn<t8jm+L2j~e9%Qa@q5nR_1E7wL|=rFhXzui^$o2qz&QX3
zfxPBY>VyYNE3VSL;NW<q^?>ID8orG_P_VnZTMA7Ij$A>Ga2_DSs1W3zkI)q+N#75m
zgDtOA8YgHwoNsiOD+6|T_*KP9gPrk#pHXbL4VR7f#*Ftr9YnYG;Z%ZfO;5x)A6n*9
zS)R*DHTgwI&q(xkGT9`!3^4==9YZz*C4su3XICNYw0zH1;7db^L^i9T6Ya)47LYi=
z^Y)!^0!O>P;r6@tIb!9WT~Dynqo1TL`tP6dU6+%<zkF99wK+})O(V;nU4n%1bSzEi
zuz!9tbF5cA56z#XcW<FcetYkJI@vcTE;A!Q>UP6gEKsDmqKKRKvKlbN#bT{u3Dl9W
zTr`ad;xz&<nmS!_*{cZY%X@b7aYZR08GZ0^^x>iO0IFQ^&Bo~{T$C1-EaV~`Y!vBX
zv<nHkb5GH(+3S(-O{T=>*k5hm_CC1a)g7z_!#FBqTM;%LXr~zOSn^Z&sFpKdZg2jI
zIN$+2bdVoTv*<{~uLaD^oD`ozmCIMM=Z+aL+3y*N1oyU69tGZ7Ggu$u_OcsL@MmJY
z{~#^47-Az~XQK6Hw$wbYx%~Y{tN~v7PO~`64W%_$svTmjr@R1@8t1l;jPa=&yoPAu
z0fc|U8l~S0Ve?MHpm9%6Y0(-nr@1$c3e_ah?p}lD_nmU*g>fy3^I2XLvb}I^FcA3b
ztp5jOF2q(JZ*C%t>fWuZjh;}lKH7`>_(=5gnZ&GrPTkYsg2TgzQrjc&l$unD1%CWO
zIedZh6rSdp{p>)@4f~@8P`<S^Ik`!9lO~3|Z18ZD00?4WFFT)Rh`tU$5A&RSs6LhV
zOH8*jQsjTJ-@={2ifA87$k!X5qjrIBb@}->Sxqw@`EFRt+g*44QiI=ZnDprr8{*RS
zB@aAKhJ88MJ9qI{RPe3YgSWhSPmP$P7b`d~mMz8xxc|&$z<A;#0+xc{I#s`S<!ql%
zIv#pic;Ty}OCb|A`bO@SYyIT?h}f@jwcwwXP941Jkt7)Nrdixa`Hlfrcw5<vwBXVE
z;Myl^4j&fBv4pis7Lf8=q@L=QF7Z!|0vNQDBbG52cc)gTgpRg)l}DoUI`HL|WQ!Bw
z%2l6I|3sYAs_iQcr&Y))AN<h35@fnA0!ShanO_IRGXCPGJgk>l+Sw>;QKlmwzFe!~
z%Ajwvvb4A?7T;!kWOP>RMj)@5J+j-^6076@esDf%)&)jhR@Np2hXvN{A!GM{2P->a
zKDYEuf%@`&T={xOJ0l^rcYn)e0p17Kz4ogFyxs%<P-2AdaST(=877@uPj^iLRuEEW
z_ld)yuXwdsUg*b$tOYS8wk7`p73Yo8u`8LIgeg<7v)%#I?<|o>SVBkvOSW*I_i;?r
zILjVrg~?)@PYkr<@;>*yG<fK1k%&8&zZu|}_jiBbPW*Z11mAhH<s!ni!`$NaUtcP6
zfA=mB$NxuWwiX-y$f|z9HA;U9GnL12<F;t(mlhT#z0!Ryd`d?6$>JMyv+72&QkHd-
z7#>8uq^X&P#azk*GytQ=82+EAx9NAZ0Wu$EBlc_rc0iI^&=`(j|A=hJgZBc#K-~FF
znan+X4}>&ehM1o~GYY|O5>mb+z7fXI_II?CY<MFtG#6r$6zzEH(wJEqw+iRU6~}@r
zj-yfe$=@6gM@28aQ4`}5W`weU?FDVtgSFIRt_1&7+GVC)d>7Ps0@LBS3~T3&JoS^;
zXdHQkGd=;HhWDS0LVR)8fhasAH546sVsn7#3s1Z9POGMp(znjFwjVogF2Q=}Q<-ad
z(lQX-mO?DnkZoD6CwRUr#pkVK|B%bKy9nWZD}I8&<0t80Hrw5_jU6Y-)1HNkEvL;)
z0M5;6wCKRap6=eiv(tod9qDUmA$%re|Aa{lB6IO|>cUPUM-X`cOr!zYt=S|}zN1J>
zKnP=M;NDg`YepEi&%M7n1D&y!WINJyO6Bu{N#~T<)cJOf!p5a8O#l&VQ=yA4BZK`n
zj|iLJR!gx8yG5dy4#h-xf<@|7FC6R97g8EC){h{XCFpw*3UMd8WTk$^{bON_kL0d!
zDDBGyC}qw!#JKv`a5Wk8QNGTl48rUXDSnHSJwfwpW>Fk5=N%0<@nTwzrnopan4$uu
zDe}%GWTzCYvjlW{XB*US!g~8hcD$eP5Lzuz7DtfwH5JP5)uH6@thBIr$b77h)DfP7
z5&i&f1|R@DTqvJ9F)4E8;{>@(hwT*<$Mu>AkFbx+y48^3u8uzM9gO53{XYA@YYp9#
zW@pRbE&0pAms@4%;=n_L;MGsgE_?gj0t<RG&l-1CJ%LlvF+Z6I1Z24bu9)OguKnmm
zIp7KP#GRyls~|iIVCS<?adu=-PVUJ`T`mzf1BUj-xY*!!8lJ~M8cQ3a%eM#G?N<On
znSm}fk16x%w^o*XT{y{pt=V`&Jcbn_R*Ca^JgWp}W5!7nF|UvmnQ{@6$&xrMkytXh
z1-Iu~nPACM4Nnp-&_z5!h-*Gem@9_SF&#-BF_Jxg!fDV#MyO{~z$}sRZ0J9UQfkk@
z#cH6-#gjONJ_Ax|1(iZG4?a<meK7u83}+$Z9GT6BXuagc#u@UMl+bD2zxA>X9-oW2
zz-@cGbxClOO%qf+*x2s-5eYP<zTA2|@aCW$K_@`u{hIOv5Azvo{Xs~z#~&t)R#cwg
zBz;r+TRw_x{^UZyabE$(3Gc!SKo|TvEu*zQ=`KDK9yQU6xDzezQP38<{8{Ose{&gj
zucmZaALpgQ?U$C=x|UBmbO&$=U(u>nlvcG)Jkk2hD69S%J;T->J|93s^IB^Ow>(#o
zfgawZzB>8!$XA+~FU5#a0Y4V_)5BuiW9v?;&X04UaqLqBd&wWm2pNl0h>60La2{nw
zzw_hg3Er@~d$m8Ouss}9cVcL2`Onm9RN&xtv-uB4U$*3RI9)VVq`9QVaoztKF8`NV
zt(yhNi%Hm2n~W|M;E7SmQ2n@QSNy)gFCQPks09Sf_A9X7%uv`p9Rlz7Lw*LkSKGMA
zY_DICZl8>zDs<4hxr>_rftR->X&0$@9`C<8H2o|%Hye4eA?;|C!!WA^+Af}M9Iy|2
zwwAVbPku;=PSPO}e|$~03g8cf9i4^4>2Sd(P0-)`{KjTcLScpWxI0yci+88>)XwWg
zBZ`t|2G19lDm%pH_nf;+-6yzH)YwVA9PtJ`aY0(SUr`84C!PMfAbN@fUpt)UPuGL*
zQ%b32tKMYo0$));-XS9o*WGbOT1+gOu@6(53s&!+;OlO8&j;DrpQrC7>;f^%I=CMO
z1VwZ#-M+mX96j`peE8V6uaAYV%wXSVyCk0%48!fk4wFCCd?5a&tgb8kBi-%KMcG}%
zIs`>Sgigi32gDs<R<9#3Dl60-!oP$wYN8MtzcijhSD~Y%K<!~3Q<k7~;^6hUtmk>K
z?>Vxqg$)kT>;^6Q?-RMeez>pSt8*h<^=D7;qJ-I5;5$eA&qqDbk{r%WDBJ=qT50NF
zNq>vrg%jxFIsu%&Q3@J%vP#++Xx9~%*L4aE497u_M-p?Ku5j+%ScS2~$pmd~#?}sw
zQ$Wrj^ZvEy;Z;js(4wB{V{aA<d@?V$t;TTp{sMKJ5-Oa!FWY)h5f;JX0N$G3F%~=Q
z2{(Rg!<MxT*25+7J3rPD-X3=-$&~-%Wk&w!B9xKv=cl+<$i&H>QEeou_KKr*>wn>8
z0?U8l<-a1e)0s#OqU7=;Q-~AJ7r%RCbc^IxhF6xkg@qT}Mw^>WBn3v@-oXR~55~s=
zrspH^9V^#?_W~RJh#s8e30(TX>7N>PM1Adke;TI(whII6V0qm{Z1Ezj@LktdJbeNa
z^R<jtWjob?$V+AKRJk{Gk8otlAzdCPChSpI|4IU7&^VvuM7}k%kslf78$Lqv;6`z<
zdmA`v!q?fY(sf(O-|KHj`~v&|)ACz{clkQ23u}Xo&iR@nFVU03$&UtOI%5@QtIQUA
z(|q7@++I7f;@}O+K0!?96dAP(GluubbDTna!`4iIO-G6YOZd+x&D*aBTxx-9e>Li+
zXWz<ta1E3TyQTyRiKrL9N?&^hSSwfy3;F#a%l;sh%e(vW{AFM~J`!hB%!*fp#}4n7
zk5$IBT{q%pV*8wHljhLix?20!sFp}dzG<HPi6{TxjOu0a>;gpMxsq&y$NIt%dH=5w
zvlQ@uY)EI0Ghg;F#A^A`-%<@0tv~9CxX&Li-`HqMIO4d53`u7Ou($h+`E*KV7J%eA
zf4-StX(S4RcdZ57-j=l?1qFi%X@2MtcDXCDqJsQuM1=E)Hk@em4?ghf2br`8J+FjY
zjnPL%whL{;XD^fWQ>z}(0arQ*$xPRCRz@iR*WS4w`N%lI3uJyh=_`G-s9ts@aS3S0
zY}X|lQ$X<LFv<aZPjpLDFiXRgUVS8I%BdChh!t-9z<rZ-6jlzTpCWrOumpXvy6QiI
zw7o_MNh`zm1w;A^w>-mg@-c7ji=ti$l>eP!?u>rgwU#uW7r|M1Km6(M7Kd-IwjSfZ
z%LppHEyuBAR;BiLUzg$XXIAO_NAUX%w5uWe<7IWvHTTAT?RS#Tt*=Ht<{-KuE-$|d
z8q@r_kM)FIu5SK=I6twfp|e;<%)EZQa0tz6g*&gJG<~)eX_6t2i{w$BhuKLHy2>D5
zJ0X%RghB7rkru0IUfmn<R)NQeOY?4geo)(Sxp?He-JScrl-Xsaa&N0b2sW#1LlWP7
zf59s}-W5)KH$yZLeTjyj*Lu#a;<VYapu6d?P#!+ek2C?DQGtDXkTu%`c;W2jX}tQr
zxS62ndh&k(`K8ePOSA&OghtxdD#cFgeCD6n_kxVy#V3UWXuWe1Ge&!U&A8Kc48KeK
zdES8KKEK>~gQu796kH01R?p&InbiH7=U58L+G$Uaj@lbztJ5c<4yZQcVQ#>Dl4sck
zuhmor`+XH$>4(1L-5a)$l3QILU4r2IjX8J!facdhK<9HndxiUKi5cvA@BS7|rv<HP
zhOZmtF?J?<wYoc_1v#+e^rX4+!G`-GEK;XeZ8yo7=dCWK0D=}1Xx2+aH*FkCFBFlr
zL(X9m8x9C0sMWFTmBh=<0Sgx+_2P9Ui+-%aI&t-=Z1eRn&8@(Yg-@Um{T3Xkz4^^r
zOMFQwn6Y?Xdj&SJUEOi9zLJ1r$P_vf;+r+e_>#lT0k8ZzYd(G(zsP_0sd`AO1>!*)
zQk0ne`{XNcqYE(hOfRuNOU#mgmzZhkitbS_+}nEC9}K+CfyHJMPHn8i*|ezwG!wVx
z5iz|+xLTnlw~wEv+kl7g3sx*I^|;#0c$qUR$U-CMEJaodz{EBN67}jK%}zqCTn!;y
zcPuKNgA<;s`jjn2J^v}~rFUuKM{%fR*_bj*U=R;J@W+qFhVwzm7(d$e?PAL70|GJS
zmpq0`#cM|)>~JksCqF9E{g{9d9;p@7ea}_f@yg`<ST}4TZU{3Lb7}J(yt3U=9LPFb
zWH!E`fs4N<z<H(L?~5$0AzQPZ*v8LzMjFSay!6%{Kur(Eu}KoS?i1AlV@hhaxoY?y
zPBeaRLz}3jE=16a)6()IU2F`2krCZ5w~}tz@v;JNeYo}%(1)HPHtbca9)y!VJpqH$
z5kJsm$L!%vyjqF-BAF8F25#<qUMI@isM1>SMmwhlm5oxLCQo9}E%Lz0e$1jjdn$Ct
zcYrAJJ=+(T*~gaMfc+wnziw}K%mb^~!L@wWGDB+J8NQ6Tkh(-NN~0Klop8<aKvV@E
zTD~?5S6jn-wPwHi*z^Y)|N0j+ZoFj`^u9?<fxOAvR6Q^<Vr}oYO~VHAEVW(E`N;rY
z+N*#XzVrk{^zGyfN)~`esD8^pECdDJO@0oz3nu2UxsW{q_^AO4s>ku{^0L40M8fD`
zJMGgpBbzPJ9N4ZKp=(yI(NDw>@nGs(_sNjO$a#~(Z$`<kp1_)P&Z@_!5QMr3z@=R}
zQa#%kstsQ4t5}hGUcXGz{|53l8lflq;Y@^%je;I4v=w>fgCAU=2QK=9U_$or%PPd&
zZXHk3oy`D55aGY*#uyWk&bnH0q^_pG=PpNK3&TzfP-(?aFxrpU!-dYI=l_-)7m^yi
zc-Uf8J&ZBRRATE4kG4KB)O9uV^+*}=1Ebo*d^ftMJC?6wSvhI3sYX%zKWK@iB~-Dm
z3LUEgy5Z5I{ht82h`O&lDs7)BjRRS6lDf5r9Yu}Sh4$A7s-9k1J3To2unxYQfp>il
zch=3VMw@l}!5{FWfw3@z%jAH13Gnmp2y->w#RB5wUycX_h}@c0AK+<E>0mCq=BE0{
zTaF8K9cm`hM*FUr;=@w(4V?()@6}TzER^6!4i)&&U-F_8VR{Q4eU$0@npY{1n2nvv
zBIzUPgLiUWcSK|l4(Bu6;<gch_Vb`JJp*sKwl<%4M;NSjb>Ey``YMw(Mw<HO1>;Uc
z9uRO@YVndvd!o4aQ>iyQ0=QcB^%Yv>BZ^8A0+>tFJey%o{nre$jE{Y)u*t^@eD~71
z6TF8_cMQO0b_Rt8?}%)n$v8^`RlLOv8Y)B(d}(5nb#ZcTS8h)9;Tk>s1zvn<gJ7hO
zScSY!+RtxAT(txv*)igGh`KNuqzmm8BsU$F9w%LU!qtD93+N2Ij}dS&G!9WlaKOtG
z;LofvKF|IPFq=$=sOadwaEz3^L(g~HRa^ZR33C{Gx|2+9YH(JS4$+0P1?GKKd|kw|
zX-{`8B5K{=q0829Vs9Jcy~d4+S{QOeY}GD_qQ3V73xX!m2p~oO122mZ@)JZq>7sU>
zdYvNep!p{WyRkYCNt^d8YmQHZ`Faz3ewqz~2J**J7@P2%lr>dhgAAehGsDBZx-?@`
zRM7*ckO>1}KX#Q4-m^vKrX%~{!HD`FgoDfh0sMx`uEaU2sTD;4{2dp?%IrjpzEh`(
zQn@g+B#XbJJt%(}YrOo4@Cv8p8}Ri88SMI1>4k@m3R-7?xn{lW?ncyn|3f!7F{|(L
zUu4`K(dZAyHf|iT)f)N+;(E-ddw`eyBJ!LUh=bm38H=bi`@212*5G7oKbYFB7AyZl
zl!Gq)A<9)cmp!>h2UjC*YS5O(4#WyPt<FjaxLR|xdSAo(T`4FX*K{vVmF59o_}{zj
z)dH#%K?mu^fufVYL$}^qpDP(h=0Pg*F3Cg({#asZt35-@j{z%ot~^TXucU2NYDlcW
z&DRwu8J==>aQ-2sLqYK=euU7$QPFA&D9q}vS0^;BJ?iKpXN$FOonssML14K@YA#&y
zSc=n8vixzu)c8kVXZeN^Kbt0vIo&9eQjzLpMmV@|adWb)m2RxHK<I15Ve!KkY$KSl
zMZ|-DXv%G~NqIzz-a<qUbFx()H#HyN6fp+V`KpfU=g!Z~%ts>SdsLr3YJ{`C$a*i&
zDU}yE`hg>v;v=d8tB6_-Ost)$Av-|XUEDoI;#5AUV*!nquH5+KUNDn=H;3dai7eqD
zn}(Kik}0~r75pH(#_@!`!Elc5gatXby|Q)U+_33)T~Doj=>3TBwHp7;6Au?0qlsiA
zt=_?RbWaFB-uSrgDAX$yUv4=TAP0P9SEK`=T2S#M4G3lJqzoNu_5N3SEyDV%t~*x?
zNyKwjA1v<9il4{C>n+p6!P~#koR_NV$upUNe}*o9Y}6K`-?8}4qNGETwIwYdwyRk!
z^XU0RpxY0e4VsOr{KDF2lnL(k<TCT&!OIM#h{yJR$9;C~md>Ibn|3i&fN-<&zGY_A
zg{>&E#t}GLfN;5jR7Bxys@ZE}OpG;pOxG;o)JIq({f$~#O3LH>$vkk2@@u_zbQU`I
zB<!)|m69|8UAnW$6>j5*RA-TFCb;S%cpR@G<HV1G9wSV3`<f|x_9svP`0qRK`^mlY
zZ`|L|3ZW2mLfkT{<euv5-O<%|h~&b~7Mod8jbF}*t3zSD|33oVBtpwXt$XQVD1nmv
z!Ejp(r(T3qPsv~TIIK`}Uc@riKPG@IxG$Da*|}4dIL_fS?F<m3Y5;0MbFSOU7obvC
zn?L(71BSv@nBV>tVd5p`EfD;8*y}k^#G!bOuW59cj+2f=8M*fYTQ7tky<KZyGJ7MM
zdym-Kv?jF_@*rAkU~{7#K9|!?oh|kIYR6r0S{jv)d9{YM$pk;5PYCvtbr0OU8v$F5
z5|QGS?L`#u^)Obq_!WunR)x!PS^o~v%BIMj%*+vwte?SiZ7l+~!gE^n<b^i5;8zY4
z_sj9^B39!2bT6l1h@l}my<yQ4wGKsrJ90BFJBPm4*vbghG;D+-B3c&?s?n&U#mgg6
z(E^wLJKLBuigRU2;vQlHj@#<M5SVTgdmJL;qt*w)ot@{`j1$@)=w^W>?Argk5;iZ2
zEDC%qnZ0!r=;ifQ>tD`-E2G(Z9&qHeQzYqmEz7nGi=4T~q7}fkOJ9a$pXPb>VPsBK
zt;J_PKArplL^eF%ylgHf+<%}?fS2Mpv#llFpE8|sX*5g6(w6)x@({&v!tp?Ixr@S_
z=%NEdVItY^`HH~BRH8OrQV>g5rz|uy`&WW{&D+r9$F?F3%ZrlF({Dss)vd!R-j%FF
zE6Yw}13K7@wP1CZRrWdI(o(O8rc+uxjo|H5uI+`I(RY`8UDM1NK3z;*+x_{|Rm*7O
zs_<V|SPoQ-n`%+Ieg@{;&m}`HK5cat|9E3b-~7tl%6O;Da6{DS3>uEZCd`@w#&d@Y
z30+x0Z>QA)Fo4%!BT`v~5GGFu<<#BbNeejst5RdQA+U-4C|b{N8Ir;G2*<mUc$UQ8
z{GTPUo%g6c96t1Cwso;dyuVHTNj>e+i>!}`VLQpz{~*)n-kj|=|0UBMfx+*hqFY^w
z7Y3kON$*yk;cYpbMJ6C-J~P`r48Y3CkE8NdmWqMT(Pf`jTfrtaOAwI)C!DNHyA5eG
zhWvJdhzXeuqrPWxjO`(KH9dLuk&t+jExrwk#9zj`FHT+!aVdH=W_&zi^69`I)3HDL
z&k!~@{Qj{2_~jevxHt?nRyM_cRwH*|h*drLC9>*eIzvl>bbb3bow{kcQneU%3mMKQ
zc+;|w<>knvqDF!B4k5n{m(I4^9bq#Cmbg$I`pZL;sY>sbx)^rWzlVOgWCM37B?J*G
z48iH@_Of5AyzY~ocM066FGZTtCC}3u9J+@e?j5}~f`_&7K8kf&sN=WUZuz`vy9s-J
zQIiwSXB%E*-+^=hFx5xN6WlvpBQbE~2@XJk-`-`Z(5;nBSG>m)A(~t@nqR;80ebDI
z5ySAe9;)2G1|Dj>4WAy_+kaE5`U^)A)P0@cEB7;o@M~DSw48jU!@LnH4`_>aFNtLp
zZF~w=^6>hslk8B@_Ml*fdwoGWjIH~8;bPz$L*vI+T%T;ZU)TA$<ChkIJ9^v0)9Yq-
zte;H~K<$%vbH8L*k&PhpaC^L`%JG)oBA8g{%J93pi-$0O!7)^=vL~Neuy$9CTJ2$r
zHtIv;(B9VXp!0cCq$1X+cQw#<+RUKx8*Akk4W$4LYl^c_MmZ;(&I0~J$heV7l-9x+
z$k{qN$=`)e-s(!m@tcPsmLMF%%-3h(BW8bE*5M3b%X*>6*3cAv5yM)%t<Ap8eDNeI
zaKF&h&pSo3(v0Il%SPR@(o<?s=9S<6TdmG4TYuxj@j9F*U#(W{Ysmn3T@A}>U(tJM
zRcWQ4KDn1Y6v|zme%hkK4B6h@L$G<I6IzV#$VrPue+vSqm!-nKMZmk9@OuyM`tRIy
zZu^k;`_pcXJMWRWyrnRAAuYyH-SCFOQF^cKCgj0u^~G5)&jy(PRq#6P9mj_YpF3%i
z(h5aLjn9(RV9k5(NWeYxu0vlVUw0*V(Dkx-*BT|;o-#l1<{|jC?4(*IaQOiV_0#`t
zvU+!V{pdf7)sxqllxzs%L4-UxcA{@iGv(i;L{S<*@e<N^l@4g$T{6y^6tCZonahhd
z*qQg>eVRqs{P$#a#Ghof;@@QT*Z)jb_Y=PL=>2ZwP=>K7D(cWg+){Ksf-IK;X@F|(
zDIFR)q>CILscwv&eObACCB8x<-c%7iu6MX&KB8kfcDC5;9Bqq~Ap|#pf2~1<m$9Mb
z<#u9gKv}ADd2rTABiIP~jiZ}`szH6_%;e5I-kY0BQ!83~*T}+dK>2RHxwnZU*#(1t
zH50EN+)!9D%Z7T8mF^5c)|8~$ZEtTblI7Q0zG%MjZe=O7?%ch_^?5q{Fww2=_zE*m
zit#<D8N%OD{|Re3@jl%{$Kj*m@@I<JSk}FRDc6X{M)SQ-agitAdyUwdr9C3NhF#`k
z11<;0InmXZ!KhU>hau%_=|7Stf2!(M3rjmaMW=o)x9C?kLu*vuFoW}h6DkGXGw5%P
z0DcSGgY9RuZ9|+GU=&#K#+kl&?h^#m8W;>2$fjRDn`kDq7!DHC{zKz^&}Oi&TdC49
zX>?Ys{&mdbZ3*|;&7UpGo2?sbx^gcbci49|>hD0ak1jaS{Nq0dn&V3BMqqcKglb?h
z@85&fpvRjnw)F%zocQASFY&cO-49K#MJ30iqmiQ!LvRg@8CVNV!b?gnUQhq}Q5?nk
z@G>*(Eo&)<k&7Ad)^;&_je!rGXjTL#njP`nqj2e=eM~hDE=_=E1at%(pWBBJya-)A
zA|+8vS)k9F5|@AuMx2<~TfRJs#0|+A^<IP?A-I7BL@Hba3|8kI!n4WhUJU$Wwwa6g
zE&AhKuG6?Yo?!)HEjxG4RmIyn>`#}%Vy%T2&Oh#9@?I~jrGjcekDn~y>y$&nf2wYb
z)x7Czh8Of^Vi`>w6II9?=HYL48UTeTRDK{mwOCD{deQFaE^$36Y-7-&SweI)RLS(J
zUCfYV{iyeTT0u^ZsA<E7ujmiMH2FUpsad<s_TZ`PTc<;)Gd^<+z8yPQxd`Z50ycn=
zSQO4oF64__P0scYC?@pE!pVoG+ZLGQIyIIPjEBy%_U4!TfNN2BmKuClT{H=J7GoZl
zpv}iSK`E!A*EngfR6LWarO;dyFGFnsTD+I;V%Lw(G~V3m9?7GrvV9~A<_iNL8CR*p
ztWzXcx<E}}rL)l`bQp!kxMdKEkMpeZp=>v?pD%gM^=mTEl-$~K+306W2|`RMz8s$<
zElKfw6`IXM-VB|2V>N7JH9=8*dhQKg#+_~gOZDx-lSM!f)e$8dh+DvFukmkp6KWUX
z9f;(BQD}uSZfJj|S>J!w>mRai%*+pKLH~x|mY}}6>ey&bxWWc*F$dIt7)3&(BTCBu
z5ZiiT4kbccZGGXq4}yw~U2@y_Y7@~LsvyiG1;tzOvWb2lyYm%DSfw`$1GDpyE8|3m
zQ@3XpbRX|CGB%(?A(ayXhCAw^^VSb4d_7mk8NAxOM&N9%Rui2MM_Bh(3*$I241_g<
zgHWZ0X-@_==Dyk^U=<+1=0ztY3Q(~#pYHiwf6h$dU{LR4SzrovF%|@O$(t41@omXw
zSR!li)iOK|y(#4%0|)T{rBho&Qq@>?uGuE#b45j#I4s?yX>sFM5kk+?>XH6kI2>ox
zii4N}*lakjGTu}-i~)WONl-INS2Q?3kw-f-%#Xk%DY>g@y5&)&j+C5^0;)JEvQ4EP
z0&+-&VAU@m8xP04FI|a=T#HFvxVp7}G1`9SU@QFUb4v+eL1n=;8exV(7R=QWYqIGU
zIJ%K?wVwaoN%o!c)y#*APU9rP9lH_y$L1gj3d?E7bW#}J=R<)_k<uNgThl@{P0>6F
zVD4ymI>_N45jEJ6k^rE{fg3q6G%PP%u;(|8VS_7C#1%Oqb*MalWWt5DMqM~2h{qtY
zEGeVU(Br)jK?7jM$+?ygeCNQGvWJ*J)1~M55RXOO>4!;2<w*{$;Tx^mj-p)fT}!yh
z*HAp&iI2UFML`wt99=n3JQK?JMI3lSYd(_YA1A(d??CqDri^3xYxutI@%@fSyY8t{
zp~IUMK;#Ff?ZwK;kbZpaXJh`g2aym%@JB)M9<2V<W%R}vi5k8a7s+sP*u&zT$Jlsa
zBZp=cbsNWe)Xo#lizbU7km@W62FQeTNGL$SM0U8j{JS7=CGLmBUG|$N&a?Zl4&q*E
zI^K(yo#l@xxn$27pJw+hB>}S@cgbb4;#KK#DAdRH`cGfHK`_sb!bZ_zDzAeOd5UQJ
zAr&|8kG_ZYI*;%#eNYg*Rg!r{f}aIjw@n9WOt~3?coGe~L?yoi3Xc#aP~kN40w<vP
zo#IC?cKNo|<u=<Ls8sJ}Ia>si635_eT%lDQ3sYk$RCf62E2^KTYud-!1G)?3`ofs=
z^Y61htC_c>%TKD$gyZJ!9m75+J0KF_mS?@}zt-@Tcp4qXo-=DW>AqU&lAbJjEM_SA
zr6m#htER=Df4J__j3v{+$Pz05lcE_sD&hJVE;)1Hyz*6Uz)nK9c<-x5b2HjD1yg>S
ztrBHRRU7a|0u_504sRxRls<}rh9w1D2w!C(P|Faq5>5~L->+OLAHuO-HTtuO2<)Kp
zgHc{%@X>4*tHdPLp>N8i5U;$}v=^R3+&4z%lPV4^1nCdByeGJIB@B*Ap={^Etf*d^
z>*wWd=8z6;{2)b#A;t*{4}NBF?Pu=`bNpvSTfRQ+mvJ%SF6Lwo`UTPtA$WKybm+Mb
zHxpmZI8WsOV%}6hi{S!@c||o6F8|_ix=Hmge2e6r&nJ}!jxSy(z;#FZhe*=3a@(2C
z<!>iG6RDKgvBrI{^7+eoInOw6JG}L;O)Pnw6>!5QFXsbfMQ~1OuS5Ln2(IOxZz?>E
z^*|R2<$${rY6+JbQASZX9aIOHshIleRRVkkVxpAWHv3tH6}yhGH@Fqc=F+d3-afK(
zLB$6vw1<*?rozosA93~z%w=CDAyhVDZvh|gHx^6`-YZ;@d-7be{+GajBVa3^3e-sm
zzWWNq&fRXU1Vph`{?)ktsi$9VP=q-OB*wh>F?8{TfT7Y%90L#Y_ttN{;@l#CH>5{o
zQP){0x{`C%(iks|=#IwTd31~a15W$W+@&4_zIMh<lss|K9@tJ48IT)TfL7JwTr$`k
z45Fb}wTg^zXeD>~{1eTH#C(b_w2=T7;|QRw0(m6&Aj(1($`Sxuz-a8dAi_fz4MR~1
zGbre}aC0N{adM6Ihg%KLWxkS*9wB;xhK^`_vXy0RBz^4l7{2l!)LN(N0@Q+=*xDG|
z*ct3s6D(E>4Q^Z75N!0R&VdOg&=WZ^(&pR}2YT_@ujRH7`C^Yt)na#~RzYj};SBh`
zBL=;R`__7O^oG9eX4O1~fAVz~4J&+lB=lnVKI~1N26KIEi{R_d*iFy;U%o84cbb0c
zWGAlgRP>Kz-@az{r5qPdRcW!!)x7{`k7g7HB7o?ilvg|`eL}Kq^xaDr;E038bMOPp
z!G26$PgAy>5Khjyer=SH{&pzWuzXh$I6i5|wZKz=QYd<(0abnkaJFZUX$dERLk49)
z8&I9?sm8w9U%D79wU%o(5<~4}x_4r^QgKtcK+g<%+fRfb71!YA%BG*&4HDyHzzHKT
z)PAiaLqO`Z{KU)iR!7LQ9jK;CV`B83S3LN4V1{$^3Qxw@OmmAp-c*h-1CM)>_gPOh
zYV}1kEm|GyQ1228sc2&LgG^W3^sEM1oWxC2I$r4o#1I~JFS+rlA#|%+YK|dJ`l3B7
zUq`?dQqV`1H>w4WO9KmdH&@gV-p{c>4WSq<8Tt$<cK8;4-32d1Ojj=hSW81Q#5TP)
z>1adINHk!FT1`X|j^NJ-PF>ebeHiLDv`gV*Qqm_~EZe*=^Ys!W$93i7=)KXWGey$p
zYrm8tZj&~2EbKy`3BTy#b3B<36lp=S(BCTZ`ce<mvil^S@B;yxfu{mlTV<LQmlK4k
zuYCHv0<O<MolB9ui)YK(Kp=RiO>mm*)MSM7YJZ~{$nz)cvMKqgaAq3M?QS-`3RJ(?
zFQ7avCxU!sA4%#KHgEN){dea3lj!7Eg6>dV_`sn|Rp%qWDq#BhK5`VxFSZT;a_vNs
zm&W44@+9G4O!E0lwi+Oy)edOZecAdx5b@~)ycsIQW!q#Cub{=@*kZH|pgRyiKfr%(
zH2H@o#C*o;=WpYpKHtlR#o_)gD{i_PUMKiri@r}@h0?om2BlYzf24LOa)WoV`d(7W
zv!5ovYdow@8$Yq*Iq~rDLh8<pnENC<9`I<5I9emqy{Cr;XZ)d_M(*nt|GQswqF7yu
zs=aT^2eW6z_R5BzD#pJb7+!~09i6IVxA#D#{eUhgZbm?87ocl6Rpv}DG3YfE{8XHi
z$Yk{UF@41tg4CSly-0kl#DGoPvF9diz@&)y)g?<d)}ZHz5U6OnlRz^4@hd__dBS){
zz>bogfc(@=^u;gXD%8BB=x14QbOnhGOb)p4yLKPZxY4LX`6|E2W{NhFh-S|3e)Pw5
zG)sXG85PjW@~BLH_$ev$Tx?_4V7`*w8=fwongH%3h58hI!cdKWjT;uCyMSm8MCO5=
zf<W{xt@Y{>oOfCC-kDXckH=E{ykabTPWn#CFHS7QNgG$JM2@Ipm!phmgF@8lLsNH6
z2O50GFYzMVmnRv3^#oS*%OslW;<=SnRQ}P;qaJ!ZE)(qk0*QD!a6OOe?fcmqgc7s>
z-9_>)_^g0KWwyQheXiLqXp|R0I3P5U)I{)RK%+9jpC4GgUwH}K3_b`~Hw+>p#~ul|
z?wJQyt1Z~hzkyIB)HtmazRTN@_P5(p#5o#e3q(8*P&@U&zr2RUe^GsQuczw~Gqe6u
z31~}0@T@^IL)T83l*rPiG{u5;<4TWzZtidr%)Zgx?9}s4CVctjv?*GBjSCxDY|_3$
z5tRA@R%9i`q2Km%D%WoHqiWQ@$G@r8w51+A!*RwFjh0^dOxeY59=&#*K=d9KF1rh*
z$N#vkg3~R5<GGXK*;T?%e*Yji@+H-C(9?X7<h}5qDwu1uoEuQ`?UeD=YfOO46R<I-
z9k>>@2z3q?3)R~?Pgp+Bjiii(EyUB(6g1{Qa>7iHVTYz7RVy-d@t+B?y`anx5-lX~
z%HGAi)jGiNJ(Jw~`u7!kPq^^L{Xapr)0W+lX<)L1dgo=khnC!Z9C97c^SVG_t(Ji;
zN>1Ik?b5GSkqUFPC|Nh$^8(4~ou;aObZmz5Gjuus0W%PEo&=qs^GA}FB>$QVxnglc
zvYUsi<_%BoH@OWZ(2*9{Oo3CSe($R|lG)${)PL&bsxN4jvW6jA-4<%WCyi#L8C=sE
zv1tO`g`;tI31gRsD`{xm>D~y@J=&k!GFcAj`Z5Nz<~zmEw5XMeGX{Ro%MO%Gi4EAx
zr!mVF^p6_qzYh5Lyz}gYMup&y_FcT~P8af{YIlu`8({Gjr@1%0SAssdh3WO}+!a~S
zsr)1pY5Mx95WuQtS!)=Zpm<v=`ke+X<t4LF26$P(IlkSDBysG#l^RI9??zu;{bvi{
zE%CFd=kNtJYyku>a240c{bb$$vdA$+hmw06zG06u!bgRHHE^QsEJ8$2AXE<#^HF@V
z=)IS)wAYq-_Z;l0@TZR2*~Syx*{!q+t^oW+5PMgtk4Hyz1py=ryMvo9Wq`5bG4$IK
z&B~`gKRBla)VS@U&f4G3X;nv=Ose<yo!)6F(Yy6Q7ydui-aDS^hyVX4Wt8kK4iOcF
zjD#E`D<n$x$PO9F9<Qj7Ju=JA$R63_kd^FBWM{8~!*QJRdi{=iU)TG(KA+$9`Fwxl
zZ?~Jj+??}z-Jg&9ozi-bQXa=}ZLkpv893Pqh9evF!S>00j6pxFFI`Wu+=!mnK8l7Z
zkc4pkmMI>5-$xED265Q}I&LH)jSlY@B+G9R-?=Ko@Scd(_p(nNxJHp1m;r+?z#T<H
zdTXK|eI{@BkSxW(o}zb>aq%T2(6AEXU+2>4X`0g4Br$S`Y{)61g(lEI?q*f*d&B&x
zi@T9;V_85JOC0m~__BSYug2+xKP-A~z-tn1-v3C@+Z}I-xIGT{qlJ)(JMwZZ-5A)u
znG4DD%FUqlF2BcClN)f|gQoGLhe?p8a9D)Ew}{HG)a<{xcaXTId>Q@<ZLVb1Kh2@$
zemufL{e1>3RTP}Icyq(FMs=3+3#iitp?Lk6udkRF7UQ@xY>3H8)(=`_5Z13HTiYXD
z-UpOkUlw7T!*;6>=(X=WFv6y=&SRx;p%+PTY7$lGR1TYAj-gIfZMy1zkZ&>t_c8Ol
zi8sUnI*1Oa3Dh0c;qMK5C||Pk)3-*+A#5Y!EsqxbMppHBNVbv!rT+Hmku=_GfBU(O
z9%~)=H~H3M4_YrD3ygZpgV$j#Z=<x2U`;d9B>rlC-tW=o3krH4H{^qBHx617UBIny
zUotjlqfi9iZsvA9K^`3a(c)MLV-C$WUD;(1t9f+o;WQ1A1>Wv`p-;+J+}e;Bjn#R<
z`Z7H8d-t`QW3LPQ$4&B|D@wBzU2og#WfKV_WZ2tTMZi>g#lJ;4TdJ|^ho_&AK}DK%
zwXdntI8N^1n6zqaeHh2BD!%ouaJGk6>ETTapZ!UPtvW5(E8`{U9dKu?ziKLrKCoq|
zdb=H9p>rFg3`K+(jV0#35kq@Ze3^l^F%^ascdxi_0-`8yP%?1?{KLI*ORY}{R0vmm
zn-&DpKSjU(?0q-Fnj->OYR<#PR$u?<9%hF;k~kih{z1r5YY5y)XG%Or!Nowp9PfHA
zU?Ex%hF@33lU%1_W%}aEm8`d_vcW`UYDDz(J1wd+`y5k}{M?&VNmpC6dWy{4fb0c`
zP3$Sn#k7%9J7i=6-bV^J$MJ8<#6yYuT-PfHj@WVJM)&#WS>_ML@43W%Pc&K_>J8IO
z&MJtm3>MV6dBIWhlv7vvJ^k`(Jov_^^%*qD2Sw$UMO(9H?FDj0%vO&o@o1ba2+exZ
zPc)uJugJH2h*_~?xp@#eFk|^f?-0uxI4c1DMYq+Z%I1%CKCo!eNSHrVwO{?sw<C>D
z`SyE>;FLB!Q8i6CCV$*~`pMS0J;$6HY&EXD^5c@j(Prl7%q8m=lcI`qO?3q!Sr@}d
z1|7O~F>A_+gi@quKD|08bbsTX*7#F4-(qF`r2z~n&LiN-#+@~5GXr4eB{%V8GJrNO
zkZSsQ>q#pxLH%7EJq2XGX*pIeY-W7EChsOEMEGQLXE1U?GwMS}v+;}21%v8jNAgmr
zlsrQ7T$x^g*^f*|94$-p1e!H+9Dkz%>oHGd|AKEmS19tAjlm<29(iqX3)YP~-#XK=
z$SfqT=vsm}M@y)q%CFlS_@jr9X<bZgjs3&#QT8t0>tp_;Ky~X^o5{i(zVIqOWUHvq
z^=^B9T>kq@imo6E9Sw+V+k#KUU+<sbUk6;QKCr8tn0i5HY9VYj<;)^ZafR(74IS{5
zjsECbbaJ%J;9QJ+3G9{-H4O$=AGQDKx0Kr?{DdEuir#BhJSE*5|A}<J&LLuI^a?N=
zE6;EsuWg$RpfHmk<mevg-BT4!33aq{sS$Wq;Sk|`O>^`Q>(+A`tVNOZzFQ-#6k@9Y
z7U5-i1O-#_ivp|>yGm1wW3USE325DQYi&3cQnTjNa#Hj0Yen;R?5)brKRH?E1m6Vf
z2FUJdEJnXp+sb~;8<gzR#rhGmRVvYWI=6nB$M$~kE;M@REIqLl9sT;8^odRJ-ndfv
zB}4JxRbCQC<j9}Jbr8vA661>l>WdX<|1aHqt1DaLWN*Kc)|XX>g*8qXM~vT)zBv&L
zsE>M<JWwQZ>u4R034MamRHD(C`%0_e+T)q)_vxXCF&r)1<=Ys@jxDqK@!m8oi(gsY
zMdX9R=RsPNgE4D|!Ma9U2NsqpaIOKl)2!8F;X*CQc5Q9Ha&kJmL!c8DfS3GiY&e$b
zEf2Ds%s!>RweuV_27vom-ax)!`b&Le5~XdBbm_}!Zp9dZmzGR+uhSP2zDfKtK?p9S
z==Wfb&;MycuTa7}b{`Sq72FgA&W)Nj?yVV!GiT_2#&oa>5p>@+y{UK6!jWT_R50iA
z+j@_?hj%b+be6Zl1O>O;qPDStMV_7Q_A9?N-2A%k6oN5Epi-!^HukaX*S+i$Ge&dW
zS}%(=5-vJKHsWlxU!((zJ9%0=y5P<-;8x4PC->5*O8*Z9&zGL4_LC9iF*M?FQrDX^
zh-Uvut=Sunc;(@N&q1@-fx5ZZ*`P)!N$loh!{xon{n^CABl<YJqS>=68@Fp*II%cW
zFMR{ks7*&T|E&hu+hO%s@gaC6kVa|#OQ8$C1g-PW67)pT83htL_&rSoP3Y=jQo+aV
z+wK@q{=fpbJW(Lx`m5;+b1Yvc{Q67Fgm&jEA9&yuBBYC;4^Gz~Ri#;J>JRCD24+mB
z1$h&mVzi+}YsANS4MI8@CFn+1B1Ou#4u*&b(P!kSB^A7I+W;PO_u6L<hrEu?_=UbY
zLGSd33jA5y-<`t@45t|%6ssma$I(MQ##A)YL^Z^9JGAnT+Q!Ybkj+*PF5#ExG(a=n
zX0y^Lzu$kUT<5@W`<VAlWEpujwe3e!W>=jE^XY|!CZ`uTnv=*gXC%X4i+PQI1S&MR
z8HUwEa(<p5@;0hckGx{i_8x(}3BA~??XMvx19xMXZV3~UKW`6R0vbB2#d9q1BklR$
zBkhZMNqb9YZxXz_?W~eY<SJ`F=fNX`r1kevjsE2=cm``aUyDg<JA`@fBEm*qpZ6LP
z(_#AH)cV&xyWy{Ww);gO;5<7Wi%X3~w=4GP<Fd8Gj(-lcqwgqvTfQpHF1jGMO`t{|
z#<qCZ^oy-#J7SE9wf@RX%+uG=l_-)BnOF?jcsRVYXM&m9{p*@B7Vd}Z3ekrq77w(T
zFCR|UP+;|m*C&ziBT6e&wK0CM{WX1`68PPTMzzTL_QA<QM4^|6AjxzQMPwY{6rzjd
zy|z{#4Fvir+L13rZRo!D+we65kA~S#lm+t^yjUj#Me(udAB0GeI}e<0P_F&nY_rL6
z1Zr`q^WD)HGO?{-5-do0L{IXQzpm);!Af$S3uXTaHgY1&#Ywz$fORvU_q*fV?6=ur
zI1kC&>v$@T8PP~HxOn!>%_79qv_YF3D^t;23Vx1GXhp?9#iq)7dY{)>jBwup8b2Lk
z>Zc9BS2$}m?;VJ$A=1`;{40}p!F6Na?k0(XmrVkYuCe2SKosCS;73Qb6}v@8;Mvxa
z+I6D**au_w&>53cITc2}nah1AaezYD9Wnn`4x0AEul$q*0sVZB)K9Q(<YxpYBM}>y
z+h_dyRtecCwF2t&DD@i}5$UT9L4qi>6|+N!;}6VRYm8&x1&B;M@y5a%_}<Qj&e3Ol
z4SHP$=wh<JJ5TkUJD)w%jq<ISDw8!V(NJLdnWE5h9LMOZheqocf^+g44{j0!IUhd9
zGOjXwJdYs0uf~XU{{i?t#~JBCx?DK1`DE}e<kA$cV&CAk&O=)%*w<7-3$^JOyId8p
z1@R*6>P<REQDxzE4KSm-f9bsvowXUKYV+iAwW6$YG-+s1wS+ZzE%gyL;SRO)cerd4
zU%>IZ%(2LOhF8m30Ug8x(%_g@k9=Fc>{KQDs#jLJ&qLKUCC%$X1vvA!cX<KpOL~)J
z><;-D!;o0Pn6z9NaCg3(#AUj}@<Zrz5!?Gqk&<d}?|`iej3f-OT5`GI;;;A+mC+Ug
z^SF4?@vRskwbq=3w!uqPI5{2VdVM(4r)1fR@K9Z;Pg|W<_p67Kbq;jMtb3toUAcLu
zm$mL28fv1Cn=V{loG5j`5@{?t6R3uhbj-?+n@n}%HQ8FfHQB1R{eZb<6cg_-3u5*T
zI0-evtopgZ7~oCdUbssMj*-b#f9?v?;X>G)MCU7m7fIX8)Uw#Xp_Do*fH={1B`vIh
z9XiOEeH0sdE>q7}Ub9a6GQ^jbX#^Zga@AkS$~+xaU&H((4_zOXxny{@tUf1HX+1)9
zwanZh)JiV{{s@7P3h&~p-zCM@p@(Nc7YwP;ZDj7_sCG$8H=T0~#Tt;P+}>ZSYUt0Z
zS_9J>K14TLB=jk>dO|HmSD~ahxmupD{5#$4I!XCX(J<9vAH%S(56e-ETH&8LY?am5
z(af~m;IgHSaOAq2?uq(xIr5aln;);DcxwyTtHNr*dY93Di_eJy+8?S`;HHJLvo23O
z=;e2d?S>Uy)H>|i5RXV*!UdAeQ@>Y0ybsLoO4c2ZNa5xB?mu*+2T3JuYqwr31P{>s
zQrO>V+z*20ZWD+ioy%rt@S5J2E05xtdWMyRGOk|jMMKr@Zr#yaif+<Bvx1o3uDIez
zn~v<z_{i*T92*y3VQuVXZqMb?#-_?!gqvpcT~8QmLv#JDwk~qh99Kli1k~qG7~&>W
zj&cS$S9_!FM9{*LpRLY37;>bgyJTK*-Md?)r~gfNQx>%S;{BHrw-!dlN6!%BPdbXg
ztaOyp4mEIj6i45(T*m(R60%yqz$S1tP~@7nBk#$!^So5d$a+g>M5g;nzQs`8*pbaZ
zr6nqbBH>a^on;5RPnVsSyKP%u#CHz$?}xLxBJsYkSCBn=)*DA?GuFg8YD_k>0aha!
zIoRBNZ|fTRO(8pt`<^^NhU4J9b^TSIH28wkV(<{!5(+x1_+>I>FO%o0+=I;}I*(6G
z`^g@CzI%;vKmxb6dqphjR=usi2rnG2?*!Y48*CN8d~RW$0e{ejEz<t@CZ&n+4KYZ}
zZf^N;h}f{*=&xeO-L5Cv`hajuaWi}?Z0>w>W?v}wYNnC4NJOWDa!mvr(@Perxb&;;
z&E0Vg4Z9S~BE4_LxRwqi;PtGI_3n0e_J*EKk*aUjkGLX4^aR>{g#YOaYG~f3Enb)Q
zSwt$zyK~kTkCTAZt9)Q%?)R12)s<VGf>3`4lsizOyX_eKB3+kg3Q==iqIo___9i~p
zDEe3^4wsh5)lu#ytqNA|-)hjo{=y7f!%>=S0)Er9=0K&2D+3&$>yXBWr{y`uF=}{@
zUvWKCiC*f=<OQv1^0~|YgPB&NFg(Y%^s*dp0eI3bDn406xVNg}zda6fOESY<vkfsj
zN}g+S8D;3q*4~ZZ%WcPh4Ns3_PvX5gI)Cf9Rjmi}ol#XN4P7yitNihrvV<f!WA_)t
z*P}+tfN9~7M((W3-`#2WX?Oa`@9wnm?veCHPj@lM554R|`5nj{A7!JCT-oQo%d!XV
zKBsf&P>DEmM*XH7@!q2dFRQ(0y+PEXYj3HIB}T;j*tG>E))Levp6(O;d@y3N-A)>|
zuCCyY@d$A~fL(W>v2c4*g!f1MP427xsif@Fsa<9YXNg{rHI1-ZYFZc<Qu=;T>$#L`
z{X*fvkECIzH-DF=qY|$rHQ63lp>Dq+V&tULclv?mO|2nLc&AI9zlcH`I5$pV>J6bv
z_}Jzanvtp{bEQnb30E}^O+df+HYSidf1rNj60Fnn7i>HZU=HHn-e0?PJSOL`40|9t
zSh2b@DJ}#pj9Y@$cLtn?Wd=DW&)0^~&u$6Nj&7%DN{Q<^5z{5pF_;q%?0V=nDt@M`
zvDtd@A0yQKpqqb0y5UVM<LskWibsMr2kJ=lx0_M^Lijm$zTb!PRrmT%3WE=?=qo68
zc87^L(YXeKVO~=Gqix$$n2XagIh<2yolOyrNLoO5>FljTMDpFA4Lm=V01uo&ODo1C
za0@l-=|J#e1=sKV-qh@a1(f}({-}4IYkO7ikBqzimY{R8w9zwx6M@E2pBn6iwk<dc
zh1HC_FJAM$AekxVMr7(P^25wt>Bfj}gL6UcjmS{{H3q$ubA3PGmOOs<J}HVYL;uA^
zDQ(1N%SmD-rbGffTH1)H-BsT{w5-VvK^J2LjL(>e&z%fH5?}II8M>n~9W|uV2qha0
zLsJ=1twCW6xo$R>2fi%7t_aTA&~jNhQhxfREbK8QHo<qy`(X_VHaCHm3>ibiCBXwl
zyUPZ&sMd|0WsFkI$mTIna}4dG_s0zU(^>KR$o90tr_dFR#~`PDdWDtGz*UD_T8x#h
z<<67N+%7~p?g@DN`U5{jUI&W2?<yF*%5xg>T)z$6v1;q6NKzyGYPvhpg7<EvdO(RW
zK0~eaf1jZq`d>2C+W+Sn>d1d&s4Gu1)Fppss0aUhhT0mRq2BmkGt@Zp|0P2Wzq!aY
zeahHD5j<m`)?g=K;>hMIuT;CsH|SdD*FZz%ww46>>c8a$r!JUtX`OrU5pUwQ7Mk6g
z4V9+;*foEREPyS!dbhu|cn%hR8&x35vwpu_(Lk0s0Mc516!U*JmEK_jj{bPKP4FJ>
zzo*i?{fL#oV^iZ&%d$@Gn@6DtZ1Qy@dRp#pza!L!-SD=D{}!Q+1K3ZY`i0X7wVw$U
zT2}c{R$(`Zsjo!AIm-w_JO8Are(^8?k5^rbgLX;zPTZRcWJbMMM$aLaDiH7DHamU`
z*~*U>$EaBUSb54*^tGS;T+kuFy;}fU(^hQyBX-%*N?sOc?Lwo^3882JsvEc(8u!PV
zvX2)_*7vtp14f@@eCZsvB)k%6MUTImu?T#j(1L#px>H(9!``NTX1frLzdg-Gb%NL2
z9ku{HJ|c>u^nDzh6-xVGBh<6T?+`)X5hM^&7UW-{1nMPH7q5EWTYmlKA6sd}%?m{L
z{Lo6ag`9QXg@Xs}yfM-QwFc!$m*$pcKVv+-%!KdQn4b6NLIgs({CtbWOy7Ao{aXID
zKP~;cKmA=5qnWRhP+sxj-?!3=+Sv}z!rYdaZ+Uf~&89GKr|vl{Lcz!*4A@ED^c?T7
z7?bg<{{~jCAjF8Of|Nc2jviIdw@p%!6Gq+c#S3v*+=)p{k2BO?b?st)l)!RoM)J3@
zt!A2lC0d*HZvrPQ@%a6;;uCO<Od0fy!iMSuf*8!OPSlng1;=A=O%(r{w|kW2=RK9f
zu;!oo!3&iXCh55%rojjAG%RdDhR|)$s;3JhL>lWuP+=ZU+Gpw!|LBCWVshw1_-Y7*
zS9D*yM2dv{umf*D2ouTgFsV$;MA8BllEx*gI^$P6X5)k3P<LOdu6{1yWnC7CHdv};
zZ2IE(GCsWsUhzy^42)z3;t01Z!G<wA-$LXL3Ndc7MZW1Y<N3nX_2<)5Z}$zJCDxQ|
z%XWzR5DwbW^B+Dvy8LHFy>e{54cRY`A3~h+9*U9M^e!d8(nN229Q@}MwXp(~j&f!M
zD%b0GjJocmkX*6x!I;TYDgz6ilgEV%Av>n>58I$y`o5J;#b`=8qqBORSDC-%?wtGE
z&RyF)+c16*T7BWCQ0^K0hhBoW*K@6WyWEY5IXv-BMgF~_e)Z24HS9mGs2w29_tZ9C
z&Q5<;)GqX=er{R|rqdYp2DZ(kO<xzSh~*6T!x-bi%=Ku7D6F|^>Mxi<<Lb_FeXd_)
z`y=8T4{F!bn+56FhSi4ON|yK)-g6HT@7A3eax#kd`p7cElJFNBf8Xho4n8?w>Zj$e
zUU@YF91hWV+hbOR>EVyxOPebYPE(pk_}X#U1{2+osf8?|*>srXy7qr7Qw#l+y5SgR
z5Ey1lIof#qxz{UvtjLznyln(qUxp%~C7fWQm?mCTecR_Hihq6YhW+V_Gn#@X<U2oU
zD^$xS)5g7<Mw-YLPC44+PIL_Vk75)?+{|>M2DI0Bk+Pdq^i4}+umT&F=n*7pa<61u
z=2&dH5Dl?88ijE&A~Hg$jlm{3<W6qVl+l|^bhfEvYw5;7O@B#7QcHq>Pq{(>L3EHF
zvnr!V_&jBt_Oi4FP(@t0f7B;L3DrJYLKOWfdwc)H)V{ebZq73B*AVF9)!s|ddN}Lo
zJPGW^mOjBdh_nU}b1(*^`6wR-LQz8X_%iKo<iuCl6)|#Iugan9kfOVgQ1He_fU;H;
zib*;?-L*u*fXcQ;3h!%FkZvD1jwnP=G3bkb!D*y`N(LpozN}ZhFQZKSjz?!HFo)fM
zjC<N4^|ccm9AZcMm0cd*-D4TG7ZmF%Tu&iq89M17VrD2VeCGOPsfm*K<1{9`<(|rF
zp$zjJ*RwBeN9O4LGP3rBH>I8Xkv84d^mg&n2{^A5RWzMNlF9aNt!Ux!j4>``b_TdC
zy2s81#Vgq1MKD2dUvMC;t|a!1^yl@7C!@3^e?x1`*+0-){|!q^WV2n~G-q?vC~%EJ
zS!2AUl}607uN#;m%{b#<^{h_f<5#MNe3I%q%-NiU=o3beQ7fWtL;yd`z90`b+w12Z
zoy~#$T15oFZG-$&HW0QKe37$`8#1vR(bOv&702U-A9``M4dTBIIJBL!Q)9D5s1jU1
z60Sr3xvTx<s8vGOC~NA1rFT(p#%iYlzI)yO#Kv(iz8uBcNZFny6)dOl$d|oceFxF)
z(+~wP?O;Ec?(X*8_WPi0R=f>~*B2v5`k~_}{={7xD=?g$cVrGGgJ!)^=@k6@)o#l@
z*L}hGWKUbqhwdMwh0*MOl?DB@3bzFYr412mA$|}~wph+Di-M4lYcKk$u5(0yp)K3b
z-us?UgTG%Aqv@IRwkT-atvd;X#<pL{MSTBo(3-0QKh#5Y!<TPjE;zp24}eKs?ci)`
zgGvY3+%ht}mSYK9!X<I>2-NF0A=Jpbv&&lbPg7qxU|~|AR9yc8B6mDgHe6>6F|N}O
z6w#lJr25?K^ok#q&GKYNF|6<wv;N~FwRtu-17K{{6V0o0OE|eYS#VEd1<@oN)QKJ5
zbb&0TUPxPl&!HBAs}0gW>{6RqVF8j?kzEUFtXl)hA+8T;RT@Af^*I$=Yae#KJ2+1p
zIE$!9cH(TOCpJk#P_-#=Xtu6zz>#a0-bLJZB6Hfg|M_C(4`GNfYm+fjXn+(@FU%AK
zxkxNVS-_2NKJ5T&fRLZt)29M+fDyd)<l8Pe5IDzMq7A>kmCGk`kg5DN&-T@QPZ|d7
z(wqqB`E87{CQweetOGGmlg<ihFafDU%uo;V!x+#hH|8@IYu3DUps=TF6Y(*p7sYs9
zXUz5dk*lGm9VDyblB|kXfQ9w7z~{fJ9ejKy*8n?eXshz{F@t*TV}Zo(1EB|SdLRX0
zem-ssGJ8${ir_ow%4BQbH-y02(Fv;`_bey>qOa|mo6p7f9m45nXvxU9V@A#;cSw`b
z%~V^8ztY4qb(4iX0sDeon|b4fQ56qy%H*%h^iBiTs!Rh_yobEf*^!t*!0c<<lx)1T
z(!y7BsUOd3XdwB917Ng2$|hr|F2lGJftpHC#b$3SVAp^Rtm@!X&@$Oo71{gyAA~>=
zq(Kc7a(-99$`AfnL#?3vbn(htdWe6uEJp8kg+kW%yqde{dhd)wkC%@yGbaMM(XAe$
ziUx7)X)R5cv-z4RLB0|8S+5iPRlhAGy5fd+By7K(J5SaChz-!}Dv=dCmT41(f`Oj^
zGhV%|eA_e<R61>0CqZNTLBclE1O#`wE__=0I4>(hWYt-lM<+0C>|qONpQ3EXf1+&Z
zKPbBfT#JC|e(}QwL-%WnJNu>RWB%T7SIq9A<^W9bi9iZ_fw7~5?J5Z_?E8wGEjPDu
zPHtb2{x$l9EMU%2NC``375bC|G5vY4f)+vmV6|WK<Il&FXx^L0-ZEz=>Oi;)7KQbi
z?5Z{f@b@aavx7o6DPnEQKwbat{Fi(pbpclljl6tH>YH+bn@*7<zqI5cgMf|O=j+rS
z2k2zD;TP0oJ;R9?Mv(p&h9^Arcx|uNEQ9?A<D}@dKviyw<H*90TgxzZk;ld!->|H=
z1?j8<A#r~Q#pj3W_B?6Ro@xFX@anIM^$W8srdy-5)1&Nc%OWN+_u_57$?a-kQ|zio
zk(z%^y6us7We0L(KSfsOUv=<JfLMysRzP05pL&s;zfIt3$w)vCV2+D@n>!)=SeAbc
z#c6yHX*!m^0@@k&BNC&BG`byn0TJf+MYBlfE8uOA0@;5FfLDQyawUf4#Y7L>1w`UU
z%S|P9JbT06jxS;&ve!Q0Q=i`Mu<g)dPRERQ?i*>VxGePk%GNtvV9gajO}XBis@AA=
z;-Wq#+czIJEWxdJ&ucZEEFsTN_-nygPUtb%iJ>lglbO=$EqIHejz9EkuBhwE#>=`R
zCzbC8S1w;VpPn#HY?PI^=N1x*;@DV3CD?w5F6qcWuUR5A_#1gsnrI8K!()=2P4)J_
zCQ5xNAKvz;#~Z>GrptmIqZ(D<Y7IVMQ?p5|M>9+;4*w{{(S1F-+~08@Un2`jw8k1L
z)8OacZ}^Z1Bs7g&snkN2V2(<FC%5Ek3bV(qaTle$9RJE!HJOZ2|G-wzEOfm*M{e9|
zKR`phOZ7-|*Zw)K5n_!c>tWqxEXO$C92H;0pHt>O>}|TUq)E+YxrP!?l{20KG^GQF
zYN{Zc&8JWa;cC?l&10%#$o;UTnTbV`#EB`{;<d1A+W;H!0|%d`fFKQQfAGPgkl#6W
z;b3BgMb`~@C97#`zkAABP|E=et_c$-XlpgN^E!}M(XDOz{HwvXuTG}d8M=)v3^64)
z>E9S)1nk4kEoz$_7%c3<#Z55%-Y-Ernq56?HwOA;0zR7bzngGnrj7PZwn*jFeri(7
z6gp=L|BlbXeTyNbZ+pW#kli4|l@bq11W3cz^9o;m_6wyjI6~c(k1QIfTd9tKe{fa0
zQ~86q;r75bYTO4z@TozgRLAnr54wH#hawA8CF`R%cMCq{gP(FU8qkyre!kzCI)zVU
z;yM5=ugXfx-VDOxj{8qK_RDvlSl8Sl?lM3KN{|5~nAYMxqK1k`^&hrJJYwb$L<^t$
z4CUNYEeltVvvnF8Zk+u!ykw$hhgi&d?YV^5Q@=T7XM}DX7hKx7yXL>Z-)q#z=;KhP
z98U6T(A?_g)t6l4eiAfR1h=_pTNZCv>rLE>D6?Mgq@8NM3vUG)9HEQ+<mHmkO<V#K
z<GCJu+xiW@ZJnk}d(qQN$Xb*A`P%FFhi&H>CuTEYO`0Qlhs{mDw3Sp~J{3dBBqThw
zg3!MY#qp00JEgz*c|)chZr=kajOJL_&{Z-2`O>lkVJb|8!Jbf(O%9)8@=fS;3VsXf
z@w-~bcvdCtAoSsjxi#ztk_)n##-B4g5wEyff$f0?m`eR0c4K7CPUBRP4~RN5K4r-U
zEWmY@+I{bTvQk@jxO0HvyiLoQVS+e+N8^4<cybxaw-h|vyj#qdbUUmQsv49@UhQ^)
zKA0Ts5gj98YC2H+fV6iaYe!%UALvu#H1Y5S^Bx0^AzUc?rvJnIwNI_tD44$O9E8%c
z%acHgSh`*ac|MB?U+jPnikPociE>@ChDh2?7(O0k9s6xi?ogbVG?v`Oc~e2&aS3;Z
zn<&3R)<YU$$Zf*gztrUYPHp6GmG?CIl_+jaBB*J-*q&a86iY20-)WnD{mW!5Ih0Ma
z@xyO6z8kMT{kDtA&0q=JVp~gbL1wknqxn(V7&FtpX@~h5Enfpm`iBl{B+;`3rGYd!
zS*$sM+mG#Od#h6yd4q$M&obhQ$4lvgm_fz%MSn*W415Py;rG9wK{qP25{`LZj;e+|
zG#mB0XtLXx`Rozm%4pW6HMd)3ok$LEQ=k%2`Pv7XC%v(`L8q5o=Q$MmIy+#49{s5C
z!MlsVCJ?0kjRn63uh@b|?9B+%U+=pHemi^D*R-o?lJD}doDS&{m0ZtL#p2z?n6its
z-DclatNWvXaa53rFBrx9VxaGk<~qUVj7-MQi#(Vc95V0TwfIzg(v7vc|AeSkjW}T9
zyw;h8BuomOy`TNf(9H)1?}{=y)un%is=mSxWQpl-QgCn*DTc9v1w{+9`B(UXzh&fN
zm*+(PU&zRJPG#iv#qhDu_d9_dASe6+eL}5|8}>HOhOfe}>Qd0N```ID!zurElzMxi
z#am!@lN%4f@k;V;G+##KdtmFf8`<k<pw!@82*uTpRjWEf)NDr|&mQlpU)=N7CD#E0
z*B_*0T$&*;Bx2s^RLN&%C4w1myy=vP3Lx12Z6vP_&p-D^Nlv`@yEt8ffx%Clo8S)(
z2-tAd+~yK5FS8n)?QVm+rHfQG6~nqx-#?bR{dmz_)!Eu8@$SRC%l|svzS2_#h5%Lq
zq-1G?hD1M)-ep`{*bw^cVJgf^AqKj?gPS%SVfJS-j;$#s`Mho(VQIg1>IM#xiasa}
ztK;hwa&UGw5wG<N!6^~?r*z1&Hrn+eCV6Q>*LW0$5BqjL$rt8Fer^5^pA*DEhR5T@
z6A;=IzW|?yJ4;-Ot-wEu&Bw0PJeRpbOl2BautEOt!z{+Xjzi4pPh=XrPs^3Dbgrf{
z`0hF0)fFmgI}5!v0WMVf*S`3Aal@Qenb<>NNa6KWyqsLq0UhaQDp+#BNl|9Va=HY6
zh?W2a^L2y6U4&)Xjz>M6X$2&DQ!ZTKdQD=djaQSeObk|_F4XxeKEKWiacDWa*7P#n
zA0TU_3_+Zfz>l>yU_fK_u|@d`M7;ukiXKGr7G1@QcpOh=pg7qLj$07-?ZQ7w@>e`i
zjBghrqC5mXHpI0uI}fkwUM^%5U|E5~x5^^ziSuhx{X}0(Gu^|W&M<vnvgB`mPmGz?
z`xwS4ZyWswZ}YARR8Eo$6{vN<FTJc-tz!Am?ef*1CbjyQ5{MMG`r4-D!KxgmOg?@C
z`=Q{M;V^<!j%i^0?UQF^0;9GZtJ_2Sv(LAOn`PPXgxhHMIWC}^gP+3z%O+0|H@vvh
zw6W8Bl1Al04poK-jBQQ;QmU@COVpkvkkC8Y&lf)8U&C>2dP6~`_bTgEJDRI<t)nIJ
z$omE!d25KAXmsC@*Uvfjf*doqTXWnd$1X4V9;{H4l<wW3p-*cX&`~@-W#3Gx=8Ao`
z=pXN5By%gj31w{%6W(f=zQXNj^5ya1gCUdU5fhtsMW5gzF(z|7`;LuL7M6#7+gl=a
zNI7CE5NhK5m>G!6DPqLWz+I&G)5wA*FW=m)mO)LAMGl#lT{5|+1W!<=%(_@8WJz;_
zQnNmYq0`^_@aZthEY*r`c#Kl(BI#&$(<__&AF4ZNoS3X<I{<%&me0F(>1_x6;LXD{
zm;s<O1|L&KsMq8G{m{n}OB&Xa)Vi*FH^M4*_S@jdxT8zoLz4kGTgwf}_S3QWDg6#D
ztGgZ@6_MA<tiP_<aqIHeh55HReM!Jbj$s>+WM10`%->p&O)5CcDQws@D+z79dByjF
zNkizP>YZq%!YTq=-L=qbw$^Iy$0eaTl30SN6bnmU57Nh|MmpZ7-2Wr_CWh5+zWiUw
zH+MjOeXjvFrxG`zw&te49|B&VKii%C<;-lYcwJ8^-sLDMrPvm1s!uYAC*DSQ;@!WO
zJ#o!w0+Jh)z+dv{(s6fmed*XCTA3A7J`P&5h7!b9Sg-Noxwp;3PNqWYQ|f(#DtXef
zwok~Zs__1WI}^dh5#KI@c?CV#*y!=aH0cASH^1^Ip7z2Y&iO=QOMF7yaLYSkn+%wR
zSpVop2ePd-`Y(&8blo`>x@t+y+|?N)N7xbu%sZz~GtqeB4S8IO)p47rcAHWf4TL^Q
z%k`*ZuaPAsi~UW!|MG~df|4&Z+tLfrCaeFFi5@)^`;&>b>UxtSu~Z!rN1#f1l!6aM
z9~8l&9+OvX2jt<=&}rj2Dp^-^XIs;V)DF>Q=+Hi!GM>icnD>5clP{AWznk0e+^N@<
ziV(6A|B~Ji3sHyfz3!lFg;s`k=+2C(l?yI^COQEYxOGdjK4|osgKK`P3G-2t^2PW8
z`AH9a?GvQAhYy@mLSG#T8ZLhqx<ToF_Ci|KCVoG@a&na?IbDQT2k!RuxNPIhW$1<D
zMX)FD+`EX~VA4`spZ9(rIB<yr=j^&gVi)T9;b@a-MzE7oQ6ut^9VF~<x*&&pMS`^N
zwt))2muf+H8a+7m;P7sa=O*44PATn1*C?q|89P?l<cK?GU_N;i4sbdd0yDxA9yiNw
zHA+H*==vi}>$go$H)ZcD49hGe_Rc3m?!qp|Hc-$)zCEt<nr4Cg=IIdqVB{h>>*)5D
z<Ua@IO5jG7CsW=yC-h!+fTFg_Y)gjL@t#xok|^{s2|(^#!AX$djpIR&es$$8*N_zb
z9G^!_i`1_(`|l!w_2v@f!O}B2QSsI(lX`khQzC|6hPc!^v2%9zz)9q<5!6uH^Inl^
zNNmQR0UC}daI&(;YM4Ooo9XjJL0t<*2PT~`obq|Dadx?M_;}=;Y14Y7&Jzi*8<lS_
z*4`Cs*jD_PTJ+0Lrkat-W6yD&$CPs6KRaM&!`^Wu4GM1@MIcTJ5rvSH<`b;9hIUWC
z0{-2#+*C#VHUL+^^2ML9W@6<K#8r6F_#?b%TmgJaVws@3FEHU+=o|lAG`{1Ju%VHL
z8&Ps?K=X-UM}LgOVh<A3nQla0pt(@cKT;ztU2wT7@4nYz7b%6EQddl7K1hl|mc&A6
z+XShurHU3(O6-wC;u}ev&J<tIgLr5z3hCDLS3lah3#h|?Y7IHlLQ|Nm{H@H&1sHCi
z92omQ;MIo+`<!1Dmlyo8ry%74Vny1U@R$;kgqEH&J_)=E{=(<0<FK?nUwA`Nw;+xr
zL*HPy+d4@vLZApyvQMD%u5G7iWHwp&!3#R7S7D)erTF`-RR4o#7e5)k48rqjf*(d}
zLFD-aYPjeFa}6G8%J@x^*!+a&=RUlK9y-TzR8-i`BOLIs8t(7X4Kz{gI1+I(-7#fe
zEuMn{K=zWB(`t07%*9@tSS5|%q{RcZ;%_RFE-VoPj5mz%YI{d<nSucq%gd79VqlAz
znV9DJEf87#{U3yS``Fs=ZOyAh;S-m3Jf1$+{0)dRk6~PW_y9SRhBY6#4%HN6Ri`mj
zS--vEH=G=o(v*4;=(v8jo_&&=^-+rD4@bH2gL9IH$F^z5#ctL-NCKXx9lhxTpGuj8
zUj?50DMyE>gufR?S?>fxRo{Zb(P^(V(|+5+<9ZJf9?cX$y|Sr~!jEid!P|CXjgojU
zHJ-?0&g6w_#dawoe>R71uC<(9(*F4wFYA=DR*ee*b7>AOg6q-nFFj2~v&|PRSjxkJ
z_6J0J;>aL{BVC|+96>Kt2w6@TLn$l79PTsFCCod(>@9A*tn=S?=REa2iTBfr)2>2i
zoKGBUx)5>DdR~m<oClY7P#O~{l@Im_@bmrIxJZZOf}!H}V>8n_l_yGs?u<=ZSG26m
zdcF*MU))4o`C3CcE+Cw=s$0LV!-n5Un=&qcy<NLCmtKF)O$Vn_vdZo51IL&IF}SwM
z$q)mn{jXAtiyLL(KHskT*#_~PQMZ#854EYgDeCSQNoR%6M5CI4N$W<Ew+0YlL^vYL
zCLF3*)NuU5Q!c6rZvY*Nfj6qXsZh`dh%yrH*ho)WM-7Z>VY^rkP4@2nf_>#VR`L}I
znOb|(B%6_0wvHA#*5R4`4k@;G^{=+|5^CR3L9j89t9{bbK7#ynZ=M(NQf>sPGd86B
z?l*<vu{6qn!Uwe{qY2kStY}qD5$j!o?Ddkk(i+_7<uS;F7i)mjS4hH;j$s)3+Nb%J
zKRmD7%hs<K-~&|PzHXc@gn;Kg?UbJVw%Lm&3|^JiQFsSyf&PSg@}B%O#$Q2~PLUS&
zjWgM8(<AU#2ZGS66Fq#nVFR;)>X+K!Jt2N%z~|i$h3%&rKZ<wN+?w^m^8SuPr$C!N
zRb*z5j+Mrf{weV0UY-Ep@?g8gl)m(QYcljWL0&prodk!t;w4kJ^@Vf6oc_g>QVrQ9
zu1DBs<cn=ia8CkL_B7=n&POCboGA0-FL-&koapiYB=2TqtH@mF@*EQ1nCCv*bf)Jg
zALuzjkG*?P<>#tYSNzz%hTeh$Enq2qg}G<6peo2Y2|OC8Dg7quViCDPRg3@Pcrjy#
z6^aO_=6@UcV|!sQ0_nbk%54wh1zkTK!D07xr(QZGS@uI+`z9ocR)u2S$(JheSHOFA
z*UPDk6aJZp{%`i~O}xEZ;3ND!O1#7dNy6EZ&D}*}dgpOo9QRog=!Y|AC@_uXAyMRo
z-$**j-CI*mXBfy~11nIS;#R{sFkFJ?pP~0Mo=6|UA_HC{y9M`6j!ymE!o{V@7%txh
z6T$mtYK?8cU?iWj5<UGrQ7~V6=bvq8hKFW0Pn>m73RYKj=<M;2uM{8n=4Ge3=lVhr
zc=(`mh-d`8s%U8%V+SSdz^P2i!4fB^Bje58`6%eU<D^Cka3StHJPNgV=2{SC@`K_W
z;juE*eeB&+b9X=gCH$h>?R3$-r;Ix^CL5;ZEjf9ghF^5&aqP7sE~&?eQ)g0S=|$bQ
zfW6B6Ytfy%K7LKC_VsJx94hhWCH5}SafkGQdt~)Em!D8eN7No(++FR{)DIMrflR2F
z|B{EMaL#woHxJa*{%pXK#fDdRk5W6&|92Wani?~E6U#c83b8?x<dZCK-^Tt%&#Exz
zC%){T>b@xsyi=eV>GxAL?)wWpUx(d+ST6K5G=T^77WFAaq@%`<`vm3g&(^=5R*7?T
zw>T?j#~Cty{Ecz-+Mn4rb26emvmU|hQtn6ol^fQ)smm20%=EwjeAi#*|8qSf@%06q
z`dqOYyHUDJdOKiKay%=pz(dpm!{zJuwVCuzyi`EcDGGsQf`K<&re~@eS5w+q7F46h
zjnP9*gL(l~eooiJ2)q_eq6x1@G~i|3Twz|$)1+lljxYT*u-e2m<CxYs-L$ps<0E`Q
z8S>bVRDjU|*zxOaft2-($GMmFaL1j*Ko8sn>NH*9-oHQBev4x)Q|TzAc6_hD?zZP|
z{2b5E#+oXxw)~Fl(Y#EI{JU2R+zhwwdeRe8snfU?!bkUEq|7|SKdmhV*IoZj;!R16
zUg;kqKWn?#umCK+IxG8x{d#E>C7l4;WT6dj_5#zdem@5;H|Cf$7_BN=cDrz$eN;cr
z!?rqF#41*^`lNF5`2O<^$2WH7NNh>^xr1<o;GJur)RnXOhY03bcqzyL?*MZ}MaH32
z=v{L^6BKgmjJf~?MFgBc^R46hCn{hZe_O}=5Bls%Nu3{wmS@2Q1Dp^?<2^0Z3}6M0
z8%S9`Tny0EUH)|T9@Ux4Y=@B!xyBOp!4*=AH!hC9Rct$x25Lijr8c3JOgA>OP}N#I
z{TkOwKgX1-v;Y4MogZUs|3~QD@t>jdb}NxloF5IWjY4x?)d5!)l0&V+W|DRT^1Arm
zv9&h@@XfH|r{*1VK;jATooEN^-e2j|yCdUQFS}kd5kFMsoK+;$x48G9YmqXJ`XvEG
zfGNA^gVl?!s>C{WBh${n99%j-qZQ2K58*JHKx^X6;~*%;98wK=kGF51ft)<}e6<l=
z+Qbrb1~Vd#Zo$@lyXUy}T{ct5Z{^@j+9M>S@f{<8M5TS7l;Ufi#7plmbocrK;{{s>
zTr>W218{-7#UZ;F=ZUKiF^uFvtDE1PUWo_jG@SoxnoA*cAObfZHu%qZXpO(~&>BAl
zb~c<Gu14M!EoP-L9Sn{9lZVdKDBUfQ#pj`~krO92bwyJSADZN!8yZG!l)jpjwu^(@
zhyvaXLmo6xSxP6@TKMcR;QkG8xq&Cb(q!3wYyZqcZ~WIh^uHyc7k=FG-W&tS*6nXU
zVFk`n6AEWIKXxU*(l&Dk{9>Q$$D9cpn>i{*@E$%+`hl41MUR6)Kx3D_k*5tN-^4YJ
z5(TrID0^Q75N25|b{^q%-7>rovw89x^*7e+r)LwtH_nm2H_q>0sU6Y7*#)7d7vQ%b
z3)$d=h9nJ<kLNFbLioSVy$=4G0J}X0=k{bH@r1ZL+t~c_bXKUznf!jL)c=P`=meVt
zd=h#V@9TCPirlRH0&0bpXCTnY=cEj41n_Kk46W5eGIQ$czG61wmTh*f!wT;Z5+l%;
zG0FG0U7U?NTk3E_NL#sY&i0<b0;P<nN}KOknmva~X<7}($ILq}J_XNR7!63e53-6-
zzMMg>{eV1;eSM{AGR5M|s8h=S$0W4x!3m$lKa$WFS`}2QzX>s<hGoGvRHji{q4PKf
zDj&VXD8xFP<=!VIkNMKZ$bi2D-}dDSwTmHBnN!`?;A<spC(JyZ8tr`myYu$Pu8Gnz
zA2>x7wx&_q5DdBCY%;(2y*K4N_gUmtnr&^CH;IyS@)YV0wEHRSxH_t93TFT;)*&6a
z*@eKHM`^JCISGAZ3$DV59s|38Q<-;~EjJ}e=#m0n=KTpT^RE4d2rK0u{>;9(Gq|_&
z3lr*S`Uub-bL`^Q@>%a^47DD3Bl=*<Mce-!SIAFyEk^ZsM=I$fuyEIMhSxONGm6xE
zPA5XK*T?+NkM@sf$SlPU-wHflrnBQ0EYA4;Q}*$x&bzG<t)VstUr7}3f=#u9ttuH=
zI1Stoqz&iFe0!f;##;qw|J9t9XQDL3^j!OUJ;R53p}c&D*FX$$<>{>X<P!xn2DCXY
z!jT@YPM@$pY`_bwHUa(ZO+Y-2T@=;~86$LWCp3nOzUwY^f5=nWc~rM^Vhp|g(GDh5
z1n=GmP5}tQt3aM}SurNB?f3kHXCMO}-;r2=Y2DHDegu*+0|`U&vM*2yMaBTm^Dq9F
zCUg;H`?~LcX+l%}OA~tkKQ^JeTNCPqj&xBNr>sD~y*^GaCPOaf9@Q8g@Bp{hT>>F@
znpOe|H7gdJ)Z^Dr{odp>qFB-Im=#^yyE7X>ZnQo4TVol;hY4~+t4@0JKhUp9N!3q@
z?_nykGnKb;CdJPb*NZY~I>2;Z`4fijNfMJ<7k>s0+MCZ9AeJ_Qd}-8guKpro%!&4l
zI3{`U)kZ2V&_uu`jvtEFRvc17ru5mUfKS_qe$9$iY(9rlF8q?gg=h%)5ro-EtIwS$
zqfRD#^veLR`Cjd}cd`y{=wEumnk?C)(%np$I(qp+i|QQ($gEWsVeg)>Lq_pI|DJ=?
z^(>~0ojsE*)c!Ptp`uMeF<lqSkgaGTw#5qbRv$npM<Dbm-uBIV=JVJ_{mD&%Xx7C#
zJklM}2wmMWe7dGN_&WaNw1#vEd8ELqKNeVw|IqHx+6A4SLk97k8Fht~oECTjT!N_e
z_8r3o!5!1?ee80Kqyf|#u7<iS%}bc)@l6{F>^q)w+&UEGfb_BN0z-lWx_(7LboG%@
zP}xk!3-fCeyyP&7yju|#`62!ee=VPD4wy1P9AZgql|>=0`jH`3-its`iw#!}%^^M;
zwpo&wMgd9?PT97jg(>d5`QCu-*`Mxc$MB(Ewm0jn79>~!6m;AVG?ivxL)^D3(wYhj
zdwG*bvRNA|dgA%7v;UqyOKHO82?!VsRqn|?{;yN$V)9GlV;ztKQm3q&W&iyEG0^Wn
zcH&-)5HgDI&d6Pg_}z?#UR{q%y8?<L@etTGtjk-u4}O{Ib_Cl)6)uut3&IX0c^fkF
z(!_fJ6WI`+F#wZ-eze^}|G;z;X46*GTnze{vosRldXMT2Db;jL^uEkFvySB-;Wkzo
zyhXIH2**UJaz5t4bUKN(mbnQ6d20fr4?jrwmtuBG$zr|!7{DEo4ZVL1;6M_72Q81v
z2l1UNM+Ej*pi}-n|FtQ5%c;D;`yXIU1K%<8Kwj@9Jw9j^HpFwqhnZ;9VDOg52IZ3r
z++>_jneACPk+m%RI-v4g-7bR={^!pY1;SVw%Ajd$95c`zamFfZ8~}L^Iw0!^_)sc*
z^LxwqQyUQuFQYx~EMelxLaU$JDk<ps@!y*7_rGL#m-FZA^jBTj?k>0)h+cnB4ehRJ
z-~VSuTABx%y8C`*L!q1lK77CaN&HhQR%V@HE2^zSaslj1?j8d65(2H}0H$^<vv-ak
z&&3lqo<s?Ib7>lpVo$kIzWRLu|7dD-zs&b__$I04^g6<W0u-i@Hqi8qR=CR3{1s0(
zp+f-LN<e_964HmV4x@q5&;N3B4@iky7<8?Ne2^8oYj)MQcXCVU$b1vu@+11`Z=mC~
zOwwt}bKPnZecO!KM(k`f%V-ljo&<7`oo+*R0KM98qZh9HfV8}}&2+1OJeV@;z<bfH
zI1Y{%)0p<Z(9*`KETwYwBbBliFCPclnT>EJ>ssOxE_JwpsHWX_|42-WBHc!=dg`5(
z!8l#gLbGsR1tm|d-@+-(L>{5p<CJ%jNXc-RxZBlppDQ$lQ$Nkpny^nq*67hjq9!EX
z;p0qy$-et$UhbOQnzE*JX`L|b3<1ES&GHQO!Ne6b3<V)00qidU094%+a3y=w-q?Oy
z(Y>OOnh+{U(3c;5mwT<i;9=P8nB%3};JX~=M?raa1i<pS?K&{nw?T3fKs6n<9?upu
z<e2}c#!EW_m{WeiW+0|SCD{G9m5%HS8WL?Zja~5PM8`qbGQ$%G?xZR|_+|3Qj=k)V
z3ZRS!7S->(v9@$yfx}jYzj1M0x|Jq%^e&=m<G4B4lTZ%c@wyN5rLVbW21Lqqd@Uec
zUB1nP4zwSB_@da4Ld}=1r4PNyT2#(B)s3u6T1<lCO*xMXA2giX40H5UzWHO}l=JeX
z%cx6iB<}yjKnJ;S+#Ue#2AQA@zn4IL)!t?X2241^GHTyzWNz!dNzx`CdW~!k+87&^
z@>=0P`+OS}bplVZF9pAXkyrv{2;A(&HvGsCaDjcsIhMc$Ff+6^So@7x%^B~US56NG
z{I6`loo_96IC;7sviF*f5fiZ7d(j^Ap?6!2C<~C52aU#Ie#hjzCqNJh*!1#>!pTZ+
z#&G4en)L*sK}W(@AyiE)^yy!fk_m5uuNqcf5gKI__m!}G^S?qPI^Fq|+mc%0fr*Ej
zXT9HAU9rgv3QUpmi(hXJ%x{w$);?1Gd3L;2)*ZV-7KqS(J$*ea)NlGpkP%sX<lJLR
zB17MO$I*pFGCGN{BHQr6FWHJh#tn|6{nlC_cm(mb$M`8A)H@$zKL^f|SQ>}KNIt)B
z9|}GUv7Z(%TM^{R58}|qe{)@gULjXX9E{%qPm0Wco-hg(#_763MYKj}s4D&VoMzX8
z&QD!90$hif?tS9*y>?YfBNK=J{q}mwxgJT*{boYX8xQhdFH1<wSE(==PdDknKFt6P
zfuUXIKA&X`Af-hOd)-{#ffju3p2ekfb#i{@ifeyej<)1xHDE^C^>|D4#n&}*#kgk)
z(mHv3d9$L>_p4*Qje7_xLb{~>GciQY3ObVPGOMk!GVMws8|3XQ1dJC9{XTw59uLIZ
z#lJiareGmm^lS1fY!;u&(=Rn$DAR(*$i#NcPKVXGl<ePP)1*I2?Zckh42+^f`{^bx
z>oU>e+OOOxqfatxcn6K`)UqP0k+aCoh3-02?Xt}B#2I&-=Ur8L_xp!T2PW}OBCx9P
zze%xG=haDiNSr022;$u3g^8mRm#`*ILAcpk8J9c<iW>)a?l-Q5j>UFib-<?qD_8*k
zPWMX(gr2i0+9#ROz+1yv_Dv30{k<>deIf{GA)Lq;mdV1hHa>kLd#`J6MU5#Z5B-(o
z+C3r3*PeviU6_55EPg(yTX`}pWkMOTZs|rH@Rm&<S3*bvi7o^}t0ctcSA1o=&Tbr$
z2a{5s$3un=@<jCMANf6oaq4evClLsDBOu%hkTzW~85VR{9|U9kmX%TbZnSp1-$#lJ
z*#$czknDo`_7&GRzzv>zj&?;B5fhkMMnIj^W#~Av|C0x#bMy0SW#|Tbj(0Eo=gxd;
z=@N`WD1R+2I0(C6bL@_e+}c!Pi+mA*?PfLMk=Xw{4vIa3sU<5Tj0xnQmA42FWcy3I
zGw_=0a!TaA`MrhaSBx&;^?{|Iy252VlfnR|MXSN*tYQgqZ-}l)rSH~3yGP<06hXHy
zbWJFeGjdSiVlBv?IpF3>k-Xe)Sl>X@if)nb>pNK%xB_WL#F{xSSNlt4wAVtK*HV%f
zXSW80Pe!#wHAtq-d*;#l(8-Q}m6#SpjSbS5R?2+Vl|lOM`vqId$$XD7+w}n{JScvS
zGcb;{01dWPj*mofp1?WBWBzv`8YWCeGbcQo$<!pVVlGcw$MJq}Pkov@Rxf`l$^<4z
z){uT|SYe2-I7qm2%ukj>_1-xq(Aahk{xX1r@277g=Ux=W11wTET=vw_T{`>pR{z25
z$Nt^^W$kaqbB_KrO(<(kN31*cE*4XOBaob=ESIl2mn|0jcx`70d%@a$jlE;CGu5dv
zF_*a-97b9LM^m@&hCZN5*4$QGNE8&ESXTUlcPCHrF1!AE1W|WzKp(tG7@~{;ERDX0
z?+5j<)m#oj(zVvkF;(}CtljGM^_Sb)R%V2enO|l66hU%cB<j~$4H9i%0fjB6)PK&H
z<8dRokRDnp;04KTsY{8I+M1~^qJ&A!?t}b{H%ci4S8bv8+!t&B-#z9ZFRo4EjX6N4
z2?Md+>$tt(jYvyL27!|_GXAyAYok5kQ8{BLN`6yGTSOHsn{e&R)rYfO&g%&WMew<g
z5%})V3YSX<n1<y#c^Trg&3t_O|LW>Y{GodHI8KRVE3#w>{gld1DeF{1%8;$$r;ME>
zBuj>zh-44h$yQmWu_h8t*|!X7EFnoVsfiiOV8+Zj_vrV!_jT_*|HJc~@AJH$&-=4l
z!0HJ4NY?F9uj%t>!A`A4Xh9ctF|E8U`l`;RJbIWau;3F`I~wQIEnu9sa*%=M+5eJq
z3h?^=an^JE*1+9i^_0RhUBOcM+IEo{!D)-I2i)>Rz%kj~7ZusutqWeiHe^%XR%;8_
z<whT*RS7_0N$x!qGDw?{Ww-)yP*?HP8k+Ud18f)0RbvR@`R-SLL$AONVMJ8@Jb|K=
zsuJ6Cos!zu>!dLbSf(^Zx%R4rs47tLFK@8Xw)5_rlajx^^Iku&cb9zST1$VW*(p`d
z-`I`A54Wm;g?jMi7`ak^3$gY@GbCuWFWL>vT{VJS9SGH<v7{jUQa0@HF8e;4JtQ0X
zqnqP#d5F2+o3iKSmZ63olMa`$oaf9g=Vf4J^?rUip?f;>HDTPF=4E2@f$MQ|>X`rC
zJt=ke179=+R<-8psSEfw-={}_H%F<<x=%uJjt82UsnKI_?=PkHG@Yz?ZeJrk)&BNw
zMm_AbzO=s@Cj-dQ_E88W4>cDvb9t)U+D#kH0<QF_NzZ5+@eR->JusmO`c-9`7c#7U
zRj^c}Ut>Vbc^o%&8@NVDfxqd}sz=|}LFGE7WmDv{txj<)8*ZIbLi3$h>ed}r)WEhN
za9D@yC0R0TrBY{!)4CiDEH>WT?G&ZH9SS~^J*!j}hhDquGnzB~)6M<j7sHas>PUZ?
zQRS%E#zkP9I3~;P)pkqd<0X=QpE8V^>8gE~TNl7{%+OQV_@(0h|E8?<@T&oMVUd{w
zA|5yhBYbND!r-0lHe3%<T0)c5UpqdHz4<9)K@7B7?4JhevBsVo7?cB7xo-H}7v`>L
zIR|G+I<On)`?VbcmS}(4&GW+uEOFeax+27_ap?xw^){uEkPa-i^7n}Mdw~BWfaxJC
zd;z%$3JA7`h{?cwbZ7f7EtTq2f{%Tyi&l-LNx+$JhoZJE-m?E#ys_7`t!yot3XZ_<
zk8^e*V4|v*RG3uMVy(*FC~FNW8McoYnIi|Yp3NTt;T2Y7*Ep|s347~KEj{}~&?Hn3
z<~9|e>$S+@*`MYu*QL0-8@^%hx?>z;yqYrIW`HKpWTj&{+tpK){imV%rZ^@&+>cZ=
z@nYGvZ5n!HUj23uQFvSCkkDfQ-4CFDa8~b_#3yY|^~5_%b8^YeA9BA(J@%)UIX#o~
z>cAXHf@heYR?*98$MMRX{(4HKuCM|>ow!een4hrpN_0vPH0nY|4-Qq?3C?}}cO`QY
zULfYH%g*GS26_$rt5sADVHto-O5BThdlg?hYcK9&#1$2d$YSjKkl~0)8{|<82Klp!
zI*(EdHBQvEJ(j%hBMyhY1Fs!7NHN>{xF)hsqc1U!D{v?s$WeGws&~s81$s!=HxtTl
zf1k>mmSX&{TCJJBlLg(CzL%2Eoxt69rPuBS({CG^*6_p7G^0-ijemw~cR9S%yIJ;N
zkxRw?W>@RKNapNUSXPs<p>HR|mGr_UHp9mPTR*w2>RxV2<myH}y~b2~TmGOBbRJ&F
z|F)bq!^!(_OlBRPqo~OE3ODTM<qe&&S#hXk;?=sVr+7~AtF$`8aB(eYGjK9Li&CQ2
zHj|C?PPrlKR^!t?2BmGT@_9ek+tflXl#~9iQduI0VfhD^3ja@f_hP$mh(4yh$Dclq
zj9-Ze(muoQtep1t*(0JEdHUMs#mo!2@pT^yqHlbyWO^I{J3kWv;xb+l9Xc56A2{{?
zY$)IFYG#eoh)&yo!n->(H&?ebCVrAW!{`6m<&6X5MMZ)e-0gXu2BTN50~PtU;pK=j
z4y$MO*U${LtyZJ+55r6md~wzrIM|aNe0di@C>tD>VjHM@hK$)&5oexMz`OUkjT{fZ
zLW_m`(W+aUhldj6kFZKsYkXnoo1BnQbYJ_QwC*A;=F_83KxqZW^<b@88^~E!wYquC
z-nd@8kckt1iwP^Pkgc4(9e-+~7~nnNc!k`nSR_M}XNTly3}P~qz9vADHY?s1kW9+2
zxQEKjz~wms&&+YwsSH(E)NfVie*P4w2M##`PJ~8KPrAW>FSfDX0XnYCzFKj48<wW`
zMY;r{+n2IDh!TFk5m_kx2HBO;9~1A3yA;-2Jtvq_y!Sgvf}4uag?ia4xd1Z4GDD&l
z(K5txGdkVcnSPyH#%H<gmsc;IEB~fS(G@7(1}70VZzDO>eHLswkHStJlsfc<nl+VF
za_yalW*7BAxN<t{JLf%4YhC_a-A(KZhqI-HxY>rvzMfVukaEVQMKy2?APE5h7NiA4
z=Q<*hkp(%e9q!C1gBDL<PV+`lPqJ2Pl{U-n!V+|mI>F1v9VvKI2Y?}cz%ic;15Pig
zF>RYJk1WPxF5T7FgO%8;nxiuv3%>F^35<nA?rU+qvHldEQY%AAs77#a(S?b{lWCu+
zaK}SM9_nPl-Z9qbDq>abww@5aIfK=)rnwlm8UE=%=#!Wcl>8___(B9nmeDTST&2#+
z6d>&{DSgsO;p;6IeT<5Y=!&1(o&}#V(;Id=4nUHd_DwjylIztHk$vf`^FdEq2s70*
zQ?(zei@Hij#7S_F(QA9FlYys}EIyOsmz6h>^Y}kIci46Pcg%sj>YG$owwqgsl)sJ}
zx`cEs%6OLFcjvc-8$N!jpK8ZbJ|?RtN8SEDhL{u3cNTev*a5_q3m#^bGD+FM$4i{0
zNP{a2d+s~=HB5>KF_sI?!L7y5?+*ki-0@Qa5ys%%!_d|g(WE`4e;HhyaTs30EHNMd
zEZ-fa8gw@OlXsH9W38hLCbgCdcR4gO`)J?Q#a@=|SmR~V^N~Xq3K(;<uWM0J>QPJR
zd#-XQ(aFUk3TWziI%<Ddh|N<*7GZ-yos@`ff+q+0=6UL8P%Dd<vRF8dRuuQoRSu*2
z+g8z}9MmFF;cCuHEo%H08n!cQ32`0a9|E<mzxvDn7m83?Gj1ky&a?#{|7bNFbpB>1
zMylBgYqTsZu*hd}iTGn^J98@s8kpZCC`CO=_!)%o1vBY&bPTv*8cb{F*}Keq>Dja+
z#t?V^VVW%?NC&q5Jk3%#XiVJI7_`NaW6JrQ;i&v;K-M_%Wy6}=UNL@l;8C$Y#e&=U
z7)HVjsdQh<99&ymlD|_$(aGC+B^@$6;AohmxtBFkQ$;do5l<jdr(Y-6)A<sT@kXva
zMOoc?@OzvHCDWr@Hz`sS!WLS^0+O^1cNxQ>eAf4)#N`j#Y+1o%R4n}SDP5P#4s^$n
zF<IvrC+d0|TD#PRV;rus?rYW#!md?2ZP^{kG(blXRtVG3<kw!_-4*#Cs=WiMOO_Zl
zI)DnK|2N3Pspr+f*Q9)4>$u{sXraS-M=f0CDG3yeXq19adc|L$9RZMY&oK`z%6wmu
z&Fvse7g;NlVNbN9I7n4|wpH4}%fRWY>~U7=yWT!EOaBf0ryBt~G&b*-9u?orZ{mId
zpQheFp>*R>Ip54&;2XWE<?*^zHidwe_iR4(xYvcm)Z+0~{;jsA!k(cS-Y)jiN3C;+
z&yZO$YoA5IhqzAoMp<sxwPA)mEBC@r;s@Dy(o*~(sPmv;>!8HiNoYMn5n;@IVjU9B
zl~C$7CE(@m^{hj%O4U(cbnShY-|Jt-BWJIfU6m0dYxuHnq$$Ky(k>8#<;CjWl><b?
zaSN6rg|N@o#4Gx`YeP{*FR%H~l$GuDML<Ui`egcstpqV}ICWVtAHQv%o{NrLo$f^B
zj19(!)BjBEMW|@YXYJqG#%CwQ{a)Z1L@QjtP35-Vrp05-4chCp&bYs!pID2TJY2c%
zpg2mGLS!Ws&?Rw>#OGhd8tLK>Tau+UTqK)MI#CLTFvvkgP}%^aIcVZbQ%K<$Nz{0N
zKFMVCFEe9?*n0v8)_0L4c^dl5`|<VTo<azBgoQ2ZE*lN8@x$g;t}3#@dqz7haE>p2
zzxqxDr*I^G<7*hyUT6CErgj2@C<^x#BW$~$YH1`N?;w0km9eI7R85V|AxxuM2jYZi
zbBNG_1oR2d>(HwF;XCA8?W_(!?w+-EKhX35>=o$Y|AIr*iUx{A5VgT`#+>!@HK-5l
zu_B-$(_WE(rfhC+WZdTbPhS1G(WkXkqJQ7u$g~TOP0agH7>){?Q0+*=lQv=}N06qO
zIK-KPSiGSGg%^_r2@5<?+xQSdex#q-?5xjd`XP2ac!`BKur)-2U7r1!EQpSVdH^;F
z&Y?jsEa-tS^At#?C@Dn5*cSJOF?Hz6H4pad3X5{%y4H{>hIAL+GKEBHg0=UPidpjG
zNJ~vFJu%smNt9*80e(D~Y)w>*ur4&<-Zu*H?Jr@Ypjc?cVWrEk(a6Y}*7O}WyLm5Z
zpnF#R_h$GDdXHMqejw$8)Val-r6iOf%KpowdJx6h2%CFlNc@X*-eQ1%u0hBWLdBEf
z|4veg`bIVuFSz%Kl%RxVL}HwNF`o;z4~Z5T)kYe$K{mHRq<UwBhJ3fbNF|uNQX|j=
g1)k~BQ1Sv1es9Fx#r>=$IpELC*y4QkIp^qq0hwU-wg3PC

literal 0
HcmV?d00001


From 910bac322cee72552ad462ce87a9b7f032ed37f5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 23 Feb 2023 12:14:21 +0000
Subject: [PATCH 117/273] v2.3.18-alpha.7

---
 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 0a3d923d6c..ebcd234dac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 479a54bd94..398dbfcd0f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.6",
+    "@budibase/types": "2.3.18-alpha.7",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6cfeb44a7b..47778ca6e7 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.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "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.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.7",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 77b09fdbf3..3f4b4fb274 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.6",
-    "@budibase/client": "2.3.18-alpha.6",
-    "@budibase/frontend-core": "2.3.18-alpha.6",
-    "@budibase/string-templates": "2.3.18-alpha.6",
+    "@budibase/bbui": "2.3.18-alpha.7",
+    "@budibase/client": "2.3.18-alpha.7",
+    "@budibase/frontend-core": "2.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.7",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 49f7a6ab6b..54ccf350a5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "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.3.18-alpha.6",
-    "@budibase/string-templates": "2.3.18-alpha.6",
-    "@budibase/types": "2.3.18-alpha.6",
+    "@budibase/backend-core": "2.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.7",
+    "@budibase/types": "2.3.18-alpha.7",
     "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 b848ae691e..685afed15b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "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.3.18-alpha.6",
-    "@budibase/frontend-core": "2.3.18-alpha.6",
-    "@budibase/string-templates": "2.3.18-alpha.6",
+    "@budibase/bbui": "2.3.18-alpha.7",
+    "@budibase/frontend-core": "2.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.7",
     "@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 8328865966..52d51f9c3e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.6",
+    "@budibase/bbui": "2.3.18-alpha.7",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index a44a61274d..0deea4e791 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c183a808b8..2db558f3d0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.6",
-    "@budibase/client": "2.3.18-alpha.6",
+    "@budibase/backend-core": "2.3.18-alpha.7",
+    "@budibase/client": "2.3.18-alpha.7",
     "@budibase/pro": "2.3.18-alpha.6",
-    "@budibase/string-templates": "2.3.18-alpha.6",
-    "@budibase/types": "2.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.7",
+    "@budibase/types": "2.3.18-alpha.7",
     "@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 82b97419ef..c11f5ce7f4 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "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 f1a9adfa2f..052ba91c3a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "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 2854f35441..15085f7718 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.6",
+  "version": "2.3.18-alpha.7",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.6",
+    "@budibase/backend-core": "2.3.18-alpha.7",
     "@budibase/pro": "2.3.18-alpha.6",
-    "@budibase/string-templates": "2.3.18-alpha.6",
-    "@budibase/types": "2.3.18-alpha.6",
+    "@budibase/string-templates": "2.3.18-alpha.7",
+    "@budibase/types": "2.3.18-alpha.7",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 351ea232f7923a0546e6b1fbaadd49dcac99a493 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 23 Feb 2023 12:17:13 +0000
Subject: [PATCH 118/273] Update pro version to 2.3.18-alpha.7

---
 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 2db558f3d0..07b9187cd5 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.7",
     "@budibase/client": "2.3.18-alpha.7",
-    "@budibase/pro": "2.3.18-alpha.6",
+    "@budibase/pro": "2.3.18-alpha.7",
     "@budibase/string-templates": "2.3.18-alpha.7",
     "@budibase/types": "2.3.18-alpha.7",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 04d1b7759f..0d838af3a2 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.6.tgz#e6b3304e96b9469f3ca0f4fcfda8cf234c37e2d7"
-  integrity sha512-To0kFbB9nZ6p0UO4ScS4PJ0gbqI1PrMWRXJLTv/6GU3PxnsqvH1tbpcleLMz2zeE04e5xdwt6W1oPViELom2gg==
+"@budibase/backend-core@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.7.tgz#3407df3d6744b5d1e9fe03e1557102fe4fb0f914"
+  integrity sha512-satGbpr+giJQFUmgjNEzHvqXxEHa3M89y/w2nKfYboPrjq4odHrnQI1N/fX/tcjmWIUwU0/dfgVm4EJuCvWCRw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.6"
+    "@budibase/types" "2.3.18-alpha.7"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.6.tgz#7c5c221da7da79af79605a00aacac5c60f209bf6"
-  integrity sha512-YWPxmZn+z3tm5GZ+2UZSkOAhamlue/dmki+FCML5pIp3dCw8KsXnpzYXHRc1F8yXMTmA/8KBb/YkjQ2WK3Rk7A==
+"@budibase/pro@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.7.tgz#c0746d624665a81b6c1ea55ff95789e67fe4aa81"
+  integrity sha512-h3bMjoLkpl6n8xtkEHuaLu/SVN4QmzetyAug6iKC5tIGsz59XMrevMLD4xvsoa/2lr8Qp2WZSyRpk47cG+fflg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.6"
-    "@budibase/types" "2.3.18-alpha.6"
+    "@budibase/backend-core" "2.3.18-alpha.7"
+    "@budibase/types" "2.3.18-alpha.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.6.tgz#9438ee64008668bbcb3d688b189cc649e03dfd60"
-  integrity sha512-16YtXwSODS8UDhdxCP2piGDWELP05EZuPbwLsOUFLX3Gt0+Wwkme+XWw4pTPE+GoK/mTVkDxzSc4cvuXWtfxxA==
+"@budibase/types@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.7.tgz#f98414de18db9948938f74322ca26ef4af6c3100"
+  integrity sha512-b5vqHFPs//PymAK1AFX+CEFts3F4YdCo/gsgo1wkCJfVpd2/EBpe6KD/PHiabS1XbA3DYvlDWL/lTrYbdnpyyw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 15085f7718..b4c4595d71 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.7",
-    "@budibase/pro": "2.3.18-alpha.6",
+    "@budibase/pro": "2.3.18-alpha.7",
     "@budibase/string-templates": "2.3.18-alpha.7",
     "@budibase/types": "2.3.18-alpha.7",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 7d296fe01b..6faf55532f 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.6.tgz#e6b3304e96b9469f3ca0f4fcfda8cf234c37e2d7"
-  integrity sha512-To0kFbB9nZ6p0UO4ScS4PJ0gbqI1PrMWRXJLTv/6GU3PxnsqvH1tbpcleLMz2zeE04e5xdwt6W1oPViELom2gg==
+"@budibase/backend-core@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.7.tgz#3407df3d6744b5d1e9fe03e1557102fe4fb0f914"
+  integrity sha512-satGbpr+giJQFUmgjNEzHvqXxEHa3M89y/w2nKfYboPrjq4odHrnQI1N/fX/tcjmWIUwU0/dfgVm4EJuCvWCRw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.6"
+    "@budibase/types" "2.3.18-alpha.7"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.6.tgz#7c5c221da7da79af79605a00aacac5c60f209bf6"
-  integrity sha512-YWPxmZn+z3tm5GZ+2UZSkOAhamlue/dmki+FCML5pIp3dCw8KsXnpzYXHRc1F8yXMTmA/8KBb/YkjQ2WK3Rk7A==
+"@budibase/pro@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.7.tgz#c0746d624665a81b6c1ea55ff95789e67fe4aa81"
+  integrity sha512-h3bMjoLkpl6n8xtkEHuaLu/SVN4QmzetyAug6iKC5tIGsz59XMrevMLD4xvsoa/2lr8Qp2WZSyRpk47cG+fflg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.6"
-    "@budibase/types" "2.3.18-alpha.6"
+    "@budibase/backend-core" "2.3.18-alpha.7"
+    "@budibase/types" "2.3.18-alpha.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.6":
-  version "2.3.18-alpha.6"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.6.tgz#9438ee64008668bbcb3d688b189cc649e03dfd60"
-  integrity sha512-16YtXwSODS8UDhdxCP2piGDWELP05EZuPbwLsOUFLX3Gt0+Wwkme+XWw4pTPE+GoK/mTVkDxzSc4cvuXWtfxxA==
+"@budibase/types@2.3.18-alpha.7":
+  version "2.3.18-alpha.7"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.7.tgz#f98414de18db9948938f74322ca26ef4af6c3100"
+  integrity sha512-b5vqHFPs//PymAK1AFX+CEFts3F4YdCo/gsgo1wkCJfVpd2/EBpe6KD/PHiabS1XbA3DYvlDWL/lTrYbdnpyyw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From a713199ddc9bdaf2eb0b410eb9cefcf24d71cfdf Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 13:00:29 +0000
Subject: [PATCH 119/273] update filter positioning

---
 .../portal/account/auditLogs/index.svelte     | 138 +++++++++---------
 1 file changed, 67 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 34c50f3354..b4daec9bd5 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -16,6 +16,7 @@
     Pagination,
     Helpers,
     Divider,
+    ActionButton,
   } from "@budibase/bbui"
   import { licensing, users, apps, auditLogs } from "stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
@@ -32,7 +33,7 @@
     user: { width: "auto" },
     app: { width: "auto" },
     name: { width: "0.8fr" },
-    view: { width: "auto", borderLeft: true, displayName: "" },
+    view: { width: "0.1fr", borderLeft: true, displayName: "" },
   }
 
   const customRenderers = [
@@ -227,69 +228,65 @@
   <div class="datepicker" />
 
   <div class="controls">
-    <div class="search">
-      <div>
-        <DatePicker
-          range={true}
-          label="Date Range"
-          on:change={e => {
-            if (e.detail[0]?.length === 1) {
-              startDate = e.detail[0][0].toISOString()
-            } else if (e.detail[0]?.length > 1) {
-              startDate = e.detail[0][0].toISOString()
-              endDate = e.detail[0][1].toISOString()
-            } else {
-              startDate = null
-              endDate = null
-            }
-          }}
-        />
-      </div>
-      <div class="select">
-        <Multiselect
-          bind:fetchTerm={userSearchTerm}
-          placeholder="All users"
-          label="Users"
-          autocomplete
-          bind:value={selectedUsers}
-          getOptionValue={user => user._id}
-          getOptionLabel={user => user.email}
-          options={sortedList}
-        />
-      </div>
-      <div class="select">
-        <Multiselect
-          autocomplete
-          placeholder="All apps"
-          label="App"
-          getOptionValue={app => app.instance._id}
-          getOptionLabel={app => app.name}
-          options={$apps}
-          bind:value={selectedApps}
-        />
-      </div>
-      <div class="select">
-        <Multiselect
-          customPopoverHeight="500px"
-          autocomplete
-          getOptionValue={event => event[0]}
-          getOptionLabel={event => event[1]}
-          options={Object.entries($auditLogs.events)}
-          placeholder="All events"
-          label="Event"
-          bind:value={selectedEvents}
-        />
-      </div>
+    <div class="select">
+      <Multiselect
+        bind:fetchTerm={userSearchTerm}
+        placeholder="All users"
+        label="Users"
+        autocomplete
+        bind:value={selectedUsers}
+        getOptionValue={user => user._id}
+        getOptionLabel={user => user.email}
+        options={sortedList}
+      />
     </div>
-    <div style="max-width: 150px; ">
+    <div class="select">
+      <Multiselect
+        autocomplete
+        placeholder="All apps"
+        label="App"
+        getOptionValue={app => app.instance._id}
+        getOptionLabel={app => app.name}
+        options={$apps}
+        bind:value={selectedApps}
+      />
+    </div>
+    <div class="select">
+      <Multiselect
+        customPopoverHeight="500px"
+        autocomplete
+        getOptionValue={event => event[0]}
+        getOptionLabel={event => event[1]}
+        options={Object.entries($auditLogs.events)}
+        placeholder="All events"
+        label="Event"
+        bind:value={selectedEvents}
+      />
+    </div>
+
+    <div class="date-picker">
+      <DatePicker
+        placeholder="Choose date range"
+        range={true}
+        on:change={e => {
+          if (e.detail[0]?.length === 1) {
+            startDate = e.detail[0][0].toISOString()
+          } else if (e.detail[0]?.length > 1) {
+            startDate = e.detail[0][0].toISOString()
+            endDate = e.detail[0][1].toISOString()
+          } else {
+            startDate = null
+            endDate = null
+          }
+        }}
+      />
+    </div>
+    <div class="freeSearch">
       <Search placeholder="Search" bind:value={logSearchTerm} />
     </div>
 
-    <div
-      on:click={() => downloadLogs()}
-      style="padding-bottom: var(--spacing-s)"
-    >
-      <Icon name="Download" hoverable />
+    <div class="">
+      <ActionButton size="M" icon="Download" on:click={() => downloadLogs()} />
     </div>
   </div>
   <Layout noPadding>
@@ -445,16 +442,12 @@
     font-size: 13px;
   }
 
-  .search :global(.spectrum-InputGroup) {
-    width: 100px;
-  }
-
   .controls {
     display: flex;
     flex-direction: row;
     gap: var(--spacing-l);
     flex-wrap: wrap;
-    align-items: flex-end;
+    align-items: center;
   }
 
   .side-panel-icons {
@@ -463,15 +456,18 @@
   }
 
   .select {
-    flex-basis: 130px;
+    flex-basis: calc(33.33% - 10px);
     width: 0;
     min-width: 100px;
   }
 
-  .search {
-    flex: 1 1 auto;
-    display: flex;
-    gap: var(--spacing-xl);
-    align-items: flex-end;
+  .date-picker {
+    flex-basis: calc(70% - 32px);
+    min-width: 100px;
+  }
+
+  .freeSearch {
+    flex-basis: 25%;
+    min-width: 100px;
   }
 </style>

From d3a7286711be145f52555c8e255f4ce818df01ef Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 23 Feb 2023 13:41:35 +0000
Subject: [PATCH 120/273] Configs updates: remove circular deps, dedicated
 module, typing improvements, reduce db reads

---
 packages/backend-core/src/auth/auth.ts        | 101 ++++----
 packages/backend-core/src/configs/configs.ts  | 224 ++++++++++++++++++
 packages/backend-core/src/configs/index.ts    |   1 +
 .../src/configs/tests/configs.spec.ts         | 116 +++++++++
 .../backend-core/src/db/tests/utils.spec.ts   | 133 +----------
 packages/backend-core/src/db/utils.ts         | 139 +----------
 packages/backend-core/src/environment.ts      |   7 +
 packages/backend-core/src/events/analytics.ts |  55 +----
 .../backend-core/src/events/identification.ts |   7 +-
 packages/backend-core/src/index.ts            |   1 +
 .../src/middleware/authenticated.ts           |   3 +-
 .../src/middleware/errorHandling.ts           |   1 +
 .../middleware/passport/datasource/google.ts  |  28 +--
 .../src/middleware/passport/sso/google.ts     |  12 +-
 .../src/middleware/passport/sso/oidc.ts       |   8 +-
 .../src/middleware/passport/utils.ts          |  21 +-
 .../tests/utilities/structures/sso.ts         |   1 +
 .../server/src/integrations/googlesheets.ts   |  14 +-
 .../functions/backfill/global/configs.ts      |  24 +-
 .../server/src/migrations/tests/helpers.ts    |   4 +-
 .../server/src/migrations/tests/structures.ts |   1 +
 packages/types/src/api/web/global/configs.ts  |  23 ++
 packages/types/src/api/web/global/index.ts    |   1 +
 packages/types/src/documents/global/config.ts |  43 ++--
 .../worker/src/api/controllers/global/auth.ts |  69 +++---
 .../src/api/controllers/global/configs.ts     | 219 ++++++-----------
 .../worker/src/api/routes/global/configs.ts   |   6 -
 27 files changed, 615 insertions(+), 647 deletions(-)
 create mode 100644 packages/backend-core/src/configs/configs.ts
 create mode 100644 packages/backend-core/src/configs/index.ts
 create mode 100644 packages/backend-core/src/configs/tests/configs.spec.ts
 create mode 100644 packages/types/src/api/web/global/configs.ts

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index bee245a3ae..435b6433b2 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -2,25 +2,33 @@ const _passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
 const JwtStrategy = require("passport-jwt").Strategy
 import { getGlobalDB } from "../context"
-const refresh = require("passport-oauth2-refresh")
-import { Config, Cookie } from "../constants"
-import { getScopedConfig } from "../db"
+import { Cookie } from "../constants"
 import { getSessionsForUser, invalidateSessions } from "../security/sessions"
 import {
+  authenticated,
+  csrf,
+  google,
   jwt as jwtPassport,
   local,
-  authenticated,
-  tenancy,
-  csrf,
   oidc,
-  google,
+  tenancy,
 } from "../middleware"
+import * as userCache from "../cache/user"
 import { invalidateUser } from "../cache/user"
-import { PlatformLogoutOpts, User } from "@budibase/types"
+import {
+  ConfigType,
+  GoogleInnerConfig,
+  OIDCInnerConfig,
+  PlatformLogoutOpts,
+  User,
+} from "@budibase/types"
 import { logAlert } from "../logging"
 import * as events from "../events"
-import * as userCache from "../cache/user"
+import * as configs from "../configs"
 import { clearCookie, getCookie } from "../utils"
+import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
+
+const refresh = require("passport-oauth2-refresh")
 export {
   auditLog,
   authError,
@@ -33,7 +41,6 @@ export {
   google,
   oidc,
 } from "../middleware"
-import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
 export const buildAuthMiddleware = authenticated
 export const buildTenancyMiddleware = tenancy
 export const buildCsrfMiddleware = csrf
@@ -63,11 +70,10 @@ _passport.deserializeUser(async (user: User, done: any) => {
 })
 
 async function refreshOIDCAccessToken(
-  db: any,
-  chosenConfig: any,
+  chosenConfig: OIDCInnerConfig,
   refreshToken: string
-) {
-  const callbackUrl = await oidc.getCallbackUrl(db, chosenConfig)
+): Promise<RefreshResponse> {
+  const callbackUrl = await oidc.getCallbackUrl()
   let enrichedConfig: any
   let strategy: any
 
@@ -90,7 +96,7 @@ async function refreshOIDCAccessToken(
 
   return new Promise(resolve => {
     refresh.requestNewAccessToken(
-      Config.OIDC,
+      ConfigType.OIDC,
       refreshToken,
       (err: any, accessToken: string, refreshToken: any, params: any) => {
         resolve({ err, accessToken, refreshToken, params })
@@ -100,11 +106,10 @@ async function refreshOIDCAccessToken(
 }
 
 async function refreshGoogleAccessToken(
-  db: any,
-  config: any,
+  config: GoogleInnerConfig,
   refreshToken: any
-) {
-  let callbackUrl = await google.getCallbackUrl(db, config)
+): Promise<RefreshResponse> {
+  let callbackUrl = await google.getCallbackUrl(config)
 
   let strategy
   try {
@@ -124,7 +129,7 @@ async function refreshGoogleAccessToken(
 
   return new Promise(resolve => {
     refresh.requestNewAccessToken(
-      Config.GOOGLE,
+      ConfigType.GOOGLE,
       refreshToken,
       (err: any, accessToken: string, refreshToken: string, params: any) => {
         resolve({ err, accessToken, refreshToken, params })
@@ -133,41 +138,37 @@ async function refreshGoogleAccessToken(
   })
 }
 
+interface RefreshResponse {
+  err?: {
+    data?: string
+  }
+  accessToken?: string
+  refreshToken?: string
+  params?: any
+}
+
 export async function refreshOAuthToken(
   refreshToken: string,
-  configType: string,
-  configId: string
-) {
-  const db = getGlobalDB()
-
-  const config = await getScopedConfig(db, {
-    type: configType,
-    group: {},
-  })
-
-  let chosenConfig = {}
-  let refreshResponse
-  if (configType === Config.OIDC) {
-    // configId - retrieved from cookie.
-    chosenConfig = config.configs.filter((c: any) => c.uuid === configId)[0]
-    if (!chosenConfig) {
-      throw new Error("Invalid OIDC configuration")
+  configType: ConfigType,
+  configId?: string
+): Promise<RefreshResponse> {
+  if (configType === ConfigType.OIDC && configId) {
+    const config = await configs.getOIDCConfigById(configId)
+    if (!config) {
+      return { err: { data: "OIDC configuration not found" } }
     }
-    refreshResponse = await refreshOIDCAccessToken(
-      db,
-      chosenConfig,
-      refreshToken
-    )
-  } else {
-    chosenConfig = config
-    refreshResponse = await refreshGoogleAccessToken(
-      db,
-      chosenConfig,
-      refreshToken
-    )
+    return refreshOIDCAccessToken(config, refreshToken)
   }
 
-  return refreshResponse
+  if (configType === ConfigType.GOOGLE) {
+    const config = await configs.getGoogleConfig()
+    if (!config) {
+      return { err: { data: "Google configuration not found" } }
+    }
+    return refreshGoogleAccessToken(config, refreshToken)
+  }
+
+  throw new Error(`Unsupported configType=${configType}`)
 }
 
 // TODO: Refactor to use user save function instead to prevent the need for
diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
new file mode 100644
index 0000000000..882c37ceb9
--- /dev/null
+++ b/packages/backend-core/src/configs/configs.ts
@@ -0,0 +1,224 @@
+import {
+  Config,
+  ConfigType,
+  GoogleConfig,
+  GoogleInnerConfig,
+  OIDCConfig,
+  OIDCInnerConfig,
+  SettingsConfig,
+  SettingsInnerConfig,
+  SMTPConfig,
+  SMTPInnerConfig,
+} from "@budibase/types"
+import { DocumentType, SEPARATOR } from "../constants"
+import { CacheKey, TTL, withCache } from "../cache"
+import * as context from "../context"
+import env from "../environment"
+import environment from "../environment"
+
+// UTILS
+
+/**
+ * Generates a new configuration ID.
+ * @returns {string} The new configuration ID which the config doc can be stored under.
+ */
+export function generateConfigID(type: ConfigType) {
+  return `${DocumentType.CONFIG}${SEPARATOR}${type}`
+}
+
+export async function getConfig<T extends Config>(
+  type: ConfigType
+): Promise<T | undefined> {
+  const db = context.getGlobalDB()
+  try {
+    // await to catch error
+    const config = (await db.get(generateConfigID(type))) as T
+    return config
+  } catch (e: any) {
+    if (e.status === 404) {
+      return
+    }
+    throw e
+  }
+}
+
+export async function save(config: Config) {
+  const db = context.getGlobalDB()
+  return db.put(config)
+}
+
+// SETTINGS
+
+export async function getSettingsConfigDoc(): Promise<SettingsConfig> {
+  let config = await getConfig<SettingsConfig>(ConfigType.SETTINGS)
+
+  if (!config) {
+    config = {
+      _id: generateConfigID(ConfigType.GOOGLE),
+      type: ConfigType.SETTINGS,
+      config: {},
+    }
+  }
+
+  // overridden fields
+  config.config.platformUrl = await getPlatformUrl({
+    tenantAware: true,
+    config: config.config,
+  })
+  config.config.analyticsEnabled = await analyticsEnabled({
+    config: config.config,
+  })
+
+  return config
+}
+
+export async function getSettingsConfig(): Promise<SettingsInnerConfig> {
+  return (await getSettingsConfigDoc()).config
+}
+
+export async function getPlatformUrl(
+  opts: { tenantAware: boolean; config?: SettingsInnerConfig } = {
+    tenantAware: true,
+  }
+) {
+  let platformUrl = env.PLATFORM_URL || "http://localhost:10000"
+
+  if (!env.SELF_HOSTED && env.MULTI_TENANCY && opts.tenantAware) {
+    // cloud and multi tenant - add the tenant to the default platform url
+    const tenantId = context.getTenantId()
+    if (!platformUrl.includes("localhost:")) {
+      platformUrl = platformUrl.replace("://", `://${tenantId}.`)
+    }
+  } else if (env.SELF_HOSTED) {
+    const config = opts?.config
+      ? opts.config
+      : // direct to db to prevent infinite loop
+        (await getConfig<SettingsConfig>(ConfigType.SETTINGS))?.config
+    if (config?.platformUrl) {
+      platformUrl = config.platformUrl
+    }
+  }
+
+  return platformUrl
+}
+
+export const analyticsEnabled = async (opts?: {
+  config?: SettingsInnerConfig
+}) => {
+  // cloud - always use the environment variable
+  if (!env.SELF_HOSTED) {
+    return !!env.ENABLE_ANALYTICS
+  }
+
+  // self host - prefer the settings doc
+  // use cache as events have high throughput
+  const enabledInDB = await withCache(
+    CacheKey.ANALYTICS_ENABLED,
+    TTL.ONE_DAY,
+    async () => {
+      const config = opts?.config
+        ? opts.config
+        : // direct to db to prevent infinite loop
+          (await getConfig<SettingsConfig>(ConfigType.SETTINGS))?.config
+
+      // need to do explicit checks in case the field is not set
+      if (config?.analyticsEnabled === false) {
+        return false
+      } else if (config?.analyticsEnabled === true) {
+        return true
+      }
+    }
+  )
+
+  if (enabledInDB !== undefined) {
+    return enabledInDB
+  }
+
+  // fallback to the environment variable
+  // explicitly check for 0 or false here, undefined or otherwise is treated as true
+  const envEnabled: any = env.ENABLE_ANALYTICS
+  if (envEnabled === 0 || envEnabled === false) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// GOOGLE
+
+async function getGoogleConfigDoc(): Promise<GoogleConfig | undefined> {
+  return await getConfig<GoogleConfig>(ConfigType.GOOGLE)
+}
+
+export async function getGoogleConfig(): Promise<
+  GoogleInnerConfig | undefined
+> {
+  const config = await getGoogleConfigDoc()
+  if (config) {
+    return config.config
+  }
+
+  // Use google fallback configuration from env variables
+  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
+    return {
+      clientID: environment.GOOGLE_CLIENT_ID!,
+      clientSecret: environment.GOOGLE_CLIENT_SECRET!,
+      activated: true,
+    }
+  }
+}
+
+// OIDC
+
+async function getOIDCConfigDoc(): Promise<OIDCConfig | undefined> {
+  return getConfig<OIDCConfig>(ConfigType.OIDC)
+}
+
+export async function getOIDCConfig(): Promise<OIDCInnerConfig | undefined> {
+  const config = (await getOIDCConfigDoc())?.config
+  // default to the 0th config
+  return config?.configs && config.configs[0]
+}
+
+/**
+ * @param configId The config id of the inner config to retrieve
+ */
+export async function getOIDCConfigById(
+  configId: string
+): Promise<OIDCInnerConfig | undefined> {
+  const config = (await getConfig<OIDCConfig>(ConfigType.OIDC))?.config
+  return config && config.configs.filter((c: any) => c.uuid === configId)[0]
+}
+
+// SMTP
+
+export async function getSMTPConfigDoc(): Promise<SMTPConfig | undefined> {
+  return getConfig<SMTPConfig>(ConfigType.SMTP)
+}
+
+export async function getSMTPConfig(
+  isAutomation?: boolean
+): Promise<SMTPInnerConfig | undefined> {
+  const config = await getSMTPConfigDoc()
+  if (config) {
+    return config.config
+  }
+
+  // always allow fallback in self host
+  // in cloud don't allow for automations
+  const allowFallback = env.SELF_HOSTED || !isAutomation
+
+  // Use an SMTP fallback configuration from env variables
+  if (env.SMTP_FALLBACK_ENABLED && allowFallback) {
+    return {
+      port: env.SMTP_PORT,
+      host: env.SMTP_HOST!,
+      secure: false,
+      from: env.SMTP_FROM_ADDRESS!,
+      auth: {
+        user: env.SMTP_USER!,
+        pass: env.SMTP_PASSWORD!,
+      },
+    }
+  }
+}
diff --git a/packages/backend-core/src/configs/index.ts b/packages/backend-core/src/configs/index.ts
new file mode 100644
index 0000000000..783f22a0b9
--- /dev/null
+++ b/packages/backend-core/src/configs/index.ts
@@ -0,0 +1 @@
+export * from "./configs"
diff --git a/packages/backend-core/src/configs/tests/configs.spec.ts b/packages/backend-core/src/configs/tests/configs.spec.ts
new file mode 100644
index 0000000000..079f2ab681
--- /dev/null
+++ b/packages/backend-core/src/configs/tests/configs.spec.ts
@@ -0,0 +1,116 @@
+import { DBTestConfiguration, generator, testEnv } from "../../../tests"
+import { ConfigType } from "@budibase/types"
+import env from "../../environment"
+import * as configs from "../configs"
+
+const DEFAULT_URL = "http://localhost:10000"
+const ENV_URL = "http://env.com"
+
+describe("configs", () => {
+  const config = new DBTestConfiguration()
+
+  const setDbPlatformUrl = async (dbUrl: string) => {
+    const settingsConfig = {
+      _id: configs.generateConfigID(ConfigType.SETTINGS),
+      type: ConfigType.SETTINGS,
+      config: {
+        platformUrl: dbUrl,
+      },
+    }
+    await configs.save(settingsConfig)
+  }
+
+  beforeEach(async () => {
+    config.newTenant()
+  })
+
+  describe("getPlatformUrl", () => {
+    describe("self host", () => {
+      beforeEach(async () => {
+        testEnv.selfHosted()
+      })
+
+      it("gets the default url", async () => {
+        await config.doInTenant(async () => {
+          const url = await configs.getPlatformUrl()
+          expect(url).toBe(DEFAULT_URL)
+        })
+      })
+
+      it("gets the platform url from the environment", async () => {
+        await config.doInTenant(async () => {
+          env._set("PLATFORM_URL", ENV_URL)
+          const url = await configs.getPlatformUrl()
+          expect(url).toBe(ENV_URL)
+        })
+      })
+
+      it("gets the platform url from the database", async () => {
+        await config.doInTenant(async () => {
+          const dbUrl = generator.url()
+          await setDbPlatformUrl(dbUrl)
+          const url = await configs.getPlatformUrl()
+          expect(url).toBe(dbUrl)
+        })
+      })
+    })
+
+    describe("cloud", () => {
+      function getTenantAwareUrl() {
+        return `http://${config.tenantId}.env.com`
+      }
+
+      beforeEach(async () => {
+        testEnv.cloudHosted()
+        testEnv.multiTenant()
+
+        env._set("PLATFORM_URL", ENV_URL)
+      })
+
+      it("gets the platform url from the environment without tenancy", async () => {
+        await config.doInTenant(async () => {
+          const url = await configs.getPlatformUrl({ tenantAware: false })
+          expect(url).toBe(ENV_URL)
+        })
+      })
+
+      it("gets the platform url from the environment with tenancy", async () => {
+        await config.doInTenant(async () => {
+          const url = await configs.getPlatformUrl()
+          expect(url).toBe(getTenantAwareUrl())
+        })
+      })
+
+      it("never gets the platform url from the database", async () => {
+        await config.doInTenant(async () => {
+          await setDbPlatformUrl(generator.url())
+          const url = await configs.getPlatformUrl()
+          expect(url).toBe(getTenantAwareUrl())
+        })
+      })
+    })
+  })
+
+  describe("getSettingsConfig", () => {
+    beforeAll(async () => {
+      testEnv.selfHosted()
+      env._set("PLATFORM_URL", "")
+    })
+
+    it("returns the platform url with an existing config", async () => {
+      await config.doInTenant(async () => {
+        const dbUrl = generator.url()
+        await setDbPlatformUrl(dbUrl)
+        const config = await configs.getSettingsConfig()
+        expect(config.platformUrl).toBe(dbUrl)
+      })
+    })
+
+    it("returns the platform url without an existing config", async () => {
+      await config.doInTenant(async () => {
+        const config = await configs.getSettingsConfig()
+        expect(config.platformUrl).toBe(DEFAULT_URL)
+      })
+    })
+  })
+})
diff --git a/packages/backend-core/src/db/tests/utils.spec.ts b/packages/backend-core/src/db/tests/utils.spec.ts
index 7bdca5ae8b..138457c65e 100644
--- a/packages/backend-core/src/db/tests/utils.spec.ts
+++ b/packages/backend-core/src/db/tests/utils.spec.ts
@@ -1,19 +1,13 @@
-import { generator, DBTestConfiguration, testEnv } from "../../../tests"
 import {
   getDevelopmentAppID,
   getProdAppID,
   isDevAppID,
   isProdAppID,
 } from "../conversions"
-import { generateAppID, getPlatformUrl, getScopedConfig } from "../utils"
-import * as context from "../../context"
-import { Config } from "../../constants"
-import env from "../../environment"
+import { generateAppID } from "../utils"
 
 describe("utils", () => {
-  const config = new DBTestConfiguration()
-
-  describe("app ID manipulation", () => {
+  describe("generateAppID", () => {
     function getID() {
       const appId = generateAppID()
       const split = appId.split("_")
@@ -66,127 +60,4 @@ describe("utils", () => {
       expect(isProdAppID(devAppId)).toEqual(false)
     })
   })
-
-  const DEFAULT_URL = "http://localhost:10000"
-  const ENV_URL = "http://env.com"
-
-  const setDbPlatformUrl = async (dbUrl: string) => {
-    const db = context.getGlobalDB()
-    await db.put({
-      _id: "config_settings",
-      type: Config.SETTINGS,
-      config: {
-        platformUrl: dbUrl,
-      },
-    })
-  }
-
-  const clearSettingsConfig = async () => {
-    await config.doInTenant(async () => {
-      const db = context.getGlobalDB()
-      try {
-        const config = await db.get("config_settings")
-        await db.remove("config_settings", config._rev)
-      } catch (e: any) {
-        if (e.status !== 404) {
-          throw e
-        }
-      }
-    })
-  }
-
-  describe("getPlatformUrl", () => {
-    describe("self host", () => {
-      beforeEach(async () => {
-        testEnv.selfHosted()
-        await clearSettingsConfig()
-      })
-
-      it("gets the default url", async () => {
-        await config.doInTenant(async () => {
-          const url = await getPlatformUrl()
-          expect(url).toBe(DEFAULT_URL)
-        })
-      })
-
-      it("gets the platform url from the environment", async () => {
-        await config.doInTenant(async () => {
-          env._set("PLATFORM_URL", ENV_URL)
-          const url = await getPlatformUrl()
-          expect(url).toBe(ENV_URL)
-        })
-      })
-
-      it("gets the platform url from the database", async () => {
-        await config.doInTenant(async () => {
-          const dbUrl = generator.url()
-          await setDbPlatformUrl(dbUrl)
-          const url = await getPlatformUrl()
-          expect(url).toBe(dbUrl)
-        })
-      })
-    })
-
-    describe("cloud", () => {
-      const TENANT_AWARE_URL = `http://${config.tenantId}.env.com`
-
-      beforeEach(async () => {
-        testEnv.cloudHosted()
-        testEnv.multiTenant()
-
-        env._set("PLATFORM_URL", ENV_URL)
-        await clearSettingsConfig()
-      })
-
-      it("gets the platform url from the environment without tenancy", async () => {
-        await config.doInTenant(async () => {
-          const url = await getPlatformUrl({ tenantAware: false })
-          expect(url).toBe(ENV_URL)
-        })
-      })
-
-      it("gets the platform url from the environment with tenancy", async () => {
-        await config.doInTenant(async () => {
-          const url = await getPlatformUrl()
-          expect(url).toBe(TENANT_AWARE_URL)
-        })
-      })
-
-      it("never gets the platform url from the database", async () => {
-        await config.doInTenant(async () => {
-          await setDbPlatformUrl(generator.url())
-          const url = await getPlatformUrl()
-          expect(url).toBe(TENANT_AWARE_URL)
-        })
-      })
-    })
-  })
-
-  describe("getScopedConfig", () => {
-    describe("settings config", () => {
-      beforeEach(async () => {
-        env._set("SELF_HOSTED", 1)
-        env._set("PLATFORM_URL", "")
-        await clearSettingsConfig()
-      })
-
-      it("returns the platform url with an existing config", async () => {
-        await config.doInTenant(async () => {
-          const dbUrl = generator.url()
-          await setDbPlatformUrl(dbUrl)
-          const db = context.getGlobalDB()
-          const config = await getScopedConfig(db, { type: Config.SETTINGS })
-          expect(config.platformUrl).toBe(dbUrl)
-        })
-      })
-
-      it("returns the platform url without an existing config", async () => {
-        await config.doInTenant(async () => {
-          const db = context.getGlobalDB()
-          const config = await getScopedConfig(db, { type: Config.SETTINGS })
-          expect(config.platformUrl).toBe(DEFAULT_URL)
-        })
-      })
-    })
-  })
 })
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index 233d044eaa..948b59b13a 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -9,12 +9,11 @@ import {
   InternalTable,
   APP_PREFIX,
 } from "../constants"
-import { getTenantId, getGlobalDB, getGlobalDBName } from "../context"
+import { getTenantId, getGlobalDBName } from "../context"
 import { doWithDB, directCouchAllDbs } from "./db"
 import { getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "./conversions"
-import * as events from "../events"
-import { App, Database, ConfigType, isSettingsConfig } from "@budibase/types"
+import { App, Database } from "@budibase/types"
 
 /**
  * Generates a new app ID.
@@ -392,32 +391,6 @@ export async function dbExists(dbName: any) {
   )
 }
 
-/**
- * Generates a new configuration ID.
- * @returns {string} The new configuration ID which the config doc can be stored under.
- */
-export const generateConfigID = ({ type, workspace, user }: any) => {
-  const scope = [type, workspace, user].filter(Boolean).join(SEPARATOR)
-
-  return `${DocumentType.CONFIG}${SEPARATOR}${scope}`
-}
-
-/**
- * Gets parameters for retrieving configurations.
- */
-export const getConfigParams = (
-  { type, workspace, user }: any,
-  otherProps = {}
-) => {
-  const scope = [type, workspace, user].filter(Boolean).join(SEPARATOR)
-
-  return {
-    ...otherProps,
-    startkey: `${DocumentType.CONFIG}${SEPARATOR}${scope}`,
-    endkey: `${DocumentType.CONFIG}${SEPARATOR}${scope}${UNICODE_MAX}`,
-  }
-}
-
 /**
  * Generates a new dev info document ID - this is scoped to a user.
  * @returns {string} The new dev info ID which info for dev (like api key) can be stored under.
@@ -441,109 +414,6 @@ export const getPluginParams = (pluginId?: string | null, otherProps = {}) => {
   return getDocParams(DocumentType.PLUGIN, pluginId, otherProps)
 }
 
-/**
- * Returns the most granular configuration document from the DB based on the type, workspace and userID passed.
- * @param {Object} db - db instance to query
- * @param {Object} scopes - the type, workspace and userID scopes of the configuration.
- * @returns The most granular configuration document based on the scope.
- */
-export const getScopedFullConfig = async function (
-  db: any,
-  { type, user, workspace }: any
-) {
-  const response = await db.allDocs(
-    getConfigParams(
-      { type, user, workspace },
-      {
-        include_docs: true,
-      }
-    )
-  )
-
-  function determineScore(row: any) {
-    const config = row.doc
-
-    // Config is specific to a user and a workspace
-    if (config._id.includes(generateConfigID({ type, user, workspace }))) {
-      return 4
-    } else if (config._id.includes(generateConfigID({ type, user }))) {
-      // Config is specific to a user only
-      return 3
-    } else if (config._id.includes(generateConfigID({ type, workspace }))) {
-      // Config is specific to a workspace only
-      return 2
-    } else if (config._id.includes(generateConfigID({ type }))) {
-      // Config is specific to a type only
-      return 1
-    }
-    return 0
-  }
-
-  // Find the config with the most granular scope based on context
-  let scopedConfig = response.rows.sort(
-    (a: any, b: any) => determineScore(a) - determineScore(b)
-  )[0]
-
-  // custom logic for settings doc
-  if (type === ConfigType.SETTINGS) {
-    if (!scopedConfig || !scopedConfig.doc) {
-      // defaults
-      scopedConfig = {
-        doc: {
-          _id: generateConfigID({ type, user, workspace }),
-          type: ConfigType.SETTINGS,
-          config: {
-            platformUrl: await getPlatformUrl({ tenantAware: true }),
-            analyticsEnabled: await events.analytics.enabled(),
-          },
-        },
-      }
-    }
-
-    // will always be true - use assertion function to get type access
-    if (isSettingsConfig(scopedConfig.doc)) {
-      // overrides affected by environment
-      scopedConfig.doc.config.platformUrl = await getPlatformUrl({
-        tenantAware: true,
-      })
-      scopedConfig.doc.config.analyticsEnabled =
-        await events.analytics.enabled()
-    }
-  }
-
-  return scopedConfig && scopedConfig.doc
-}
-
-export const getPlatformUrl = async (opts = { tenantAware: true }) => {
-  let platformUrl = env.PLATFORM_URL || "http://localhost:10000"
-
-  if (!env.SELF_HOSTED && env.MULTI_TENANCY && opts.tenantAware) {
-    // cloud and multi tenant - add the tenant to the default platform url
-    const tenantId = getTenantId()
-    if (!platformUrl.includes("localhost:")) {
-      platformUrl = platformUrl.replace("://", `://${tenantId}.`)
-    }
-  } else if (env.SELF_HOSTED) {
-    const db = getGlobalDB()
-    // get the doc directly instead of with getScopedConfig to prevent loop
-    let settings
-    try {
-      settings = await db.get(generateConfigID({ type: ConfigType.SETTINGS }))
-    } catch (e: any) {
-      if (e.status !== 404) {
-        throw e
-      }
-    }
-
-    // self hosted - check for platform url override
-    if (settings && settings.config && settings.config.platformUrl) {
-      platformUrl = settings.config.platformUrl
-    }
-  }
-
-  return platformUrl
-}
-
 export function pagination(
   data: any[],
   pageSize: number,
@@ -577,8 +447,3 @@ export function pagination(
     nextPage,
   }
 }
-
-export async function getScopedConfig(db: any, params: any) {
-  const configDoc = await getScopedFullConfig(db, params)
-  return configDoc && configDoc.config ? configDoc.config : configDoc
-}
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index ed7a161160..d565606133 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -84,6 +84,13 @@ const environment = {
   DEPLOYMENT_ENVIRONMENT:
     process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
   ENABLE_4XX_HTTP_LOGGING: process.env.ENABLE_4XX_HTTP_LOGGING || true,
+  // smtp
+  SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
+  SMTP_USER: process.env.SMTP_USER,
+  SMTP_PASSWORD: process.env.SMTP_PASSWORD,
+  SMTP_HOST: process.env.SMTP_HOST,
+  SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
+  SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/backend-core/src/events/analytics.ts b/packages/backend-core/src/events/analytics.ts
index 7fbc6d9c2b..dcfd6d5104 100644
--- a/packages/backend-core/src/events/analytics.ts
+++ b/packages/backend-core/src/events/analytics.ts
@@ -1,55 +1,6 @@
-import env from "../environment"
-import * as context from "../context"
-import * as dbUtils from "../db/utils"
-import { Config } from "../constants"
-import { withCache, TTL, CacheKey } from "../cache"
+import * as configs from "../configs"
 
+// wrapper utility function
 export const enabled = async () => {
-  // cloud - always use the environment variable
-  if (!env.SELF_HOSTED) {
-    return !!env.ENABLE_ANALYTICS
-  }
-
-  // self host - prefer the settings doc
-  // use cache as events have high throughput
-  const enabledInDB = await withCache(
-    CacheKey.ANALYTICS_ENABLED,
-    TTL.ONE_DAY,
-    async () => {
-      const settings = await getSettingsDoc()
-
-      // need to do explicit checks in case the field is not set
-      if (settings?.config?.analyticsEnabled === false) {
-        return false
-      } else if (settings?.config?.analyticsEnabled === true) {
-        return true
-      }
-    }
-  )
-
-  if (enabledInDB !== undefined) {
-    return enabledInDB
-  }
-
-  // fallback to the environment variable
-  // explicitly check for 0 or false here, undefined or otherwise is treated as true
-  const envEnabled: any = env.ENABLE_ANALYTICS
-  if (envEnabled === 0 || envEnabled === false) {
-    return false
-  } else {
-    return true
-  }
-}
-
-const getSettingsDoc = async () => {
-  const db = context.getGlobalDB()
-  let settings
-  try {
-    settings = await db.get(dbUtils.generateConfigID({ type: Config.SETTINGS }))
-  } catch (e: any) {
-    if (e.status !== 404) {
-      throw e
-    }
-  }
-  return settings
+  return configs.analyticsEnabled()
 }
diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index 7cade9e14b..75cd4ae7ec 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -19,10 +19,9 @@ import {
   isSSOUser,
 } from "@budibase/types"
 import { processors } from "./processors"
-import * as dbUtils from "../db/utils"
-import { Config } from "../constants"
 import { newid } from "../utils"
 import * as installation from "../installation"
+import * as configs from "../configs"
 import { withCache, TTL, CacheKey } from "../cache/generic"
 
 const pkg = require("../../package.json")
@@ -270,9 +269,7 @@ const getUniqueTenantId = async (tenantId: string): Promise<string> => {
   return context.doInTenant(tenantId, () => {
     return withCache(CacheKey.UNIQUE_TENANT_ID, TTL.ONE_DAY, async () => {
       const db = context.getGlobalDB()
-      const config: SettingsConfig = await dbUtils.getScopedFullConfig(db, {
-        type: Config.SETTINGS,
-      })
+      const config = await configs.getSettingsConfigDoc()
 
       let uniqueTenantId: string
       if (config.config.uniqueTenantId) {
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index d507d8175f..601b14a661 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -1,3 +1,4 @@
+export * as configs from "./configs"
 export * as events from "./events"
 export * as migrations from "./migrations"
 export * as users from "./users"
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index 4bb2aaba76..23fb87df8b 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -115,7 +115,8 @@ export default function (
           authenticated = true
         } catch (err: any) {
           authenticated = false
-          console.error("Auth Error", err?.message || err)
+          console.error(`Auth Error: ${err.message}`)
+          console.error(err)
           // remove the cookie as the user does not exist anymore
           clearCookie(ctx, Cookie.Auth)
         }
diff --git a/packages/backend-core/src/middleware/errorHandling.ts b/packages/backend-core/src/middleware/errorHandling.ts
index 5ac70c33e5..36aff2cdbc 100644
--- a/packages/backend-core/src/middleware/errorHandling.ts
+++ b/packages/backend-core/src/middleware/errorHandling.ts
@@ -11,6 +11,7 @@ export async function errorHandling(ctx: any, next: any) {
 
     if (status > 499 || env.ENABLE_4XX_HTTP_LOGGING) {
       ctx.log.error(err)
+      console.trace(err)
     }
 
     const error = errors.getPublicError(err)
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index 112f8d2096..ff5224e437 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -1,9 +1,8 @@
 import * as google from "../sso/google"
-import { Cookie, Config } from "../../../constants"
+import { Cookie } from "../../../constants"
 import { clearCookie, getCookie } from "../../../utils"
-import { getScopedConfig, getPlatformUrl, doWithDB } from "../../../db"
-import environment from "../../../environment"
-import { getGlobalDB } from "../../../context"
+import { doWithDB } from "../../../db"
+import * as configs from "../../../configs"
 import { BBContext, Database, SSOProfile } from "@budibase/types"
 import { ssoSaveUserNoOp } from "../sso/sso"
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
@@ -13,18 +12,11 @@ type Passport = {
 }
 
 async function fetchGoogleCreds() {
-  // try and get the config from the tenant
-  const db = getGlobalDB()
-  const googleConfig = await getScopedConfig(db, {
-    type: Config.GOOGLE,
-  })
-  // or fall back to env variables
-  return (
-    googleConfig || {
-      clientID: environment.GOOGLE_CLIENT_ID,
-      clientSecret: environment.GOOGLE_CLIENT_SECRET,
-    }
-  )
+  const config = await configs.getGoogleConfig()
+  if (!config) {
+    throw new Error("No google configuration found")
+  }
+  return config
 }
 
 export async function preAuth(
@@ -34,7 +26,7 @@ export async function preAuth(
 ) {
   // get the relevant config
   const googleConfig = await fetchGoogleCreds()
-  const platformUrl = await getPlatformUrl({ tenantAware: false })
+  const platformUrl = await configs.getPlatformUrl({ tenantAware: false })
 
   let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`
   const strategy = await google.strategyFactory(
@@ -61,7 +53,7 @@ export async function postAuth(
 ) {
   // get the relevant config
   const config = await fetchGoogleCreds()
-  const platformUrl = await getPlatformUrl({ tenantAware: false })
+  const platformUrl = await configs.getPlatformUrl({ tenantAware: false })
 
   let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`
   const authStateCookie = getCookie(ctx, Cookie.DatasourceAuth)
diff --git a/packages/backend-core/src/middleware/passport/sso/google.ts b/packages/backend-core/src/middleware/passport/sso/google.ts
index d26d7d6a8d..ad7593e63d 100644
--- a/packages/backend-core/src/middleware/passport/sso/google.ts
+++ b/packages/backend-core/src/middleware/passport/sso/google.ts
@@ -2,12 +2,11 @@ import { ssoCallbackUrl } from "../utils"
 import * as sso from "./sso"
 import {
   ConfigType,
-  GoogleConfig,
-  Database,
   SSOProfile,
   SSOAuthDetails,
   SSOProviderType,
   SaveSSOUserFunction,
+  GoogleInnerConfig,
 } from "@budibase/types"
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 
@@ -45,7 +44,7 @@ export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
  * @returns Dynamically configured Passport Google Strategy
  */
 export async function strategyFactory(
-  config: GoogleConfig["config"],
+  config: GoogleInnerConfig,
   callbackUrl: string,
   saveUserFn: SaveSSOUserFunction
 ) {
@@ -73,9 +72,6 @@ export async function strategyFactory(
   }
 }
 
-export async function getCallbackUrl(
-  db: Database,
-  config: { callbackURL?: string }
-) {
-  return ssoCallbackUrl(db, config, ConfigType.GOOGLE)
+export async function getCallbackUrl(config: GoogleInnerConfig) {
+  return ssoCallbackUrl(ConfigType.GOOGLE, config)
 }
diff --git a/packages/backend-core/src/middleware/passport/sso/oidc.ts b/packages/backend-core/src/middleware/passport/sso/oidc.ts
index 1fb44b84a3..b6d5eb52e9 100644
--- a/packages/backend-core/src/middleware/passport/sso/oidc.ts
+++ b/packages/backend-core/src/middleware/passport/sso/oidc.ts
@@ -4,7 +4,6 @@ import { ssoCallbackUrl } from "../utils"
 import {
   ConfigType,
   OIDCInnerConfig,
-  Database,
   SSOProfile,
   OIDCStrategyConfiguration,
   SSOAuthDetails,
@@ -157,9 +156,6 @@ export async function fetchStrategyConfig(
   }
 }
 
-export async function getCallbackUrl(
-  db: Database,
-  config: { callbackURL?: string }
-) {
-  return ssoCallbackUrl(db, config, ConfigType.OIDC)
+export async function getCallbackUrl() {
+  return ssoCallbackUrl(ConfigType.OIDC)
 }
diff --git a/packages/backend-core/src/middleware/passport/utils.ts b/packages/backend-core/src/middleware/passport/utils.ts
index 6eb3bc29d1..7e0d3863a0 100644
--- a/packages/backend-core/src/middleware/passport/utils.ts
+++ b/packages/backend-core/src/middleware/passport/utils.ts
@@ -1,6 +1,6 @@
-import { isMultiTenant, getTenantId } from "../../context"
-import { getScopedConfig } from "../../db"
-import { ConfigType, Database } from "@budibase/types"
+import { getTenantId, isMultiTenant } from "../../context"
+import * as configs from "../../configs"
+import { ConfigType, GoogleInnerConfig } from "@budibase/types"
 
 /**
  * Utility to handle authentication errors.
@@ -19,17 +19,14 @@ export function authError(done: Function, message: string, err?: any) {
 }
 
 export async function ssoCallbackUrl(
-  db: Database,
-  config?: { callbackURL?: string },
-  type?: ConfigType
+  type: ConfigType,
+  config?: GoogleInnerConfig
 ) {
   // incase there is a callback URL from before
-  if (config && config.callbackURL) {
-    return config.callbackURL
+  if (config && (config as GoogleInnerConfig).callbackURL) {
+    return (config as GoogleInnerConfig).callbackURL as string
   }
-  const publicConfig = await getScopedConfig(db, {
-    type: ConfigType.SETTINGS,
-  })
+  const settingsConfig = await configs.getSettingsConfig()
 
   let callbackUrl = `/api/global/auth`
   if (isMultiTenant()) {
@@ -37,5 +34,5 @@ export async function ssoCallbackUrl(
   }
   callbackUrl += `/${type}/callback`
 
-  return `${publicConfig.platformUrl}${callbackUrl}`
+  return `${settingsConfig.platformUrl}${callbackUrl}`
 }
diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts
index ad5e8e87ef..a63d26cbb3 100644
--- a/packages/backend-core/tests/utilities/structures/sso.ts
+++ b/packages/backend-core/tests/utilities/structures/sso.ts
@@ -69,6 +69,7 @@ export function oidcConfig(): OIDCInnerConfig {
     configUrl: "http://someconfigurl",
     clientID: generator.string(),
     clientSecret: generator.string(),
+    scopes: [],
   }
 }
 
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index d3caf0b944..2b54123bdb 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -11,8 +11,7 @@ import { OAuth2Client } from "google-auth-library"
 import { buildExternalTableId } from "./utils"
 import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
-import env from "../environment"
-import { tenancy, db as dbCore, constants } from "@budibase/backend-core"
+import { configs, HTTPError } from "@budibase/backend-core"
 const fetch = require("node-fetch")
 
 interface GoogleSheetsConfig {
@@ -173,16 +172,9 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async connect() {
     try {
       // Initialise oAuth client
-      const db = tenancy.getGlobalDB()
-      let googleConfig = await dbCore.getScopedConfig(db, {
-        type: constants.Config.GOOGLE,
-      })
-
+      let googleConfig = await configs.getGoogleConfig()
       if (!googleConfig) {
-        googleConfig = {
-          clientID: env.GOOGLE_CLIENT_ID,
-          clientSecret: env.GOOGLE_CLIENT_SECRET,
-        }
+        throw new HTTPError("Google config not found", 400)
       }
 
       const oauthClient = new OAuth2Client({
diff --git a/packages/server/src/migrations/functions/backfill/global/configs.ts b/packages/server/src/migrations/functions/backfill/global/configs.ts
index 7eaa987bc7..1b76727bbe 100644
--- a/packages/server/src/migrations/functions/backfill/global/configs.ts
+++ b/packages/server/src/migrations/functions/backfill/global/configs.ts
@@ -1,4 +1,9 @@
-import { events, db as dbUtils } from "@budibase/backend-core"
+import {
+  events,
+  DocumentType,
+  SEPARATOR,
+  UNICODE_MAX,
+} from "@budibase/backend-core"
 import {
   Config,
   isSMTPConfig,
@@ -9,15 +14,16 @@ import {
 } from "@budibase/types"
 import env from "./../../../../environment"
 
+export const getConfigParams = () => {
+  return {
+    include_docs: true,
+    startkey: `${DocumentType.CONFIG}${SEPARATOR}`,
+    endkey: `${DocumentType.CONFIG}${SEPARATOR}${UNICODE_MAX}`,
+  }
+}
+
 const getConfigs = async (globalDb: any): Promise<Config[]> => {
-  const response = await globalDb.allDocs(
-    dbUtils.getConfigParams(
-      {},
-      {
-        include_docs: true,
-      }
-    )
-  )
+  const response = await globalDb.allDocs(getConfigParams())
   return response.rows.map((row: any) => row.doc)
 }
 
diff --git a/packages/server/src/migrations/tests/helpers.ts b/packages/server/src/migrations/tests/helpers.ts
index 17658d5290..35831a2fd0 100644
--- a/packages/server/src/migrations/tests/helpers.ts
+++ b/packages/server/src/migrations/tests/helpers.ts
@@ -1,7 +1,7 @@
 // Mimic configs test configuration from worker, creation configs directly in database
 
 import * as structures from "./structures"
-import { db } from "@budibase/backend-core"
+import { configs } from "@budibase/backend-core"
 import { Config } from "@budibase/types"
 
 export const saveSettingsConfig = async (globalDb: any) => {
@@ -25,7 +25,7 @@ export const saveSmtpConfig = async (globalDb: any) => {
 }
 
 const saveConfig = async (config: Config, globalDb: any) => {
-  config._id = db.generateConfigID({ type: config.type })
+  config._id = configs.generateConfigID(config.type)
 
   let response
   try {
diff --git a/packages/server/src/migrations/tests/structures.ts b/packages/server/src/migrations/tests/structures.ts
index bd48bf63cd..b075c04f5c 100644
--- a/packages/server/src/migrations/tests/structures.ts
+++ b/packages/server/src/migrations/tests/structures.ts
@@ -20,6 +20,7 @@ export const oidc = (conf?: OIDCConfig): OIDCConfig => {
           name: "Active Directory",
           uuid: utils.newid(),
           activated: true,
+          scopes: [],
           ...conf,
         },
       ],
diff --git a/packages/types/src/api/web/global/configs.ts b/packages/types/src/api/web/global/configs.ts
new file mode 100644
index 0000000000..1476d13cee
--- /dev/null
+++ b/packages/types/src/api/web/global/configs.ts
@@ -0,0 +1,23 @@
+import { SettingsConfig, SettingsInnerConfig } from "../../../documents"
+
+/**
+ * Settings that aren't stored in the database - enriched at runtime.
+ */
+export interface PublicSettingsInnerConfig extends SettingsInnerConfig {
+  google: boolean
+  oidc: boolean
+  oidcCallbackUrl: string
+  googleCallbackUrl: string
+}
+
+export interface GetPublicSettingsResponse extends SettingsConfig {
+  config: PublicSettingsInnerConfig
+}
+
+export interface PublicOIDCConfig {
+  logo?: string
+  name?: string
+  uuid?: string
+}
+
+export type GetPublicOIDCConfigResponse = PublicOIDCConfig[]
diff --git a/packages/types/src/api/web/global/index.ts b/packages/types/src/api/web/global/index.ts
index 415ed55ab1..d6e87d3a0d 100644
--- a/packages/types/src/api/web/global/index.ts
+++ b/packages/types/src/api/web/global/index.ts
@@ -1,2 +1,3 @@
 export * from "./environmentVariables"
 export * from "./events"
+export * from "./configs"
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 99dec534b6..8c423feb65 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -5,32 +5,42 @@ export interface Config extends Document {
   config: any
 }
 
-export interface SMTPConfig extends Config {
-  config: {
-    port: number
-    host: string
-    from: string
-    subject: string
-    secure: boolean
+export interface SMTPInnerConfig {
+  port: number
+  host: string
+  from: string
+  subject?: string
+  secure: boolean
+  auth?: {
+    user: string
+    pass: string
   }
+  connectionTimeout?: any
+}
+
+export interface SMTPConfig extends Config {
+  config: SMTPInnerConfig
+}
+
+export interface SettingsInnerConfig {
+  platformUrl?: string
+  company?: string
+  logoUrl?: string // Populated on read
+  logoUrlEtag?: string
+  uniqueTenantId?: string
+  analyticsEnabled?: boolean
 }
 
 export interface SettingsConfig extends Config {
-  config: {
-    company: string
-    // Populated on read
-    logoUrl?: string
-    logoUrlEtag?: boolean
-    platformUrl: string
-    uniqueTenantId?: string
-    analyticsEnabled?: boolean
-  }
+  config: SettingsInnerConfig
 }
 
 export interface GoogleInnerConfig {
   clientID: string
   clientSecret: string
   activated: boolean
+  // deprecated / read only
+  callbackURL?: string
 }
 
 export interface GoogleConfig extends Config {
@@ -55,6 +65,7 @@ export interface OIDCInnerConfig {
   name: string
   uuid: string
   activated: boolean
+  scopes: string[]
 }
 
 export interface OIDCConfig extends Config {
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 948a98cf3a..ab017a4184 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -2,10 +2,9 @@ import {
   auth as authCore,
   constants,
   context,
-  db as dbCore,
   events,
-  tenancy,
   utils as utilsCore,
+  configs,
 } from "@budibase/backend-core"
 import {
   ConfigType,
@@ -15,6 +14,7 @@ import {
   SSOUser,
   PasswordResetRequest,
   PasswordResetUpdateRequest,
+  GoogleInnerConfig,
 } from "@budibase/types"
 import env from "../../../environment"
 
@@ -163,8 +163,8 @@ export const datasourceAuth = async (ctx: any, next: any) => {
 
 // GOOGLE SSO
 
-export async function googleCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.GOOGLE)
+export async function googleCallbackUrl(config?: GoogleInnerConfig) {
+  return ssoCallbackUrl(ConfigType.GOOGLE, config)
 }
 
 /**
@@ -172,12 +172,10 @@ export async function googleCallbackUrl(config?: { callbackURL?: string }) {
  * On a successful login, you will be redirected to the googleAuth callback route.
  */
 export const googlePreAuth = async (ctx: any, next: any) => {
-  const db = tenancy.getGlobalDB()
-
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.GOOGLE,
-    workspace: ctx.query.workspace,
-  })
+  const config = await configs.getGoogleConfig()
+  if (!config) {
+    return ctx.throw(400, "Google config not found")
+  }
   let callbackUrl = await googleCallbackUrl(config)
   const strategy = await google.strategyFactory(
     config,
@@ -193,12 +191,10 @@ export const googlePreAuth = async (ctx: any, next: any) => {
 }
 
 export const googleCallback = async (ctx: any, next: any) => {
-  const db = tenancy.getGlobalDB()
-
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.GOOGLE,
-    workspace: ctx.query.workspace,
-  })
+  const config = await configs.getGoogleConfig()
+  if (!config) {
+    return ctx.throw(400, "Google config not found")
+  }
   const callbackUrl = await googleCallbackUrl(config)
   const strategy = await google.strategyFactory(
     config,
@@ -221,25 +217,20 @@ export const googleCallback = async (ctx: any, next: any) => {
 
 // OIDC SSO
 
-export async function oidcCallbackUrl(config?: { callbackURL?: string }) {
-  return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.OIDC)
+export async function oidcCallbackUrl() {
+  return ssoCallbackUrl(ConfigType.OIDC)
 }
 
 export const oidcStrategyFactory = async (ctx: any, configId: any) => {
-  const db = tenancy.getGlobalDB()
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.OIDC,
-    group: ctx.query.group,
-  })
+  const config = await configs.getOIDCConfig()
+  if (!config) {
+    return ctx.throw(400, "OIDC config not found")
+  }
 
-  const chosenConfig = config.configs.filter((c: any) => c.uuid === configId)[0]
-  let callbackUrl = await oidcCallbackUrl(chosenConfig)
+  let callbackUrl = await oidcCallbackUrl()
 
   //Remote Config
-  const enrichedConfig = await oidc.fetchStrategyConfig(
-    chosenConfig,
-    callbackUrl
-  )
+  const enrichedConfig = await oidc.fetchStrategyConfig(config, callbackUrl)
   return oidc.strategyFactory(enrichedConfig, userSdk.save)
 }
 
@@ -247,23 +238,23 @@ export const oidcStrategyFactory = async (ctx: any, configId: any) => {
  * The initial call that OIDC authentication makes to take you to the configured OIDC login screen.
  * On a successful login, you will be redirected to the oidcAuth callback route.
  */
-export const oidcPreAuth = async (ctx: any, next: any) => {
+export const oidcPreAuth = async (ctx: Ctx, next: any) => {
   const { configId } = ctx.params
+  if (!configId) {
+    ctx.throw(400, "OIDC config id is required")
+  }
   const strategy = await oidcStrategyFactory(ctx, configId)
 
   setCookie(ctx, configId, Cookie.OIDC_CONFIG)
 
-  const db = tenancy.getGlobalDB()
-  const config = await dbCore.getScopedConfig(db, {
-    type: ConfigType.OIDC,
-    group: ctx.query.group,
-  })
-
-  const chosenConfig = config.configs.filter((c: any) => c.uuid === configId)[0]
+  const config = await configs.getOIDCConfigById(configId)
+  if (!config) {
+    return ctx.throw(400, "OIDC config not found")
+  }
 
   let authScopes =
-    chosenConfig.scopes?.length > 0
-      ? chosenConfig.scopes
+    config.scopes?.length > 0
+      ? config.scopes
       : ["profile", "email", "offline_access"]
 
   return passport.authenticate(strategy, {
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 855d766a87..b076416989 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -2,38 +2,31 @@ import * as email from "../../../utilities/email"
 import env from "../../../environment"
 import { googleCallbackUrl, oidcCallbackUrl } from "./auth"
 import {
-  events,
   cache,
-  objectStore,
-  tenancy,
+  configs,
   db as dbCore,
   env as coreEnv,
+  events,
+  objectStore,
+  tenancy,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import {
-  Database,
-  Config as ConfigDoc,
+  Config,
   ConfigType,
-  SSOType,
-  GoogleConfig,
-  OIDCConfig,
-  SettingsConfig,
+  Ctx,
+  GetPublicOIDCConfigResponse,
+  GetPublicSettingsResponse,
   isGoogleConfig,
   isOIDCConfig,
   isSettingsConfig,
   isSMTPConfig,
-  Ctx,
   UserCtx,
 } from "@budibase/types"
 
-const getEventFns = async (db: Database, config: ConfigDoc) => {
+const getEventFns = async (config: Config, existing?: Config) => {
   const fns = []
 
-  let existing
-  if (config._id) {
-    existing = await db.get(config._id)
-  }
-
   if (!existing) {
     if (isSMTPConfig(config)) {
       fns.push(events.email.SMTPCreated)
@@ -125,21 +118,21 @@ const getEventFns = async (db: Database, config: ConfigDoc) => {
   return fns
 }
 
-export async function save(ctx: UserCtx) {
-  const db = tenancy.getGlobalDB()
-  const { type, workspace, user, config } = ctx.request.body
-  let eventFns = await getEventFns(db, ctx.request.body)
+export async function save(ctx: UserCtx<Config>) {
+  const body = ctx.request.body
+  const type = body.type
+  const config = body.config
+
+  const existingConfig = await configs.getConfig(type)
+  let eventFns = await getEventFns(ctx.request.body, existingConfig)
+
   // Config does not exist yet
-  if (!ctx.request.body._id) {
-    ctx.request.body._id = dbCore.generateConfigID({
-      type,
-      workspace,
-      user,
-    })
+  if (!existingConfig) {
+    body._id = configs.generateConfigID(type)
   }
   try {
     // verify the configuration
-    switch (type) {
+    switch (config.type) {
       case ConfigType.SMTP:
         await email.verifyConfig(config)
         break
@@ -149,7 +142,7 @@ export async function save(ctx: UserCtx) {
   }
 
   try {
-    const response = await db.put(ctx.request.body)
+    const response = await configs.save(body)
     await cache.bustCache(cache.CacheKey.CHECKLIST)
     await cache.bustCache(cache.CacheKey.ANALYTICS_ENABLED)
 
@@ -167,44 +160,11 @@ export async function save(ctx: UserCtx) {
   }
 }
 
-export async function fetch(ctx: UserCtx) {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbCore.getConfigParams(
-      { type: ctx.params.type },
-      {
-        include_docs: true,
-      }
-    )
-  )
-  ctx.body = response.rows.map(row => row.doc)
-}
-
-/**
- * Gets the most granular config for a particular configuration type.
- * The hierarchy is type -> workspace -> user.
- */
 export async function find(ctx: UserCtx) {
-  const db = tenancy.getGlobalDB()
-
-  const { userId, workspaceId } = ctx.query
-  if (workspaceId && userId) {
-    const workspace = await db.get(workspaceId as string)
-    const userInWorkspace = workspace.users.some(
-      (workspaceUser: any) => workspaceUser === userId
-    )
-    if (!ctx.user!.admin && !userInWorkspace) {
-      ctx.throw(400, `User is not in specified workspace: ${workspace}.`)
-    }
-  }
-
   try {
     // Find the config with the most granular scope based on context
-    const scopedConfig = await dbCore.getScopedFullConfig(db, {
-      type: ctx.params.type,
-      user: userId,
-      workspace: workspaceId,
-    })
+    const type = ctx.params.type
+    const scopedConfig = await configs.getConfig(type)
 
     if (scopedConfig) {
       ctx.body = scopedConfig
@@ -217,85 +177,64 @@ export async function find(ctx: UserCtx) {
   }
 }
 
-export async function publicOidc(ctx: Ctx) {
-  const db = tenancy.getGlobalDB()
+export async function publicOidc(ctx: Ctx<void, GetPublicOIDCConfigResponse>) {
   try {
     // Find the config with the most granular scope based on context
-    const oidcConfig: OIDCConfig = await dbCore.getScopedFullConfig(db, {
-      type: ConfigType.OIDC,
-    })
+    const config = await configs.getOIDCConfig()
 
-    if (!oidcConfig) {
-      ctx.body = {}
+    if (!config) {
+      ctx.body = []
     } else {
-      ctx.body = oidcConfig.config.configs.map(config => ({
-        logo: config.logo,
-        name: config.name,
-        uuid: config.uuid,
-      }))
+      ctx.body = [
+        {
+          logo: config.logo,
+          name: config.name,
+          uuid: config.uuid,
+        },
+      ]
     }
   } catch (err: any) {
     ctx.throw(err.status, err)
   }
 }
 
-export async function publicSettings(ctx: Ctx) {
-  const db = tenancy.getGlobalDB()
-
+export async function publicSettings(
+  ctx: Ctx<void, GetPublicSettingsResponse>
+) {
   try {
-    // Find the config with the most granular scope based on context
-    const publicConfig = await dbCore.getScopedFullConfig(db, {
-      type: ConfigType.SETTINGS,
-    })
-
-    const googleConfig = await dbCore.getScopedFullConfig(db, {
-      type: ConfigType.GOOGLE,
-    })
-
-    const oidcConfig = await dbCore.getScopedFullConfig(db, {
-      type: ConfigType.OIDC,
-    })
-
-    let config
-    if (!publicConfig) {
-      config = {
-        config: {},
-      }
-    } else {
-      config = publicConfig
-    }
-
-    // enrich the logo url
-    // empty url means deleted
-    if (config.config.logoUrl && config.config.logoUrl !== "") {
-      config.config.logoUrl = objectStore.getGlobalFileUrl(
+    // settings
+    const config = await configs.getSettingsConfig()
+    // enrich the logo url - empty url means deleted
+    if (config.logoUrl && config.logoUrl !== "") {
+      config.logoUrl = objectStore.getGlobalFileUrl(
         "settings",
         "logoUrl",
-        config.config.logoUrlEtag
+        config.logoUrlEtag
       )
     }
 
-    // google button flag
-    if (googleConfig && googleConfig.config) {
-      // activated by default for configs pre-activated flag
-      config.config.google =
-        googleConfig.config.activated == null || googleConfig.config.activated
-    } else {
-      config.config.google = false
+    // google
+    const googleConfig = await configs.getGoogleConfig()
+    const preActivated = googleConfig?.activated == null
+    const google = preActivated || !!googleConfig?.activated
+    const _googleCallbackUrl = await googleCallbackUrl(googleConfig)
+
+    // oidc
+    const oidcConfig = await configs.getOIDCConfig()
+    const oidc = oidcConfig?.activated || false
+    const _oidcCallbackUrl = await oidcCallbackUrl()
+
+    ctx.body = {
+      type: ConfigType.SETTINGS,
+      _id: configs.generateConfigID(ConfigType.SETTINGS),
+      config: {
+        ...config,
+        google,
+        oidc,
+        oidcCallbackUrl: _oidcCallbackUrl,
+        googleCallbackUrl: _googleCallbackUrl,
+      },
     }
-
-    // callback urls
-    config.config.oidcCallbackUrl = await oidcCallbackUrl()
-    config.config.googleCallbackUrl = await googleCallbackUrl()
-
-    // oidc button flag
-    if (oidcConfig && oidcConfig.config) {
-      config.config.oidc = oidcConfig.config.configs[0].activated
-    } else {
-      config.config.oidc = false
-    }
-
-    ctx.body = config
   } catch (err: any) {
     ctx.throw(err.status, err)
   }
@@ -319,12 +258,11 @@ export async function upload(ctx: UserCtx) {
   })
 
   // add to configuration structure
-  // TODO: right now this only does a global level
-  const db = tenancy.getGlobalDB()
-  let cfgStructure = await dbCore.getScopedFullConfig(db, { type })
-  if (!cfgStructure) {
-    cfgStructure = {
-      _id: dbCore.generateConfigID({ type }),
+  let config = await configs.getConfig(type)
+  if (!config) {
+    config = {
+      _id: configs.generateConfigID(type),
+      type,
       config: {},
     }
   }
@@ -332,14 +270,14 @@ export async function upload(ctx: UserCtx) {
   // save the Etag for cache bursting
   const etag = result.ETag
   if (etag) {
-    cfgStructure.config[`${name}Etag`] = etag.replace(/"/g, "")
+    config.config[`${name}Etag`] = etag.replace(/"/g, "")
   }
 
   // save the file key
-  cfgStructure.config[`${name}`] = key
+  config.config[`${name}`] = key
 
   // write back to db
-  await db.put(cfgStructure)
+  await configs.save(config)
 
   ctx.body = {
     message: "File has been uploaded and url stored to config.",
@@ -360,7 +298,6 @@ export async function destroy(ctx: UserCtx) {
 }
 
 export async function configChecklist(ctx: Ctx) {
-  const db = tenancy.getGlobalDB()
   const tenantId = tenancy.getTenantId()
 
   try {
@@ -375,19 +312,13 @@ export async function configChecklist(ctx: Ctx) {
         }
 
         // They have set up SMTP
-        const smtpConfig = await dbCore.getScopedFullConfig(db, {
-          type: ConfigType.SMTP,
-        })
+        const smtpConfig = await configs.getSMTPConfig()
 
         // They have set up Google Auth
-        const googleConfig = await dbCore.getScopedFullConfig(db, {
-          type: ConfigType.GOOGLE,
-        })
+        const googleConfig = await configs.getGoogleConfig()
 
         // They have set up OIDC
-        const oidcConfig = await dbCore.getScopedFullConfig(db, {
-          type: ConfigType.OIDC,
-        })
+        const oidcConfig = await configs.getOIDCConfig()
 
         // They have set up a global user
         const userExists = await checkAnyUserExists()
diff --git a/packages/worker/src/api/routes/global/configs.ts b/packages/worker/src/api/routes/global/configs.ts
index 38a31a28e6..922bcea212 100644
--- a/packages/worker/src/api/routes/global/configs.ts
+++ b/packages/worker/src/api/routes/global/configs.ts
@@ -104,13 +104,7 @@ router
     controller.save
   )
   .delete("/api/global/configs/:id/:rev", auth.adminOnly, controller.destroy)
-  .get("/api/global/configs", controller.fetch)
   .get("/api/global/configs/checklist", controller.configChecklist)
-  .get(
-    "/api/global/configs/all/:type",
-    buildConfigGetValidation(),
-    controller.fetch
-  )
   .get("/api/global/configs/public", controller.publicSettings)
   .get("/api/global/configs/public/oidc", controller.publicOidc)
   .get("/api/global/configs/:type", buildConfigGetValidation(), controller.find)

From 2d993adec8c1a5827d3482af5513a33f9b965863 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 23 Feb 2023 13:42:10 +0000
Subject: [PATCH 121/273] Fix for real email tests failing silently

---
 .../api/routes/global/tests/realEmail.spec.ts |  1 +
 packages/worker/src/tests/api/email.ts        |  1 +
 .../worker/src/tests/structures/configs.ts    |  4 +-
 packages/worker/src/utilities/email.ts        | 82 ++++---------------
 packages/worker/src/utilities/templates.ts    | 13 +--
 5 files changed, 26 insertions(+), 75 deletions(-)

diff --git a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
index 1c180be75d..8ad7363c85 100644
--- a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
@@ -1,3 +1,4 @@
+jest.unmock("node-fetch")
 import { TestConfiguration } from "../../../../tests"
 import { EmailTemplatePurpose } from "../../../../constants"
 const nodemailer = require("nodemailer")
diff --git a/packages/worker/src/tests/api/email.ts b/packages/worker/src/tests/api/email.ts
index ba7c7dbec0..fd3c622cfa 100644
--- a/packages/worker/src/tests/api/email.ts
+++ b/packages/worker/src/tests/api/email.ts
@@ -13,6 +13,7 @@ export class EmailAPI extends TestAPI {
         email: "test@test.com",
         purpose,
         tenantId: this.config.getTenantId(),
+        userId: this.config.user?._id!,
       })
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)
diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts
index 2c76f271c4..9b5b29f652 100644
--- a/packages/worker/src/tests/structures/configs.ts
+++ b/packages/worker/src/tests/structures/configs.ts
@@ -55,8 +55,8 @@ export function smtpEthereal() {
       host: "smtp.ethereal.email",
       secure: false,
       auth: {
-        user: "don.bahringer@ethereal.email",
-        pass: "yCKSH8rWyUPbnhGYk9",
+        user: "wyatt.zulauf29@ethereal.email",
+        pass: "tEwDtHBWWxusVWAPfa",
       },
       connectionTimeout: 1000, // must be less than the jest default of 5000
     },
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index 66e860edcb..69861684eb 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -1,11 +1,11 @@
 import env from "../environment"
-import { EmailTemplatePurpose, TemplateType, Config } from "../constants"
+import { EmailTemplatePurpose, TemplateType } from "../constants"
 import { getTemplateByPurpose } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
 import { getResetPasswordCode, getInviteCode } from "./redis"
-import { User, Database } from "@budibase/types"
-import { tenancy, db as dbCore } from "@budibase/backend-core"
+import { User, SMTPInnerConfig } from "@budibase/types"
+import { configs } from "@budibase/backend-core"
 const nodemailer = require("nodemailer")
 
 type SendEmailOpts = {
@@ -36,24 +36,24 @@ const FULL_EMAIL_PURPOSES = [
   EmailTemplatePurpose.CUSTOM,
 ]
 
-function createSMTPTransport(config: any) {
+function createSMTPTransport(config?: SMTPInnerConfig) {
   let options: any
-  let secure = config.secure
+  let secure = config?.secure
   // default it if not specified
   if (secure == null) {
-    secure = config.port === 465
+    secure = config?.port === 465
   }
   if (!TEST_MODE) {
     options = {
-      port: config.port,
-      host: config.host,
+      port: config?.port,
+      host: config?.host,
       secure: secure,
-      auth: config.auth,
+      auth: config?.auth,
     }
     options.tls = {
       rejectUnauthorized: false,
     }
-    if (config.connectionTimeout) {
+    if (config?.connectionTimeout) {
       options.connectionTimeout = config.connectionTimeout
     }
   } else {
@@ -134,57 +134,16 @@ async function buildEmail(
   })
 }
 
-/**
- * Utility function for finding most valid SMTP configuration.
- * @param {object} db The CouchDB database which is to be looked up within.
- * @param {string|null} workspaceId If using finer grain control of configs a workspace can be used.
- * @param {boolean|null} automation Whether or not the configuration is being fetched for an email automation.
- * @return {Promise<object|null>} returns the SMTP configuration if it exists
- */
-async function getSmtpConfiguration(
-  db: Database,
-  workspaceId?: string,
-  automation?: boolean
-) {
-  const params: any = {
-    type: Config.SMTP,
-  }
-  if (workspaceId) {
-    params.workspace = workspaceId
-  }
-
-  const customConfig = await dbCore.getScopedConfig(db, params)
-
-  if (customConfig) {
-    return customConfig
-  }
-
-  // Use an SMTP fallback configuration from env variables
-  if (!automation && env.SMTP_FALLBACK_ENABLED) {
-    return {
-      port: env.SMTP_PORT,
-      host: env.SMTP_HOST,
-      secure: false,
-      from: env.SMTP_FROM_ADDRESS,
-      auth: {
-        user: env.SMTP_USER,
-        pass: env.SMTP_PASSWORD,
-      },
-    }
-  }
-}
-
 /**
  * Checks if a SMTP config exists based on passed in parameters.
  * @return {Promise<boolean>} returns true if there is a configuration that can be used.
  */
-export async function isEmailConfigured(workspaceId?: string) {
+export async function isEmailConfigured() {
   // when "testing" or smtp fallback is enabled simply return true
   if (TEST_MODE || env.SMTP_FALLBACK_ENABLED) {
     return true
   }
-  const db = tenancy.getGlobalDB()
-  const config = await getSmtpConfiguration(db, workspaceId)
+  const config = await configs.getSMTPConfig()
   return config != null
 }
 
@@ -202,22 +161,17 @@ export async function sendEmail(
   purpose: EmailTemplatePurpose,
   opts: SendEmailOpts
 ) {
-  const db = tenancy.getGlobalDB()
-  let config =
-    (await getSmtpConfiguration(db, opts?.workspaceId, opts?.automation)) || {}
-  if (Object.keys(config).length === 0 && !TEST_MODE) {
+  const config = await configs.getSMTPConfig(opts?.automation)
+  if (!config && !TEST_MODE) {
     throw "Unable to find SMTP configuration."
   }
   const transport = createSMTPTransport(config)
   // if there is a link code needed this will retrieve it
   const code = await getLinkCode(purpose, email, opts.user, opts?.info)
-  let context
-  if (code) {
-    context = await getSettingsTemplateContext(purpose, code)
-  }
+  let context = await getSettingsTemplateContext(purpose, code)
 
   let message: any = {
-    from: opts?.from || config.from,
+    from: opts?.from || config?.from,
     html: await buildEmail(purpose, email, context, {
       user: opts?.user,
       contents: opts?.contents,
@@ -231,9 +185,9 @@ export async function sendEmail(
     bcc: opts?.bcc,
   }
 
-  if (opts?.subject || config.subject) {
+  if (opts?.subject || config?.subject) {
     message.subject = await processString(
-      opts?.subject || config.subject,
+      (opts?.subject || config?.subject) as string,
       context
     )
   }
diff --git a/packages/worker/src/utilities/templates.ts b/packages/worker/src/utilities/templates.ts
index ede95dbe4a..1597325c7c 100644
--- a/packages/worker/src/utilities/templates.ts
+++ b/packages/worker/src/utilities/templates.ts
@@ -1,6 +1,5 @@
-import { db as dbCore, tenancy } from "@budibase/backend-core"
+import { tenancy, configs } from "@budibase/backend-core"
 import {
-  Config,
   InternalTemplateBinding,
   LOGO_URL,
   EmailTemplatePurpose,
@@ -10,20 +9,16 @@ const BASE_COMPANY = "Budibase"
 
 export async function getSettingsTemplateContext(
   purpose: EmailTemplatePurpose,
-  code?: string
+  code?: string | null
 ) {
-  const db = tenancy.getGlobalDB()
-  // TODO: use more granular settings in the future if required
-  let settings =
-    (await dbCore.getScopedConfig(db, { type: Config.SETTINGS })) || {}
+  let settings = await configs.getSettingsConfig()
   const URL = settings.platformUrl
   const context: any = {
     [InternalTemplateBinding.LOGO_URL]:
       checkSlashesInUrl(`${URL}/${settings.logoUrl}`) || LOGO_URL,
     [InternalTemplateBinding.PLATFORM_URL]: URL,
     [InternalTemplateBinding.COMPANY]: settings.company || BASE_COMPANY,
-    [InternalTemplateBinding.DOCS_URL]:
-      settings.docsUrl || "https://docs.budibase.com/",
+    [InternalTemplateBinding.DOCS_URL]: "https://docs.budibase.com/",
     [InternalTemplateBinding.LOGIN_URL]: checkSlashesInUrl(
       tenancy.addTenantToUrl(`${URL}/login`)
     ),

From 4e1bebe897135d3953e62c0b3f613712c51e0737 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 23 Feb 2023 13:43:01 +0000
Subject: [PATCH 122/273] Server flaky tests fixes - improving tenancy config

---
 .../backend-core/src/events/identification.ts |  1 -
 packages/server/src/api/controllers/cloud.ts  |  4 +-
 .../{cloud.seq.spec.ts => cloud.spec.ts}      | 33 ++++-----
 .../routes/tests/utilities/TestFunctions.ts   |  3 +-
 .../tests/userEmailViewCasing.spec.js         |  7 +-
 packages/server/src/tests/jestEnv.ts          |  1 +
 .../src/tests/utilities/TestConfiguration.ts  | 72 +++++++++++--------
 .../server/src/tests/utilities/structures.ts  |  2 -
 8 files changed, 62 insertions(+), 61 deletions(-)
 rename packages/server/src/api/routes/tests/{cloud.seq.spec.ts => cloud.spec.ts} (70%)

diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index 75cd4ae7ec..08ed9c54b2 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -10,7 +10,6 @@ import {
   isCloudAccount,
   isSSOAccount,
   TenantGroup,
-  SettingsConfig,
   CloudAccount,
   UserIdentity,
   InstallationGroup,
diff --git a/packages/server/src/api/controllers/cloud.ts b/packages/server/src/api/controllers/cloud.ts
index 7f43f21fc9..7be00e3a1d 100644
--- a/packages/server/src/api/controllers/cloud.ts
+++ b/packages/server/src/api/controllers/cloud.ts
@@ -58,7 +58,7 @@ export async function exportApps(ctx: Ctx) {
 }
 
 async function checkHasBeenImported() {
-  if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
+  if (!env.SELF_HOSTED) {
     return true
   }
   const apps = await dbCore.getAllApps({ all: true })
@@ -72,7 +72,7 @@ export async function hasBeenImported(ctx: Ctx) {
 }
 
 export async function importApps(ctx: Ctx) {
-  if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
+  if (!env.SELF_HOSTED) {
     ctx.throw(400, "Importing only allowed in self hosted environments.")
   }
   const beenImported = await checkHasBeenImported()
diff --git a/packages/server/src/api/routes/tests/cloud.seq.spec.ts b/packages/server/src/api/routes/tests/cloud.spec.ts
similarity index 70%
rename from packages/server/src/api/routes/tests/cloud.seq.spec.ts
rename to packages/server/src/api/routes/tests/cloud.spec.ts
index d9bd6221ad..aad1214a31 100644
--- a/packages/server/src/api/routes/tests/cloud.seq.spec.ts
+++ b/packages/server/src/api/routes/tests/cloud.spec.ts
@@ -1,3 +1,5 @@
+import { App } from "@budibase/types"
+
 jest.setTimeout(30000)
 
 import { AppStatus } from "../../../db/utils"
@@ -5,6 +7,7 @@ import { AppStatus } from "../../../db/utils"
 import * as setup from "./utilities"
 
 import { wipeDb } from "./utilities/TestFunctions"
+import { tenancy } from "@budibase/backend-core"
 
 describe("/cloud", () => {
   let request = setup.getRequest()!
@@ -12,18 +15,10 @@ describe("/cloud", () => {
 
   afterAll(setup.afterAll)
 
-  beforeAll(() => {
+  beforeAll(async () => {
     // Importing is only allowed in self hosted environments
-    config.modeSelf()
-  })
-
-  beforeEach(async () => {
     await config.init()
-  })
-
-  afterEach(async () => {
-    // clear all mocks
-    jest.clearAllMocks()
+    config.modeSelf()
   })
 
   describe("import", () => {
@@ -32,30 +27,28 @@ describe("/cloud", () => {
       // import will not run
       await wipeDb()
 
-      // get a count of apps before the import
-      const preImportApps = await request
-        .get(`/api/applications?status=${AppStatus.ALL}`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-
       // Perform the import
       const res = await request
         .post(`/api/cloud/import`)
+        .set(config.publicHeaders())
         .attach("importFile", "src/api/routes/tests/data/export-test.tar.gz")
-        .set(config.defaultHeaders())
         .expect(200)
       expect(res.body.message).toEqual("Apps successfully imported.")
 
       // get a count of apps after the import
       const postImportApps = await request
         .get(`/api/applications?status=${AppStatus.ALL}`)
-        .set(config.defaultHeaders())
+        .set(config.publicHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
 
+      const apps = postImportApps.body as App[]
       // There are two apps in the file that was imported so check for this
-      expect(postImportApps.body.length).toEqual(2)
+      expect(apps.length).toEqual(2)
+      // The new tenant id was assigned to the imported apps
+      expect(tenancy.getTenantIDFromAppID(apps[0].appId)).toBe(
+        config.getTenantId()
+      )
     })
   })
 })
diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
index 3f57c1e8ef..5a1ed5210e 100644
--- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
+++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
@@ -2,7 +2,6 @@ import * as rowController from "../../../controllers/row"
 import * as appController from "../../../controllers/application"
 import { AppStatus } from "../../../../db/utils"
 import { roles, tenancy, context } from "@budibase/backend-core"
-import { TENANT_ID } from "../../../../tests/utilities/structures"
 import env from "../../../../environment"
 import { db } from "@budibase/backend-core"
 import Nano from "@budibase/nano"
@@ -33,7 +32,7 @@ export const getAllTableRows = async (config: any) => {
 }
 
 export const clearAllApps = async (
-  tenantId = TENANT_ID,
+  tenantId: string,
   exceptions: Array<string> = []
 ) => {
   await tenancy.doInTenant(tenantId, async () => {
diff --git a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
index c0066b1c71..15ddcfd1ef 100644
--- a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
+++ b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
@@ -8,9 +8,8 @@ jest.mock("@budibase/backend-core", () => {
     }
   }
 })
-const { tenancy, db: dbCore } = require("@budibase/backend-core")
+const { context, db: dbCore } = require("@budibase/backend-core")
 const TestConfig = require("../../../tests/utilities/TestConfiguration")
-const { TENANT_ID } = require("../../../tests/utilities/structures")
 
 // mock email view creation
 
@@ -26,8 +25,8 @@ describe("run", () => {
     afterAll(config.end)
 
     it("runs successfully", async () => {
-      await tenancy.doInTenant(TENANT_ID, async () => {
-        const globalDb = tenancy.getGlobalDB()
+      await config.doInTenant(async () => {
+        const globalDb = context.getGlobalDB()
         await migration.run(globalDb)
         expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1)
       })
diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts
index c567b260b3..7727bb6007 100644
--- a/packages/server/src/tests/jestEnv.ts
+++ b/packages/server/src/tests/jestEnv.ts
@@ -8,3 +8,4 @@ process.env.BUDIBASE_DIR = tmpdir("budibase-unittests")
 process.env.LOG_LEVEL = process.env.LOG_LEVEL || "error"
 process.env.ENABLE_4XX_HTTP_LOGGING = "0"
 process.env.MOCK_REDIS = "1"
+process.env.PLATFORM_URL = "http://localhost:10000"
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 88545dbcbb..e9b770229f 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -21,7 +21,6 @@ import {
   basicScreen,
   basicLayout,
   basicWebhook,
-  TENANT_ID,
 } from "./structures"
 import {
   constants,
@@ -41,8 +40,8 @@ import { generateUserMetadataID } from "../../db/utils"
 import { startup } from "../../startup"
 import supertest from "supertest"
 import {
+  App,
   AuthToken,
-  Database,
   Datasource,
   Row,
   SourceName,
@@ -63,7 +62,7 @@ class TestConfiguration {
   started: boolean
   appId: string | null
   allApps: any[]
-  app: any
+  app?: App
   prodApp: any
   prodAppId: any
   user: any
@@ -73,7 +72,7 @@ class TestConfiguration {
   linkedTable: any
   automation: any
   datasource: any
-  tenantId: string | null
+  tenantId?: string
   defaultUserValues: DefaultUserValues
 
   constructor(openServer = true) {
@@ -89,7 +88,6 @@ class TestConfiguration {
     }
     this.appId = null
     this.allApps = []
-    this.tenantId = null
     this.defaultUserValues = this.populateDefaultUserValues()
   }
 
@@ -154,19 +152,10 @@ class TestConfiguration {
 
   // use a new id as the name to avoid name collisions
   async init(appName = newid()) {
-    this.defaultUserValues = this.populateDefaultUserValues()
-    if (context.isMultiTenant()) {
-      this.tenantId = structures.tenant.id()
-    }
-
     if (!this.started) {
       await startup()
     }
-    this.user = await this.globalUser()
-    this.globalUserId = this.user._id
-    this.userMetadataId = generateUserMetadataID(this.globalUserId)
-
-    return this.createApp(appName)
+    return this.newTenant(appName)
   }
 
   end() {
@@ -182,24 +171,22 @@ class TestConfiguration {
   }
 
   // MODES
-  #setMultiTenancy = (value: boolean) => {
+  setMultiTenancy = (value: boolean) => {
     env._set("MULTI_TENANCY", value)
     coreEnv._set("MULTI_TENANCY", value)
   }
 
-  #setSelfHosted = (value: boolean) => {
+  setSelfHosted = (value: boolean) => {
     env._set("SELF_HOSTED", value)
     coreEnv._set("SELF_HOSTED", value)
   }
 
   modeCloud = () => {
-    this.#setSelfHosted(false)
-    this.#setMultiTenancy(true)
+    this.setSelfHosted(false)
   }
 
   modeSelf = () => {
-    this.#setSelfHosted(true)
-    this.#setMultiTenancy(false)
+    this.setSelfHosted(true)
   }
 
   // UTILS
@@ -354,6 +341,8 @@ class TestConfiguration {
     })
   }
 
+  // HEADERS
+
   defaultHeaders(extras = {}) {
     const tenantId = this.getTenantId()
     const authObj: AuthToken = {
@@ -374,6 +363,7 @@ class TestConfiguration {
         `${constants.Cookie.CurrentApp}=${appToken}`,
       ],
       [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken,
+      Host: this.tenantHost(),
       ...extras,
     }
 
@@ -383,10 +373,6 @@ class TestConfiguration {
     return headers
   }
 
-  getTenantId() {
-    return this.tenantId || TENANT_ID
-  }
-
   publicHeaders({ prodApp = true } = {}) {
     const appId = prodApp ? this.prodAppId : this.appId
 
@@ -397,9 +383,7 @@ class TestConfiguration {
       headers[constants.Header.APP_ID] = appId
     }
 
-    if (this.tenantId) {
-      headers[constants.Header.TENANT_ID] = this.tenantId
-    }
+    headers[constants.Header.TENANT_ID] = this.getTenantId()
 
     return headers
   }
@@ -413,6 +397,34 @@ class TestConfiguration {
     return this.login({ email, roleId, builder, prodApp })
   }
 
+  // TENANCY
+
+  tenantHost() {
+    const tenantId = this.getTenantId()
+    const platformHost = new URL(coreEnv.PLATFORM_URL).host.split(":")[0]
+    return `${tenantId}.${platformHost}`
+  }
+
+  getTenantId() {
+    if (!this.tenantId) {
+      throw new Error("no test tenant id - init has not been called")
+    }
+    return this.tenantId
+  }
+
+  async newTenant(appName = newid()): Promise<App> {
+    this.defaultUserValues = this.populateDefaultUserValues()
+    this.tenantId = structures.tenant.id()
+    this.user = await this.globalUser()
+    this.globalUserId = this.user._id
+    this.userMetadataId = generateUserMetadataID(this.globalUserId)
+    return this.createApp(appName)
+  }
+
+  doInTenant(task: any) {
+    return context.doInTenant(this.getTenantId(), task)
+  }
+
   // API
 
   async generateApiKey(userId = this.defaultUserValues.globalUserId) {
@@ -432,7 +444,7 @@ class TestConfiguration {
   }
 
   // APP
-  async createApp(appName: string) {
+  async createApp(appName: string): Promise<App> {
     // create dev app
     // clear any old app
     this.appId = null
@@ -442,7 +454,7 @@ class TestConfiguration {
         null,
         controllers.app.create
       )
-      this.appId = this.app.appId
+      this.appId = this.app?.appId!
     })
     return await context.doInAppContext(this.appId, async () => {
       // create production app
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index c1959dc791..e38c0a5275 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -13,8 +13,6 @@ import {
 
 const { v4: uuidv4 } = require("uuid")
 
-export const TENANT_ID = "default"
-
 export function basicTable() {
   return {
     name: "TestTable",

From f593b39e1be421f6a247baac063530b9d26b9f96 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 13:49:44 +0000
Subject: [PATCH 123/273] default start and end date

---
 .../src/pages/builder/portal/account/auditLogs/index.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index b4daec9bd5..f5b4ee90be 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -68,7 +68,10 @@
   let selectedLog
   let sidePanelVisible = false
   let wideSidePanel = false
-  let startDate, endDate
+
+  let startDate = new Date()
+  startDate.setDate(startDate.getDate() - 30)
+  let endDate = new Date()
 
   $: fetchUsers(userPage, userSearchTerm)
   $: fetchLogs({
@@ -266,6 +269,7 @@
 
     <div class="date-picker">
       <DatePicker
+        value={[startDate, endDate]}
         placeholder="Choose date range"
         range={true}
         on:change={e => {

From 8cd7ba1fdfccec709c7c35a5e392ec1f1c311c3a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 23 Feb 2023 13:55:18 +0000
Subject: [PATCH 124/273] Undo/Redo for Design and Automate sections +
 automations refactor (#9714)

* Add full undo/redo support for screens

* Add loading states to disable spamming undo/redo

* Add keyboard shortcuts for undo and redo

* Fix modals not closing in design section when escape is pressed

* Remove log

* Add smart metadata saving to undo/redo

* Add error handling to undo/redo

* Add active state to hoverable icons

* Fix screen deletion

* Always attempt to get latest doc version before deleting in case rev has changed

* Move undo listener top level, hide controls when on certain tabs, and improve selection state

* Add tooltips to undo/redo control

* Update automation section nav to match other sections

* Fix automation list padding

* Fix some styles in create automation modal

* Improve automation section styles and add undo/redo

* Update styles in add action modal

* Fix button size when creating admin user

* Fix styles in add automation step modal

* Fix issue selecting disabled automation steps

* Reset automation history store when changing app

* Reduce spammy unnecessary API calls when editing cron trigger

* WIP automation refactor

* Rewrite most automation state

* Rewrite most of the rest of automation state

* Finish refactor of automation state

* Fix selection state when selecting new doc after history recreates it

* Prune nullish or empty block inputs from automations and avoid sending API requests when no changes have been made

* Fix animation issues with automations

* Sort automations and refetch list when adding or deleting

* Fix formatting

* Add back in ability to swap between values and bindings for block inputs

* Lint

* Format

* Fix potential issue in design section when selected screen is unset

* Fix automation arrow directions everywhere, tidy up logic and fix crash when using invalid looping

* Lint

* Fix more cases of automation errors

* Fix implicity any TS error

* Respect _id specified when creating automations

* Fix crash in history store when reverting a change on a doc whose ID has changed

* Lint

* Ensure cloneDeep helper doesn't crash when a nullish value is passed in

* Remove deprecated frontend automation test

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
---
 packages/bbui/src/Icon/Icon.svelte            |   3 +
 .../bbui/src/InlineAlert/InlineAlert.svelte   |   2 +
 packages/bbui/src/Label/Label.svelte          |   2 +-
 packages/bbui/src/Modal/Modal.svelte          |  11 +-
 packages/bbui/src/helpers.js                  |   3 +
 packages/builder/package.json                 |   1 +
 packages/builder/src/builderStore/index.js    |  45 +++
 .../store/automation/Automation.js            |  69 ----
 .../builderStore/store/automation/index.js    | 212 +++++++-----
 .../store/automation/tests/Automation.spec.js |  48 ---
 .../store/automation/tests/testAutomation.js  |  78 -----
 .../src/builderStore/store/frontend.js        |  17 +-
 .../builder/src/builderStore/store/history.js | 319 ++++++++++++++++++
 .../AutomationBuilder.svelte                  |  10 +-
 .../FlowChart/ActionModal.svelte              |  93 ++---
 .../FlowChart/FlowChart.svelte                |  88 ++---
 .../FlowChart/FlowItem.svelte                 | 139 +++-----
 .../FlowChart/FlowItemHeader.svelte           |  23 +-
 .../FlowChart/TestDataModal.svelte            |  23 +-
 .../AutomationBuilder/TestDisplay.svelte      |  13 +-
 .../AutomationBuilder/TestPanel.svelte        |  20 +-
 .../AutomationPanel/AutomationList.svelte     |  13 +-
 .../AutomationPanel/AutomationPanel.svelte    |  38 +--
 .../CreateAutomationModal.svelte              |  38 +--
 .../EditAutomationPopover.svelte              |   3 -
 .../UpdateAutomationModal.svelte              |   6 +-
 .../SetupPanel/AutomationBlockSetup.svelte    |  62 ++--
 .../automation/SetupPanel/CronBuilder.svelte  |  11 +-
 .../Shared/CreateWebhookModal.svelte          |   5 +-
 .../components/common/UndoRedoControl.svelte  |  57 ++++
 .../ButtonActionEditor.svelte                 |  21 +-
 .../src/pages/builder/admin/index.svelte      |   1 +
 .../_layout.svelte                            |   0
 .../index.svelte                              |   0
 .../app/[application]/automate/_layout.svelte |  50 ++-
 .../app/[application]/automate/index.svelte   |  15 +-
 .../[screenId]/_components/AppPanel.svelte    |  10 +-
 .../navigation/ComponentKeyHandler.svelte     |  59 ++--
 .../_components/ScreenSettingsPanel.svelte    |  10 +-
 .../design/[screenId]/screens/index.svelte    |   8 +-
 packages/builder/yarn.lock                    |   5 +
 .../server/src/api/controllers/automation.ts  |  15 +-
 packages/server/src/api/routes/automation.ts  |   2 +-
 43 files changed, 926 insertions(+), 722 deletions(-)
 delete mode 100644 packages/builder/src/builderStore/store/automation/Automation.js
 delete mode 100644 packages/builder/src/builderStore/store/automation/tests/Automation.spec.js
 delete mode 100644 packages/builder/src/builderStore/store/automation/tests/testAutomation.js
 create mode 100644 packages/builder/src/builderStore/store/history.js
 create mode 100644 packages/builder/src/components/common/UndoRedoControl.svelte
 rename packages/builder/src/pages/builder/app/[application]/automate/{[automation] => [automationId]}/_layout.svelte (100%)
 rename packages/builder/src/pages/builder/app/[application]/automate/{[automation] => [automationId]}/index.svelte (100%)

diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte
index 8290acd7cc..452a8c74a1 100644
--- a/packages/bbui/src/Icon/Icon.svelte
+++ b/packages/bbui/src/Icon/Icon.svelte
@@ -67,6 +67,9 @@
     color: var(--spectrum-alias-icon-color-selected-hover) !important;
     cursor: pointer;
   }
+  svg.hoverable:active {
+    color: var(--spectrum-global-color-blue-400) !important;
+  }
 
   svg.disabled {
     color: var(--spectrum-global-color-gray-500) !important;
diff --git a/packages/bbui/src/InlineAlert/InlineAlert.svelte b/packages/bbui/src/InlineAlert/InlineAlert.svelte
index 57e7296234..bd873042b3 100644
--- a/packages/bbui/src/InlineAlert/InlineAlert.svelte
+++ b/packages/bbui/src/InlineAlert/InlineAlert.svelte
@@ -57,5 +57,7 @@
     --spectrum-semantic-negative-icon-color: #e34850;
     min-width: 100px;
     margin: 0;
+    border-color: var(--spectrum-global-color-gray-400);
+    border-width: 1px;
   }
 </style>
diff --git a/packages/bbui/src/Label/Label.svelte b/packages/bbui/src/Label/Label.svelte
index ee6d9adf76..261ca946ea 100644
--- a/packages/bbui/src/Label/Label.svelte
+++ b/packages/bbui/src/Label/Label.svelte
@@ -21,7 +21,7 @@
   label {
     padding: 0;
     white-space: nowrap;
-    color: var(--spectrum-global-color-gray-600);
+    color: var(--spectrum-global-color-gray-700);
   }
 
   .muted {
diff --git a/packages/bbui/src/Modal/Modal.svelte b/packages/bbui/src/Modal/Modal.svelte
index 47420444a2..45081356c1 100644
--- a/packages/bbui/src/Modal/Modal.svelte
+++ b/packages/bbui/src/Modal/Modal.svelte
@@ -1,7 +1,7 @@
 <script>
   import "@spectrum-css/modal/dist/index-vars.css"
   import "@spectrum-css/underlay/dist/index-vars.css"
-  import { createEventDispatcher, setContext, tick } from "svelte"
+  import { createEventDispatcher, setContext, tick, onMount } from "svelte"
   import { fade, fly } from "svelte/transition"
   import Portal from "svelte-portal"
   import Context from "../context"
@@ -62,9 +62,14 @@
   }
 
   setContext(Context.Modal, { show, hide, cancel })
-</script>
 
-<svelte:window on:keydown={handleKey} />
+  onMount(() => {
+    document.addEventListener("keydown", handleKey)
+    return () => {
+      document.removeEventListener("keydown", handleKey)
+    }
+  })
+</script>
 
 {#if inline}
   {#if visible}
diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js
index b02783e0bd..f2246fbb49 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@@ -104,6 +104,9 @@ export const deepSet = (obj, key, value) => {
  * @param obj the object to clone
  */
 export const cloneDeep = obj => {
+  if (!obj) {
+    return obj
+  }
   return JSON.parse(JSON.stringify(obj))
 }
 
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3f4b4fb274..b87cd3924b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -72,6 +72,7 @@
     "codemirror": "^5.59.0",
     "dayjs": "^1.11.2",
     "downloadjs": "1.4.7",
+    "fast-json-patch": "^3.1.1",
     "lodash": "4.17.21",
     "posthog-js": "^1.36.0",
     "remixicon": "2.5.0",
diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 69bca7eac3..d15cdb6e98 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -5,12 +5,47 @@ import { getThemeStore } from "./store/theme"
 import { derived } from "svelte/store"
 import { findComponent, findComponentPath } from "./componentUtils"
 import { RoleUtils } from "@budibase/frontend-core"
+import { createHistoryStore } from "builderStore/store/history"
+import { get } from "svelte/store"
 
 export const store = getFrontendStore()
 export const automationStore = getAutomationStore()
 export const themeStore = getThemeStore()
 export const temporalStore = getTemporalStore()
 
+// Setup history for screens
+export const screenHistoryStore = createHistoryStore({
+  getDoc: id => get(store).screens?.find(screen => screen._id === id),
+  selectDoc: store.actions.screens.select,
+  afterAction: () => {
+    // Ensure a valid component is selected
+    if (!get(selectedComponent)) {
+      store.update(state => ({
+        ...state,
+        selectedComponentId: get(selectedScreen)?.props._id,
+      }))
+    }
+  },
+})
+store.actions.screens.save = screenHistoryStore.wrapSaveDoc(
+  store.actions.screens.save
+)
+store.actions.screens.delete = screenHistoryStore.wrapDeleteDoc(
+  store.actions.screens.delete
+)
+
+// Setup history for automations
+export const automationHistoryStore = createHistoryStore({
+  getDoc: automationStore.actions.getDefinition,
+  selectDoc: automationStore.actions.select,
+})
+automationStore.actions.save = automationHistoryStore.wrapSaveDoc(
+  automationStore.actions.save
+)
+automationStore.actions.delete = automationHistoryStore.wrapDeleteDoc(
+  automationStore.actions.delete
+)
+
 export const selectedScreen = derived(store, $store => {
   return $store.screens.find(screen => screen._id === $store.selectedScreenId)
 })
@@ -71,3 +106,13 @@ export const selectedComponentPath = derived(
     ).map(component => component._id)
   }
 )
+
+// Derived automation state
+export const selectedAutomation = derived(automationStore, $automationStore => {
+  if (!$automationStore.selectedAutomationId) {
+    return null
+  }
+  return $automationStore.automations?.find(
+    x => x._id === $automationStore.selectedAutomationId
+  )
+})
diff --git a/packages/builder/src/builderStore/store/automation/Automation.js b/packages/builder/src/builderStore/store/automation/Automation.js
deleted file mode 100644
index af0c03cb5a..0000000000
--- a/packages/builder/src/builderStore/store/automation/Automation.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { generate } from "shortid"
-
-/**
- * Class responsible for the traversing of the automation definition.
- * Automation definitions are stored in linked lists.
- */
-export default class Automation {
-  constructor(automation) {
-    this.automation = automation
-  }
-
-  hasTrigger() {
-    return this.automation.definition.trigger
-  }
-
-  addTestData(data) {
-    this.automation.testData = { ...this.automation.testData, ...data }
-  }
-
-  addBlock(block, idx) {
-    // Make sure to add trigger if doesn't exist
-    if (!this.hasTrigger() && block.type === "TRIGGER") {
-      const trigger = { id: generate(), ...block }
-      this.automation.definition.trigger = trigger
-      return trigger
-    }
-
-    const newBlock = { id: generate(), ...block }
-    this.automation.definition.steps.splice(idx, 0, newBlock)
-    return newBlock
-  }
-
-  updateBlock(updatedBlock, id) {
-    const { steps, trigger } = this.automation.definition
-
-    if (trigger && trigger.id === id) {
-      this.automation.definition.trigger = updatedBlock
-      return
-    }
-
-    const stepIdx = steps.findIndex(step => step.id === id)
-    if (stepIdx < 0) throw new Error("Block not found.")
-    steps.splice(stepIdx, 1, updatedBlock)
-    this.automation.definition.steps = steps
-  }
-
-  deleteBlock(id) {
-    const { steps, trigger } = this.automation.definition
-
-    if (trigger && trigger.id === id) {
-      this.automation.definition.trigger = null
-      return
-    }
-
-    const stepIdx = steps.findIndex(step => step.id === id)
-    if (stepIdx < 0) throw new Error("Block not found.")
-    steps.splice(stepIdx, 1)
-    this.automation.definition.steps = steps
-  }
-
-  constructBlock(type, stepId, blockDefinition) {
-    return {
-      ...blockDefinition,
-      inputs: blockDefinition.inputs || {},
-      stepId,
-      type,
-    }
-  }
-}
diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js
index af102ab694..dc1e2a2cc1 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@@ -1,16 +1,18 @@
-import { writable } from "svelte/store"
+import { writable, get } from "svelte/store"
 import { API } from "api"
-import Automation from "./Automation"
 import { cloneDeep } from "lodash/fp"
+import { generate } from "shortid"
+import { selectedAutomation } from "builderStore"
 
 const initialAutomationState = {
   automations: [],
+  testResults: null,
   showTestPanel: false,
   blockDefinitions: {
     TRIGGER: [],
     ACTION: [],
   },
-  selectedAutomation: null,
+  selectedAutomationId: null,
 }
 
 export const getAutomationStore = () => {
@@ -37,49 +39,41 @@ const automationActions = store => ({
       API.getAutomationDefinitions(),
     ])
     store.update(state => {
-      let selected = state.selectedAutomation?.automation
       state.automations = responses[0]
+      state.automations.sort((a, b) => {
+        return a.name < b.name ? -1 : 1
+      })
       state.blockDefinitions = {
         TRIGGER: responses[1].trigger,
         ACTION: responses[1].action,
       }
-      // If previously selected find the new obj and select it
-      if (selected) {
-        selected = responses[0].filter(
-          automation => automation._id === selected._id
-        )
-        state.selectedAutomation = new Automation(selected[0])
-      }
       return state
     })
   },
-  create: async ({ name }) => {
+  create: async (name, trigger) => {
     const automation = {
       name,
       type: "automation",
       definition: {
         steps: [],
+        trigger,
       },
     }
-    const response = await API.createAutomation(automation)
-    store.update(state => {
-      state.automations = [...state.automations, response.automation]
-      store.actions.select(response.automation)
-      return state
-    })
+    const response = await store.actions.save(automation)
+    await store.actions.fetch()
+    store.actions.select(response._id)
+    return response
   },
   duplicate: async automation => {
-    const response = await API.createAutomation({
+    const response = await store.actions.save({
       ...automation,
       name: `${automation.name} - copy`,
       _id: undefined,
       _ref: undefined,
     })
-    store.update(state => {
-      state.automations = [...state.automations, response.automation]
-      store.actions.select(response.automation)
-      return state
-    })
+    await store.actions.fetch()
+    store.actions.select(response._id)
+    return response
   },
   save: async automation => {
     const response = await API.updateAutomation(automation)
@@ -90,11 +84,13 @@ const automationActions = store => ({
       )
       if (existingIdx !== -1) {
         state.automations.splice(existingIdx, 1, updatedAutomation)
-        state.automations = [...state.automations]
-        store.actions.select(updatedAutomation)
         return state
+      } else {
+        state.automations = [...state.automations, updatedAutomation]
       }
+      return state
     })
+    return response.automation
   },
   delete: async automation => {
     await API.deleteAutomation({
@@ -102,34 +98,83 @@ const automationActions = store => ({
       automationRev: automation?._rev,
     })
     store.update(state => {
-      const existingIdx = state.automations.findIndex(
-        existing => existing._id === automation?._id
+      // Remove the automation
+      state.automations = state.automations.filter(
+        x => x._id !== automation._id
       )
-      state.automations.splice(existingIdx, 1)
-      state.automations = [...state.automations]
-      state.selectedAutomation = null
-      state.selectedBlock = null
+      // Select a new automation if required
+      if (automation._id === state.selectedAutomationId) {
+        store.actions.select(state.automations[0]?._id)
+      }
       return state
     })
+    await store.actions.fetch()
+  },
+  updateBlockInputs: async (block, data) => {
+    // Create new modified block
+    let newBlock = {
+      ...block,
+      inputs: {
+        ...block.inputs,
+        ...data,
+      },
+    }
+
+    // Remove any nullish or empty string values
+    Object.keys(newBlock.inputs).forEach(key => {
+      const val = newBlock.inputs[key]
+      if (val == null || val === "") {
+        delete newBlock.inputs[key]
+      }
+    })
+
+    // Create new modified automation
+    const automation = get(selectedAutomation)
+    const newAutomation = store.actions.getUpdatedDefinition(
+      automation,
+      newBlock
+    )
+
+    // Don't save if no changes were made
+    if (JSON.stringify(newAutomation) === JSON.stringify(automation)) {
+      return
+    }
+    await store.actions.save(newAutomation)
   },
   test: async (automation, testData) => {
-    store.update(state => {
-      state.selectedAutomation.testResults = null
-      return state
-    })
     const result = await API.testAutomation({
       automationId: automation?._id,
       testData,
     })
+    if (!result?.trigger && !result?.steps?.length) {
+      throw "Something went wrong testing your automation"
+    }
     store.update(state => {
-      state.selectedAutomation.testResults = result
+      state.testResults = result
       return state
     })
   },
-  select: automation => {
+  getDefinition: id => {
+    return get(store).automations?.find(x => x._id === id)
+  },
+  getUpdatedDefinition: (automation, block) => {
+    let newAutomation = cloneDeep(automation)
+    if (automation.definition.trigger?.id === block.id) {
+      newAutomation.definition.trigger = block
+    } else {
+      const idx = automation.definition.steps.findIndex(x => x.id === block.id)
+      newAutomation.definition.steps.splice(idx, 1, block)
+    }
+    return newAutomation
+  },
+  select: id => {
+    if (!id || id === get(store).selectedAutomationId) {
+      return
+    }
     store.update(state => {
-      state.selectedAutomation = new Automation(cloneDeep(automation))
-      state.selectedBlock = null
+      state.selectedAutomationId = id
+      state.testResults = null
+      state.showTestPanel = false
       return state
     })
   },
@@ -147,48 +192,57 @@ const automationActions = store => ({
       appId,
     })
   },
-  addTestDataToAutomation: data => {
-    store.update(state => {
-      state.selectedAutomation.addTestData(data)
-      return state
-    })
+  addTestDataToAutomation: async data => {
+    let newAutomation = cloneDeep(get(selectedAutomation))
+    newAutomation.testData = {
+      ...newAutomation.testData,
+      ...data,
+    }
+    await store.actions.save(newAutomation)
   },
-  addBlockToAutomation: (block, blockIdx) => {
-    store.update(state => {
-      state.selectedBlock = state.selectedAutomation.addBlock(
-        cloneDeep(block),
-        blockIdx
-      )
-      return state
-    })
+  constructBlock(type, stepId, blockDefinition) {
+    return {
+      ...blockDefinition,
+      inputs: blockDefinition.inputs || {},
+      stepId,
+      type,
+      id: generate(),
+    }
   },
-  toggleFieldControl: value => {
-    store.update(state => {
-      state.selectedBlock.rowControl = value
-      return state
-    })
+  addBlockToAutomation: async (block, blockIdx) => {
+    const automation = get(selectedAutomation)
+    let newAutomation = cloneDeep(automation)
+    if (!automation) {
+      return
+    }
+    newAutomation.definition.steps.splice(blockIdx, 0, block)
+    await store.actions.save(newAutomation)
   },
-  deleteAutomationBlock: block => {
-    store.update(state => {
-      const idx =
-        state.selectedAutomation.automation.definition.steps.findIndex(
-          x => x.id === block.id
-        )
-      state.selectedAutomation.deleteBlock(block.id)
+  /**
+   * "rowControl" appears to be the name of the flag used to determine whether
+   * a certain automation block uses values or bindings as inputs
+   */
+  toggleRowControl: async (block, rowControl) => {
+    const newBlock = { ...block, rowControl }
+    const newAutomation = store.actions.getUpdatedDefinition(
+      get(selectedAutomation),
+      newBlock
+    )
+    await store.actions.save(newAutomation)
+  },
+  deleteAutomationBlock: async block => {
+    const automation = get(selectedAutomation)
+    let newAutomation = cloneDeep(automation)
 
-      // Select next closest step
-      const steps = state.selectedAutomation.automation.definition.steps
-      let nextSelectedBlock
-      if (steps[idx] != null) {
-        nextSelectedBlock = steps[idx]
-      } else if (steps[idx - 1] != null) {
-        nextSelectedBlock = steps[idx - 1]
-      } else {
-        nextSelectedBlock =
-          state.selectedAutomation.automation.definition.trigger || null
-      }
-      state.selectedBlock = nextSelectedBlock
-      return state
-    })
+    // Delete trigger if required
+    if (newAutomation.definition.trigger?.id === block.id) {
+      delete newAutomation.definition.trigger
+    } else {
+      // Otherwise remove step
+      newAutomation.definition.steps = newAutomation.definition.steps.filter(
+        step => step.id !== block.id
+      )
+    }
+    await store.actions.save(newAutomation)
   },
 })
diff --git a/packages/builder/src/builderStore/store/automation/tests/Automation.spec.js b/packages/builder/src/builderStore/store/automation/tests/Automation.spec.js
deleted file mode 100644
index 8378310c2e..0000000000
--- a/packages/builder/src/builderStore/store/automation/tests/Automation.spec.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Automation from "../Automation"
-import TEST_AUTOMATION from "./testAutomation"
-
-const TEST_BLOCK = {
-  id: "AUXJQGZY7",
-  name: "Delay",
-  icon: "ri-time-fill",
-  tagline: "Delay for <b>{{time}}</b> milliseconds",
-  description: "Delay the automation until an amount of time has passed.",
-  params: { time: "number" },
-  type: "LOGIC",
-  args: { time: "5000" },
-  stepId: "DELAY",
-}
-
-describe("Automation Data Object", () => {
-  let automation
-
-  beforeEach(() => {
-    automation = new Automation({ ...TEST_AUTOMATION })
-  })
-
-  it("adds a automation block to the automation", () => {
-    automation.addBlock(TEST_BLOCK)
-    expect(automation.automation.definition)
-  })
-
-  it("updates a automation block with new attributes", () => {
-    const firstBlock = automation.automation.definition.steps[0]
-    const updatedBlock = {
-      ...firstBlock,
-      name: "UPDATED",
-    }
-    automation.updateBlock(updatedBlock, firstBlock.id)
-    expect(automation.automation.definition.steps[0]).toEqual(updatedBlock)
-  })
-
-  it("deletes a automation block successfully", () => {
-    const { steps } = automation.automation.definition
-    const originalLength = steps.length
-
-    const lastBlock = steps[steps.length - 1]
-    automation.deleteBlock(lastBlock.id)
-    expect(automation.automation.definition.steps.length).toBeLessThan(
-      originalLength
-    )
-  })
-})
diff --git a/packages/builder/src/builderStore/store/automation/tests/testAutomation.js b/packages/builder/src/builderStore/store/automation/tests/testAutomation.js
deleted file mode 100644
index 3fafbaf1d0..0000000000
--- a/packages/builder/src/builderStore/store/automation/tests/testAutomation.js
+++ /dev/null
@@ -1,78 +0,0 @@
-export default {
-  name: "Test automation",
-  definition: {
-    steps: [
-      {
-        id: "ANBDINAPS",
-        description: "Send an email.",
-        tagline: "Send email to <b>{{to}}</b>",
-        icon: "ri-mail-open-fill",
-        name: "Send Email",
-        params: {
-          to: "string",
-          from: "string",
-          subject: "longText",
-          text: "longText",
-        },
-        type: "ACTION",
-        args: {
-          text: "A user was created!",
-          subject: "New Budibase User",
-          from: "budimaster@budibase.com",
-          to: "test@test.com",
-        },
-        stepId: "SEND_EMAIL",
-      },
-    ],
-    trigger: {
-      id: "iRzYMOqND",
-      name: "Row Saved",
-      event: "row:save",
-      icon: "ri-save-line",
-      tagline: "Row is added to <b>{{table.name}}</b>",
-      description: "Fired when a row is saved to your database.",
-      params: { table: "table" },
-      type: "TRIGGER",
-      args: {
-        table: {
-          type: "table",
-          views: {},
-          name: "users",
-          schema: {
-            name: {
-              type: "string",
-              constraints: {
-                type: "string",
-                length: { maximum: 123 },
-                presence: { allowEmpty: false },
-              },
-              name: "name",
-            },
-            age: {
-              type: "number",
-              constraints: {
-                type: "number",
-                presence: { allowEmpty: false },
-                numericality: {
-                  greaterThanOrEqualTo: "",
-                  lessThanOrEqualTo: "",
-                },
-              },
-              name: "age",
-            },
-          },
-          _id: "c6b4e610cd984b588837bca27188a451",
-          _rev: "7-b8aa1ce0b53e88928bb88fc11bdc0aff",
-        },
-      },
-      stepId: "ROW_SAVED",
-    },
-  },
-  type: "automation",
-  ok: true,
-  id: "b384f861f4754e1693835324a7fcca62",
-  rev: "1-aa1c2cbd868ef02e26f8fad531dd7e37",
-  live: false,
-  _id: "b384f861f4754e1693835324a7fcca62",
-  _rev: "108-4116829ec375e0481d0ecab9e83a2caf",
-}
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 56b8a599f0..d58a2d5b9e 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -1,6 +1,11 @@
 import { get, writable } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { selectedScreen, selectedComponent } from "builderStore"
+import {
+  selectedScreen,
+  selectedComponent,
+  screenHistoryStore,
+  automationHistoryStore,
+} from "builderStore"
 import {
   datasources,
   integrations,
@@ -122,6 +127,8 @@ export const getFrontendStore = () => {
         navigation: application.navigation || {},
         usedPlugins: application.usedPlugins || [],
       }))
+      screenHistoryStore.reset()
+      automationHistoryStore.reset()
 
       // Initialise backend stores
       database.set(application.instance)
@@ -179,10 +186,7 @@ export const getFrontendStore = () => {
         }
 
         // Check screen isn't already selected
-        if (
-          state.selectedScreenId === screen._id &&
-          state.selectedComponentId === screen.props?._id
-        ) {
+        if (state.selectedScreenId === screen._id) {
           return
         }
 
@@ -256,7 +260,7 @@ export const getFrontendStore = () => {
         }
       },
       save: async screen => {
-        /* 
+        /*
           Temporarily disabled to accomodate migration issues.
           store.actions.screens.validate(screen)
         */
@@ -347,6 +351,7 @@ export const getFrontendStore = () => {
 
           return state
         })
+        return null
       },
       updateSetting: async (screen, name, value) => {
         if (!screen || !name) {
diff --git a/packages/builder/src/builderStore/store/history.js b/packages/builder/src/builderStore/store/history.js
new file mode 100644
index 0000000000..0f21085c6a
--- /dev/null
+++ b/packages/builder/src/builderStore/store/history.js
@@ -0,0 +1,319 @@
+import * as jsonpatch from "fast-json-patch/index.mjs"
+import { writable, derived, get } from "svelte/store"
+
+const Operations = {
+  Add: "Add",
+  Delete: "Delete",
+  Change: "Change",
+}
+
+const initialState = {
+  history: [],
+  position: 0,
+  loading: false,
+}
+
+export const createHistoryStore = ({
+  getDoc,
+  selectDoc,
+  beforeAction,
+  afterAction,
+}) => {
+  // Use a derived store to check if we are able to undo or redo any operations
+  const store = writable(initialState)
+  const derivedStore = derived(store, $store => {
+    return {
+      ...$store,
+      canUndo: $store.position > 0,
+      canRedo: $store.position < $store.history.length,
+    }
+  })
+
+  // Wrapped versions of essential functions which we call ourselves when using
+  // undo and redo
+  let saveFn
+  let deleteFn
+
+  /**
+   * Internal util to set the loading flag
+   */
+  const startLoading = () => {
+    store.update(state => {
+      state.loading = true
+      return state
+    })
+  }
+
+  /**
+   * Internal util to unset the loading flag
+   */
+  const stopLoading = () => {
+    store.update(state => {
+      state.loading = false
+      return state
+    })
+  }
+
+  /**
+   * Resets history state
+   */
+  const reset = () => {
+    store.set(initialState)
+  }
+
+  /**
+   * Adds or updates an operation in history.
+   * For internal use only.
+   * @param operation the operation to save
+   */
+  const saveOperation = operation => {
+    store.update(state => {
+      // Update history
+      let history = state.history
+      let position = state.position
+      if (!operation.id) {
+        // Every time a new operation occurs we discard any redo potential
+        operation.id = Math.random()
+        history = [...history.slice(0, state.position), operation]
+        position += 1
+      } else {
+        // If this is a redo/undo of an existing operation, just update history
+        // to replace the doc object as revisions may have changed
+        const idx = history.findIndex(op => op.id === operation.id)
+        history[idx].doc = operation.doc
+      }
+      return { history, position }
+    })
+  }
+
+  /**
+   * Wraps the save function, which asynchronously updates a doc.
+   * The returned function is an enriched version of the real save function so
+   * that we can control history.
+   * @param fn the save function
+   * @returns {function} a wrapped version of the save function
+   */
+  const wrapSaveDoc = fn => {
+    saveFn = async (doc, operationId) => {
+      // Only works on a single doc at a time
+      if (!doc || Array.isArray(doc)) {
+        return
+      }
+      startLoading()
+      try {
+        const oldDoc = getDoc(doc._id)
+        const newDoc = jsonpatch.deepClone(await fn(doc))
+
+        // Store the change
+        if (!oldDoc) {
+          // If no old doc, this is an add operation
+          saveOperation({
+            type: Operations.Add,
+            doc: newDoc,
+            id: operationId,
+          })
+        } else {
+          // Otherwise this is a change operation
+          saveOperation({
+            type: Operations.Change,
+            forwardPatch: jsonpatch.compare(oldDoc, doc),
+            backwardsPatch: jsonpatch.compare(doc, oldDoc),
+            doc: newDoc,
+            id: operationId,
+          })
+        }
+        stopLoading()
+        return newDoc
+      } catch (error) {
+        // We want to allow errors to propagate up to normal handlers, but we
+        // want to stop loading first
+        stopLoading()
+        throw error
+      }
+    }
+    return saveFn
+  }
+
+  /**
+   * Wraps the delete function, which asynchronously deletes a doc.
+   * The returned function is an enriched version of the real delete function so
+   * that we can control history.
+   * @param fn the delete function
+   * @returns {function} a wrapped version of the delete function
+   */
+  const wrapDeleteDoc = fn => {
+    deleteFn = async (doc, operationId) => {
+      // Only works on a single doc at a time
+      if (!doc || Array.isArray(doc)) {
+        return
+      }
+      startLoading()
+      try {
+        const oldDoc = jsonpatch.deepClone(doc)
+        await fn(doc)
+        saveOperation({
+          type: Operations.Delete,
+          doc: oldDoc,
+          id: operationId,
+        })
+        stopLoading()
+      } catch (error) {
+        // We want to allow errors to propagate up to normal handlers, but we
+        // want to stop loading first
+        stopLoading()
+        throw error
+      }
+    }
+    return deleteFn
+  }
+
+  /**
+   * Asynchronously undoes the previous operation.
+   * Optionally selects the changed document so that changes are visible.
+   * @returns {Promise<void>}
+   */
+  const undo = async () => {
+    // Sanity checks
+    const { canUndo, history, position, loading } = get(derivedStore)
+    if (!canUndo || loading) {
+      return
+    }
+    const operation = history[position - 1]
+    if (!operation) {
+      return
+    }
+    startLoading()
+
+    // Before hook
+    await beforeAction?.(operation)
+
+    // Update state immediately to prevent further clicks and to prevent bad
+    // history in the event of an update failing
+    store.update(state => {
+      return {
+        ...state,
+        position: state.position - 1,
+      }
+    })
+
+    // Undo the operation
+    try {
+      // Undo ADD
+      if (operation.type === Operations.Add) {
+        // Try to get the latest doc version to delete
+        const latestDoc = getDoc(operation.doc._id)
+        const doc = latestDoc || operation.doc
+        await deleteFn(doc, operation.id)
+      }
+
+      // Undo DELETE
+      else if (operation.type === Operations.Delete) {
+        // Delete the _rev from the deleted doc so that we can save it as a new
+        // doc again without conflicts
+        let doc = jsonpatch.deepClone(operation.doc)
+        delete doc._rev
+        const created = await saveFn(doc, operation.id)
+        selectDoc?.(created?._id || doc._id)
+      }
+
+      // Undo CHANGE
+      else {
+        // Get the current doc and apply the backwards patch on top of it
+        let doc = jsonpatch.deepClone(getDoc(operation.doc._id))
+        if (doc) {
+          jsonpatch.applyPatch(
+            doc,
+            jsonpatch.deepClone(operation.backwardsPatch)
+          )
+          await saveFn(doc, operation.id)
+          selectDoc?.(doc._id)
+        }
+      }
+      stopLoading()
+    } catch (error) {
+      stopLoading()
+      throw error
+    }
+
+    // After hook
+    await afterAction?.(operation)
+  }
+
+  /**
+   * Asynchronously redoes the previous undo.
+   * Optionally selects the changed document so that changes are visible.
+   * @returns {Promise<void>}
+   */
+  const redo = async () => {
+    // Sanity checks
+    const { canRedo, history, position, loading } = get(derivedStore)
+    if (!canRedo || loading) {
+      return
+    }
+    const operation = history[position]
+    if (!operation) {
+      return
+    }
+    startLoading()
+
+    // Before hook
+    await beforeAction?.(operation)
+
+    // Update state immediately to prevent further clicks and to prevent bad
+    // history in the event of an update failing
+    store.update(state => {
+      return {
+        ...state,
+        position: state.position + 1,
+      }
+    })
+
+    // Redo the operation
+    try {
+      // Redo ADD
+      if (operation.type === Operations.Add) {
+        // Delete the _rev from the deleted doc so that we can save it as a new
+        // doc again without conflicts
+        let doc = jsonpatch.deepClone(operation.doc)
+        delete doc._rev
+        const created = await saveFn(doc, operation.id)
+        selectDoc?.(created?._id || doc._id)
+      }
+
+      // Redo DELETE
+      else if (operation.type === Operations.Delete) {
+        // Try to get the latest doc version to delete
+        const latestDoc = getDoc(operation.doc._id)
+        const doc = latestDoc || operation.doc
+        await deleteFn(doc, operation.id)
+      }
+
+      // Redo CHANGE
+      else {
+        // Get the current doc and apply the forwards patch on top of it
+        let doc = jsonpatch.deepClone(getDoc(operation.doc._id))
+        if (doc) {
+          jsonpatch.applyPatch(doc, jsonpatch.deepClone(operation.forwardPatch))
+          await saveFn(doc, operation.id)
+          selectDoc?.(doc._id)
+        }
+      }
+      stopLoading()
+    } catch (error) {
+      stopLoading()
+      throw error
+    }
+
+    // After hook
+    await afterAction?.(operation)
+  }
+
+  return {
+    subscribe: derivedStore.subscribe,
+    wrapSaveDoc,
+    wrapDeleteDoc,
+    reset,
+    undo,
+    redo,
+  }
+}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index e852ee1a0d..b80ba45086 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@@ -1,10 +1,10 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { selectedAutomation } from "builderStore"
   import Flowchart from "./FlowChart/FlowChart.svelte"
-
-  $: automation = $automationStore.selectedAutomation?.automation
 </script>
 
-{#if automation}
-  <Flowchart {automation} />
+{#if $selectedAutomation}
+  {#key $selectedAutomation._id}
+    <Flowchart automation={$selectedAutomation} />
+  {/key}
 {/if}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index caf8835b86..f30b49eb39 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -5,7 +5,6 @@
     Detail,
     Body,
     Icon,
-    Tooltip,
     notifications,
   } from "@budibase/bbui"
   import { automationStore } from "builderStore"
@@ -13,7 +12,6 @@
   import { externalActions } from "./ExternalActions"
 
   export let blockIdx
-  export let blockComplete
 
   const disabled = {
     SEND_EMAIL_SMTP: {
@@ -50,15 +48,12 @@
 
   async function addBlockToAutomation() {
     try {
-      const newBlock = $automationStore.selectedAutomation.constructBlock(
+      const newBlock = automationStore.actions.constructBlock(
         "ACTION",
         actionVal.stepId,
         actionVal
       )
-      automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1)
-      await automationStore.actions.save(
-        $automationStore.selectedAutomation?.automation
-      )
+      await automationStore.actions.addBlockToAutomation(newBlock, blockIdx + 1)
     } catch (error) {
       notifications.error("Error saving automation")
     }
@@ -66,20 +61,14 @@
 </script>
 
 <ModalContent
-  title="Create Automation"
+  title="Add automation step"
   confirmText="Save"
   size="M"
   disabled={!selectedAction}
-  onConfirm={() => {
-    blockComplete = true
-    addBlockToAutomation()
-  }}
+  onConfirm={addBlockToAutomation}
 >
-  <Body size="XS">Select an app or event.</Body>
-
-  <Layout noPadding>
-    <Body size="S">Apps</Body>
-
+  <Layout noPadding gap="XS">
+    <Detail size="S">Apps</Detail>
     <div class="item-list">
       {#each Object.entries(external) as [idx, action]}
         <div
@@ -95,64 +84,45 @@
               alt="zapier"
             />
             <span class="icon-spacing">
-              <Body size="XS">{idx.charAt(0).toUpperCase() + idx.slice(1)}</Body
-              ></span
-            >
+              <Body size="XS">
+                {idx.charAt(0).toUpperCase() + idx.slice(1)}
+              </Body>
+            </span>
           </div>
         </div>
       {/each}
     </div>
+  </Layout>
 
+  <Layout noPadding gap="XS">
     <Detail size="S">Actions</Detail>
-
     <div class="item-list">
       {#each Object.entries(internal) as [idx, action]}
-        {#if disabled[idx] && disabled[idx].disabled}
-          <Tooltip text={disabled[idx].message} direction="bottom">
-            <div
-              class="item"
-              class:selected={selectedAction === action.name}
-              class:disabled={true}
-              on:click={() => selectAction(action)}
-            >
-              <div class="item-body">
-                <Icon name={action.icon} />
-                <span class="icon-spacing">
-                  <Body size="XS">{action.name}</Body></span
-                >
-              </div>
-            </div>
-          </Tooltip>
-        {:else}
-          <div
-            class="item"
-            class:selected={selectedAction === action.name}
-            on:click={() => selectAction(action)}
-          >
-            <div class="item-body">
-              <Icon name={action.icon} />
-              <span class="icon-spacing">
-                <Body size="XS">{action.name}</Body></span
-              >
-            </div>
+        {@const isDisabled = disabled[idx] && disabled[idx].disabled}
+        <div
+          class="item"
+          class:disabled={isDisabled}
+          class:selected={selectedAction === action.name}
+          on:click={isDisabled ? null : () => selectAction(action)}
+        >
+          <div class="item-body">
+            <Icon name={action.icon} />
+            <Body size="XS">{action.name}</Body>
+            {#if isDisabled}
+              <Icon name="Help" tooltip={disabled[idx].message} />
+            {/if}
           </div>
-        {/if}
+        </div>
       {/each}
     </div>
   </Layout>
 </ModalContent>
 
 <style>
-  .disabled {
-    opacity: 0.3;
-    pointer-events: none;
-  }
-  .icon-spacing {
-    margin-left: var(--spacing-m);
-  }
   .item-body {
     display: flex;
     margin-left: var(--spacing-m);
+    gap: var(--spacing-m);
   }
   .item-list {
     display: grid;
@@ -171,8 +141,15 @@
     box-sizing: border-box;
     border-width: 2px;
   }
-  .item:hover,
+  .item:not(.disabled):hover,
   .selected {
     background: var(--spectrum-alias-background-color-tertiary);
   }
+  .disabled {
+    background: var(--spectrum-global-color-gray-200);
+    color: var(--spectrum-global-color-gray-500);
+  }
+  .disabled :global(.spectrum-Body) {
+    color: var(--spectrum-global-color-gray-600);
+  }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 4b01616b54..63a3478ef3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import FlowItem from "./FlowItem.svelte"
   import TestDataModal from "./TestDataModal.svelte"
@@ -13,27 +13,28 @@
     Modal,
   } from "@budibase/bbui"
   import { ActionStepID } from "constants/backend/automations"
+  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { automationHistoryStore } from "builderStore"
 
   export let automation
+
   let testDataModal
-  let blocks
   let confirmDeleteDialog
 
-  $: {
-    blocks = []
-    if (automation) {
-      if (automation.definition.trigger) {
-        blocks.push(automation.definition.trigger)
-      }
-      blocks = blocks.concat(automation.definition.steps || [])
+  $: blocks = getBlocks(automation)
+
+  const getBlocks = automation => {
+    let blocks = []
+    if (automation.definition.trigger) {
+      blocks.push(automation.definition.trigger)
     }
+    blocks = blocks.concat(automation.definition.steps || [])
+    return blocks
   }
 
   async function deleteAutomation() {
     try {
-      await automationStore.actions.delete(
-        $automationStore.selectedAutomation?.automation
-      )
+      await automationStore.actions.delete($selectedAutomation)
     } catch (error) {
       notifications.error("Error deleting automation")
     }
@@ -41,20 +42,17 @@
 </script>
 
 <div class="canvas">
-  <div style="float: left; padding-left: var(--spacing-xl);">
+  <div class="header">
     <Heading size="S">{automation.name}</Heading>
-  </div>
-  <div style="float: right; padding-right: var(--spacing-xl);" class="title">
-    <div class="subtitle">
-      <div style="display:flex; align-items: center;">
-        <div class="icon">
-          <Icon
-            on:click={confirmDeleteDialog.show}
-            hoverable
-            size="M"
-            name="DeleteOutline"
-          />
-        </div>
+    <div class="controls">
+      <UndoRedoControl store={automationHistoryStore} />
+      <Icon
+        on:click={confirmDeleteDialog.show}
+        hoverable
+        size="M"
+        name="DeleteOutline"
+      />
+      <div class="buttons">
         <ActionButton
           on:click={() => {
             testDataModal.show()
@@ -62,15 +60,13 @@
           icon="MultipleCheck"
           size="M">Run test</ActionButton
         >
-        <div style="padding-left: var(--spacing-m);">
-          <ActionButton
-            disabled={!$automationStore.selectedAutomation?.testResults}
-            on:click={() => {
-              $automationStore.showTestPanel = true
-            }}
-            size="M">Test Details</ActionButton
-          >
-        </div>
+        <ActionButton
+          disabled={!$automationStore.testResults}
+          on:click={() => {
+            $automationStore.showTestPanel = true
+          }}
+          size="M">Test Details</ActionButton
+        >
       </div>
     </div>
   </div>
@@ -80,7 +76,7 @@
     <div
       class="block"
       animate:flip={{ duration: 500 }}
-      in:fly|local={{ x: 500, duration: 500 }}
+      in:fly={{ x: 500, duration: 500 }}
       out:fly|local={{ x: 500, duration: 500 }}
     >
       {#if block.stepId !== ActionStepID.LOOP}
@@ -105,6 +101,9 @@
 </Modal>
 
 <style>
+  .canvas {
+    padding: var(--spacing-l) var(--spacing-xl);
+  }
   /* Fix for firefox not respecting bottom padding in scrolling containers */
   .canvas > *:last-child {
     padding-bottom: 40px;
@@ -122,18 +121,19 @@
     text-align: left;
   }
 
-  .title {
-    padding-bottom: var(--spacing-xl);
-  }
-
-  .subtitle {
-    padding-bottom: var(--spacing-xl);
+  .header {
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
-  .icon {
-    cursor: pointer;
-    padding-right: var(--spacing-m);
+  .controls,
+  .buttons {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    gap: var(--spacing-xl);
+  }
+  .buttons {
+    gap: var(--spacing-s);
   }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index d6e5fcb36d..7484a60502 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import {
     Icon,
     Divider,
@@ -23,36 +23,26 @@
   export let block
   export let testDataModal
   export let idx
+
   let selected
   let webhookModal
   let actionModal
-  let blockComplete
+  let open = true
   let showLooping = false
   let role
 
-  $: automationId = $automationStore.selectedAutomation?.automation._id
+  $: automationId = $selectedAutomation?._id
   $: showBindingPicker =
     block.stepId === ActionStepID.CREATE_ROW ||
     block.stepId === ActionStepID.UPDATE_ROW
-
   $: isTrigger = block.type === "TRIGGER"
-
-  $: selected = $automationStore.selectedBlock?.id === block.id
-  $: steps =
-    $automationStore.selectedAutomation?.automation?.definition?.steps ?? []
-
+  $: steps = $selectedAutomation?.definition?.steps ?? []
   $: blockIdx = steps.findIndex(step => step.id === block.id)
   $: lastStep = !isTrigger && blockIdx + 1 === steps.length
-
-  $: totalBlocks =
-    $automationStore.selectedAutomation?.automation?.definition?.steps.length +
-    1
-
-  $: loopingSelected =
-    $automationStore.selectedAutomation?.automation.definition.steps.find(
-      x => x.blockToLoop === block.id
-    )
-
+  $: totalBlocks = $selectedAutomation?.definition?.steps.length + 1
+  $: loopBlock = $selectedAutomation?.definition.steps.find(
+    x => x.blockToLoop === block.id
+  )
   $: isAppAction = block?.stepId === TriggerStepID.APP
   $: isAppAction && setPermissions(role)
   $: isAppAction && getPermissions(automationId)
@@ -81,76 +71,54 @@
   }
 
   async function removeLooping() {
-    loopingSelected = false
-    let loopBlock =
-      $automationStore.selectedAutomation?.automation.definition.steps.find(
-        x => x.blockToLoop === block.id
-      )
-    automationStore.actions.deleteAutomationBlock(loopBlock)
-    await automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation
+    let loopBlock = $selectedAutomation?.definition.steps.find(
+      x => x.blockToLoop === block.id
     )
+    try {
+      await automationStore.actions.deleteAutomationBlock(loopBlock)
+    } catch (error) {
+      notifications.error("Error saving automation")
+    }
   }
 
   async function deleteStep() {
-    let loopBlock =
-      $automationStore.selectedAutomation?.automation.definition.steps.find(
-        x => x.blockToLoop === block.id
-      )
+    let loopBlock = $selectedAutomation?.definition.steps.find(
+      x => x.blockToLoop === block.id
+    )
 
     try {
       if (loopBlock) {
-        automationStore.actions.deleteAutomationBlock(loopBlock)
+        await automationStore.actions.deleteAutomationBlock(loopBlock)
       }
-      automationStore.actions.deleteAutomationBlock(block)
-      await automationStore.actions.save(
-        $automationStore.selectedAutomation?.automation
-      )
+      await automationStore.actions.deleteAutomationBlock(block)
     } catch (error) {
-      notifications.error("Error saving notification")
+      notifications.error("Error saving automation")
     }
   }
-  function toggleFieldControl(evt) {
-    onSelect(block)
-    let rowControl
-    if (evt.detail === "Use values") {
-      rowControl = false
-    } else {
-      rowControl = true
-    }
-    automationStore.actions.toggleFieldControl(rowControl)
-    automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation
-    )
+
+  /**
+   * "rowControl" appears to be the name of the flag used to determine whether
+   * a certain automation block uses values or bindings as inputs
+   */
+  function toggleRowControl(evt) {
+    const rowControl = evt.detail !== "Use values"
+    automationStore.actions.toggleRowControl(block, rowControl)
   }
 
   async function addLooping() {
-    loopingSelected = true
     const loopDefinition = $automationStore.blockDefinitions.ACTION.LOOP
-
-    const loopBlock = $automationStore.selectedAutomation.constructBlock(
+    const loopBlock = automationStore.actions.constructBlock(
       "ACTION",
       "LOOP",
       loopDefinition
     )
     loopBlock.blockToLoop = block.id
-    block.loopBlock = loopBlock.id
-    automationStore.actions.addBlockToAutomation(loopBlock, blockIdx)
-    await automationStore.actions.save(
-      $automationStore.selectedAutomation?.automation
-    )
-  }
-
-  async function onSelect(block) {
-    await automationStore.update(state => {
-      state.selectedBlock = block
-      return state
-    })
+    await automationStore.actions.addBlockToAutomation(loopBlock, blockIdx)
   }
 </script>
 
 <div class={`block ${block.type} hoverable`} class:selected on:click={() => {}}>
-  {#if loopingSelected}
+  {#if loopBlock}
     <div class="blockSection">
       <div
         on:click={() => {
@@ -174,13 +142,8 @@
         </div>
 
         <div class="blockTitle">
-          <div
-            style="margin-left: 10px;"
-            on:click={() => {
-              onSelect(block)
-            }}
-          >
-            <Icon name={showLooping ? "ChevronUp" : "ChevronDown"} />
+          <div style="margin-left: 10px;" on:click={() => {}}>
+            <Icon hoverable name={showLooping ? "ChevronDown" : "ChevronUp"} />
           </div>
         </div>
       </div>
@@ -198,9 +161,7 @@
               $automationStore.blockDefinitions.ACTION.LOOP.schema.inputs
                 .properties
             )}
-            block={$automationStore.selectedAutomation?.automation.definition.steps.find(
-              x => x.blockToLoop === block.id
-            )}
+            block={loopBlock}
             {webhookModal}
           />
         </Layout>
@@ -209,22 +170,28 @@
     {/if}
   {/if}
 
-  <FlowItemHeader bind:blockComplete {block} {testDataModal} {idx} />
-  {#if !blockComplete}
+  <FlowItemHeader
+    {open}
+    {block}
+    {testDataModal}
+    {idx}
+    on:toggle={() => (open = !open)}
+  />
+  {#if open}
     <Divider noMargin />
     <div class="blockSection">
       <Layout noPadding gap="S">
         {#if !isTrigger}
           <div>
             <div class="block-options">
-              {#if !loopingSelected}
-                <ActionButton on:click={() => addLooping()} icon="Reuse"
-                  >Add Looping</ActionButton
-                >
+              {#if !loopBlock}
+                <ActionButton on:click={() => addLooping()} icon="Reuse">
+                  Add Looping
+                </ActionButton>
               {/if}
               {#if showBindingPicker}
                 <Select
-                  on:change={toggleFieldControl}
+                  on:change={toggleRowControl}
                   defaultValue="Use values"
                   autoWidth
                   value={block.rowControl ? "Use bindings" : "Use values"}
@@ -250,16 +217,16 @@
           {webhookModal}
         />
         {#if lastStep}
-          <Button on:click={() => testDataModal.show()} cta
-            >Finish and test automation</Button
-          >
+          <Button on:click={() => testDataModal.show()} cta>
+            Finish and test automation
+          </Button>
         {/if}
       </Layout>
     </div>
   {/if}
 
   <Modal bind:this={actionModal} width="30%">
-    <ActionModal {blockIdx} bind:blockComplete />
+    <ActionModal {blockIdx} />
   </Modal>
 
   <Modal bind:this={webhookModal} width="30%">
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index bc40b7bf85..c09474a370 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -2,21 +2,22 @@
   import { automationStore } from "builderStore"
   import { Icon, Body, Detail, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
+  import { createEventDispatcher } from "svelte"
 
   export let block
-  export let blockComplete
+  export let open
   export let showTestStatus = false
-  export let showParameters = {}
   export let testResult
   export let isTrigger
   export let idx
 
+  const dispatch = createEventDispatcher()
+
   $: {
     if (!testResult) {
-      testResult =
-        $automationStore.selectedAutomation?.testResults?.steps.filter(step =>
-          block.id ? step.id === block.id : step.stepId === block.stepId
-        )[0]
+      testResult = $automationStore.testResults?.steps?.filter(step =>
+        block.id ? step.id === block.id : step.stepId === block.stepId
+      )?.[0]
     }
   }
   $: isTrigger = isTrigger || block.type === "TRIGGER"
@@ -45,13 +46,7 @@
 </script>
 
 <div class="blockSection">
-  <div
-    on:click={() => {
-      blockComplete = !blockComplete
-      showParameters[block.id] = blockComplete
-    }}
-    class="splitHeader"
-  >
+  <div on:click={() => dispatch("toggle")} class="splitHeader">
     <div class="center-items">
       {#if externalActions[block.stepId]}
         <img
@@ -99,7 +94,7 @@
           onSelect(block)
         }}
       >
-        <Icon hoverable name={blockComplete ? "ChevronUp" : "ChevronDown"} />
+        <Icon hoverable name={open ? "ChevronUp" : "ChevronDown"} />
       </div>
     </div>
   </div>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 3beb6cd79b..cd170142e4 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -7,7 +7,7 @@
     Label,
     notifications,
   } from "@budibase/bbui"
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
 
@@ -17,9 +17,7 @@
 
   $: {
     // clone the trigger so we're not mutating the reference
-    trigger = cloneDeep(
-      $automationStore.selectedAutomation.automation.definition.trigger
-    )
+    trigger = cloneDeep($selectedAutomation.definition.trigger)
 
     // get the outputs so we can define the fields
     let schema = Object.entries(trigger.schema?.outputs?.properties || {})
@@ -32,7 +30,7 @@
   }
 
   // check to see if there is existing test data in the store
-  $: testData = $automationStore.selectedAutomation.automation.testData || {}
+  $: testData = $selectedAutomation.testData || {}
 
   // Check the schema to see if required fields have been entered
   $: isError = !trigger.schema.outputs.required.every(
@@ -51,10 +49,7 @@
 
   const testAutomation = async () => {
     try {
-      await automationStore.actions.test(
-        $automationStore.selectedAutomation?.automation,
-        testData
-      )
+      await automationStore.actions.test($selectedAutomation, testData)
       $automationStore.showTestPanel = true
     } catch (error) {
       notifications.error("Error testing automation")
@@ -70,8 +65,8 @@
   onConfirm={testAutomation}
   cancelText="Cancel"
 >
-  <Tabs selected="Form" quiet
-    ><Tab icon="Form" title="Form">
+  <Tabs selected="Form" quiet>
+    <Tab icon="Form" title="Form">
       <div class="tab-content-padding">
         <AutomationBlockSetup
           {testData}
@@ -86,11 +81,7 @@
         <Label>JSON</Label>
         <div class="text-area-container">
           <TextArea
-            value={JSON.stringify(
-              $automationStore.selectedAutomation.automation.testData,
-              null,
-              2
-            )}
+            value={JSON.stringify($selectedAutomation.testData, null, 2)}
             error={failedParse}
             on:change={e => parseTestJSON(e)}
           />
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
index bd46c70df5..d74eab3622 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
@@ -7,7 +7,7 @@
   export let testResults
   export let width = "400px"
 
-  let showParameters
+  let openBlocks = {}
   let blocks
 
   function prepTestResults(results) {
@@ -48,14 +48,15 @@
     <div class="block" style={width ? `width: ${width}` : ""}>
       {#if block.stepId !== ActionStepID.LOOP}
         <FlowItemHeader
-          showTestStatus={true}
-          bind:showParameters
-          {block}
+          open={!!openBlocks[block.id]}
+          on:toggle={() => (openBlocks[block.id] = !openBlocks[block.id])}
           isTrigger={idx === 0}
-          {idx}
           testResult={filteredResults?.[idx]}
+          showTestStatus
+          {block}
+          {idx}
         />
-        {#if showParameters && showParameters[block.id]}
+        {#if openBlocks[block.id]}
           <Divider noMargin />
           {#if filteredResults?.[idx]?.outputs.iterations}
             <div style="display: flex; padding: 10px 10px 0px 12px;">
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
index 4f09edf7c2..c2626fb3c2 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
@@ -2,26 +2,8 @@
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
   import { automationStore } from "builderStore"
-  import { ActionStepID } from "constants/backend/automations"
 
   export let automation
-
-  let blocks, testResults
-
-  $: {
-    blocks = []
-    if (automation) {
-      if (automation.definition.trigger) {
-        blocks.push(automation.definition.trigger)
-      }
-      blocks = blocks
-        .concat(automation.definition.steps || [])
-        .filter(x => x.stepId !== ActionStepID.LOOP)
-    } else if ($automationStore.selectedAutomation) {
-      automation = $automationStore.selectedAutomation
-    }
-  }
-  $: testResults = $automationStore.selectedAutomation?.testResults
 </script>
 
 <div class="title">
@@ -42,7 +24,7 @@
 
 <Divider />
 
-<TestDisplay {automation} {testResults} />
+<TestDisplay {automation} testResults={$automationStore.testResults} />
 
 <style>
   .title {
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index c7bd43661b..80d65a5cb6 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -1,12 +1,11 @@
 <script>
   import { onMount } from "svelte"
-  import { goto } from "@roxi/routify"
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
   import { notifications } from "@budibase/bbui"
 
-  $: selectedAutomationId = $automationStore.selectedAutomation?.automation?._id
+  $: selectedAutomationId = $selectedAutomation?._id
 
   onMount(async () => {
     try {
@@ -16,9 +15,8 @@
     }
   })
 
-  function selectAutomation(automation) {
-    automationStore.actions.select(automation)
-    $goto(`./${automation._id}`)
+  function selectAutomation(id) {
+    automationStore.actions.select(id)
   }
 </script>
 
@@ -29,7 +27,7 @@
       icon="ShareAndroid"
       text={automation.name}
       selected={automation._id === selectedAutomationId}
-      on:click={() => selectAutomation(automation)}
+      on:click={() => selectAutomation(automation._id)}
     >
       <EditAutomationPopover {automation} />
     </NavItem>
@@ -42,5 +40,6 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
+    margin: 0 calc(-1 * var(--spacing-xl));
   }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index dc442c0fae..85e6a5faa3 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -1,36 +1,20 @@
 <script>
   import AutomationList from "./AutomationList.svelte"
   import CreateAutomationModal from "./CreateAutomationModal.svelte"
-  import { Modal, Tabs, Tab, Button, Layout } from "@budibase/bbui"
+  import { Modal, Button, Layout } from "@budibase/bbui"
+  import Panel from "components/design/Panel.svelte"
 
   export let modal
   export let webhookModal
 </script>
 
-<div class="nav">
-  <Tabs selected="Automations">
-    <Tab title="Automations">
-      <Layout paddingX="L" paddingY="L" gap="S">
-        <Button cta wide on:click={modal.show}>Add automation</Button>
-      </Layout>
-      <AutomationList />
-      <Modal bind:this={modal}>
-        <CreateAutomationModal {webhookModal} />
-      </Modal>
-    </Tab>
-  </Tabs>
-</div>
+<Panel title="Automations" borderRight>
+  <Layout paddingX="L" paddingY="XL" gap="S">
+    <Button cta on:click={modal.show}>Add automation</Button>
+    <AutomationList />
+  </Layout>
+</Panel>
 
-<style>
-  .nav {
-    overflow-y: auto;
-    background: var(--background);
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    position: relative;
-    border-right: var(--border-light);
-    padding-bottom: 60px;
-  }
-</style>
+<Modal bind:this={modal}>
+  <CreateAutomationModal {webhookModal} />
+</Modal>
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 3549bc6de8..5fb27eaaf3 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,6 +1,4 @@
 <script>
-  import { goto } from "@roxi/routify"
-  import { database } from "stores/backend"
   import { automationStore } from "builderStore"
   import { notifications } from "@budibase/bbui"
   import {
@@ -10,48 +8,37 @@
     Layout,
     Body,
     Icon,
+    Label,
   } from "@budibase/bbui"
   import { TriggerStepID } from "constants/backend/automations"
 
+  export let webhookModal
+
   let name
   let selectedTrigger
   let nameTouched = false
   let triggerVal
-  export let webhookModal
 
-  $: instanceId = $database._id
   $: nameError =
     nameTouched && !name ? "Please specify a name for the automation." : null
+  $: triggers = Object.entries($automationStore.blockDefinitions.TRIGGER)
 
   async function createAutomation() {
     try {
-      await automationStore.actions.create({
-        name,
-        instanceId,
-      })
-      const newBlock = $automationStore.selectedAutomation.constructBlock(
+      const trigger = automationStore.actions.constructBlock(
         "TRIGGER",
         triggerVal.stepId,
         triggerVal
       )
-
-      automationStore.actions.addBlockToAutomation(newBlock)
+      await automationStore.actions.create(name, trigger)
       if (triggerVal.stepId === TriggerStepID.WEBHOOK) {
-        webhookModal.show
+        webhookModal.show()
       }
-
-      await automationStore.actions.save(
-        $automationStore.selectedAutomation?.automation
-      )
-
       notifications.success(`Automation ${name} created`)
-
-      $goto(`./${$automationStore.selectedAutomation.automation._id}`)
     } catch (error) {
       notifications.error("Error creating automation")
     }
   }
-  $: triggers = Object.entries($automationStore.blockDefinitions.TRIGGER)
 
   const selectTrigger = trigger => {
     triggerVal = trigger
@@ -70,9 +57,9 @@
     header="You must publish your app to activate your automations."
     message="To test your automation before publishing, you can use the 'Run Test' functionality on the next screen."
   />
-  <Body size="XS"
-    >Please name your automation, then select a trigger. Every automation must
-    start with a trigger.
+  <Body size="S">
+    Please name your automation, then select a trigger.<br />
+    Every automation must start with a trigger.
   </Body>
   <Input
     bind:value={name}
@@ -81,9 +68,8 @@
     label="Name"
   />
 
-  <Layout noPadding>
-    <Body size="S">Triggers</Body>
-
+  <Layout noPadding gap="XS">
+    <Label size="S">Trigger</Label>
     <div class="item-list">
       {#each triggers as [idx, trigger]}
         <div
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index 30892882bf..0ce9c781ac 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { goto } from "@roxi/routify"
   import { automationStore } from "builderStore"
   import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -14,7 +13,6 @@
     try {
       await automationStore.actions.delete(automation)
       notifications.success("Automation deleted successfully")
-      $goto("../automate")
     } catch (error) {
       notifications.error("Error deleting automation")
     }
@@ -24,7 +22,6 @@
     try {
       await automationStore.actions.duplicate(automation)
       notifications.success("Automation has been duplicated successfully")
-      $goto(`./${$automationStore.selectedAutomation.automation._id}`)
     } catch (error) {
       notifications.error("Error duplicating automation")
     }
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index 9075a5433c..ac96eb6b70 100644
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@@ -3,13 +3,13 @@
   import { notifications } from "@budibase/bbui"
   import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
 
+  export let automation
+  export let onCancel = undefined
+
   let name
   let error = ""
   let modal
 
-  export let automation
-  export let onCancel = undefined
-
   export const show = () => {
     name = automation?.name
     modal.show()
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index a3fc44f8c2..f47fb8a086 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -15,8 +15,7 @@
     notifications,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import { tables } from "stores/backend"
   import { environment, licensing } from "stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
@@ -50,22 +49,8 @@
   $: filters = lookForFilters(schemaProperties) || []
   $: tempFilters = filters
   $: stepId = block.stepId
-  $: bindings = getAvailableBindings(
-    block || $automationStore.selectedBlock,
-    $automationStore.selectedAutomation?.automation?.definition
-  )
-
+  $: bindings = getAvailableBindings(block, $selectedAutomation?.definition)
   $: getInputData(testData, block.inputs)
-  const getInputData = (testData, blockInputs) => {
-    let newInputData = testData || blockInputs
-
-    if (block.event === "app:trigger" && !newInputData?.fields) {
-      newInputData = cloneDeep(blockInputs)
-    }
-
-    inputData = newInputData
-  }
-
   $: tableId = inputData ? inputData.tableId : null
   $: table = tableId
     ? $tables.list.find(table => table._id === inputData.tableId)
@@ -76,39 +61,48 @@
   $: isTrigger = block?.type === "TRIGGER"
   $: isUpdateRow = stepId === ActionStepID.UPDATE_ROW
 
+  const getInputData = (testData, blockInputs) => {
+    let newInputData = testData || blockInputs
+    if (block.event === "app:trigger" && !newInputData?.fields) {
+      newInputData = cloneDeep(blockInputs)
+    }
+    inputData = newInputData
+  }
+
   const onChange = Utils.sequential(async (e, key) => {
+    // We need to cache the schema as part of the definition because it is
+    // used in the server to detect relationships. It would be far better to
+    // instead fetch the schema in the backend at runtime.
+    let schema
     if (e.detail?.tableId) {
-      const tableSchema = getSchemaForTable(e.detail.tableId, {
+      schema = getSchemaForTable(e.detail.tableId, {
         searchableSchema: true,
       }).schema
-      if (isTestModal) {
-        testData.schema = tableSchema
-      } else {
-        block.inputs.schema = tableSchema
-      }
     }
+
     try {
       if (isTestModal) {
+        let newTestData = { schema }
+
         // Special case for webhook, as it requires a body, but the schema already brings back the body's contents
         if (stepId === TriggerStepID.WEBHOOK) {
-          automationStore.actions.addTestDataToAutomation({
+          newTestData = {
+            ...newTestData,
             body: {
               [key]: e.detail,
-              ...$automationStore.selectedAutomation.automation.testData?.body,
+              ...$selectedAutomation.testData?.body,
             },
-          })
+          }
         }
-        automationStore.actions.addTestDataToAutomation({
+        newTestData = {
+          ...newTestData,
           [key]: e.detail,
-        })
-        testData[key] = e.detail
+        }
+        await automationStore.actions.addTestDataToAutomation(newTestData)
       } else {
-        block.inputs[key] = e.detail
+        const data = { schema, [key]: e.detail }
+        await automationStore.actions.updateBlockInputs(block, data)
       }
-
-      await automationStore.actions.save(
-        $automationStore.selectedAutomation?.automation
-      )
     } catch (error) {
       notifications.error("Error saving automation")
     }
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index f2da863424..162285fd73 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -5,7 +5,11 @@
   const dispatch = createEventDispatcher()
 
   export let value
+
   const onChange = e => {
+    if (e.detail === value) {
+      return
+    }
     value = e.detail
     dispatch("change", e.detail)
   }
@@ -43,7 +47,12 @@
 </script>
 
 <div class="block-field">
-  <Input on:change={onChange} {value} on:blur={() => (touched = true)} />
+  <Input
+    on:change={onChange}
+    {value}
+    on:blur={() => (touched = true)}
+    updateOnChange={false}
+  />
   {#if touched && !value}
     <Label><div class="error">Please specify a CRON expression</div></Label>
   {/if}
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 59bf818b71..86eadd66a1 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,17 +1,18 @@
 <script>
   import { Icon, notifications } from "@budibase/bbui"
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"
 
   const POLL_RATE_MS = 2500
+
   let interval
   let finished = false
   let schemaURL
   let propCount = 0
 
-  $: automation = $automationStore.selectedAutomation?.automation
+  $: automation = $selectedAutomation
 
   onMount(async () => {
     if (!automation?.definition?.trigger?.inputs.schemaUrl) {
diff --git a/packages/builder/src/components/common/UndoRedoControl.svelte b/packages/builder/src/components/common/UndoRedoControl.svelte
new file mode 100644
index 0000000000..321350e32a
--- /dev/null
+++ b/packages/builder/src/components/common/UndoRedoControl.svelte
@@ -0,0 +1,57 @@
+<script>
+  import { Icon } from "@budibase/bbui"
+  import { onMount } from "svelte"
+
+  export let store
+
+  const handleKeyPress = e => {
+    if (!(e.ctrlKey || e.metaKey)) {
+      return
+    }
+    if (e.shiftKey && e.key === "Z") {
+      store.redo()
+    } else if (e.key === "z") {
+      store.undo()
+    }
+  }
+
+  onMount(() => {
+    document.addEventListener("keydown", handleKeyPress)
+
+    return () => {
+      document.removeEventListener("keydown", handleKeyPress)
+    }
+  })
+</script>
+
+<div class="undo-redo">
+  <Icon
+    name="Undo"
+    hoverable
+    on:click={store.undo}
+    disabled={!$store.canUndo}
+    tooltip="Undo latest change"
+  />
+  <Icon
+    name="Redo"
+    hoverable
+    on:click={store.redo}
+    disabled={!$store.canRedo}
+    tooltip="Redo latest undo"
+  />
+</div>
+
+<style>
+  .undo-redo {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    gap: var(--spacing-xs);
+    padding-right: var(--spacing-xl);
+    border-right: var(--border-light);
+  }
+  .undo-redo :global(svg) {
+    padding: 6px;
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
index 6a23ba8cbd..2c5f07240e 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
@@ -42,29 +42,22 @@
       return
     }
     try {
-      await automationStore.actions.create({
-        name: parameters.newAutomationName,
-      })
-      const appActionDefinition = $automationStore.blockDefinitions.TRIGGER.APP
-      const newBlock = $automationStore.selectedAutomation.constructBlock(
+      let trigger = automationStore.actions.constructBlock(
         "TRIGGER",
         "APP",
-        appActionDefinition
+        $automationStore.blockDefinitions.TRIGGER.APP
       )
-
-      newBlock.inputs = {
+      trigger.inputs = {
         fields: Object.keys(parameters.fields ?? {}).reduce((fields, key) => {
           fields[key] = "string"
           return fields
         }, {}),
       }
-
-      automationStore.actions.addBlockToAutomation(newBlock)
-      await automationStore.actions.save(
-        $automationStore.selectedAutomation?.automation
+      const automation = await automationStore.actions.create(
+        parameters.newAutomationName,
+        trigger
       )
-      parameters.automationId =
-        $automationStore.selectedAutomation.automation._id
+      parameters.automationId = automation._id
       delete parameters.newAutomationName
     } catch (error) {
       notifications.error("Error creating automation")
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index cc1a70b3bc..dc87054b0c 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -149,6 +149,7 @@
     <Layout gap="XS" noPadding justifyItems="center">
       <Button
         cta
+        size="L"
         disabled={Object.keys(errors).length > 0 || submitted}
         on:click={save}
       >
diff --git a/packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automationId]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte
rename to packages/builder/src/pages/builder/app/[application]/automate/[automationId]/_layout.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automationId]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/automate/[automationId]/index.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
index b1d01d58cf..74dfe671ab 100644
--- a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
@@ -1,30 +1,40 @@
 <script>
   import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import { automationStore } from "builderStore"
+  import { automationStore, selectedAutomation } from "builderStore"
   import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
   import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
   import TestPanel from "components/automation/AutomationBuilder/TestPanel.svelte"
-  import { onMount } from "svelte"
+  import { onDestroy, onMount } from "svelte"
+  import { syncURLToState } from "helpers/urlStateSync"
+  import * as routify from "@roxi/routify"
 
-  $: automation =
-    $automationStore.selectedAutomation?.automation ||
-    $automationStore.automations[0]
+  // Keep URL and state in sync for selected screen ID
+  const stopSyncing = syncURLToState({
+    urlParam: "automationId",
+    stateKey: "selectedAutomationId",
+    validate: id => $automationStore.automations.some(x => x._id === id),
+    fallbackUrl: "./index",
+    store: automationStore,
+    up: automationStore.actions.select,
+    routify,
+  })
 
   let modal
   let webhookModal
+
   onMount(() => {
     $automationStore.showTestPanel = false
   })
+
+  onDestroy(stopSyncing)
 </script>
 
 <!-- routify:options index=3 -->
 <div class="root">
-  <div class="nav">
-    <AutomationPanel {modal} {webhookModal} />
-  </div>
+  <AutomationPanel {modal} {webhookModal} />
   <div class="content">
-    {#if automation}
+    {#if $automationStore.automations?.length}
       <slot />
     {:else}
       <div class="centered">
@@ -40,9 +50,9 @@
             </svg>
             <Heading size="M">You have no automations</Heading>
             <Body size="M">Let's fix that. Call the bots!</Body>
-            <Button on:click={() => modal.show()} size="M" cta
-              >Create automation</Button
-            >
+            <Button on:click={() => modal.show()} size="M" cta>
+              Create automation
+            </Button>
           </Layout>
         </div>
       </div>
@@ -51,7 +61,7 @@
 
   {#if $automationStore.showTestPanel}
     <div class="setup">
-      <TestPanel {automation} />
+      <TestPanel automation={$selectedAutomation} />
     </div>
   {/if}
   <Modal bind:this={modal}>
@@ -71,22 +81,8 @@
     grid-template-columns: 260px minmax(510px, 1fr) fit-content(500px);
     overflow: hidden;
   }
-
-  .nav {
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    border-right: var(--border-light);
-    background-color: var(--background);
-    padding-bottom: 60px;
-    overflow: hidden;
-  }
-
   .content {
     position: relative;
-    padding-top: var(--spacing-l);
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
diff --git a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte
index b861e82dd1..ea2c853139 100644
--- a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte
@@ -1,17 +1,10 @@
 <script>
-  import { redirect, leftover } from "@roxi/routify"
-  import { onMount } from "svelte"
+  import { redirect } from "@roxi/routify"
   import { automationStore } from "builderStore"
 
-  onMount(async () => {
-    // navigate to first automation in list, if not already selected
-    if (
-      !$leftover &&
-      $automationStore.automations.length > 0 &&
-      (!$automationStore.selectedAutomation ||
-        !$automationStore.selectedAutomation?.automation?._id)
-    ) {
+  $: {
+    if ($automationStore.automations?.length) {
       $redirect(`./${$automationStore.automations[0]._id}`)
     }
-  })
+  }
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
index e97e3ee15c..785b221239 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
@@ -1,9 +1,11 @@
 <script>
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
-  import { store, sortedScreens } from "builderStore"
+  import { store, sortedScreens, screenHistoryStore } from "builderStore"
   import { Select } from "@budibase/bbui"
   import { RoleUtils } from "@budibase/frontend-core"
+  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { isActive } from "@roxi/routify"
 </script>
 
 <div class="app-panel">
@@ -22,6 +24,9 @@
       />
     </div>
     <div class="header-right">
+      {#if $isActive("./screens") || $isActive("./components")}
+        <UndoRedoControl store={screenHistoryStore} />
+      {/if}
       {#if $store.clientFeatures.devicePreview}
         <DevicePreviewSelect />
       {/if}
@@ -52,6 +57,7 @@
     align-items: flex-start;
     gap: var(--spacing-l);
     margin: 0 2px;
+    z-index: 1;
   }
   .header-left,
   .header-right {
@@ -59,7 +65,7 @@
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
-    gap: var(--spacing-l);
+    gap: var(--spacing-xl);
   }
   .header-left {
     flex: 1 1 auto;
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
index f83e5d6194..956e1f7a3b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
@@ -12,30 +12,30 @@
   let componentToEject
 
   const keyHandlers = {
-    ["^ArrowUp"]: async component => {
+    ["Ctrl+ArrowUp"]: async component => {
       await store.actions.components.moveUp(component)
     },
-    ["^ArrowDown"]: async component => {
+    ["Ctrl+ArrowDown"]: async component => {
       await store.actions.components.moveDown(component)
     },
-    ["^c"]: component => {
+    ["Ctrl+c"]: component => {
       store.actions.components.copy(component, false)
     },
-    ["^x"]: component => {
+    ["Ctrl+x"]: component => {
       store.actions.components.copy(component, true)
     },
-    ["^v"]: async component => {
+    ["Ctrl+v"]: async component => {
       await store.actions.components.paste(component, "inside")
     },
-    ["^d"]: async component => {
+    ["Ctrl+d"]: async component => {
       store.actions.components.copy(component)
       await store.actions.components.paste(component, "below")
     },
-    ["^e"]: component => {
+    ["Ctrl+e"]: component => {
       componentToEject = component
       confirmEjectDialog.show()
     },
-    ["^Enter"]: () => {
+    ["Ctrl+Enter"]: () => {
       $goto("./new")
     },
     ["Delete"]: component => {
@@ -53,14 +53,19 @@
       store.actions.components.selectNext()
     },
     ["Escape"]: () => {
-      if (!$isActive("/new")) {
-        return false
+      if ($isActive("./new")) {
+        $goto("./")
       }
-      $goto("./")
     },
   }
 
-  const handleKeyAction = async (event, component, key, ctrlKey = false) => {
+  const handleKeyAction = async ({
+    event,
+    component,
+    key,
+    ctrlKey = false,
+    shiftKey = false,
+  }) => {
     if (!component || !key) {
       return false
     }
@@ -69,9 +74,12 @@
       if (key === "Backspace") {
         key = "Delete"
       }
-      // Prefix key with a caret for ctrl modifier
+      // Prefix keys for modifiers
+      if (shiftKey) {
+        key = "Shift+" + key
+      }
       if (ctrlKey) {
-        key = "^" + key
+        key = "Ctrl+" + key
       }
       const handler = keyHandlers[key]
       if (!handler) {
@@ -97,19 +105,26 @@
       return
     }
     // Key events are always for the selected component
-    return await handleKeyAction(
-      e,
-      $selectedComponent,
-      e.key,
-      e.ctrlKey || e.metaKey
-    )
+    return await handleKeyAction({
+      event: e,
+      component: $selectedComponent,
+      key: e.key,
+      ctrlKey: e.ctrlKey || e.metaKey,
+      shiftKey: e.shiftKey,
+    })
   }
 
   const handleComponentMenu = async e => {
     // Menu events can be for any component
-    const { id, key, ctrlKey } = e.detail
+    const { id, key, ctrlKey, shiftKey } = e.detail
     const component = findComponent($selectedScreen.props, id)
-    return await handleKeyAction(null, component, key, ctrlKey)
+    return await handleKeyAction({
+      event: null,
+      component,
+      key,
+      ctrlKey,
+      shiftKey,
+    })
   }
 
   onMount(() => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte
index 507d7a36d9..02c3586f7d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte
@@ -25,7 +25,7 @@
   let errors = {}
 
   const routeTaken = url => {
-    const roleId = get(selectedScreen)?.routing.roleId || "BASIC"
+    const roleId = get(selectedScreen).routing.roleId || "BASIC"
     return get(store).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
@@ -34,7 +34,7 @@
   }
 
   const roleTaken = roleId => {
-    const url = get(selectedScreen)?.routing.route
+    const url = get(selectedScreen).routing.route
     return get(store).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
@@ -95,7 +95,7 @@
         return sanitizeUrl(val)
       },
       validate: route => {
-        const existingRoute = get(selectedScreen)?.routing.route
+        const existingRoute = get(selectedScreen).routing.route
         if (route !== existingRoute && routeTaken(route)) {
           return "That URL is already in use for this role"
         }
@@ -107,7 +107,7 @@
       label: "Access",
       control: RoleSelect,
       validate: role => {
-        const existingRole = get(selectedScreen)?.routing.roleId
+        const existingRole = get(selectedScreen).routing.roleId
         if (role !== existingRole && roleTaken(role)) {
           return "That role is already in use for this URL"
         }
@@ -146,7 +146,7 @@
 </script>
 
 <Panel
-  title={$selectedScreen?.routing.route}
+  title={$selectedScreen.routing.route}
   icon={$selectedScreen.routing.route === "/" ? "Home" : "WebPage"}
   borderLeft
 >
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
index d1a5df68e1..6236721e1a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
@@ -5,6 +5,8 @@
 </script>
 
 <ScreenListPanel />
-{#key $selectedScreen?._id}
-  <ScreenSettingsPanel />
-{/key}
+{#if $selectedScreen}
+  {#key $selectedScreen._id}
+    <ScreenSettingsPanel />
+  {/key}
+{/if}
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 20fc29b0e3..7035ca1765 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -3178,6 +3178,11 @@ fast-glob@^3.0.3:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-json-patch@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
+  integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 0e6624d125..8ccd3fb3d0 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -65,10 +65,14 @@ export async function create(ctx: BBContext) {
 
   // call through to update if already exists
   if (automation._id && automation._rev) {
-    return update(ctx)
+    await update(ctx)
+    return
   }
 
-  automation._id = generateAutomationID()
+  // Respect existing IDs if recreating a deleted automation
+  if (!automation._id) {
+    automation._id = generateAutomationID()
+  }
 
   automation.type = "automation"
   automation = cleanAutomationInputs(automation)
@@ -126,6 +130,13 @@ export async function update(ctx: BBContext) {
   const db = context.getAppDB()
   let automation = ctx.request.body
   automation.appId = ctx.appId
+
+  // Call through to create if it doesn't exist
+  if (!automation._id || !automation._rev) {
+    await create(ctx)
+    return
+  }
+
   const oldAutomation = await db.get(automation._id)
   automation = cleanAutomationInputs(automation)
   automation = await checkForWebhooks({
diff --git a/packages/server/src/api/routes/automation.ts b/packages/server/src/api/routes/automation.ts
index dc0f171584..cb8b6042ae 100644
--- a/packages/server/src/api/routes/automation.ts
+++ b/packages/server/src/api/routes/automation.ts
@@ -38,7 +38,7 @@ router
     "/api/automations",
     bodyResource("_id"),
     authorized(permissions.BUILDER),
-    automationValidator(true),
+    automationValidator(false),
     controller.update
   )
   .post(

From c4e2566438bedce39fc75307fed37149f314f7e3 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 23 Feb 2023 14:02:39 +0000
Subject: [PATCH 125/273] v2.3.18-alpha.8

---
 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 ebcd234dac..8f5c3f058f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 398dbfcd0f..0d7c5b1079 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.7",
+    "@budibase/types": "2.3.18-alpha.8",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 47778ca6e7..05f405d63d 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.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "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.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.8",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b87cd3924b..fd7c6b5571 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.7",
-    "@budibase/client": "2.3.18-alpha.7",
-    "@budibase/frontend-core": "2.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.7",
+    "@budibase/bbui": "2.3.18-alpha.8",
+    "@budibase/client": "2.3.18-alpha.8",
+    "@budibase/frontend-core": "2.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.8",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 54ccf350a5..48ad2655b9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "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.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.7",
-    "@budibase/types": "2.3.18-alpha.7",
+    "@budibase/backend-core": "2.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.8",
+    "@budibase/types": "2.3.18-alpha.8",
     "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 685afed15b..d856a6618d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "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.3.18-alpha.7",
-    "@budibase/frontend-core": "2.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.7",
+    "@budibase/bbui": "2.3.18-alpha.8",
+    "@budibase/frontend-core": "2.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.8",
     "@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 52d51f9c3e..a743d73553 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.7",
+    "@budibase/bbui": "2.3.18-alpha.8",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0deea4e791..d7d5db1e1a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 07b9187cd5..b20db330e4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.7",
-    "@budibase/client": "2.3.18-alpha.7",
+    "@budibase/backend-core": "2.3.18-alpha.8",
+    "@budibase/client": "2.3.18-alpha.8",
     "@budibase/pro": "2.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.7",
-    "@budibase/types": "2.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.8",
+    "@budibase/types": "2.3.18-alpha.8",
     "@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 c11f5ce7f4..bdf8258cc0 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "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 052ba91c3a..c340fc9851 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "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 b4c4595d71..c895c153dd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.7",
+  "version": "2.3.18-alpha.8",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.7",
+    "@budibase/backend-core": "2.3.18-alpha.8",
     "@budibase/pro": "2.3.18-alpha.7",
-    "@budibase/string-templates": "2.3.18-alpha.7",
-    "@budibase/types": "2.3.18-alpha.7",
+    "@budibase/string-templates": "2.3.18-alpha.8",
+    "@budibase/types": "2.3.18-alpha.8",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 969a026db3a4a05d3360fab2c23f7872022c5bb7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 23 Feb 2023 14:05:48 +0000
Subject: [PATCH 126/273] Update pro version to 2.3.18-alpha.8

---
 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 b20db330e4..91587f06d3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.8",
     "@budibase/client": "2.3.18-alpha.8",
-    "@budibase/pro": "2.3.18-alpha.7",
+    "@budibase/pro": "2.3.18-alpha.8",
     "@budibase/string-templates": "2.3.18-alpha.8",
     "@budibase/types": "2.3.18-alpha.8",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0d838af3a2..f2dd97a6c5 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.7.tgz#3407df3d6744b5d1e9fe03e1557102fe4fb0f914"
-  integrity sha512-satGbpr+giJQFUmgjNEzHvqXxEHa3M89y/w2nKfYboPrjq4odHrnQI1N/fX/tcjmWIUwU0/dfgVm4EJuCvWCRw==
+"@budibase/backend-core@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.8.tgz#a48406adf2f781471822f62d42cba3e27c660778"
+  integrity sha512-uP6ff/h47d/YwBJdws6sMZVNnMyoGJsLO/Wqz5JlLR1g3F5k5fViMtwx1kK4FcQ8J3JGjjfXtxWJ4wLyWucFAA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.7"
+    "@budibase/types" "2.3.18-alpha.8"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.7.tgz#c0746d624665a81b6c1ea55ff95789e67fe4aa81"
-  integrity sha512-h3bMjoLkpl6n8xtkEHuaLu/SVN4QmzetyAug6iKC5tIGsz59XMrevMLD4xvsoa/2lr8Qp2WZSyRpk47cG+fflg==
+"@budibase/pro@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.8.tgz#24aa885d35b51123e5152094f67961edb10785b8"
+  integrity sha512-pozClQBcntm7SIc66CIblPBHnoWekxqWSxoulj9zbXvO/gmIc0oU7z0xT7nwKvsU9RCthXaFXDHeH+rWbyOPNg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.7"
-    "@budibase/types" "2.3.18-alpha.7"
+    "@budibase/backend-core" "2.3.18-alpha.8"
+    "@budibase/types" "2.3.18-alpha.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.7.tgz#f98414de18db9948938f74322ca26ef4af6c3100"
-  integrity sha512-b5vqHFPs//PymAK1AFX+CEFts3F4YdCo/gsgo1wkCJfVpd2/EBpe6KD/PHiabS1XbA3DYvlDWL/lTrYbdnpyyw==
+"@budibase/types@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.8.tgz#7822eb07b7abf2af48d6940a0ab208b8be4ab51a"
+  integrity sha512-M3GM35OkFgkw6ByQkSlZn/SG3/T6e/kyY/3f2mqft4dYL1Y89bPn7zKG6nB4BqTwU7ItLkUCNVtJNOBhXZCKqg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c895c153dd..8800695a31 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.8",
-    "@budibase/pro": "2.3.18-alpha.7",
+    "@budibase/pro": "2.3.18-alpha.8",
     "@budibase/string-templates": "2.3.18-alpha.8",
     "@budibase/types": "2.3.18-alpha.8",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 6faf55532f..d91fc340ec 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.7.tgz#3407df3d6744b5d1e9fe03e1557102fe4fb0f914"
-  integrity sha512-satGbpr+giJQFUmgjNEzHvqXxEHa3M89y/w2nKfYboPrjq4odHrnQI1N/fX/tcjmWIUwU0/dfgVm4EJuCvWCRw==
+"@budibase/backend-core@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.8.tgz#a48406adf2f781471822f62d42cba3e27c660778"
+  integrity sha512-uP6ff/h47d/YwBJdws6sMZVNnMyoGJsLO/Wqz5JlLR1g3F5k5fViMtwx1kK4FcQ8J3JGjjfXtxWJ4wLyWucFAA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.7"
+    "@budibase/types" "2.3.18-alpha.8"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.7.tgz#c0746d624665a81b6c1ea55ff95789e67fe4aa81"
-  integrity sha512-h3bMjoLkpl6n8xtkEHuaLu/SVN4QmzetyAug6iKC5tIGsz59XMrevMLD4xvsoa/2lr8Qp2WZSyRpk47cG+fflg==
+"@budibase/pro@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.8.tgz#24aa885d35b51123e5152094f67961edb10785b8"
+  integrity sha512-pozClQBcntm7SIc66CIblPBHnoWekxqWSxoulj9zbXvO/gmIc0oU7z0xT7nwKvsU9RCthXaFXDHeH+rWbyOPNg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.7"
-    "@budibase/types" "2.3.18-alpha.7"
+    "@budibase/backend-core" "2.3.18-alpha.8"
+    "@budibase/types" "2.3.18-alpha.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.7":
-  version "2.3.18-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.7.tgz#f98414de18db9948938f74322ca26ef4af6c3100"
-  integrity sha512-b5vqHFPs//PymAK1AFX+CEFts3F4YdCo/gsgo1wkCJfVpd2/EBpe6KD/PHiabS1XbA3DYvlDWL/lTrYbdnpyyw==
+"@budibase/types@2.3.18-alpha.8":
+  version "2.3.18-alpha.8"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.8.tgz#7822eb07b7abf2af48d6940a0ab208b8be4ab51a"
+  integrity sha512-M3GM35OkFgkw6ByQkSlZn/SG3/T6e/kyY/3f2mqft4dYL1Y89bPn7zKG6nB4BqTwU7ItLkUCNVtJNOBhXZCKqg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 163556ffb1ffa7091e02a620693c30f20f3233a8 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 14:20:56 +0000
Subject: [PATCH 127/273] fix spacing as columns were moving around

---
 .../account/auditLogs/_components/UserRenderer.svelte     | 4 ++--
 .../pages/builder/portal/account/auditLogs/index.svelte   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 1dfb425965..16e2a7be04 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -33,8 +33,8 @@
   .tooltip {
     z-index: 1;
     position: absolute;
-    top: 85%;
-    left: calc(90% - 8px);
+    top: 75%;
+    left: 120%;
     transform: translateX(-100%) translateY(-50%);
     display: flex;
     flex-direction: row;
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index f5b4ee90be..0077acdd50 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -29,10 +29,10 @@
   import { cloneDeep } from "lodash"
 
   const schema = {
-    date: { width: "auto" },
-    user: { width: "auto" },
-    app: { width: "auto" },
-    name: { width: "0.8fr" },
+    date: { width: "0.8fr" },
+    user: { width: "0.5fr" },
+    app: { width: "1.5fr" },
+    name: { width: "2fr" },
     view: { width: "0.1fr", borderLeft: true, displayName: "" },
   }
 

From c1db2c0c3ef7aa3237725f419bc00ee2b5a3d2b4 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 14:33:15 +0000
Subject: [PATCH 128/273] add debounce for search

---
 .../builder/portal/account/auditLogs/index.svelte   | 13 +++++++++++--
 packages/frontend-core/src/api/auditLogs.js         |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 0077acdd50..2898189fda 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -27,6 +27,7 @@
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
   import { cloneDeep } from "lodash"
+  import { Utils } from "@budibase/frontend-core"
 
   const schema = {
     date: { width: "0.8fr" },
@@ -68,7 +69,7 @@
   let selectedLog
   let sidePanelVisible = false
   let wideSidePanel = false
-
+  let timer
   let startDate = new Date()
   startDate.setDate(startDate.getDate() - 30)
   let endDate = new Date()
@@ -89,6 +90,14 @@
   $: enrichedList = enrich($users.data || [], selectedUsers)
   $: sortedList = sort(enrichedList)
 
+  const debounce = value => {
+    console.log(value)
+    clearTimeout(timer)
+    timer = setTimeout(() => {
+      logSearchTerm = value
+    }, 400)
+  }
+
   const fetchUsers = async (userPage, search) => {
     if ($userPageInfo.loading) {
       return
@@ -286,7 +295,7 @@
       />
     </div>
     <div class="freeSearch">
-      <Search placeholder="Search" bind:value={logSearchTerm} />
+      <Search placeholder="Search" on:change={e => debounce(e.detail)} />
     </div>
 
     <div class="">
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
index b8ad16a722..c4230df6d9 100644
--- a/packages/frontend-core/src/api/auditLogs.js
+++ b/packages/frontend-core/src/api/auditLogs.js
@@ -35,7 +35,7 @@ const buildOpts = ({
   if (appIds.length) {
     opts.appIds = appIds
   }
-  console.log(opts)
+
   return opts
 }
 

From d8fbdeb6f8454d60d348cefdd561781c15a001bf Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 23 Feb 2023 16:20:44 +0000
Subject: [PATCH 129/273] set couchDB chart version to 3.1.1

---
 charts/budibase/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index dd75b2daa3..536af8560f 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -245,7 +245,7 @@ couchdb:
   ## The CouchDB image
   image:
     repository: couchdb
-    tag: 3.2.1
+    tag: 3.1.1
     pullPolicy: IfNotPresent
 
   ## Experimental integration with Lucene-powered fulltext search

From 30d9899bb7ac404a0ef910bd07fcc862deac4695 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 23 Feb 2023 17:14:08 +0000
Subject: [PATCH 130/273] sorting for event and app list

---
 .../portal/account/auditLogs/index.svelte     | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 2898189fda..63852a6923 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -27,7 +27,6 @@
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
   import { cloneDeep } from "lodash"
-  import { Utils } from "@budibase/frontend-core"
 
   const schema = {
     date: { width: "0.8fr" },
@@ -87,11 +86,17 @@
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
-  $: enrichedList = enrich($users.data || [], selectedUsers)
-  $: sortedList = sort(enrichedList)
+  $: enrichedList = enrich($users.data || [], selectedUsers, "_id")
+  $: sortedList = sort(enrichedList, "email")
+
+  $: sortedEvents = sort(
+    enrich(parseEventObject($auditLogs.events), selectedEvents, "id"),
+    "id"
+  )
+  // below is not sorting yet
+  $: sortedApps = enrich($apps, selectedApps, "appId")
 
   const debounce = value => {
-    console.log(value)
     clearTimeout(timer)
     timer = setTimeout(() => {
       logSearchTerm = value
@@ -155,20 +160,20 @@
     }
   }
 
-  const enrich = (list, selected) => {
+  const enrich = (list, selected, key) => {
     return list.map(item => {
       return {
         ...item,
-        selected: selected.find(x => x === item._id) != null,
+        selected: selected.find(x => x === item[key]) != null,
       }
     })
   }
 
-  const sort = list => {
+  const sort = (list, key) => {
     let sortedList = list.slice()
     sortedList?.sort((a, b) => {
       if (a.selected === b.selected) {
-        return a["email"] < b["email"] ? -1 : 1
+        return a[key] < b[key] ? -1 : 1
       } else if (a.selected) {
         return -1
       } else if (b.selected) {
@@ -179,6 +184,16 @@
     return sortedList
   }
 
+  const parseEventObject = obj => {
+    // convert obj which is an object of key value pairs to an array of objects
+    // with the key as the id and the value as the name
+    if (obj) {
+      return Object.entries(obj).map(([id, label]) => {
+        return { id, label }
+      })
+    }
+  }
+
   const viewDetails = detail => {
     selectedLog = detail
     sidePanelVisible = true
@@ -259,7 +274,7 @@
         label="App"
         getOptionValue={app => app.instance._id}
         getOptionLabel={app => app.name}
-        options={$apps}
+        options={sortedApps}
         bind:value={selectedApps}
       />
     </div>
@@ -267,9 +282,9 @@
       <Multiselect
         customPopoverHeight="500px"
         autocomplete
-        getOptionValue={event => event[0]}
-        getOptionLabel={event => event[1]}
-        options={Object.entries($auditLogs.events)}
+        getOptionValue={event => event.id}
+        getOptionLabel={event => event.label}
+        options={sortedEvents}
         placeholder="All events"
         label="Event"
         bind:value={selectedEvents}

From 0b48075688fd5bc82f266cdb506d47d9ee976a17 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 23 Feb 2023 17:23:06 +0000
Subject: [PATCH 131/273] Implementing a few basic tests to create and search
 the audit logs.

---
 packages/backend-core/src/users.ts            |   9 +-
 .../tests/utilities/mocks/licenses.ts         |   4 +
 .../api/routes/global/tests/auditLogs.spec.ts | 110 +++++++++++++++++-
 packages/worker/src/tests/api/auditLogs.ts    |  26 +++++
 packages/worker/src/tests/api/index.ts        |   3 +
 5 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 packages/worker/src/tests/api/auditLogs.ts

diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index 4c1c9ad464..5100066ff9 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -15,13 +15,16 @@ type GetOpts = { cleanup?: boolean }
 function cleanupUsers(users: User | User[]) {
   if (Array.isArray(users)) {
     return users.map(user => {
-      delete user.password
-      return user
+      if (user) {
+        delete user.password
+        return user
+      }
     })
-  } else {
+  } else if (users) {
     delete users.password
     return users
   }
+  return users
 }
 
 export const bulkGetGlobalUsersById = async (
diff --git a/packages/backend-core/tests/utilities/mocks/licenses.ts b/packages/backend-core/tests/utilities/mocks/licenses.ts
index e374612f5f..210c03b900 100644
--- a/packages/backend-core/tests/utilities/mocks/licenses.ts
+++ b/packages/backend-core/tests/utilities/mocks/licenses.ts
@@ -78,6 +78,10 @@ export const useEnvironmentVariables = () => {
   return useFeature(Feature.ENVIRONMENT_VARIABLES)
 }
 
+export const useAuditLogs = () => {
+  return useFeature(Feature.AUDIT_LOGS)
+}
+
 // QUOTAS
 
 export const setAutomationLogsQuota = (value: number) => {
diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
index 5e7ed31263..536c510129 100644
--- a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -1,5 +1,109 @@
-import { mocks } from "@budibase/backend-core/tests"
+import { mocks, structures } from "@budibase/backend-core/tests"
+import { context, events } from "@budibase/backend-core"
+import { Event, IdentityType } from "@budibase/types"
+import { TestConfiguration } from "../../../../tests"
 
-mocks.licenses.useEnvironmentVariables()
+mocks.licenses.useAuditLogs()
 
-describe("/api/global/auditlogs", () => {})
+const BASE_IDENTITY = {
+  account: undefined,
+  type: IdentityType.USER,
+}
+const USER_AUDIT_LOG_COUNT = 3
+const APP_ID = "app_1"
+
+describe("/api/global/auditlogs", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.beforeAll()
+  })
+
+  afterAll(async () => {
+    await config.afterAll()
+  })
+
+  it("should be able to fire some events (create audit logs)", async () => {
+    await context.doInTenant(config.tenantId, async () => {
+      const userId = config.user!._id!
+      const identity = {
+        ...BASE_IDENTITY,
+        _id: userId,
+        tenantId: config.tenantId,
+      }
+      await context.doInIdentityContext(identity, async () => {
+        for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
+          await events.user.created(structures.users.user())
+        }
+        await context.doInAppContext(APP_ID, async () => {
+          await events.app.created(structures.apps.app(APP_ID))
+        })
+        // fetch the user created events
+        const response = await config.api.auditLogs.search({
+          events: [Event.USER_CREATED],
+        })
+        expect(response.data).toBeDefined()
+        // there will be an initial event which comes from the default user creation
+        expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
+      })
+    })
+  })
+
+  it("should be able to search by event", async () => {
+    const response = await config.api.auditLogs.search({
+      events: [Event.USER_CREATED],
+    })
+    expect(response.data.length).toBeGreaterThan(0)
+    for (let log of response.data) {
+      expect(log.event).toBe(Event.USER_CREATED)
+    }
+  })
+
+  it("should be able to search by time range (frozen)", async () => {
+    // this is frozen, only need to add 1 and minus 1
+    const now = new Date()
+    const start = new Date()
+    start.setSeconds(now.getSeconds() - 1)
+    const end = new Date()
+    end.setSeconds(now.getSeconds() + 1)
+    const response = await config.api.auditLogs.search({
+      startDate: start.toISOString(),
+      endDate: end.toISOString(),
+    })
+    expect(response.data.length).toBeGreaterThan(0)
+    for (let log of response.data) {
+      expect(log.timestamp).toBe(now.toISOString())
+    }
+  })
+
+  it("should be able to search by user ID", async () => {
+    const userId = config.user!._id!
+    const response = await config.api.auditLogs.search({
+      userIds: [userId],
+    })
+    expect(response.data.length).toBeGreaterThan(0)
+    for (let log of response.data) {
+      expect(log.user._id).toBe(userId)
+    }
+  })
+
+  it("should be able to search by app ID", async () => {
+    const response = await config.api.auditLogs.search({
+      appIds: [APP_ID],
+    })
+    expect(response.data.length).toBeGreaterThan(0)
+    for (let log of response.data) {
+      expect(log.app?._id).toBe(APP_ID)
+    }
+  })
+
+  it("should be able to search by full string", async () => {
+    const response = await config.api.auditLogs.search({
+      fullSearch: "User",
+    })
+    expect(response.data.length).toBeGreaterThan(0)
+    for (let log of response.data) {
+      expect(log.name.includes("User")).toBe(true)
+    }
+  })
+})
diff --git a/packages/worker/src/tests/api/auditLogs.ts b/packages/worker/src/tests/api/auditLogs.ts
new file mode 100644
index 0000000000..d7bc4d99fb
--- /dev/null
+++ b/packages/worker/src/tests/api/auditLogs.ts
@@ -0,0 +1,26 @@
+import { AuditLogSearchParams, SearchAuditLogsResponse } from "@budibase/types"
+import TestConfiguration from "../TestConfiguration"
+import { TestAPI } from "./base"
+
+export class AuditLogAPI extends TestAPI {
+  constructor(config: TestConfiguration) {
+    super(config)
+  }
+
+  search = async (search: AuditLogSearchParams) => {
+    const res = await this.request
+      .post("/api/global/auditlogs/search")
+      .send(search)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+    return res.body as SearchAuditLogsResponse
+  }
+
+  download = (search: AuditLogSearchParams) => {
+    const query = encodeURIComponent(JSON.stringify(search))
+    return this.request
+      .get(`/api/global/auditlogs/download?query=${query}`)
+      .set(this.config.defaultHeaders())
+  }
+}
diff --git a/packages/worker/src/tests/api/index.ts b/packages/worker/src/tests/api/index.ts
index 0bd0308e2f..166996e792 100644
--- a/packages/worker/src/tests/api/index.ts
+++ b/packages/worker/src/tests/api/index.ts
@@ -14,6 +14,7 @@ import { GroupsAPI } from "./groups"
 import { RolesAPI } from "./roles"
 import { TemplatesAPI } from "./templates"
 import { LicenseAPI } from "./license"
+import { AuditLogAPI } from "./auditLogs"
 export default class API {
   accounts: AccountAPI
   auth: AuthAPI
@@ -30,6 +31,7 @@ export default class API {
   roles: RolesAPI
   templates: TemplatesAPI
   license: LicenseAPI
+  auditLogs: AuditLogAPI
 
   constructor(config: TestConfiguration) {
     this.accounts = new AccountAPI(config)
@@ -47,5 +49,6 @@ export default class API {
     this.roles = new RolesAPI(config)
     this.templates = new TemplatesAPI(config)
     this.license = new LicenseAPI(config)
+    this.auditLogs = new AuditLogAPI(config)
   }
 }

From b17f4111832abd16c97239f155d282b05707647b Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 24 Feb 2023 09:16:18 +0000
Subject: [PATCH 132/273] Remove deploy to release env (#9793)

---
 .github/workflows/release-develop.yml | 77 ---------------------------
 1 file changed, 77 deletions(-)

diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 16c6c37bbd..e986179cfc 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -68,83 +68,6 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
 
-  deploy-to-release-env:
-    needs: [release-images]
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Get the current budibase release version
-        id: version
-        run: |
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-
-      - name: Pull values.yaml from budibase-infra
-        run: | 
-          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-          -H 'Accept: application/vnd.github.v3.raw' \
-          -o values.release.yaml \
-          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-release/values.yaml
-          wc -l values.release.yaml
-
-      - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.7.1
-        with:
-          release: budibase-release
-          namespace: budibase
-          chart: charts/budibase
-          token: ${{ github.token }}
-          helm: helm3
-          values: |
-            globals: 
-              appVersion: develop
-            ingress:
-              enabled: true
-              nginx: true
-          value-files: >-
-            [
-              "values.release.yaml"
-            ]
-        env:
-          KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
-      
-      - name: Re roll app-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment app-service -n budibase
-
-      - name: Re roll proxy-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment proxy-service -n budibase
-
-      - name: Re roll worker-service
-        uses: actions-hub/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
-        with:
-          args: rollout restart deployment worker-service -n budibase
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v4.0.0
-        with:
-          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
-          content: "Release Env Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Release Env."
-          embed-title: ${{ env.RELEASE_VERSION }}
-
   release-helm-chart:
     needs: [release-images]
     runs-on: ubuntu-latest

From f3c5ddc7c9520bd73587e9ecda99b84be8cc51bb Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 09:23:36 +0000
Subject: [PATCH 133/273] v2.3.18-alpha.9

---
 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 8f5c3f058f..ee2681c548 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 0d7c5b1079..6ff40ab4f3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.8",
+    "@budibase/types": "2.3.18-alpha.9",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 05f405d63d..9771c2aa43 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.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "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.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.9",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index fd7c6b5571..a4b2c0fc89 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.8",
-    "@budibase/client": "2.3.18-alpha.8",
-    "@budibase/frontend-core": "2.3.18-alpha.8",
-    "@budibase/string-templates": "2.3.18-alpha.8",
+    "@budibase/bbui": "2.3.18-alpha.9",
+    "@budibase/client": "2.3.18-alpha.9",
+    "@budibase/frontend-core": "2.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.9",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 48ad2655b9..c5a8eb7dc6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "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.3.18-alpha.8",
-    "@budibase/string-templates": "2.3.18-alpha.8",
-    "@budibase/types": "2.3.18-alpha.8",
+    "@budibase/backend-core": "2.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.9",
+    "@budibase/types": "2.3.18-alpha.9",
     "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 d856a6618d..0872267c03 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "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.3.18-alpha.8",
-    "@budibase/frontend-core": "2.3.18-alpha.8",
-    "@budibase/string-templates": "2.3.18-alpha.8",
+    "@budibase/bbui": "2.3.18-alpha.9",
+    "@budibase/frontend-core": "2.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.9",
     "@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 a743d73553..ea74808a4d 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.8",
+    "@budibase/bbui": "2.3.18-alpha.9",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d7d5db1e1a..0bb9a12dae 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 91587f06d3..33107b98b6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.8",
-    "@budibase/client": "2.3.18-alpha.8",
+    "@budibase/backend-core": "2.3.18-alpha.9",
+    "@budibase/client": "2.3.18-alpha.9",
     "@budibase/pro": "2.3.18-alpha.8",
-    "@budibase/string-templates": "2.3.18-alpha.8",
-    "@budibase/types": "2.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.9",
+    "@budibase/types": "2.3.18-alpha.9",
     "@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 bdf8258cc0..0ca02a80b6 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "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 c340fc9851..739d21126f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "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 8800695a31..87226b4fcc 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.8",
+  "version": "2.3.18-alpha.9",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.8",
+    "@budibase/backend-core": "2.3.18-alpha.9",
     "@budibase/pro": "2.3.18-alpha.8",
-    "@budibase/string-templates": "2.3.18-alpha.8",
-    "@budibase/types": "2.3.18-alpha.8",
+    "@budibase/string-templates": "2.3.18-alpha.9",
+    "@budibase/types": "2.3.18-alpha.9",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 3f50c04335d3bad4bafa3d35abae870ef04ee3e0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 09:26:25 +0000
Subject: [PATCH 134/273] Update pro version to 2.3.18-alpha.9

---
 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 33107b98b6..147e3b17b6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.9",
     "@budibase/client": "2.3.18-alpha.9",
-    "@budibase/pro": "2.3.18-alpha.8",
+    "@budibase/pro": "2.3.18-alpha.9",
     "@budibase/string-templates": "2.3.18-alpha.9",
     "@budibase/types": "2.3.18-alpha.9",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index f2dd97a6c5..0ef2527e7e 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.8.tgz#a48406adf2f781471822f62d42cba3e27c660778"
-  integrity sha512-uP6ff/h47d/YwBJdws6sMZVNnMyoGJsLO/Wqz5JlLR1g3F5k5fViMtwx1kK4FcQ8J3JGjjfXtxWJ4wLyWucFAA==
+"@budibase/backend-core@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.9.tgz#13ecee562b25e4f5297dfcc1fc47e32a52729c72"
+  integrity sha512-1mvBGAGwwj2aYlu1xx3FjGJRYSG4btYdljv5dkjvfCxl1wZoYrxQDe8FOzU0AOqtLyBgk9ANkkF185i1lhGXqg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.8"
+    "@budibase/types" "2.3.18-alpha.9"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.8.tgz#24aa885d35b51123e5152094f67961edb10785b8"
-  integrity sha512-pozClQBcntm7SIc66CIblPBHnoWekxqWSxoulj9zbXvO/gmIc0oU7z0xT7nwKvsU9RCthXaFXDHeH+rWbyOPNg==
+"@budibase/pro@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.9.tgz#e930299011d88114df201df744a6bf470f39127e"
+  integrity sha512-QEapO6kYeMt5h12E48SnEuFNmXTmN0PFkHP5FTgA7MH1JPgaVsAcbNjeEZ+aOLOtQ1e6jRbuB5Ue0JxWMfujOg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.8"
-    "@budibase/types" "2.3.18-alpha.8"
+    "@budibase/backend-core" "2.3.18-alpha.9"
+    "@budibase/types" "2.3.18-alpha.9"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.8.tgz#7822eb07b7abf2af48d6940a0ab208b8be4ab51a"
-  integrity sha512-M3GM35OkFgkw6ByQkSlZn/SG3/T6e/kyY/3f2mqft4dYL1Y89bPn7zKG6nB4BqTwU7ItLkUCNVtJNOBhXZCKqg==
+"@budibase/types@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.9.tgz#6e5b684e83c8054bfb3d3da01d8ce7c4fab1269a"
+  integrity sha512-dgtm1IgzNun3em7fTkZzUHSn7YmypiohlTKGBDu4No94Br3K6ysiI1hc4eSEuzakL+TAuvmVgjRKpw2yzumeBQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 87226b4fcc..cd0e6139c5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.9",
-    "@budibase/pro": "2.3.18-alpha.8",
+    "@budibase/pro": "2.3.18-alpha.9",
     "@budibase/string-templates": "2.3.18-alpha.9",
     "@budibase/types": "2.3.18-alpha.9",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d91fc340ec..2063169772 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.8.tgz#a48406adf2f781471822f62d42cba3e27c660778"
-  integrity sha512-uP6ff/h47d/YwBJdws6sMZVNnMyoGJsLO/Wqz5JlLR1g3F5k5fViMtwx1kK4FcQ8J3JGjjfXtxWJ4wLyWucFAA==
+"@budibase/backend-core@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.9.tgz#13ecee562b25e4f5297dfcc1fc47e32a52729c72"
+  integrity sha512-1mvBGAGwwj2aYlu1xx3FjGJRYSG4btYdljv5dkjvfCxl1wZoYrxQDe8FOzU0AOqtLyBgk9ANkkF185i1lhGXqg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.8"
+    "@budibase/types" "2.3.18-alpha.9"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.8.tgz#24aa885d35b51123e5152094f67961edb10785b8"
-  integrity sha512-pozClQBcntm7SIc66CIblPBHnoWekxqWSxoulj9zbXvO/gmIc0oU7z0xT7nwKvsU9RCthXaFXDHeH+rWbyOPNg==
+"@budibase/pro@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.9.tgz#e930299011d88114df201df744a6bf470f39127e"
+  integrity sha512-QEapO6kYeMt5h12E48SnEuFNmXTmN0PFkHP5FTgA7MH1JPgaVsAcbNjeEZ+aOLOtQ1e6jRbuB5Ue0JxWMfujOg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.8"
-    "@budibase/types" "2.3.18-alpha.8"
+    "@budibase/backend-core" "2.3.18-alpha.9"
+    "@budibase/types" "2.3.18-alpha.9"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.8":
-  version "2.3.18-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.8.tgz#7822eb07b7abf2af48d6940a0ab208b8be4ab51a"
-  integrity sha512-M3GM35OkFgkw6ByQkSlZn/SG3/T6e/kyY/3f2mqft4dYL1Y89bPn7zKG6nB4BqTwU7ItLkUCNVtJNOBhXZCKqg==
+"@budibase/types@2.3.18-alpha.9":
+  version "2.3.18-alpha.9"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.9.tgz#6e5b684e83c8054bfb3d3da01d8ce7c4fab1269a"
+  integrity sha512-dgtm1IgzNun3em7fTkZzUHSn7YmypiohlTKGBDu4No94Br3K6ysiI1hc4eSEuzakL+TAuvmVgjRKpw2yzumeBQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 6b7d07c9269aa7e98947828b67ac4c3cafcc5f40 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 24 Feb 2023 09:41:48 +0000
Subject: [PATCH 135/273] fix app sorting

---
 .../builder/portal/account/auditLogs/index.svelte    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 63852a6923..e767412e5c 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -86,15 +86,12 @@
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
-  $: enrichedList = enrich($users.data || [], selectedUsers, "_id")
-  $: sortedList = sort(enrichedList, "email")
-
+  $: sortedUsers = sort(enrich($users.data, selectedUsers, "_id"), "email")
   $: sortedEvents = sort(
     enrich(parseEventObject($auditLogs.events), selectedEvents, "id"),
     "id"
   )
-  // below is not sorting yet
-  $: sortedApps = enrich($apps, selectedApps, "appId")
+  $: sortedApps = sort(enrich($apps, selectedApps, "appId"), "name")
 
   const debounce = value => {
     clearTimeout(timer)
@@ -164,7 +161,8 @@
     return list.map(item => {
       return {
         ...item,
-        selected: selected.find(x => x === item[key]) != null,
+        selected:
+          selected.find(x => x === item[key] || x.includes(item[key])) != null,
       }
     })
   }
@@ -264,7 +262,7 @@
         bind:value={selectedUsers}
         getOptionValue={user => user._id}
         getOptionLabel={user => user.email}
-        options={sortedList}
+        options={sortedUsers}
       />
     </div>
     <div class="select">

From 2e45f94d79d8ff13ac8b48d51fd795391bd2f7f9 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 24 Feb 2023 10:47:32 +0100
Subject: [PATCH 136/273] Improve verbosity

---
 .../api/controllers/row/ExternalRequest.ts    | 53 ++++++++++----
 .../src/integration-test/postgres.spec.ts     | 73 ++++++++++---------
 2 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 74d48cb93e..45940abff8 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -181,7 +181,15 @@ function getEndpoint(tableId: string | undefined, operation: string) {
   }
 }
 
-function basicProcessing(row: Row, table: Table, isLinked: boolean): Row {
+function basicProcessing({
+  row,
+  table,
+  isLinked,
+}: {
+  row: Row
+  table: Table
+  isLinked: boolean
+}): Row {
   const thisRow: Row = {}
   // filter the row down to what is actually the row (not joined)
   for (let field of Object.values(table.schema)) {
@@ -389,7 +397,7 @@ export class ExternalRequest {
         continue
       }
 
-      let linked = basicProcessing(row, linkedTable, true)
+      let linked = basicProcessing({ row, table: linkedTable, isLinked: true })
       if (!linked._id) {
         continue
       }
@@ -437,7 +445,10 @@ export class ExternalRequest {
         )
         continue
       }
-      const thisRow = fixArrayTypes(basicProcessing(row, table, false), table)
+      const thisRow = fixArrayTypes(
+        basicProcessing({ row, table, isLinked: false }),
+        table
+      )
       if (thisRow._id == null) {
         throw "Unable to generate row ID for SQL rows"
       }
@@ -583,20 +594,36 @@ export class ExternalRequest {
         return
       }
 
-      const linkSecondary =
-        linkTable?.primary &&
-        linkTable?.primary?.length > 1 &&
-        linkTable?.primary[1]
+      // @ts-ignore
+      const linkSecondary = linkTable?.primary[1]
 
       const rows = related[key]?.rows || []
-      const found = rows.find(
-        (row: { [key: string]: any }) =>
+
+      function relationshipMatchPredicate({
+        row,
+        linkPrimary,
+        linkSecondary,
+      }: {
+        row: { [key: string]: any }
+        linkPrimary: string
+        linkSecondary?: string
+      }) {
+        const matchesPrimaryLink =
           row[linkPrimary] === relationship.id ||
-          (row[linkPrimary] === body?.[linkPrimary] &&
-            (!linkSecondary || row[linkSecondary] === body?.[linkSecondary]))
+          row[linkPrimary] === body?.[linkPrimary]
+        if (!matchesPrimaryLink || !linkSecondary) {
+          return matchesPrimaryLink
+        }
+
+        const matchesSecondayLink = row[linkSecondary] === body?.[linkSecondary]
+        return matchesPrimaryLink && matchesSecondayLink
+      }
+
+      const existingRelationship = rows.find((row: { [key: string]: any }) =>
+        relationshipMatchPredicate({ row, linkPrimary, linkSecondary })
       )
       const operation = isUpdate ? Operation.UPDATE : Operation.CREATE
-      if (!found) {
+      if (!existingRelationship) {
         promises.push(
           getDatasourceAndQuery({
             endpoint: getEndpoint(tableId, operation),
@@ -607,7 +634,7 @@ export class ExternalRequest {
         )
       } else {
         // remove the relationship from cache so it isn't adjusted again
-        rows.splice(rows.indexOf(found), 1)
+        rows.splice(rows.indexOf(existingRelationship), 1)
       }
     }
     // finally cleanup anything that needs to be removed
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index df0e4bac15..e6f2116f43 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -27,9 +27,9 @@ describe("row api - postgres", () => {
   let makeRequest: MakeRequestResponse,
     postgresDatasource: Datasource,
     primaryPostgresTable: Table,
-    o2mInfo: ForeignTableInfo,
-    m2oInfo: ForeignTableInfo,
-    m2mInfo: ForeignTableInfo
+    oneToManyRelationshipInfo: ForeignTableInfo,
+    manyToOneRelationshipInfo: ForeignTableInfo,
+    manyToManyRelationshipInfo: ForeignTableInfo
 
   let host: string
   let port: number
@@ -96,17 +96,17 @@ describe("row api - postgres", () => {
       })
     }
 
-    o2mInfo = {
+    oneToManyRelationshipInfo = {
       table: await createAuxTable("o2m"),
       fieldName: "oneToManyRelation",
       relationshipType: RelationshipTypes.ONE_TO_MANY,
     }
-    m2oInfo = {
+    manyToOneRelationshipInfo = {
       table: await createAuxTable("m2o"),
       fieldName: "manyToOneRelation",
       relationshipType: RelationshipTypes.MANY_TO_ONE,
     }
-    m2mInfo = {
+    manyToManyRelationshipInfo = {
       table: await createAuxTable("m2m"),
       fieldName: "manyToManyRelation",
       relationshipType: RelationshipTypes.MANY_TO_MANY,
@@ -146,10 +146,10 @@ describe("row api - postgres", () => {
             type: "array",
             presence: false,
           },
-          fieldName: o2mInfo.fieldName,
+          fieldName: oneToManyRelationshipInfo.fieldName,
           name: "oneToManyRelation",
           relationshipType: RelationshipTypes.ONE_TO_MANY,
-          tableId: o2mInfo.table._id,
+          tableId: oneToManyRelationshipInfo.table._id,
           main: true,
         },
         manyToOneRelation: {
@@ -158,10 +158,10 @@ describe("row api - postgres", () => {
             type: "array",
             presence: false,
           },
-          fieldName: m2oInfo.fieldName,
+          fieldName: manyToOneRelationshipInfo.fieldName,
           name: "manyToOneRelation",
           relationshipType: RelationshipTypes.MANY_TO_ONE,
-          tableId: m2oInfo.table._id,
+          tableId: manyToOneRelationshipInfo.table._id,
           main: true,
         },
         manyToManyRelation: {
@@ -170,10 +170,10 @@ describe("row api - postgres", () => {
             type: "array",
             presence: false,
           },
-          fieldName: m2mInfo.fieldName,
+          fieldName: manyToManyRelationshipInfo.fieldName,
           name: "manyToManyRelation",
           relationshipType: RelationshipTypes.MANY_TO_MANY,
-          tableId: m2mInfo.table._id,
+          tableId: manyToManyRelationshipInfo.table._id,
           main: true,
         },
       },
@@ -239,10 +239,10 @@ describe("row api - postgres", () => {
     }
 
     if (opts?.createForeignRows?.createOne2Many) {
-      const foreignKey = `fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`
+      const foreignKey = `fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`
 
       const foreignRow = await config.createRow({
-        tableId: o2mInfo.table._id,
+        tableId: oneToManyRelationshipInfo.table._id,
         title: generator.name(),
       })
 
@@ -252,21 +252,22 @@ describe("row api - postgres", () => {
       }
       foreignRows.push({
         row: foreignRow,
-        relationshipType: o2mInfo.relationshipType,
+        relationshipType: oneToManyRelationshipInfo.relationshipType,
       })
     }
 
     for (let i = 0; i < (opts?.createForeignRows?.createMany2One || 0); i++) {
       const foreignRow = await config.createRow({
-        tableId: m2oInfo.table._id,
+        tableId: manyToOneRelationshipInfo.table._id,
         title: generator.name(),
       })
 
       rowData = {
         ...rowData,
-        [m2oInfo.fieldName]: rowData[m2oInfo.fieldName] || [],
+        [manyToOneRelationshipInfo.fieldName]:
+          rowData[manyToOneRelationshipInfo.fieldName] || [],
       }
-      rowData[m2oInfo.fieldName].push(foreignRow._id)
+      rowData[manyToOneRelationshipInfo.fieldName].push(foreignRow._id)
       foreignRows.push({
         row: foreignRow,
         relationshipType: RelationshipTypes.MANY_TO_ONE,
@@ -275,15 +276,16 @@ describe("row api - postgres", () => {
 
     for (let i = 0; i < (opts?.createForeignRows?.createMany2Many || 0); i++) {
       const foreignRow = await config.createRow({
-        tableId: m2mInfo.table._id,
+        tableId: manyToManyRelationshipInfo.table._id,
         title: generator.name(),
       })
 
       rowData = {
         ...rowData,
-        [m2mInfo.fieldName]: rowData[m2mInfo.fieldName] || [],
+        [manyToManyRelationshipInfo.fieldName]:
+          rowData[manyToManyRelationshipInfo.fieldName] || [],
       }
-      rowData[m2mInfo.fieldName].push(foreignRow._id)
+      rowData[manyToManyRelationshipInfo.fieldName].push(foreignRow._id)
       foreignRows.push({
         row: foreignRow,
         relationshipType: RelationshipTypes.MANY_TO_MANY,
@@ -577,11 +579,11 @@ describe("row api - postgres", () => {
             tableId: row.tableId,
             _id: expect.any(String),
             _rev: expect.any(String),
-            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+            [`fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`]:
               one2ManyForeignRows[0].row.id,
           })
 
-          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+          expect(res.body[oneToManyRelationshipInfo.fieldName]).toBeUndefined()
         })
       })
 
@@ -608,11 +610,11 @@ describe("row api - postgres", () => {
             tableId: row.tableId,
             _id: expect.any(String),
             _rev: expect.any(String),
-            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+            [`fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`]:
               foreignRows[0].row.id,
           })
 
-          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+          expect(res.body[oneToManyRelationshipInfo.fieldName]).toBeUndefined()
         })
       })
 
@@ -641,7 +643,7 @@ describe("row api - postgres", () => {
             _rev: expect.any(String),
           })
 
-          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+          expect(res.body[oneToManyRelationshipInfo.fieldName]).toBeUndefined()
         })
       })
 
@@ -670,7 +672,7 @@ describe("row api - postgres", () => {
             _rev: expect.any(String),
           })
 
-          expect(res.body[o2mInfo.fieldName]).toBeUndefined()
+          expect(res.body[oneToManyRelationshipInfo.fieldName]).toBeUndefined()
         })
       })
     })
@@ -921,30 +923,33 @@ describe("row api - postgres", () => {
           )
           expect(res.body).toEqual({
             ...rowData,
-            [`fk_${o2mInfo.table.name}_${o2mInfo.fieldName}`]:
+            [`fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`]:
               foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row.id,
-            [o2mInfo.fieldName]: [
+            [oneToManyRelationshipInfo.fieldName]: [
               {
                 ...foreignRowsByType[RelationshipTypes.ONE_TO_MANY][0].row,
                 _id: expect.any(String),
                 _rev: expect.any(String),
               },
             ],
-            [m2oInfo.fieldName]: [
+            [manyToOneRelationshipInfo.fieldName]: [
               {
                 ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][0].row,
-                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                  row.id,
               },
               {
                 ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][1].row,
-                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                  row.id,
               },
               {
                 ...foreignRowsByType[RelationshipTypes.MANY_TO_ONE][2].row,
-                [`fk_${m2oInfo.table.name}_${m2oInfo.fieldName}`]: row.id,
+                [`fk_${manyToOneRelationshipInfo.table.name}_${manyToOneRelationshipInfo.fieldName}`]:
+                  row.id,
               },
             ],
-            [m2mInfo.fieldName]: [
+            [manyToManyRelationshipInfo.fieldName]: [
               {
                 ...foreignRowsByType[RelationshipTypes.MANY_TO_MANY][0].row,
               },

From d6363f07b366141e90dde61a4d2e3e682d780741 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 24 Feb 2023 10:51:55 +0100
Subject: [PATCH 137/273] Renamings

---
 .../src/integration-test/postgres.spec.ts     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index e6f2116f43..2afff8b786 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -211,9 +211,9 @@ describe("row api - postgres", () => {
   async function createPrimaryRow(opts: {
     rowData: PrimaryRowData
     createForeignRows?: {
-      createOne2Many?: boolean
-      createMany2One?: number
-      createMany2Many?: number
+      createOneToMany?: boolean
+      createManyToOne?: number
+      createManyToMany?: number
     }
   }) {
     let { rowData } = opts as any
@@ -238,7 +238,7 @@ describe("row api - postgres", () => {
       })
     }
 
-    if (opts?.createForeignRows?.createOne2Many) {
+    if (opts?.createForeignRows?.createOneToMany) {
       const foreignKey = `fk_${oneToManyRelationshipInfo.table.name}_${oneToManyRelationshipInfo.fieldName}`
 
       const foreignRow = await config.createRow({
@@ -256,7 +256,7 @@ describe("row api - postgres", () => {
       })
     }
 
-    for (let i = 0; i < (opts?.createForeignRows?.createMany2One || 0); i++) {
+    for (let i = 0; i < (opts?.createForeignRows?.createManyToOne || 0); i++) {
       const foreignRow = await config.createRow({
         tableId: manyToOneRelationshipInfo.table._id,
         title: generator.name(),
@@ -274,7 +274,7 @@ describe("row api - postgres", () => {
       })
     }
 
-    for (let i = 0; i < (opts?.createForeignRows?.createMany2Many || 0); i++) {
+    for (let i = 0; i < (opts?.createForeignRows?.createManyToMany || 0); i++) {
       const foreignRow = await config.createRow({
         tableId: manyToManyRelationshipInfo.table._id,
         title: generator.name(),
@@ -321,9 +321,9 @@ describe("row api - postgres", () => {
   async function populatePrimaryRows(
     count: number,
     opts?: {
-      createOne2Many?: boolean
-      createMany2One?: number
-      createMany2Many?: number
+      createOneToMany?: boolean
+      createManyToOne?: number
+      createManyToMany?: number
     }
   ) {
     return await Promise.all(
@@ -554,9 +554,9 @@ describe("row api - postgres", () => {
       describe("with all relationship types", () => {
         beforeEach(async () => {
           let [createdRow] = await populatePrimaryRows(1, {
-            createOne2Many: true,
-            createMany2One: 3,
-            createMany2Many: 2,
+            createOneToMany: true,
+            createManyToOne: 3,
+            createManyToMany: 2,
           })
           row = createdRow.row
           rowData = createdRow.rowData
@@ -590,7 +590,7 @@ describe("row api - postgres", () => {
       describe("with only one to many", () => {
         beforeEach(async () => {
           let [createdRow] = await populatePrimaryRows(1, {
-            createOne2Many: true,
+            createOneToMany: true,
           })
           row = createdRow.row
           rowData = createdRow.rowData
@@ -621,7 +621,7 @@ describe("row api - postgres", () => {
       describe("with only many to one", () => {
         beforeEach(async () => {
           let [createdRow] = await populatePrimaryRows(1, {
-            createMany2One: 3,
+            createManyToOne: 3,
           })
           row = createdRow.row
           rowData = createdRow.rowData
@@ -650,7 +650,7 @@ describe("row api - postgres", () => {
       describe("with only many to many", () => {
         beforeEach(async () => {
           let [createdRow] = await populatePrimaryRows(1, {
-            createMany2Many: 2,
+            createManyToMany: 2,
           })
           row = createdRow.row
           rowData = createdRow.rowData
@@ -902,9 +902,9 @@ describe("row api - postgres", () => {
           const rowsInfo = await createPrimaryRow({
             rowData,
             createForeignRows: {
-              createOne2Many: true,
-              createMany2One: 3,
-              createMany2Many: 2,
+              createOneToMany: true,
+              createManyToOne: 3,
+              createManyToMany: 2,
             },
           })
 

From 045822d65e8bccc0ef9e3dfe775cc6bbebae09f6 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 24 Feb 2023 11:24:29 +0100
Subject: [PATCH 138/273] Dry

---
 .../api/controllers/row/ExternalRequest.ts    | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 45940abff8..f60d1b83ab 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -154,11 +154,12 @@ function generateIdForRow(
   // build id array
   let idParts = []
   for (let field of primary) {
-    // need to handle table name + field or just field, depending on if relationships used
-    let fieldValue = row[`${table.name}.${field}`]
-    if (!fieldValue && !isLinked) {
-      fieldValue = row[field]
-    }
+    let fieldValue = extractFieldValue({
+      row,
+      tableName: table.name,
+      fieldName: field,
+      isLinked,
+    })
     if (fieldValue) {
       idParts.push(fieldValue)
     }
@@ -181,6 +182,25 @@ function getEndpoint(tableId: string | undefined, operation: string) {
   }
 }
 
+// need to handle table name + field or just field, depending on if relationships used
+function extractFieldValue({
+  row,
+  tableName,
+  fieldName,
+  isLinked,
+}: {
+  row: Row
+  tableName: string
+  fieldName: string
+  isLinked: boolean
+}) {
+  let value = row[`${tableName}.${fieldName}`]
+  if (value == null && !isLinked) {
+    value = row[fieldName]
+  }
+  return value
+}
+
 function basicProcessing({
   row,
   table,
@@ -195,8 +215,13 @@ function basicProcessing({
   for (let field of Object.values(table.schema)) {
     const fieldName = field.name
 
-    const pathValue = row[`${table.name}.${fieldName}`]
-    const value = pathValue != null || isLinked ? pathValue : row[fieldName]
+    const value = extractFieldValue({
+      row,
+      tableName: table.name,
+      fieldName,
+      isLinked,
+    })
+
     // all responses include "select col as table.col" so that overlaps are handled
     if (value != null) {
       thisRow[fieldName] = value

From d5fd635d6c308ffd7534695cd4d29afae9538917 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Fri, 24 Feb 2023 11:26:05 +0100
Subject: [PATCH 139/273] Remove @ts-ignore

---
 packages/server/src/api/controllers/row/ExternalRequest.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index f60d1b83ab..c3b7636636 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -613,14 +613,13 @@ export class ExternalRequest {
       const { key, tableId, isUpdate, id, ...rest } = relationship
       const body: { [key: string]: any } = processObjectSync(rest, row, {})
       const linkTable = this.getTable(tableId)
-      // @ts-ignore
-      const linkPrimary = linkTable?.primary[0]
+      const relationshipPrimary = linkTable?.primary || []
+      const linkPrimary = relationshipPrimary[0]
       if (!linkTable || !linkPrimary) {
         return
       }
 
-      // @ts-ignore
-      const linkSecondary = linkTable?.primary[1]
+      const linkSecondary = relationshipPrimary[1]
 
       const rows = related[key]?.rows || []
 

From f791cb6365620b759314c71ab06fc72c1e899146 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 10:48:01 +0000
Subject: [PATCH 140/273] v2.3.18-alpha.10

---
 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 ee2681c548..5f14e78ec7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6ff40ab4f3..d41e8504ac 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.9",
+    "@budibase/types": "2.3.18-alpha.10",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9771c2aa43..64d654cd36 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.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "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.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.10",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a4b2c0fc89..510cea0ab2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.9",
-    "@budibase/client": "2.3.18-alpha.9",
-    "@budibase/frontend-core": "2.3.18-alpha.9",
-    "@budibase/string-templates": "2.3.18-alpha.9",
+    "@budibase/bbui": "2.3.18-alpha.10",
+    "@budibase/client": "2.3.18-alpha.10",
+    "@budibase/frontend-core": "2.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.10",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c5a8eb7dc6..a8a017e4a3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "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.3.18-alpha.9",
-    "@budibase/string-templates": "2.3.18-alpha.9",
-    "@budibase/types": "2.3.18-alpha.9",
+    "@budibase/backend-core": "2.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.10",
+    "@budibase/types": "2.3.18-alpha.10",
     "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 0872267c03..0b177fa6cd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "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.3.18-alpha.9",
-    "@budibase/frontend-core": "2.3.18-alpha.9",
-    "@budibase/string-templates": "2.3.18-alpha.9",
+    "@budibase/bbui": "2.3.18-alpha.10",
+    "@budibase/frontend-core": "2.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.10",
     "@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 ea74808a4d..9c67294d35 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.9",
+    "@budibase/bbui": "2.3.18-alpha.10",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0bb9a12dae..8509c8ea1d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 147e3b17b6..a841987800 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.9",
-    "@budibase/client": "2.3.18-alpha.9",
+    "@budibase/backend-core": "2.3.18-alpha.10",
+    "@budibase/client": "2.3.18-alpha.10",
     "@budibase/pro": "2.3.18-alpha.9",
-    "@budibase/string-templates": "2.3.18-alpha.9",
-    "@budibase/types": "2.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.10",
+    "@budibase/types": "2.3.18-alpha.10",
     "@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 0ca02a80b6..570474b19d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "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 739d21126f..79b0a64912 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "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 cd0e6139c5..655eaef529 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.9",
+  "version": "2.3.18-alpha.10",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.9",
+    "@budibase/backend-core": "2.3.18-alpha.10",
     "@budibase/pro": "2.3.18-alpha.9",
-    "@budibase/string-templates": "2.3.18-alpha.9",
-    "@budibase/types": "2.3.18-alpha.9",
+    "@budibase/string-templates": "2.3.18-alpha.10",
+    "@budibase/types": "2.3.18-alpha.10",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 80813f5aa87a47575bb31d7cc61a134912046a52 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 10:51:08 +0000
Subject: [PATCH 141/273] Update pro version to 2.3.18-alpha.10

---
 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 a841987800..4292c70ac6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.10",
     "@budibase/client": "2.3.18-alpha.10",
-    "@budibase/pro": "2.3.18-alpha.9",
+    "@budibase/pro": "2.3.18-alpha.10",
     "@budibase/string-templates": "2.3.18-alpha.10",
     "@budibase/types": "2.3.18-alpha.10",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0ef2527e7e..c1ba41a830 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.9.tgz#13ecee562b25e4f5297dfcc1fc47e32a52729c72"
-  integrity sha512-1mvBGAGwwj2aYlu1xx3FjGJRYSG4btYdljv5dkjvfCxl1wZoYrxQDe8FOzU0AOqtLyBgk9ANkkF185i1lhGXqg==
+"@budibase/backend-core@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.10.tgz#c934db86c39280b67819f90f19b2633503a7c563"
+  integrity sha512-4Y6+DEoCCnlrLtdMSkn07CkJKvkNhu744OgnjvVf+gWhhZAQbsgCNyK62HrUtH4Rnp8Xk9IZ1T59icEH4nbjJQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.9"
+    "@budibase/types" "2.3.18-alpha.10"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.9.tgz#e930299011d88114df201df744a6bf470f39127e"
-  integrity sha512-QEapO6kYeMt5h12E48SnEuFNmXTmN0PFkHP5FTgA7MH1JPgaVsAcbNjeEZ+aOLOtQ1e6jRbuB5Ue0JxWMfujOg==
+"@budibase/pro@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.10.tgz#fed175d68dfd2219bb969eb96ef5db71fe1798ca"
+  integrity sha512-knUyW1U/CxrJ6P6Uv1kJC2APTyLUTp2+Zqo7X/w8aLWF1K/cn4mq6/6s6A8cC9xOZXJHNT30ZKzX6SJVrxjU4A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.9"
-    "@budibase/types" "2.3.18-alpha.9"
+    "@budibase/backend-core" "2.3.18-alpha.10"
+    "@budibase/types" "2.3.18-alpha.10"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.9.tgz#6e5b684e83c8054bfb3d3da01d8ce7c4fab1269a"
-  integrity sha512-dgtm1IgzNun3em7fTkZzUHSn7YmypiohlTKGBDu4No94Br3K6ysiI1hc4eSEuzakL+TAuvmVgjRKpw2yzumeBQ==
+"@budibase/types@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.10.tgz#efc70c66bb59df2eb9ba3292ca14009016ba0d4a"
+  integrity sha512-31MLknZpi+H08qFxCDoDP2kNf7Nj+QvvvEGYFbMXFQkNLNoGO8cFVIlE70hVgYe0Rxa+mqSMJ5WwFIGIKuYNCw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 655eaef529..10984e8468 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.10",
-    "@budibase/pro": "2.3.18-alpha.9",
+    "@budibase/pro": "2.3.18-alpha.10",
     "@budibase/string-templates": "2.3.18-alpha.10",
     "@budibase/types": "2.3.18-alpha.10",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 2063169772..5972eea55a 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.9.tgz#13ecee562b25e4f5297dfcc1fc47e32a52729c72"
-  integrity sha512-1mvBGAGwwj2aYlu1xx3FjGJRYSG4btYdljv5dkjvfCxl1wZoYrxQDe8FOzU0AOqtLyBgk9ANkkF185i1lhGXqg==
+"@budibase/backend-core@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.10.tgz#c934db86c39280b67819f90f19b2633503a7c563"
+  integrity sha512-4Y6+DEoCCnlrLtdMSkn07CkJKvkNhu744OgnjvVf+gWhhZAQbsgCNyK62HrUtH4Rnp8Xk9IZ1T59icEH4nbjJQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.9"
+    "@budibase/types" "2.3.18-alpha.10"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.9.tgz#e930299011d88114df201df744a6bf470f39127e"
-  integrity sha512-QEapO6kYeMt5h12E48SnEuFNmXTmN0PFkHP5FTgA7MH1JPgaVsAcbNjeEZ+aOLOtQ1e6jRbuB5Ue0JxWMfujOg==
+"@budibase/pro@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.10.tgz#fed175d68dfd2219bb969eb96ef5db71fe1798ca"
+  integrity sha512-knUyW1U/CxrJ6P6Uv1kJC2APTyLUTp2+Zqo7X/w8aLWF1K/cn4mq6/6s6A8cC9xOZXJHNT30ZKzX6SJVrxjU4A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.9"
-    "@budibase/types" "2.3.18-alpha.9"
+    "@budibase/backend-core" "2.3.18-alpha.10"
+    "@budibase/types" "2.3.18-alpha.10"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.9":
-  version "2.3.18-alpha.9"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.9.tgz#6e5b684e83c8054bfb3d3da01d8ce7c4fab1269a"
-  integrity sha512-dgtm1IgzNun3em7fTkZzUHSn7YmypiohlTKGBDu4No94Br3K6ysiI1hc4eSEuzakL+TAuvmVgjRKpw2yzumeBQ==
+"@budibase/types@2.3.18-alpha.10":
+  version "2.3.18-alpha.10"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.10.tgz#efc70c66bb59df2eb9ba3292ca14009016ba0d4a"
+  integrity sha512-31MLknZpi+H08qFxCDoDP2kNf7Nj+QvvvEGYFbMXFQkNLNoGO8cFVIlE70hVgYe0Rxa+mqSMJ5WwFIGIKuYNCw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 5e4c4a9dfd7e47ca63ce0dbe850acea5804ca891 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 24 Feb 2023 12:27:52 +0000
Subject: [PATCH 142/273] fix datepicker bug

---
 .../pages/builder/portal/account/auditLogs/index.svelte   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index e767412e5c..4f339fab4e 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -86,7 +86,10 @@
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
-  $: sortedUsers = sort(enrich($users.data, selectedUsers, "_id"), "email")
+  $: sortedUsers = sort(
+    enrich($users.data || [], selectedUsers, "_id"),
+    "email"
+  )
   $: sortedEvents = sort(
     enrich(parseEventObject($auditLogs.events), selectedEvents, "id"),
     "id"
@@ -250,8 +253,6 @@
     $licensing.goToUpgradePage()
   }}
 >
-  <div class="datepicker" />
-
   <div class="controls">
     <div class="select">
       <Multiselect
@@ -297,6 +298,7 @@
         on:change={e => {
           if (e.detail[0]?.length === 1) {
             startDate = e.detail[0][0].toISOString()
+            endDate = null
           } else if (e.detail[0]?.length > 1) {
             startDate = e.detail[0][0].toISOString()
             endDate = e.detail[0][1].toISOString()

From f070be5f65bb2c73514dc289b805f70251656cb1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 13:15:14 +0000
Subject: [PATCH 143/273] Moving search index to an enum.

---
 packages/backend-core/src/constants/db.ts             |  5 -----
 .../server/src/api/controllers/row/internalSearch.ts  | 11 +++--------
 packages/server/src/db/views/staticViews.ts           |  6 +++---
 packages/types/src/sdk/db.ts                          |  5 +++++
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index 19f493fd8e..d41098c405 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -24,11 +24,6 @@ export enum ViewName {
   APP_BACKUP_BY_TRIGGER = "by_trigger",
 }
 
-export const SearchIndexes = {
-  ROWS: "rows",
-  AUDIT: "audit",
-}
-
 export const DeprecatedViews = {
   [ViewName.USER_BY_EMAIL]: [
     // removed due to inaccuracy in view doc filter logic
diff --git a/packages/server/src/api/controllers/row/internalSearch.ts b/packages/server/src/api/controllers/row/internalSearch.ts
index bdb9379334..9dc12342d6 100644
--- a/packages/server/src/api/controllers/row/internalSearch.ts
+++ b/packages/server/src/api/controllers/row/internalSearch.ts
@@ -1,17 +1,12 @@
 import { db as dbCore, context, SearchParams } from "@budibase/backend-core"
-import { SearchFilters, Row } from "@budibase/types"
+import { SearchFilters, Row, SearchIndex } from "@budibase/types"
 
 export async function paginatedSearch(
   query: SearchFilters,
   params: SearchParams<Row>
 ) {
   const appId = context.getAppId()
-  return dbCore.paginatedSearch(
-    appId!,
-    dbCore.SearchIndexes.ROWS,
-    query,
-    params
-  )
+  return dbCore.paginatedSearch(appId!, SearchIndex.ROWS, query, params)
 }
 
 export async function fullSearch(
@@ -19,5 +14,5 @@ export async function fullSearch(
   params: SearchParams<Row>
 ) {
   const appId = context.getAppId()
-  return dbCore.fullSearch(appId!, dbCore.SearchIndexes.ROWS, query, params)
+  return dbCore.fullSearch(appId!, SearchIndex.ROWS, query, params)
 }
diff --git a/packages/server/src/db/views/staticViews.ts b/packages/server/src/db/views/staticViews.ts
index 674dd20ec7..730e5b1e66 100644
--- a/packages/server/src/db/views/staticViews.ts
+++ b/packages/server/src/db/views/staticViews.ts
@@ -1,6 +1,6 @@
-import { context, db as dbCore } from "@budibase/backend-core"
+import { context } from "@budibase/backend-core"
 import { DocumentType, SEPARATOR, ViewName } from "../utils"
-import { LinkDocument, Row } from "@budibase/types"
+import { LinkDocument, Row, SearchIndex } from "@budibase/types"
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
 
 /**************************************************
@@ -91,7 +91,7 @@ async function searchIndex(indexName: string, fnString: string) {
 
 export async function createAllSearchIndex() {
   await searchIndex(
-    dbCore.SearchIndexes.ROWS,
+    SearchIndex.ROWS,
     function (doc: Row) {
       function idx(input: Row, prev?: string) {
         for (let key of Object.keys(input)) {
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 092253d63a..6e213b5831 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -2,6 +2,11 @@ import Nano from "@budibase/nano"
 import { AllDocsResponse, AnyDocument, Document } from "../"
 import { Writable } from "stream"
 
+export enum SearchIndex {
+  ROWS = "rows",
+  AUDIT = "audit",
+}
+
 export type PouchOptions = {
   inMemory?: boolean
   replication?: boolean

From b80ed3cfee239b263d2466d30fa003c34f1b0a05 Mon Sep 17 00:00:00 2001
From: Gerard Burns <Ghrehh@users.noreply.github.com>
Date: Fri, 24 Feb 2023 13:16:33 +0000
Subject: [PATCH 144/273] Fix App Import (#9796)

---
 .../builder/src/components/start/CreateAppModal.svelte    | 8 ++++----
 .../builder/src/components/start/UpdateAppModal.svelte    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index e3ce048a89..62194df3db 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -28,10 +28,10 @@
   const validation = createValidationStore()
 
   $: {
-    const { name, url } = $values
+    const { url } = $values
 
     validation.check({
-      name,
+      ...$values,
       url: url?.[0] === "/" ? url.substring(1, url.length) : url,
     })
   }
@@ -95,9 +95,9 @@
     appValidation.url(validation, { apps: applications })
     appValidation.file(validation, { template })
     // init validation
-    const { name, url } = $values
+    const { url } = $values
     validation.check({
-      name,
+      ...$values,
       url: url?.[0] === "/" ? url.substring(1, url.length) : url,
     })
   }
diff --git a/packages/builder/src/components/start/UpdateAppModal.svelte b/packages/builder/src/components/start/UpdateAppModal.svelte
index 4385175816..59d2957bf5 100644
--- a/packages/builder/src/components/start/UpdateAppModal.svelte
+++ b/packages/builder/src/components/start/UpdateAppModal.svelte
@@ -24,10 +24,10 @@
   const validation = createValidationStore()
 
   $: {
-    const { name, url } = $values
+    const { url } = $values
 
     validation.check({
-      name,
+      ...$values,
       url: url?.[0] === "/" ? url.substring(1, url.length) : url,
     })
   }
@@ -37,9 +37,9 @@
     appValidation.name(validation, { apps: applications, currentApp: app })
     appValidation.url(validation, { apps: applications, currentApp: app })
     // init validation
-    const { name, url } = $values
+    const { url } = $values
     validation.check({
-      name,
+      ...$values,
       url: url?.[0] === "/" ? url.substring(1, url.length) : url,
     })
   }

From d5a655a4eb58077984135be85b7bfb80123251ce Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 13:23:58 +0000
Subject: [PATCH 145/273] v2.3.18-alpha.11

---
 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 5f14e78ec7..1bc8cef62b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index d41e8504ac..973414832a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.10",
+    "@budibase/types": "2.3.18-alpha.11",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 64d654cd36..959bcf5f10 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.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "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.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.11",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 510cea0ab2..3967709bc8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.10",
-    "@budibase/client": "2.3.18-alpha.10",
-    "@budibase/frontend-core": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.10",
+    "@budibase/bbui": "2.3.18-alpha.11",
+    "@budibase/client": "2.3.18-alpha.11",
+    "@budibase/frontend-core": "2.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.11",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a8a017e4a3..aa77ad5a92 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "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.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.10",
-    "@budibase/types": "2.3.18-alpha.10",
+    "@budibase/backend-core": "2.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.11",
+    "@budibase/types": "2.3.18-alpha.11",
     "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 0b177fa6cd..439f0e869c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "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.3.18-alpha.10",
-    "@budibase/frontend-core": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.10",
+    "@budibase/bbui": "2.3.18-alpha.11",
+    "@budibase/frontend-core": "2.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.11",
     "@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 9c67294d35..ad2d979b04 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.10",
+    "@budibase/bbui": "2.3.18-alpha.11",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 8509c8ea1d..0e9c083550 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 4292c70ac6..84d7916f47 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.10",
-    "@budibase/client": "2.3.18-alpha.10",
+    "@budibase/backend-core": "2.3.18-alpha.11",
+    "@budibase/client": "2.3.18-alpha.11",
     "@budibase/pro": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.10",
-    "@budibase/types": "2.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.11",
+    "@budibase/types": "2.3.18-alpha.11",
     "@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 570474b19d..e1019d23b1 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "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 79b0a64912..1e35f267f4 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "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 10984e8468..78255e11ab 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.10",
+  "version": "2.3.18-alpha.11",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.10",
+    "@budibase/backend-core": "2.3.18-alpha.11",
     "@budibase/pro": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.10",
-    "@budibase/types": "2.3.18-alpha.10",
+    "@budibase/string-templates": "2.3.18-alpha.11",
+    "@budibase/types": "2.3.18-alpha.11",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 58fab29fb491af9e9335dddc76b9a81e06d45492 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 13:32:45 +0000
Subject: [PATCH 146/273] Main body of PR comments.

---
 .../backend-core/src/context/mainContext.ts   |   2 +-
 packages/backend-core/src/db/utils.ts         |   2 +-
 .../processors/posthog/PosthogProcessor.ts    |   9 ++
 .../src/events/publishers/auditLog.ts         |  16 +-
 .../{downloadBody.ts => querystringToBody.ts} |   6 +
 packages/backend-core/src/users.ts            |  13 +-
 packages/backend-core/src/utils/utils.ts      |  30 ----
 packages/server/src/app.ts                    |   5 -
 packages/server/src/startup.ts                |   6 +-
 packages/types/src/sdk/auditLogs.ts           |   2 +-
 packages/types/src/sdk/events/auditLog.ts     |   4 +-
 packages/types/src/sdk/events/event.ts        |   8 +-
 .../api/routes/global/tests/auditLogs.spec.ts | 138 +++++++++---------
 13 files changed, 113 insertions(+), 128 deletions(-)
 rename packages/backend-core/src/middleware/{downloadBody.ts => querystringToBody.ts} (79%)

diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 14b7547ea9..96ddd61268 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -239,7 +239,7 @@ export function getGlobalDB(): Database {
 
 export function getAuditLogsDB(): Database {
   if (!getTenantId()) {
-    throw new Error("Audit log DB not found")
+    throw new Error("No tenant ID found - cannot open audit log DB")
   }
   return getDB(getAuditLogDBName())
 }
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index d9dbb809d1..8ad7714973 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -366,7 +366,7 @@ export async function getAllApps({
   }
 }
 
-export async function getAppsById(appIds: string[]) {
+export async function getAppsByIDs(appIds: string[]) {
   const settled = await Promise.allSettled(
     appIds.map(appId => getAppMetadata(appId))
   )
diff --git a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
index 593e5ff082..280669b992 100644
--- a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
+++ b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
@@ -47,6 +47,8 @@ export default class PosthogProcessor implements EventProcessor {
       return
     }
 
+    properties = this.clearPIIProperties(properties)
+
     properties.version = pkg.version
     properties.service = env.SERVICE
     properties.environment = identity.environment
@@ -79,6 +81,13 @@ export default class PosthogProcessor implements EventProcessor {
     this.posthog.capture(payload)
   }
 
+  clearPIIProperties(properties: any) {
+    if (properties.email) {
+      delete properties.email
+    }
+    return properties
+  }
+
   async identify(identity: Identity, timestamp?: string | number) {
     const payload: any = { distinctId: identity.id, properties: identity }
     if (timestamp) {
diff --git a/packages/backend-core/src/events/publishers/auditLog.ts b/packages/backend-core/src/events/publishers/auditLog.ts
index b72c135799..7cfb76147a 100644
--- a/packages/backend-core/src/events/publishers/auditLog.ts
+++ b/packages/backend-core/src/events/publishers/auditLog.ts
@@ -1,26 +1,26 @@
 import {
   Event,
   AuditLogSearchParams,
-  AuditLogFilterEvent,
-  AuditLogDownloadEvent,
+  AuditLogFilteredEvent,
+  AuditLogDownloadedEvent,
 } from "@budibase/types"
 import { publishEvent } from "../events"
 
 async function filtered(search: AuditLogSearchParams) {
-  const properties: AuditLogFilterEvent = {
+  const properties: AuditLogFilteredEvent = {
     filters: search,
   }
-  await publishEvent(Event.AUDIT_LOG_FILTER, properties)
+  await publishEvent(Event.AUDIT_LOGS_FILTERED, properties)
 }
 
-async function download(search: AuditLogSearchParams) {
-  const properties: AuditLogDownloadEvent = {
+async function downloaded(search: AuditLogSearchParams) {
+  const properties: AuditLogDownloadedEvent = {
     filters: search,
   }
-  await publishEvent(Event.AUDIT_LOG_DOWNLOAD, properties)
+  await publishEvent(Event.AUDIT_LOGS_DOWNLOADED, properties)
 }
 
 export default {
   filtered,
-  download,
+  downloaded,
 }
diff --git a/packages/backend-core/src/middleware/downloadBody.ts b/packages/backend-core/src/middleware/querystringToBody.ts
similarity index 79%
rename from packages/backend-core/src/middleware/downloadBody.ts
rename to packages/backend-core/src/middleware/querystringToBody.ts
index a7050e08c5..b6f109231a 100644
--- a/packages/backend-core/src/middleware/downloadBody.ts
+++ b/packages/backend-core/src/middleware/querystringToBody.ts
@@ -7,6 +7,12 @@ import { Ctx } from "@budibase/types"
  */
 export default function (ctx: Ctx, next: any) {
   const queryString = ctx.request.query?.query as string | undefined
+  if (ctx.request.method.toLowerCase() !== "get") {
+    ctx.throw(
+      500,
+      "Query to download middleware can only be used for get requests."
+    )
+  }
   if (!queryString) {
     return next()
   }
diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index 5100066ff9..9ef2c5c31f 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -12,7 +12,7 @@ import * as context from "./context"
 
 type GetOpts = { cleanup?: boolean }
 
-function cleanupUsers(users: User | User[]) {
+function removeUserPassword(users: User | User[]) {
   if (Array.isArray(users)) {
     return users.map(user => {
       if (user) {
@@ -39,7 +39,7 @@ export const bulkGetGlobalUsersById = async (
     })
   ).rows.map(row => row.doc) as User[]
   if (opts?.cleanup) {
-    users = cleanupUsers(users) as User[]
+    users = removeUserPassword(users) as User[]
   }
   return users
 }
@@ -53,7 +53,7 @@ export async function getById(id: string, opts?: GetOpts): Promise<User> {
   const db = context.getGlobalDB()
   let user = await db.get(id)
   if (opts?.cleanup) {
-    user = cleanupUsers(user)
+    user = removeUserPassword(user)
   }
   return user
 }
@@ -61,7 +61,6 @@ export async function getById(id: string, opts?: GetOpts): Promise<User> {
 /**
  * Given an email address this will use a view to search through
  * all the users to find one with this email address.
- * @param {string} email the email to lookup the user by.
  */
 export const getGlobalUserByEmail = async (
   email: String,
@@ -83,7 +82,7 @@ export const getGlobalUserByEmail = async (
 
   let user = response as User
   if (opts?.cleanup) {
-    user = cleanupUsers(user) as User
+    user = removeUserPassword(user) as User
   }
 
   return user
@@ -107,7 +106,7 @@ export const searchGlobalUsersByApp = async (
   }
   let users: User[] = Array.isArray(response) ? response : [response]
   if (getOpts?.cleanup) {
-    users = cleanupUsers(users) as User[]
+    users = removeUserPassword(users) as User[]
   }
   return users
 }
@@ -143,7 +142,7 @@ export const searchGlobalUsersByEmail = async (
   }
   let users: User[] = Array.isArray(response) ? response : [response]
   if (getOpts?.cleanup) {
-    users = cleanupUsers(users) as User[]
+    users = removeUserPassword(users) as User[]
   }
   return users
 }
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index 1458c94e77..3731e134ad 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -214,36 +214,6 @@ export async function getBuildersCount() {
   return builders.length
 }
 
-/**
- * Logs a user out from budibase. Re-used across account portal and builder.
- */
-export async function platformLogout(opts: PlatformLogoutOpts) {
-  const ctx = opts.ctx
-  const email = ctx.user?.email!
-  const userId = opts.userId
-  const keepActiveSession = opts.keepActiveSession
-
-  if (!ctx) throw new Error("Koa context must be supplied to logout.")
-
-  const currentSession = getCookie(ctx, Cookie.Auth)
-  let sessions = await getSessionsForUser(userId)
-
-  if (keepActiveSession) {
-    sessions = sessions.filter(
-      session => session.sessionId !== currentSession.sessionId
-    )
-  } else {
-    // clear cookies
-    clearCookie(ctx, Cookie.Auth)
-    clearCookie(ctx, Cookie.CurrentApp)
-  }
-
-  const sessionIds = sessions.map(({ sessionId }) => sessionId)
-  await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  await events.auth.logout(email)
-  await userCache.invalidateUser(userId)
-}
-
 export function timeout(timeMs: number) {
   return new Promise(resolve => setTimeout(resolve, timeMs))
 }
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 86b2783533..00f2aca7fc 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -28,17 +28,12 @@ import * as automations from "./automations"
 import { Thread } from "./threads"
 import * as redis from "./utilities/redis"
 import { events, logging, middleware } from "@budibase/backend-core"
-import { sdk } from "@budibase/pro"
 import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 const Sentry = require("@sentry/node")
 const destroyable = require("server-destroy")
 const { userAgent } = require("koa-useragent")
 
-// configure events to use the pro audit log write
-// can't integrate directly into backend-core due to cyclic issues
-events.configure(sdk.auditLogs.write)
-
 const app = new Koa()
 
 let mbNumber = parseInt(env.HTTP_MB_LIMIT || "10")
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index f70694226d..1729c7ba20 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -5,7 +5,7 @@ import {
   generateApiKey,
   getChecklist,
 } from "./utilities/workerRequests"
-import { installation, tenancy, logging } from "@budibase/backend-core"
+import { installation, tenancy, logging, events } from "@budibase/backend-core"
 import fs from "fs"
 import { watch } from "./watch"
 import * as automations from "./automations"
@@ -17,6 +17,7 @@ import * as pro from "@budibase/pro"
 import * as api from "./api"
 import sdk from "./sdk"
 const pino = require("koa-pino-logger")
+import { sdk as proSdk } from "@budibase/pro"
 
 let STARTUP_RAN = false
 
@@ -124,6 +125,9 @@ export async function startup(app?: any, server?: any) {
   // get the references to the queue promises, don't await as
   // they will never end, unless the processing stops
   let queuePromises = []
+  // configure events to use the pro audit log write
+  // can't integrate directly into backend-core due to cyclic issues
+  queuePromises.push(events.configure(proSdk.auditLogs.write))
   queuePromises.push(automations.init())
   queuePromises.push(initPro())
   if (app) {
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index e5d0c77d90..9a5d6e7556 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -11,7 +11,7 @@ export type AuditLogFn = (
   event: Event,
   metadata: any,
   opts: AuditWriteOpts
-) => Promise<any>
+) => Promise<void>
 
 export type AuditLogQueueEvent = {
   event: Event
diff --git a/packages/types/src/sdk/events/auditLog.ts b/packages/types/src/sdk/events/auditLog.ts
index c5e3208536..5f3edfb826 100644
--- a/packages/types/src/sdk/events/auditLog.ts
+++ b/packages/types/src/sdk/events/auditLog.ts
@@ -1,10 +1,10 @@
 import { BaseEvent } from "./event"
 import { AuditLogSearchParams } from "../../api"
 
-export interface AuditLogFilterEvent extends BaseEvent {
+export interface AuditLogFilteredEvent extends BaseEvent {
   filters: AuditLogSearchParams
 }
 
-export interface AuditLogDownloadEvent extends BaseEvent {
+export interface AuditLogDownloadedEvent extends BaseEvent {
   filters: AuditLogSearchParams
 }
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 119ae4ad7a..e2c85c970c 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -182,8 +182,8 @@ export enum Event {
   ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened",
 
   // AUDIT LOG
-  AUDIT_LOG_FILTER = "audit_log:filter",
-  AUDIT_LOG_DOWNLOAD = "audit_log:download",
+  AUDIT_LOGS_FILTERED = "audit_log:filtered",
+  AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded",
 }
 
 // all events that are not audited have been added to this record as undefined, this means
@@ -362,8 +362,8 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.INSTALLATION_FIRST_STARTUP]: undefined,
 
   // AUDIT LOG - NOT AUDITED
-  [Event.AUDIT_LOG_FILTER]: undefined,
-  [Event.AUDIT_LOG_DOWNLOAD]: undefined,
+  [Event.AUDIT_LOGS_FILTERED]: undefined,
+  [Event.AUDIT_LOGS_DOWNLOADED]: undefined,
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
index 536c510129..19e3cd64b4 100644
--- a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -23,87 +23,89 @@ describe("/api/global/auditlogs", () => {
     await config.afterAll()
   })
 
-  it("should be able to fire some events (create audit logs)", async () => {
-    await context.doInTenant(config.tenantId, async () => {
-      const userId = config.user!._id!
-      const identity = {
-        ...BASE_IDENTITY,
-        _id: userId,
-        tenantId: config.tenantId,
-      }
-      await context.doInIdentityContext(identity, async () => {
-        for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
-          await events.user.created(structures.users.user())
+  describe("POST /api/global/auditlogs/search", () => {
+    it("should be able to fire some events (create audit logs)", async () => {
+      await context.doInTenant(config.tenantId, async () => {
+        const userId = config.user!._id!
+        const identity = {
+          ...BASE_IDENTITY,
+          _id: userId,
+          tenantId: config.tenantId,
         }
-        await context.doInAppContext(APP_ID, async () => {
-          await events.app.created(structures.apps.app(APP_ID))
+        await context.doInIdentityContext(identity, async () => {
+          for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
+            await events.user.created(structures.users.user())
+          }
+          await context.doInAppContext(APP_ID, async () => {
+            await events.app.created(structures.apps.app(APP_ID))
+          })
+          // fetch the user created events
+          const response = await config.api.auditLogs.search({
+            events: [Event.USER_CREATED],
+          })
+          expect(response.data).toBeDefined()
+          // there will be an initial event which comes from the default user creation
+          expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
         })
-        // fetch the user created events
-        const response = await config.api.auditLogs.search({
-          events: [Event.USER_CREATED],
-        })
-        expect(response.data).toBeDefined()
-        // there will be an initial event which comes from the default user creation
-        expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
       })
     })
-  })
 
-  it("should be able to search by event", async () => {
-    const response = await config.api.auditLogs.search({
-      events: [Event.USER_CREATED],
+    it("should be able to search by event", async () => {
+      const response = await config.api.auditLogs.search({
+        events: [Event.USER_CREATED],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.event).toBe(Event.USER_CREATED)
+      }
     })
-    expect(response.data.length).toBeGreaterThan(0)
-    for (let log of response.data) {
-      expect(log.event).toBe(Event.USER_CREATED)
-    }
-  })
 
-  it("should be able to search by time range (frozen)", async () => {
-    // this is frozen, only need to add 1 and minus 1
-    const now = new Date()
-    const start = new Date()
-    start.setSeconds(now.getSeconds() - 1)
-    const end = new Date()
-    end.setSeconds(now.getSeconds() + 1)
-    const response = await config.api.auditLogs.search({
-      startDate: start.toISOString(),
-      endDate: end.toISOString(),
+    it("should be able to search by time range (frozen)", async () => {
+      // this is frozen, only need to add 1 and minus 1
+      const now = new Date()
+      const start = new Date()
+      start.setSeconds(now.getSeconds() - 1)
+      const end = new Date()
+      end.setSeconds(now.getSeconds() + 1)
+      const response = await config.api.auditLogs.search({
+        startDate: start.toISOString(),
+        endDate: end.toISOString(),
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.timestamp).toBe(now.toISOString())
+      }
     })
-    expect(response.data.length).toBeGreaterThan(0)
-    for (let log of response.data) {
-      expect(log.timestamp).toBe(now.toISOString())
-    }
-  })
 
-  it("should be able to search by user ID", async () => {
-    const userId = config.user!._id!
-    const response = await config.api.auditLogs.search({
-      userIds: [userId],
+    it("should be able to search by user ID", async () => {
+      const userId = config.user!._id!
+      const response = await config.api.auditLogs.search({
+        userIds: [userId],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.user._id).toBe(userId)
+      }
     })
-    expect(response.data.length).toBeGreaterThan(0)
-    for (let log of response.data) {
-      expect(log.user._id).toBe(userId)
-    }
-  })
 
-  it("should be able to search by app ID", async () => {
-    const response = await config.api.auditLogs.search({
-      appIds: [APP_ID],
+    it("should be able to search by app ID", async () => {
+      const response = await config.api.auditLogs.search({
+        appIds: [APP_ID],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.app?._id).toBe(APP_ID)
+      }
     })
-    expect(response.data.length).toBeGreaterThan(0)
-    for (let log of response.data) {
-      expect(log.app?._id).toBe(APP_ID)
-    }
-  })
 
-  it("should be able to search by full string", async () => {
-    const response = await config.api.auditLogs.search({
-      fullSearch: "User",
+    it("should be able to search by full string", async () => {
+      const response = await config.api.auditLogs.search({
+        fullSearch: "User",
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.name.includes("User")).toBe(true)
+      }
     })
-    expect(response.data.length).toBeGreaterThan(0)
-    for (let log of response.data) {
-      expect(log.name.includes("User")).toBe(true)
-    }
   })
 })

From 8853776c7982fa0ba15595aa0c64cb01a4f9ed75 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 13:52:54 +0000
Subject: [PATCH 147/273] Moving around processors to separate audit logs out
 of central event handling.

---
 packages/backend-core/src/events/events.ts    | 44 +-----------
 packages/backend-core/src/events/index.ts     |  2 +-
 .../events/processors/AuditLogsProcessor.ts   | 71 +++++++++++++++++++
 .../src/events/processors/index.ts            | 13 +++-
 packages/server/src/startup.ts                |  2 +-
 packages/types/src/sdk/auditLogs.ts           |  3 +-
 packages/worker/src/index.ts                  |  4 +-
 7 files changed, 90 insertions(+), 49 deletions(-)
 create mode 100644 packages/backend-core/src/events/processors/AuditLogsProcessor.ts

diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index d3d32384aa..dc8c5482fb 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -1,38 +1,12 @@
-import {
-  AuditLogFn,
-  Event,
-  IdentityType,
-  AuditedEventFriendlyName,
-  AuditLogQueueEvent,
-} from "@budibase/types"
+import { Event, AuditedEventFriendlyName } from "@budibase/types"
 import { processors } from "./processors"
 import identification from "./identification"
-import { getAppId } from "../context"
 import * as backfill from "./backfill"
-import { createQueue, JobQueue } from "../queue"
-import BullQueue from "bull"
 
 export function isAudited(event: Event) {
   return !!AuditedEventFriendlyName[event]
 }
 
-let auditLogsEnabled = false
-let auditLogQueue: BullQueue.Queue<AuditLogQueueEvent>
-
-export const configure = (fn: AuditLogFn) => {
-  auditLogsEnabled = true
-  const writeAuditLogs = fn
-  auditLogQueue = createQueue<AuditLogQueueEvent>(JobQueue.AUDIT_LOG)
-  return auditLogQueue.process(async job => {
-    await writeAuditLogs(job.data.event, job.data.properties, {
-      userId: job.data.opts.userId,
-      timestamp: job.data.opts.timestamp,
-      appId: job.data.opts.appId,
-      hostInfo: job.data.opts.hostInfo,
-    })
-  })
-}
-
 export const publishEvent = async (
   event: Event,
   properties: any,
@@ -45,22 +19,6 @@ export const publishEvent = async (
   // no backfill - send the event and exit
   if (!backfilling) {
     await processors.processEvent(event, identity, properties, timestamp)
-    if (auditLogsEnabled && isAudited(event)) {
-      // only audit log actual events, don't include backfills
-      const userId =
-        identity.type === IdentityType.USER ? identity.id : undefined
-      // add to the event queue, rather than just writing immediately
-      await auditLogQueue.add({
-        event,
-        properties,
-        opts: {
-          userId,
-          timestamp,
-          appId: getAppId(),
-          hostInfo: identity.hostInfo,
-        },
-      })
-    }
     return
   }
 
diff --git a/packages/backend-core/src/events/index.ts b/packages/backend-core/src/events/index.ts
index 15f6dde835..dd687304d8 100644
--- a/packages/backend-core/src/events/index.ts
+++ b/packages/backend-core/src/events/index.ts
@@ -3,7 +3,7 @@ export * as processors from "./processors"
 export * as analytics from "./analytics"
 export { default as identification } from "./identification"
 export * as backfillCache from "./backfill"
-export { configure, isAudited } from "./events"
+export { isAudited } from "./events"
 
 import { processors } from "./processors"
 
diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
new file mode 100644
index 0000000000..2461539ff3
--- /dev/null
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -0,0 +1,71 @@
+import {
+  Event,
+  Identity,
+  Group,
+  IdentityType,
+  AuditLogQueueEvent,
+  AuditLogFn,
+} from "@budibase/types"
+import { EventProcessor } from "./types"
+import { getAppId } from "../../context"
+import { isAudited } from "../events"
+import BullQueue from "bull"
+import { createQueue, JobQueue } from "../../queue"
+
+export default class AuditLogsProcessor implements EventProcessor {
+  static auditLogsEnabled = false
+  static auditLogQueue: BullQueue.Queue<AuditLogQueueEvent>
+
+  // can't use constructor as need to return promise
+  static init(fn: AuditLogFn) {
+    AuditLogsProcessor.auditLogsEnabled = true
+    const writeAuditLogs = fn
+    AuditLogsProcessor.auditLogQueue = createQueue<AuditLogQueueEvent>(
+      JobQueue.AUDIT_LOG
+    )
+    return AuditLogsProcessor.auditLogQueue.process(async job => {
+      await writeAuditLogs(job.data.event, job.data.properties, {
+        userId: job.data.opts.userId,
+        timestamp: job.data.opts.timestamp,
+        appId: job.data.opts.appId,
+        hostInfo: job.data.opts.hostInfo,
+      })
+    })
+  }
+
+  async processEvent(
+    event: Event,
+    identity: Identity,
+    properties: any,
+    timestamp?: string
+  ): Promise<void> {
+    if (AuditLogsProcessor.auditLogsEnabled && isAudited(event)) {
+      // only audit log actual events, don't include backfills
+      const userId =
+        identity.type === IdentityType.USER ? identity.id : undefined
+      // add to the event queue, rather than just writing immediately
+      await AuditLogsProcessor.auditLogQueue.add({
+        event,
+        properties,
+        opts: {
+          userId,
+          timestamp,
+          appId: getAppId(),
+          hostInfo: identity.hostInfo,
+        },
+      })
+    }
+  }
+
+  async identify(identity: Identity, timestamp?: string | number) {
+    // no-op
+  }
+
+  async identifyGroup(group: Group, timestamp?: string | number) {
+    // no-op
+  }
+
+  shutdown(): void {
+    AuditLogsProcessor.auditLogQueue.close()
+  }
+}
diff --git a/packages/backend-core/src/events/processors/index.ts b/packages/backend-core/src/events/processors/index.ts
index 0e75f050db..6646764e47 100644
--- a/packages/backend-core/src/events/processors/index.ts
+++ b/packages/backend-core/src/events/processors/index.ts
@@ -1,8 +1,19 @@
 import AnalyticsProcessor from "./AnalyticsProcessor"
 import LoggingProcessor from "./LoggingProcessor"
+import AuditLogsProcessor from "./AuditLogsProcessor"
 import Processors from "./Processors"
+import { AuditLogFn } from "@budibase/types"
 
 export const analyticsProcessor = new AnalyticsProcessor()
 const loggingProcessor = new LoggingProcessor()
+const auditLogsProcessor = new AuditLogsProcessor()
 
-export const processors = new Processors([analyticsProcessor, loggingProcessor])
+export function init(auditingFn: AuditLogFn) {
+  return AuditLogsProcessor.init(auditingFn)
+}
+
+export const processors = new Processors([
+  analyticsProcessor,
+  loggingProcessor,
+  auditLogsProcessor,
+])
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index 1729c7ba20..e6784c5a82 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -127,7 +127,7 @@ export async function startup(app?: any, server?: any) {
   let queuePromises = []
   // configure events to use the pro audit log write
   // can't integrate directly into backend-core due to cyclic issues
-  queuePromises.push(events.configure(proSdk.auditLogs.write))
+  queuePromises.push(events.processors.init(proSdk.auditLogs.write))
   queuePromises.push(automations.init())
   queuePromises.push(initPro())
   if (app) {
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index 9a5d6e7556..0322d2e862 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -1,4 +1,5 @@
 import { Event, HostInfo } from "./events"
+import { AuditLogDoc } from "../documents"
 
 export type AuditWriteOpts = {
   appId?: string
@@ -11,7 +12,7 @@ export type AuditLogFn = (
   event: Event,
   metadata: any,
   opts: AuditWriteOpts
-) => Promise<void>
+) => Promise<AuditLogDoc | undefined>
 
 export type AuditLogQueueEvent = {
   event: Event
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 750ae0055d..ac28ead30a 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -14,7 +14,7 @@ import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
 import { auth, logging, events, middleware } from "@budibase/backend-core"
-import { sdk } from "@budibase/pro"
+import { sdk as proSdk, sdk } from "@budibase/pro"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -30,7 +30,7 @@ import destroyable from "server-destroy"
 
 // configure events to use the pro audit log write
 // can't integrate directly into backend-core due to cyclic issues
-events.configure(sdk.auditLogs.write)
+events.processors.init(proSdk.auditLogs.write)
 
 if (env.ENABLE_SSO_MAINTENANCE_MODE) {
   console.warn(

From a293d3842f60553bae572e33ce719e5b302fbb49 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 13:55:36 +0000
Subject: [PATCH 148/273] Fixing build issue.

---
 packages/backend-core/src/middleware/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts
index 0c4c2f6b94..addeac6a1a 100644
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@@ -17,5 +17,5 @@ export { default as builderOrAdmin } from "./builderOrAdmin"
 export { default as builderOnly } from "./builderOnly"
 export { default as logging } from "./logging"
 export { default as errorHandling } from "./errorHandling"
-export { default as downloadBody } from "./downloadBody"
+export { default as querystringToBody } from "./querystringToBody"
 export * as joiValidator from "./joi-validator"

From 0ba544bb0a101ea7b48806d1069e33025d9625e2 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 15:51:56 +0000
Subject: [PATCH 149/273] v2.3.18-alpha.12

---
 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 1bc8cef62b..5145222dfa 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 973414832a..428d785a44 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.11",
+    "@budibase/types": "2.3.18-alpha.12",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 959bcf5f10..b697a532ad 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.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "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.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.12",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3967709bc8..b3afb4de2a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.11",
-    "@budibase/client": "2.3.18-alpha.11",
-    "@budibase/frontend-core": "2.3.18-alpha.11",
-    "@budibase/string-templates": "2.3.18-alpha.11",
+    "@budibase/bbui": "2.3.18-alpha.12",
+    "@budibase/client": "2.3.18-alpha.12",
+    "@budibase/frontend-core": "2.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.12",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index aa77ad5a92..5bc10322c1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "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.3.18-alpha.11",
-    "@budibase/string-templates": "2.3.18-alpha.11",
-    "@budibase/types": "2.3.18-alpha.11",
+    "@budibase/backend-core": "2.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.12",
+    "@budibase/types": "2.3.18-alpha.12",
     "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 439f0e869c..c18aa46812 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "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.3.18-alpha.11",
-    "@budibase/frontend-core": "2.3.18-alpha.11",
-    "@budibase/string-templates": "2.3.18-alpha.11",
+    "@budibase/bbui": "2.3.18-alpha.12",
+    "@budibase/frontend-core": "2.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.12",
     "@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 ad2d979b04..bc7a82d0a6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.11",
+    "@budibase/bbui": "2.3.18-alpha.12",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0e9c083550..8199e84495 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 84d7916f47..5c4c6f9656 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.11",
-    "@budibase/client": "2.3.18-alpha.11",
+    "@budibase/backend-core": "2.3.18-alpha.12",
+    "@budibase/client": "2.3.18-alpha.12",
     "@budibase/pro": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.11",
-    "@budibase/types": "2.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.12",
+    "@budibase/types": "2.3.18-alpha.12",
     "@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 e1019d23b1..1baef9fcf0 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "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 1e35f267f4..e3972ab5ea 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "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 78255e11ab..8c40cb6313 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.11",
+  "version": "2.3.18-alpha.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.11",
+    "@budibase/backend-core": "2.3.18-alpha.12",
     "@budibase/pro": "2.3.18-alpha.10",
-    "@budibase/string-templates": "2.3.18-alpha.11",
-    "@budibase/types": "2.3.18-alpha.11",
+    "@budibase/string-templates": "2.3.18-alpha.12",
+    "@budibase/types": "2.3.18-alpha.12",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 07b874d30f94e10523fe6728a103ff20d97e3ac8 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 24 Feb 2023 15:54:43 +0000
Subject: [PATCH 150/273] Update pro version to 2.3.18-alpha.12

---
 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 5c4c6f9656..aa3754ee94 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.12",
     "@budibase/client": "2.3.18-alpha.12",
-    "@budibase/pro": "2.3.18-alpha.10",
+    "@budibase/pro": "2.3.18-alpha.12",
     "@budibase/string-templates": "2.3.18-alpha.12",
     "@budibase/types": "2.3.18-alpha.12",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index c1ba41a830..0526603777 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.10.tgz#c934db86c39280b67819f90f19b2633503a7c563"
-  integrity sha512-4Y6+DEoCCnlrLtdMSkn07CkJKvkNhu744OgnjvVf+gWhhZAQbsgCNyK62HrUtH4Rnp8Xk9IZ1T59icEH4nbjJQ==
+"@budibase/backend-core@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.12.tgz#ad1b16be64b78b596af2b5f75647c32e8f6f101a"
+  integrity sha512-E1NEO+/sNkkRqn/xk9XQmFBO9/dl27w9EB0QGztti/16JV9NgxyDQCJIdGwlD08s1y/lUwOKk0TkSZJs+CTYDw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.10"
+    "@budibase/types" "2.3.18-alpha.12"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.10.tgz#fed175d68dfd2219bb969eb96ef5db71fe1798ca"
-  integrity sha512-knUyW1U/CxrJ6P6Uv1kJC2APTyLUTp2+Zqo7X/w8aLWF1K/cn4mq6/6s6A8cC9xOZXJHNT30ZKzX6SJVrxjU4A==
+"@budibase/pro@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.12.tgz#be552b3a9f5850e746081540d6586aae69147bec"
+  integrity sha512-M3b0njzSi47KH6uaQfYPoA2KWrjPiwcU3ONyaVWXHIktVrIKtYaFwOLBr/dmWGfMrL2297SSqg7V4DTaLyAhnw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.10"
-    "@budibase/types" "2.3.18-alpha.10"
+    "@budibase/backend-core" "2.3.18-alpha.12"
+    "@budibase/types" "2.3.18-alpha.12"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.10.tgz#efc70c66bb59df2eb9ba3292ca14009016ba0d4a"
-  integrity sha512-31MLknZpi+H08qFxCDoDP2kNf7Nj+QvvvEGYFbMXFQkNLNoGO8cFVIlE70hVgYe0Rxa+mqSMJ5WwFIGIKuYNCw==
+"@budibase/types@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.12.tgz#a63eb978ccc7e55c209b3e9d71f9aecf7facc0d1"
+  integrity sha512-27o2BmI/HXIR3frZ8FtqHgAe1hd8jPIzgPaEhKrQiYJ/opUVccqupx9ld75Hyk9E6cdXu0UF0/+LxPpUmMugag==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8c40cb6313..6d7cae05a6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.12",
-    "@budibase/pro": "2.3.18-alpha.10",
+    "@budibase/pro": "2.3.18-alpha.12",
     "@budibase/string-templates": "2.3.18-alpha.12",
     "@budibase/types": "2.3.18-alpha.12",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 5972eea55a..99f46ba5fb 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.10.tgz#c934db86c39280b67819f90f19b2633503a7c563"
-  integrity sha512-4Y6+DEoCCnlrLtdMSkn07CkJKvkNhu744OgnjvVf+gWhhZAQbsgCNyK62HrUtH4Rnp8Xk9IZ1T59icEH4nbjJQ==
+"@budibase/backend-core@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.12.tgz#ad1b16be64b78b596af2b5f75647c32e8f6f101a"
+  integrity sha512-E1NEO+/sNkkRqn/xk9XQmFBO9/dl27w9EB0QGztti/16JV9NgxyDQCJIdGwlD08s1y/lUwOKk0TkSZJs+CTYDw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.10"
+    "@budibase/types" "2.3.18-alpha.12"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.10.tgz#fed175d68dfd2219bb969eb96ef5db71fe1798ca"
-  integrity sha512-knUyW1U/CxrJ6P6Uv1kJC2APTyLUTp2+Zqo7X/w8aLWF1K/cn4mq6/6s6A8cC9xOZXJHNT30ZKzX6SJVrxjU4A==
+"@budibase/pro@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.12.tgz#be552b3a9f5850e746081540d6586aae69147bec"
+  integrity sha512-M3b0njzSi47KH6uaQfYPoA2KWrjPiwcU3ONyaVWXHIktVrIKtYaFwOLBr/dmWGfMrL2297SSqg7V4DTaLyAhnw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.10"
-    "@budibase/types" "2.3.18-alpha.10"
+    "@budibase/backend-core" "2.3.18-alpha.12"
+    "@budibase/types" "2.3.18-alpha.12"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.10":
-  version "2.3.18-alpha.10"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.10.tgz#efc70c66bb59df2eb9ba3292ca14009016ba0d4a"
-  integrity sha512-31MLknZpi+H08qFxCDoDP2kNf7Nj+QvvvEGYFbMXFQkNLNoGO8cFVIlE70hVgYe0Rxa+mqSMJ5WwFIGIKuYNCw==
+"@budibase/types@2.3.18-alpha.12":
+  version "2.3.18-alpha.12"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.12.tgz#a63eb978ccc7e55c209b3e9d71f9aecf7facc0d1"
+  integrity sha512-27o2BmI/HXIR3frZ8FtqHgAe1hd8jPIzgPaEhKrQiYJ/opUVccqupx9ld75Hyk9E6cdXu0UF0/+LxPpUmMugag==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b0fd593db5fb319f8f89280071077b35e79e2bac Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 24 Feb 2023 16:27:50 +0000
Subject: [PATCH 151/273] Downgrade glopezep/helm to 1.7.0 (#9803)

---
 .github/workflows/deploy-preprod.yml  | 2 +-
 .github/workflows/deploy-release.yml  | 2 +-
 .github/workflows/release-develop.yml | 2 +-
 .github/workflows/release.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
index cef47636ee..5ce27b08d9 100644
--- a/.github/workflows/deploy-preprod.yml
+++ b/.github/workflows/deploy-preprod.yml
@@ -37,7 +37,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.7.1
+        uses: glopezep/helm@v1.7.0
         with:
           release: budibase-preprod
           namespace: budibase
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index cff26fd7c8..b4653e5a4e 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -38,7 +38,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.7.1
+        uses: glopezep/helm@v1.7.0
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 1ac6b20003..bbb1be0878 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -98,7 +98,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.7.1
+        uses: glopezep/helm@v1.7.0
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2a28150891..7f522244e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.7.1
+        uses: glopezep/helm@v1.7.0
         with:
           release: budibase-preprod
           namespace: budibase

From c14c57bc63e0403a1459e08bbfaf2c6207016037 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 24 Feb 2023 16:34:13 +0000
Subject: [PATCH 152/273] Fix helm action (#9804)

* Downgrade glopezep/helm to 1.7.0

* Downgrade glopezep/helm to 1.6.1
---
 .github/workflows/deploy-preprod.yml  | 2 +-
 .github/workflows/deploy-release.yml  | 2 +-
 .github/workflows/release-develop.yml | 2 +-
 .github/workflows/release.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
index 5ce27b08d9..583d83dc5d 100644
--- a/.github/workflows/deploy-preprod.yml
+++ b/.github/workflows/deploy-preprod.yml
@@ -37,7 +37,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.7.0
+        uses: glopezep/helm@v1.6.1
         with:
           release: budibase-preprod
           namespace: budibase
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index b4653e5a4e..fcc29fcd7d 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -38,7 +38,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.7.0
+        uses: glopezep/helm@v1.6.1
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index bbb1be0878..3201ecb1c9 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -98,7 +98,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.7.0
+        uses: glopezep/helm@v1.6.1
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f522244e0..28da63aadf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.7.0
+        uses: glopezep/helm@v1.6.1
         with:
           release: budibase-preprod
           namespace: budibase

From 62501b01858f54bac32fdc8b3f6e78ff1c03ada0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 16:45:33 +0000
Subject: [PATCH 153/273] Adding a system for checking audited data in events,
 so that PII can be removed by posthog processor.

---
 packages/backend-core/src/auth/auth.ts        |  3 +-
 .../events/processors/AuditLogsProcessor.ts   | 10 +++-
 .../processors/posthog/PosthogProcessor.ts    |  3 +
 .../backend-core/src/events/publishers/app.ts | 44 ++++++++++----
 .../src/events/publishers/auth.ts             |  8 ++-
 .../src/events/publishers/automation.ts       | 12 ++++
 .../src/events/publishers/group.ts            | 24 ++++++--
 .../src/events/publishers/screen.ts           |  6 ++
 .../src/events/publishers/table.ts            | 15 +++++
 .../src/events/publishers/user.ts             | 58 ++++++++++++++-----
 packages/types/src/sdk/events/app.ts          | 44 ++++++++++----
 packages/types/src/sdk/events/auth.ts         |  8 ++-
 packages/types/src/sdk/events/automation.ts   | 12 ++++
 packages/types/src/sdk/events/event.ts        | 27 +++++----
 packages/types/src/sdk/events/screen.ts       |  6 ++
 packages/types/src/sdk/events/table.ts        | 15 +++++
 packages/types/src/sdk/events/user.ts         | 48 +++++++++++----
 packages/types/src/sdk/events/userGroup.ts    | 24 ++++++--
 18 files changed, 290 insertions(+), 77 deletions(-)

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index bee245a3ae..982b5cfa89 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -225,6 +225,7 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
   await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  await events.auth.logout()
+  const user = await userCache.getUser(userId)
+  await events.auth.logout(user.email)
   await userCache.invalidateUser(userId)
 }
diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index 2461539ff3..31f34d342a 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -24,7 +24,15 @@ export default class AuditLogsProcessor implements EventProcessor {
       JobQueue.AUDIT_LOG
     )
     return AuditLogsProcessor.auditLogQueue.process(async job => {
-      await writeAuditLogs(job.data.event, job.data.properties, {
+      let properties = job.data.properties
+      if (properties.audited) {
+        properties = {
+          ...properties,
+          ...properties.audited,
+        }
+        delete properties.audited
+      }
+      await writeAuditLogs(job.data.event, properties, {
         userId: job.data.opts.userId,
         timestamp: job.data.opts.timestamp,
         appId: job.data.opts.appId,
diff --git a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
index 280669b992..0dbe70d543 100644
--- a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
+++ b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
@@ -85,6 +85,9 @@ export default class PosthogProcessor implements EventProcessor {
     if (properties.email) {
       delete properties.email
     }
+    if (properties.audited) {
+      delete properties.audited
+    }
     return properties
   }
 
diff --git a/packages/backend-core/src/events/publishers/app.ts b/packages/backend-core/src/events/publishers/app.ts
index a4d578bb4f..d08d59b5f1 100644
--- a/packages/backend-core/src/events/publishers/app.ts
+++ b/packages/backend-core/src/events/publishers/app.ts
@@ -19,7 +19,9 @@ const created = async (app: App, timestamp?: string | number) => {
   const properties: AppCreatedEvent = {
     appId: app.appId,
     version: app.version,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_CREATED, properties, timestamp)
 }
@@ -28,7 +30,9 @@ async function updated(app: App) {
   const properties: AppUpdatedEvent = {
     appId: app.appId,
     version: app.version,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_UPDATED, properties)
 }
@@ -36,7 +40,9 @@ async function updated(app: App) {
 async function deleted(app: App) {
   const properties: AppDeletedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_DELETED, properties)
 }
@@ -44,7 +50,9 @@ async function deleted(app: App) {
 async function published(app: App, timestamp?: string | number) {
   const properties: AppPublishedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_PUBLISHED, properties, timestamp)
 }
@@ -52,7 +60,9 @@ async function published(app: App, timestamp?: string | number) {
 async function unpublished(app: App) {
   const properties: AppUnpublishedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_UNPUBLISHED, properties)
 }
@@ -60,7 +70,9 @@ async function unpublished(app: App) {
 async function fileImported(app: App) {
   const properties: AppFileImportedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_FILE_IMPORTED, properties)
 }
@@ -69,7 +81,9 @@ async function templateImported(app: App, templateKey: string) {
   const properties: AppTemplateImportedEvent = {
     appId: app.appId,
     templateKey,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_TEMPLATE_IMPORTED, properties)
 }
@@ -83,7 +97,9 @@ async function versionUpdated(
     appId: app.appId,
     currentVersion,
     updatedToVersion,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_VERSION_UPDATED, properties)
 }
@@ -97,7 +113,9 @@ async function versionReverted(
     appId: app.appId,
     currentVersion,
     revertedToVersion,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_VERSION_REVERTED, properties)
 }
@@ -105,7 +123,9 @@ async function versionReverted(
 async function reverted(app: App) {
   const properties: AppRevertedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_REVERTED, properties)
 }
@@ -113,7 +133,9 @@ async function reverted(app: App) {
 async function exported(app: App) {
   const properties: AppExportedEvent = {
     appId: app.appId,
-    name: app.name,
+    audited: {
+      name: app.name,
+    },
   }
   await publishEvent(Event.APP_EXPORTED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/auth.ts b/packages/backend-core/src/events/publishers/auth.ts
index 5527e02a34..d63acbc469 100644
--- a/packages/backend-core/src/events/publishers/auth.ts
+++ b/packages/backend-core/src/events/publishers/auth.ts
@@ -17,7 +17,9 @@ async function login(source: LoginSource, email: string) {
   const properties: LoginEvent = {
     userId: identity.id,
     source,
-    email,
+    audited: {
+      email,
+    },
   }
   await publishEvent(Event.AUTH_LOGIN, properties)
 }
@@ -26,7 +28,9 @@ async function logout(email: string) {
   const identity = await identification.getCurrentIdentity()
   const properties: LogoutEvent = {
     userId: identity.id,
-    email,
+    audited: {
+      email,
+    },
   }
   await publishEvent(Event.AUTH_LOGOUT, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/automation.ts b/packages/backend-core/src/events/publishers/automation.ts
index 6eb36ab067..419d4136bd 100644
--- a/packages/backend-core/src/events/publishers/automation.ts
+++ b/packages/backend-core/src/events/publishers/automation.ts
@@ -18,6 +18,9 @@ async function created(automation: Automation, timestamp?: string | number) {
     automationId: automation._id as string,
     triggerId: automation.definition?.trigger?.id,
     triggerType: automation.definition?.trigger?.stepId,
+    audited: {
+      name: automation.name,
+    },
   }
   await publishEvent(Event.AUTOMATION_CREATED, properties, timestamp)
 }
@@ -38,6 +41,9 @@ async function deleted(automation: Automation) {
     automationId: automation._id as string,
     triggerId: automation.definition?.trigger?.id,
     triggerType: automation.definition?.trigger?.stepId,
+    audited: {
+      name: automation.name,
+    },
   }
   await publishEvent(Event.AUTOMATION_DELETED, properties)
 }
@@ -71,6 +77,9 @@ async function stepCreated(
     triggerType: automation.definition?.trigger?.stepId,
     stepId: step.id!,
     stepType: step.stepId,
+    audited: {
+      name: automation.name,
+    },
   }
   await publishEvent(Event.AUTOMATION_STEP_CREATED, properties, timestamp)
 }
@@ -83,6 +92,9 @@ async function stepDeleted(automation: Automation, step: AutomationStep) {
     triggerType: automation.definition?.trigger?.stepId,
     stepId: step.id!,
     stepType: step.stepId,
+    audited: {
+      name: automation.name,
+    },
   }
   await publishEvent(Event.AUTOMATION_STEP_DELETED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/group.ts b/packages/backend-core/src/events/publishers/group.ts
index d8de4ccba4..a000b880a2 100644
--- a/packages/backend-core/src/events/publishers/group.ts
+++ b/packages/backend-core/src/events/publishers/group.ts
@@ -15,7 +15,9 @@ import {
 async function created(group: UserGroup, timestamp?: number) {
   const properties: GroupCreatedEvent = {
     groupId: group._id as string,
-    name: group.name,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_CREATED, properties, timestamp)
 }
@@ -23,7 +25,9 @@ async function created(group: UserGroup, timestamp?: number) {
 async function updated(group: UserGroup) {
   const properties: GroupUpdatedEvent = {
     groupId: group._id as string,
-    name: group.name,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_UPDATED, properties)
 }
@@ -31,7 +35,9 @@ async function updated(group: UserGroup) {
 async function deleted(group: UserGroup) {
   const properties: GroupDeletedEvent = {
     groupId: group._id as string,
-    name: group.name,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_DELETED, properties)
 }
@@ -40,7 +46,9 @@ async function usersAdded(count: number, group: UserGroup) {
   const properties: GroupUsersAddedEvent = {
     count,
     groupId: group._id as string,
-    name: group.name,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_USERS_ADDED, properties)
 }
@@ -49,7 +57,9 @@ async function usersDeleted(count: number, group: UserGroup) {
   const properties: GroupUsersDeletedEvent = {
     count,
     groupId: group._id as string,
-    name: group.name,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_USERS_REMOVED, properties)
 }
@@ -65,8 +75,10 @@ async function createdOnboarding(groupId: string) {
 async function permissionsEdited(group: UserGroup) {
   const properties: GroupPermissionsEditedEvent = {
     permissions: group.roles!,
-    name: group.name,
     groupId: group._id as string,
+    audited: {
+      name: group.name,
+    },
   }
   await publishEvent(Event.USER_GROUP_PERMISSIONS_EDITED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/screen.ts b/packages/backend-core/src/events/publishers/screen.ts
index 27264b5847..df486029e8 100644
--- a/packages/backend-core/src/events/publishers/screen.ts
+++ b/packages/backend-core/src/events/publishers/screen.ts
@@ -11,6 +11,9 @@ async function created(screen: Screen, timestamp?: string | number) {
     layoutId: screen.layoutId,
     screenId: screen._id as string,
     roleId: screen.routing.roleId,
+    audited: {
+      name: screen.routing?.route,
+    },
   }
   await publishEvent(Event.SCREEN_CREATED, properties, timestamp)
 }
@@ -20,6 +23,9 @@ async function deleted(screen: Screen) {
     layoutId: screen.layoutId,
     screenId: screen._id as string,
     roleId: screen.routing.roleId,
+    audited: {
+      name: screen.routing?.route,
+    },
   }
   await publishEvent(Event.SCREEN_DELETED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/table.ts b/packages/backend-core/src/events/publishers/table.ts
index d50f4df0e1..dc3200291a 100644
--- a/packages/backend-core/src/events/publishers/table.ts
+++ b/packages/backend-core/src/events/publishers/table.ts
@@ -13,6 +13,9 @@ import {
 async function created(table: Table, timestamp?: string | number) {
   const properties: TableCreatedEvent = {
     tableId: table._id as string,
+    audited: {
+      name: table.name,
+    },
   }
   await publishEvent(Event.TABLE_CREATED, properties, timestamp)
 }
@@ -20,6 +23,9 @@ async function created(table: Table, timestamp?: string | number) {
 async function updated(table: Table) {
   const properties: TableUpdatedEvent = {
     tableId: table._id as string,
+    audited: {
+      name: table.name,
+    },
   }
   await publishEvent(Event.TABLE_UPDATED, properties)
 }
@@ -27,6 +33,9 @@ async function updated(table: Table) {
 async function deleted(table: Table) {
   const properties: TableDeletedEvent = {
     tableId: table._id as string,
+    audited: {
+      name: table.name,
+    },
   }
   await publishEvent(Event.TABLE_DELETED, properties)
 }
@@ -35,6 +44,9 @@ async function exported(table: Table, format: TableExportFormat) {
   const properties: TableExportedEvent = {
     tableId: table._id as string,
     format,
+    audited: {
+      name: table.name,
+    },
   }
   await publishEvent(Event.TABLE_EXPORTED, properties)
 }
@@ -42,6 +54,9 @@ async function exported(table: Table, format: TableExportFormat) {
 async function imported(table: Table) {
   const properties: TableImportedEvent = {
     tableId: table._id as string,
+    audited: {
+      name: table.name,
+    },
   }
   await publishEvent(Event.TABLE_IMPORTED, properties)
 }
diff --git a/packages/backend-core/src/events/publishers/user.ts b/packages/backend-core/src/events/publishers/user.ts
index ec43dbbf00..8dbc494d1e 100644
--- a/packages/backend-core/src/events/publishers/user.ts
+++ b/packages/backend-core/src/events/publishers/user.ts
@@ -19,7 +19,9 @@ import {
 async function created(user: User, timestamp?: number) {
   const properties: UserCreatedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_CREATED, properties, timestamp)
 }
@@ -27,7 +29,9 @@ async function created(user: User, timestamp?: number) {
 async function updated(user: User) {
   const properties: UserUpdatedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_UPDATED, properties)
 }
@@ -35,7 +39,9 @@ async function updated(user: User) {
 async function deleted(user: User) {
   const properties: UserDeletedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_DELETED, properties)
 }
@@ -43,7 +49,9 @@ async function deleted(user: User) {
 export async function onboardingComplete(user: User) {
   const properties: UserOnboardingEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_ONBOARDING_COMPLETE, properties)
 }
@@ -53,7 +61,9 @@ export async function onboardingComplete(user: User) {
 async function permissionAdminAssigned(user: User, timestamp?: number) {
   const properties: UserPermissionAssignedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(
     Event.USER_PERMISSION_ADMIN_ASSIGNED,
@@ -65,7 +75,9 @@ async function permissionAdminAssigned(user: User, timestamp?: number) {
 async function permissionAdminRemoved(user: User) {
   const properties: UserPermissionRemovedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PERMISSION_ADMIN_REMOVED, properties)
 }
@@ -73,7 +85,9 @@ async function permissionAdminRemoved(user: User) {
 async function permissionBuilderAssigned(user: User, timestamp?: number) {
   const properties: UserPermissionAssignedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(
     Event.USER_PERMISSION_BUILDER_ASSIGNED,
@@ -85,7 +99,9 @@ async function permissionBuilderAssigned(user: User, timestamp?: number) {
 async function permissionBuilderRemoved(user: User) {
   const properties: UserPermissionRemovedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PERMISSION_BUILDER_REMOVED, properties)
 }
@@ -93,14 +109,20 @@ async function permissionBuilderRemoved(user: User) {
 // INVITE
 
 async function invited(email: string) {
-  const properties: UserInvitedEvent = { email }
+  const properties: UserInvitedEvent = {
+    audited: {
+      email,
+    },
+  }
   await publishEvent(Event.USER_INVITED, properties)
 }
 
 async function inviteAccepted(user: User) {
   const properties: UserInviteAcceptedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_INVITED_ACCEPTED, properties)
 }
@@ -110,7 +132,9 @@ async function inviteAccepted(user: User) {
 async function passwordForceReset(user: User) {
   const properties: UserPasswordForceResetEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PASSWORD_FORCE_RESET, properties)
 }
@@ -118,7 +142,9 @@ async function passwordForceReset(user: User) {
 async function passwordUpdated(user: User) {
   const properties: UserPasswordUpdatedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PASSWORD_UPDATED, properties)
 }
@@ -126,7 +152,9 @@ async function passwordUpdated(user: User) {
 async function passwordResetRequested(user: User) {
   const properties: UserPasswordResetRequestedEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PASSWORD_RESET_REQUESTED, properties)
 }
@@ -134,7 +162,9 @@ async function passwordResetRequested(user: User) {
 async function passwordReset(user: User) {
   const properties: UserPasswordResetEvent = {
     userId: user._id as string,
-    email: user.email,
+    audited: {
+      email: user.email,
+    },
   }
   await publishEvent(Event.USER_PASSWORD_RESET, properties)
 }
diff --git a/packages/types/src/sdk/events/app.ts b/packages/types/src/sdk/events/app.ts
index 7b63a4f0cd..602dd8b6a5 100644
--- a/packages/types/src/sdk/events/app.ts
+++ b/packages/types/src/sdk/events/app.ts
@@ -3,61 +3,83 @@ import { BaseEvent } from "./event"
 export interface AppCreatedEvent extends BaseEvent {
   appId: string
   version: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppUpdatedEvent extends BaseEvent {
   appId: string
   version: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppDeletedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppPublishedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppUnpublishedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppFileImportedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppTemplateImportedEvent extends BaseEvent {
   appId: string
   templateKey: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppVersionUpdatedEvent extends BaseEvent {
   appId: string
   currentVersion: string
   updatedToVersion: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppVersionRevertedEvent extends BaseEvent {
   appId: string
   currentVersion: string
   revertedToVersion: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppRevertedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AppExportedEvent extends BaseEvent {
   appId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
diff --git a/packages/types/src/sdk/events/auth.ts b/packages/types/src/sdk/events/auth.ts
index a98e1ca889..fd97dd3b46 100644
--- a/packages/types/src/sdk/events/auth.ts
+++ b/packages/types/src/sdk/events/auth.ts
@@ -7,12 +7,16 @@ export type SSOType = ConfigType.OIDC | ConfigType.GOOGLE
 export interface LoginEvent extends BaseEvent {
   userId: string
   source: LoginSource
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface LogoutEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface SSOCreatedEvent extends BaseEvent {
diff --git a/packages/types/src/sdk/events/automation.ts b/packages/types/src/sdk/events/automation.ts
index beabdbb9eb..a3f4d15186 100644
--- a/packages/types/src/sdk/events/automation.ts
+++ b/packages/types/src/sdk/events/automation.ts
@@ -5,6 +5,9 @@ export interface AutomationCreatedEvent extends BaseEvent {
   automationId: string
   triggerId: string
   triggerType: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AutomationTriggerUpdatedEvent extends BaseEvent {
@@ -19,6 +22,9 @@ export interface AutomationDeletedEvent extends BaseEvent {
   automationId: string
   triggerId: string
   triggerType: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AutomationTestedEvent extends BaseEvent {
@@ -35,6 +41,9 @@ export interface AutomationStepCreatedEvent extends BaseEvent {
   triggerType: string
   stepId: string
   stepType: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AutomationStepDeletedEvent extends BaseEvent {
@@ -44,6 +53,9 @@ export interface AutomationStepDeletedEvent extends BaseEvent {
   triggerType: string
   stepId: string
   stepType: string
+  audited: {
+    name: string
+  }
 }
 
 export interface AutomationsRunEvent extends BaseEvent {
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index e2c85c970c..3d0d3122b5 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -262,11 +262,11 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.QUERY_PREVIEWED]: undefined,
 
   // TABLE
-  [Event.TABLE_CREATED]: `Table created`,
-  [Event.TABLE_UPDATED]: `Table updated`,
-  [Event.TABLE_DELETED]: `Table deleted`,
-  [Event.TABLE_EXPORTED]: `Table exported`,
-  [Event.TABLE_IMPORTED]: `Table imported`,
+  [Event.TABLE_CREATED]: `Table "{{ name }}" created`,
+  [Event.TABLE_UPDATED]: `Table "{{ name }}" updated`,
+  [Event.TABLE_DELETED]: `Table "{{ name }}" deleted`,
+  [Event.TABLE_EXPORTED]: `Table "{{ name }}" exported`,
+  [Event.TABLE_IMPORTED]: `Table "{{ name }}" imported`,
   [Event.TABLE_DATA_IMPORTED]: `Data imported to table`,
 
   // ROWS
@@ -274,17 +274,17 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.ROWS_IMPORTED]: `Rows imported`,
 
   // AUTOMATION
-  [Event.AUTOMATION_CREATED]: `Automation created`,
-  [Event.AUTOMATION_DELETED]: `Automation deleted`,
+  [Event.AUTOMATION_CREATED]: `Automation "{{ name }}" created`,
+  [Event.AUTOMATION_DELETED]: `Automation "{{ name }}" deleted`,
+  [Event.AUTOMATION_STEP_CREATED]: `Automation "{{ name }}" step added`,
+  [Event.AUTOMATION_STEP_DELETED]: `Automation "{{ name }}" step removed`,
   [Event.AUTOMATION_TESTED]: undefined,
   [Event.AUTOMATIONS_RUN]: undefined,
-  [Event.AUTOMATION_STEP_CREATED]: undefined,
-  [Event.AUTOMATION_STEP_DELETED]: undefined,
   [Event.AUTOMATION_TRIGGER_UPDATED]: undefined,
 
   // SCREEN
-  [Event.SCREEN_CREATED]: `Screen created`,
-  [Event.SCREEN_DELETED]: `Screen deleted`,
+  [Event.SCREEN_CREATED]: `Screen "{{ name }}" created`,
+  [Event.SCREEN_DELETED]: `Screen "{{ name }}" deleted`,
 
   // COMPONENT
   [Event.COMPONENT_CREATED]: `Component created`,
@@ -375,6 +375,11 @@ export interface BaseEvent {
   installationId?: string
   tenantId?: string
   hosting?: Hosting
+  // any props in the audited section will be removed before passing events
+  // up out of system (purely for use with auditing)
+  audited?: {
+    [key: string]: any
+  }
 }
 
 export type TableExportFormat = "json" | "csv"
diff --git a/packages/types/src/sdk/events/screen.ts b/packages/types/src/sdk/events/screen.ts
index 23c468b7ad..e6b1d4d360 100644
--- a/packages/types/src/sdk/events/screen.ts
+++ b/packages/types/src/sdk/events/screen.ts
@@ -4,10 +4,16 @@ export interface ScreenCreatedEvent extends BaseEvent {
   screenId: string
   layoutId?: string
   roleId: string
+  audited: {
+    name: string
+  }
 }
 
 export interface ScreenDeletedEvent extends BaseEvent {
   screenId: string
   layoutId?: string
   roleId: string
+  audited: {
+    name: string
+  }
 }
diff --git a/packages/types/src/sdk/events/table.ts b/packages/types/src/sdk/events/table.ts
index da3c7edf47..8df2a95796 100644
--- a/packages/types/src/sdk/events/table.ts
+++ b/packages/types/src/sdk/events/table.ts
@@ -2,21 +2,36 @@ import { BaseEvent, TableExportFormat } from "./event"
 
 export interface TableCreatedEvent extends BaseEvent {
   tableId: string
+  audited: {
+    name: string
+  }
 }
 
 export interface TableUpdatedEvent extends BaseEvent {
   tableId: string
+  audited: {
+    name: string
+  }
 }
 
 export interface TableDeletedEvent extends BaseEvent {
   tableId: string
+  audited: {
+    name: string
+  }
 }
 
 export interface TableExportedEvent extends BaseEvent {
   tableId: string
   format: TableExportFormat
+  audited: {
+    name: string
+  }
 }
 
 export interface TableImportedEvent extends BaseEvent {
   tableId: string
+  audited: {
+    name: string
+  }
 }
diff --git a/packages/types/src/sdk/events/user.ts b/packages/types/src/sdk/events/user.ts
index 1322934d45..ab4b4d9724 100644
--- a/packages/types/src/sdk/events/user.ts
+++ b/packages/types/src/sdk/events/user.ts
@@ -2,60 +2,84 @@ import { BaseEvent } from "./event"
 
 export interface UserCreatedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserUpdatedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserDeletedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserOnboardingEvent extends BaseEvent {
   userId: string
   step?: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPermissionAssignedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPermissionRemovedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserInvitedEvent extends BaseEvent {
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserInviteAcceptedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPasswordForceResetEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPasswordUpdatedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPasswordResetRequestedEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
 
 export interface UserPasswordResetEvent extends BaseEvent {
   userId: string
-  email: string
+  audited: {
+    email: string
+  }
 }
diff --git a/packages/types/src/sdk/events/userGroup.ts b/packages/types/src/sdk/events/userGroup.ts
index 57deef4c20..d82ab70b4c 100644
--- a/packages/types/src/sdk/events/userGroup.ts
+++ b/packages/types/src/sdk/events/userGroup.ts
@@ -2,29 +2,39 @@ import { BaseEvent } from "./event"
 
 export interface GroupCreatedEvent extends BaseEvent {
   groupId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface GroupUpdatedEvent extends BaseEvent {
   groupId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface GroupDeletedEvent extends BaseEvent {
   groupId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface GroupUsersAddedEvent extends BaseEvent {
   count: number
   groupId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface GroupUsersDeletedEvent extends BaseEvent {
   count: number
   groupId: string
-  name: string
+  audited: {
+    name: string
+  }
 }
 
 export interface GroupAddedOnboardingEvent extends BaseEvent {
@@ -34,6 +44,8 @@ export interface GroupAddedOnboardingEvent extends BaseEvent {
 
 export interface GroupPermissionsEditedEvent extends BaseEvent {
   permissions: Record<string, string>
-  name: string
   groupId: string
+  audited: {
+    name: string
+  }
 }

From 3ba76ce5cd4d9ca0df9c8c74230949ca68324751 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 16:51:04 +0000
Subject: [PATCH 154/273] Adding test case for PII clear out.

---
 .../posthog/tests/PosthogProcessor.spec.ts    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
index 2c1340d36e..8df4e40bcf 100644
--- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
+++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
@@ -49,6 +49,25 @@ describe("PosthogProcessor", () => {
       expect(processor.posthog.capture).toHaveBeenCalledTimes(0)
     })
 
+    it("removes audited information", async () => {
+      const processor = new PosthogProcessor("test")
+
+      const identity = newIdentity()
+      const properties = {
+        email: "test",
+        audited: {
+          name: "test",
+        },
+      }
+
+      await processor.processEvent(Event.USER_CREATED, identity, properties)
+      expect(processor.posthog.capture).toHaveBeenCalled()
+      // @ts-ignore
+      const call = processor.posthog.capture.mock.calls[0][0]
+      expect(call.properties.audited).toBeUndefined()
+      expect(call.properties.email).toBeUndefined()
+    })
+
     describe("rate limiting", () => {
       it("sends daily event once in same day", async () => {
         const processor = new PosthogProcessor("test")

From d6b0b7610a5dea0862d7c5ec8be473b063e1e109 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 17:31:58 +0000
Subject: [PATCH 155/273] Fixing circular dependencies which were blocking
 tests.

---
 package.json                                  |   4 +-
 packages/backend-core/src/context/Context.ts  |   2 +-
 .../backend-core/src/context/mainContext.ts   |   8 +-
 packages/backend-core/src/context/types.ts    |   9 +
 packages/backend-core/src/db/lucene.ts        |   4 +-
 packages/backend-core/src/index.ts            |   2 +-
 packages/backend-core/src/platform/tenants.ts |   2 +-
 packages/backend-core/src/redis/index.ts      |   2 +-
 .../src/redis/{redlock.ts => redlockImpl.ts}  |   0
 .../tests/utilities/structures/generator.ts   |   2 +
 .../tests/utilities/structures/index.ts       |   5 +-
 .../tests/utilities/structures/shared.ts      |  19 ++
 .../tests/utilities/structures/sso.ts         |  57 +++--
 .../tests/utilities/structures/users.ts       |  24 +-
 yarn.lock                                     | 238 ++++++++++++++----
 15 files changed, 267 insertions(+), 111 deletions(-)
 create mode 100644 packages/backend-core/src/context/types.ts
 rename packages/backend-core/src/redis/{redlock.ts => redlockImpl.ts} (100%)
 create mode 100644 packages/backend-core/tests/utilities/structures/generator.ts
 create mode 100644 packages/backend-core/tests/utilities/structures/shared.ts

diff --git a/package.json b/package.json
index 3ead7d5553..85c9fd893e 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "js-yaml": "^4.1.0",
     "kill-port": "^1.6.1",
     "lerna": "3.14.1",
-    "madge": "^5.0.1",
+    "madge": "^6.0.0",
     "prettier": "^2.3.1",
     "prettier-plugin-svelte": "^2.3.0",
     "rimraf": "^3.0.2",
@@ -84,4 +84,4 @@
     "install:pro": "bash scripts/pro/install.sh",
     "dep:clean": "yarn clean && yarn bootstrap"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/backend-core/src/context/Context.ts b/packages/backend-core/src/context/Context.ts
index 02b7713764..d29b6935a8 100644
--- a/packages/backend-core/src/context/Context.ts
+++ b/packages/backend-core/src/context/Context.ts
@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "async_hooks"
-import { ContextMap } from "./mainContext"
+import { ContextMap } from "./types"
 
 export default class Context {
   static storage = new AsyncLocalStorage<ContextMap>()
diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 96ddd61268..02ba16aa8c 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -11,13 +11,7 @@ import {
   DEFAULT_TENANT_ID,
 } from "../constants"
 import { Database, IdentityContext } from "@budibase/types"
-
-export type ContextMap = {
-  tenantId?: string
-  appId?: string
-  identity?: IdentityContext
-  environmentVariables?: Record<string, string>
-}
+import { ContextMap } from "./types"
 
 let TEST_APP_ID: string | null = null
 
diff --git a/packages/backend-core/src/context/types.ts b/packages/backend-core/src/context/types.ts
new file mode 100644
index 0000000000..78197ed528
--- /dev/null
+++ b/packages/backend-core/src/context/types.ts
@@ -0,0 +1,9 @@
+import { IdentityContext } from "@budibase/types"
+
+// keep this out of Budibase types, don't want to expose context info
+export type ContextMap = {
+  tenantId?: string
+  appId?: string
+  identity?: IdentityContext
+  environmentVariables?: Record<string, string>
+}
diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
index 4a44aaa073..cba2f0138a 100644
--- a/packages/backend-core/src/db/lucene.ts
+++ b/packages/backend-core/src/db/lucene.ts
@@ -1,5 +1,5 @@
 import fetch from "node-fetch"
-import { db as dbCore } from "../"
+import { getCouchInfo } from "./couch"
 import { SearchFilters, Row } from "@budibase/types"
 
 const QUERY_START_REGEX = /\d[0-9]*:/g
@@ -416,7 +416,7 @@ export class QueryBuilder<T> {
   }
 
   async run() {
-    const { url, cookie } = dbCore.getCouchInfo()
+    const { url, cookie } = getCouchInfo()
     const fullPath = `${url}/${this.dbName}/_design/database/_search/${this.index}`
     const body = this.buildSearchBody()
     try {
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index 2631020bd4..1cffcc3f7b 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -20,7 +20,7 @@ export * as context from "./context"
 export * as cache from "./cache"
 export * as objectStore from "./objectStore"
 export * as redis from "./redis"
-export * as locks from "./redis/redlock"
+export * as locks from "./redis/redlockImpl"
 export * as utils from "./utils"
 export * as errors from "./errors"
 export { default as env } from "./environment"
diff --git a/packages/backend-core/src/platform/tenants.ts b/packages/backend-core/src/platform/tenants.ts
index b9f946a735..b6bc3410d8 100644
--- a/packages/backend-core/src/platform/tenants.ts
+++ b/packages/backend-core/src/platform/tenants.ts
@@ -1,7 +1,7 @@
 import { StaticDatabases } from "../constants"
 import { getPlatformDB } from "./platformDb"
 import { LockName, LockOptions, LockType, Tenants } from "@budibase/types"
-import * as locks from "../redis/redlock"
+import * as locks from "../redis/redlockImpl"
 
 const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants
 
diff --git a/packages/backend-core/src/redis/index.ts b/packages/backend-core/src/redis/index.ts
index 5bf2c65c39..6585d6e4fa 100644
--- a/packages/backend-core/src/redis/index.ts
+++ b/packages/backend-core/src/redis/index.ts
@@ -3,4 +3,4 @@
 export { default as Client } from "./redis"
 export * as utils from "./utils"
 export * as clients from "./init"
-export * as locks from "./redlock"
+export * as locks from "./redlockImpl"
diff --git a/packages/backend-core/src/redis/redlock.ts b/packages/backend-core/src/redis/redlockImpl.ts
similarity index 100%
rename from packages/backend-core/src/redis/redlock.ts
rename to packages/backend-core/src/redis/redlockImpl.ts
diff --git a/packages/backend-core/tests/utilities/structures/generator.ts b/packages/backend-core/tests/utilities/structures/generator.ts
new file mode 100644
index 0000000000..51567b152e
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/generator.ts
@@ -0,0 +1,2 @@
+import Chance from "chance"
+export const generator = new Chance()
diff --git a/packages/backend-core/tests/utilities/structures/index.ts b/packages/backend-core/tests/utilities/structures/index.ts
index d0073ba851..ca77f476d0 100644
--- a/packages/backend-core/tests/utilities/structures/index.ts
+++ b/packages/backend-core/tests/utilities/structures/index.ts
@@ -1,8 +1,4 @@
 export * from "./common"
-
-import Chance from "chance"
-export const generator = new Chance()
-
 export * as accounts from "./accounts"
 export * as apps from "./apps"
 export * as db from "./db"
@@ -12,3 +8,4 @@ export * as plugins from "./plugins"
 export * as sso from "./sso"
 export * as tenant from "./tenants"
 export * as users from "./users"
+export { generator } from "./generator"
diff --git a/packages/backend-core/tests/utilities/structures/shared.ts b/packages/backend-core/tests/utilities/structures/shared.ts
new file mode 100644
index 0000000000..de0e19486c
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/shared.ts
@@ -0,0 +1,19 @@
+import { User } from "@budibase/types"
+import { generator } from "./generator"
+import { uuid } from "./common"
+
+export const newEmail = () => {
+  return `${uuid()}@test.com`
+}
+
+export const user = (userProps?: any): User => {
+  return {
+    email: newEmail(),
+    password: "test",
+    roles: { app_test: "admin" },
+    firstName: generator.first(),
+    lastName: generator.last(),
+    pictureUrl: "http://test.com",
+    ...userProps,
+  }
+}
diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts
index ad5e8e87ef..df2a237d5f 100644
--- a/packages/backend-core/tests/utilities/structures/sso.ts
+++ b/packages/backend-core/tests/utilities/structures/sso.ts
@@ -8,8 +8,36 @@ import {
   SSOProviderType,
   User,
 } from "@budibase/types"
-import { uuid, generator, users, email } from "./index"
+import { generator } from "./generator"
+import { uuid, email } from "./common"
+import * as shared from "./shared"
 import _ from "lodash"
+import { user } from "./shared"
+
+export function authDetails(userDoc?: User): SSOAuthDetails {
+  if (!userDoc) {
+    userDoc = user()
+  }
+
+  const userId = userDoc._id || uuid()
+  const provider = generator.string()
+
+  const profile = ssoProfile(userDoc)
+  profile.provider = provider
+  profile.id = userId
+
+  return {
+    email: userDoc.email,
+    oauth2: {
+      refreshToken: generator.string(),
+      accessToken: generator.string(),
+    },
+    profile,
+    provider,
+    providerType: providerType(),
+    userId,
+  }
+}
 
 export function providerType(): SSOProviderType {
   return _.sample(Object.values(SSOProviderType)) as SSOProviderType
@@ -17,7 +45,7 @@ export function providerType(): SSOProviderType {
 
 export function ssoProfile(user?: User): SSOProfile {
   if (!user) {
-    user = users.user()
+    user = shared.user()
   }
   return {
     id: user._id!,
@@ -33,31 +61,6 @@ export function ssoProfile(user?: User): SSOProfile {
   }
 }
 
-export function authDetails(user?: User): SSOAuthDetails {
-  if (!user) {
-    user = users.user()
-  }
-
-  const userId = user._id || uuid()
-  const provider = generator.string()
-
-  const profile = ssoProfile(user)
-  profile.provider = provider
-  profile.id = userId
-
-  return {
-    email: user.email,
-    oauth2: {
-      refreshToken: generator.string(),
-      accessToken: generator.string(),
-    },
-    profile,
-    provider,
-    providerType: providerType(),
-    userId,
-  }
-}
-
 // OIDC
 
 export function oidcConfig(): OIDCInnerConfig {
diff --git a/packages/backend-core/tests/utilities/structures/users.ts b/packages/backend-core/tests/utilities/structures/users.ts
index 332c27ca12..7a6b4f0d80 100644
--- a/packages/backend-core/tests/utilities/structures/users.ts
+++ b/packages/backend-core/tests/utilities/structures/users.ts
@@ -1,29 +1,13 @@
-import { generator } from "../"
 import {
   AdminUser,
   BuilderUser,
   SSOAuthDetails,
   SSOUser,
-  User,
 } from "@budibase/types"
-import { v4 as uuid } from "uuid"
-import * as sso from "./sso"
+import { user } from "./shared"
+import { authDetails } from "./sso"
 
-export const newEmail = () => {
-  return `${uuid()}@test.com`
-}
-
-export const user = (userProps?: any): User => {
-  return {
-    email: newEmail(),
-    password: "test",
-    roles: { app_test: "admin" },
-    firstName: generator.first(),
-    lastName: generator.last(),
-    pictureUrl: "http://test.com",
-    ...userProps,
-  }
-}
+export { user, newEmail } from "./shared"
 
 export const adminUser = (userProps?: any): AdminUser => {
   return {
@@ -53,7 +37,7 @@ export function ssoUser(
   delete base.password
 
   if (!opts.details) {
-    opts.details = sso.authDetails(base)
+    opts.details = authDetails(base)
   }
 
   return {
diff --git a/yarn.lock b/yarn.lock
index f80cde1b6f..bcd33ad2b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,6 +1064,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
   integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
 
+"@typescript-eslint/types@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
+  integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==
+
 "@typescript-eslint/typescript-estree@5.45.0":
   version "5.45.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d"
@@ -1090,6 +1095,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@^5.13.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690"
+  integrity sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==
+  dependencies:
+    "@typescript-eslint/types" "5.53.0"
+    "@typescript-eslint/visitor-keys" "5.53.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.33.0":
   version "4.33.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
@@ -1106,6 +1124,14 @@
     "@typescript-eslint/types" "5.45.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.53.0":
+  version "5.53.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f"
+  integrity sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==
+  dependencies:
+    "@typescript-eslint/types" "5.53.0"
+    eslint-visitor-keys "^3.3.0"
+
 JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -1214,6 +1240,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+any-promise@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
+
 app-module-path@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"
@@ -1793,6 +1824,11 @@ commander@^7.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+commander@^9.1.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
+  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2139,16 +2175,16 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
-dependency-tree@^8.1.1:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/dependency-tree/-/dependency-tree-8.1.2.tgz#c9e652984f53bd0239bc8a3e50cbd52f05b2e770"
-  integrity sha512-c4CL1IKxkKng0oT5xrg4uNiiMVFqTGOXqHSFx7XEFdgSsp6nw3AGGruICppzJUrfad/r7GLqt26rmWU4h4j39A==
+dependency-tree@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/dependency-tree/-/dependency-tree-9.0.0.tgz#9288dd6daf35f6510c1ea30d9894b75369aa50a2"
+  integrity sha512-osYHZJ1fBSon3lNLw70amAXsQ+RGzXsPvk9HbBgTLbp/bQBmpH5mOmsUvqXU+YEWVU0ZLewsmzOET/8jWswjDQ==
   dependencies:
     commander "^2.20.3"
     debug "^4.3.1"
     filing-cabinet "^3.0.1"
-    precinct "^8.0.0"
-    typescript "^3.9.7"
+    precinct "^9.0.0"
+    typescript "^4.0.0"
 
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
@@ -2170,6 +2206,16 @@ detective-amd@^3.1.0:
     get-amd-module-type "^3.0.0"
     node-source-walk "^4.2.0"
 
+detective-amd@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/detective-amd/-/detective-amd-4.0.1.tgz#1a827d9e4fa2f832506bd87aa392f124155bca3a"
+  integrity sha512-bDo22IYbJ8yzALB0Ow5CQLtyhU1BpDksLB9dsWHI9Eh0N3OQR6aQqhjPsNDd69ncYwRfL1sTo7OA9T3VRVSe2Q==
+  dependencies:
+    ast-module-types "^3.0.0"
+    escodegen "^2.0.0"
+    get-amd-module-type "^4.0.0"
+    node-source-walk "^5.0.0"
+
 detective-cjs@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/detective-cjs/-/detective-cjs-3.1.3.tgz#50e107d67b37f459b0ec02966ceb7e20a73f268b"
@@ -2178,13 +2224,28 @@ detective-cjs@^3.1.1:
     ast-module-types "^3.0.0"
     node-source-walk "^4.0.0"
 
-detective-es6@^2.2.0, detective-es6@^2.2.1:
+detective-cjs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detective-cjs/-/detective-cjs-4.0.0.tgz#316e2c7ae14276a5dcfe0c43dc05d8cf9a0e5cf9"
+  integrity sha512-VsD6Yo1+1xgxJWoeDRyut7eqZ8EWaJI70C5eanSAPcBHzenHZx0uhjxaaEfIm0cHII7dBiwU98Orh44bwXN2jg==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^5.0.0"
+
+detective-es6@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-2.2.2.tgz#ee5f880981d9fecae9a694007029a2f6f26d8d28"
   integrity sha512-eZUKCUsbHm8xoeoCM0z6JFwvDfJ5Ww5HANo+jPR7AzkFpW9Mun3t/TqIF2jjeWa2TFbAiGaWESykf2OQp3oeMw==
   dependencies:
     node-source-walk "^4.0.0"
 
+detective-es6@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-3.0.0.tgz#78c9ef5492d5b59748b411aecaaf52b5ca0f0bc2"
+  integrity sha512-Uv2b5Uih7vorYlqGzCX+nTPUb4CMzUAn3VPHTV5p5lBkAN4cAApLGgUz4mZE2sXlBfv4/LMmeP7qzxHV/ZcfWA==
+  dependencies:
+    node-source-walk "^5.0.0"
+
 detective-less@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/detective-less/-/detective-less-1.0.2.tgz#a68af9ca5f69d74b7d0aa190218b211d83b4f7e3"
@@ -2204,14 +2265,14 @@ detective-postcss@^4.0.0:
     postcss "^8.1.7"
     postcss-values-parser "^2.0.1"
 
-detective-postcss@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-5.1.1.tgz#ec23ac3818f8be95ac3a38a8b9f3b6d43103ef87"
-  integrity sha512-YJMsvA0Y6/ST9abMNcQytl9iFQ2bfu4I7B74IUiAvyThfaI9Y666yipL+SrqfReoIekeIEwmGH72oeqX63mwUw==
+detective-postcss@^6.0.1, detective-postcss@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-6.1.0.tgz#01ca6f83dbc3158540fb0e6a6c631f3998946e54"
+  integrity sha512-ZFZnEmUrL2XHAC0j/4D1fdwZbo/anAcK84soJh7qc7xfx2Kc8gFO5Bk5I9jU7NLC/OAF1Yho1GLxEDnmQnRH2A==
   dependencies:
     is-url "^1.2.4"
-    postcss "^8.4.6"
-    postcss-values-parser "^5.0.0"
+    postcss "^8.4.12"
+    postcss-values-parser "^6.0.2"
 
 detective-sass@^3.0.1:
   version "3.0.2"
@@ -2221,6 +2282,14 @@ detective-sass@^3.0.1:
     gonzales-pe "^4.3.0"
     node-source-walk "^4.0.0"
 
+detective-sass@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/detective-sass/-/detective-sass-4.0.1.tgz#2a9e303a0bd472d00aaa79512334845e3acbaffc"
+  integrity sha512-80zfpxux1krOrkxCHbtwvIs2gNHUBScnSqlGl0FvUuHVz8HD6vD2ov66OroMctyvzhM67fxhuEeVjIk18s6yTQ==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^5.0.0"
+
 detective-scss@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/detective-scss/-/detective-scss-2.0.2.tgz#7d2a642616d44bf677963484fa8754d9558b8235"
@@ -2229,11 +2298,24 @@ detective-scss@^2.0.1:
     gonzales-pe "^4.3.0"
     node-source-walk "^4.0.0"
 
+detective-scss@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/detective-scss/-/detective-scss-3.0.0.tgz#c3c7bc4799f51515a4f0ed1e8ca491151364230f"
+  integrity sha512-37MB/mhJyS45ngqfzd6eTbuLMoDgdZnH03ZOMW2m9WqJ/Rlbuc8kZAr0Ypovaf1DJiTRzy5mmxzOTja85jbzlA==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^5.0.0"
+
 detective-stylus@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detective-stylus/-/detective-stylus-1.0.3.tgz#20a702936c9fd7d4203fd7a903314b5dd43ac713"
   integrity sha512-4/bfIU5kqjwugymoxLXXLltzQNeQfxGoLm2eIaqtnkWxqbhap9puDVpJPVDx96hnptdERzS5Cy6p9N8/08A69Q==
 
+detective-stylus@^2.0.0, detective-stylus@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detective-stylus/-/detective-stylus-2.0.1.tgz#d528dfa7ef3c4eb2fbc9a7249d54906ec4e05d09"
+  integrity sha512-/Tvs1pWLg8eYwwV6kZQY5IslGaYqc/GACxjcaGudiNtN5nKCH6o2WnJK3j0gA3huCnoQcbv8X7oz/c1lnvE3zQ==
+
 detective-typescript@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/detective-typescript/-/detective-typescript-7.0.2.tgz#c6e00b4c28764741ef719662250e6b014a5f3c8e"
@@ -2244,6 +2326,16 @@ detective-typescript@^7.0.0:
     node-source-walk "^4.2.0"
     typescript "^3.9.10"
 
+detective-typescript@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/detective-typescript/-/detective-typescript-9.0.0.tgz#57d674cec49ec775460ab975b5bcbb5c2d32ff8e"
+  integrity sha512-lR78AugfUSBojwlSRZBeEqQ1l8LI7rbxOl1qTUnGLcjZQDjZmrZCb7R46rK8U8B5WzFvJrxa7fEBA8FoD/n5fA==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "^5.13.0"
+    ast-module-types "^3.0.0"
+    node-source-walk "^5.0.0"
+    typescript "^4.5.5"
+
 dezalgo@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
@@ -2937,6 +3029,14 @@ get-amd-module-type@^3.0.0:
     ast-module-types "^3.0.0"
     node-source-walk "^4.2.2"
 
+get-amd-module-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/get-amd-module-type/-/get-amd-module-type-4.0.0.tgz#3d4e5b44eec81f8337157d7c52c4fa9389aff78b"
+  integrity sha512-GbBawUCuA2tY8ztiMiVo3e3P95gc2TVrfYFfpUHdHQA8WyxMCckK29bQsVKhYX8SUf+w6JLhL2LG8tSC0ANt9Q==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^5.0.0"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -3148,13 +3248,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-graphviz@0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/graphviz/-/graphviz-0.0.9.tgz#0bbf1df588c6a92259282da35323622528c4bbc4"
-  integrity sha512-SmoY2pOtcikmMCqCSy2NO1YsRfu9OO0wpTlOYW++giGjfX1a6gax/m1Fo8IdUd0/3H15cTOfR1SMKwohj4LKsg==
-  dependencies:
-    temp "~0.4.0"
-
 handlebars@^4.7.6:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
@@ -4167,31 +4260,32 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.5.0.tgz#067c2c88b5f3fb3c56a375b2ec93826220fa1ff2"
   integrity sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==
 
-madge@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/madge/-/madge-5.0.1.tgz#2096d9006558ea0669b3ade89c2cda708a24e22b"
-  integrity sha512-krmSWL9Hkgub74bOjnjWRoFPAJvPwSG6Dbta06qhWOq6X/n/FPzO3ESZvbFYVIvG2g4UHXvCJN1b+RZLaSs9nA==
+madge@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/madge/-/madge-6.0.0.tgz#d17d68d1023376318cae89abd16629d329f4ed0a"
+  integrity sha512-dddxP62sj5pL+l9MJnq9C34VFqmRj+2+uSOdn/7lOTSliLRH0WyQ8uCEF3VxkPRNOBvMKK2xumnIE15HRSAL9A==
   dependencies:
     chalk "^4.1.1"
     commander "^7.2.0"
     commondir "^1.0.1"
     debug "^4.3.1"
-    dependency-tree "^8.1.1"
-    detective-amd "^3.1.0"
-    detective-cjs "^3.1.1"
-    detective-es6 "^2.2.0"
+    dependency-tree "^9.0.0"
+    detective-amd "^4.0.1"
+    detective-cjs "^4.0.0"
+    detective-es6 "^3.0.0"
     detective-less "^1.0.2"
-    detective-postcss "^5.0.0"
-    detective-sass "^3.0.1"
-    detective-scss "^2.0.1"
-    detective-stylus "^1.0.0"
-    detective-typescript "^7.0.0"
-    graphviz "0.0.9"
+    detective-postcss "^6.1.0"
+    detective-sass "^4.0.1"
+    detective-scss "^3.0.0"
+    detective-stylus "^2.0.1"
+    detective-typescript "^9.0.0"
     ora "^5.4.1"
     pluralize "^8.0.0"
     precinct "^8.1.0"
     pretty-ms "^7.0.1"
     rc "^1.2.7"
+    stream-to-array "^2.3.0"
+    ts-graphviz "^1.5.0"
     typescript "^3.9.5"
     walkdir "^0.4.1"
 
@@ -4481,6 +4575,14 @@ module-definition@^3.3.1:
     ast-module-types "^3.0.0"
     node-source-walk "^4.0.0"
 
+module-definition@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/module-definition/-/module-definition-4.0.0.tgz#5b39cca9be28c5b0fec768eb2d9fd8de08a2550b"
+  integrity sha512-wntiAHV4lDn24BQn2kX6LKq0y85phHLHiv3aOPDF+lIs06kVjEMTe/ZTdrbVLnQV5FQsjik21taknvMhKY1Cug==
+  dependencies:
+    ast-module-types "^3.0.0"
+    node-source-walk "^5.0.0"
+
 module-lookup-amd@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/module-lookup-amd/-/module-lookup-amd-7.0.1.tgz#d67c1a93f2ff8e38b8774b99a638e9a4395774b2"
@@ -4616,6 +4718,13 @@ node-source-walk@^4.0.0, node-source-walk@^4.2.0, node-source-walk@^4.2.2:
   dependencies:
     "@babel/parser" "^7.0.0"
 
+node-source-walk@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-5.0.0.tgz#7cf93a0d12408081531fc440a00d7019eb3d5665"
+  integrity sha512-58APXoMXpmmU+oVBJFajhTCoD8d/OGtngnVAWzIo2A8yn0IXwBzvIVIsTzoie/SrA37u+1hnpNz2HMWx/VIqlw==
+  dependencies:
+    "@babel/parser" "^7.0.0"
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -5246,16 +5355,16 @@ postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-values-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-5.0.0.tgz#10c61ac3f488e4de25746b829ea8d8894e9ac3d2"
-  integrity sha512-2viDDjMMrt21W2izbeiJxl3kFuD/+asgB0CBwPEgSyhCmBnDIa/y+pLaoyX+q3I3DHH0oPPL3cgjVTQvlS1Maw==
+postcss-values-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-6.0.2.tgz#636edc5b86c953896f1bb0d7a7a6615df00fb76f"
+  integrity sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==
   dependencies:
     color-name "^1.1.4"
     is-url-superb "^4.0.0"
     quote-unquote "^1.0.0"
 
-postcss@^8.1.7, postcss@^8.4.6:
+postcss@^8.1.7:
   version "8.4.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
   integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
@@ -5264,7 +5373,16 @@ postcss@^8.1.7, postcss@^8.4.6:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-precinct@^8.0.0, precinct@^8.1.0:
+postcss@^8.4.12:
+  version "8.4.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
+  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+precinct@^8.1.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/precinct/-/precinct-8.3.1.tgz#94b99b623df144eed1ce40e0801c86078466f0dc"
   integrity sha512-pVppfMWLp2wF68rwHqBIpPBYY8Kd12lDhk8LVQzOwqllifVR15qNFyod43YLyFpurKRZQKnE7E4pofAagDOm2Q==
@@ -5283,6 +5401,24 @@ precinct@^8.0.0, precinct@^8.1.0:
     module-definition "^3.3.1"
     node-source-walk "^4.2.0"
 
+precinct@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/precinct/-/precinct-9.0.1.tgz#64e7ea0de4bea1b73572e50531dfe297c7b8a7c7"
+  integrity sha512-hVNS6JvfvlZ64B3ezKeGAcVhIuOvuAiSVzagHX/+KjVPkYWoCNkfyMgCl1bjDtAFQSlzi95NcS9ykUWrl1L1vA==
+  dependencies:
+    commander "^9.1.0"
+    detective-amd "^4.0.1"
+    detective-cjs "^4.0.0"
+    detective-es6 "^3.0.0"
+    detective-less "^1.0.2"
+    detective-postcss "^6.0.1"
+    detective-sass "^4.0.1"
+    detective-scss "^3.0.0"
+    detective-stylus "^2.0.0"
+    detective-typescript "^9.0.0"
+    module-definition "^4.0.0"
+    node-source-walk "^5.0.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -6168,6 +6304,13 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
+stream-to-array@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353"
+  integrity sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==
+  dependencies:
+    any-promise "^1.1.0"
+
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -6401,11 +6544,6 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-temp@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.4.0.tgz#671ad63d57be0fe9d7294664b3fc400636678a60"
-  integrity sha512-IsFisGgDKk7qzK9erMIkQe/XwiSUdac7z3wYOsjcLkhPBy3k1SlvLoIh2dAHIlEpgA971CgguMrx9z8fFg7tSA==
-
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
@@ -6523,6 +6661,11 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
+ts-graphviz@^1.5.0:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/ts-graphviz/-/ts-graphviz-1.5.4.tgz#61a3059afeac4f6d4be3c6729a4d88546ca9e095"
+  integrity sha512-oxhI6wfPQBJC8WSiP0AjDI8z+9hcc9yl1etaynQJmQ2Yivn0KlT0oImLzJct7Es0TR/6xphzvJBAhGzgOjTGmQ==
+
 tsconfig-paths@^3.10.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -6606,6 +6749,11 @@ typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
   integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
 
+typescript@^4.0.0, typescript@^4.5.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 uglify-js@^3.1.4:
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.1.tgz#0e7ec928b3d0b1e1d952bce634c384fd56377317"

From 8fb5168d56745d2e29447a79b72a62913263fe56 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 17:42:22 +0000
Subject: [PATCH 156/273] Fix for auth logout test case.

---
 packages/backend-core/src/auth/auth.ts              | 9 +++++++--
 packages/backend-core/src/events/publishers/auth.ts | 2 +-
 packages/types/src/sdk/events/auth.ts               | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 982b5cfa89..4bdf0e0cd3 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -225,7 +225,12 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
   await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  const user = await userCache.getUser(userId)
-  await events.auth.logout(user.email)
+  let user: User | undefined
+  try {
+    user = await userCache.getUser(userId)
+  } catch {
+    user = undefined
+  }
+  await events.auth.logout(user?.email)
   await userCache.invalidateUser(userId)
 }
diff --git a/packages/backend-core/src/events/publishers/auth.ts b/packages/backend-core/src/events/publishers/auth.ts
index d63acbc469..e275d2dbb0 100644
--- a/packages/backend-core/src/events/publishers/auth.ts
+++ b/packages/backend-core/src/events/publishers/auth.ts
@@ -24,7 +24,7 @@ async function login(source: LoginSource, email: string) {
   await publishEvent(Event.AUTH_LOGIN, properties)
 }
 
-async function logout(email: string) {
+async function logout(email?: string) {
   const identity = await identification.getCurrentIdentity()
   const properties: LogoutEvent = {
     userId: identity.id,
diff --git a/packages/types/src/sdk/events/auth.ts b/packages/types/src/sdk/events/auth.ts
index fd97dd3b46..c7171d923d 100644
--- a/packages/types/src/sdk/events/auth.ts
+++ b/packages/types/src/sdk/events/auth.ts
@@ -15,7 +15,7 @@ export interface LoginEvent extends BaseEvent {
 export interface LogoutEvent extends BaseEvent {
   userId: string
   audited: {
-    email: string
+    email?: string
   }
 }
 

From 3e7c1d10cff1cb4fa9a40331d3c1a4b4f7835f73 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 24 Feb 2023 19:04:40 +0000
Subject: [PATCH 157/273] Fix based on test cases.

---
 .../backend-core/src/events/processors/AuditLogsProcessor.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index 31f34d342a..f2c2cd04d7 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -74,6 +74,6 @@ export default class AuditLogsProcessor implements EventProcessor {
   }
 
   shutdown(): void {
-    AuditLogsProcessor.auditLogQueue.close()
+    AuditLogsProcessor.auditLogQueue?.close()
   }
 }

From 32619fbfa33ac883298d3db46aefeed86e3bb033 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 27 Feb 2023 09:11:32 +0000
Subject: [PATCH 158/273] Merge commit

---
 packages/builder/src/builderStore/store/frontend.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 56b8a599f0..7b01f57a53 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -67,6 +67,8 @@ const INITIAL_FRONTEND_STATE = {
   // onboarding
   onboarding: false,
   tourNodes: null,
+
+  builderSidePanel: false,
 }
 
 export const getFrontendStore = () => {

From 9aea8bfec4edb7a3572fb4c4fe77dbb74b89eb50 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 10:01:43 +0000
Subject: [PATCH 159/273] Use forked helm action (#9814)

---
 .github/workflows/deploy-preprod.yml  | 2 +-
 .github/workflows/deploy-release.yml  | 2 +-
 .github/workflows/release-develop.yml | 2 +-
 .github/workflows/release.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
index 583d83dc5d..eec5546444 100644
--- a/.github/workflows/deploy-preprod.yml
+++ b/.github/workflows/deploy-preprod.yml
@@ -37,7 +37,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.6.1
+        uses: budibase/helm@v1.8.0
         with:
           release: budibase-preprod
           namespace: budibase
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
index fcc29fcd7d..1f7a5ebfd4 100644
--- a/.github/workflows/deploy-release.yml
+++ b/.github/workflows/deploy-release.yml
@@ -38,7 +38,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.6.1
+        uses: budibase/helm@v1.8.0
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml
index 3201ecb1c9..193f736b5f 100644
--- a/.github/workflows/release-develop.yml
+++ b/.github/workflows/release-develop.yml
@@ -98,7 +98,7 @@ jobs:
           wc -l values.release.yaml
 
       - name: Deploy to Release Environment
-        uses: glopezep/helm@v1.6.1
+        uses: budibase/helm@v1.8.0
         with:
           release: budibase-release
           namespace: budibase
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28da63aadf..a24537ccd4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -107,7 +107,7 @@ jobs:
           wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
-        uses: glopezep/helm@v1.6.1
+        uses: budibase/helm@v1.8.0
         with:
           release: budibase-preprod
           namespace: budibase

From 868f82ea337634adc8e22e3e3542069a974653ce Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 27 Feb 2023 10:12:47 +0000
Subject: [PATCH 160/273] v2.3.18

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

diff --git a/lerna.json b/lerna.json
index cfbed56e23..dc96b47dea 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.17",
+  "version": "2.3.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 25e73b9e4d..e4b47dd0a1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@budibase/nano": "10.1.1",
-    "@budibase/types": "^2.3.17",
+    "@budibase/types": "^2.3.18",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 8c9629b314..b2903c4811 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.3.17",
+  "version": "2.3.18",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/string-templates": "^2.3.18",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5e968c23a3..39435e2fd2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
-    "@budibase/client": "^2.3.17",
-    "@budibase/frontend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/bbui": "^2.3.18",
+    "@budibase/client": "^2.3.18",
+    "@budibase/frontend-core": "^2.3.18",
+    "@budibase/string-templates": "^2.3.18",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index fb08c290fc..edebd25e3a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/backend-core": "^2.3.18",
+    "@budibase/string-templates": "^2.3.18",
+    "@budibase/types": "^2.3.18",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 78df2b67f7..f11fe4360d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
-    "@budibase/frontend-core": "^2.3.17",
-    "@budibase/string-templates": "^2.3.17",
+    "@budibase/bbui": "^2.3.18",
+    "@budibase/frontend-core": "^2.3.18",
+    "@budibase/string-templates": "^2.3.18",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 502df0fbd4..723560309f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.17",
+    "@budibase/bbui": "^2.3.18",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d8a5c44c5b..4b84e6d726 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index f5787302fe..2d4a8814f8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.17",
-    "@budibase/client": "^2.3.17",
+    "@budibase/backend-core": "^2.3.18",
+    "@budibase/client": "^2.3.18",
     "@budibase/pro": "2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/string-templates": "^2.3.18",
+    "@budibase/types": "^2.3.18",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 87b7c69dbb..f3f8c67fab 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 8417cadc06..c674aedc53 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 71b8ed6e9c..d3331d7223 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.17",
+    "@budibase/backend-core": "^2.3.18",
     "@budibase/pro": "2.3.17",
-    "@budibase/string-templates": "^2.3.17",
-    "@budibase/types": "^2.3.17",
+    "@budibase/string-templates": "^2.3.18",
+    "@budibase/types": "^2.3.18",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 941b2e4200da75661458ec695652718d93471d8a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 27 Feb 2023 10:16:38 +0000
Subject: [PATCH 161/273] Update pro version to 2.3.18

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 2d4a8814f8..edee3c2634 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.18",
     "@budibase/client": "^2.3.18",
-    "@budibase/pro": "2.3.17",
+    "@budibase/pro": "2.3.18",
     "@budibase/string-templates": "^2.3.18",
     "@budibase/types": "^2.3.18",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 31a5b3350e..3304ea07a4 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1273,13 +1273,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
-  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
+"@budibase/backend-core@2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50"
+  integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.17"
+    "@budibase/types" "^2.3.18"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1374,13 +1374,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
-  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
+"@budibase/pro@2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3"
+  integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw==
   dependencies:
-    "@budibase/backend-core" "2.3.17"
-    "@budibase/types" "2.3.17"
+    "@budibase/backend-core" "2.3.18"
+    "@budibase/types" "2.3.18"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1406,10 +1406,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
-  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
+"@budibase/types@2.3.18", "@budibase/types@^2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329"
+  integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d3331d7223..8e781bf5d7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.18",
-    "@budibase/pro": "2.3.17",
+    "@budibase/pro": "2.3.18",
     "@budibase/string-templates": "^2.3.18",
     "@budibase/types": "^2.3.18",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 43d5ffb1bd..9197f589f5 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -470,13 +470,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.17.tgz#27c8c2144bfda1533b43da6de7111c0819aea6a5"
-  integrity sha512-KcmF2OrNLjLbFtNbYD4ZufnsnwmN2Ez/occgWiecvFRAHOhpkm+Hoy6VggpG1YJBp1DG9kLh3WAZbeYI3QoJbw==
+"@budibase/backend-core@2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50"
+  integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.17"
+    "@budibase/types" "^2.3.18"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -521,13 +521,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.17.tgz#1a05d3d13195fcfacac410305fcd0943fbbcd5c8"
-  integrity sha512-sdWuKRDbseu2POkyGfmiqAWp8M9jGmpD0FqaIEWGQmKdezvOKh3sGg0PGT4InoibbXcFf4vVB+HiofBedDFLkA==
+"@budibase/pro@2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3"
+  integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw==
   dependencies:
-    "@budibase/backend-core" "2.3.17"
-    "@budibase/types" "2.3.17"
+    "@budibase/backend-core" "2.3.18"
+    "@budibase/types" "2.3.18"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -535,10 +535,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.17", "@budibase/types@^2.3.17":
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.17.tgz#d97c1de5fb03c91ff7e55d7c8c3901e5e2e95995"
-  integrity sha512-p/6WgwNjVGfwyNLOofhPEG7S3tt5URxAVs+mPXuLn5bsAqRxxJ5XObvw8chijYXmewhGP0hjONQDkmDJ0FkHuA==
+"@budibase/types@2.3.18", "@budibase/types@^2.3.18":
+  version "2.3.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329"
+  integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 65646ba01bce7608f6feb6c07b67876ea4ee8b07 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 11:00:13 +0000
Subject: [PATCH 162/273] Further PR comments.

---
 packages/backend-core/src/auth/auth.ts                   | 8 +-------
 packages/backend-core/src/events/events.ts               | 4 ----
 packages/backend-core/src/events/index.ts                | 1 -
 .../src/events/processors/AuditLogsProcessor.ts          | 9 ++++++---
 packages/server/src/startup.ts                           | 3 +--
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 4bdf0e0cd3..f34d54a879 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -225,12 +225,6 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
   await invalidateSessions(userId, { sessionIds, reason: "logout" })
-  let user: User | undefined
-  try {
-    user = await userCache.getUser(userId)
-  } catch {
-    user = undefined
-  }
-  await events.auth.logout(user?.email)
+  await events.auth.logout(ctx.user?.email)
   await userCache.invalidateUser(userId)
 }
diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts
index dc8c5482fb..c2f7cf66ec 100644
--- a/packages/backend-core/src/events/events.ts
+++ b/packages/backend-core/src/events/events.ts
@@ -3,10 +3,6 @@ import { processors } from "./processors"
 import identification from "./identification"
 import * as backfill from "./backfill"
 
-export function isAudited(event: Event) {
-  return !!AuditedEventFriendlyName[event]
-}
-
 export const publishEvent = async (
   event: Event,
   properties: any,
diff --git a/packages/backend-core/src/events/index.ts b/packages/backend-core/src/events/index.ts
index dd687304d8..d0d59a5b22 100644
--- a/packages/backend-core/src/events/index.ts
+++ b/packages/backend-core/src/events/index.ts
@@ -3,7 +3,6 @@ export * as processors from "./processors"
 export * as analytics from "./analytics"
 export { default as identification } from "./identification"
 export * as backfillCache from "./backfill"
-export { isAudited } from "./events"
 
 import { processors } from "./processors"
 
diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index f2c2cd04d7..326e476544 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -4,11 +4,10 @@ import {
   Group,
   IdentityType,
   AuditLogQueueEvent,
-  AuditLogFn,
+  AuditLogFn, AuditedEventFriendlyName,
 } from "@budibase/types"
 import { EventProcessor } from "./types"
 import { getAppId } from "../../context"
-import { isAudited } from "../events"
 import BullQueue from "bull"
 import { createQueue, JobQueue } from "../../queue"
 
@@ -41,13 +40,17 @@ export default class AuditLogsProcessor implements EventProcessor {
     })
   }
 
+  isAudited(event: Event) {
+    return !!AuditedEventFriendlyName[event]
+  }
+
   async processEvent(
     event: Event,
     identity: Identity,
     properties: any,
     timestamp?: string
   ): Promise<void> {
-    if (AuditLogsProcessor.auditLogsEnabled && isAudited(event)) {
+    if (AuditLogsProcessor.auditLogsEnabled && this.isAudited(event)) {
       // only audit log actual events, don't include backfills
       const userId =
         identity.type === IdentityType.USER ? identity.id : undefined
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index e6784c5a82..6cdbf87c2c 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -17,7 +17,6 @@ import * as pro from "@budibase/pro"
 import * as api from "./api"
 import sdk from "./sdk"
 const pino = require("koa-pino-logger")
-import { sdk as proSdk } from "@budibase/pro"
 
 let STARTUP_RAN = false
 
@@ -127,7 +126,7 @@ export async function startup(app?: any, server?: any) {
   let queuePromises = []
   // configure events to use the pro audit log write
   // can't integrate directly into backend-core due to cyclic issues
-  queuePromises.push(events.processors.init(proSdk.auditLogs.write))
+  queuePromises.push(events.processors.init(pro.sdk.auditLogs.write))
   queuePromises.push(automations.init())
   queuePromises.push(initPro())
   if (app) {

From 7f35961e77c2202a7a47b94c2df842c6c41fd0c2 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 27 Feb 2023 11:12:52 +0000
Subject: [PATCH 163/273] adjust table sizing and switch column position

---
 .../src/pages/builder/portal/account/auditLogs/index.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 4f339fab4e..05ed511c22 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -31,8 +31,8 @@
   const schema = {
     date: { width: "0.8fr" },
     user: { width: "0.5fr" },
+    name: { width: "2fr", displayName: "Event" },
     app: { width: "1.5fr" },
-    name: { width: "2fr" },
     view: { width: "0.1fr", borderLeft: true, displayName: "" },
   }
 
@@ -270,7 +270,7 @@
       <Multiselect
         autocomplete
         placeholder="All apps"
-        label="App"
+        label="Apps"
         getOptionValue={app => app.instance._id}
         getOptionLabel={app => app.name}
         options={sortedApps}
@@ -285,7 +285,7 @@
         getOptionLabel={event => event.label}
         options={sortedEvents}
         placeholder="All events"
-        label="Event"
+        label="Events"
         bind:value={selectedEvents}
       />
     </div>

From 0fa984f26f05574336b35af4a2a942583b7c64b7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 11:42:52 +0000
Subject: [PATCH 164/273] Moving is audited and adding in env var for ip
 address/user agent auditing.

---
 packages/backend-core/src/environment.ts      |  1 +
 .../events/processors/AuditLogsProcessor.ts   | 22 +++++++++++++------
 packages/backend-core/src/utils/utils.ts      | 12 +++++++++-
 .../types/src/sdk/events/identification.ts    |  4 ++--
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index ed7a161160..6bcc59bcea 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -84,6 +84,7 @@ const environment = {
   DEPLOYMENT_ENVIRONMENT:
     process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
   ENABLE_4XX_HTTP_LOGGING: process.env.ENABLE_4XX_HTTP_LOGGING || true,
+  ENABLE_AUDIT_LOG_IP_ADDR: process.env.ENABLE_AUDIT_LOG_IP_ADDR,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index 326e476544..fd68b66871 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -4,12 +4,15 @@ import {
   Group,
   IdentityType,
   AuditLogQueueEvent,
-  AuditLogFn, AuditedEventFriendlyName,
+  AuditLogFn,
+  HostInfo,
 } from "@budibase/types"
 import { EventProcessor } from "./types"
 import { getAppId } from "../../context"
 import BullQueue from "bull"
 import { createQueue, JobQueue } from "../../queue"
+import { isAudited } from "../../utils"
+import env from "../../environment"
 
 export default class AuditLogsProcessor implements EventProcessor {
   static auditLogsEnabled = false
@@ -31,26 +34,31 @@ export default class AuditLogsProcessor implements EventProcessor {
         }
         delete properties.audited
       }
+
+      // this feature is disabled by default due to privacy requirements
+      // in some countries - available as env var in-case it is desired
+      // in self host deployments
+      let hostInfo: HostInfo | undefined = {}
+      if (env.ENABLE_AUDIT_LOG_IP_ADDR) {
+        hostInfo = job.data.opts.hostInfo
+      }
+
       await writeAuditLogs(job.data.event, properties, {
         userId: job.data.opts.userId,
         timestamp: job.data.opts.timestamp,
         appId: job.data.opts.appId,
-        hostInfo: job.data.opts.hostInfo,
+        hostInfo,
       })
     })
   }
 
-  isAudited(event: Event) {
-    return !!AuditedEventFriendlyName[event]
-  }
-
   async processEvent(
     event: Event,
     identity: Identity,
     properties: any,
     timestamp?: string
   ): Promise<void> {
-    if (AuditLogsProcessor.auditLogsEnabled && this.isAudited(event)) {
+    if (AuditLogsProcessor.auditLogsEnabled && isAudited(event)) {
       // only audit log actual events, don't include backfills
       const userId =
         identity.type === IdentityType.USER ? identity.id : undefined
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index 3731e134ad..3efd40ca80 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -10,7 +10,13 @@ import {
 import env from "../environment"
 import * as tenancy from "../tenancy"
 import * as context from "../context"
-import { App, Ctx, TenantResolutionStrategy } from "@budibase/types"
+import {
+  App,
+  AuditedEventFriendlyName,
+  Ctx,
+  Event,
+  TenantResolutionStrategy,
+} from "@budibase/types"
 import { SetOption } from "cookies"
 const jwt = require("jsonwebtoken")
 
@@ -217,3 +223,7 @@ export async function getBuildersCount() {
 export function timeout(timeMs: number) {
   return new Promise(resolve => setTimeout(resolve, timeMs))
 }
+
+export function isAudited(event: Event) {
+  return !!AuditedEventFriendlyName[event]
+}
diff --git a/packages/types/src/sdk/events/identification.ts b/packages/types/src/sdk/events/identification.ts
index 8b6b7ddf44..627254882e 100644
--- a/packages/types/src/sdk/events/identification.ts
+++ b/packages/types/src/sdk/events/identification.ts
@@ -35,8 +35,8 @@ export enum IdentityType {
 }
 
 export interface HostInfo {
-  ipAddress: string
-  userAgent: string
+  ipAddress?: string
+  userAgent?: string
 }
 
 export interface Identity {

From 3d12607b989fe29bc5722b335f2a5164bf02b6d1 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 12:02:49 +0000
Subject: [PATCH 165/273] Update packages/types/src/documents/global/config.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>
---
 packages/types/src/documents/global/config.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 8c423feb65..e2323d2b19 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -39,7 +39,9 @@ export interface GoogleInnerConfig {
   clientID: string
   clientSecret: string
   activated: boolean
-  // deprecated / read only
+  /**
+   * @deprecated read only
+   */
   callbackURL?: string
 }
 

From b231311a879a0f4eff787318ebb6322028911afd Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Feb 2023 13:17:05 +0100
Subject: [PATCH 166/273] Don't hide errors on the frontend

---
 .../backend/DataTable/modals/CreateEditColumn.svelte          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index d7225a6645..352f094507 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -192,13 +192,13 @@
     editableColumn.name = originalName
   }
 
-  function deleteColumn() {
+  async function deleteColumn() {
     try {
       editableColumn.name = deleteColName
       if (editableColumn.name === $tables.selected.primaryDisplay) {
         notifications.error("You cannot delete the display column")
       } else {
-        tables.deleteField(editableColumn)
+        await tables.deleteField(editableColumn)
         notifications.success(`Column ${editableColumn.name} deleted.`)
         confirmDeleteDialog.hide()
         hide()

From 30fde61d4d571d82a216acf46888cef42f1e8cc6 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Feb 2023 13:33:19 +0100
Subject: [PATCH 167/273] Handle deletes

---
 packages/server/src/integrations/googlesheets.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index d3caf0b944..587616adfc 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -308,10 +308,17 @@ class GoogleSheetsIntegration implements DatasourcePlus {
         }
         await sheet.setHeaderRow(headers)
       } else {
-        let newField = Object.keys(table.schema).find(
+        const updatedHeaderValues = [...sheet.headerValues]
+
+        const newField = Object.keys(table.schema).find(
           key => !sheet.headerValues.includes(key)
         )
-        await sheet.setHeaderRow([...sheet.headerValues, newField])
+
+        if (newField) {
+          updatedHeaderValues.push(newField)
+        }
+
+        await sheet.setHeaderRow(updatedHeaderValues)
       }
     } catch (err) {
       console.error("Error updating table in google sheets", err)

From 0a9344622a9f076fa387aacd4b62ccfe0aaee5e5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 13:17:42 +0000
Subject: [PATCH 168/273] Fixing test case.

---
 packages/worker/src/api/routes/global/tests/auth.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index 84f8ce1b0a..81964c166d 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -367,7 +367,7 @@ describe("/api/global/auth", () => {
 
         const res = await config.api.configs.OIDCCallback(configId, preAuthRes)
 
-        expect(events.auth.login).toBeCalledWith("oidc")
+        expect(events.auth.login).toBeCalledWith("oidc", "oauth@example.com")
         expect(events.auth.login).toBeCalledTimes(1)
         expect(res.status).toBe(302)
         const location: string = res.get("location")

From db2a8c125a0313421c53bd89e11c4a09c0e30187 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 13:31:52 +0000
Subject: [PATCH 169/273] Trying to remove audit log test - see if it fixes
 test stalling issue.

---
 .../api/routes/global/tests/auditLogs.spec.ts | 222 +++++++++---------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
index 19e3cd64b4..0b9bf367cc 100644
--- a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -1,111 +1,111 @@
-import { mocks, structures } from "@budibase/backend-core/tests"
-import { context, events } from "@budibase/backend-core"
-import { Event, IdentityType } from "@budibase/types"
-import { TestConfiguration } from "../../../../tests"
-
-mocks.licenses.useAuditLogs()
-
-const BASE_IDENTITY = {
-  account: undefined,
-  type: IdentityType.USER,
-}
-const USER_AUDIT_LOG_COUNT = 3
-const APP_ID = "app_1"
-
-describe("/api/global/auditlogs", () => {
-  const config = new TestConfiguration()
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  describe("POST /api/global/auditlogs/search", () => {
-    it("should be able to fire some events (create audit logs)", async () => {
-      await context.doInTenant(config.tenantId, async () => {
-        const userId = config.user!._id!
-        const identity = {
-          ...BASE_IDENTITY,
-          _id: userId,
-          tenantId: config.tenantId,
-        }
-        await context.doInIdentityContext(identity, async () => {
-          for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
-            await events.user.created(structures.users.user())
-          }
-          await context.doInAppContext(APP_ID, async () => {
-            await events.app.created(structures.apps.app(APP_ID))
-          })
-          // fetch the user created events
-          const response = await config.api.auditLogs.search({
-            events: [Event.USER_CREATED],
-          })
-          expect(response.data).toBeDefined()
-          // there will be an initial event which comes from the default user creation
-          expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
-        })
-      })
-    })
-
-    it("should be able to search by event", async () => {
-      const response = await config.api.auditLogs.search({
-        events: [Event.USER_CREATED],
-      })
-      expect(response.data.length).toBeGreaterThan(0)
-      for (let log of response.data) {
-        expect(log.event).toBe(Event.USER_CREATED)
-      }
-    })
-
-    it("should be able to search by time range (frozen)", async () => {
-      // this is frozen, only need to add 1 and minus 1
-      const now = new Date()
-      const start = new Date()
-      start.setSeconds(now.getSeconds() - 1)
-      const end = new Date()
-      end.setSeconds(now.getSeconds() + 1)
-      const response = await config.api.auditLogs.search({
-        startDate: start.toISOString(),
-        endDate: end.toISOString(),
-      })
-      expect(response.data.length).toBeGreaterThan(0)
-      for (let log of response.data) {
-        expect(log.timestamp).toBe(now.toISOString())
-      }
-    })
-
-    it("should be able to search by user ID", async () => {
-      const userId = config.user!._id!
-      const response = await config.api.auditLogs.search({
-        userIds: [userId],
-      })
-      expect(response.data.length).toBeGreaterThan(0)
-      for (let log of response.data) {
-        expect(log.user._id).toBe(userId)
-      }
-    })
-
-    it("should be able to search by app ID", async () => {
-      const response = await config.api.auditLogs.search({
-        appIds: [APP_ID],
-      })
-      expect(response.data.length).toBeGreaterThan(0)
-      for (let log of response.data) {
-        expect(log.app?._id).toBe(APP_ID)
-      }
-    })
-
-    it("should be able to search by full string", async () => {
-      const response = await config.api.auditLogs.search({
-        fullSearch: "User",
-      })
-      expect(response.data.length).toBeGreaterThan(0)
-      for (let log of response.data) {
-        expect(log.name.includes("User")).toBe(true)
-      }
-    })
-  })
-})
+// import { mocks, structures } from "@budibase/backend-core/tests"
+// import { context, events } from "@budibase/backend-core"
+// import { Event, IdentityType } from "@budibase/types"
+// import { TestConfiguration } from "../../../../tests"
+//
+// mocks.licenses.useAuditLogs()
+//
+// const BASE_IDENTITY = {
+//   account: undefined,
+//   type: IdentityType.USER,
+// }
+// const USER_AUDIT_LOG_COUNT = 3
+// const APP_ID = "app_1"
+//
+// describe("/api/global/auditlogs", () => {
+//   const config = new TestConfiguration()
+//
+//   beforeAll(async () => {
+//     await config.beforeAll()
+//   })
+//
+//   afterAll(async () => {
+//     await config.afterAll()
+//   })
+//
+//   describe("POST /api/global/auditlogs/search", () => {
+//     it("should be able to fire some events (create audit logs)", async () => {
+//       await context.doInTenant(config.tenantId, async () => {
+//         const userId = config.user!._id!
+//         const identity = {
+//           ...BASE_IDENTITY,
+//           _id: userId,
+//           tenantId: config.tenantId,
+//         }
+//         await context.doInIdentityContext(identity, async () => {
+//           for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
+//             await events.user.created(structures.users.user())
+//           }
+//           await context.doInAppContext(APP_ID, async () => {
+//             await events.app.created(structures.apps.app(APP_ID))
+//           })
+//           // fetch the user created events
+//           const response = await config.api.auditLogs.search({
+//             events: [Event.USER_CREATED],
+//           })
+//           expect(response.data).toBeDefined()
+//           // there will be an initial event which comes from the default user creation
+//           expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
+//         })
+//       })
+//     })
+//
+//     it("should be able to search by event", async () => {
+//       const response = await config.api.auditLogs.search({
+//         events: [Event.USER_CREATED],
+//       })
+//       expect(response.data.length).toBeGreaterThan(0)
+//       for (let log of response.data) {
+//         expect(log.event).toBe(Event.USER_CREATED)
+//       }
+//     })
+//
+//     it("should be able to search by time range (frozen)", async () => {
+//       // this is frozen, only need to add 1 and minus 1
+//       const now = new Date()
+//       const start = new Date()
+//       start.setSeconds(now.getSeconds() - 1)
+//       const end = new Date()
+//       end.setSeconds(now.getSeconds() + 1)
+//       const response = await config.api.auditLogs.search({
+//         startDate: start.toISOString(),
+//         endDate: end.toISOString(),
+//       })
+//       expect(response.data.length).toBeGreaterThan(0)
+//       for (let log of response.data) {
+//         expect(log.timestamp).toBe(now.toISOString())
+//       }
+//     })
+//
+//     it("should be able to search by user ID", async () => {
+//       const userId = config.user!._id!
+//       const response = await config.api.auditLogs.search({
+//         userIds: [userId],
+//       })
+//       expect(response.data.length).toBeGreaterThan(0)
+//       for (let log of response.data) {
+//         expect(log.user._id).toBe(userId)
+//       }
+//     })
+//
+//     it("should be able to search by app ID", async () => {
+//       const response = await config.api.auditLogs.search({
+//         appIds: [APP_ID],
+//       })
+//       expect(response.data.length).toBeGreaterThan(0)
+//       for (let log of response.data) {
+//         expect(log.app?._id).toBe(APP_ID)
+//       }
+//     })
+//
+//     it("should be able to search by full string", async () => {
+//       const response = await config.api.auditLogs.search({
+//         fullSearch: "User",
+//       })
+//       expect(response.data.length).toBeGreaterThan(0)
+//       for (let log of response.data) {
+//         expect(log.name.includes("User")).toBe(true)
+//       }
+//     })
+//   })
+// })

From 2c46109e7d26626785aa525d5071aaff789174de Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 13:42:51 +0000
Subject: [PATCH 170/273] Enforceable SSO (#9787)

* Add ENFORCEABLE_SSO feature flag

* First draft of enforce sso configuration / show single sign on url

* Reading and writing isSSOEnforced + integration with login page

* Enable CI + lint

* Set correct base branch for CI

* Test fix for expected string changed

* Use tenant aware platform url as SSO link

* Bring in latest pro changes

* Lint

* Add useEnforceableSSO mock helper function

* Update configs.spec.ts with coverage for public settings

* Update users.spec.ts with additional tests for isPreventPasswordActions

* Lint

* Update refresh OAuthToken to use correct enum and add case statement
---
 .github/workflows/budibase_ci.yml             |   3 +-
 packages/backend-core/src/auth/auth.ts        |  35 +++--
 packages/backend-core/src/environment.ts      |  12 +-
 .../tests/utilities/mocks/licenses.ts         |   4 +
 .../src/pages/builder/auth/login.svelte       | 122 ++++++++-------
 .../builder/portal/settings/auth/index.svelte |  72 ++++++++-
 .../portal/settings/organisation.svelte       |   2 +
 .../builder/src/stores/portal/licensing.js    |   4 +
 .../builder/src/stores/portal/organisation.js |   6 +-
 packages/frontend-core/src/constants.js       |   1 +
 packages/types/src/documents/global/config.ts |   1 +
 packages/types/src/sdk/licensing/feature.ts   |   1 +
 .../worker/src/api/controllers/global/auth.ts |   4 +-
 .../src/api/controllers/global/configs.ts     |  18 ++-
 .../src/api/routes/global/tests/auth.spec.ts  |   4 +-
 .../api/routes/global/tests/configs.spec.ts   | 146 +++++++++++-------
 packages/worker/src/environment.ts            |  12 +-
 packages/worker/src/index.ts                  |  10 +-
 packages/worker/src/sdk/auth/auth.ts          |   4 +-
 .../worker/src/sdk/users/tests/users.spec.ts  |  38 ++++-
 packages/worker/src/sdk/users/users.ts        |  20 ++-
 packages/worker/src/tests/api/configs.ts      |   8 +
 .../worker/src/tests/structures/configs.ts    |  29 ++--
 23 files changed, 365 insertions(+), 191 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index e0263546ff..838142898d 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -10,7 +10,8 @@ on:
  pull_request:
     branches:
       - master
-      - develop 
+      - develop
+      - configs-refactor-and-server-test-fixes
  workflow_dispatch:
 
 env:
diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 435b6433b2..dd28344b1f 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -20,6 +20,7 @@ import {
   GoogleInnerConfig,
   OIDCInnerConfig,
   PlatformLogoutOpts,
+  SSOProviderType,
   User,
 } from "@budibase/types"
 import { logAlert } from "../logging"
@@ -149,26 +150,26 @@ interface RefreshResponse {
 
 export async function refreshOAuthToken(
   refreshToken: string,
-  configType: ConfigType,
+  providerType: SSOProviderType,
   configId?: string
 ): Promise<RefreshResponse> {
-  if (configType === ConfigType.OIDC && configId) {
-    const config = await configs.getOIDCConfigById(configId)
-    if (!config) {
-      return { err: { data: "OIDC configuration not found" } }
-    }
-    return refreshOIDCAccessToken(config, refreshToken)
+  switch (providerType) {
+    case SSOProviderType.OIDC:
+      if (!configId) {
+        return { err: { data: "OIDC config id not provided" } }
+      }
+      const oidcConfig = await configs.getOIDCConfigById(configId)
+      if (!oidcConfig) {
+        return { err: { data: "OIDC configuration not found" } }
+      }
+      return refreshOIDCAccessToken(oidcConfig, refreshToken)
+    case SSOProviderType.GOOGLE:
+      let googleConfig = await configs.getGoogleConfig()
+      if (!googleConfig) {
+        return { err: { data: "Google configuration not found" } }
+      }
+      return refreshGoogleAccessToken(googleConfig, refreshToken)
   }
-
-  if (configType === ConfigType.GOOGLE) {
-    const config = await configs.getGoogleConfig()
-    if (!config) {
-      return { err: { data: "Google configuration not found" } }
-    }
-    return refreshGoogleAccessToken(config, refreshToken)
-  }
-
-  throw new Error(`Unsupported configType=${configType}`)
 }
 
 // TODO: Refactor to use user save function instead to prevent the need for
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index d565606133..0579d709d7 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -28,6 +28,8 @@ const DefaultBucketName = {
   PLUGINS: "plugins",
 }
 
+const selfHosted = !!parseInt(process.env.SELF_HOSTED || "")
+
 const environment = {
   isTest,
   isJest,
@@ -58,7 +60,7 @@ const environment = {
     process.env.ACCOUNT_PORTAL_URL || "https://account.budibase.app",
   ACCOUNT_PORTAL_API_KEY: process.env.ACCOUNT_PORTAL_API_KEY || "",
   DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
-  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED || ""),
+  SELF_HOSTED: selfHosted,
   COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
   PLATFORM_URL: process.env.PLATFORM_URL || "",
   POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
@@ -91,6 +93,14 @@ const environment = {
   SMTP_HOST: process.env.SMTP_HOST,
   SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
+  /**
+   * Enable to allow an admin user to login using a password.
+   * This can be useful to prevent lockout when configuring SSO.
+   * However, this should be turned OFF by default for security purposes.
+   */
+  ENABLE_SSO_MAINTENANCE_MODE: selfHosted
+    ? process.env.ENABLE_SSO_MAINTENANCE_MODE
+    : false,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/backend-core/tests/utilities/mocks/licenses.ts b/packages/backend-core/tests/utilities/mocks/licenses.ts
index e374612f5f..109fcdf9c6 100644
--- a/packages/backend-core/tests/utilities/mocks/licenses.ts
+++ b/packages/backend-core/tests/utilities/mocks/licenses.ts
@@ -70,6 +70,10 @@ export const useBackups = () => {
   return useFeature(Feature.APP_BACKUPS)
 }
 
+export const useEnforceableSSO = () => {
+  return useFeature(Feature.ENFORCEABLE_SSO)
+}
+
 export const useGroups = () => {
   return useFeature(Feature.USER_GROUPS)
 }
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 80122c23a5..06e09e4fee 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -79,67 +79,71 @@
           <OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
           <GoogleButton />
         </FancyForm>
-        <Divider />
       {/if}
-      <FancyForm bind:this={form}>
-        <FancyInput
-          label="Your work email"
-          value={formData.username}
-          on:change={e => {
-            formData = {
-              ...formData,
-              username: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {
-              username: !formData.username
-                ? "Please enter a valid email"
-                : undefined,
-            }
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.username}
-        />
-        <FancyInput
-          label="Password"
-          value={formData.password}
-          type="password"
-          on:change={e => {
-            formData = {
-              ...formData,
-              password: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {
-              password: !formData.password
-                ? "Please enter your password"
-                : undefined,
-            }
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.password}
-        />
-      </FancyForm>
-    </Layout>
-    <Layout gap="XS" noPadding justifyItems="center">
-      <Button
-        size="L"
-        cta
-        disabled={Object.keys(errors).length > 0}
-        on:click={login}
-      >
-        Log in to {company}
-      </Button>
-    </Layout>
-    <Layout gap="XS" noPadding justifyItems="center">
-      <div class="user-actions">
-        <ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
-          Forgot password?
-        </ActionButton>
-      </div>
+      {#if !$organisation.isSSOEnforced}
+        <Divider />
+        <FancyForm bind:this={form}>
+          <FancyInput
+            label="Your work email"
+            value={formData.username}
+            on:change={e => {
+              formData = {
+                ...formData,
+                username: e.detail,
+              }
+            }}
+            validate={() => {
+              let fieldError = {
+                username: !formData.username
+                  ? "Please enter a valid email"
+                  : undefined,
+              }
+              errors = handleError({ ...errors, ...fieldError })
+            }}
+            error={errors.username}
+          />
+          <FancyInput
+            label="Password"
+            value={formData.password}
+            type="password"
+            on:change={e => {
+              formData = {
+                ...formData,
+                password: e.detail,
+              }
+            }}
+            validate={() => {
+              let fieldError = {
+                password: !formData.password
+                  ? "Please enter your password"
+                  : undefined,
+              }
+              errors = handleError({ ...errors, ...fieldError })
+            }}
+            error={errors.password}
+          />
+        </FancyForm>
+      {/if}
     </Layout>
+    {#if !$organisation.isSSOEnforced}
+      <Layout gap="XS" noPadding justifyItems="center">
+        <Button
+          size="L"
+          cta
+          disabled={Object.keys(errors).length > 0}
+          on:click={login}
+        >
+          Log in to {company}
+        </Button>
+      </Layout>
+      <Layout gap="XS" noPadding justifyItems="center">
+        <div class="user-actions">
+          <ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
+            Forgot password?
+          </ActionButton>
+        </div>
+      </Layout>
+    {/if}
 
     {#if cloud}
       <Body size="xs" textAlign="center">
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index 608ca271c0..e5196a1cbf 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -22,10 +22,11 @@
     Tags,
     Icon,
     Helpers,
+    Link,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { API } from "api"
-  import { organisation, admin } from "stores/portal"
+  import { organisation, admin, licensing } from "stores/portal"
 
   const ConfigTypes = {
     Google: "google",
@@ -34,6 +35,8 @@
 
   const HasSpacesRegex = /[\\"\s]/
 
+  $: enforcedSSO = $organisation.isSSOEnforced
+
   // Some older google configs contain a manually specified value - retain the functionality to edit the field
   // When there is no value or we are in the cloud - prohibit editing the field, must use platform url to change
   $: googleCallbackUrl = undefined
@@ -154,6 +157,11 @@
     iconDropdownOptions.unshift({ label: fileName, value: fileName })
   }
 
+  async function toggleIsSSOEnforced() {
+    const value = $organisation.isSSOEnforced
+    await organisation.save({ isSSOEnforced: !value })
+  }
+
   async function save(docs) {
     let calls = []
     // Only if the user has provided an image, upload it
@@ -316,6 +324,49 @@
     <Heading size="M">Authentication</Heading>
     <Body>Add additional authentication methods from the options below</Body>
   </Layout>
+  <Divider />
+  <Layout noPadding gap="XS">
+    <Heading size="S">Single Sign-On URL</Heading>
+    <Body size="S">
+      Use the following link to access your configured identity provider.
+    </Body>
+    <Body size="S">
+      <div class="sso-link">
+        <Link href={$organisation.platformUrl} target="_blank"
+          >{$organisation.platformUrl}</Link
+        >
+        <div class="sso-link-icon">
+          <Icon size="XS" name="LinkOutLight" />
+        </div>
+      </div>
+    </Body>
+  </Layout>
+  <Divider />
+  <Layout noPadding gap="XS">
+    <div class="provider-title">
+      <div class="enforce-sso-heading-container">
+        <div class="enforce-sso-title">
+          <Heading size="S">Enforce Single Sign-On</Heading>
+        </div>
+        {#if !$licensing.enforceableSSO}
+          <Tags>
+            <Tag icon="LockClosed">Business plan</Tag>
+          </Tags>
+        {/if}
+      </div>
+      {#if $licensing.enforceableSSO}
+        <Toggle on:change={toggleIsSSOEnforced} bind:value={enforcedSSO} />
+      {/if}
+    </div>
+    <Body size="S">
+      Require SSO authentication for all users. It is recommended to read the
+      help <Link
+        size="M"
+        href={"https://docs.budibase.com/docs/authentication-and-sso"}
+        >documentation</Link
+      > before enabling this feature.
+    </Body>
+  </Layout>
   {#if providers.google}
     <Divider />
     <Layout gap="XS" noPadding>
@@ -546,7 +597,24 @@
   input[type="file"] {
     display: none;
   }
-
+  .sso-link-icon {
+    padding-top: 4px;
+    margin-left: 3px;
+  }
+  .sso-link {
+    margin-top: 12px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .enforce-sso-title {
+    margin-right: 10px;
+  }
+  .enforce-sso-heading-container {
+    display: flex;
+    flex-direction: row;
+    align-items: start;
+  }
   .provider-title {
     display: flex;
     flex-direction: row;
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index 8e4d6e738c..bba046ce10 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -24,6 +24,7 @@
   }
 
   const values = writable({
+    isSSOEnforced: $organisation.isSSOEnforced,
     company: $organisation.company,
     platformUrl: $organisation.platformUrl,
     analyticsEnabled: $organisation.analyticsEnabled,
@@ -54,6 +55,7 @@
       }
 
       const config = {
+        isSSOEnforced: $values.isSSOEnforced,
         company: $values.company ?? "",
         platformUrl: $values.platformUrl ?? "",
         analyticsEnabled: $values.analyticsEnabled,
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 6f5c80e03c..42c150c893 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -63,6 +63,9 @@ export const createLicensingStore = () => {
       const environmentVariablesEnabled = license.features.includes(
         Constants.Features.ENVIRONMENT_VARIABLES
       )
+      const enforceableSSO = license.features.includes(
+        Constants.Features.ENFORCEABLE_SSO
+      )
 
       store.update(state => {
         return {
@@ -72,6 +75,7 @@ export const createLicensingStore = () => {
           groupsEnabled,
           backupsEnabled,
           environmentVariablesEnabled,
+          enforceableSSO,
         }
       })
     },
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
index 9709578fa2..c8b62bb2bc 100644
--- a/packages/builder/src/stores/portal/organisation.js
+++ b/packages/builder/src/stores/portal/organisation.js
@@ -11,6 +11,7 @@ const DEFAULT_CONFIG = {
   google: undefined,
   oidcCallbackUrl: "",
   googleCallbackUrl: "",
+  isSSOEnforced: false,
 }
 
 export function createOrganisationStore() {
@@ -19,8 +20,8 @@ export function createOrganisationStore() {
 
   async function init() {
     const tenantId = get(auth).tenantId
-    const tenant = await API.getTenantConfig(tenantId)
-    set({ ...DEFAULT_CONFIG, ...tenant.config, _rev: tenant._rev })
+    const settingsConfigDoc = await API.getTenantConfig(tenantId)
+    set({ ...DEFAULT_CONFIG, ...settingsConfigDoc.config })
   }
 
   async function save(config) {
@@ -33,7 +34,6 @@ export function createOrganisationStore() {
     await API.saveConfig({
       type: "settings",
       config: { ...get(store), ...config },
-      _rev: get(store)._rev,
     })
     await init()
   }
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 3a16013df2..ec0b447159 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -115,6 +115,7 @@ export const Features = {
   USER_GROUPS: "userGroups",
   BACKUPS: "appBackups",
   ENVIRONMENT_VARIABLES: "environmentVariables",
+  ENFORCEABLE_SSO: "enforceableSSO",
 }
 
 // Role IDs
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index e2323d2b19..f4bba21e0f 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -29,6 +29,7 @@ export interface SettingsInnerConfig {
   logoUrlEtag?: string
   uniqueTenantId?: string
   analyticsEnabled?: boolean
+  isSSOEnforced?: boolean
 }
 
 export interface SettingsConfig extends Config {
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index a39bcab18b..f28c3c0709 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -2,4 +2,5 @@ export enum Feature {
   USER_GROUPS = "userGroups",
   APP_BACKUPS = "appBackups",
   ENVIRONMENT_VARIABLES = "environmentVariables",
+  ENFORCEABLE_SSO = "enforceableSSO",
 }
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index ab017a4184..9336ba0d5b 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -61,8 +61,8 @@ export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
   const email = ctx.request.body.username
 
   const user = await userSdk.getUserByEmail(email)
-  if (user && (await userSdk.isPreventSSOPasswords(user))) {
-    ctx.throw(400, "SSO user cannot login using password")
+  if (user && (await userSdk.isPreventPasswordActions(user))) {
+    ctx.throw(400, "Password login is disabled for this user")
   }
 
   return passport.authenticate(
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index b076416989..1ea0f52c96 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -23,6 +23,7 @@ import {
   isSMTPConfig,
   UserCtx,
 } from "@budibase/types"
+import * as pro from "@budibase/pro"
 
 const getEventFns = async (config: Config, existing?: Config) => {
   const fns = []
@@ -126,10 +127,10 @@ export async function save(ctx: UserCtx<Config>) {
   const existingConfig = await configs.getConfig(type)
   let eventFns = await getEventFns(ctx.request.body, existingConfig)
 
-  // Config does not exist yet
-  if (!existingConfig) {
-    body._id = configs.generateConfigID(type)
+  if (existingConfig) {
+    body._rev = existingConfig._rev
   }
+
   try {
     // verify the configuration
     switch (config.type) {
@@ -142,6 +143,7 @@ export async function save(ctx: UserCtx<Config>) {
   }
 
   try {
+    body._id = configs.generateConfigID(type)
     const response = await configs.save(body)
     await cache.bustCache(cache.CacheKey.CHECKLIST)
     await cache.bustCache(cache.CacheKey.ANALYTICS_ENABLED)
@@ -203,7 +205,8 @@ export async function publicSettings(
 ) {
   try {
     // settings
-    const config = await configs.getSettingsConfig()
+    const configDoc = await configs.getSettingsConfigDoc()
+    const config = configDoc.config
     // enrich the logo url - empty url means deleted
     if (config.logoUrl && config.logoUrl !== "") {
       config.logoUrl = objectStore.getGlobalFileUrl(
@@ -224,13 +227,18 @@ export async function publicSettings(
     const oidc = oidcConfig?.activated || false
     const _oidcCallbackUrl = await oidcCallbackUrl()
 
+    // sso enforced
+    const isSSOEnforced = await pro.features.isSSOEnforced({ config })
+
     ctx.body = {
       type: ConfigType.SETTINGS,
-      _id: configs.generateConfigID(ConfigType.SETTINGS),
+      _id: configDoc._id,
+      _rev: configDoc._rev,
       config: {
         ...config,
         google,
         oidc,
+        isSSOEnforced,
         oidcCallbackUrl: _oidcCallbackUrl,
         googleCallbackUrl: _googleCallbackUrl,
       },
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index 84f8ce1b0a..b6be1fd7af 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -110,7 +110,7 @@ describe("/api/global/auth", () => {
           )
 
           expect(response.body).toEqual({
-            message: "SSO user cannot login using password",
+            message: "Password login is disabled for this user",
             status: 400,
           })
         }
@@ -175,7 +175,7 @@ describe("/api/global/auth", () => {
           )
 
           expect(res.body).toEqual({
-            message: "SSO user cannot reset password",
+            message: "Password reset is disabled for this user",
             status: 400,
             error: {
               code: "http",
diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts
index 39ad74d295..892fe8a67b 100644
--- a/packages/worker/src/api/routes/global/tests/configs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts
@@ -2,7 +2,8 @@
 jest.mock("nodemailer")
 import { TestConfiguration, structures, mocks } from "../../../../tests"
 mocks.email.mock()
-import { Config, events } from "@budibase/backend-core"
+import { events } from "@budibase/backend-core"
+import { GetPublicSettingsResponse, Config, ConfigType } from "@budibase/types"
 
 describe("configs", () => {
   const config = new TestConfiguration()
@@ -19,22 +20,29 @@ describe("configs", () => {
     await config.afterAll()
   })
 
-  describe("post /api/global/configs", () => {
-    const saveConfig = async (conf: any, _id?: string, _rev?: string) => {
-      const data = {
-        ...conf,
-        _id,
-        _rev,
-      }
-
-      const res = await config.api.configs.saveConfig(data)
-
-      return {
-        ...data,
-        ...res.body,
-      }
+  const saveConfig = async (conf: Config, _id?: string, _rev?: string) => {
+    const data = {
+      ...conf,
+      _id,
+      _rev,
     }
+    const res = await config.api.configs.saveConfig(data)
+    return {
+      ...data,
+      ...res.body,
+    }
+  }
 
+  const saveSettingsConfig = async (
+    conf?: any,
+    _id?: string,
+    _rev?: string
+  ) => {
+    const settingsConfig = structures.configs.settings(conf)
+    return saveConfig(settingsConfig, _id, _rev)
+  }
+
+  describe("POST /api/global/configs", () => {
     describe("google", () => {
       const saveGoogleConfig = async (
         conf?: any,
@@ -49,20 +57,20 @@ describe("configs", () => {
         it("should create activated google config", async () => {
           await saveGoogleConfig()
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(Config.GOOGLE)
+          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.GOOGLE)
           expect(events.auth.SSODeactivated).not.toBeCalled()
           expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(Config.GOOGLE)
-          await config.deleteConfig(Config.GOOGLE)
+          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.GOOGLE)
+          await config.deleteConfig(ConfigType.GOOGLE)
         })
 
         it("should create deactivated google config", async () => {
           await saveGoogleConfig({ activated: false })
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(Config.GOOGLE)
+          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.GOOGLE)
           expect(events.auth.SSOActivated).not.toBeCalled()
           expect(events.auth.SSODeactivated).not.toBeCalled()
-          await config.deleteConfig(Config.GOOGLE)
+          await config.deleteConfig(ConfigType.GOOGLE)
         })
       })
 
@@ -76,11 +84,11 @@ describe("configs", () => {
             googleConf._rev
           )
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(Config.GOOGLE)
+          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.GOOGLE)
           expect(events.auth.SSOActivated).not.toBeCalled()
           expect(events.auth.SSODeactivated).toBeCalledTimes(1)
-          expect(events.auth.SSODeactivated).toBeCalledWith(Config.GOOGLE)
-          await config.deleteConfig(Config.GOOGLE)
+          expect(events.auth.SSODeactivated).toBeCalledWith(ConfigType.GOOGLE)
+          await config.deleteConfig(ConfigType.GOOGLE)
         })
 
         it("should update google config to activated", async () => {
@@ -92,11 +100,11 @@ describe("configs", () => {
             googleConf._rev
           )
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(Config.GOOGLE)
+          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.GOOGLE)
           expect(events.auth.SSODeactivated).not.toBeCalled()
           expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(Config.GOOGLE)
-          await config.deleteConfig(Config.GOOGLE)
+          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.GOOGLE)
+          await config.deleteConfig(ConfigType.GOOGLE)
         })
       })
     })
@@ -115,20 +123,20 @@ describe("configs", () => {
         it("should create activated OIDC config", async () => {
           await saveOIDCConfig()
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.OIDC)
           expect(events.auth.SSODeactivated).not.toBeCalled()
           expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
-          await config.deleteConfig(Config.OIDC)
+          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.OIDC)
+          await config.deleteConfig(ConfigType.OIDC)
         })
 
         it("should create deactivated OIDC config", async () => {
           await saveOIDCConfig({ activated: false })
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
-          expect(events.auth.SSOCreated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOCreated).toBeCalledWith(ConfigType.OIDC)
           expect(events.auth.SSOActivated).not.toBeCalled()
           expect(events.auth.SSODeactivated).not.toBeCalled()
-          await config.deleteConfig(Config.OIDC)
+          await config.deleteConfig(ConfigType.OIDC)
         })
       })
 
@@ -142,11 +150,11 @@ describe("configs", () => {
             oidcConf._rev
           )
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.OIDC)
           expect(events.auth.SSOActivated).not.toBeCalled()
           expect(events.auth.SSODeactivated).toBeCalledTimes(1)
-          expect(events.auth.SSODeactivated).toBeCalledWith(Config.OIDC)
-          await config.deleteConfig(Config.OIDC)
+          expect(events.auth.SSODeactivated).toBeCalledWith(ConfigType.OIDC)
+          await config.deleteConfig(ConfigType.OIDC)
         })
 
         it("should update OIDC config to activated", async () => {
@@ -158,11 +166,11 @@ describe("configs", () => {
             oidcConf._rev
           )
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
-          expect(events.auth.SSOUpdated).toBeCalledWith(Config.OIDC)
+          expect(events.auth.SSOUpdated).toBeCalledWith(ConfigType.OIDC)
           expect(events.auth.SSODeactivated).not.toBeCalled()
           expect(events.auth.SSOActivated).toBeCalledTimes(1)
-          expect(events.auth.SSOActivated).toBeCalledWith(Config.OIDC)
-          await config.deleteConfig(Config.OIDC)
+          expect(events.auth.SSOActivated).toBeCalledWith(ConfigType.OIDC)
+          await config.deleteConfig(ConfigType.OIDC)
         })
       })
     })
@@ -179,11 +187,11 @@ describe("configs", () => {
 
       describe("create", () => {
         it("should create SMTP config", async () => {
-          await config.deleteConfig(Config.SMTP)
+          await config.deleteConfig(ConfigType.SMTP)
           await saveSMTPConfig()
           expect(events.email.SMTPUpdated).not.toBeCalled()
           expect(events.email.SMTPCreated).toBeCalledTimes(1)
-          await config.deleteConfig(Config.SMTP)
+          await config.deleteConfig(ConfigType.SMTP)
         })
       })
 
@@ -194,24 +202,15 @@ describe("configs", () => {
           await saveSMTPConfig(smtpConf.config, smtpConf._id, smtpConf._rev)
           expect(events.email.SMTPCreated).not.toBeCalled()
           expect(events.email.SMTPUpdated).toBeCalledTimes(1)
-          await config.deleteConfig(Config.SMTP)
+          await config.deleteConfig(ConfigType.SMTP)
         })
       })
     })
 
     describe("settings", () => {
-      const saveSettingsConfig = async (
-        conf?: any,
-        _id?: string,
-        _rev?: string
-      ) => {
-        const settingsConfig = structures.configs.settings(conf)
-        return saveConfig(settingsConfig, _id, _rev)
-      }
-
       describe("create", () => {
         it("should create settings config with default settings", async () => {
-          await config.deleteConfig(Config.SETTINGS)
+          await config.deleteConfig(ConfigType.SETTINGS)
 
           await saveSettingsConfig()
 
@@ -222,7 +221,7 @@ describe("configs", () => {
 
         it("should create settings config with non-default settings", async () => {
           config.selfHosted()
-          await config.deleteConfig(Config.SETTINGS)
+          await config.deleteConfig(ConfigType.SETTINGS)
           const conf = {
             company: "acme",
             logoUrl: "http://example.com",
@@ -241,7 +240,7 @@ describe("configs", () => {
       describe("update", () => {
         it("should update settings config", async () => {
           config.selfHosted()
-          await config.deleteConfig(Config.SETTINGS)
+          await config.deleteConfig(ConfigType.SETTINGS)
           const settingsConfig = await saveSettingsConfig()
           settingsConfig.config.company = "acme"
           settingsConfig.config.logoUrl = "http://example.com"
@@ -262,14 +261,43 @@ describe("configs", () => {
     })
   })
 
-  it("should return the correct checklist status based on the state of the budibase installation", async () => {
-    await config.saveSmtpConfig()
+  describe("GET /api/global/configs/checklist", () => {
+    it("should return the correct checklist", async () => {
+      await config.saveSmtpConfig()
 
-    const res = await config.api.configs.getConfigChecklist()
-    const checklist = res.body
+      const res = await config.api.configs.getConfigChecklist()
+      const checklist = res.body
 
-    expect(checklist.apps.checked).toBeFalsy()
-    expect(checklist.smtp.checked).toBeTruthy()
-    expect(checklist.adminUser.checked).toBeTruthy()
+      expect(checklist.apps.checked).toBeFalsy()
+      expect(checklist.smtp.checked).toBeTruthy()
+      expect(checklist.adminUser.checked).toBeTruthy()
+    })
+  })
+
+  describe("GET /api/global/configs/public", () => {
+    it("should return the expected public settings", async () => {
+      await saveSettingsConfig()
+
+      const res = await config.api.configs.getPublicSettings()
+      const body = res.body as GetPublicSettingsResponse
+
+      const expected = {
+        _id: "config_settings",
+        type: "settings",
+        config: {
+          company: "Budibase",
+          logoUrl: "",
+          analyticsEnabled: false,
+          google: true,
+          googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`,
+          isSSOEnforced: false,
+          oidc: false,
+          oidcCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/oidc/callback`,
+          platformUrl: "http://localhost:10000",
+        },
+      }
+      delete body._rev
+      expect(body).toEqual(expected)
+    })
   })
 })
diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts
index 71fd89f276..cd5360f7f7 100644
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@@ -26,8 +26,6 @@ function parseIntSafe(number: any) {
   }
 }
 
-const selfHosted = !!parseInt(process.env.SELF_HOSTED || "")
-
 const environment = {
   // auth
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
@@ -51,7 +49,7 @@ const environment = {
   CLUSTER_PORT: process.env.CLUSTER_PORT,
   // flags
   NODE_ENV: process.env.NODE_ENV,
-  SELF_HOSTED: selfHosted,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED || ""),
   LOG_LEVEL: process.env.LOG_LEVEL,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
@@ -71,14 +69,6 @@ const environment = {
    * Mock the email service in use - links to ethereal hosted emails are logged instead.
    */
   ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
-  /**
-   * Enable to allow an admin user to login using a password.
-   * This can be useful to prevent lockout when configuring SSO.
-   * However, this should be turned OFF by default for security purposes.
-   */
-  ENABLE_SSO_MAINTENANCE_MODE: selfHosted
-    ? process.env.ENABLE_SSO_MAINTENANCE_MODE
-    : false,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 1e3ff3cbdf..6e3a88bf20 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -13,7 +13,13 @@ import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
-import { auth, logging, events, middleware } from "@budibase/backend-core"
+import {
+  auth,
+  logging,
+  events,
+  middleware,
+  env as coreEnv,
+} from "@budibase/backend-core"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -25,7 +31,7 @@ const koaSession = require("koa-session")
 const logger = require("koa-pino-logger")
 import destroyable from "server-destroy"
 
-if (env.ENABLE_SSO_MAINTENANCE_MODE) {
+if (coreEnv.ENABLE_SSO_MAINTENANCE_MODE) {
   console.warn(
     "Warning: ENABLE_SSO_MAINTENANCE_MODE is set. It is recommended this flag is disabled if maintenance is not in progress"
   )
diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts
index 15a4f3c7e7..8e9cff18dd 100644
--- a/packages/worker/src/sdk/auth/auth.ts
+++ b/packages/worker/src/sdk/auth/auth.ts
@@ -58,8 +58,8 @@ export const reset = async (email: string) => {
   }
 
   // exit if user has sso
-  if (await userSdk.isPreventSSOPasswords(user)) {
-    throw new HTTPError("SSO user cannot reset password", 400)
+  if (await userSdk.isPreventPasswordActions(user)) {
+    throw new HTTPError("Password reset is disabled for this user", 400)
   }
 
   // send password reset
diff --git a/packages/worker/src/sdk/users/tests/users.spec.ts b/packages/worker/src/sdk/users/tests/users.spec.ts
index 41d9298997..77f02eec7a 100644
--- a/packages/worker/src/sdk/users/tests/users.spec.ts
+++ b/packages/worker/src/sdk/users/tests/users.spec.ts
@@ -1,26 +1,50 @@
 import { structures } from "../../../tests"
-import * as users from "../users"
-import env from "../../../environment"
 import { mocks } from "@budibase/backend-core/tests"
+import { env } from "@budibase/backend-core"
+import * as users from "../users"
 import { CloudAccount } from "@budibase/types"
+import { isPreventPasswordActions } from "../users"
+
+jest.mock("@budibase/pro")
+import * as _pro from "@budibase/pro"
+const pro = jest.mocked(_pro, true)
 
 describe("users", () => {
-  describe("isPreventSSOPasswords", () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  describe("isPreventPasswordActions", () => {
+    it("returns false for non sso user", async () => {
+      const user = structures.users.user()
+      const result = await users.isPreventPasswordActions(user)
+      expect(result).toBe(false)
+    })
+
     it("returns true for sso account user", async () => {
       const user = structures.users.user()
       mocks.accounts.getAccount.mockReturnValue(
         Promise.resolve(structures.accounts.ssoAccount() as CloudAccount)
       )
-      const result = await users.isPreventSSOPasswords(user)
+      const result = await users.isPreventPasswordActions(user)
       expect(result).toBe(true)
     })
 
     it("returns true for sso user", async () => {
       const user = structures.users.ssoUser()
-      const result = await users.isPreventSSOPasswords(user)
+      const result = await users.isPreventPasswordActions(user)
       expect(result).toBe(true)
     })
 
+    describe("enforced sso", () => {
+      it("returns true for all users when sso is enforced", async () => {
+        const user = structures.users.user()
+        pro.features.isSSOEnforced.mockReturnValue(Promise.resolve(true))
+        const result = await users.isPreventPasswordActions(user)
+        expect(result).toBe(true)
+      })
+    })
+
     describe("sso maintenance mode", () => {
       beforeEach(() => {
         env._set("ENABLE_SSO_MAINTENANCE_MODE", true)
@@ -33,7 +57,7 @@ describe("users", () => {
       describe("non-admin user", () => {
         it("returns true", async () => {
           const user = structures.users.ssoUser()
-          const result = await users.isPreventSSOPasswords(user)
+          const result = await users.isPreventPasswordActions(user)
           expect(result).toBe(true)
         })
       })
@@ -43,7 +67,7 @@ describe("users", () => {
           const user = structures.users.ssoUser({
             user: structures.users.adminUser(),
           })
-          const result = await users.isPreventSSOPasswords(user)
+          const result = await users.isPreventPasswordActions(user)
           expect(result).toBe(false)
         })
       })
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 7d4a2f04f0..b0ca22e44a 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -14,6 +14,7 @@ import {
   users as usersCore,
   utils,
   ViewName,
+  env as coreEnv,
 } from "@budibase/backend-core"
 import {
   AccountMetadata,
@@ -34,7 +35,7 @@ import {
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
 import { EmailTemplatePurpose } from "../../constants"
-import { groups as groupsSdk } from "@budibase/pro"
+import * as pro from "@budibase/pro"
 import * as accountSdk from "../accounts"
 
 const PAGE_LIMIT = 8
@@ -122,8 +123,8 @@ const buildUser = async (
 
   let hashedPassword
   if (password) {
-    if (await isPreventSSOPasswords(user)) {
-      throw new HTTPError("SSO user cannot set password", 400)
+    if (await isPreventPasswordActions(user)) {
+      throw new HTTPError("Password change is disabled for this user", 400)
     }
     hashedPassword = opts.hashPassword ? await utils.hash(password) : password
   } else if (dbUser) {
@@ -188,13 +189,18 @@ const validateUniqueUser = async (email: string, tenantId: string) => {
   }
 }
 
-export async function isPreventSSOPasswords(user: User) {
+export async function isPreventPasswordActions(user: User) {
   // when in maintenance mode we allow sso users with the admin role
   // to perform any password action - this prevents lockout
-  if (env.ENABLE_SSO_MAINTENANCE_MODE && user.admin?.global) {
+  if (coreEnv.ENABLE_SSO_MAINTENANCE_MODE && user.admin?.global) {
     return false
   }
 
+  // SSO is enforced for all users
+  if (await pro.features.isSSOEnforced()) {
+    return true
+  }
+
   // Check local sso
   if (isSSOUser(user)) {
     return true
@@ -278,7 +284,7 @@ export const save = async (
 
     if (userGroups.length > 0) {
       for (let groupId of userGroups) {
-        groupPromises.push(groupsSdk.addUsers(groupId, [_id]))
+        groupPromises.push(pro.groups.addUsers(groupId, [_id]))
       }
     }
   }
@@ -456,7 +462,7 @@ export const bulkCreate = async (
     const groupPromises = []
     const createdUserIds = saved.map(user => user._id)
     for (let groupId of groups) {
-      groupPromises.push(groupsSdk.addUsers(groupId, createdUserIds))
+      groupPromises.push(pro.groups.addUsers(groupId, createdUserIds))
     }
     await Promise.all(groupPromises)
   }
diff --git a/packages/worker/src/tests/api/configs.ts b/packages/worker/src/tests/api/configs.ts
index 76a6f31415..74cef2bf8b 100644
--- a/packages/worker/src/tests/api/configs.ts
+++ b/packages/worker/src/tests/api/configs.ts
@@ -14,6 +14,14 @@ export class ConfigAPI extends TestAPI {
       .expect("Content-Type", /json/)
   }
 
+  getPublicSettings = () => {
+    return this.request
+      .get(`/api/global/configs/public`)
+      .set(this.config.defaultHeaders())
+      .expect(200)
+      .expect("Content-Type", /json/)
+  }
+
   saveConfig = (data: any) => {
     return this.request
       .post(`/api/global/configs`)
diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts
index 9b5b29f652..d50f5ebc72 100644
--- a/packages/worker/src/tests/structures/configs.ts
+++ b/packages/worker/src/tests/structures/configs.ts
@@ -1,9 +1,15 @@
-import { Config } from "../../constants"
 import { utils } from "@budibase/backend-core"
+import {
+  SettingsConfig,
+  ConfigType,
+  SMTPConfig,
+  GoogleConfig,
+  OIDCConfig,
+} from "@budibase/types"
 
-export function oidc(conf?: any) {
+export function oidc(conf?: any): OIDCConfig {
   return {
-    type: Config.OIDC,
+    type: ConfigType.OIDC,
     config: {
       configs: [
         {
@@ -21,9 +27,9 @@ export function oidc(conf?: any) {
   }
 }
 
-export function google(conf?: any) {
+export function google(conf?: any): GoogleConfig {
   return {
-    type: Config.GOOGLE,
+    type: ConfigType.GOOGLE,
     config: {
       clientID: "clientId",
       clientSecret: "clientSecret",
@@ -33,9 +39,9 @@ export function google(conf?: any) {
   }
 }
 
-export function smtp(conf?: any) {
+export function smtp(conf?: any): SMTPConfig {
   return {
-    type: Config.SMTP,
+    type: ConfigType.SMTP,
     config: {
       port: 12345,
       host: "smtptesthost.com",
@@ -47,12 +53,13 @@ export function smtp(conf?: any) {
   }
 }
 
-export function smtpEthereal() {
+export function smtpEthereal(): SMTPConfig {
   return {
-    type: Config.SMTP,
+    type: ConfigType.SMTP,
     config: {
       port: 587,
       host: "smtp.ethereal.email",
+      from: "testfrom@test.com",
       secure: false,
       auth: {
         user: "wyatt.zulauf29@ethereal.email",
@@ -63,9 +70,9 @@ export function smtpEthereal() {
   }
 }
 
-export function settings(conf?: any) {
+export function settings(conf?: any): SettingsConfig {
   return {
-    type: Config.SETTINGS,
+    type: ConfigType.SETTINGS,
     config: {
       platformUrl: "http://localhost:10000",
       logoUrl: "",

From fd085847c3c51c0e16c5a23905c6ca6885613a3c Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 13:53:10 +0000
Subject: [PATCH 171/273] Remove temporary ci branch

---
 .github/workflows/budibase_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 838142898d..f196b70db4 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -11,7 +11,6 @@ on:
     branches:
       - master
       - develop
-      - configs-refactor-and-server-test-fixes
  workflow_dispatch:
 
 env:

From edfd53a79a3dad6c175378664ae0e9eca3c53910 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 27 Feb 2023 14:07:12 +0000
Subject: [PATCH 172/273] v2.3.18-alpha.13

---
 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 5145222dfa..0e1e6a8711 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 428d785a44..1243f58abe 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.12",
+    "@budibase/types": "2.3.18-alpha.13",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b697a532ad..ca63265dda 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.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "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.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.13",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b3afb4de2a..1d75b3874d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.12",
-    "@budibase/client": "2.3.18-alpha.12",
-    "@budibase/frontend-core": "2.3.18-alpha.12",
-    "@budibase/string-templates": "2.3.18-alpha.12",
+    "@budibase/bbui": "2.3.18-alpha.13",
+    "@budibase/client": "2.3.18-alpha.13",
+    "@budibase/frontend-core": "2.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.13",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5bc10322c1..157219ea7a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "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.3.18-alpha.12",
-    "@budibase/string-templates": "2.3.18-alpha.12",
-    "@budibase/types": "2.3.18-alpha.12",
+    "@budibase/backend-core": "2.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.13",
+    "@budibase/types": "2.3.18-alpha.13",
     "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 c18aa46812..b5926feaae 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "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.3.18-alpha.12",
-    "@budibase/frontend-core": "2.3.18-alpha.12",
-    "@budibase/string-templates": "2.3.18-alpha.12",
+    "@budibase/bbui": "2.3.18-alpha.13",
+    "@budibase/frontend-core": "2.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.13",
     "@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 bc7a82d0a6..c29e9cc785 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.12",
+    "@budibase/bbui": "2.3.18-alpha.13",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 8199e84495..b1f68d3b27 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index aa3754ee94..dcc3bd2ccf 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.12",
-    "@budibase/client": "2.3.18-alpha.12",
+    "@budibase/backend-core": "2.3.18-alpha.13",
+    "@budibase/client": "2.3.18-alpha.13",
     "@budibase/pro": "2.3.18-alpha.12",
-    "@budibase/string-templates": "2.3.18-alpha.12",
-    "@budibase/types": "2.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.13",
+    "@budibase/types": "2.3.18-alpha.13",
     "@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 1baef9fcf0..41ea0cf30d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "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 e3972ab5ea..ae19e2eb5d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "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 6d7cae05a6..fd26326431 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.12",
+  "version": "2.3.18-alpha.13",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.12",
+    "@budibase/backend-core": "2.3.18-alpha.13",
     "@budibase/pro": "2.3.18-alpha.12",
-    "@budibase/string-templates": "2.3.18-alpha.12",
-    "@budibase/types": "2.3.18-alpha.12",
+    "@budibase/string-templates": "2.3.18-alpha.13",
+    "@budibase/types": "2.3.18-alpha.13",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 3365f9f0d31fb0ceeb73829ddad784a4edfe2c72 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 27 Feb 2023 14:10:33 +0000
Subject: [PATCH 173/273] Update pro version to 2.3.18-alpha.13

---
 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 dcc3bd2ccf..a04687cdbe 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.13",
     "@budibase/client": "2.3.18-alpha.13",
-    "@budibase/pro": "2.3.18-alpha.12",
+    "@budibase/pro": "2.3.18-alpha.13",
     "@budibase/string-templates": "2.3.18-alpha.13",
     "@budibase/types": "2.3.18-alpha.13",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0526603777..fed1fcbaa3 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.12.tgz#ad1b16be64b78b596af2b5f75647c32e8f6f101a"
-  integrity sha512-E1NEO+/sNkkRqn/xk9XQmFBO9/dl27w9EB0QGztti/16JV9NgxyDQCJIdGwlD08s1y/lUwOKk0TkSZJs+CTYDw==
+"@budibase/backend-core@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.13.tgz#b797d7a4d30ff7f21e473334edb4086f5818830e"
+  integrity sha512-c6d0xCRgLlPeX1euAoQuoDOkMkDGQy/miBx/Z8xyU9bzDDTNqBTogxpxsNf8DdZG7EMJhsJlCUvb26Onz7/50A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.12"
+    "@budibase/types" "2.3.18-alpha.13"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.12.tgz#be552b3a9f5850e746081540d6586aae69147bec"
-  integrity sha512-M3b0njzSi47KH6uaQfYPoA2KWrjPiwcU3ONyaVWXHIktVrIKtYaFwOLBr/dmWGfMrL2297SSqg7V4DTaLyAhnw==
+"@budibase/pro@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.13.tgz#9f3dd0339184a58609c726f3f2b4580cf802dc78"
+  integrity sha512-pRroVVFGITFsFtzzH6LgzuaUBKldvFQxTgO7K6dYjjE7xwTCnZCg0E4L2Ew/JIY39UN2WEb5bwdt3+pqPH7Dmg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.12"
-    "@budibase/types" "2.3.18-alpha.12"
+    "@budibase/backend-core" "2.3.18-alpha.13"
+    "@budibase/types" "2.3.18-alpha.13"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.12.tgz#a63eb978ccc7e55c209b3e9d71f9aecf7facc0d1"
-  integrity sha512-27o2BmI/HXIR3frZ8FtqHgAe1hd8jPIzgPaEhKrQiYJ/opUVccqupx9ld75Hyk9E6cdXu0UF0/+LxPpUmMugag==
+"@budibase/types@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.13.tgz#e80cbf79249ed5cf8fe86e294d0b1e25e0a839ee"
+  integrity sha512-fmgpwMMGkbPOObmFnZZH8iKelycmhvBydGQuPEmIk1c449ysfiKF2Strnca6MaY1XtskfRz/nNdWGdGS1HhmFw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fd26326431..c8783175ec 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.13",
-    "@budibase/pro": "2.3.18-alpha.12",
+    "@budibase/pro": "2.3.18-alpha.13",
     "@budibase/string-templates": "2.3.18-alpha.13",
     "@budibase/types": "2.3.18-alpha.13",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 99f46ba5fb..e51dba9bc8 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.12.tgz#ad1b16be64b78b596af2b5f75647c32e8f6f101a"
-  integrity sha512-E1NEO+/sNkkRqn/xk9XQmFBO9/dl27w9EB0QGztti/16JV9NgxyDQCJIdGwlD08s1y/lUwOKk0TkSZJs+CTYDw==
+"@budibase/backend-core@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.13.tgz#b797d7a4d30ff7f21e473334edb4086f5818830e"
+  integrity sha512-c6d0xCRgLlPeX1euAoQuoDOkMkDGQy/miBx/Z8xyU9bzDDTNqBTogxpxsNf8DdZG7EMJhsJlCUvb26Onz7/50A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.12"
+    "@budibase/types" "2.3.18-alpha.13"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.12.tgz#be552b3a9f5850e746081540d6586aae69147bec"
-  integrity sha512-M3b0njzSi47KH6uaQfYPoA2KWrjPiwcU3ONyaVWXHIktVrIKtYaFwOLBr/dmWGfMrL2297SSqg7V4DTaLyAhnw==
+"@budibase/pro@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.13.tgz#9f3dd0339184a58609c726f3f2b4580cf802dc78"
+  integrity sha512-pRroVVFGITFsFtzzH6LgzuaUBKldvFQxTgO7K6dYjjE7xwTCnZCg0E4L2Ew/JIY39UN2WEb5bwdt3+pqPH7Dmg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.12"
-    "@budibase/types" "2.3.18-alpha.12"
+    "@budibase/backend-core" "2.3.18-alpha.13"
+    "@budibase/types" "2.3.18-alpha.13"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.12":
-  version "2.3.18-alpha.12"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.12.tgz#a63eb978ccc7e55c209b3e9d71f9aecf7facc0d1"
-  integrity sha512-27o2BmI/HXIR3frZ8FtqHgAe1hd8jPIzgPaEhKrQiYJ/opUVccqupx9ld75Hyk9E6cdXu0UF0/+LxPpUmMugag==
+"@budibase/types@2.3.18-alpha.13":
+  version "2.3.18-alpha.13"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.13.tgz#e80cbf79249ed5cf8fe86e294d0b1e25e0a839ee"
+  integrity sha512-fmgpwMMGkbPOObmFnZZH8iKelycmhvBydGQuPEmIk1c449ysfiKF2Strnca6MaY1XtskfRz/nNdWGdGS1HhmFw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From fefc6d920f6605018c3c0b0fdd5e78236b91a3a1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 14:41:28 +0000
Subject: [PATCH 174/273] Fixing open handle issue - now that the worker has
 access to queues needs to shut them down.

---
 packages/backend-core/src/queue/queue.ts      |   4 +-
 .../api/routes/global/tests/auditLogs.spec.ts | 222 +++++++++---------
 packages/worker/src/index.ts                  |   5 +-
 3 files changed, 117 insertions(+), 114 deletions(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 8e1fc1fbf3..c57ebafb1f 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -40,8 +40,10 @@ export function createQueue<T>(
 }
 
 export async function shutdown() {
-  if (QUEUES.length) {
+  if (cleanupInterval) {
     clearInterval(cleanupInterval)
+  }
+  if (QUEUES.length) {
     for (let queue of QUEUES) {
       await queue.close()
     }
diff --git a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
index 0b9bf367cc..19e3cd64b4 100644
--- a/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
@@ -1,111 +1,111 @@
-// import { mocks, structures } from "@budibase/backend-core/tests"
-// import { context, events } from "@budibase/backend-core"
-// import { Event, IdentityType } from "@budibase/types"
-// import { TestConfiguration } from "../../../../tests"
-//
-// mocks.licenses.useAuditLogs()
-//
-// const BASE_IDENTITY = {
-//   account: undefined,
-//   type: IdentityType.USER,
-// }
-// const USER_AUDIT_LOG_COUNT = 3
-// const APP_ID = "app_1"
-//
-// describe("/api/global/auditlogs", () => {
-//   const config = new TestConfiguration()
-//
-//   beforeAll(async () => {
-//     await config.beforeAll()
-//   })
-//
-//   afterAll(async () => {
-//     await config.afterAll()
-//   })
-//
-//   describe("POST /api/global/auditlogs/search", () => {
-//     it("should be able to fire some events (create audit logs)", async () => {
-//       await context.doInTenant(config.tenantId, async () => {
-//         const userId = config.user!._id!
-//         const identity = {
-//           ...BASE_IDENTITY,
-//           _id: userId,
-//           tenantId: config.tenantId,
-//         }
-//         await context.doInIdentityContext(identity, async () => {
-//           for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
-//             await events.user.created(structures.users.user())
-//           }
-//           await context.doInAppContext(APP_ID, async () => {
-//             await events.app.created(structures.apps.app(APP_ID))
-//           })
-//           // fetch the user created events
-//           const response = await config.api.auditLogs.search({
-//             events: [Event.USER_CREATED],
-//           })
-//           expect(response.data).toBeDefined()
-//           // there will be an initial event which comes from the default user creation
-//           expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
-//         })
-//       })
-//     })
-//
-//     it("should be able to search by event", async () => {
-//       const response = await config.api.auditLogs.search({
-//         events: [Event.USER_CREATED],
-//       })
-//       expect(response.data.length).toBeGreaterThan(0)
-//       for (let log of response.data) {
-//         expect(log.event).toBe(Event.USER_CREATED)
-//       }
-//     })
-//
-//     it("should be able to search by time range (frozen)", async () => {
-//       // this is frozen, only need to add 1 and minus 1
-//       const now = new Date()
-//       const start = new Date()
-//       start.setSeconds(now.getSeconds() - 1)
-//       const end = new Date()
-//       end.setSeconds(now.getSeconds() + 1)
-//       const response = await config.api.auditLogs.search({
-//         startDate: start.toISOString(),
-//         endDate: end.toISOString(),
-//       })
-//       expect(response.data.length).toBeGreaterThan(0)
-//       for (let log of response.data) {
-//         expect(log.timestamp).toBe(now.toISOString())
-//       }
-//     })
-//
-//     it("should be able to search by user ID", async () => {
-//       const userId = config.user!._id!
-//       const response = await config.api.auditLogs.search({
-//         userIds: [userId],
-//       })
-//       expect(response.data.length).toBeGreaterThan(0)
-//       for (let log of response.data) {
-//         expect(log.user._id).toBe(userId)
-//       }
-//     })
-//
-//     it("should be able to search by app ID", async () => {
-//       const response = await config.api.auditLogs.search({
-//         appIds: [APP_ID],
-//       })
-//       expect(response.data.length).toBeGreaterThan(0)
-//       for (let log of response.data) {
-//         expect(log.app?._id).toBe(APP_ID)
-//       }
-//     })
-//
-//     it("should be able to search by full string", async () => {
-//       const response = await config.api.auditLogs.search({
-//         fullSearch: "User",
-//       })
-//       expect(response.data.length).toBeGreaterThan(0)
-//       for (let log of response.data) {
-//         expect(log.name.includes("User")).toBe(true)
-//       }
-//     })
-//   })
-// })
+import { mocks, structures } from "@budibase/backend-core/tests"
+import { context, events } from "@budibase/backend-core"
+import { Event, IdentityType } from "@budibase/types"
+import { TestConfiguration } from "../../../../tests"
+
+mocks.licenses.useAuditLogs()
+
+const BASE_IDENTITY = {
+  account: undefined,
+  type: IdentityType.USER,
+}
+const USER_AUDIT_LOG_COUNT = 3
+const APP_ID = "app_1"
+
+describe("/api/global/auditlogs", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.beforeAll()
+  })
+
+  afterAll(async () => {
+    await config.afterAll()
+  })
+
+  describe("POST /api/global/auditlogs/search", () => {
+    it("should be able to fire some events (create audit logs)", async () => {
+      await context.doInTenant(config.tenantId, async () => {
+        const userId = config.user!._id!
+        const identity = {
+          ...BASE_IDENTITY,
+          _id: userId,
+          tenantId: config.tenantId,
+        }
+        await context.doInIdentityContext(identity, async () => {
+          for (let i = 0; i < USER_AUDIT_LOG_COUNT; i++) {
+            await events.user.created(structures.users.user())
+          }
+          await context.doInAppContext(APP_ID, async () => {
+            await events.app.created(structures.apps.app(APP_ID))
+          })
+          // fetch the user created events
+          const response = await config.api.auditLogs.search({
+            events: [Event.USER_CREATED],
+          })
+          expect(response.data).toBeDefined()
+          // there will be an initial event which comes from the default user creation
+          expect(response.data.length).toBe(USER_AUDIT_LOG_COUNT + 1)
+        })
+      })
+    })
+
+    it("should be able to search by event", async () => {
+      const response = await config.api.auditLogs.search({
+        events: [Event.USER_CREATED],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.event).toBe(Event.USER_CREATED)
+      }
+    })
+
+    it("should be able to search by time range (frozen)", async () => {
+      // this is frozen, only need to add 1 and minus 1
+      const now = new Date()
+      const start = new Date()
+      start.setSeconds(now.getSeconds() - 1)
+      const end = new Date()
+      end.setSeconds(now.getSeconds() + 1)
+      const response = await config.api.auditLogs.search({
+        startDate: start.toISOString(),
+        endDate: end.toISOString(),
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.timestamp).toBe(now.toISOString())
+      }
+    })
+
+    it("should be able to search by user ID", async () => {
+      const userId = config.user!._id!
+      const response = await config.api.auditLogs.search({
+        userIds: [userId],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.user._id).toBe(userId)
+      }
+    })
+
+    it("should be able to search by app ID", async () => {
+      const response = await config.api.auditLogs.search({
+        appIds: [APP_ID],
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.app?._id).toBe(APP_ID)
+      }
+    })
+
+    it("should be able to search by full string", async () => {
+      const response = await config.api.auditLogs.search({
+        fullSearch: "User",
+      })
+      expect(response.data.length).toBeGreaterThan(0)
+      for (let log of response.data) {
+        expect(log.name.includes("User")).toBe(true)
+      }
+    })
+  })
+})
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index ac28ead30a..ec6a44cc3a 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -13,8 +13,8 @@ import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
-import { auth, logging, events, middleware } from "@budibase/backend-core"
-import { sdk as proSdk, sdk } from "@budibase/pro"
+import { auth, logging, events, middleware, queue } from "@budibase/backend-core"
+import { sdk as proSdk } from "@budibase/pro"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -86,6 +86,7 @@ server.on("close", async () => {
   console.log("Server Closed")
   await redis.shutdown()
   await events.shutdown()
+  await queue.shutdown()
   if (!env.isTest()) {
     process.exit(errCode)
   }

From cb3d0c39bd2e8dd876ca49857d192207641e0cc7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 27 Feb 2023 15:03:25 +0000
Subject: [PATCH 175/273] null date string was breaking download for certain
 ranges

---
 .../src/pages/builder/portal/account/auditLogs/index.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 05ed511c22..739877db26 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -298,13 +298,13 @@
         on:change={e => {
           if (e.detail[0]?.length === 1) {
             startDate = e.detail[0][0].toISOString()
-            endDate = null
+            endDate = ""
           } else if (e.detail[0]?.length > 1) {
             startDate = e.detail[0][0].toISOString()
             endDate = e.detail[0][1].toISOString()
           } else {
-            startDate = null
-            endDate = null
+            startDate = ""
+            endDate = ""
           }
         }}
       />

From 60a4d46fd3e6b2387af98ba6f99f19fbfac85efb Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 15:55:46 +0000
Subject: [PATCH 176/273] Break out pro tests into their own ci job

---
 .github/workflows/budibase_ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index f196b70db4..c64adb010f 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -64,6 +64,20 @@ jobs:
           name: codecov-umbrella
           verbose: true
 
+  test-pro:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - name: Install Pro
+        run: yarn install:pro $BRANCH $BASE_BRANCH
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn test:pro
+
   integration-test:
     runs-on: ubuntu-latest
     services:

From 895938a53b7f2653548665fbb0b25c64bc068c02 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Mon, 27 Feb 2023 15:56:27 +0000
Subject: [PATCH 177/273] Remove test:pro from main test command

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3ead7d5553..3958917380 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
     "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
     "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
-    "test": "lerna run test && yarn test:pro",
+    "test": "lerna run test",
     "test:pro": "bash scripts/pro/test.sh",
     "lint:eslint": "eslint packages && eslint qa-core",
     "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",

From abe06a127ad3c7fff5bd77775e4a576aa4e9bdf4 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Feb 2023 17:25:26 +0100
Subject: [PATCH 178/273] Types

---
 .../server/src/integrations/googlesheets.ts    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index 587616adfc..30633c9203 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -13,7 +13,7 @@ import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
 import env from "../environment"
 import { tenancy, db as dbCore, constants } from "@budibase/backend-core"
-const fetch = require("node-fetch")
+import fetch from "node-fetch"
 
 interface GoogleSheetsConfig {
   spreadsheetId: string
@@ -112,7 +112,7 @@ const SCHEMA: Integration = {
 
 class GoogleSheetsIntegration implements DatasourcePlus {
   private readonly config: GoogleSheetsConfig
-  private client: any
+  private client: GoogleSpreadsheet
   public tables: Record<string, Table> = {}
   public schemaErrors: Record<string, string> = {}
 
@@ -211,7 +211,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
 
   async buildSchema(datasourceId: string) {
     await this.connect()
-    const sheets = await this.client.sheetsByIndex
+    const sheets = this.client.sheetsByIndex
     const tables: Record<string, Table> = {}
     for (let sheet of sheets) {
       // must fetch rows to determine schema
@@ -294,7 +294,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async updateTable(table?: any) {
     try {
       await this.connect()
-      const sheet = await this.client.sheetsByTitle[table.name]
+      const sheet = this.client.sheetsByTitle[table.name]
       await sheet.loadHeaderRow()
 
       if (table._rename) {
@@ -329,7 +329,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async deleteTable(sheet: any) {
     try {
       await this.connect()
-      const sheetToDelete = await this.client.sheetsByTitle[sheet]
+      const sheetToDelete = this.client.sheetsByTitle[sheet]
       return await sheetToDelete.delete()
     } catch (err) {
       console.error("Error deleting table in google sheets", err)
@@ -340,7 +340,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async create(query: { sheet: string; row: any }) {
     try {
       await this.connect()
-      const sheet = await this.client.sheetsByTitle[query.sheet]
+      const sheet = this.client.sheetsByTitle[query.sheet]
       const rowToInsert =
         typeof query.row === "string" ? JSON.parse(query.row) : query.row
       const row = await sheet.addRow(rowToInsert)
@@ -356,7 +356,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async read(query: { sheet: string }) {
     try {
       await this.connect()
-      const sheet = await this.client.sheetsByTitle[query.sheet]
+      const sheet = this.client.sheetsByTitle[query.sheet]
       const rows = await sheet.getRows()
       const headerValues = sheet.headerValues
       const response = []
@@ -375,7 +375,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async update(query: { sheet: string; rowIndex: number; row: any }) {
     try {
       await this.connect()
-      const sheet = await this.client.sheetsByTitle[query.sheet]
+      const sheet = this.client.sheetsByTitle[query.sheet]
       const rows = await sheet.getRows()
       const row = rows[query.rowIndex]
       if (row) {
@@ -399,7 +399,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
 
   async delete(query: { sheet: string; rowIndex: number }) {
     await this.connect()
-    const sheet = await this.client.sheetsByTitle[query.sheet]
+    const sheet = this.client.sheetsByTitle[query.sheet]
     const rows = await sheet.getRows()
     const row = rows[query.rowIndex]
     if (row) {

From f85ea527bd6e23915b7b4458eabed6ed485ba7a7 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Feb 2023 17:25:48 +0100
Subject: [PATCH 179/273] Add tests for adding/removing columns in a google
 spreadsheet

---
 packages/server/__mocks__/node-fetch.ts       |   3 +
 .../integrations/tests/googlesheets.spec.ts   | 119 ++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 packages/server/src/integrations/tests/googlesheets.spec.ts

diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index 78071dc8af..fdf44d173d 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -172,6 +172,9 @@ module FetchMock {
         ),
         ok: true,
       })
+    } else if (url === "https://www.googleapis.com/oauth2/v4/token") {
+      // any valid response
+      return json({})
     } else if (url.includes("failonce.com")) {
       failCount++
       if (failCount === 1) {
diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
new file mode 100644
index 0000000000..186388740a
--- /dev/null
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -0,0 +1,119 @@
+import type { GoogleSpreadsheetWorksheet } from "google-spreadsheet"
+
+jest.mock("google-auth-library")
+const { OAuth2Client } = require("google-auth-library")
+
+const setCredentialsMock = jest.fn()
+const getAccessTokenMock = jest.fn()
+
+OAuth2Client.mockImplementation(() => {
+  return {
+    setCredentials: setCredentialsMock,
+    getAccessToken: getAccessTokenMock,
+  }
+})
+
+jest.mock("google-spreadsheet")
+const { GoogleSpreadsheet } = require("google-spreadsheet")
+
+const sheetsByTitle: { [title: string]: GoogleSpreadsheetWorksheet } = {}
+
+GoogleSpreadsheet.mockImplementation(() => {
+  return {
+    useOAuth2Client: jest.fn(),
+    loadInfo: jest.fn(),
+    sheetsByTitle,
+  }
+})
+
+import { structures } from "@budibase/backend-core/tests"
+import TestConfiguration from "../../tests/utilities/TestConfiguration"
+import GoogleSheetsIntegration from "../googlesheets"
+import { FieldType, Table, TableSchema } from "../../../../types/src/documents"
+
+describe("Google Sheets Integration", () => {
+  let integration: any,
+    config = new TestConfiguration()
+
+  beforeEach(async () => {
+    integration = new GoogleSheetsIntegration.integration({
+      spreadsheetId: "randomId",
+      auth: {
+        appId: "appId",
+        accessToken: "accessToken",
+        refreshToken: "refreshToken",
+      },
+    })
+    await config.init()
+  })
+
+  function createBasicTable(name: string, columns: string[]): Table {
+    return {
+      name,
+      schema: {
+        ...columns.reduce((p, c) => {
+          p[c] = {
+            name: c,
+            type: FieldType.STRING,
+            constraints: {
+              type: "string",
+            },
+          }
+          return p
+        }, {} as TableSchema),
+      },
+    }
+  }
+
+  function createSheet({
+    headerValues,
+  }: {
+    headerValues: string[]
+  }): GoogleSpreadsheetWorksheet {
+    return {
+      // to ignore the unmapped fields
+      ...({} as any),
+      loadHeaderRow: jest.fn(),
+      headerValues,
+      setHeaderRow: jest.fn(),
+    }
+  }
+
+  describe("update table", () => {
+    test("adding a new field will be adding a new header row", async () => {
+      await config.doInContext(structures.uuid(), async () => {
+        const tableColumns = ["name", "description", "new field"]
+        const table = createBasicTable(structures.uuid(), tableColumns)
+
+        const sheet = createSheet({ headerValues: ["name", "description"] })
+        sheetsByTitle[table.name] = sheet
+        await integration.updateTable(table)
+
+        expect(sheet.loadHeaderRow).toBeCalledTimes(1)
+        expect(sheet.setHeaderRow).toBeCalledTimes(1)
+        expect(sheet.setHeaderRow).toBeCalledWith(tableColumns)
+      })
+    })
+
+    test("removing an existing field will not remove the data from the spreadsheet", async () => {
+      await config.doInContext(structures.uuid(), async () => {
+        const tableColumns = ["name"]
+        const table = createBasicTable(structures.uuid(), tableColumns)
+
+        const sheet = createSheet({
+          headerValues: ["name", "description", "location"],
+        })
+        sheetsByTitle[table.name] = sheet
+        await integration.updateTable(table)
+
+        expect(sheet.loadHeaderRow).toBeCalledTimes(1)
+        expect(sheet.setHeaderRow).toBeCalledTimes(1)
+        expect(sheet.setHeaderRow).toBeCalledWith([
+          "name",
+          "description",
+          "location",
+        ])
+      })
+    })
+  })
+})

From 0338a211970b3397ac207f46f743b5cd46e84ea1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 27 Feb 2023 16:27:18 +0000
Subject: [PATCH 180/273] v2.3.18-alpha.14

---
 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 0e1e6a8711..39a4de05fa 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1243f58abe..658641bb1b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.13",
+    "@budibase/types": "2.3.18-alpha.14",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ca63265dda..ebf2790cb5 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.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "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.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.14",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1d75b3874d..d5fc757ca3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.13",
-    "@budibase/client": "2.3.18-alpha.13",
-    "@budibase/frontend-core": "2.3.18-alpha.13",
-    "@budibase/string-templates": "2.3.18-alpha.13",
+    "@budibase/bbui": "2.3.18-alpha.14",
+    "@budibase/client": "2.3.18-alpha.14",
+    "@budibase/frontend-core": "2.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.14",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 157219ea7a..e3afdf555c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "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.3.18-alpha.13",
-    "@budibase/string-templates": "2.3.18-alpha.13",
-    "@budibase/types": "2.3.18-alpha.13",
+    "@budibase/backend-core": "2.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.14",
+    "@budibase/types": "2.3.18-alpha.14",
     "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 b5926feaae..6d46da138c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "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.3.18-alpha.13",
-    "@budibase/frontend-core": "2.3.18-alpha.13",
-    "@budibase/string-templates": "2.3.18-alpha.13",
+    "@budibase/bbui": "2.3.18-alpha.14",
+    "@budibase/frontend-core": "2.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.14",
     "@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 c29e9cc785..938dca82aa 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.13",
+    "@budibase/bbui": "2.3.18-alpha.14",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b1f68d3b27..051af9233e 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index a04687cdbe..8d328127c1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.13",
-    "@budibase/client": "2.3.18-alpha.13",
+    "@budibase/backend-core": "2.3.18-alpha.14",
+    "@budibase/client": "2.3.18-alpha.14",
     "@budibase/pro": "2.3.18-alpha.13",
-    "@budibase/string-templates": "2.3.18-alpha.13",
-    "@budibase/types": "2.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.14",
+    "@budibase/types": "2.3.18-alpha.14",
     "@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 41ea0cf30d..a8c2e0ccc2 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "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 ae19e2eb5d..eac644ab11 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "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 c8783175ec..a0fc422231 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.13",
+  "version": "2.3.18-alpha.14",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.13",
+    "@budibase/backend-core": "2.3.18-alpha.14",
     "@budibase/pro": "2.3.18-alpha.13",
-    "@budibase/string-templates": "2.3.18-alpha.13",
-    "@budibase/types": "2.3.18-alpha.13",
+    "@budibase/string-templates": "2.3.18-alpha.14",
+    "@budibase/types": "2.3.18-alpha.14",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0810ae8ef000112274a0396dd6a521bc3376a6c6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 27 Feb 2023 16:30:38 +0000
Subject: [PATCH 181/273] Update pro version to 2.3.18-alpha.14

---
 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 8d328127c1..5c970de929 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.14",
     "@budibase/client": "2.3.18-alpha.14",
-    "@budibase/pro": "2.3.18-alpha.13",
+    "@budibase/pro": "2.3.18-alpha.14",
     "@budibase/string-templates": "2.3.18-alpha.14",
     "@budibase/types": "2.3.18-alpha.14",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index fed1fcbaa3..e4ad525977 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.13.tgz#b797d7a4d30ff7f21e473334edb4086f5818830e"
-  integrity sha512-c6d0xCRgLlPeX1euAoQuoDOkMkDGQy/miBx/Z8xyU9bzDDTNqBTogxpxsNf8DdZG7EMJhsJlCUvb26Onz7/50A==
+"@budibase/backend-core@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.14.tgz#84c10d5840a61437c77c62cb27aa52a48ebea34c"
+  integrity sha512-8MlNAJNFhct4CwN49wu7EBZJQyToSnUlhZeBlvv94AQxKF6iTzTq40CoNIMCv69nzbeTbDw/ImG7dPW8kBHjpg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.13"
+    "@budibase/types" "2.3.18-alpha.14"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,13 +1392,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.13.tgz#9f3dd0339184a58609c726f3f2b4580cf802dc78"
-  integrity sha512-pRroVVFGITFsFtzzH6LgzuaUBKldvFQxTgO7K6dYjjE7xwTCnZCg0E4L2Ew/JIY39UN2WEb5bwdt3+pqPH7Dmg==
+"@budibase/pro@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.14.tgz#037045c7c315c23d2981abdcd35fb18bc1a4727d"
+  integrity sha512-15OFi/Kycp8lYTP424fMoF1l+l3M/0pcDOHpkn0sHix4KhQz2mnqE2iu3k1FR/w9tpPEGHwdd4++BHiDw6h1ZQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.13"
-    "@budibase/types" "2.3.18-alpha.13"
+    "@budibase/backend-core" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.14"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1424,10 +1424,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.13.tgz#e80cbf79249ed5cf8fe86e294d0b1e25e0a839ee"
-  integrity sha512-fmgpwMMGkbPOObmFnZZH8iKelycmhvBydGQuPEmIk1c449ysfiKF2Strnca6MaY1XtskfRz/nNdWGdGS1HhmFw==
+"@budibase/types@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.14.tgz#3fa32f0b262169c4c8679f38f5e0e321f43f54dc"
+  integrity sha512-mkp0GAqB7zAeLSNV8//dBjSH9dP9z8Q/Sxv29zlExKAxBHlUcYIB442QZJ8Z2V8Tzb+DlRIK7SLTG622cfyUgg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a0fc422231..1f5d4fb36a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.14",
-    "@budibase/pro": "2.3.18-alpha.13",
+    "@budibase/pro": "2.3.18-alpha.14",
     "@budibase/string-templates": "2.3.18-alpha.14",
     "@budibase/types": "2.3.18-alpha.14",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e51dba9bc8..4abc720cf1 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.13.tgz#b797d7a4d30ff7f21e473334edb4086f5818830e"
-  integrity sha512-c6d0xCRgLlPeX1euAoQuoDOkMkDGQy/miBx/Z8xyU9bzDDTNqBTogxpxsNf8DdZG7EMJhsJlCUvb26Onz7/50A==
+"@budibase/backend-core@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.14.tgz#84c10d5840a61437c77c62cb27aa52a48ebea34c"
+  integrity sha512-8MlNAJNFhct4CwN49wu7EBZJQyToSnUlhZeBlvv94AQxKF6iTzTq40CoNIMCv69nzbeTbDw/ImG7dPW8kBHjpg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.13"
+    "@budibase/types" "2.3.18-alpha.14"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,13 +539,13 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.13.tgz#9f3dd0339184a58609c726f3f2b4580cf802dc78"
-  integrity sha512-pRroVVFGITFsFtzzH6LgzuaUBKldvFQxTgO7K6dYjjE7xwTCnZCg0E4L2Ew/JIY39UN2WEb5bwdt3+pqPH7Dmg==
+"@budibase/pro@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.14.tgz#037045c7c315c23d2981abdcd35fb18bc1a4727d"
+  integrity sha512-15OFi/Kycp8lYTP424fMoF1l+l3M/0pcDOHpkn0sHix4KhQz2mnqE2iu3k1FR/w9tpPEGHwdd4++BHiDw6h1ZQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.13"
-    "@budibase/types" "2.3.18-alpha.13"
+    "@budibase/backend-core" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.14"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -553,10 +553,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.13":
-  version "2.3.18-alpha.13"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.13.tgz#e80cbf79249ed5cf8fe86e294d0b1e25e0a839ee"
-  integrity sha512-fmgpwMMGkbPOObmFnZZH8iKelycmhvBydGQuPEmIk1c449ysfiKF2Strnca6MaY1XtskfRz/nNdWGdGS1HhmFw==
+"@budibase/types@2.3.18-alpha.14":
+  version "2.3.18-alpha.14"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.14.tgz#3fa32f0b262169c4c8679f38f5e0e321f43f54dc"
+  integrity sha512-mkp0GAqB7zAeLSNV8//dBjSH9dP9z8Q/Sxv29zlExKAxBHlUcYIB442QZJ8Z2V8Tzb+DlRIK7SLTG622cfyUgg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From f017f0d54e35035559e8d7adb8897eb5ff18f670 Mon Sep 17 00:00:00 2001
From: adrinr <adria@budibase.com>
Date: Mon, 27 Feb 2023 17:41:42 +0100
Subject: [PATCH 182/273] Catch issue on test

---
 packages/server/src/integrations/tests/googlesheets.spec.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index 186388740a..1e28be33c6 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -113,6 +113,9 @@ describe("Google Sheets Integration", () => {
           "description",
           "location",
         ])
+
+        // No undefineds are sent
+        expect((sheet.setHeaderRow as any).mock.calls[0][0]).toHaveLength(3)
       })
     })
   })

From e2ee573747260ce06a854ff7965bbb2980eef8b8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 17:07:52 +0000
Subject: [PATCH 183/273] Trying to measure coverage from backend-core from
 server/worker.

---
 packages/server/jest.config.ts | 1 +
 packages/worker/jest.config.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index 331912aa19..f247e90bd1 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -39,6 +39,7 @@ const config: Config.InitialOptions = {
   ],
   collectCoverageFrom: [
     "src/**/*.{js,ts}",
+    "../backend-core/src/**/*.{js,ts}",
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
   ],
diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts
index cdacfa411a..3655479d82 100644
--- a/packages/worker/jest.config.ts
+++ b/packages/worker/jest.config.ts
@@ -7,7 +7,7 @@ const config: Config.InitialOptions = {
   preset: "@trendyol/jest-testcontainers",
   setupFiles: ["./src/tests/jestEnv.ts"],
   setupFilesAfterEnv: ["./src/tests/jestSetup.ts"],
-  collectCoverageFrom: ["src/**/*.{js,ts}"],
+  collectCoverageFrom: ["src/**/*.{js,ts}", "../backend-core/src/**/*.{js,ts}"],
   coverageReporters: ["lcov", "json", "clover"],
   transform: {
     "^.+\\.ts?$": "@swc/jest",

From c3a3fa1176a0a89f4d2c1ca23b7127f03e118cee Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 21:18:06 +0000
Subject: [PATCH 184/273] Adding a lucene test case.

---
 .../backend-core/src/db/tests/lucene.spec.ts  | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 packages/backend-core/src/db/tests/lucene.spec.ts

diff --git a/packages/backend-core/src/db/tests/lucene.spec.ts b/packages/backend-core/src/db/tests/lucene.spec.ts
new file mode 100644
index 0000000000..de469ae9e4
--- /dev/null
+++ b/packages/backend-core/src/db/tests/lucene.spec.ts
@@ -0,0 +1,140 @@
+import { newid } from "../../newid"
+import { getDB } from "../db"
+import { Database } from "@budibase/types"
+import { QueryBuilder } from "../lucene"
+
+const INDEX_NAME = "main"
+
+const index = `function(doc) {
+  let props = ["property", "number"]
+  for (let key of props) {
+    if (doc[key]) {
+      index(key, doc[key])
+    }
+  }
+}`
+
+describe("lucene", () => {
+  let db: Database, dbName: string
+
+  beforeAll(async () => {
+    dbName = `db-${newid()}`
+    // create the DB for testing
+    db = getDB(dbName)
+    await db.put({ _id: newid(), property: "word" })
+    await db.put({ _id: newid(), property: "word2" })
+    await db.put({ _id: newid(), property: "word3", number: 1 })
+  })
+
+  it("should be able to create a lucene index", async () => {
+    const response = await db.put({
+      _id: "_design/database",
+      indexes: {
+        [INDEX_NAME]: {
+          index: index,
+          analyzer: "standard",
+        },
+      },
+    })
+    expect(response.ok).toBe(true)
+  })
+
+  it("should be able to perform a basic query", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME)
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(3)
+  })
+
+  it("should be able to perform a string search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      string: {
+        property: "wo",
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(3)
+  })
+
+  it("should be able to perform a range search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      range: {
+        number: {
+          low: 0,
+          high: 1,
+        },
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(1)
+  })
+
+  it("should be able to perform an equal search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      equal: {
+        property: "word2",
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(1)
+  })
+
+  it("should be able to perform a not equal search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      notEqual: {
+        property: "word2",
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(2)
+  })
+
+  it("should be able to perform an empty search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      empty: {
+        number: true,
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(2)
+  })
+
+  it("should be able to perform a not empty search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      notEmpty: {
+        number: true,
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(1)
+  })
+
+  it("should be able to perform a one of search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      oneOf: {
+        property: ["word", "word2"],
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(2)
+  })
+
+  it("should be able to perform a contains search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      contains: {
+        property: ["word"],
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(1)
+  })
+
+  it("should be able to perform a not contains search", async () => {
+    const builder = new QueryBuilder(dbName, INDEX_NAME, {
+      notContains: {
+        property: ["word2"],
+      },
+    })
+    const resp = await builder.run()
+    expect(resp.rows.length).toBe(2)
+  })
+})

From 6fac00b3deacf7582e595e26229dbb81e12aadb4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 21:19:07 +0000
Subject: [PATCH 185/273] Attempting to fix issues where wrong port is picked
 for test containers, occurred a lot locally.

---
 hosting/docker-compose.test.yaml              | 14 ++---
 .../tests/utilities/testContainerUtils.ts     | 55 +++++++++++++++++--
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/hosting/docker-compose.test.yaml b/hosting/docker-compose.test.yaml
index dfd78621c5..f059173d2d 100644
--- a/hosting/docker-compose.test.yaml
+++ b/hosting/docker-compose.test.yaml
@@ -8,8 +8,8 @@ services:
     # Last version that supports the "fs" backend
     image: minio/minio:RELEASE.2022-10-24T18-35-07Z
     ports:
-      - 9000
-      - 9001
+      - "9000"
+      - "9001"
     environment:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
@@ -28,9 +28,9 @@ services:
       - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
       - COUCHDB_USER=${COUCH_DB_USER}
     ports:
-      - 5984
-      - 4369
-      - 9100
+      - "5984"
+      - "4369"
+      - "9100"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5984/_up"]
       interval: 30s
@@ -42,6 +42,6 @@ services:
     image: redis
     command: redis-server --requirepass ${REDIS_PASSWORD}
     ports:
-      - 6379
+      - "6379"
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: ["CMD", "redis-cli", "ping"]
\ No newline at end of file
diff --git a/packages/backend-core/tests/utilities/testContainerUtils.ts b/packages/backend-core/tests/utilities/testContainerUtils.ts
index 11c5fca806..f6c702f7ef 100644
--- a/packages/backend-core/tests/utilities/testContainerUtils.ts
+++ b/packages/backend-core/tests/utilities/testContainerUtils.ts
@@ -1,3 +1,31 @@
+import { execSync } from "child_process"
+
+let dockerPsResult: string | undefined
+
+function formatDockerPsResult(serverName: string, port: number) {
+  const lines = dockerPsResult?.split("\n")
+  let first = true
+  if (!lines) {
+    return null
+  }
+  for (let line of lines) {
+    if (first) {
+      first = false
+      continue
+    }
+    let toLookFor = serverName.split("-service")[0]
+    if (!line.includes(toLookFor)) {
+      continue
+    }
+    const regex = new RegExp(`0.0.0.0:([0-9]*)->${port}`, "g")
+    const found = line.match(regex)
+    if (found) {
+      return found[0].split(":")[1].split("->")[0]
+    }
+  }
+  return null
+}
+
 function getTestContainerSettings(
   serverName: string,
   key: string
@@ -14,10 +42,22 @@ function getTestContainerSettings(
 }
 
 function getContainerInfo(containerName: string, port: number) {
-  const assignedPort = getTestContainerSettings(
+  let assignedPort = getTestContainerSettings(
     containerName.toUpperCase(),
     `PORT_${port}`
   )
+  if (!dockerPsResult) {
+    try {
+      const outputBuffer = execSync("docker ps")
+      dockerPsResult = outputBuffer.toString("utf8")
+    } catch (err) {
+      //no-op
+    }
+  }
+  const possiblePort = formatDockerPsResult(containerName, port)
+  if (possiblePort) {
+    assignedPort = possiblePort
+  }
   const host = getTestContainerSettings(containerName.toUpperCase(), "IP")
   return {
     port: assignedPort,
@@ -39,12 +79,15 @@ function getRedisConfig() {
 }
 
 export function setupEnv(...envs: any[]) {
+  const couch = getCouchConfig(),
+    minio = getCouchConfig(),
+    redis = getRedisConfig()
   const configs = [
-    { key: "COUCH_DB_PORT", value: getCouchConfig().port },
-    { key: "COUCH_DB_URL", value: getCouchConfig().url },
-    { key: "MINIO_PORT", value: getMinioConfig().port },
-    { key: "MINIO_URL", value: getMinioConfig().url },
-    { key: "REDIS_URL", value: getRedisConfig().url },
+    { key: "COUCH_DB_PORT", value: couch.port },
+    { key: "COUCH_DB_URL", value: couch.url },
+    { key: "MINIO_PORT", value: minio.port },
+    { key: "MINIO_URL", value: minio.url },
+    { key: "REDIS_URL", value: redis.url },
   ]
 
   for (const config of configs.filter(x => !!x.value)) {

From b47101e1fb725a3d7850f9ea1041277d61ad896a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 27 Feb 2023 21:48:05 +0000
Subject: [PATCH 186/273] Updating lucene test case to improve coverage.

---
 .../backend-core/src/db/tests/lucene.spec.ts  | 201 ++++++++++--------
 1 file changed, 111 insertions(+), 90 deletions(-)

diff --git a/packages/backend-core/src/db/tests/lucene.spec.ts b/packages/backend-core/src/db/tests/lucene.spec.ts
index de469ae9e4..23b01e18df 100644
--- a/packages/backend-core/src/db/tests/lucene.spec.ts
+++ b/packages/backend-core/src/db/tests/lucene.spec.ts
@@ -1,7 +1,7 @@
 import { newid } from "../../newid"
 import { getDB } from "../db"
 import { Database } from "@budibase/types"
-import { QueryBuilder } from "../lucene"
+import { QueryBuilder, paginatedSearch, fullSearch } from "../lucene"
 
 const INDEX_NAME = "main"
 
@@ -39,102 +39,123 @@ describe("lucene", () => {
     expect(response.ok).toBe(true)
   })
 
-  it("should be able to perform a basic query", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME)
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(3)
-  })
-
-  it("should be able to perform a string search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      string: {
-        property: "wo",
-      },
+  describe("query builder", () => {
+    it("should be able to perform a basic query", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.setSort("property")
+      builder.setSortOrder("desc")
+      builder.setSortType("string")
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(3)
+    })
+
+    it("should handle limits", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.setLimit(1)
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(1)
+    })
+
+    it("should be able to perform a string search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addString("property", "wo")
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(3)
+    })
+
+    it("should be able to perform a range search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addRange("number", 0, 1)
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(1)
+    })
+
+    it("should be able to perform an equal search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addEqual("property", "word2")
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(1)
+    })
+
+    it("should be able to perform a not equal search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addNotEqual("property", "word2")
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(2)
+    })
+
+    it("should be able to perform an empty search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addEmpty("number", true)
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(2)
+    })
+
+    it("should be able to perform a not empty search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addNotEmpty("number", true)
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(1)
+    })
+
+    it("should be able to perform a one of search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addOneOf("property", ["word", "word2"])
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(2)
+    })
+
+    it("should be able to perform a contains search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addContains("property", ["word"])
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(1)
+    })
+
+    it("should be able to perform a not contains search", async () => {
+      const builder = new QueryBuilder(dbName, INDEX_NAME)
+      builder.addNotContains("property", ["word2"])
+      const resp = await builder.run()
+      expect(resp.rows.length).toBe(2)
     })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(3)
   })
 
-  it("should be able to perform a range search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      range: {
-        number: {
-          low: 0,
-          high: 1,
+  describe("paginated search", () => {
+    it("should be able to perform a paginated search", async () => {
+      const page = await paginatedSearch(
+        dbName,
+        INDEX_NAME,
+        {
+          string: {
+            property: "wo",
+          },
         },
-      },
+        {
+          limit: 1,
+          sort: "property",
+          sortType: "string",
+          sortOrder: "desc",
+        }
+      )
+      expect(page.rows.length).toBe(1)
+      expect(page.hasNextPage).toBe(true)
+      expect(page.bookmark).toBeDefined()
     })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(1)
   })
 
-  it("should be able to perform an equal search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      equal: {
-        property: "word2",
-      },
+  describe("full search", () => {
+    it("should be able to perform a full search", async () => {
+      const page = await fullSearch(
+        dbName,
+        INDEX_NAME,
+        {
+          string: {
+            property: "wo",
+          },
+        },
+        {}
+      )
+      expect(page.rows.length).toBe(3)
     })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(1)
-  })
-
-  it("should be able to perform a not equal search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      notEqual: {
-        property: "word2",
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(2)
-  })
-
-  it("should be able to perform an empty search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      empty: {
-        number: true,
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(2)
-  })
-
-  it("should be able to perform a not empty search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      notEmpty: {
-        number: true,
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(1)
-  })
-
-  it("should be able to perform a one of search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      oneOf: {
-        property: ["word", "word2"],
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(2)
-  })
-
-  it("should be able to perform a contains search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      contains: {
-        property: ["word"],
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(1)
-  })
-
-  it("should be able to perform a not contains search", async () => {
-    const builder = new QueryBuilder(dbName, INDEX_NAME, {
-      notContains: {
-        property: ["word2"],
-      },
-    })
-    const resp = await builder.run()
-    expect(resp.rows.length).toBe(2)
   })
 })

From 61ed62e6c41deb1c92b9edd9c2d6c930125c01d0 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 28 Feb 2023 09:37:03 +0000
Subject: [PATCH 187/273] Builder user onboarding

---
 packages/backend-core/src/users.ts            |  41 +
 .../bbui/src/ActionButton/ActionButton.svelte |  98 ++-
 packages/bbui/src/Form/Core/Select.svelte     |   4 +-
 ...loyNavigation.svelte => AppActions.svelte} | 170 ++--
 .../src/components/deploy/RevertModal.svelte  |  12 +-
 .../portal/onboarding/TourPopover.svelte      |   4 +-
 .../src/components/portal/onboarding/tours.js |  24 +
 .../_components/BuilderSidePanel.svelte       | 735 ++++++++++++++++++
 .../builder/app/[application]/_layout.svelte  |  22 +-
 packages/builder/src/stores/portal/users.js   |  17 +
 packages/frontend-core/src/api/user.js        |  52 +-
 packages/frontend-core/src/fetch/UserFetch.js |   1 +
 packages/types/src/api/web/user.ts            |   2 +-
 .../src/api/controllers/global/users.ts       |  49 +-
 .../worker/src/api/routes/global/users.ts     |  29 +-
 packages/worker/src/sdk/users/users.ts        |  13 +-
 packages/worker/src/utilities/redis.ts        |   6 +-
 17 files changed, 1133 insertions(+), 146 deletions(-)
 rename packages/builder/src/components/deploy/{DeployNavigation.svelte => AppActions.svelte} (53%)
 create mode 100644 packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte

diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index ef76af390d..ad226e29d8 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -5,6 +5,7 @@ import {
   generateAppUserID,
   queryGlobalView,
   UNICODE_MAX,
+  directCouchFind,
 } from "./db"
 import { BulkDocsResponse, User } from "@budibase/types"
 import { getGlobalDB } from "./context"
@@ -64,12 +65,52 @@ export const searchGlobalUsersByApp = async (appId: any, opts: any) => {
   })
   params.startkey = opts && opts.startkey ? opts.startkey : params.startkey
   let response = await queryGlobalView(ViewName.USER_BY_APP, params)
+
   if (!response) {
     response = []
   }
   return Array.isArray(response) ? response : [response]
 }
 
+/*
+  Return any user who potentially has access to the application
+  Admins, developers and app users with the explicitly role.
+*/
+export const searchGlobalUsersByAppAccess = async (appId: any, opts: any) => {
+  const roleSelector = `roles.${appId}`
+
+  let orQuery: any[] = [
+    {
+      "builder.global": true,
+    },
+    {
+      "admin.global": true,
+    },
+  ]
+
+  if (appId) {
+    const roleCheck = {
+      [roleSelector]: {
+        $exists: true,
+      },
+    }
+    orQuery.push(roleCheck)
+  }
+
+  let searchOptions = {
+    selector: {
+      $or: orQuery,
+      _id: {
+        $regex: "^us_",
+      },
+    },
+    limit: opts?.limit || 50,
+  }
+
+  const resp = await directCouchFind(context.getGlobalDBName(), searchOptions)
+  return resp?.rows
+}
+
 export const getGlobalUserByAppPage = (appId: string, user: User) => {
   if (!user) {
     return
diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index 663128160f..01f5033e6c 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -1,6 +1,9 @@
 <script>
   import "@spectrum-css/actionbutton/dist/index-vars.css"
   import { createEventDispatcher } from "svelte"
+  import Tooltip from "../Tooltip/Tooltip.svelte"
+  import { fade } from "svelte/transition"
+
   const dispatch = createEventDispatcher()
 
   export let quiet = false
@@ -13,6 +16,9 @@
   export let active = false
   export let fullWidth = false
   export let noPadding = false
+  export let tooltip = ""
+
+  let showTooltip = false
 
   function longPress(element) {
     if (!longPressable) return
@@ -35,42 +41,54 @@
   }
 </script>
 
-<button
-  use:longPress
-  class:spectrum-ActionButton--quiet={quiet}
-  class:spectrum-ActionButton--emphasized={emphasized}
-  class:is-selected={selected}
-  class:noPadding
-  class:fullWidth
-  class="spectrum-ActionButton spectrum-ActionButton--size{size}"
-  class:active
-  {disabled}
-  on:longPress
-  on:click|preventDefault
+<span
+  class="btn-wrap"
+  on:mouseover={() => (showTooltip = true)}
+  on:mouseleave={() => (showTooltip = false)}
+  on:focus={() => (showTooltip = true)}
 >
-  {#if longPressable}
-    <svg
-      class="spectrum-Icon spectrum-UIIcon-CornerTriangle100 spectrum-ActionButton-hold"
-      focusable="false"
-      aria-hidden="true"
-    >
-      <use xlink:href="#spectrum-css-icon-CornerTriangle100" />
-    </svg>
-  {/if}
-  {#if icon}
-    <svg
-      class="spectrum-Icon spectrum-Icon--size{size}"
-      focusable="false"
-      aria-hidden="true"
-      aria-label={icon}
-    >
-      <use xlink:href="#spectrum-icon-18-{icon}" />
-    </svg>
-  {/if}
-  {#if $$slots}
-    <span class="spectrum-ActionButton-label"><slot /></span>
-  {/if}
-</button>
+  <button
+    use:longPress
+    class:spectrum-ActionButton--quiet={quiet}
+    class:spectrum-ActionButton--emphasized={emphasized}
+    class:is-selected={selected}
+    class:noPadding
+    class:fullWidth
+    class="spectrum-ActionButton spectrum-ActionButton--size{size}"
+    class:active
+    {disabled}
+    on:longPress
+    on:click|preventDefault
+  >
+    {#if longPressable}
+      <svg
+        class="spectrum-Icon spectrum-UIIcon-CornerTriangle100 spectrum-ActionButton-hold"
+        focusable="false"
+        aria-hidden="true"
+      >
+        <use xlink:href="#spectrum-css-icon-CornerTriangle100" />
+      </svg>
+    {/if}
+    {#if icon}
+      <svg
+        class="spectrum-Icon spectrum-Icon--size{size}"
+        focusable="false"
+        aria-hidden="true"
+        aria-label={icon}
+      >
+        <use xlink:href="#spectrum-icon-18-{icon}" />
+      </svg>
+    {/if}
+    {#if $$slots}
+      <span class="spectrum-ActionButton-label"><slot /></span>
+    {/if}
+    {#if tooltip && showTooltip}
+      <div class="tooltip" in:fade={{ duration: 130, delay: 250 }}>
+        <Tooltip textWrapping direction="bottom" text={tooltip} />
+      </div>
+    {/if}
+  </button>
+</span>
 
 <style>
   .fullWidth {
@@ -98,4 +116,14 @@
   .is-selected:not(.emphasized) .spectrum-Icon {
     color: var(--spectrum-global-color-gray-900);
   }
+  .tooltip {
+    position: absolute;
+    pointer-events: none;
+    left: 50%;
+    top: calc(100% + 4px);
+    width: 100vw;
+    max-width: 150px;
+    transform: translateX(-50%);
+    text-align: center;
+  }
 </style>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 721083e3a6..aa9071607e 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -41,7 +41,7 @@
   const getFieldText = (value, options, placeholder) => {
     // Always use placeholder if no value
     if (value == null || value === "") {
-      return placeholder || "Choose an option"
+      return placeholder !== false ? "Choose an option" : ""
     }
 
     return getFieldAttribute(getOptionLabel, value, options)
@@ -74,7 +74,7 @@
   {autocomplete}
   {sort}
   isPlaceholder={value == null || value === ""}
-  placeholderOption={placeholder}
+  placeholderOption={placeholder === false ? null : placeholder}
   isOptionSelected={option => option === value}
   onSelectOption={selectOption}
 />
diff --git a/packages/builder/src/components/deploy/DeployNavigation.svelte b/packages/builder/src/components/deploy/AppActions.svelte
similarity index 53%
rename from packages/builder/src/components/deploy/DeployNavigation.svelte
rename to packages/builder/src/components/deploy/AppActions.svelte
index d3a428fed2..582b5ab8f0 100644
--- a/packages/builder/src/components/deploy/DeployNavigation.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -6,8 +6,10 @@
     Heading,
     Body,
     Button,
-    Icon,
+    ActionButton,
   } from "@budibase/bbui"
+  import RevertModal from "components/deploy/RevertModal.svelte"
+  import VersionModal from "components/deploy/VersionModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import analytics, { Events, EventSource } from "analytics"
@@ -16,6 +18,8 @@
   import { onMount } from "svelte"
   import DeployModal from "components/deploy/DeployModal.svelte"
   import { apps } from "stores/portal"
+  import { store } from "builderStore"
+  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
 
   export let application
 
@@ -108,66 +112,93 @@
   })
 </script>
 
-<div class="deployment-top-nav">
-  {#if isPublished}
-    <div class="publish-popover">
-      <div bind:this={publishPopoverAnchor}>
-        <Icon
-          size="M"
-          hoverable
-          name="Globe"
-          tooltip="Your published app"
-          on:click={publishPopover.show()}
-        />
-      </div>
-      <Popover
-        bind:this={publishPopover}
-        align="right"
-        disabled={!isPublished}
-        anchor={publishPopoverAnchor}
-        offset={10}
-      >
-        <div class="popover-content">
-          <Layout noPadding gap="M">
-            <Heading size="XS">Your published app</Heading>
-            <Body size="S">
-              <span class="publish-popover-message">
-                {processStringSync(
-                  "Last published {{ duration time 'millisecond' }} ago",
-                  {
-                    time:
-                      new Date().getTime() -
-                      new Date(latestDeployments[0].updatedAt).getTime(),
-                  }
-                )}
-              </span>
-            </Body>
-            <div class="buttons">
-              <Button
-                warning={true}
-                icon="GlobeStrike"
-                disabled={!isPublished}
-                on:click={unpublishApp}
-              >
-                Unpublish
-              </Button>
-              <Button cta on:click={viewApp}>View app</Button>
-            </div>
-          </Layout>
-        </div>
-      </Popover>
+<div class="action-top-nav">
+  <div class="action-buttons">
+    <div class="version">
+      <VersionModal />
     </div>
-  {/if}
+    <RevertModal />
 
-  {#if !isPublished}
-    <Icon
-      size="M"
-      name="GlobeStrike"
-      disabled
-      tooltip="Your app has not been published yet"
-    />
-  {/if}
+    {#if isPublished}
+      <div class="publish-popover">
+        <div bind:this={publishPopoverAnchor}>
+          <ActionButton
+            quiet
+            icon="Globe"
+            size="M"
+            tooltip="Your published app"
+            on:click={publishPopover.show()}
+          />
+        </div>
+        <Popover
+          bind:this={publishPopover}
+          align="right"
+          disabled={!isPublished}
+          anchor={publishPopoverAnchor}
+          offset={10}
+        >
+          <div class="popover-content">
+            <Layout noPadding gap="M">
+              <Heading size="XS">Your published app</Heading>
+              <Body size="S">
+                <span class="publish-popover-message">
+                  {processStringSync(
+                    "Last published {{ duration time 'millisecond' }} ago",
+                    {
+                      time:
+                        new Date().getTime() -
+                        new Date(latestDeployments[0].updatedAt).getTime(),
+                    }
+                  )}
+                </span>
+              </Body>
+              <div class="buttons">
+                <Button
+                  warning={true}
+                  icon="GlobeStrike"
+                  disabled={!isPublished}
+                  on:click={unpublishApp}
+                >
+                  Unpublish
+                </Button>
+                <Button cta on:click={viewApp}>View app</Button>
+              </div>
+            </Layout>
+          </div>
+        </Popover>
+      </div>
+    {/if}
+
+    {#if !isPublished}
+      <ActionButton
+        quiet
+        icon="GlobeStrike"
+        size="M"
+        tooltip="Your app has not been published yet"
+        disabled
+      />
+    {/if}
+
+    <TourWrap tourStepKey={`builder-user-management`}>
+      <span id="builder-app-users-button">
+        <ActionButton
+          quiet
+          icon="UserGroup"
+          size="M"
+          on:click={() => {
+            store.update(state => {
+              state.builderSidePanel = true
+              return state
+            })
+          }}
+        >
+          Users
+        </ActionButton>
+      </span>
+    </TourWrap>
+  </div>
 </div>
+
 <ConfirmDialog
   bind:this={unpublishModal}
   title="Confirm unpublish"
@@ -183,6 +214,11 @@
 </div>
 
 <style>
+  /* .banner-btn {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-s);
+  } */
   .popover-content {
     padding: var(--spacing-xl);
   }
@@ -191,6 +227,22 @@
     flex-direction: row;
     justify-content: flex-end;
     align-items: center;
-    gap: var(--spacing-m);
+    gap: var(--spacing-l);
+  }
+  .action-buttons {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+    /* gap: var(--spacing-s); */
+  }
+  .version {
+    margin-right: var(--spacing-s);
+  }
+  .action-top-nav {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
   }
 </style>
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index a8f9d8f6e3..0c3372f8ec 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,10 +1,10 @@
 <script>
   import {
-    Icon,
     Input,
     Modal,
     notifications,
     ModalContent,
+    ActionButton,
   } from "@budibase/bbui"
   import { store } from "builderStore"
   import { API } from "api"
@@ -28,12 +28,14 @@
   }
 </script>
 
-<Icon
-  name="Revert"
-  hoverable
-  on:click={revertModal.show}
+<ActionButton
+  quiet
+  icon="Revert"
+  size="M"
   tooltip="Revert changes"
+  on:click={revertModal.show}
 />
+
 <Modal bind:this={revertModal}>
   <ModalContent
     title="Revert Changes"
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index e6a4ed3b27..37ed0c6350 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -122,7 +122,9 @@
         <Layout noPadding gap="M">
           <div class="tour-header">
             <Heading size="XS">{tourStep?.title || "-"}</Heading>
-            <div>{`${tourStepIdx + 1}/${tourSteps?.length}`}</div>
+            {#if tourSteps?.length > 1}
+              <div>{`${tourStepIdx + 1}/${tourSteps?.length}`}</div>
+            {/if}
           </div>
           <Body size="S">
             <span class="tour-body">
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index d1485c4872..7975f11bb5 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -9,11 +9,14 @@ export const TOUR_STEP_KEYS = {
   BUILDER_APP_PUBLISH: "builder-app-publish",
   BUILDER_DATA_SECTION: "builder-data-section",
   BUILDER_DESIGN_SECTION: "builder-design-section",
+  BUILDER_USER_MANAGEMENT: "builder-user-management",
   BUILDER_AUTOMATE_SECTION: "builder-automate-section",
+  FEATURE_USER_MANAGEMENT: "feature-user-management",
 }
 
 export const TOUR_KEYS = {
   TOUR_BUILDER_ONBOARDING: "builder-onboarding",
+  FEATURE_ONBOARDING: "feature-onboarding",
 }
 
 const tourEvent = eventKey => {
@@ -58,6 +61,15 @@ const getTours = () => {
         },
         align: "left",
       },
+      {
+        id: TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT,
+        title: "Users",
+        query: ".toprightnav #builder-app-users-button",
+        body: "Choose which users you want to see to have access to your app and control what level of access they have.",
+        onLoad: () => {
+          tourEvent(TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT)
+        },
+      },
       {
         id: TOUR_STEP_KEYS.BUILDER_APP_PUBLISH,
         title: "Publish",
@@ -90,6 +102,18 @@ const getTours = () => {
         },
       },
     ],
+    [TOUR_KEYS.FEATURE_ONBOARDING]: [
+      {
+        id: TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT,
+        title: "Users",
+        query: ".toprightnav #builder-app-users-button",
+        body: "Choose which users you want to have access to your app and control what level of access they have.",
+        onLoad: () => {
+          tourEvent(TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT)
+        },
+        align: "left",
+      },
+    ],
   }
 }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
new file mode 100644
index 0000000000..ccd6071b90
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -0,0 +1,735 @@
+<script>
+  import {
+    Icon,
+    Heading,
+    Layout,
+    Input,
+    clickOutside,
+    notifications,
+    ActionButton,
+  } from "@budibase/bbui"
+  import { store } from "builderStore"
+  import { groups, licensing, apps, users } from "stores/portal"
+  import { fetchData } from "@budibase/frontend-core"
+  import { API } from "api"
+  import { onMount } from "svelte"
+  import GroupIcon from "../../../portal/users/groups/_components/GroupIcon.svelte"
+  import RoleSelect from "components/common/RoleSelect.svelte"
+  import { Constants, Utils } from "@budibase/frontend-core"
+  import { emailValidator } from "helpers/validation"
+  import CopyInput from "components/common/inputs/CopyInput.svelte"
+
+  let query = null
+  let loaded = false
+  let rendered = false
+  let inviting = false
+  let searchFocus = false
+
+  let appInvites = []
+  let filteredInvites = []
+  let filteredUsers = []
+  let filteredGroups = []
+  let selectedGroup
+  let userOnboardResponse = null
+
+  $: queryIsEmail = emailValidator(query) === true
+  $: prodAppId = apps.getProdAppID($store.appId)
+  $: promptInvite = showInvite(
+    filteredInvites,
+    filteredUsers,
+    filteredGroups,
+    query
+  )
+
+  const showInvite = (invites, users, groups, query) => {
+    return !invites?.length && !users?.length && !groups?.length && query
+  }
+
+  const filterInvites = async query => {
+    appInvites = await getInvites()
+    if (!query || query == "") {
+      filteredInvites = appInvites
+      return
+    }
+    filteredInvites = appInvites.filter(invite => invite.email.includes(query))
+  }
+
+  $: filterInvites(query)
+
+  const usersFetch = fetchData({
+    API,
+    datasource: {
+      type: "user",
+    },
+  })
+
+  const searchUsers = async (query, sidePaneOpen, loaded) => {
+    if (!sidePaneOpen || !loaded) {
+      return
+    }
+    if (!prodAppId) {
+      console.log("Application id required")
+      return
+    }
+    await usersFetch.update({
+      query: {
+        appId: query ? null : prodAppId,
+        email: query,
+        paginated: query ? null : false,
+      },
+    })
+    await usersFetch.refresh()
+
+    filteredUsers = $usersFetch.rows.map(user => {
+      const appRole = Object.keys(user.roles).find(x => x === prodAppId)
+
+      // if (
+      //   !appRole &&
+      //   user.userGroups &&
+      //   !user.builder?.global &&
+      //   !user.admin.global
+      // ) {
+      //   console.log("Hi, I don't have groups > ", user.email)
+      // }
+
+      return {
+        ...user,
+        role: !appRole ? undefined : user.roles[appRole],
+      }
+    })
+  }
+
+  const debouncedUpdateFetch = Utils.debounce(searchUsers, 250)
+  $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded)
+
+  const updateAppUser = async (user, role) => {
+    if (!prodAppId) {
+      notifications.error("Application id must be specified")
+      return
+    }
+    const update = await users.get(user._id)
+    await users.save({
+      ...update,
+      roles: {
+        ...update.roles,
+        [prodAppId]: role,
+      },
+    })
+    await searchUsers(query, $store.builderSidePanel, loaded)
+  }
+
+  const onUpdateUser = async (user, role) => {
+    if (!user) {
+      notifications.error("A user must be specified")
+      return
+    }
+    try {
+      await updateAppUser(user, role)
+    } catch (error) {
+      console.error(error)
+      notifications.error("User could not be updated")
+    }
+  }
+
+  const updateAppGroup = async (target, role) => {
+    if (!prodAppId) {
+      notifications.error("Application id must be specified")
+      return
+    }
+
+    if (!role) {
+      await groups.actions.removeApp(target._id, prodAppId)
+    } else {
+      await groups.actions.addApp(target._id, prodAppId, role)
+    }
+
+    await usersFetch.refresh()
+    await groups.actions.init()
+  }
+
+  const onUpdateGroup = async (group, role) => {
+    if (!group) {
+      notifications.error("A group must be specified")
+      return
+    }
+    try {
+      await updateAppGroup(group, role)
+    } catch {
+      notifications.error("Group update failed")
+    }
+  }
+
+  const getAppGroups = (allGroups, appId) => {
+    if (!allGroups) {
+      return []
+    }
+    return allGroups.filter(group => {
+      if (!group.roles) {
+        return false
+      }
+      return groups.actions.getGroupAppIds(group).includes(appId)
+    })
+  }
+
+  const searchGroups = (userGroups, query) => {
+    let filterGroups = query?.length
+      ? userGroups
+      : getAppGroups(userGroups, prodAppId)
+    return filterGroups
+      .filter(group => {
+        if (!query?.length) {
+          return true
+        }
+        //Group Name only.
+        const nameMatch = group.name
+          ?.toLowerCase()
+          .includes(query?.toLowerCase())
+
+        return nameMatch
+      })
+      .map(enrichGroupRole)
+  }
+
+  const enrichGroupRole = group => {
+    return {
+      ...group,
+      role: group.roles[
+        groups.actions.getGroupAppIds(group).find(x => x === prodAppId)
+      ],
+    }
+  }
+
+  const getEnrichedGroups = groups => {
+    return groups.map(enrichGroupRole)
+  }
+
+  // Adds the 'role' attribute and sets it to the current app.
+  $: enrichedGroups = getEnrichedGroups($groups)
+  $: filteredGroups = searchGroups(enrichedGroups, query)
+
+  // $: enrichedAppGroupsById = getAppGroups(enrichedGroups, prodAppId).map(
+  //   group => group._id
+  // )
+  // $: console.log("ALL GROUP IDS ", enrichedAppGroupsById)
+
+  $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers)
+  $: allUsers = [...filteredUsers, ...groupUsers]
+
+  /*
+    Create pseudo users from the "users" attribute on app groups.
+    These users will appear muted in the UI and show the ROLE
+    inherited from their parent group. The users allow assigning of user 
+    specific roles for the app.
+  */
+  const buildGroupUsers = (userGroups, filteredUsers) => {
+    if (query) {
+      return []
+    }
+    // Must exclude users who have explicit privileges
+    const userByEmail = filteredUsers.reduce((acc, user) => {
+      if (user.role || user.admin?.global || user.builder?.global) {
+        acc.push(user.email)
+      }
+      return acc
+    }, [])
+
+    const indexedUsers = userGroups.reduce((acc, group) => {
+      group.users.forEach(user => {
+        if (userByEmail.indexOf(user.email) == -1) {
+          acc[user._id] = {
+            _id: user._id,
+            email: user.email,
+            role: group.role,
+            group: group.name,
+          }
+        }
+      })
+      return acc
+    }, {})
+    return Object.values(indexedUsers)
+  }
+
+  const getInvites = async () => {
+    try {
+      const invites = await users.getInvites()
+      return invites
+    } catch (error) {
+      notifications.error(error.message)
+      return []
+    }
+  }
+
+  async function inviteUser() {
+    if (!queryIsEmail) {
+      notifications.error("Email is not valid")
+      return
+    }
+    const newUserEmail = query + ""
+    inviting = true
+
+    const payload = [
+      {
+        email: newUserEmail,
+        builder: false,
+        admin: false,
+        apps: { [prodAppId]: Constants.Roles.BASIC },
+      },
+    ]
+    let userInviteResponse
+    try {
+      userInviteResponse = await users.onboard(payload)
+
+      const newUser = userInviteResponse?.successful.find(
+        user => user.email === newUserEmail
+      )
+      if (newUser) {
+        notifications.success(
+          userInviteResponse.created
+            ? "User created successfully"
+            : "User invite successful"
+        )
+      } else {
+        throw new Error("User invite failed")
+      }
+    } catch (error) {
+      console.error(error.message)
+      notifications.error("Error inviting user")
+    }
+    inviting = false
+    return userInviteResponse
+  }
+
+  const onInviteUser = async () => {
+    userOnboardResponse = await inviteUser()
+
+    const userInviteSuccess = userOnboardResponse?.successful
+    if (userInviteSuccess && userInviteSuccess[0].email === query) {
+      query = null
+      query = userInviteSuccess[0].email
+    }
+  }
+
+  const onUpdateUserInvite = async (invite, role) => {
+    await users.updateInvite({
+      code: invite.code,
+      apps: {
+        ...invite.apps,
+        [prodAppId]: role,
+      },
+    })
+    await filterInvites()
+  }
+
+  const onUninviteAppUser = async invite => {
+    await uninviteAppUser(invite)
+    await filterInvites()
+  }
+
+  // Purge only the app from the invite or recind the invite if only 1 app remains?
+  const uninviteAppUser = async invite => {
+    let updated = { ...invite }
+    delete updated.info.apps[prodAppId]
+
+    return await users.updateInvite({
+      code: updated.code,
+      apps: updated.apps,
+    })
+  }
+
+  const initSidePanel = async sidePaneOpen => {
+    if (sidePaneOpen === true) {
+      await groups.actions.init()
+    }
+    loaded = true
+  }
+
+  $: initSidePanel($store.builderSidePanel)
+
+  onMount(() => {
+    rendered = true
+  })
+
+  const userTitle = user => {
+    if (user.admin?.global) {
+      return "Admin"
+    } else if (user.builder?.global) {
+      return "Developer"
+    } else {
+      return "App user"
+    }
+  }
+
+  const roleNote = user => {
+    if (user.group) {
+      return "Part of a group"
+    }
+    return null
+  }
+</script>
+
+<div
+  id="builder-side-panel-container"
+  class:open={$store.builderSidePanel}
+  use:clickOutside={$store.builderSidePanel
+    ? () => {
+        store.update(state => {
+          state.builderSidePanel = false
+          return state
+        })
+      }
+    : () => {}}
+>
+  <div class="builder-side-panel-header">
+    <Heading size="S">Users</Heading>
+    <Icon
+      color="var(--spectrum-global-color-gray-600)"
+      name="RailRightClose"
+      hoverable
+      on:click={() => {
+        store.update(state => {
+          state.builderSidePanel = false
+          return state
+        })
+      }}
+    />
+  </div>
+  <div class="search" class:focused={searchFocus}>
+    <span class="search-input">
+      <Input
+        placeholder={"Add users and groups to your app"}
+        autocomplete="off"
+        disabled={inviting}
+        value={query}
+        on:input={e => {
+          query = e.target.value.trim()
+        }}
+        on:focus={() => (searchFocus = true)}
+        on:blur={() => (searchFocus = false)}
+      />
+    </span>
+
+    <span
+      class="search-input-icon"
+      class:searching={query}
+      on:click={() => {
+        if (!query) {
+          return
+        }
+        query = null
+        userOnboardResponse = null
+      }}
+    >
+      <Icon name={query ? "Close" : "Search"} />
+    </span>
+  </div>
+
+  {#if promptInvite && !userOnboardResponse}
+    <Layout gap="S" paddingX="XL">
+      <div class="invite-header">
+        <Heading size="XS">No user found</Heading>
+        <div class="invite-directions">
+          Add a valid email to invite a new user
+        </div>
+      </div>
+      <div class="invite-form">
+        <span>{query || ""}</span>
+        <ActionButton
+          icon="UserAdd"
+          disabled={!queryIsEmail || inviting}
+          on:click={onInviteUser}
+        >
+          Add user
+        </ActionButton>
+      </div>
+    </Layout>
+  {/if}
+
+  {#if !promptInvite}
+    <Layout gap="L" noPadding>
+      {#if filteredInvites?.length}
+        <Layout noPadding gap="XS">
+          <div class="auth-entity-header">
+            <div class="auth-entity-title">Pending invites</div>
+            <div class="auth-entity-access-title">Access</div>
+          </div>
+          {#each filteredInvites as invite}
+            <div class="auth-entity">
+              <div class="details">
+                <div class="user-email" title={invite.email}>
+                  {invite.email}
+                </div>
+              </div>
+              <div class="auth-entity-access">
+                <RoleSelect
+                  placeholder={false}
+                  value={invite.info.apps?.[prodAppId]}
+                  allowRemove={invite.info.apps?.[prodAppId]}
+                  allowPublic={false}
+                  quiet={true}
+                  on:change={e => {
+                    onUpdateUserInvite(invite, e.detail)
+                  }}
+                  on:remove={() => {
+                    onUninviteAppUser(invite)
+                  }}
+                />
+              </div>
+            </div>
+          {/each}
+        </Layout>
+      {/if}
+
+      {#if $licensing.groupsEnabled && filteredGroups?.length}
+        <Layout noPadding gap="XS">
+          <div class="auth-entity-header">
+            <div class="auth-entity-title">Groups</div>
+            <div class="auth-entity-access-title">Access</div>
+          </div>
+          {#each filteredGroups as group}
+            <div
+              class="auth-entity group"
+              on:click={() => {
+                if (selectedGroup != group._id) {
+                  selectedGroup = group._id
+                } else {
+                  selectedGroup = null
+                }
+              }}
+              on:keydown={() => {}}
+            >
+              <div class="details">
+                <GroupIcon {group} size="S" />
+                <div>
+                  {group.name}
+                </div>
+                <div class="auth-entity-meta">
+                  {`${group.users?.length} user${
+                    group.users?.length != 1 ? "s" : ""
+                  }`}
+                </div>
+              </div>
+              <div class="auth-entity-access">
+                <RoleSelect
+                  placeholder={false}
+                  value={group.role}
+                  allowRemove={group.role}
+                  allowPublic={false}
+                  quiet={true}
+                  on:change={e => {
+                    onUpdateGroup(group, e.detail)
+                  }}
+                  on:remove={() => {
+                    onUpdateGroup(group)
+                  }}
+                />
+              </div>
+            </div>
+          {/each}
+        </Layout>
+      {/if}
+
+      {#if filteredUsers?.length}
+        <div class="auth-entity-section">
+          <div class="auth-entity-header ">
+            <div class="auth-entity-title">Users</div>
+            <div class="auth-entity-access-title">Access</div>
+          </div>
+          {#each allUsers as user}
+            <div class="auth-entity">
+              <div class="details">
+                <div class="user-email" title={user.email}>
+                  {user.email}
+                </div>
+                <div class="auth-entity-meta">
+                  {userTitle(user)}
+                </div>
+              </div>
+              <div class="auth-entity-access" class:muted={user.group}>
+                <RoleSelect
+                  note={roleNote(user)}
+                  placeholder={false}
+                  value={user.role}
+                  allowRemove={user.role && !user.group}
+                  allowPublic={false}
+                  quiet={true}
+                  on:change={e => {
+                    onUpdateUser(user, e.detail)
+                  }}
+                  on:remove={() => {
+                    onUpdateUser(user)
+                  }}
+                />
+              </div>
+            </div>
+          {/each}
+        </div>
+      {/if}
+    </Layout>
+  {/if}
+
+  {#if userOnboardResponse?.created}
+    <Layout gap="S" paddingX="XL">
+      <div class="invite-header">
+        <Heading size="XS">User added!</Heading>
+        <div class="invite-directions">
+          Email invites are not available without SMTP configuration. Here is
+          the password that has been generated for this user.
+        </div>
+      </div>
+      <div>
+        <CopyInput
+          value={userOnboardResponse.successful[0]?.password}
+          label="Password"
+        />
+      </div>
+    </Layout>
+  {/if}
+</div>
+
+<style>
+  .search :global(input) {
+    padding-left: 0px;
+  }
+
+  .search {
+    display: flex;
+    align-items: center;
+  }
+
+  .search-input {
+    flex: 1;
+  }
+
+  .search-input-icon.searching {
+    cursor: pointer;
+  }
+
+  .auth-entity-section {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-s);
+    width: 400px;
+  }
+
+  .auth-entity-meta {
+    color: var(--spectrum-global-color-gray-600);
+    font-size: 12px;
+    white-space: nowrap;
+  }
+
+  .auth-entity-access.muted :global(.spectrum-Picker-label),
+  .auth-entity-access.muted :global(.spectrum-StatusLight) {
+    opacity: 0.7;
+  }
+
+  .auth-entity-header {
+    color: var(--spectrum-global-color-gray-600);
+  }
+
+  .auth-entity,
+  .auth-entity-header {
+    padding: 0px var(--spacing-xl);
+  }
+
+  .auth-entity,
+  .auth-entity-header {
+    display: grid;
+    grid-template-columns: 65% auto;
+    align-items: center;
+    gap: var(--spacing-xl);
+  }
+
+  .auth-entity .details {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-m);
+  }
+
+  .auth-entity .user-email {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  #builder-side-panel-container {
+    box-sizing: border-box;
+    max-width: calc(100vw - 40px);
+    background: var(--background);
+    border-left: var(--border-light);
+    z-index: 3;
+    padding: var(--spacing-xl) 0px;
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-xl);
+    overflow-y: auto;
+    overflow-x: hidden;
+    transition: transform 130ms ease-out;
+    position: absolute;
+    width: 400px;
+    right: 0;
+    transform: translateX(100%);
+    height: 100%;
+  }
+
+  .builder-side-panel-header,
+  #builder-side-panel-container .search {
+    padding: 0px var(--spacing-xl);
+  }
+
+  #builder-side-panel-container .auth-entity .details {
+    box-sizing: border-box;
+  }
+
+  .invite-form {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  #builder-side-panel-container .search {
+    padding-top: var(--spacing-m);
+    padding-bottom: var(--spacing-m);
+    border-top: 1px solid var(--spectrum-alias-border-color-mid);
+    border-bottom: 1px solid var(--spectrum-alias-border-color-mid);
+  }
+
+  #builder-side-panel-container .search :global(input) {
+    border: none;
+    border-radius: 0px;
+    background: none;
+  }
+
+  #builder-side-panel-container .search :global(input) {
+    border: none;
+    border-radius: 0px;
+  }
+
+  #builder-side-panel-container .search.focused {
+    border-color: var(
+      --spectrum-textfield-m-border-color-down,
+      var(--spectrum-alias-border-color-mouse-focus)
+    );
+  }
+
+  #builder-side-panel-container .search :global(input::placeholder) {
+    font-style: normal;
+  }
+
+  #builder-side-panel-container.open {
+    transform: translateX(0);
+    box-shadow: 0 0 40px 10px rgba(0, 0, 0, 0.1);
+  }
+
+  .builder-side-panel-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .invite-header {
+    display: flex;
+    gap: var(--spacing-s);
+    flex-direction: column;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index f561bd8ecd..abf70a84c0 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -13,15 +13,14 @@
     notifications,
   } from "@budibase/bbui"
 
-  import RevertModal from "components/deploy/RevertModal.svelte"
-  import VersionModal from "components/deploy/VersionModal.svelte"
-  import DeployNavigation from "components/deploy/DeployNavigation.svelte"
+  import AppActions from "components/deploy/AppActions.svelte"
   import { API } from "api"
   import { isActive, goto, layout, redirect } from "@roxi/routify"
   import { capitalise } from "helpers"
   import { onMount, onDestroy } from "svelte"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import TourPopover from "components/portal/onboarding/TourPopover.svelte"
+  import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
   import { TOUR_KEYS, TOURS } from "components/portal/onboarding/tours.js"
 
   export let application
@@ -116,6 +115,11 @@
   <div class="loading" />
 {:then _}
   <TourPopover />
+
+  {#if $store.builderSidePanel}
+    <BuilderSidePanel />
+  {/if}
+
   <div class="root">
     <div class="top-nav">
       <div class="topleftnav">
@@ -181,11 +185,7 @@
         </Tabs>
       </div>
       <div class="toprightnav">
-        <div class="version">
-          <VersionModal />
-        </div>
-        <RevertModal />
-        <DeployNavigation {application} />
+        <AppActions {application} />
       </div>
     </div>
     <slot />
@@ -250,10 +250,6 @@
     flex-direction: row;
     justify-content: flex-end;
     align-items: center;
-    gap: var(--spacing-xl);
-  }
-
-  .version {
-    margin-right: var(--spacing-s);
+    gap: var(--spacing-l);
   }
 </style>
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
index 1510207604..206e14568b 100644
--- a/packages/builder/src/stores/portal/users.js
+++ b/packages/builder/src/stores/portal/users.js
@@ -26,9 +26,15 @@ export function createUsersStore() {
     return await API.getUsers()
   }
 
+  // One or more users.
+  async function onboard(payload) {
+    return await API.onboardUsers(payload)
+  }
+
   async function invite(payload) {
     return API.inviteUsers(payload)
   }
+
   async function acceptInvite(inviteCode, password, firstName, lastName) {
     return API.acceptInvite({
       inviteCode,
@@ -42,6 +48,14 @@ export function createUsersStore() {
     return API.getUserInvite(inviteCode)
   }
 
+  async function getInvites() {
+    return API.getUserInvites()
+  }
+
+  async function updateInvite(invite) {
+    return API.updateUserInvite(invite)
+  }
+
   async function create(data) {
     let mappedUsers = data.users.map(user => {
       const body = {
@@ -106,8 +120,11 @@ export function createUsersStore() {
     getUserRole,
     fetch,
     invite,
+    onboard,
     acceptInvite,
     fetchInvite,
+    getInvites,
+    updateInvite,
     create,
     save,
     bulkDelete,
diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js
index 9875605ce0..cb8a8f6555 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.js
@@ -12,8 +12,10 @@ export const buildUserEndpoints = API => ({
    * Gets a list of users in the current tenant.
    * @param {string} page The page to retrieve
    * @param {string} search The starts with string to search username/email by.
+   * @param {string} appId Facilitate app/role based user searching
+   * @param {boolean} paginated Allow the disabling of pagination
    */
-  searchUsers: async ({ page, email, appId } = {}) => {
+  searchUsers: async ({ paginated, page, email, appId } = {}) => {
     const opts = {}
     if (page) {
       opts.page = page
@@ -24,6 +26,9 @@ export const buildUserEndpoints = API => ({
     if (appId) {
       opts.appId = appId
     }
+    if (typeof paginated === "boolean") {
+      opts.paginated = paginated
+    }
     return await API.post({
       url: `/api/global/users/search`,
       body: opts,
@@ -133,7 +138,7 @@ export const buildUserEndpoints = API => ({
    * @param builder whether the user should be a global builder
    * @param admin whether the user should be a global admin
    */
-  inviteUser: async ({ email, builder, admin }) => {
+  inviteUser: async ({ email, builder, admin, apps }) => {
     return await API.post({
       url: "/api/global/users/invite",
       body: {
@@ -141,11 +146,43 @@ export const buildUserEndpoints = API => ({
         userInfo: {
           admin: admin ? { global: true } : undefined,
           builder: builder ? { global: true } : undefined,
+          apps: apps ? apps : undefined,
         },
       },
     })
   },
 
+  onboardUsers: async payload => {
+    return await API.post({
+      url: "/api/global/users/onboard",
+      body: payload.map(invite => {
+        const { email, admin, builder, apps } = invite
+        return {
+          email,
+          userInfo: {
+            admin: admin ? { global: true } : undefined,
+            builder: builder ? { global: true } : undefined,
+            apps: apps ? apps : undefined,
+          },
+        }
+      }),
+    })
+  },
+
+  /**
+   * Accepts a user invite as a body and will update the associated app roles.
+   * for an existing invite
+   * @param invite the invite code sent in the email
+   */
+  updateUserInvite: async invite => {
+    await API.post({
+      url: `/api/global/users/invite/update/${invite.code}`,
+      body: {
+        apps: invite.apps,
+      },
+    })
+  },
+
   /**
    * Retrieves the invitation associated with a provided code.
    * @param code The unique code for the target invite
@@ -156,6 +193,16 @@ export const buildUserEndpoints = API => ({
     })
   },
 
+  /**
+   * Retrieves the invitation associated with a provided code.
+   * @param code The unique code for the target invite
+   */
+  getUserInvites: async () => {
+    return await API.get({
+      url: `/api/global/users/invites`,
+    })
+  },
+
   /**
    * Invites multiple users to the current tenant.
    * @param users An array of users to invite
@@ -169,6 +216,7 @@ export const buildUserEndpoints = API => ({
           admin: user.admin ? { global: true } : undefined,
           builder: user.admin || user.builder ? { global: true } : undefined,
           userGroups: user.groups,
+          roles: user.apps ? user.apps : undefined,
         },
       })),
     })
diff --git a/packages/frontend-core/src/fetch/UserFetch.js b/packages/frontend-core/src/fetch/UserFetch.js
index 9aeadbc0f5..5372d0ec33 100644
--- a/packages/frontend-core/src/fetch/UserFetch.js
+++ b/packages/frontend-core/src/fetch/UserFetch.js
@@ -35,6 +35,7 @@ export default class UserFetch extends DataFetch {
         page: cursor,
         email: query.email,
         appId: query.appId,
+        paginated: query.paginated,
       })
       return {
         rows: res?.data || [],
diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index b2ac6b7804..63d6be6fa0 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -50,7 +50,7 @@ export interface SearchUsersRequest {
   page?: string
   email?: string
   appId?: string
-  userIds?: string[]
+  paginated?: boolean
 }
 
 export interface CreateAdminUserRequest {
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index e41a280b22..2971011682 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -185,16 +185,28 @@ export const destroy = async (ctx: any) => {
   }
 }
 
+export const getAppUsers = async (ctx: any) => {
+  const body = ctx.request.body as SearchUsersRequest
+  const users = await userSdk.getUsersByAppAccess(body?.appId)
+
+  ctx.body = { data: users }
+}
+
 export const search = async (ctx: any) => {
   const body = ctx.request.body as SearchUsersRequest
-  const paginated = await userSdk.paginatedUsers(body)
-  // user hashed password shouldn't ever be returned
-  for (let user of paginated.data) {
-    if (user) {
-      delete user.password
+
+  if (body.paginated === false) {
+    await getAppUsers(ctx)
+  } else {
+    const paginated = await userSdk.paginatedUsers(body)
+    // user hashed password shouldn't ever be returned
+    for (let user of paginated.data) {
+      if (user) {
+        delete user.password
+      }
     }
+    ctx.body = paginated
   }
-  ctx.body = paginated
 }
 
 // called internally by app server user fetch
@@ -242,12 +254,18 @@ export const onboardUsers = async (ctx: any) => {
     onboardingResponse = await userSdk.bulkCreate(assignUsers, groups)
     ctx.body = onboardingResponse
   } else if (emailConfigured) {
-    onboardingResponse = await inviteMultiple(ctx)
+    onboardingResponse = await invite(ctx)
   } else if (!emailConfigured) {
     const inviteRequest = ctx.request.body as InviteUsersRequest
+
+    let createdPasswords: any = {}
+
     const users: User[] = inviteRequest.map(invite => {
       let password = Math.random().toString(36).substring(2, 22)
 
+      // Temp password to be passed to the user.
+      createdPasswords[invite.email] = password
+
       return {
         email: invite.email,
         password,
@@ -259,19 +277,28 @@ export const onboardUsers = async (ctx: any) => {
       }
     })
     let bulkCreateReponse = await userSdk.bulkCreate(users, [])
-    onboardingResponse = {
+
+    // Apply temporary credentials
+    let createWithCredentials = {
       ...bulkCreateReponse,
+      successful: bulkCreateReponse?.successful.map(user => {
+        return {
+          ...user,
+          password: createdPasswords[user.email],
+        }
+      }),
       created: true,
     }
-    ctx.body = onboardingResponse
+
+    ctx.body = createWithCredentials
   } else {
     ctx.throw(400, "User onboarding failed")
   }
 }
 
 export const invite = async (ctx: any) => {
-  const request = ctx.request.body as InviteUserRequest
-  const response = await userSdk.invite([request])
+  const request = ctx.request.body as InviteUsersRequest
+  const response = await userSdk.invite(request)
 
   // explicitly throw for single user invite
   if (response.unsuccessful.length) {
diff --git a/packages/worker/src/api/routes/global/users.ts b/packages/worker/src/api/routes/global/users.ts
index a73462b235..db182a99c6 100644
--- a/packages/worker/src/api/routes/global/users.ts
+++ b/packages/worker/src/api/routes/global/users.ts
@@ -38,13 +38,6 @@ function buildInviteMultipleValidation() {
   ))
 }
 
-function buildInviteLookupValidation() {
-  // prettier-ignore
-  return auth.joiValidator.params(Joi.object({
-    code: Joi.string().required()
-  }).unknown(true))
-}
-
 const createUserAdminOnly = (ctx: any, next: any) => {
   if (!ctx.request.body._id) {
     return auth.adminOnly(ctx, next)
@@ -88,22 +81,34 @@ router
   .get("/api/global/roles/:appId")
   .post(
     "/api/global/users/invite",
-    auth.adminOnly,
+    auth.builderOrAdmin,
     buildInviteValidation(),
     controller.invite
   )
+  .post(
+    "/api/global/users/onboard",
+    auth.builderOrAdmin,
+    buildInviteMultipleValidation(),
+    controller.onboardUsers
+  )
   .post(
     "/api/global/users/multi/invite",
-    auth.adminOnly,
+    auth.builderOrAdmin,
     buildInviteMultipleValidation(),
     controller.inviteMultiple
   )
 
   // non-global endpoints
+  .get("/api/global/users/invite/:code", controller.checkInvite)
+  .post(
+    "/api/global/users/invite/update/:code",
+    auth.builderOrAdmin,
+    controller.updateInvite
+  )
   .get(
-    "/api/global/users/invite/:code",
-    buildInviteLookupValidation(),
-    controller.checkInvite
+    "/api/global/users/invites",
+    auth.builderOrAdmin,
+    controller.getUserInvites
   )
   .post(
     "/api/global/users/invite/accept",
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 4a72badc10..de1ea27546 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -56,11 +56,22 @@ export const countUsersByApp = async (appId: string) => {
   }
 }
 
+export const getUsersByAppAccess = async (appId?: string) => {
+  const opts: any = {
+    include_docs: true,
+    limit: 50,
+  }
+  let response: User[] = await usersCore.searchGlobalUsersByAppAccess(
+    appId,
+    opts
+  )
+  return response
+}
+
 export const paginatedUsers = async ({
   page,
   email,
   appId,
-  userIds,
 }: SearchUsersRequest = {}) => {
   const db = tenancy.getGlobalDB()
   // get one extra document, to have the next page
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index e9ba06227a..1e0d0beb97 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -130,11 +130,9 @@ export async function checkInviteCode(
 
 /** 
   Get all currently available user invitations.
-  @return {Object[]} A
+  @return {Object[]} A list of all objects containing invite metadata
 **/
-export async function getInviteCodes(
-  tenantIds?: string[] //should default to the current tenant of the user session.
-) {
+export async function getInviteCodes(tenantIds?: string[]) {
   const client = await getClient(redis.utils.Databases.INVITATIONS)
   const invites: any[] = await client.scan()
 

From 312c01a8793515195a8437cfc924bd49224b3c1d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Feb 2023 10:36:00 +0000
Subject: [PATCH 188/273] Prefer default config for google sheets in cloud,
 don't use env vars for regular auth

---
 packages/backend-core/src/configs/configs.ts  | 22 ++++++++++++++++---
 .../middleware/passport/datasource/google.ts  |  3 ++-
 .../server/src/integrations/googlesheets.ts   |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index 882c37ceb9..b46eef6834 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -154,11 +154,27 @@ export async function getGoogleConfig(): Promise<
   GoogleInnerConfig | undefined
 > {
   const config = await getGoogleConfigDoc()
-  if (config) {
-    return config.config
+  return config?.config
+}
+
+export async function getGoogleDatasourceConfig(): Promise<GoogleInnerConfig | undefined> {
+  if (!env.SELF_HOSTED) {
+    // always use the env vars in cloud
+    return getDefaultGoogleConfig()
   }
 
-  // Use google fallback configuration from env variables
+  // prefer the config in self-host
+  let config = await getGoogleConfig()
+
+  // fallback to env vars
+  if (!config || !config.activated) {
+    config = getDefaultGoogleConfig()
+  }
+
+  return config
+}
+
+export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
   if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
     return {
       clientID: environment.GOOGLE_CLIENT_ID!,
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index ff5224e437..32451cb8d2 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -12,7 +12,8 @@ type Passport = {
 }
 
 async function fetchGoogleCreds() {
-  const config = await configs.getGoogleConfig()
+  let config = await configs.getGoogleDatasourceConfig()
+
   if (!config) {
     throw new Error("No google configuration found")
   }
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index 2b54123bdb..290509eb4a 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -172,7 +172,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async connect() {
     try {
       // Initialise oAuth client
-      let googleConfig = await configs.getGoogleConfig()
+      let googleConfig = await configs.getGoogleDatasourceConfig()
       if (!googleConfig) {
         throw new HTTPError("Google config not found", 400)
       }

From ab69bbc2996b7b3c1b3520f2c9f9eff04a8b2e3c Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Feb 2023 11:03:56 +0000
Subject: [PATCH 189/273] lint

---
 packages/backend-core/src/configs/configs.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index b46eef6834..38e7bcbb29 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -157,7 +157,9 @@ export async function getGoogleConfig(): Promise<
   return config?.config
 }
 
-export async function getGoogleDatasourceConfig(): Promise<GoogleInnerConfig | undefined> {
+export async function getGoogleDatasourceConfig(): Promise<
+  GoogleInnerConfig | undefined
+> {
   if (!env.SELF_HOSTED) {
     // always use the env vars in cloud
     return getDefaultGoogleConfig()

From f60e435c3c040a27d516f3f824c2ea276c63a98a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Feb 2023 11:11:24 +0000
Subject: [PATCH 190/273] v2.3.18-alpha.15

---
 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 39a4de05fa..01659623bb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 658641bb1b..de2017ecd6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.14",
+    "@budibase/types": "2.3.18-alpha.15",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ebf2790cb5..90c79ef807 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.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "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.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.15",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d5fc757ca3..27cc1f31e4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.14",
-    "@budibase/client": "2.3.18-alpha.14",
-    "@budibase/frontend-core": "2.3.18-alpha.14",
-    "@budibase/string-templates": "2.3.18-alpha.14",
+    "@budibase/bbui": "2.3.18-alpha.15",
+    "@budibase/client": "2.3.18-alpha.15",
+    "@budibase/frontend-core": "2.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.15",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e3afdf555c..219f5ed1f3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "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.3.18-alpha.14",
-    "@budibase/string-templates": "2.3.18-alpha.14",
-    "@budibase/types": "2.3.18-alpha.14",
+    "@budibase/backend-core": "2.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.15",
+    "@budibase/types": "2.3.18-alpha.15",
     "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 6d46da138c..c9711433a7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "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.3.18-alpha.14",
-    "@budibase/frontend-core": "2.3.18-alpha.14",
-    "@budibase/string-templates": "2.3.18-alpha.14",
+    "@budibase/bbui": "2.3.18-alpha.15",
+    "@budibase/frontend-core": "2.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.15",
     "@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 938dca82aa..927f40c568 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.14",
+    "@budibase/bbui": "2.3.18-alpha.15",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 051af9233e..21573b4d74 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 84337f0113..a374485881 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.14",
-    "@budibase/client": "2.3.18-alpha.14",
+    "@budibase/backend-core": "2.3.18-alpha.15",
+    "@budibase/client": "2.3.18-alpha.15",
     "@budibase/pro": "2.3.18-alpha.14",
-    "@budibase/string-templates": "2.3.18-alpha.14",
-    "@budibase/types": "2.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.15",
+    "@budibase/types": "2.3.18-alpha.15",
     "@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 a8c2e0ccc2..fe03c45bdd 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "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 eac644ab11..19bb756723 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "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 84b5d69ee0..027f363844 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.14",
+  "version": "2.3.18-alpha.15",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.14",
+    "@budibase/backend-core": "2.3.18-alpha.15",
     "@budibase/pro": "2.3.18-alpha.14",
-    "@budibase/string-templates": "2.3.18-alpha.14",
-    "@budibase/types": "2.3.18-alpha.14",
+    "@budibase/string-templates": "2.3.18-alpha.15",
+    "@budibase/types": "2.3.18-alpha.15",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 982a7a17aaba833c77c5328a364f6645fb8555c2 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Feb 2023 11:14:33 +0000
Subject: [PATCH 191/273] Update pro version to 2.3.18-alpha.15

---
 packages/server/package.json |   2 +-
 packages/server/yarn.lock    | 286 ++++++++++-
 packages/worker/package.json |   2 +-
 packages/worker/yarn.lock    | 936 ++++++++++++++++++++++++++++++++++-
 4 files changed, 1177 insertions(+), 49 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index a374485881..39210f7d4a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.15",
     "@budibase/client": "2.3.18-alpha.15",
-    "@budibase/pro": "2.3.18-alpha.14",
+    "@budibase/pro": "2.3.18-alpha.15",
     "@budibase/string-templates": "2.3.18-alpha.15",
     "@budibase/types": "2.3.18-alpha.15",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index f39c5387d7..465b849997 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.14":
-  version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.14.tgz#84c10d5840a61437c77c62cb27aa52a48ebea34c"
-  integrity sha512-8MlNAJNFhct4CwN49wu7EBZJQyToSnUlhZeBlvv94AQxKF6iTzTq40CoNIMCv69nzbeTbDw/ImG7dPW8kBHjpg==
+"@budibase/backend-core@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.15.tgz#62e17491c4f546ff0e772005f0a6b4c55f9d2b63"
+  integrity sha512-TX7LU0E3EoCxcMSZFSO/CmQdhkHYBjT5y1O/UhNMzp9xOVsFUcuFNDXFhylruHnWo7VnbiIBwYDxcXgg0Bz9ig==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.15"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1367,6 +1367,31 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -1392,18 +1417,20 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.14":
-  version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.14.tgz#037045c7c315c23d2981abdcd35fb18bc1a4727d"
-  integrity sha512-15OFi/Kycp8lYTP424fMoF1l+l3M/0pcDOHpkn0sHix4KhQz2mnqE2iu3k1FR/w9tpPEGHwdd4++BHiDw6h1ZQ==
+"@budibase/pro@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.15.tgz#5237b6f9b8f8627cd46bc014b9be6c083412a370"
+  integrity sha512-owEtr2peoF4zpPQ+UZepfi4nYxWRKA/qZa/748qJc03T3hOdU7dXj6Nkjl7nc0PHuYdZ3NewJKK5gnr2wMb2+A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.14"
+    "@budibase/backend-core" "2.3.18-alpha.15"
+    "@budibase/string-templates" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.15"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     jsonwebtoken "8.5.1"
     lru-cache "^7.14.1"
+    memorystream "^0.3.1"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
@@ -1424,10 +1451,22 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18-alpha.14":
+"@budibase/string-templates@2.3.18-alpha.14":
   version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.14.tgz#3fa32f0b262169c4c8679f38f5e0e321f43f54dc"
-  integrity sha512-mkp0GAqB7zAeLSNV8//dBjSH9dP9z8Q/Sxv29zlExKAxBHlUcYIB442QZJ8Z2V8Tzb+DlRIK7SLTG622cfyUgg==
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.18-alpha.14.tgz#c3b8d45ced321088c76bcda4efd7e9c7635a2788"
+  integrity sha512-xamfugDHgvzupe3EkvTY7ymXn9cRxb61nKaap52NsQQl8Zby2W2qJNVBNnuSnhnkQQeF5EatIFgGni+yBDchtQ==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
+"@budibase/types@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.15.tgz#a7b4189b5dd823100f3785b5a991e428529c7e21"
+  integrity sha512-94+OIOpY4d+kdsXMIXU0RYB8WKQN8y8ueqJZt1OUHvSgCnb8CWIJoVv0LlHFgiW7871JPO2KS6nbpndDXeJhgA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
@@ -4230,7 +4269,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -4277,6 +4316,15 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -4420,6 +4468,13 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -5500,6 +5555,13 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -5941,6 +6003,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 default-shell@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
@@ -6417,6 +6486,11 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -7617,6 +7691,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -7679,6 +7761,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
 getopts@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4"
@@ -7966,7 +8055,24 @@ gtoken@^5.0.4:
     google-p12-pem "^3.1.3"
     jws "^4.0.0"
 
-handlebars@^4.7.7:
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -8060,6 +8166,14 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -8073,6 +8187,13 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -8085,6 +8206,16 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
 hexoid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
@@ -8119,6 +8250,14 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -8595,6 +8734,13 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -8701,6 +8847,13 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -8723,6 +8876,13 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -8763,6 +8923,13 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -8878,6 +9045,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -10072,7 +10244,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -10086,12 +10258,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -10518,6 +10690,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -10628,6 +10805,21 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -10643,7 +10835,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -10875,7 +11067,7 @@ memory-pager@^1.0.2:
   resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
   integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==
 
-memorystream@0.3.1:
+memorystream@0.3.1, memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
@@ -10900,7 +11092,7 @@ methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -13096,6 +13288,21 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -13444,6 +13651,11 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -14232,6 +14444,11 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
@@ -14716,6 +14933,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
 to-json-schema@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
@@ -14984,6 +15206,13 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typeof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
@@ -15344,6 +15573,14 @@ vm2@3.9.11:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
+vm2@^3.9.4:
+  version "3.9.14"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
+  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -15905,6 +16142,11 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 027f363844..28c1566697 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.15",
-    "@budibase/pro": "2.3.18-alpha.14",
+    "@budibase/pro": "2.3.18-alpha.15",
     "@budibase/string-templates": "2.3.18-alpha.15",
     "@budibase/types": "2.3.18-alpha.15",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index dc2b635259..d382f67ed0 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.14":
-  version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.14.tgz#84c10d5840a61437c77c62cb27aa52a48ebea34c"
-  integrity sha512-8MlNAJNFhct4CwN49wu7EBZJQyToSnUlhZeBlvv94AQxKF6iTzTq40CoNIMCv69nzbeTbDw/ImG7dPW8kBHjpg==
+"@budibase/backend-core@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.15.tgz#62e17491c4f546ff0e772005f0a6b4c55f9d2b63"
+  integrity sha512-TX7LU0E3EoCxcMSZFSO/CmQdhkHYBjT5y1O/UhNMzp9xOVsFUcuFNDXFhylruHnWo7VnbiIBwYDxcXgg0Bz9ig==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.15"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -514,6 +514,31 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
 "@budibase/nano@10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
@@ -539,24 +564,38 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.14":
-  version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.14.tgz#037045c7c315c23d2981abdcd35fb18bc1a4727d"
-  integrity sha512-15OFi/Kycp8lYTP424fMoF1l+l3M/0pcDOHpkn0sHix4KhQz2mnqE2iu3k1FR/w9tpPEGHwdd4++BHiDw6h1ZQ==
+"@budibase/pro@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.15.tgz#5237b6f9b8f8627cd46bc014b9be6c083412a370"
+  integrity sha512-owEtr2peoF4zpPQ+UZepfi4nYxWRKA/qZa/748qJc03T3hOdU7dXj6Nkjl7nc0PHuYdZ3NewJKK5gnr2wMb2+A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.14"
+    "@budibase/backend-core" "2.3.18-alpha.15"
+    "@budibase/string-templates" "2.3.18-alpha.14"
+    "@budibase/types" "2.3.18-alpha.15"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     jsonwebtoken "8.5.1"
     lru-cache "^7.14.1"
+    memorystream "^0.3.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18-alpha.14":
+"@budibase/string-templates@2.3.18-alpha.14":
   version "2.3.18-alpha.14"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.14.tgz#3fa32f0b262169c4c8679f38f5e0e321f43f54dc"
-  integrity sha512-mkp0GAqB7zAeLSNV8//dBjSH9dP9z8Q/Sxv29zlExKAxBHlUcYIB442QZJ8Z2V8Tzb+DlRIK7SLTG622cfyUgg==
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.18-alpha.14.tgz#c3b8d45ced321088c76bcda4efd7e9c7635a2788"
+  integrity sha512-xamfugDHgvzupe3EkvTY7ymXn9cRxb61nKaap52NsQQl8Zby2W2qJNVBNnuSnhnkQQeF5EatIFgGni+yBDchtQ==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
+"@budibase/types@2.3.18-alpha.15":
+  version "2.3.18-alpha.15"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.15.tgz#a7b4189b5dd823100f3785b5a991e428529c7e21"
+  integrity sha512-94+OIOpY4d+kdsXMIXU0RYB8WKQN8y8ueqJZt1OUHvSgCnb8CWIJoVv0LlHFgiW7871JPO2KS6nbpndDXeJhgA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -1930,7 +1969,7 @@ acorn-jsx@^5.2.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -1950,6 +1989,11 @@ acorn@^8.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
+acorn@^8.7.0:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+
 after-all-results@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0"
@@ -2060,7 +2104,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -2082,11 +2126,40 @@ argsarray@0.0.1:
   resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"
   integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg==
 
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
+
 asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -2104,6 +2177,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
+
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
@@ -2138,11 +2216,23 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
 atomic-sleep@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
 aws-cloudfront-sign@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d"
@@ -2279,6 +2369,19 @@ base64url@3.x.x, base64url@^3.0.1:
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 basic-auth@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
@@ -2357,6 +2460,22 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -2468,6 +2587,21 @@ bytes@3.1.2, bytes@^3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
 cache-content-type@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
@@ -2622,6 +2756,16 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
   integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
@@ -2694,6 +2838,14 @@ collect-v8-coverage@^1.0.0:
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
   integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2750,7 +2902,7 @@ commoner@^0.10.1:
     q "^1.1.2"
     recast "^0.11.17"
 
-component-emitter@^1.3.0:
+component-emitter@^1.2.1, component-emitter@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -2780,6 +2932,13 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -2849,6 +3008,11 @@ cookies@~0.8.0:
     depd "~2.0.0"
     keygrip "~1.1.0"
 
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+
 copyfiles@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5"
@@ -2961,6 +3125,11 @@ dateformat@^4.5.1:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
 
+dayjs@^1.10.4:
+  version "1.11.7"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
+  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+
 dd-trace@3.13.2:
   version "3.13.2"
   resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-3.13.2.tgz#95b1ec480ab9ac406e1da7591a8c6f678d3799fd"
@@ -3001,6 +3170,13 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, d
   dependencies:
     ms "2.1.2"
 
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -3013,6 +3189,11 @@ debuglog@^1.0.0:
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
 
+decode-uri-component@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -3052,6 +3233,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 defer-to-connect@^1.0.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
@@ -3078,6 +3266,28 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3371,6 +3581,11 @@ end-stream@~0.1.0:
   dependencies:
     write-stream "~0.4.3"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
 errno@~0.1.1:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -3635,6 +3850,19 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-tilde@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
@@ -3658,6 +3886,21 @@ express-useragent@^1.0.15:
   resolved "https://registry.yarnpkg.com/express-useragent/-/express-useragent-1.0.15.tgz#cefda5fa4904345d51d3368b117a8dd4124985d9"
   integrity sha512-eq5xMiYCYwFPoekffMjvEIk+NWdlQY9Y38OsTyl13IvA728vKT+q/CSERYWzcw93HGBJcIqMIsZC5CZGARPVdg==
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@@ -3672,6 +3915,20 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -3784,6 +4041,16 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -3848,6 +4115,11 @@ follow-redirects@^1.15.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -3900,6 +4172,13 @@ forwarded-parse@^2.1.0:
   resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325"
   integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@^0.5.2, fresh@~0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -3991,6 +4270,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -4028,6 +4315,18 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
+
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -4172,6 +4471,35 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4224,6 +4552,52 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -4236,6 +4610,16 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
 hexoid@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
@@ -4253,6 +4637,14 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -4524,6 +4916,20 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4551,7 +4957,7 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@~1.1.6:
+is-buffer@^1.1.5, is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -4587,6 +4993,20 @@ is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -4594,6 +5014,43 @@ is-date-object@^1.0.1:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -4678,6 +5135,20 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -4688,11 +5159,25 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -4706,6 +5191,13 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -4758,6 +5250,11 @@ is-windows@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
   integrity sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
@@ -4768,7 +5265,7 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
@@ -4778,6 +5275,23 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -5388,6 +5902,30 @@ keyv@^4.0.0:
     compress-brotli "^1.3.8"
     json-buffer "3.0.1"
 
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0, kind-of@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -5651,6 +6189,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
@@ -5721,12 +6264,27 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5805,6 +6363,18 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
+  dependencies:
+    object-visit "^1.0.0"
+
 mapcap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a"
@@ -5861,6 +6431,11 @@ memdown@1.4.1:
     ltgt "~2.2.0"
     safe-buffer "~5.1.1"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
+
 merge-descriptors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5881,6 +6456,25 @@ methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
+micromatch@^3.1.5:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -5938,6 +6532,11 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass@^3.0.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
@@ -5953,6 +6552,14 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp-classic@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
@@ -5985,6 +6592,11 @@ mri@1.1.4:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
   integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -6026,6 +6638,23 @@ nan@^2.15.0, nan@^2.16.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 napi-macros@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
@@ -6051,6 +6680,11 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+neo-async@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 next-line@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-line/-/next-line-1.1.0.tgz#fcae57853052b6a9bae8208e40dd7d3c2d304603"
@@ -6234,6 +6868,15 @@ object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-filter-sequence@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/object-filter-sequence/-/object-filter-sequence-1.0.0.tgz#10bb05402fff100082b80d7e83991b10db411692"
@@ -6256,6 +6899,13 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
+  dependencies:
+    isobject "^3.0.0"
+
 object.assign@^4.1.2:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
@@ -6275,6 +6925,13 @@ object.entries@^1.0.4, object.entries@^1.1.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
+  dependencies:
+    isobject "^3.0.1"
+
 on-finished@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -6430,6 +7087,11 @@ parseurl@^1.3.2, parseurl@^1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
+
 passport-google-oauth1@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc"
@@ -6634,6 +7296,11 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+
 posthog-node@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-1.3.0.tgz#804ed2f213a2f05253f798bf9569d55a9cad94f7"
@@ -7170,6 +7837,14 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
@@ -7203,11 +7878,36 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-slash@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d"
   integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==
 
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+
 request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -7291,6 +7991,11 @@ resolve-path@^1.4.0:
     http-errors "~1.6.2"
     path-is-absolute "1.0.1"
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
+
 resolve.exports@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
@@ -7336,6 +8041,11 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
 retry@^0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
@@ -7406,6 +8116,13 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
+  dependencies:
+    ret "~0.1.10"
+
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -7426,6 +8143,11 @@ sax@>=0.1.1, sax@>=0.6.0:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -7484,6 +8206,16 @@ set-cookie-serde@^1.0.0:
   resolved "https://registry.yarnpkg.com/set-cookie-serde/-/set-cookie-serde-1.0.0.tgz#bcf9c260ed2212ac4005a53eacbaaa37c07ac452"
   integrity sha512-Vq8e5GsupfJ7okHIvEPcfs5neCo7MZ1ZuWrO3sllYi3DOWt6bSSCpADzqXjz3k0fXehnoFIrmmhty9IN6U6BXQ==
 
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -7561,6 +8293,36 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sonic-boom@^1.0.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e"
@@ -7569,6 +8331,17 @@ sonic-boom@^1.0.2:
     atomic-sleep "^1.0.0"
     flatstr "^1.0.12"
 
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
@@ -7577,6 +8350,11 @@ source-map-support@0.5.13:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
 source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -7584,6 +8362,11 @@ source-map@^0.4.2:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.6, source-map@~0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
+
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -7601,11 +8384,6 @@ source-map@^0.8.0-beta.0:
   dependencies:
     whatwg-url "^7.0.0"
 
-source-map@~0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
 spark-md5@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d"
@@ -7621,6 +8399,13 @@ split-ca@^1.0.1:
   resolved "https://registry.yarnpkg.com/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6"
   integrity sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
@@ -7700,6 +8485,14 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 statuses@2.0.1, statuses@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
@@ -7836,6 +8629,11 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 sublevel-pouchdb@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f"
@@ -8045,11 +8843,31 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
+  dependencies:
+    kind-of "^3.0.2"
+
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -8057,6 +8875,16 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 to-source-code@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-source-code/-/to-source-code-1.0.2.tgz#dd136bdb1e1dbd80bbeacf088992678e9070bfea"
@@ -8238,11 +9066,23 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typescript@4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
   integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
+uglify-js@^3.1.4:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 uid2@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44"
@@ -8276,6 +9116,16 @@ unicode-substring@^0.1.0:
   resolved "https://registry.yarnpkg.com/unicode-substring/-/unicode-substring-0.1.0.tgz#6120ce3c390385dbcd0f60c32b9065c4181d4b36"
   integrity sha512-36Xaw9wXi7MB/3/EQZZHkZyyiRNa9i3k9YtPAz2KfqMVH2xutdXyMHn4Igarmnvr+wOrfWa/6njhY+jPpXN2EQ==
 
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -8298,6 +9148,14 @@ unpipe@1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -8348,6 +9206,11 @@ urijs@^1.19.2:
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
   integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
+
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -8371,6 +9234,11 @@ url@0.10.3:
     punycode "1.3.2"
     querystring "0.2.0"
 
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -8434,6 +9302,14 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vm2@^3.9.4:
+  version "3.9.14"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
+  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -8525,6 +9401,11 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -8657,6 +9538,11 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"

From 862ba6ce924a09726c791f451c749196166ad813 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 12:29:13 +0000
Subject: [PATCH 192/273] Update spacing, borders and sizing

---
 packages/bbui/src/Form/Core/Picker.svelte     |   4 +-
 packages/bbui/src/Form/Core/Select.svelte     |   2 +
 packages/bbui/src/Form/Select.svelte          |   2 +
 .../src/components/common/RoleSelect.svelte   |   4 +
 .../_components/BuilderSidePanel.svelte       | 356 ++++++++++--------
 5 files changed, 202 insertions(+), 166 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 5cef0f9213..4e7bd7ba78 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -33,6 +33,8 @@
   export let sort = false
   export let fetchTerm = null
   export let customPopoverHeight
+  export let align = "left"
+
   const dispatch = createEventDispatcher()
 
   let searchTerm = null
@@ -131,7 +133,7 @@
 
 <Popover
   anchor={button}
-  align="left"
+  align={align || "left"}
   bind:this={popover}
   {open}
   on:close={() => (open = false)}
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index aa9071607e..a1ae2107c8 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -18,6 +18,7 @@
   export let autoWidth = false
   export let autocomplete = false
   export let sort = false
+  export let align
 
   const dispatch = createEventDispatcher()
 
@@ -66,6 +67,7 @@
   {fieldColour}
   {options}
   {autoWidth}
+  {align}
   {getOptionLabel}
   {getOptionValue}
   {getOptionIcon}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 76fe613c92..44ce51eff2 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -22,6 +22,7 @@
   export let tooltip = ""
   export let autocomplete = false
   export let customPopoverHeight
+  export let align
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -48,6 +49,7 @@
     {placeholder}
     {autoWidth}
     {sort}
+    {align}
     {getOptionLabel}
     {getOptionValue}
     {getOptionIcon}
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 645e82c8ba..f94f048945 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -11,6 +11,8 @@
   export let quiet = false
   export let allowPublic = true
   export let allowRemove = false
+  export let disabled = false
+  export let align
 
   const dispatch = createEventDispatcher()
   const RemoveID = "remove"
@@ -59,6 +61,8 @@
 <Select
   {autoWidth}
   {quiet}
+  {disabled}
+  {align}
   bind:value
   on:change={onChange}
   {options}
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index ccd6071b90..c99ec01770 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -81,7 +81,16 @@
     await usersFetch.refresh()
 
     filteredUsers = $usersFetch.rows.map(user => {
-      const appRole = Object.keys(user.roles).find(x => x === prodAppId)
+      const isBuilderOrAdmin = user.admin?.global || user.builder?.global
+      let role = undefined
+      if (isBuilderOrAdmin) {
+        role = "ADMIN"
+      } else {
+        const appRole = Object.keys(user.roles).find(x => x === prodAppId)
+        if (appRole) {
+          role = user.roles[appRole]
+        }
+      }
 
       // if (
       //   !appRole &&
@@ -94,7 +103,8 @@
 
       return {
         ...user,
-        role: !appRole ? undefined : user.roles[appRole],
+        role,
+        isBuilderOrAdmin,
       }
     })
   }
@@ -423,167 +433,172 @@
     </span>
   </div>
 
-  {#if promptInvite && !userOnboardResponse}
-    <Layout gap="S" paddingX="XL">
-      <div class="invite-header">
-        <Heading size="XS">No user found</Heading>
-        <div class="invite-directions">
-          Add a valid email to invite a new user
-        </div>
-      </div>
-      <div class="invite-form">
-        <span>{query || ""}</span>
-        <ActionButton
-          icon="UserAdd"
-          disabled={!queryIsEmail || inviting}
-          on:click={onInviteUser}
-        >
-          Add user
-        </ActionButton>
-      </div>
-    </Layout>
-  {/if}
-
-  {#if !promptInvite}
-    <Layout gap="L" noPadding>
-      {#if filteredInvites?.length}
-        <Layout noPadding gap="XS">
-          <div class="auth-entity-header">
-            <div class="auth-entity-title">Pending invites</div>
-            <div class="auth-entity-access-title">Access</div>
+  <div class="body">
+    {#if promptInvite && !userOnboardResponse}
+      <Layout gap="S" paddingX="XL">
+        <div class="invite-header">
+          <Heading size="XS">No user found</Heading>
+          <div class="invite-directions">
+            Add a valid email to invite a new user
           </div>
-          {#each filteredInvites as invite}
-            <div class="auth-entity">
-              <div class="details">
-                <div class="user-email" title={invite.email}>
-                  {invite.email}
-                </div>
-              </div>
-              <div class="auth-entity-access">
-                <RoleSelect
-                  placeholder={false}
-                  value={invite.info.apps?.[prodAppId]}
-                  allowRemove={invite.info.apps?.[prodAppId]}
-                  allowPublic={false}
-                  quiet={true}
-                  on:change={e => {
-                    onUpdateUserInvite(invite, e.detail)
-                  }}
-                  on:remove={() => {
-                    onUninviteAppUser(invite)
-                  }}
-                />
-              </div>
-            </div>
-          {/each}
-        </Layout>
-      {/if}
-
-      {#if $licensing.groupsEnabled && filteredGroups?.length}
-        <Layout noPadding gap="XS">
-          <div class="auth-entity-header">
-            <div class="auth-entity-title">Groups</div>
-            <div class="auth-entity-access-title">Access</div>
-          </div>
-          {#each filteredGroups as group}
-            <div
-              class="auth-entity group"
-              on:click={() => {
-                if (selectedGroup != group._id) {
-                  selectedGroup = group._id
-                } else {
-                  selectedGroup = null
-                }
-              }}
-              on:keydown={() => {}}
-            >
-              <div class="details">
-                <GroupIcon {group} size="S" />
-                <div>
-                  {group.name}
-                </div>
-                <div class="auth-entity-meta">
-                  {`${group.users?.length} user${
-                    group.users?.length != 1 ? "s" : ""
-                  }`}
-                </div>
-              </div>
-              <div class="auth-entity-access">
-                <RoleSelect
-                  placeholder={false}
-                  value={group.role}
-                  allowRemove={group.role}
-                  allowPublic={false}
-                  quiet={true}
-                  on:change={e => {
-                    onUpdateGroup(group, e.detail)
-                  }}
-                  on:remove={() => {
-                    onUpdateGroup(group)
-                  }}
-                />
-              </div>
-            </div>
-          {/each}
-        </Layout>
-      {/if}
-
-      {#if filteredUsers?.length}
-        <div class="auth-entity-section">
-          <div class="auth-entity-header ">
-            <div class="auth-entity-title">Users</div>
-            <div class="auth-entity-access-title">Access</div>
-          </div>
-          {#each allUsers as user}
-            <div class="auth-entity">
-              <div class="details">
-                <div class="user-email" title={user.email}>
-                  {user.email}
-                </div>
-                <div class="auth-entity-meta">
-                  {userTitle(user)}
-                </div>
-              </div>
-              <div class="auth-entity-access" class:muted={user.group}>
-                <RoleSelect
-                  note={roleNote(user)}
-                  placeholder={false}
-                  value={user.role}
-                  allowRemove={user.role && !user.group}
-                  allowPublic={false}
-                  quiet={true}
-                  on:change={e => {
-                    onUpdateUser(user, e.detail)
-                  }}
-                  on:remove={() => {
-                    onUpdateUser(user)
-                  }}
-                />
-              </div>
-            </div>
-          {/each}
         </div>
-      {/if}
-    </Layout>
-  {/if}
-
-  {#if userOnboardResponse?.created}
-    <Layout gap="S" paddingX="XL">
-      <div class="invite-header">
-        <Heading size="XS">User added!</Heading>
-        <div class="invite-directions">
-          Email invites are not available without SMTP configuration. Here is
-          the password that has been generated for this user.
+        <div class="invite-form">
+          <span>{query || ""}</span>
+          <ActionButton
+            icon="UserAdd"
+            disabled={!queryIsEmail || inviting}
+            on:click={onInviteUser}
+          >
+            Add user
+          </ActionButton>
         </div>
-      </div>
-      <div>
-        <CopyInput
-          value={userOnboardResponse.successful[0]?.password}
-          label="Password"
-        />
-      </div>
-    </Layout>
-  {/if}
+      </Layout>
+    {/if}
+
+    {#if !promptInvite}
+      <Layout gap="L" noPadding>
+        {#if filteredInvites?.length}
+          <Layout noPadding gap="XS">
+            <div class="auth-entity-header">
+              <div class="auth-entity-title">Pending invites</div>
+              <div class="auth-entity-access-title">Access</div>
+            </div>
+            {#each filteredInvites as invite}
+              <div class="auth-entity">
+                <div class="details">
+                  <div class="user-email" title={invite.email}>
+                    {invite.email}
+                  </div>
+                </div>
+                <div class="auth-entity-access">
+                  <RoleSelect
+                    placeholder={false}
+                    value={invite.info.apps?.[prodAppId]}
+                    allowRemove={invite.info.apps?.[prodAppId]}
+                    allowPublic={false}
+                    quiet={true}
+                    on:change={e => {
+                      onUpdateUserInvite(invite, e.detail)
+                    }}
+                    on:remove={() => {
+                      onUninviteAppUser(invite)
+                    }}
+                  />
+                </div>
+              </div>
+            {/each}
+          </Layout>
+        {/if}
+
+        {#if $licensing.groupsEnabled && filteredGroups?.length}
+          <Layout noPadding gap="XS">
+            <div class="auth-entity-header">
+              <div class="auth-entity-title">Groups</div>
+              <div class="auth-entity-access-title">Access</div>
+            </div>
+            {#each filteredGroups as group}
+              <div
+                class="auth-entity group"
+                on:click={() => {
+                  if (selectedGroup != group._id) {
+                    selectedGroup = group._id
+                  } else {
+                    selectedGroup = null
+                  }
+                }}
+                on:keydown={() => {}}
+              >
+                <div class="details">
+                  <GroupIcon {group} size="S" />
+                  <div>
+                    {group.name}
+                  </div>
+                  <div class="auth-entity-meta">
+                    {`${group.users?.length} user${
+                      group.users?.length != 1 ? "s" : ""
+                    }`}
+                  </div>
+                </div>
+                <div class="auth-entity-access">
+                  <RoleSelect
+                    placeholder={false}
+                    value={group.role}
+                    allowRemove={group.role}
+                    allowPublic={false}
+                    quiet={true}
+                    on:change={e => {
+                      onUpdateGroup(group, e.detail)
+                    }}
+                    on:remove={() => {
+                      onUpdateGroup(group)
+                    }}
+                  />
+                </div>
+              </div>
+            {/each}
+          </Layout>
+        {/if}
+
+        {#if filteredUsers?.length}
+          <div class="auth-entity-section">
+            <div class="auth-entity-header ">
+              <div class="auth-entity-title">Users</div>
+              <div class="auth-entity-access-title">Access</div>
+            </div>
+            {#each allUsers as user}
+              <div class="auth-entity">
+                <div class="details">
+                  <div class="user-email" title={user.email}>
+                    {user.email}
+                  </div>
+                  <div class="auth-entity-meta">
+                    {userTitle(user)}
+                  </div>
+                </div>
+                <div class="auth-entity-access" class:muted={user.group}>
+                  <RoleSelect
+                    note={roleNote(user)}
+                    placeholder={false}
+                    value={user.role}
+                    allowRemove={user.role && !user.group}
+                    allowPublic={false}
+                    quiet={true}
+                    on:change={e => {
+                      onUpdateUser(user, e.detail)
+                    }}
+                    on:remove={() => {
+                      onUpdateUser(user)
+                    }}
+                    disabled={user.isBuilderOrAdmin}
+                    autoWidth
+                    align="right"
+                  />
+                </div>
+              </div>
+            {/each}
+          </div>
+        {/if}
+      </Layout>
+    {/if}
+
+    {#if userOnboardResponse?.created}
+      <Layout gap="S" paddingX="XL">
+        <div class="invite-header">
+          <Heading size="XS">User added!</Heading>
+          <div class="invite-directions">
+            Email invites are not available without SMTP configuration. Here is
+            the password that has been generated for this user.
+          </div>
+        </div>
+        <div>
+          <CopyInput
+            value={userOnboardResponse.successful[0]?.password}
+            label="Password"
+          />
+        </div>
+      </Layout>
+    {/if}
+  </div>
 </div>
 
 <style>
@@ -617,6 +632,9 @@
     white-space: nowrap;
   }
 
+  .auth-entity-access {
+    margin-right: var(--spacing-m);
+  }
   .auth-entity-access.muted :global(.spectrum-Picker-label),
   .auth-entity-access.muted :global(.spectrum-StatusLight) {
     opacity: 0.7;
@@ -634,7 +652,7 @@
   .auth-entity,
   .auth-entity-header {
     display: grid;
-    grid-template-columns: 65% auto;
+    grid-template-columns: 1fr 100px;
     align-items: center;
     gap: var(--spacing-xl);
   }
@@ -657,10 +675,8 @@
     background: var(--background);
     border-left: var(--border-light);
     z-index: 3;
-    padding: var(--spacing-xl) 0px;
     display: flex;
     flex-direction: column;
-    gap: var(--spacing-xl);
     overflow-y: auto;
     overflow-x: hidden;
     transition: transform 130ms ease-out;
@@ -689,8 +705,10 @@
   #builder-side-panel-container .search {
     padding-top: var(--spacing-m);
     padding-bottom: var(--spacing-m);
-    border-top: 1px solid var(--spectrum-alias-border-color-mid);
-    border-bottom: 1px solid var(--spectrum-alias-border-color-mid);
+    border-top: var(--border-light);
+    border-bottom: var(--border-light);
+    border-left: 2px solid transparent;
+    border-right: 2px solid transparent;
   }
 
   #builder-side-panel-container .search :global(input) {
@@ -721,6 +739,7 @@
   }
 
   .builder-side-panel-header {
+    height: 58px;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -732,4 +751,11 @@
     gap: var(--spacing-s);
     flex-direction: column;
   }
+
+  .body {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-xl);
+    padding: var(--spacing-xl) 0;
+  }
 </style>

From a6c7277a2a84626cb8ba56b5538eda8555f8a32a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 12:32:22 +0000
Subject: [PATCH 193/273] Update user text color

---
 .../app/[application]/_components/BuilderSidePanel.svelte       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index c99ec01770..b53b218c74 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -661,12 +661,14 @@
     display: flex;
     align-items: center;
     gap: var(--spacing-m);
+    color: var(--spectrum-global-color-gray-900);
   }
 
   .auth-entity .user-email {
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    color: var(--spectrum-global-color-gray-900);
   }
 
   #builder-side-panel-container {

From a44729d7ecbf6a2d062339820394129ceff1c4d0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 12:49:40 +0000
Subject: [PATCH 194/273] Add role footer for admins and developers, remove
 wasted API calls

---
 packages/bbui/src/Form/Core/Picker.svelte     | 14 +++++++++++++
 packages/bbui/src/Form/Core/Select.svelte     |  2 ++
 packages/bbui/src/Form/Select.svelte          |  2 ++
 .../src/components/common/RoleSelect.svelte   | 21 +++++++++++++------
 .../_components/BuilderSidePanel.svelte       | 20 ++++++++++++------
 5 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 4e7bd7ba78..f5fd3750d4 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -34,6 +34,7 @@
   export let fetchTerm = null
   export let customPopoverHeight
   export let align = "left"
+  export let footer = null
 
   const dispatch = createEventDispatcher()
 
@@ -210,6 +211,12 @@
         {/each}
       {/if}
     </ul>
+
+    {#if footer}
+      <div class="footer">
+        {footer}
+      </div>
+    {/if}
   </div>
 </Popover>
 
@@ -286,4 +293,11 @@
   .popover-content :global(.spectrum-Search .spectrum-Textfield-icon) {
     top: 9px;
   }
+
+  .footer {
+    padding: 4px 12px 12px 12px;
+    font-style: italic;
+    max-width: 160px;
+    font-size: 12px;
+  }
 </style>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index a1ae2107c8..a329933670 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -19,6 +19,7 @@
   export let autocomplete = false
   export let sort = false
   export let align
+  export let footer = null
 
   const dispatch = createEventDispatcher()
 
@@ -68,6 +69,7 @@
   {options}
   {autoWidth}
   {align}
+  {footer}
   {getOptionLabel}
   {getOptionValue}
   {getOptionIcon}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 44ce51eff2..17074968fa 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -23,6 +23,7 @@
   export let autocomplete = false
   export let customPopoverHeight
   export let align
+  export let footer = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -50,6 +51,7 @@
     {autoWidth}
     {sort}
     {align}
+    {footer}
     {getOptionLabel}
     {getOptionValue}
     {getOptionIcon}
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index f94f048945..6a1448b714 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -13,16 +13,24 @@
   export let allowRemove = false
   export let disabled = false
   export let align
+  export let footer = null
+  export let allowedRoles = null
 
   const dispatch = createEventDispatcher()
   const RemoveID = "remove"
 
-  $: options = getOptions($roles, allowPublic, allowRemove)
+  $: options = getOptions($roles, allowPublic, allowRemove, allowedRoles)
 
-  const getOptions = (roles, allowPublic) => {
+  const getOptions = (roles, allowPublic, allowRemove, allowedRoles) => {
+    if (allowedRoles?.length) {
+      console.log(allowedRoles)
+      console.log(roles)
+      return roles.filter(role => allowedRoles.includes(role._id))
+    }
+    let newRoles = [...roles]
     if (allowRemove) {
-      roles = [
-        ...roles,
+      newRoles = [
+        ...newRoles,
         {
           _id: RemoveID,
           name: "Remove",
@@ -30,9 +38,9 @@
       ]
     }
     if (allowPublic) {
-      return roles
+      return newRoles
     }
-    return roles.filter(role => role._id !== Constants.Roles.PUBLIC)
+    return newRoles.filter(role => role._id !== Constants.Roles.PUBLIC)
   }
 
   const getColor = role => {
@@ -63,6 +71,7 @@
   {quiet}
   {disabled}
   {align}
+  {footer}
   bind:value
   on:change={onChange}
   {options}
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index b53b218c74..a350a044c9 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -84,7 +84,7 @@
       const isBuilderOrAdmin = user.admin?.global || user.builder?.global
       let role = undefined
       if (isBuilderOrAdmin) {
-        role = "ADMIN"
+        role = Constants.Roles.ADMIN
       } else {
         const appRole = Object.keys(user.roles).find(x => x === prodAppId)
         if (appRole) {
@@ -134,6 +134,9 @@
       return
     }
     try {
+      if (user.role === role) {
+        return
+      }
       await updateAppUser(user, role)
     } catch (error) {
       console.error(error)
@@ -369,9 +372,12 @@
     }
   }
 
-  const roleNote = user => {
-    if (user.group) {
-      return "Part of a group"
+  const getRoleFooter = user => {
+    if (!user.role && user.group) {
+      return "This user has been given access via their group"
+    }
+    if (user.isBuilderOrAdmin) {
+      return "This user's role grants admin access to all apps"
     }
     return null
   }
@@ -557,7 +563,7 @@
                 </div>
                 <div class="auth-entity-access" class:muted={user.group}>
                   <RoleSelect
-                    note={roleNote(user)}
+                    footer={getRoleFooter(user)}
                     placeholder={false}
                     value={user.role}
                     allowRemove={user.role && !user.group}
@@ -569,9 +575,11 @@
                     on:remove={() => {
                       onUpdateUser(user)
                     }}
-                    disabled={user.isBuilderOrAdmin}
                     autoWidth
                     align="right"
+                    allowedRoles={user.isBuilderOrAdmin
+                      ? [Constants.Roles.ADMIN]
+                      : null}
                   />
                 </div>
               </div>

From 5a23eadd04eec23309d093c4371f0785ced643b3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 12:49:55 +0000
Subject: [PATCH 195/273] Remove redundant user fetch refresh

---
 .../app/[application]/_components/BuilderSidePanel.svelte        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index a350a044c9..9866bda267 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -78,7 +78,6 @@
         paginated: query ? null : false,
       },
     })
-    await usersFetch.refresh()
 
     filteredUsers = $usersFetch.rows.map(user => {
       const isBuilderOrAdmin = user.admin?.global || user.builder?.global

From b6247fb9e4378fd31dcd893eefdddab97759f7e6 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 12:54:18 +0000
Subject: [PATCH 196/273] Remove logs

---
 packages/builder/src/components/common/RoleSelect.svelte        | 2 --
 .../app/[application]/_components/BuilderSidePanel.svelte       | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 6a1448b714..09a67cb6fe 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -23,8 +23,6 @@
 
   const getOptions = (roles, allowPublic, allowRemove, allowedRoles) => {
     if (allowedRoles?.length) {
-      console.log(allowedRoles)
-      console.log(roles)
       return roles.filter(role => allowedRoles.includes(role._id))
     }
     let newRoles = [...roles]
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 9866bda267..a350a044c9 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -78,6 +78,7 @@
         paginated: query ? null : false,
       },
     })
+    await usersFetch.refresh()
 
     filteredUsers = $usersFetch.rows.map(user => {
       const isBuilderOrAdmin = user.admin?.global || user.builder?.global

From 9f3176ce0967562474a5615dd7ca792953cb1e4d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 13:19:44 +0000
Subject: [PATCH 197/273] Update width of picker footer

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

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index f5fd3750d4..dbaa031ed0 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -297,7 +297,7 @@
   .footer {
     padding: 4px 12px 12px 12px;
     font-style: italic;
-    max-width: 160px;
+    max-width: 170px;
     font-size: 12px;
   }
 </style>

From 75215f244ad63153f63f2186b583471418bd7f6a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 13:20:00 +0000
Subject: [PATCH 198/273] Fix crash when using empty groups, update user invite
 picker to be right aligned like others

---
 .../_components/BuilderSidePanel.svelte          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index a350a044c9..646f7478db 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -18,6 +18,7 @@
   import { Constants, Utils } from "@budibase/frontend-core"
   import { emailValidator } from "helpers/validation"
   import CopyInput from "components/common/inputs/CopyInput.svelte"
+  import { roles } from "stores/backend"
 
   let query = null
   let loaded = false
@@ -206,7 +207,7 @@
   const enrichGroupRole = group => {
     return {
       ...group,
-      role: group.roles[
+      role: group.roles?.[
         groups.actions.getGroupAppIds(group).find(x => x === prodAppId)
       ],
     }
@@ -373,8 +374,9 @@
   }
 
   const getRoleFooter = user => {
-    if (!user.role && user.group) {
-      return "This user has been given access via their group"
+    if (user.group) {
+      const role = $roles.find(role => role._id === user.role)
+      return `This user has been given ${role?.name} access from the ${user.group} group`
     }
     if (user.isBuilderOrAdmin) {
       return "This user's role grants admin access to all apps"
@@ -489,6 +491,8 @@
                     on:remove={() => {
                       onUninviteAppUser(invite)
                     }}
+                    autoWidth
+                    align="right"
                   />
                 </div>
               </div>
@@ -538,6 +542,8 @@
                     on:remove={() => {
                       onUpdateGroup(group)
                     }}
+                    autoWidth
+                    align="right"
                   />
                 </div>
               </div>
@@ -645,7 +651,7 @@
   }
   .auth-entity-access.muted :global(.spectrum-Picker-label),
   .auth-entity-access.muted :global(.spectrum-StatusLight) {
-    opacity: 0.7;
+    opacity: 0.5;
   }
 
   .auth-entity-header {
@@ -660,7 +666,7 @@
   .auth-entity,
   .auth-entity-header {
     display: grid;
-    grid-template-columns: 1fr 100px;
+    grid-template-columns: 1fr 110px;
     align-items: center;
     gap: var(--spacing-xl);
   }

From 8b9ddd8ab2f55f5b3488abdeb25eaec1af83cbf3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 28 Feb 2023 13:24:28 +0000
Subject: [PATCH 199/273] Add tiny margin to show full border around search
 field

---
 .../app/[application]/_components/BuilderSidePanel.svelte        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 646f7478db..05ff742637 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -725,6 +725,7 @@
     border-bottom: var(--border-light);
     border-left: 2px solid transparent;
     border-right: 2px solid transparent;
+    margin-right: 1px;
   }
 
   #builder-side-panel-container .search :global(input) {

From 7ed0586673872f321fe37ab1abbe476d8b008ccb Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Feb 2023 13:36:54 +0000
Subject: [PATCH 200/273] Add validation between sso config acivation and sso
 enforcement

---
 .../builder/portal/settings/auth/index.svelte | 159 ++++++++++--------
 .../builder/src/stores/portal/organisation.js |   5 +-
 packages/types/src/documents/global/config.ts |  11 +-
 .../src/api/controllers/global/configs.ts     |  73 +++++++-
 .../worker/src/api/routes/global/configs.ts   |  12 +-
 packages/worker/src/utilities/email.ts        |   2 +-
 6 files changed, 175 insertions(+), 87 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index e5196a1cbf..236636ecd5 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -131,24 +131,25 @@
     isEqual(providers.google?.config, originalGoogleDoc?.config)
       ? (googleSaveButtonDisabled = true)
       : (googleSaveButtonDisabled = false)
+
+    // delete the callback url which is never saved to the oidc
+    // config doc, to ensure an accurate comparison
+    delete providers.oidc?.config.configs[0].callbackURL
+
     isEqual(providers.oidc?.config, originalOidcDoc?.config)
       ? (oidcSaveButtonDisabled = true)
       : (oidcSaveButtonDisabled = false)
   }
 
-  // Create a flag so that it will only try to save completed forms
-  $: partialGoogle =
-    providers.google?.config?.clientID || providers.google?.config?.clientSecret
-  $: partialOidc =
-    providers.oidc?.config?.configs[0].configUrl ||
-    providers.oidc?.config?.configs[0].clientID ||
-    providers.oidc?.config?.configs[0].clientSecret
-  $: googleComplete =
+  $: googleComplete = !!(
     providers.google?.config?.clientID && providers.google?.config?.clientSecret
-  $: oidcComplete =
+  )
+
+  $: oidcComplete = !!(
     providers.oidc?.config?.configs[0].configUrl &&
     providers.oidc?.config?.configs[0].clientID &&
     providers.oidc?.config?.configs[0].clientSecret
+  )
 
   const onFileSelected = e => {
     let fileName = e.target.files[0].name
@@ -159,74 +160,88 @@
 
   async function toggleIsSSOEnforced() {
     const value = $organisation.isSSOEnforced
-    await organisation.save({ isSSOEnforced: !value })
+    try {
+      await organisation.save({ isSSOEnforced: !value })
+    } catch (e) {
+      notifications.error(e.message)
+    }
   }
 
-  async function save(docs) {
-    let calls = []
-    // Only if the user has provided an image, upload it
+  async function saveConfig(config) {
+    // Delete unsupported fields
+    delete config.createdAt
+    delete config.updatedAt
+    return API.saveConfig(config)
+  }
+
+  async function saveOIDCLogo() {
     if (image) {
       let data = new FormData()
       data.append("file", image)
-      calls.push(
-        API.uploadOIDCLogo({
-          name: image.name,
-          data,
-        })
+      await API.uploadOIDCLogo({
+        name: image.name,
+        data,
+      })
+    }
+  }
+
+  async function saveOIDC() {
+    if (!oidcComplete) {
+      notifications.error(
+        `Please fill in all required ${ConfigTypes.OIDC} fields`
       )
+      return
     }
-    docs.forEach(element => {
-      // Delete unsupported fields
-      delete element.createdAt
-      delete element.updatedAt
 
-      const { activated } = element.config
+    const oidc = providers.oidc
 
-      if (element.type === ConfigTypes.OIDC) {
-        // Add a UUID here so each config is distinguishable when it arrives at the login page
-        for (let config of element.config.configs) {
-          if (!config.uuid) {
-            config.uuid = Helpers.uuid()
-          }
-          // Callback urls shouldn't be included
-          delete config.callbackURL
-        }
-        if ((partialOidc || activated) && !oidcComplete) {
-          notifications.error(
-            `Please fill in all required ${ConfigTypes.OIDC} fields`
-          )
-        } else if (oidcComplete || !activated) {
-          calls.push(API.saveConfig(element))
-          // Turn the save button grey when clicked
-          oidcSaveButtonDisabled = true
-          originalOidcDoc = cloneDeep(providers.oidc)
-        }
+    // Add a UUID here so each config is distinguishable when it arrives at the login page
+    for (let config of oidc.config.configs) {
+      if (!config.uuid) {
+        config.uuid = Helpers.uuid()
       }
-      if (element.type === ConfigTypes.Google) {
-        if ((partialGoogle || activated) && !googleComplete) {
-          notifications.error(
-            `Please fill in all required ${ConfigTypes.Google} fields`
-          )
-        } else if (googleComplete || !activated) {
-          calls.push(API.saveConfig(element))
-          googleSaveButtonDisabled = true
-          originalGoogleDoc = cloneDeep(providers.google)
-        }
-      }
-    })
-    if (calls.length) {
-      Promise.all(calls)
-        .then(data => {
-          data.forEach(res => {
-            providers[res.type]._rev = res._rev
-            providers[res.type]._id = res._id
-          })
-          notifications.success(`Settings saved`)
-        })
-        .catch(() => {
-          notifications.error("Failed to update auth settings")
-        })
+      // Callback urls shouldn't be included
+      delete config.callbackURL
     }
+
+    try {
+      const res = await saveConfig(oidc)
+      providers[res.type]._rev = res._rev
+      providers[res.type]._id = res._id
+      await saveOIDCLogo()
+      notifications.success(`Settings saved`)
+    } catch (e) {
+      notifications.error(e.message)
+      return
+    }
+
+    // Turn the save button grey when clicked
+    oidcSaveButtonDisabled = true
+    originalOidcDoc = cloneDeep(providers.oidc)
+  }
+
+  async function saveGoogle() {
+    if (!googleComplete) {
+      notifications.error(
+        `Please fill in all required ${ConfigTypes.Google} fields`
+      )
+      return
+    }
+
+    const google = providers.google
+
+    try {
+      const res = await saveConfig(google)
+      providers[res.type]._rev = res._rev
+      providers[res.type]._id = res._id
+      notifications.success(`Settings saved`)
+    } catch (e) {
+      notifications.error(e.message)
+      return
+    }
+
+    googleSaveButtonDisabled = true
+    originalGoogleDoc = cloneDeep(providers.google)
   }
 
   let defaultScopes = ["profile", "email", "offline_access"]
@@ -266,7 +281,7 @@
     if (!googleDoc?._id) {
       providers.google = {
         type: ConfigTypes.Google,
-        config: { activated: true },
+        config: { activated: false },
       }
       originalGoogleDoc = cloneDeep(googleDoc)
     } else {
@@ -310,7 +325,7 @@
     if (!oidcDoc?._id) {
       providers.oidc = {
         type: ConfigTypes.OIDC,
-        config: { configs: [{ activated: true, scopes: defaultScopes }] },
+        config: { configs: [{ activated: false, scopes: defaultScopes }] },
       }
     } else {
       originalOidcDoc = cloneDeep(oidcDoc)
@@ -413,7 +428,7 @@
       <Button
         disabled={googleSaveButtonDisabled}
         cta
-        on:click={() => save([providers.google])}
+        on:click={() => saveGoogle()}
       >
         Save
       </Button>
@@ -575,11 +590,7 @@
       </div>
     </Layout>
     <div>
-      <Button
-        disabled={oidcSaveButtonDisabled}
-        cta
-        on:click={() => save([providers.oidc])}
-      >
+      <Button disabled={oidcSaveButtonDisabled} cta on:click={() => saveOIDC()}>
         Save
       </Button>
     </div>
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
index c8b62bb2bc..36bf98b0ba 100644
--- a/packages/builder/src/stores/portal/organisation.js
+++ b/packages/builder/src/stores/portal/organisation.js
@@ -1,6 +1,7 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
 import { auth } from "stores/portal"
+import _ from "lodash"
 
 const DEFAULT_CONFIG = {
   platformUrl: "",
@@ -26,14 +27,14 @@ export function createOrganisationStore() {
 
   async function save(config) {
     // Delete non-persisted fields
-    const storeConfig = get(store)
+    const storeConfig = _.cloneDeep(get(store))
     delete storeConfig.oidc
     delete storeConfig.google
     delete storeConfig.oidcCallbackUrl
     delete storeConfig.googleCallbackUrl
     await API.saveConfig({
       type: "settings",
-      config: { ...get(store), ...config },
+      config: { ...storeConfig, ...config },
     })
     await init()
   }
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index f4bba21e0f..6e86ed2674 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -36,6 +36,9 @@ export interface SettingsConfig extends Config {
   config: SettingsInnerConfig
 }
 
+export type SSOConfigType = ConfigType.GOOGLE | ConfigType.OIDC
+export type SSOConfig = GoogleInnerConfig | OIDCInnerConfig
+
 export interface GoogleInnerConfig {
   clientID: string
   clientSecret: string
@@ -60,6 +63,10 @@ export interface OIDCStrategyConfiguration {
   callbackURL: string
 }
 
+export interface OIDCConfigs {
+  configs: OIDCInnerConfig[]
+}
+
 export interface OIDCInnerConfig {
   configUrl: string
   clientID: string
@@ -72,9 +79,7 @@ export interface OIDCInnerConfig {
 }
 
 export interface OIDCConfig extends Config {
-  config: {
-    configs: OIDCInnerConfig[]
-  }
+  config: OIDCConfigs
 }
 
 export interface OIDCWellKnownConfig {
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 1ea0f52c96..230bf8abd9 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -17,10 +17,15 @@ import {
   Ctx,
   GetPublicOIDCConfigResponse,
   GetPublicSettingsResponse,
+  GoogleInnerConfig,
   isGoogleConfig,
   isOIDCConfig,
   isSettingsConfig,
   isSMTPConfig,
+  OIDCConfigs,
+  SettingsInnerConfig,
+  SSOConfig,
+  SSOConfigType,
   UserCtx,
 } from "@budibase/types"
 import * as pro from "@budibase/pro"
@@ -119,6 +124,63 @@ const getEventFns = async (config: Config, existing?: Config) => {
   return fns
 }
 
+type SSOConfigs = { [key in SSOConfigType]: SSOConfig | undefined }
+
+async function getSSOConfigs(): Promise<SSOConfigs> {
+  const google = await configs.getGoogleConfig()
+  const oidc = await configs.getOIDCConfig()
+  return {
+    [ConfigType.GOOGLE]: google,
+    [ConfigType.OIDC]: oidc,
+  }
+}
+
+async function hasActivatedConfig(ssoConfigs?: SSOConfigs) {
+  if (!ssoConfigs) {
+    ssoConfigs = await getSSOConfigs()
+  }
+ return !!Object.values(ssoConfigs).find(c => c?.activated)
+}
+
+async function verifySettingsConfig(config: SettingsInnerConfig) {
+  if (config.isSSOEnforced) {
+    const valid = await hasActivatedConfig()
+    if (!valid) {
+      throw new Error(
+        "Cannot enforce SSO without an activated configuration"
+      )
+    }
+  }
+}
+
+async function verifySSOConfig(type: SSOConfigType, config: SSOConfig) {
+  const settings = await configs.getSettingsConfig()
+  if (settings.isSSOEnforced && !config.activated) {
+    // config is being saved as deactivated
+    // ensure there is at least one other activated sso config
+    const ssoConfigs = await getSSOConfigs()
+
+    // overwrite the config being updated
+    // to reflect the desired state
+    ssoConfigs[type] = config
+
+    const activated = await hasActivatedConfig(ssoConfigs)
+    if (!activated) {
+      throw new Error(
+        "Configuration cannot be deactivated while SSO is enforced"
+      )
+    }
+  }
+}
+
+async function verifyGoogleConfig(config: GoogleInnerConfig) {
+  await verifySSOConfig(ConfigType.GOOGLE, config)
+}
+
+async function verifyOIDCConfig(config: OIDCConfigs) {
+  await verifySSOConfig(ConfigType.OIDC, config.configs[0])
+}
+
 export async function save(ctx: UserCtx<Config>) {
   const body = ctx.request.body
   const type = body.type
@@ -133,10 +195,19 @@ export async function save(ctx: UserCtx<Config>) {
 
   try {
     // verify the configuration
-    switch (config.type) {
+    switch (type) {
       case ConfigType.SMTP:
         await email.verifyConfig(config)
         break
+      case ConfigType.SETTINGS:
+        await verifySettingsConfig(config)
+        break
+      case ConfigType.GOOGLE:
+        await verifyGoogleConfig(config)
+        break
+      case ConfigType.OIDC:
+        await verifyOIDCConfig(config)
+        break
     }
   } catch (err: any) {
     ctx.throw(400, err)
diff --git a/packages/worker/src/api/routes/global/configs.ts b/packages/worker/src/api/routes/global/configs.ts
index 922bcea212..88c6bfbe7d 100644
--- a/packages/worker/src/api/routes/global/configs.ts
+++ b/packages/worker/src/api/routes/global/configs.ts
@@ -34,8 +34,8 @@ function settingValidation() {
 function googleValidation() {
   // prettier-ignore
   return Joi.object({
-    clientID: Joi.when('activated', { is: true, then: Joi.string().required() }),
-    clientSecret: Joi.when('activated', { is: true, then: Joi.string().required() }),
+    clientID: Joi.string().required(),
+    clientSecret: Joi.string().required(),
     activated: Joi.boolean().required(),
   }).unknown(true)
 }
@@ -45,12 +45,12 @@ function oidcValidation() {
   return Joi.object({
     configs: Joi.array().items(
       Joi.object({
-        clientID: Joi.when('activated', { is: true, then: Joi.string().required() }),
-        clientSecret: Joi.when('activated', { is: true, then: Joi.string().required() }),
-        configUrl: Joi.when('activated', { is: true, then: Joi.string().required() }),
+        clientID: Joi.string().required(),
+        clientSecret: Joi.string().required(),
+        configUrl: Joi.string().required(),
         logo: Joi.string().allow("", null),
         name: Joi.string().allow("", null),
-        uuid: Joi.when('activated', { is: true, then: Joi.string().required() }),
+        uuid: Joi.string().required(),
         activated: Joi.boolean().required(),
         scopes: Joi.array().optional()
       })
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index 69861684eb..4fd8a82161 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -203,7 +203,7 @@ export async function sendEmail(
  * @param {object} config an SMTP configuration - this is based on the nodemailer API.
  * @return {Promise<boolean>} returns true if the configuration is valid.
  */
-export async function verifyConfig(config: any) {
+export async function verifyConfig(config: SMTPInnerConfig) {
   const transport = createSMTPTransport(config)
   await transport.verify()
 }

From 7b48c2787ef3df4da3c5adab726c47b9426363ca Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Feb 2023 13:37:34 +0000
Subject: [PATCH 201/273] lint

---
 packages/worker/src/api/controllers/global/configs.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 230bf8abd9..02459855c2 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -139,16 +139,14 @@ async function hasActivatedConfig(ssoConfigs?: SSOConfigs) {
   if (!ssoConfigs) {
     ssoConfigs = await getSSOConfigs()
   }
- return !!Object.values(ssoConfigs).find(c => c?.activated)
+  return !!Object.values(ssoConfigs).find(c => c?.activated)
 }
 
 async function verifySettingsConfig(config: SettingsInnerConfig) {
   if (config.isSSOEnforced) {
     const valid = await hasActivatedConfig()
     if (!valid) {
-      throw new Error(
-        "Cannot enforce SSO without an activated configuration"
-      )
+      throw new Error("Cannot enforce SSO without an activated configuration")
     }
   }
 }

From 64e4788fc5ee382294412ee9a7dbce6f97e45d06 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Feb 2023 14:10:56 +0000
Subject: [PATCH 202/273] v2.3.18-alpha.16

---
 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 01659623bb..d0c541cc5b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index de2017ecd6..a96ba9bf41 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.15",
+    "@budibase/types": "2.3.18-alpha.16",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 90c79ef807..21bbc15807 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.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "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.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.16",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 27cc1f31e4..6524c5623f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.15",
-    "@budibase/client": "2.3.18-alpha.15",
-    "@budibase/frontend-core": "2.3.18-alpha.15",
-    "@budibase/string-templates": "2.3.18-alpha.15",
+    "@budibase/bbui": "2.3.18-alpha.16",
+    "@budibase/client": "2.3.18-alpha.16",
+    "@budibase/frontend-core": "2.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.16",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 219f5ed1f3..bab0b54a86 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "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.3.18-alpha.15",
-    "@budibase/string-templates": "2.3.18-alpha.15",
-    "@budibase/types": "2.3.18-alpha.15",
+    "@budibase/backend-core": "2.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.16",
+    "@budibase/types": "2.3.18-alpha.16",
     "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 c9711433a7..75af8909e1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "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.3.18-alpha.15",
-    "@budibase/frontend-core": "2.3.18-alpha.15",
-    "@budibase/string-templates": "2.3.18-alpha.15",
+    "@budibase/bbui": "2.3.18-alpha.16",
+    "@budibase/frontend-core": "2.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.16",
     "@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 927f40c568..6f76261d7b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.15",
+    "@budibase/bbui": "2.3.18-alpha.16",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 21573b4d74..18ab3fefb5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 39210f7d4a..e930fe7ba0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.15",
-    "@budibase/client": "2.3.18-alpha.15",
+    "@budibase/backend-core": "2.3.18-alpha.16",
+    "@budibase/client": "2.3.18-alpha.16",
     "@budibase/pro": "2.3.18-alpha.15",
-    "@budibase/string-templates": "2.3.18-alpha.15",
-    "@budibase/types": "2.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.16",
+    "@budibase/types": "2.3.18-alpha.16",
     "@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 fe03c45bdd..c1c9fb89b7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "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 19bb756723..aa85beb856 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "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 28c1566697..56b0d7beab 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.15",
+  "version": "2.3.18-alpha.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.15",
+    "@budibase/backend-core": "2.3.18-alpha.16",
     "@budibase/pro": "2.3.18-alpha.15",
-    "@budibase/string-templates": "2.3.18-alpha.15",
-    "@budibase/types": "2.3.18-alpha.15",
+    "@budibase/string-templates": "2.3.18-alpha.16",
+    "@budibase/types": "2.3.18-alpha.16",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From db28c5006c67d51327de85f1be3facabc35bfe1f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 28 Feb 2023 14:13:52 +0000
Subject: [PATCH 203/273] Update pro version to 2.3.18-alpha.16

---
 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 e930fe7ba0..676ba2e108 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.16",
     "@budibase/client": "2.3.18-alpha.16",
-    "@budibase/pro": "2.3.18-alpha.15",
+    "@budibase/pro": "2.3.18-alpha.16",
     "@budibase/string-templates": "2.3.18-alpha.16",
     "@budibase/types": "2.3.18-alpha.16",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 465b849997..72cc24a5ee 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.15.tgz#62e17491c4f546ff0e772005f0a6b4c55f9d2b63"
-  integrity sha512-TX7LU0E3EoCxcMSZFSO/CmQdhkHYBjT5y1O/UhNMzp9xOVsFUcuFNDXFhylruHnWo7VnbiIBwYDxcXgg0Bz9ig==
+"@budibase/backend-core@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.16.tgz#dc4eb1a84283d96e9d0814647cff6a985e204ede"
+  integrity sha512-oxca+tBXCqr713lH+MLKvY0K/i+yCS5W+sJmMR2jlCfBBEULhPBRcBnyNhUEQsszqcZDiHI4Svy1a50BryDCsQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.15"
+    "@budibase/types" "2.3.18-alpha.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.15.tgz#5237b6f9b8f8627cd46bc014b9be6c083412a370"
-  integrity sha512-owEtr2peoF4zpPQ+UZepfi4nYxWRKA/qZa/748qJc03T3hOdU7dXj6Nkjl7nc0PHuYdZ3NewJKK5gnr2wMb2+A==
+"@budibase/pro@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.16.tgz#239ccee2469d7465cec859c22ae39abf0d9cc4ec"
+  integrity sha512-sGgZ5gTMFVtkU0GZF0ApVTAB1uw1twL/2v5vXYzrIzfJKL2Ehcsrg8d3JwlaF6S7bOzOOaNa90cuGgvXQ1TzTw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.15"
+    "@budibase/backend-core" "2.3.18-alpha.16"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.15"
+    "@budibase/types" "2.3.18-alpha.16"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.15.tgz#a7b4189b5dd823100f3785b5a991e428529c7e21"
-  integrity sha512-94+OIOpY4d+kdsXMIXU0RYB8WKQN8y8ueqJZt1OUHvSgCnb8CWIJoVv0LlHFgiW7871JPO2KS6nbpndDXeJhgA==
+"@budibase/types@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.16.tgz#e4613c482ee7fc0ff099190ba3c7432fd6a3efce"
+  integrity sha512-nltKX5erHad2vM6SEv2tYLWCztEtV4bjXrmB8lbkTcf6iD0gjXB280vGkE4gOBdeOmBXXP39GxVc30e7ugw5GA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 56b0d7beab..a0a73b17f4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.16",
-    "@budibase/pro": "2.3.18-alpha.15",
+    "@budibase/pro": "2.3.18-alpha.16",
     "@budibase/string-templates": "2.3.18-alpha.16",
     "@budibase/types": "2.3.18-alpha.16",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d382f67ed0..d5245ff350 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.15.tgz#62e17491c4f546ff0e772005f0a6b4c55f9d2b63"
-  integrity sha512-TX7LU0E3EoCxcMSZFSO/CmQdhkHYBjT5y1O/UhNMzp9xOVsFUcuFNDXFhylruHnWo7VnbiIBwYDxcXgg0Bz9ig==
+"@budibase/backend-core@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.16.tgz#dc4eb1a84283d96e9d0814647cff6a985e204ede"
+  integrity sha512-oxca+tBXCqr713lH+MLKvY0K/i+yCS5W+sJmMR2jlCfBBEULhPBRcBnyNhUEQsszqcZDiHI4Svy1a50BryDCsQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.15"
+    "@budibase/types" "2.3.18-alpha.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.15.tgz#5237b6f9b8f8627cd46bc014b9be6c083412a370"
-  integrity sha512-owEtr2peoF4zpPQ+UZepfi4nYxWRKA/qZa/748qJc03T3hOdU7dXj6Nkjl7nc0PHuYdZ3NewJKK5gnr2wMb2+A==
+"@budibase/pro@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.16.tgz#239ccee2469d7465cec859c22ae39abf0d9cc4ec"
+  integrity sha512-sGgZ5gTMFVtkU0GZF0ApVTAB1uw1twL/2v5vXYzrIzfJKL2Ehcsrg8d3JwlaF6S7bOzOOaNa90cuGgvXQ1TzTw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.15"
+    "@budibase/backend-core" "2.3.18-alpha.16"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.15"
+    "@budibase/types" "2.3.18-alpha.16"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.15":
-  version "2.3.18-alpha.15"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.15.tgz#a7b4189b5dd823100f3785b5a991e428529c7e21"
-  integrity sha512-94+OIOpY4d+kdsXMIXU0RYB8WKQN8y8ueqJZt1OUHvSgCnb8CWIJoVv0LlHFgiW7871JPO2KS6nbpndDXeJhgA==
+"@budibase/types@2.3.18-alpha.16":
+  version "2.3.18-alpha.16"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.16.tgz#e4613c482ee7fc0ff099190ba3c7432fd6a3efce"
+  integrity sha512-nltKX5erHad2vM6SEv2tYLWCztEtV4bjXrmB8lbkTcf6iD0gjXB280vGkE4gOBdeOmBXXP39GxVc30e7ugw5GA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From c6a22282f7a400b08532ad0cab91d492e2511896 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 28 Feb 2023 16:21:54 +0000
Subject: [PATCH 204/273] Fix default oidc icons

---
 packages/bbui/src/Form/Core/Picker.svelte      | 12 +++++++++++-
 packages/bbui/src/Form/Core/Select.svelte      |  2 ++
 packages/bbui/src/Form/Select.svelte           |  2 ++
 .../builder/portal/settings/auth/index.svelte  | 18 +++++++++++-------
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 5cef0f9213..2c37aadb6d 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -24,6 +24,7 @@
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
   export let getOptionIcon = () => null
+  export let useOptionIconImage = false
   export let getOptionColour = () => null
   export let open = false
   export let readonly = false
@@ -186,7 +187,16 @@
           >
             {#if getOptionIcon(option, idx)}
               <span class="option-extra icon">
-                <Icon size="S" name={getOptionIcon(option, idx)} />
+                {#if useOptionIconImage}
+                  <img
+                    src={getOptionIcon(option, idx)}
+                    alt="icon"
+                    width="15"
+                    height="15"
+                  />
+                {:else}
+                  <Icon size="S" name={getOptionIcon(option, idx)} />
+                {/if}
               </span>
             {/if}
             {#if getOptionColour(option, idx)}
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index 721083e3a6..09c2e35f82 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -11,6 +11,7 @@
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
   export let getOptionIcon = () => null
+  export let useOptionIconImage = false
   export let getOptionColour = () => null
   export let isOptionEnabled
   export let readonly = false
@@ -69,6 +70,7 @@
   {getOptionLabel}
   {getOptionValue}
   {getOptionIcon}
+  {useOptionIconImage}
   {getOptionColour}
   {isOptionEnabled}
   {autocomplete}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 76fe613c92..e1500c6a6c 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -14,6 +14,7 @@
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
   export let getOptionIcon = option => option?.icon
+  export let useOptionIconImage = false
   export let getOptionColour = option => option?.colour
   export let isOptionEnabled
   export let quiet = false
@@ -52,6 +53,7 @@
     {getOptionValue}
     {getOptionIcon}
     {getOptionColour}
+    {useOptionIconImage}
     {isOptionEnabled}
     {autocomplete}
     {customPopoverHeight}
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index 236636ecd5..af272b5d7c 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -305,14 +305,17 @@
     }
     if (oidcLogos?.config) {
       const logoKeys = Object.keys(oidcLogos.config)
-      logoKeys.map(logoKey => {
-        const logoUrl = oidcLogos.config[logoKey]
-        iconDropdownOptions.unshift({
-          label: logoKey,
-          value: logoKey,
-          icon: logoUrl,
+      logoKeys
+        // don't include the etag entry in the logo config
+        .filter(key => !key.toLowerCase().includes("etag"))
+        .map(logoKey => {
+          const logoUrl = oidcLogos.config[logoKey]
+          iconDropdownOptions.unshift({
+            label: logoKey,
+            value: logoKey,
+            icon: logoUrl,
+          })
         })
-      })
     }
 
     // Fetch OIDC config
@@ -484,6 +487,7 @@
         <Select
           label=""
           bind:value={providers.oidc.config.configs[0].logo}
+          useOptionIconImage
           options={iconDropdownOptions}
           on:change={e => e.detail === "Upload" && fileinput.click()}
         />

From 8c8dd637e10659388a2c242765e9a429199355ff Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 28 Feb 2023 16:38:11 +0000
Subject: [PATCH 205/273] Enable the feature tour window and extend the invite
 duration to 1 week

---
 .../src/components/deploy/AppActions.svelte   |  7 +++-
 .../portal/onboarding/TourWrap.svelte         |  9 ++--
 .../src/components/portal/onboarding/tours.js | 25 +++++++++--
 .../builder/app/[application]/_layout.svelte  | 42 ++++++++++++-------
 packages/worker/src/utilities/redis.ts        |  2 +-
 5 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 582b5ab8f0..daed564204 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -20,6 +20,7 @@
   import { apps } from "stores/portal"
   import { store } from "builderStore"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
+  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
 
   export let application
 
@@ -179,7 +180,11 @@
       />
     {/if}
 
-    <TourWrap tourStepKey={`builder-user-management`}>
+    <TourWrap
+      tourStepKey={$store.onboarding
+        ? TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT
+        : TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT}
+    >
       <span id="builder-app-users-button">
         <ActionButton
           quiet
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
index 1be149f7fa..2fff8507c5 100644
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
@@ -6,16 +6,19 @@
 
   export let tourStepKey
 
-  let currentTour
+  let currentTourStep
   let ready = false
   let handler
 
   onMount(() => {
     if (!$store.tourKey) return
 
-    currentTour = TOURS[$store.tourKey].find(step => step.id === tourStepKey)
+    currentTourStep = TOURS[$store.tourKey].find(
+      step => step.id === tourStepKey
+    )
+    if (!currentTourStep) return
 
-    const elem = document.querySelector(currentTour.query)
+    const elem = document.querySelector(currentTourStep.query)
     handler = tourHandler(elem, tourStepKey)
     ready = true
   })
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 7975f11bb5..e28c638a4a 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -65,7 +65,7 @@ const getTours = () => {
         id: TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT,
         title: "Users",
         query: ".toprightnav #builder-app-users-button",
-        body: "Choose which users you want to see to have access to your app and control what level of access they have.",
+        body: "Add users to your app and control what level of access they have.",
         onLoad: () => {
           tourEvent(TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT)
         },
@@ -107,11 +107,30 @@ const getTours = () => {
         id: TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT,
         title: "Users",
         query: ".toprightnav #builder-app-users-button",
-        body: "Choose which users you want to have access to your app and control what level of access they have.",
+        body: "Add users to your app and control what level of access they have.",
         onLoad: () => {
           tourEvent(TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT)
         },
-        align: "left",
+        onComplete: async () => {
+          // Push the onboarding forward
+          if (get(auth).user) {
+            await users.save({
+              ...get(auth).user,
+              onboardedAt: new Date().toISOString(),
+            })
+
+            // Update the cached user
+            await auth.getSelf()
+
+            store.update(state => ({
+              ...state,
+              tourNodes: undefined,
+              tourKey: undefined,
+              tourKeyStep: undefined,
+              onboarding: false,
+            }))
+          }
+        },
       },
     ],
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index abf70a84c0..a4b4982fca 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -68,22 +68,32 @@
   }
 
   const initTour = async () => {
-    if (
-      !$auth.user?.onboardedAt &&
-      isEnabled(TENANT_FEATURE_FLAGS.ONBOARDING_TOUR)
-    ) {
-      // Determine the correct step
-      const activeNav = $layout.children.find(c => $isActive(c.path))
-      const onboardingTour = TOURS[TOUR_KEYS.TOUR_BUILDER_ONBOARDING]
-      const targetStep = activeNav
-        ? onboardingTour.find(step => step.route === activeNav?.path)
-        : null
-      await store.update(state => ({
-        ...state,
-        onboarding: true,
-        tourKey: TOUR_KEYS.TOUR_BUILDER_ONBOARDING,
-        tourStepKey: targetStep?.id,
-      }))
+    // Check if onboarding is enabled.
+    if (isEnabled(TENANT_FEATURE_FLAGS.ONBOARDING_TOUR)) {
+      if (!$auth.user?.onboardedAt) {
+        // Determine the correct step
+        const activeNav = $layout.children.find(c => $isActive(c.path))
+        const onboardingTour = TOURS[TOUR_KEYS.TOUR_BUILDER_ONBOARDING]
+        const targetStep = activeNav
+          ? onboardingTour.find(step => step.route === activeNav?.path)
+          : null
+        await store.update(state => ({
+          ...state,
+          onboarding: true,
+          tourKey: TOUR_KEYS.TOUR_BUILDER_ONBOARDING,
+          tourStepKey: targetStep?.id,
+        }))
+      } else {
+        // Feature tour date
+        const release_date = new Date("2023-03-01T00:00:00.000Z")
+        const onboarded = new Date($auth.user?.onboardedAt)
+        if (onboarded < release_date) {
+          await store.update(state => ({
+            ...state,
+            tourKey: TOUR_KEYS.FEATURE_ONBOARDING,
+          }))
+        }
+      }
     }
   }
 
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index 1e0d0beb97..ecfc027cad 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -7,7 +7,7 @@ function getExpirySecondsForDB(db: string) {
       return 3600
     case redis.utils.Databases.INVITATIONS:
       // a day
-      return 86400
+      return 604800
   }
 }
 

From f66fc22f29b8abe2eec46d1cfe330cb7fb194cd2 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 28 Feb 2023 17:05:11 +0000
Subject: [PATCH 206/273] Updated email utility import

---
 packages/worker/src/api/controllers/global/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 2971011682..ab43138aa4 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -33,7 +33,7 @@ import {
   platform,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
-import { isEmailConfigured } from "src/utilities/email"
+import { isEmailConfigured } from "../../../utilities/email"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 

From cb39053b12d6370557549905f0817f9f79251ec1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 28 Feb 2023 18:10:56 +0000
Subject: [PATCH 207/273] Fix for #9778 - there was an issue with operationId
 in the OpenAPI spec, these need to be unique to be compliant with the spec as
 brought up in the issue. Also re-writing the spec generation to Typescript to
 be compliant with how backend code is now written.

---
 packages/server/package.json                  |   2 +-
 .../server/specs/{generate.js => generate.ts} |  16 +-
 packages/server/specs/openapi.json            |  48 +-
 packages/server/specs/openapi.yaml            |  48 +-
 .../specs/{parameters.js => parameters.ts}    |  12 +-
 .../{application.js => application.ts}        |   8 +-
 .../specs/resources/{index.js => index.ts}    |  16 +-
 .../specs/resources/{misc.js => misc.ts}      |   6 +-
 .../specs/resources/{query.js => query.ts}    |   8 +-
 .../server/specs/resources/{row.js => row.ts} |   7 +-
 .../specs/resources/{table.js => table.ts}    |  10 +-
 .../specs/resources/{user.js => user.ts}      |   6 +-
 .../server/specs/resources/utils/Resource.js  |  26 -
 .../server/specs/resources/utils/Resource.ts  |  39 ++
 .../resources/utils/{index.js => index.ts}    |   2 +-
 .../server/specs/{security.js => security.ts} |   2 +-
 .../src/api/routes/public/applications.ts     |  14 +-
 .../server/src/api/routes/public/queries.ts   |   4 +-
 packages/server/src/api/routes/public/rows.ts |  10 +-
 .../server/src/api/routes/public/tables.ts    |  10 +-
 .../{compare.spec.js => compare.spec.ts}      |  69 ++-
 .../server/src/api/routes/public/users.ts     |  10 +-
 packages/server/src/definitions/openapi.ts    | 512 +++++++++++++++---
 23 files changed, 650 insertions(+), 235 deletions(-)
 rename packages/server/specs/{generate.js => generate.ts} (87%)
 rename packages/server/specs/{parameters.js => parameters.ts} (86%)
 rename packages/server/specs/resources/{application.js => application.ts} (94%)
 rename packages/server/specs/resources/{index.js => index.ts} (56%)
 rename packages/server/specs/resources/{misc.js => misc.ts} (96%)
 rename packages/server/specs/resources/{query.js => query.ts} (96%)
 rename packages/server/specs/resources/{row.js => row.ts} (94%)
 rename packages/server/specs/resources/{table.js => table.ts} (97%)
 rename packages/server/specs/resources/{user.js => user.ts} (96%)
 delete mode 100644 packages/server/specs/resources/utils/Resource.js
 create mode 100644 packages/server/specs/resources/utils/Resource.ts
 rename packages/server/specs/resources/utils/{index.js => index.ts} (79%)
 rename packages/server/specs/{security.js => security.ts} (87%)
 rename packages/server/src/api/routes/public/tests/{compare.spec.js => compare.spec.ts} (80%)

diff --git a/packages/server/package.json b/packages/server/package.json
index 39210f7d4a..40001da373 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -25,7 +25,7 @@
     "dev:stack:down": "node scripts/dev/manage.js down",
     "dev:stack:nuke": "node scripts/dev/manage.js nuke",
     "dev:builder": "yarn run dev:stack:up && nodemon",
-    "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
+    "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
     "initialise": "node scripts/initialise.js",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",
diff --git a/packages/server/specs/generate.js b/packages/server/specs/generate.ts
similarity index 87%
rename from packages/server/specs/generate.js
rename to packages/server/specs/generate.ts
index f6a055f683..39d8a50ade 100644
--- a/packages/server/specs/generate.js
+++ b/packages/server/specs/generate.ts
@@ -1,9 +1,9 @@
+import { join } from "path"
+import { writeFileSync } from "fs"
+import { examples, schemas } from "./resources"
+import * as parameters from "./parameters"
+import * as security from "./security"
 const swaggerJsdoc = require("swagger-jsdoc")
-const { join } = require("path")
-const { writeFileSync } = require("fs")
-const { examples, schemas } = require("./resources")
-const parameters = require("./parameters")
-const security = require("./security")
 
 const VARIABLES = {}
 
@@ -60,7 +60,7 @@ const options = {
   apis: [join(__dirname, "..", "src", "api", "routes", "public", "*.ts")],
 }
 
-function writeFile(output, filename) {
+function writeFile(output: any, filename: string) {
   try {
     const path = join(__dirname, filename)
     let spec = output
@@ -79,7 +79,7 @@ function writeFile(output, filename) {
   }
 }
 
-function run() {
+export function run() {
   const outputJSON = swaggerJsdoc(options)
   options.format = ".yaml"
   const outputYAML = swaggerJsdoc(options)
@@ -90,5 +90,3 @@ function run() {
 if (require.main === module) {
   run()
 }
-
-module.exports = run
diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index cf4eef75a9..a9959186a8 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -1829,7 +1829,7 @@
   "paths": {
     "/applications": {
       "post": {
-        "operationId": "create",
+        "operationId": "appCreate",
         "summary": "Create an application",
         "tags": [
           "applications"
@@ -1870,7 +1870,7 @@
     },
     "/applications/{appId}": {
       "put": {
-        "operationId": "update",
+        "operationId": "appUpdate",
         "summary": "Update an application",
         "tags": [
           "applications"
@@ -1909,7 +1909,7 @@
         }
       },
       "delete": {
-        "operationId": "destroy",
+        "operationId": "appDestroy",
         "summary": "Delete an application",
         "tags": [
           "applications"
@@ -1938,7 +1938,7 @@
         }
       },
       "get": {
-        "operationId": "getById",
+        "operationId": "appGetById",
         "summary": "Retrieve an application",
         "tags": [
           "applications"
@@ -1969,7 +1969,7 @@
     },
     "/applications/{appId}/unpublish": {
       "post": {
-        "operationId": "unpublish",
+        "operationId": "appUnpublish",
         "summary": "Unpublish an application",
         "tags": [
           "applications"
@@ -1988,7 +1988,7 @@
     },
     "/applications/{appId}/publish": {
       "post": {
-        "operationId": "publish",
+        "operationId": "appPublish",
         "summary": "Unpublish an application",
         "tags": [
           "applications"
@@ -2019,7 +2019,7 @@
     },
     "/applications/search": {
       "post": {
-        "operationId": "search",
+        "operationId": "appSearch",
         "summary": "Search for applications",
         "description": "Based on application properties (currently only name) search for applications.",
         "tags": [
@@ -2056,7 +2056,7 @@
     },
     "/queries/{queryId}": {
       "post": {
-        "operationId": "execute",
+        "operationId": "queryExecute",
         "summary": "Execute a query",
         "description": "Queries which have been created within a Budibase app can be executed using this,",
         "tags": [
@@ -2104,7 +2104,7 @@
     },
     "/queries/search": {
       "post": {
-        "operationId": "search",
+        "operationId": "querySearch",
         "summary": "Search for queries",
         "description": "Based on query properties (currently only name) search for queries.",
         "tags": [
@@ -2146,7 +2146,7 @@
     },
     "/tables/{tableId}/rows": {
       "post": {
-        "operationId": "create",
+        "operationId": "rowCreate",
         "summary": "Create a row",
         "description": "Creates a row within the specified table.",
         "tags": [
@@ -2196,7 +2196,7 @@
     },
     "/tables/{tableId}/rows/{rowId}": {
       "put": {
-        "operationId": "update",
+        "operationId": "rowUpdate",
         "summary": "Update a row",
         "description": "Updates a row within the specified table.",
         "tags": [
@@ -2247,7 +2247,7 @@
         }
       },
       "delete": {
-        "operationId": "destroy",
+        "operationId": "rowDestroy",
         "summary": "Delete a row",
         "description": "Deletes a row within the specified table.",
         "tags": [
@@ -2283,7 +2283,7 @@
         }
       },
       "get": {
-        "operationId": "getById",
+        "operationId": "rowGetById",
         "summary": "Retrieve a row",
         "description": "This gets a single row, it will be enriched with the full related rows, rather than the squashed \"primaryDisplay\" format returned by the search endpoint.",
         "tags": [
@@ -2321,7 +2321,7 @@
     },
     "/tables/{tableId}/rows/search": {
       "post": {
-        "operationId": "search",
+        "operationId": "rowSearch",
         "summary": "Search for rows",
         "tags": [
           "rows"
@@ -2365,7 +2365,7 @@
     },
     "/tables": {
       "post": {
-        "operationId": "create",
+        "operationId": "tableCreate",
         "summary": "Create a table",
         "description": "Create a table, this could be internal or external.",
         "tags": [
@@ -2411,7 +2411,7 @@
     },
     "/tables/{tableId}": {
       "put": {
-        "operationId": "update",
+        "operationId": "tableUpdate",
         "summary": "Update a table",
         "description": "Update a table, this could be internal or external.",
         "tags": [
@@ -2458,7 +2458,7 @@
         }
       },
       "delete": {
-        "operationId": "destroy",
+        "operationId": "tableDestroy",
         "summary": "Delete a table",
         "description": "Delete a table, this could be internal or external.",
         "tags": [
@@ -2491,7 +2491,7 @@
         }
       },
       "get": {
-        "operationId": "getById",
+        "operationId": "tableGetById",
         "summary": "Retrieve a table",
         "description": "Lookup a table, this could be internal or external.",
         "tags": [
@@ -2526,7 +2526,7 @@
     },
     "/tables/search": {
       "post": {
-        "operationId": "search",
+        "operationId": "tableSearch",
         "summary": "Search for tables",
         "description": "Based on table properties (currently only name) search for tables. This could be an internal or an external table.",
         "tags": [
@@ -2568,7 +2568,7 @@
     },
     "/users": {
       "post": {
-        "operationId": "create",
+        "operationId": "userCreate",
         "summary": "Create a user",
         "tags": [
           "users"
@@ -2604,7 +2604,7 @@
     },
     "/users/{userId}": {
       "put": {
-        "operationId": "update",
+        "operationId": "userUpdate",
         "summary": "Update a user",
         "tags": [
           "users"
@@ -2643,7 +2643,7 @@
         }
       },
       "delete": {
-        "operationId": "destroy",
+        "operationId": "userDestroy",
         "summary": "Delete a user",
         "tags": [
           "users"
@@ -2672,7 +2672,7 @@
         }
       },
       "get": {
-        "operationId": "getById",
+        "operationId": "userGetById",
         "summary": "Retrieve a user",
         "tags": [
           "users"
@@ -2703,7 +2703,7 @@
     },
     "/users/search": {
       "post": {
-        "operationId": "search",
+        "operationId": "userSearch",
         "summary": "Search for users",
         "description": "Based on user properties (currently only name) search for users.",
         "tags": [
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index 414efe7adb..a3007b9639 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -1397,7 +1397,7 @@ security:
 paths:
   /applications:
     post:
-      operationId: create
+      operationId: appCreate
       summary: Create an application
       tags:
         - applications
@@ -1421,7 +1421,7 @@ paths:
                   $ref: "#/components/examples/application"
   "/applications/{appId}":
     put:
-      operationId: update
+      operationId: appUpdate
       summary: Update an application
       tags:
         - applications
@@ -1444,7 +1444,7 @@ paths:
                 application:
                   $ref: "#/components/examples/application"
     delete:
-      operationId: destroy
+      operationId: appDestroy
       summary: Delete an application
       tags:
         - applications
@@ -1461,7 +1461,7 @@ paths:
                 application:
                   $ref: "#/components/examples/application"
     get:
-      operationId: getById
+      operationId: appGetById
       summary: Retrieve an application
       tags:
         - applications
@@ -1479,7 +1479,7 @@ paths:
                   $ref: "#/components/examples/application"
   "/applications/{appId}/unpublish":
     post:
-      operationId: unpublish
+      operationId: appUnpublish
       summary: Unpublish an application
       tags:
         - applications
@@ -1490,7 +1490,7 @@ paths:
           description: The app was published successfully.
   "/applications/{appId}/publish":
     post:
-      operationId: publish
+      operationId: appPublish
       summary: Unpublish an application
       tags:
         - applications
@@ -1508,7 +1508,7 @@ paths:
                   $ref: "#/components/examples/deploymentOutput"
   /applications/search:
     post:
-      operationId: search
+      operationId: appSearch
       summary: Search for applications
       description: Based on application properties (currently only name) search for
         applications.
@@ -1533,7 +1533,7 @@ paths:
                   $ref: "#/components/examples/applications"
   "/queries/{queryId}":
     post:
-      operationId: execute
+      operationId: queryExecute
       summary: Execute a query
       description: Queries which have been created within a Budibase app can be
         executed using this,
@@ -1562,7 +1562,7 @@ paths:
                   $ref: "#/components/examples/sqlResponse"
   /queries/search:
     post:
-      operationId: search
+      operationId: querySearch
       summary: Search for queries
       description: Based on query properties (currently only name) search for queries.
       tags:
@@ -1587,7 +1587,7 @@ paths:
                   $ref: "#/components/examples/queries"
   "/tables/{tableId}/rows":
     post:
-      operationId: create
+      operationId: rowCreate
       summary: Create a row
       description: Creates a row within the specified table.
       tags:
@@ -1618,7 +1618,7 @@ paths:
                   $ref: "#/components/examples/row"
   "/tables/{tableId}/rows/{rowId}":
     put:
-      operationId: update
+      operationId: rowUpdate
       summary: Update a row
       description: Updates a row within the specified table.
       tags:
@@ -1648,7 +1648,7 @@ paths:
                 row:
                   $ref: "#/components/examples/row"
     delete:
-      operationId: destroy
+      operationId: rowDestroy
       summary: Delete a row
       description: Deletes a row within the specified table.
       tags:
@@ -1669,7 +1669,7 @@ paths:
                 row:
                   $ref: "#/components/examples/row"
     get:
-      operationId: getById
+      operationId: rowGetById
       summary: Retrieve a row
       description: This gets a single row, it will be enriched with the full related
         rows, rather than the squashed "primaryDisplay" format returned by the
@@ -1692,7 +1692,7 @@ paths:
                   $ref: "#/components/examples/enrichedRow"
   "/tables/{tableId}/rows/search":
     post:
-      operationId: search
+      operationId: rowSearch
       summary: Search for rows
       tags:
         - rows
@@ -1718,7 +1718,7 @@ paths:
                   $ref: "#/components/examples/rows"
   /tables:
     post:
-      operationId: create
+      operationId: tableCreate
       summary: Create a table
       description: Create a table, this could be internal or external.
       tags:
@@ -1746,7 +1746,7 @@ paths:
                   $ref: "#/components/examples/table"
   "/tables/{tableId}":
     put:
-      operationId: update
+      operationId: tableUpdate
       summary: Update a table
       description: Update a table, this could be internal or external.
       tags:
@@ -1773,7 +1773,7 @@ paths:
                 table:
                   $ref: "#/components/examples/table"
     delete:
-      operationId: destroy
+      operationId: tableDestroy
       summary: Delete a table
       description: Delete a table, this could be internal or external.
       tags:
@@ -1792,7 +1792,7 @@ paths:
                 table:
                   $ref: "#/components/examples/table"
     get:
-      operationId: getById
+      operationId: tableGetById
       summary: Retrieve a table
       description: Lookup a table, this could be internal or external.
       tags:
@@ -1812,7 +1812,7 @@ paths:
                   $ref: "#/components/examples/table"
   /tables/search:
     post:
-      operationId: search
+      operationId: tableSearch
       summary: Search for tables
       description: Based on table properties (currently only name) search for tables.
         This could be an internal or an external table.
@@ -1838,7 +1838,7 @@ paths:
                   $ref: "#/components/examples/tables"
   /users:
     post:
-      operationId: create
+      operationId: userCreate
       summary: Create a user
       tags:
         - users
@@ -1860,7 +1860,7 @@ paths:
                   $ref: "#/components/examples/user"
   "/users/{userId}":
     put:
-      operationId: update
+      operationId: userUpdate
       summary: Update a user
       tags:
         - users
@@ -1883,7 +1883,7 @@ paths:
                 user:
                   $ref: "#/components/examples/user"
     delete:
-      operationId: destroy
+      operationId: userDestroy
       summary: Delete a user
       tags:
         - users
@@ -1900,7 +1900,7 @@ paths:
                 user:
                   $ref: "#/components/examples/user"
     get:
-      operationId: getById
+      operationId: userGetById
       summary: Retrieve a user
       tags:
         - users
@@ -1918,7 +1918,7 @@ paths:
                   $ref: "#/components/examples/user"
   /users/search:
     post:
-      operationId: search
+      operationId: userSearch
       summary: Search for users
       description: Based on user properties (currently only name) search for users.
       tags:
diff --git a/packages/server/specs/parameters.js b/packages/server/specs/parameters.ts
similarity index 86%
rename from packages/server/specs/parameters.js
rename to packages/server/specs/parameters.ts
index ca7a0a9a27..a928026bb1 100644
--- a/packages/server/specs/parameters.js
+++ b/packages/server/specs/parameters.ts
@@ -1,4 +1,4 @@
-exports.tableId = {
+export const tableId = {
   in: "path",
   name: "tableId",
   required: true,
@@ -8,7 +8,7 @@ exports.tableId = {
   },
 }
 
-exports.rowId = {
+export const rowId = {
   in: "path",
   name: "rowId",
   required: true,
@@ -18,7 +18,7 @@ exports.rowId = {
   },
 }
 
-exports.appId = {
+export const appId = {
   in: "header",
   name: "x-budibase-app-id",
   required: true,
@@ -28,7 +28,7 @@ exports.appId = {
   },
 }
 
-exports.appIdUrl = {
+export const appIdUrl = {
   in: "path",
   name: "appId",
   required: true,
@@ -38,7 +38,7 @@ exports.appIdUrl = {
   },
 }
 
-exports.queryId = {
+export const queryId = {
   in: "path",
   name: "queryId",
   required: true,
@@ -48,7 +48,7 @@ exports.queryId = {
   },
 }
 
-exports.userId = {
+export const userId = {
   in: "path",
   name: "userId",
   required: true,
diff --git a/packages/server/specs/resources/application.js b/packages/server/specs/resources/application.ts
similarity index 94%
rename from packages/server/specs/resources/application.js
rename to packages/server/specs/resources/application.ts
index 6e73817898..aa037da154 100644
--- a/packages/server/specs/resources/application.js
+++ b/packages/server/specs/resources/application.ts
@@ -1,6 +1,6 @@
-const userResource = require("./user")
-const { object } = require("./utils")
-const Resource = require("./utils/Resource")
+import userResource from "./user"
+import { object } from "./utils"
+import Resource from "./utils/Resource"
 
 const application = {
   _id: "app_metadata",
@@ -96,7 +96,7 @@ const deploymentOutputSchema = object({
   },
 })
 
-module.exports = new Resource()
+export default new Resource()
   .setExamples({
     application: {
       value: {
diff --git a/packages/server/specs/resources/index.js b/packages/server/specs/resources/index.ts
similarity index 56%
rename from packages/server/specs/resources/index.js
rename to packages/server/specs/resources/index.ts
index 67421fa494..f1729f4541 100644
--- a/packages/server/specs/resources/index.js
+++ b/packages/server/specs/resources/index.ts
@@ -1,11 +1,11 @@
-const application = require("./application")
-const row = require("./row")
-const table = require("./table")
-const query = require("./query")
-const user = require("./user")
-const misc = require("./misc")
+import application from "./application"
+import row from "./row"
+import table from "./table"
+import query from "./query"
+import user from "./user"
+import misc from "./misc"
 
-exports.examples = {
+export const examples = {
   ...application.getExamples(),
   ...row.getExamples(),
   ...table.getExamples(),
@@ -14,7 +14,7 @@ exports.examples = {
   ...misc.getExamples(),
 }
 
-exports.schemas = {
+export const schemas = {
   ...application.getSchemas(),
   ...row.getSchemas(),
   ...table.getSchemas(),
diff --git a/packages/server/specs/resources/misc.js b/packages/server/specs/resources/misc.ts
similarity index 96%
rename from packages/server/specs/resources/misc.js
rename to packages/server/specs/resources/misc.ts
index 32a81da9ec..16cb831c86 100644
--- a/packages/server/specs/resources/misc.js
+++ b/packages/server/specs/resources/misc.ts
@@ -1,7 +1,7 @@
-const { object } = require("./utils")
-const Resource = require("./utils/Resource")
+import { object } from "./utils"
+import Resource from "./utils/Resource"
 
-module.exports = new Resource().setSchemas({
+export default new Resource().setSchemas({
   rowSearch: object(
     {
       query: {
diff --git a/packages/server/specs/resources/query.js b/packages/server/specs/resources/query.ts
similarity index 96%
rename from packages/server/specs/resources/query.js
rename to packages/server/specs/resources/query.ts
index 1442e46a04..1db80e6011 100644
--- a/packages/server/specs/resources/query.js
+++ b/packages/server/specs/resources/query.ts
@@ -1,6 +1,6 @@
-const Resource = require("./utils/Resource")
-const { object } = require("./utils")
-const { BaseQueryVerbs } = require("../../src/constants")
+import Resource from "./utils/Resource"
+import { object } from "./utils"
+import { BaseQueryVerbs } from "../../src/constants"
 
 const query = {
   _id: "query_datasource_plus_4d8be0c506b9465daf4bf84d890fdab6_454854487c574d45bc4029b1e153219e",
@@ -189,7 +189,7 @@ const executeQueryOutputSchema = object(
   { required: ["data"] }
 )
 
-module.exports = new Resource()
+export default new Resource()
   .setExamples({
     query: {
       value: {
diff --git a/packages/server/specs/resources/row.js b/packages/server/specs/resources/row.ts
similarity index 94%
rename from packages/server/specs/resources/row.js
rename to packages/server/specs/resources/row.ts
index 4e6359a029..aeb66b8e46 100644
--- a/packages/server/specs/resources/row.js
+++ b/packages/server/specs/resources/row.ts
@@ -1,5 +1,5 @@
-const { object } = require("./utils")
-const Resource = require("./utils/Resource")
+import { object } from "./utils"
+import Resource from "./utils/Resource"
 
 const baseRow = {
   _id: "ro_ta_5b1649e42a5b41dea4ef7742a36a7a70_e6dc7e38cf1343b2b56760265201cda4",
@@ -56,7 +56,6 @@ const rowSchema = {
 const rowOutputSchema = {
   ...rowSchema,
   properties: {
-    ...rowSchema.properties,
     _id: {
       description: "The ID of the row.",
       type: "string",
@@ -93,7 +92,7 @@ const searchOutputSchema = {
   },
 }
 
-module.exports = new Resource()
+export default new Resource()
   .setExamples({
     inputRow: {
       value: inputRow,
diff --git a/packages/server/specs/resources/table.js b/packages/server/specs/resources/table.ts
similarity index 97%
rename from packages/server/specs/resources/table.js
rename to packages/server/specs/resources/table.ts
index 523a3a9dfd..0fd063beb7 100644
--- a/packages/server/specs/resources/table.js
+++ b/packages/server/specs/resources/table.ts
@@ -1,10 +1,10 @@
-const {
+import {
   FieldTypes,
   RelationshipTypes,
   FormulaTypes,
-} = require("../../src/constants")
-const { object } = require("./utils")
-const Resource = require("./utils/Resource")
+} from "../../src/constants"
+import { object } from "./utils"
+import Resource from "./utils/Resource"
 
 const table = {
   _id: "ta_5b1649e42a5b41dea4ef7742a36a7a70",
@@ -170,7 +170,7 @@ const tableOutputSchema = {
   required: [...tableSchema.required, "_id"],
 }
 
-module.exports = new Resource()
+export default new Resource()
   .setExamples({
     table: {
       value: {
diff --git a/packages/server/specs/resources/user.js b/packages/server/specs/resources/user.ts
similarity index 96%
rename from packages/server/specs/resources/user.js
rename to packages/server/specs/resources/user.ts
index 8fb505dfb5..a7b9f1ddb9 100644
--- a/packages/server/specs/resources/user.js
+++ b/packages/server/specs/resources/user.ts
@@ -1,5 +1,5 @@
-const { object } = require("./utils")
-const Resource = require("./utils/Resource")
+import { object } from "./utils"
+import Resource from "./utils/Resource"
 
 const user = {
   _id: "us_693a73206518477283a8d5ae31103252",
@@ -105,7 +105,7 @@ const userOutputSchema = {
   required: [...userSchema.required, "_id"],
 }
 
-module.exports = new Resource()
+export default new Resource()
   .setExamples({
     user: {
       value: {
diff --git a/packages/server/specs/resources/utils/Resource.js b/packages/server/specs/resources/utils/Resource.js
deleted file mode 100644
index 69ed7001a6..0000000000
--- a/packages/server/specs/resources/utils/Resource.js
+++ /dev/null
@@ -1,26 +0,0 @@
-class Resource {
-  constructor() {
-    this.examples = {}
-    this.schemas = {}
-  }
-
-  setExamples(examples) {
-    this.examples = examples
-    return this
-  }
-
-  setSchemas(schemas) {
-    this.schemas = schemas
-    return this
-  }
-
-  getExamples() {
-    return this.examples
-  }
-
-  getSchemas() {
-    return this.schemas
-  }
-}
-
-module.exports = Resource
diff --git a/packages/server/specs/resources/utils/Resource.ts b/packages/server/specs/resources/utils/Resource.ts
new file mode 100644
index 0000000000..3b9065db82
--- /dev/null
+++ b/packages/server/specs/resources/utils/Resource.ts
@@ -0,0 +1,39 @@
+type Example = {
+  [key: string]: {
+    [key: string]: any
+  }
+}
+
+type Schema = {
+  [key: string]: {
+    [key: string]: any
+  }
+}
+
+export default class Resource {
+  examples: Example
+  schemas: Schema
+
+  constructor() {
+    this.examples = {}
+    this.schemas = {}
+  }
+
+  setExamples(examples: Example) {
+    this.examples = examples
+    return this
+  }
+
+  setSchemas(schemas: Schema) {
+    this.schemas = schemas
+    return this
+  }
+
+  getExamples() {
+    return this.examples
+  }
+
+  getSchemas() {
+    return this.schemas
+  }
+}
diff --git a/packages/server/specs/resources/utils/index.js b/packages/server/specs/resources/utils/index.ts
similarity index 79%
rename from packages/server/specs/resources/utils/index.js
rename to packages/server/specs/resources/utils/index.ts
index 9bd0ecc6cf..6791fb06d7 100644
--- a/packages/server/specs/resources/utils/index.js
+++ b/packages/server/specs/resources/utils/index.ts
@@ -1,4 +1,4 @@
-exports.object = (props, opts) => {
+export const object = (props: any, opts?: any) => {
   const base = {
     type: "object",
     properties: props,
diff --git a/packages/server/specs/security.js b/packages/server/specs/security.ts
similarity index 87%
rename from packages/server/specs/security.js
rename to packages/server/specs/security.ts
index cbdeb40c63..e431801a07 100644
--- a/packages/server/specs/security.js
+++ b/packages/server/specs/security.ts
@@ -1,4 +1,4 @@
-exports.ApiKeyAuth = {
+export const ApiKeyAuth = {
   type: "apiKey",
   in: "header",
   name: "x-budibase-api-key",
diff --git a/packages/server/src/api/routes/public/applications.ts b/packages/server/src/api/routes/public/applications.ts
index 9d6c380e60..088d974e6c 100644
--- a/packages/server/src/api/routes/public/applications.ts
+++ b/packages/server/src/api/routes/public/applications.ts
@@ -9,7 +9,7 @@ const read = [],
  * @openapi
  * /applications:
  *   post:
- *     operationId: create
+ *     operationId: appCreate
  *     summary: Create an application
  *     tags:
  *       - applications
@@ -42,7 +42,7 @@ write.push(
  * @openapi
  * /applications/{appId}:
  *   put:
- *     operationId: update
+ *     operationId: appUpdate
  *     summary: Update an application
  *     tags:
  *       - applications
@@ -75,7 +75,7 @@ write.push(
  * @openapi
  * /applications/{appId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: appDestroy
  *     summary: Delete an application
  *     tags:
  *       - applications
@@ -98,7 +98,7 @@ write.push(new Endpoint("delete", "/applications/:appId", controller.destroy))
  * @openapi
  * /applications/{appId}/unpublish:
  *   post:
- *     operationId: unpublish
+ *     operationId: appUnpublish
  *     summary: Unpublish an application
  *     tags:
  *       - applications
@@ -116,7 +116,7 @@ write.push(
  * @openapi
  * /applications/{appId}/publish:
  *   post:
- *     operationId: publish
+ *     operationId: appPublish
  *     summary: Unpublish an application
  *     tags:
  *       - applications
@@ -141,7 +141,7 @@ write.push(
  * @openapi
  * /applications/{appId}:
  *   get:
- *     operationId: getById
+ *     operationId: appGetById
  *     summary: Retrieve an application
  *     tags:
  *       - applications
@@ -164,7 +164,7 @@ read.push(new Endpoint("get", "/applications/:appId", controller.read))
  * @openapi
  * /applications/search:
  *   post:
- *     operationId: search
+ *     operationId: appSearch
  *     summary: Search for applications
  *     description: Based on application properties (currently only name) search for applications.
  *     tags:
diff --git a/packages/server/src/api/routes/public/queries.ts b/packages/server/src/api/routes/public/queries.ts
index dc18fb91ac..854db3c964 100644
--- a/packages/server/src/api/routes/public/queries.ts
+++ b/packages/server/src/api/routes/public/queries.ts
@@ -9,7 +9,7 @@ const read = [],
  * @openapi
  * /queries/{queryId}:
  *   post:
- *     operationId: execute
+ *     operationId: queryExecute
  *     summary: Execute a query
  *     description: Queries which have been created within a Budibase app can be executed using this,
  *     tags:
@@ -43,7 +43,7 @@ write.push(new Endpoint("post", "/queries/:queryId", controller.execute))
  * @openapi
  * /queries/search:
  *   post:
- *     operationId: search
+ *     operationId: querySearch
  *     summary: Search for queries
  *     description: Based on query properties (currently only name) search for queries.
  *     tags:
diff --git a/packages/server/src/api/routes/public/rows.ts b/packages/server/src/api/routes/public/rows.ts
index 9109ae76b8..80ad6d6434 100644
--- a/packages/server/src/api/routes/public/rows.ts
+++ b/packages/server/src/api/routes/public/rows.ts
@@ -9,7 +9,7 @@ const read = [],
  * @openapi
  * /tables/{tableId}/rows:
  *   post:
- *     operationId: create
+ *     operationId: rowCreate
  *     summary: Create a row
  *     description: Creates a row within the specified table.
  *     tags:
@@ -44,7 +44,7 @@ write.push(new Endpoint("post", "/tables/:tableId/rows", controller.create))
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   put:
- *     operationId: update
+ *     operationId: rowUpdate
  *     summary: Update a row
  *     description: Updates a row within the specified table.
  *     tags:
@@ -81,7 +81,7 @@ write.push(
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: rowDestroy
  *     summary: Delete a row
  *     description: Deletes a row within the specified table.
  *     tags:
@@ -109,7 +109,7 @@ write.push(
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   get:
- *     operationId: getById
+ *     operationId: rowGetById
  *     summary: Retrieve a row
  *     description: This gets a single row, it will be enriched with the full related rows, rather than
  *       the squashed "primaryDisplay" format returned by the search endpoint.
@@ -136,7 +136,7 @@ read.push(new Endpoint("get", "/tables/:tableId/rows/:rowId", controller.read))
  * @openapi
  * /tables/{tableId}/rows/search:
  *   post:
- *     operationId: search
+ *     operationId: rowSearch
  *     summary: Search for rows
  *     tags:
  *       - rows
diff --git a/packages/server/src/api/routes/public/tables.ts b/packages/server/src/api/routes/public/tables.ts
index 74cd8ca3cf..f8d62c4a37 100644
--- a/packages/server/src/api/routes/public/tables.ts
+++ b/packages/server/src/api/routes/public/tables.ts
@@ -9,7 +9,7 @@ const read = [],
  * @openapi
  * /tables:
  *   post:
- *     operationId: create
+ *     operationId: tableCreate
  *     summary: Create a table
  *     description: Create a table, this could be internal or external.
  *     tags:
@@ -46,7 +46,7 @@ write.push(
  * @openapi
  * /tables/{tableId}:
  *   put:
- *     operationId: update
+ *     operationId: tableUpdate
  *     summary: Update a table
  *     description: Update a table, this could be internal or external.
  *     tags:
@@ -83,7 +83,7 @@ write.push(
  * @openapi
  * /tables/{tableId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: tableDestroy
  *     summary: Delete a table
  *     description: Delete a table, this could be internal or external.
  *     tags:
@@ -108,7 +108,7 @@ write.push(new Endpoint("delete", "/tables/:tableId", controller.destroy))
  * @openapi
  * /tables/{tableId}:
  *   get:
- *     operationId: getById
+ *     operationId: tableGetById
  *     summary: Retrieve a table
  *     description: Lookup a table, this could be internal or external.
  *     tags:
@@ -133,7 +133,7 @@ read.push(new Endpoint("get", "/tables/:tableId", controller.read))
  * @openapi
  * /tables/search:
  *   post:
- *     operationId: search
+ *     operationId: tableSearch
  *     summary: Search for tables
  *     description: Based on table properties (currently only name) search for tables. This could be
  *       an internal or an external table.
diff --git a/packages/server/src/api/routes/public/tests/compare.spec.js b/packages/server/src/api/routes/public/tests/compare.spec.ts
similarity index 80%
rename from packages/server/src/api/routes/public/tests/compare.spec.js
rename to packages/server/src/api/routes/public/tests/compare.spec.ts
index 36693a1098..f9616b06e1 100644
--- a/packages/server/src/api/routes/public/tests/compare.spec.js
+++ b/packages/server/src/api/routes/public/tests/compare.spec.ts
@@ -1,13 +1,14 @@
-const jestOpenAPI = require("jest-openapi").default
-const generateSchema = require("../../../../../specs/generate")
-const setup = require("../../tests/utilities")
-const { generateMakeRequest } = require("./utils")
+import jestOpenAPI from "jest-openapi"
+import { run as generateSchema } from "../../../../../specs/generate"
+import * as setup from "../../tests/utilities"
+import { generateMakeRequest } from "./utils"
+import { Table, App, Row, User } from "@budibase/types"
 
 const yamlPath = generateSchema()
-jestOpenAPI(yamlPath)
+jestOpenAPI(yamlPath!)
 
 let config = setup.getConfig()
-let apiKey, table, app, makeRequest
+let apiKey: string, table: Table, app: App, makeRequest: any
 
 beforeAll(async () => {
   app = await config.init()
@@ -25,19 +26,29 @@ describe("check the applications endpoints", () => {
   })
 
   it("should allow creating an application", async () => {
-    const res = await makeRequest("post", "/applications", {
-      name: "new App"
-    }, null)
+    const res = await makeRequest(
+      "post",
+      "/applications",
+      {
+        name: "new App",
+      },
+      null
+    )
     expect(res).toSatisfyApiSpec()
   })
 
   it("should allow updating an application", async () => {
     const app = config.getApp()
     const appId = config.getAppId()
-    const res = await makeRequest("put", `/applications/${appId}`, {
-      ...app,
-      name: "updated app name",
-    }, appId)
+    const res = await makeRequest(
+      "put",
+      `/applications/${appId}`,
+      {
+        ...app,
+        name: "updated app name",
+      },
+      appId
+    )
     expect(res).toSatisfyApiSpec()
   })
 
@@ -47,7 +58,10 @@ describe("check the applications endpoints", () => {
   })
 
   it("should allow deleting an application", async () => {
-    const res = await makeRequest("delete", `/applications/${config.getAppId()}`)
+    const res = await makeRequest(
+      "delete",
+      `/applications/${config.getAppId()}`
+    )
     expect(res).toSatisfyApiSpec()
   })
 })
@@ -68,8 +82,8 @@ describe("check the tables endpoints", () => {
         column1: {
           type: "string",
           constraints: {},
-        }
-      }
+        },
+      },
     })
     expect(res).toSatisfyApiSpec()
   })
@@ -92,12 +106,11 @@ describe("check the tables endpoints", () => {
 })
 
 describe("check the rows endpoints", () => {
-  let row
+  let row: Row
   it("should allow retrieving rows through search", async () => {
     table = await config.updateTable()
     const res = await makeRequest("post", `/tables/${table._id}/rows/search`, {
-      query: {
-      },
+      query: {},
     })
     expect(res).toSatisfyApiSpec()
   })
@@ -111,9 +124,13 @@ describe("check the rows endpoints", () => {
   })
 
   it("should allow updating a row", async () => {
-    const res = await makeRequest("put", `/tables/${table._id}/rows/${row._id}`, {
-      name: "test row updated",
-    })
+    const res = await makeRequest(
+      "put",
+      `/tables/${table._id}/rows/${row._id}`,
+      {
+        name: "test row updated",
+      }
+    )
     expect(res).toSatisfyApiSpec()
   })
 
@@ -123,13 +140,16 @@ describe("check the rows endpoints", () => {
   })
 
   it("should allow deleting a row", async () => {
-    const res = await makeRequest("delete", `/tables/${table._id}/rows/${row._id}`)
+    const res = await makeRequest(
+      "delete",
+      `/tables/${table._id}/rows/${row._id}`
+    )
     expect(res).toSatisfyApiSpec()
   })
 })
 
 describe("check the users endpoints", () => {
-  let user
+  let user: User
   it("should allow retrieving users through search", async () => {
     user = await config.createUser()
     const res = await makeRequest("post", "/users/search")
@@ -163,4 +183,3 @@ describe("check the queries endpoints", () => {
     expect(res).toSatisfyApiSpec()
   })
 })
-
diff --git a/packages/server/src/api/routes/public/users.ts b/packages/server/src/api/routes/public/users.ts
index 67b73f6cbe..0787dfa3dc 100644
--- a/packages/server/src/api/routes/public/users.ts
+++ b/packages/server/src/api/routes/public/users.ts
@@ -9,7 +9,7 @@ const read = [],
  * @openapi
  * /users:
  *   post:
- *     operationId: create
+ *     operationId: userCreate
  *     summary: Create a user
  *     tags:
  *       - users
@@ -36,7 +36,7 @@ write.push(new Endpoint("post", "/users", controller.create))
  * @openapi
  * /users/{userId}:
  *   put:
- *     operationId: update
+ *     operationId: userUpdate
  *     summary: Update a user
  *     tags:
  *       - users
@@ -65,7 +65,7 @@ write.push(new Endpoint("put", "/users/:userId", controller.update))
  * @openapi
  * /users/{userId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: userDestroy
  *     summary: Delete a user
  *     tags:
  *       - users
@@ -88,7 +88,7 @@ write.push(new Endpoint("delete", "/users/:userId", controller.destroy))
  * @openapi
  * /users/{userId}:
  *   get:
- *     operationId: getById
+ *     operationId: userGetById
  *     summary: Retrieve a user
  *     tags:
  *       - users
@@ -111,7 +111,7 @@ read.push(new Endpoint("get", "/users/:userId", controller.read))
  * @openapi
  * /users/search:
  *   post:
- *     operationId: search
+ *     operationId: userSearch
  *     summary: Search for users
  *     description: Based on user properties (currently only name) search for users.
  *     tags:
diff --git a/packages/server/src/definitions/openapi.ts b/packages/server/src/definitions/openapi.ts
index 7c02aac060..8c44131e96 100644
--- a/packages/server/src/definitions/openapi.ts
+++ b/packages/server/src/definitions/openapi.ts
@@ -5,67 +5,73 @@
 
 export interface paths {
   "/applications": {
-    post: operations["create"];
+    post: operations["appCreate"];
   };
   "/applications/{appId}": {
-    get: operations["getById"];
-    put: operations["update"];
-    delete: operations["destroy"];
+    get: operations["appGetById"];
+    put: operations["appUpdate"];
+    delete: operations["appDestroy"];
+  };
+  "/applications/{appId}/unpublish": {
+    post: operations["appUnpublish"];
+  };
+  "/applications/{appId}/publish": {
+    post: operations["appPublish"];
   };
   "/applications/search": {
     /** Based on application properties (currently only name) search for applications. */
-    post: operations["search"];
+    post: operations["appSearch"];
   };
   "/queries/{queryId}": {
     /** Queries which have been created within a Budibase app can be executed using this, */
-    post: operations["execute"];
+    post: operations["queryExecute"];
   };
   "/queries/search": {
     /** Based on query properties (currently only name) search for queries. */
-    post: operations["search"];
+    post: operations["querySearch"];
   };
   "/tables/{tableId}/rows": {
     /** Creates a row within the specified table. */
-    post: operations["create"];
+    post: operations["rowCreate"];
   };
   "/tables/{tableId}/rows/{rowId}": {
     /** This gets a single row, it will be enriched with the full related rows, rather than the squashed "primaryDisplay" format returned by the search endpoint. */
-    get: operations["getById"];
+    get: operations["rowGetById"];
     /** Updates a row within the specified table. */
-    put: operations["update"];
+    put: operations["rowUpdate"];
     /** Deletes a row within the specified table. */
-    delete: operations["destroy"];
+    delete: operations["rowDestroy"];
   };
   "/tables/{tableId}/rows/search": {
-    post: operations["search"];
+    post: operations["rowSearch"];
   };
   "/tables": {
     /** Create a table, this could be internal or external. */
-    post: operations["create"];
+    post: operations["tableCreate"];
   };
   "/tables/{tableId}": {
     /** Lookup a table, this could be internal or external. */
-    get: operations["getById"];
+    get: operations["tableGetById"];
     /** Update a table, this could be internal or external. */
-    put: operations["update"];
+    put: operations["tableUpdate"];
     /** Delete a table, this could be internal or external. */
-    delete: operations["destroy"];
+    delete: operations["tableDestroy"];
   };
   "/tables/search": {
     /** Based on table properties (currently only name) search for tables. This could be an internal or an external table. */
-    post: operations["search"];
+    post: operations["tableSearch"];
   };
   "/users": {
-    post: operations["create"];
+    post: operations["userCreate"];
   };
   "/users/{userId}": {
-    get: operations["getById"];
-    put: operations["update"];
-    delete: operations["destroy"];
+    get: operations["userGetById"];
+    put: operations["userUpdate"];
+    delete: operations["userDestroy"];
   };
   "/users/search": {
     /** Based on user properties (currently only name) search for users. */
-    post: operations["search"];
+    post: operations["userSearch"];
   };
 }
 
@@ -102,16 +108,6 @@ export interface components {
         lockedBy?: { [key: string]: unknown };
       };
     };
-    deploymentOutput: {
-      data: {
-        /** @description The ID of the deployment. */
-        _id: string;
-        /** @description The status of the deployment. */
-        status: "SUCCESS" | "FAILURE";
-        /** @description The URL by which the published app is accessed. */
-        appUrl?: string;
-      }
-    };
     applicationSearch: {
       data: {
         /** @description The name of the app. */
@@ -137,6 +133,19 @@ export interface components {
         lockedBy?: { [key: string]: unknown };
       }[];
     };
+    deploymentOutput: {
+      data: {
+        /** @description The ID of the app. */
+        _id: string;
+        /**
+         * @description Status of the deployment, whether it succeeded or failed
+         * @enum {string}
+         */
+        status: "SUCCESS" | "FAILURE";
+        /** @description The URL of the published app */
+        appUrl: string;
+      };
+    };
     /** @description The row to be created/updated, based on the table schema. */
     row: { [key: string]: unknown };
     searchOutput: {
@@ -231,7 +240,6 @@ export interface components {
                */
               type?:
                 | "string"
-                | "barcodeqr"
                 | "longform"
                 | "options"
                 | "number"
@@ -243,7 +251,8 @@ export interface components {
                 | "formula"
                 | "auto"
                 | "json"
-                | "internal";
+                | "internal"
+                | "barcodeqr";
               /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
               constraints?: {
                 /** @enum {string} */
@@ -337,7 +346,6 @@ export interface components {
                  */
                 type?:
                   | "string"
-                  | "barcodeqr"
                   | "longform"
                   | "options"
                   | "number"
@@ -349,7 +357,8 @@ export interface components {
                   | "formula"
                   | "auto"
                   | "json"
-                  | "internal";
+                  | "internal"
+                  | "barcodeqr";
                 /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
                 constraints?: {
                   /** @enum {string} */
@@ -445,7 +454,6 @@ export interface components {
                  */
                 type?:
                   | "string"
-                  | "barcodeqr"
                   | "longform"
                   | "options"
                   | "number"
@@ -457,7 +465,8 @@ export interface components {
                   | "formula"
                   | "auto"
                   | "json"
-                  | "internal";
+                  | "internal"
+                  | "barcodeqr";
                 /** @description A constraint can be applied to the column which will be validated against when a row is saved. */
                 constraints?: {
                   /** @enum {string} */
@@ -717,81 +726,115 @@ export interface components {
 }
 
 export interface operations {
-  create: {
+  appCreate: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
     responses: {
-      /** Returns the created user. */
+      /** Returns the created application. */
       200: {
         content: {
-          "application/json": components["schemas"]["userOutput"];
+          "application/json": components["schemas"]["applicationOutput"];
         };
       };
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["user"];
+        "application/json": components["schemas"]["application"];
       };
     };
   };
-  getById: {
+  appGetById: {
     parameters: {
       path: {
-        /** The ID of the user which this request is targeting. */
-        userId: components["parameters"]["userId"];
+        /** The ID of the app which this request is targeting. */
+        appId: components["parameters"]["appIdUrl"];
       };
     };
     responses: {
-      /** Returns the retrieved user. */
+      /** Returns the retrieved application. */
       200: {
         content: {
-          "application/json": components["schemas"]["userOutput"];
+          "application/json": components["schemas"]["applicationOutput"];
         };
       };
     };
   };
-  update: {
+  appUpdate: {
     parameters: {
       path: {
-        /** The ID of the user which this request is targeting. */
-        userId: components["parameters"]["userId"];
+        /** The ID of the app which this request is targeting. */
+        appId: components["parameters"]["appIdUrl"];
       };
     };
     responses: {
-      /** Returns the updated user. */
+      /** Returns the updated application. */
       200: {
         content: {
-          "application/json": components["schemas"]["userOutput"];
+          "application/json": components["schemas"]["applicationOutput"];
         };
       };
     };
     requestBody: {
       content: {
-        "application/json": components["schemas"]["user"];
+        "application/json": components["schemas"]["application"];
       };
     };
   };
-  destroy: {
+  appDestroy: {
     parameters: {
       path: {
-        /** The ID of the user which this request is targeting. */
-        userId: components["parameters"]["userId"];
+        /** The ID of the app which this request is targeting. */
+        appId: components["parameters"]["appIdUrl"];
       };
     };
     responses: {
-      /** Returns the deleted user. */
+      /** Returns the deleted application. */
       200: {
         content: {
-          "application/json": components["schemas"]["userOutput"];
+          "application/json": components["schemas"]["applicationOutput"];
         };
       };
     };
   };
-  /** Based on user properties (currently only name) search for users. */
-  search: {
+  appUnpublish: {
+    parameters: {
+      path: {
+        /** The ID of the app which this request is targeting. */
+        appId: components["parameters"]["appIdUrl"];
+      };
+    };
     responses: {
-      /** Returns the found users based on search parameters. */
+      /** The app was published successfully. */
+      204: never;
+    };
+  };
+  appPublish: {
+    parameters: {
+      path: {
+        /** The ID of the app which this request is targeting. */
+        appId: components["parameters"]["appIdUrl"];
+      };
+    };
+    responses: {
+      /** Returns the deployment object. */
       200: {
         content: {
-          "application/json": components["schemas"]["userSearch"];
+          "application/json": components["schemas"]["deploymentOutput"];
+        };
+      };
+    };
+  };
+  /** Based on application properties (currently only name) search for applications. */
+  appSearch: {
+    responses: {
+      /** Returns the applications that were found based on the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["applicationSearch"];
         };
       };
     };
@@ -802,7 +845,7 @@ export interface operations {
     };
   };
   /** Queries which have been created within a Budibase app can be executed using this, */
-  execute: {
+  queryExecute: {
     parameters: {
       path: {
         /** The ID of the query which this request is targeting. */
@@ -827,6 +870,349 @@ export interface operations {
       };
     };
   };
+  /** Based on query properties (currently only name) search for queries. */
+  querySearch: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the queries found based on the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["querySearch"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["nameSearch"];
+      };
+    };
+  };
+  /** Creates a row within the specified table. */
+  rowCreate: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the created row, including the ID which has been generated for it. This can be found in the Budibase portal, viewed under the developer information. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["rowOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["row"];
+      };
+    };
+  };
+  /** This gets a single row, it will be enriched with the full related rows, rather than the squashed "primaryDisplay" format returned by the search endpoint. */
+  rowGetById: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+        /** The ID of the row which this request is targeting. */
+        rowId: components["parameters"]["rowId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the retrieved row. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["rowOutput"];
+        };
+      };
+    };
+  };
+  /** Updates a row within the specified table. */
+  rowUpdate: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+        /** The ID of the row which this request is targeting. */
+        rowId: components["parameters"]["rowId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the created row, including the ID which has been generated for it. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["rowOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["row"];
+      };
+    };
+  };
+  /** Deletes a row within the specified table. */
+  rowDestroy: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+        /** The ID of the row which this request is targeting. */
+        rowId: components["parameters"]["rowId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the deleted row, including the ID which has been generated for it. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["rowOutput"];
+        };
+      };
+    };
+  };
+  rowSearch: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** The response will contain an array of rows that match the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["searchOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["rowSearch"];
+      };
+    };
+  };
+  /** Create a table, this could be internal or external. */
+  tableCreate: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the created table, including the ID which has been generated for it. This can be internal or external datasources. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["tableOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["table"];
+      };
+    };
+  };
+  /** Lookup a table, this could be internal or external. */
+  tableGetById: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the retrieved table. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["tableOutput"];
+        };
+      };
+    };
+  };
+  /** Update a table, this could be internal or external. */
+  tableUpdate: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the updated table. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["tableOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["table"];
+      };
+    };
+  };
+  /** Delete a table, this could be internal or external. */
+  tableDestroy: {
+    parameters: {
+      path: {
+        /** The ID of the table which this request is targeting. */
+        tableId: components["parameters"]["tableId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the deleted table. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["tableOutput"];
+        };
+      };
+    };
+  };
+  /** Based on table properties (currently only name) search for tables. This could be an internal or an external table. */
+  tableSearch: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the found tables, based on the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["tableSearch"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["nameSearch"];
+      };
+    };
+  };
+  userCreate: {
+    responses: {
+      /** Returns the created user. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["userOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["user"];
+      };
+    };
+  };
+  userGetById: {
+    parameters: {
+      path: {
+        /** The ID of the user which this request is targeting. */
+        userId: components["parameters"]["userId"];
+      };
+    };
+    responses: {
+      /** Returns the retrieved user. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["userOutput"];
+        };
+      };
+    };
+  };
+  userUpdate: {
+    parameters: {
+      path: {
+        /** The ID of the user which this request is targeting. */
+        userId: components["parameters"]["userId"];
+      };
+    };
+    responses: {
+      /** Returns the updated user. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["userOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["user"];
+      };
+    };
+  };
+  userDestroy: {
+    parameters: {
+      path: {
+        /** The ID of the user which this request is targeting. */
+        userId: components["parameters"]["userId"];
+      };
+    };
+    responses: {
+      /** Returns the deleted user. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["userOutput"];
+        };
+      };
+    };
+  };
+  /** Based on user properties (currently only name) search for users. */
+  userSearch: {
+    responses: {
+      /** Returns the found users based on search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["userSearch"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["nameSearch"];
+      };
+    };
+  };
 }
 
 export interface external {}

From 5882f2b468dc73afb053b43faf8f52bd3290f7ca Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 28 Feb 2023 19:27:59 +0000
Subject: [PATCH 208/273] Fixing an issue shown in #9602 where the schema type
 will revert each time you re-run a query, this will hold any previously
 selected schema information in the query.

---
 .../src/components/integration/QueryViewer.svelte    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 2109356c74..7a76970ecb 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -35,6 +35,7 @@
   let parameters
   let data = []
   let saveId
+  let currentTab = "JSON"
 
   $: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
   $: query.schema = fieldsToSchema(fields)
@@ -84,7 +85,16 @@
         return
       }
       data = response.rows
+      // need to merge fields that already exist/might have changed
+      if (fields) {
+        for (let key of Object.keys(response.schema)) {
+          if (fields[key]) {
+            response.schema[key] = fields[key]
+          }
+        }
+      }
       fields = response.schema
+      currentTab = "JSON"
       notifications.success("Query executed successfully")
     } catch (error) {
       notifications.error(`Query Error: ${error.message}`)
@@ -205,7 +215,7 @@
       </Body>
       <section class="viewer">
         {#if data}
-          <Tabs selected="JSON">
+          <Tabs bind:selected={currentTab}>
             <Tab title="JSON">
               <JSONPreview data={data[0]} minHeight="120" />
             </Tab>

From 09adef4d59c83b6f58a195ac00cfc787b78e0f17 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 28 Feb 2023 22:27:02 +0000
Subject: [PATCH 209/273] Fixes for invitation unit tests

---
 packages/worker/src/api/controllers/global/users.ts       | 8 +++++---
 packages/worker/src/api/routes/global/tests/users.spec.ts | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index ab43138aa4..d68e726e71 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -254,7 +254,7 @@ export const onboardUsers = async (ctx: any) => {
     onboardingResponse = await userSdk.bulkCreate(assignUsers, groups)
     ctx.body = onboardingResponse
   } else if (emailConfigured) {
-    onboardingResponse = await invite(ctx)
+    onboardingResponse = await inviteMultiple(ctx)
   } else if (!emailConfigured) {
     const inviteRequest = ctx.request.body as InviteUsersRequest
 
@@ -297,8 +297,10 @@ export const onboardUsers = async (ctx: any) => {
 }
 
 export const invite = async (ctx: any) => {
-  const request = ctx.request.body as InviteUsersRequest
-  const response = await userSdk.invite(request)
+  const request = ctx.request.body as InviteUserRequest
+
+  let multiRequest = [request] as InviteUsersRequest
+  const response = await userSdk.invite(multiRequest)
 
   // explicitly throw for single user invite
   if (response.unsuccessful.length) {
diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts
index 31ef1d9b0c..085c976649 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -30,7 +30,11 @@ describe("/api/global/users", () => {
         email
       )
 
-      expect(res.body).toEqual({ message: "Invitation has been sent." })
+      expect(res.body?.message).toBe("Invitation has been sent.")
+      expect(res.body?.unsuccessful.length).toBe(0)
+      expect(res.body?.successful.length).toBe(1)
+      expect(res.body?.successful[0].email).toBe(email)
+
       expect(sendMailMock).toHaveBeenCalled()
       expect(code).toBeDefined()
       expect(events.user.invited).toBeCalledTimes(1)

From 8234fc7f3a77bef437fe82b59c69ff54f46d0853 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 1 Mar 2023 09:32:52 +0000
Subject: [PATCH 210/273] Remove comment blocks

---
 .../_components/BuilderSidePanel.svelte           | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 05ff742637..a38751f5d4 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -93,15 +93,6 @@
         }
       }
 
-      // if (
-      //   !appRole &&
-      //   user.userGroups &&
-      //   !user.builder?.global &&
-      //   !user.admin.global
-      // ) {
-      //   console.log("Hi, I don't have groups > ", user.email)
-      // }
-
       return {
         ...user,
         role,
@@ -220,12 +211,6 @@
   // Adds the 'role' attribute and sets it to the current app.
   $: enrichedGroups = getEnrichedGroups($groups)
   $: filteredGroups = searchGroups(enrichedGroups, query)
-
-  // $: enrichedAppGroupsById = getAppGroups(enrichedGroups, prodAppId).map(
-  //   group => group._id
-  // )
-  // $: console.log("ALL GROUP IDS ", enrichedAppGroupsById)
-
   $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers)
   $: allUsers = [...filteredUsers, ...groupUsers]
 

From e796880e54b300fae95256e43405931602a67b15 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 10:02:33 +0000
Subject: [PATCH 211/273] v2.3.18-alpha.17

---
 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 d0c541cc5b..5f01f98b3a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a96ba9bf41..db49070128 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.16",
+    "@budibase/types": "2.3.18-alpha.17",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 21bbc15807..c200860933 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.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "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.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.17",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6524c5623f..a06235cbb5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.16",
-    "@budibase/client": "2.3.18-alpha.16",
-    "@budibase/frontend-core": "2.3.18-alpha.16",
-    "@budibase/string-templates": "2.3.18-alpha.16",
+    "@budibase/bbui": "2.3.18-alpha.17",
+    "@budibase/client": "2.3.18-alpha.17",
+    "@budibase/frontend-core": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.17",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bab0b54a86..bcfb086f66 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "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.3.18-alpha.16",
-    "@budibase/string-templates": "2.3.18-alpha.16",
-    "@budibase/types": "2.3.18-alpha.16",
+    "@budibase/backend-core": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/types": "2.3.18-alpha.17",
     "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 75af8909e1..c3425a1372 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "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.3.18-alpha.16",
-    "@budibase/frontend-core": "2.3.18-alpha.16",
-    "@budibase/string-templates": "2.3.18-alpha.16",
+    "@budibase/bbui": "2.3.18-alpha.17",
+    "@budibase/frontend-core": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.17",
     "@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 6f76261d7b..26c56d4895 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.16",
+    "@budibase/bbui": "2.3.18-alpha.17",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 18ab3fefb5..20245a9043 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 676ba2e108..c5a5c7454c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.16",
-    "@budibase/client": "2.3.18-alpha.16",
+    "@budibase/backend-core": "2.3.18-alpha.17",
+    "@budibase/client": "2.3.18-alpha.17",
     "@budibase/pro": "2.3.18-alpha.16",
-    "@budibase/string-templates": "2.3.18-alpha.16",
-    "@budibase/types": "2.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/types": "2.3.18-alpha.17",
     "@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 c1c9fb89b7..caf2965e05 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "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 aa85beb856..1ce263a016 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "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 a0a73b17f4..1a03bec87b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.16",
+  "version": "2.3.18-alpha.17",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.16",
+    "@budibase/backend-core": "2.3.18-alpha.17",
     "@budibase/pro": "2.3.18-alpha.16",
-    "@budibase/string-templates": "2.3.18-alpha.16",
-    "@budibase/types": "2.3.18-alpha.16",
+    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/types": "2.3.18-alpha.17",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From e629e9ab220717f6c49bb4cd154e49cd1bf3f449 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 10:06:03 +0000
Subject: [PATCH 212/273] Update pro version to 2.3.18-alpha.17

---
 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 c5a5c7454c..01c6e3dc33 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.17",
     "@budibase/client": "2.3.18-alpha.17",
-    "@budibase/pro": "2.3.18-alpha.16",
+    "@budibase/pro": "2.3.18-alpha.17",
     "@budibase/string-templates": "2.3.18-alpha.17",
     "@budibase/types": "2.3.18-alpha.17",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 72cc24a5ee..f84bd6f625 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.16.tgz#dc4eb1a84283d96e9d0814647cff6a985e204ede"
-  integrity sha512-oxca+tBXCqr713lH+MLKvY0K/i+yCS5W+sJmMR2jlCfBBEULhPBRcBnyNhUEQsszqcZDiHI4Svy1a50BryDCsQ==
+"@budibase/backend-core@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.17.tgz#4b887d161a0ad6f21bf8f582417cfec90c2c417f"
+  integrity sha512-tXza/NP4pA08FjIyToPqJSQcYFL03RFJRdeT6aA0u8Ibd6ASSXZ/iVw7t0VEk57S4G7fftXA5e6Q3XX8PRR2+A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.16"
+    "@budibase/types" "2.3.18-alpha.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.16.tgz#239ccee2469d7465cec859c22ae39abf0d9cc4ec"
-  integrity sha512-sGgZ5gTMFVtkU0GZF0ApVTAB1uw1twL/2v5vXYzrIzfJKL2Ehcsrg8d3JwlaF6S7bOzOOaNa90cuGgvXQ1TzTw==
+"@budibase/pro@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.17.tgz#4eceff71514ffa5254082bf5b15f9f82f5b1bdf4"
+  integrity sha512-Xsk3kw1MnwGtWI3aNheOdmphSjRjwh0dx/VGTP6MHiFObCKYUxrxm6VmzS9ysw5HxCfyRG8Y2w2EuXoJ08jxtQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.16"
+    "@budibase/backend-core" "2.3.18-alpha.17"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.16"
+    "@budibase/types" "2.3.18-alpha.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.16.tgz#e4613c482ee7fc0ff099190ba3c7432fd6a3efce"
-  integrity sha512-nltKX5erHad2vM6SEv2tYLWCztEtV4bjXrmB8lbkTcf6iD0gjXB280vGkE4gOBdeOmBXXP39GxVc30e7ugw5GA==
+"@budibase/types@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.17.tgz#603a1374b601720ed39e047367fbb71fb5a1c51f"
+  integrity sha512-e+hJBt7LxbOjEcjklfNlzn59yODAgdjd3nhH8d/7Mv9q1tcp92ssjN6gLcFCuNSvFdH861J/ln0ApbkcNAOeTg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1a03bec87b..a6d34b2816 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.17",
-    "@budibase/pro": "2.3.18-alpha.16",
+    "@budibase/pro": "2.3.18-alpha.17",
     "@budibase/string-templates": "2.3.18-alpha.17",
     "@budibase/types": "2.3.18-alpha.17",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d5245ff350..d66da29ec2 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.16.tgz#dc4eb1a84283d96e9d0814647cff6a985e204ede"
-  integrity sha512-oxca+tBXCqr713lH+MLKvY0K/i+yCS5W+sJmMR2jlCfBBEULhPBRcBnyNhUEQsszqcZDiHI4Svy1a50BryDCsQ==
+"@budibase/backend-core@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.17.tgz#4b887d161a0ad6f21bf8f582417cfec90c2c417f"
+  integrity sha512-tXza/NP4pA08FjIyToPqJSQcYFL03RFJRdeT6aA0u8Ibd6ASSXZ/iVw7t0VEk57S4G7fftXA5e6Q3XX8PRR2+A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.16"
+    "@budibase/types" "2.3.18-alpha.17"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.16.tgz#239ccee2469d7465cec859c22ae39abf0d9cc4ec"
-  integrity sha512-sGgZ5gTMFVtkU0GZF0ApVTAB1uw1twL/2v5vXYzrIzfJKL2Ehcsrg8d3JwlaF6S7bOzOOaNa90cuGgvXQ1TzTw==
+"@budibase/pro@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.17.tgz#4eceff71514ffa5254082bf5b15f9f82f5b1bdf4"
+  integrity sha512-Xsk3kw1MnwGtWI3aNheOdmphSjRjwh0dx/VGTP6MHiFObCKYUxrxm6VmzS9ysw5HxCfyRG8Y2w2EuXoJ08jxtQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.16"
+    "@budibase/backend-core" "2.3.18-alpha.17"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.16"
+    "@budibase/types" "2.3.18-alpha.17"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.16":
-  version "2.3.18-alpha.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.16.tgz#e4613c482ee7fc0ff099190ba3c7432fd6a3efce"
-  integrity sha512-nltKX5erHad2vM6SEv2tYLWCztEtV4bjXrmB8lbkTcf6iD0gjXB280vGkE4gOBdeOmBXXP39GxVc30e7ugw5GA==
+"@budibase/types@2.3.18-alpha.17":
+  version "2.3.18-alpha.17"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.17.tgz#603a1374b601720ed39e047367fbb71fb5a1c51f"
+  integrity sha512-e+hJBt7LxbOjEcjklfNlzn59yODAgdjd3nhH8d/7Mv9q1tcp92ssjN6gLcFCuNSvFdH861J/ln0ApbkcNAOeTg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From b11bc5280f83ba6ce44c50f04fafade774a542ca Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 12:36:38 +0000
Subject: [PATCH 213/273] v2.3.18-alpha.18

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

diff --git a/lerna.json b/lerna.json
index 5f01f98b3a..076c79595a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index db49070128..e1a7a83f45 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.17",
+    "@budibase/types": "2.3.18-alpha.18",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c200860933..019b007c27 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.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.18",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a06235cbb5..85c45f83a1 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.17",
-    "@budibase/client": "2.3.18-alpha.17",
-    "@budibase/frontend-core": "2.3.18-alpha.17",
-    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/bbui": "2.3.18-alpha.18",
+    "@budibase/client": "2.3.18-alpha.18",
+    "@budibase/frontend-core": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.18",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bcfb086f66..ae989fa1a6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.17",
-    "@budibase/string-templates": "2.3.18-alpha.17",
-    "@budibase/types": "2.3.18-alpha.17",
+    "@budibase/backend-core": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/types": "2.3.18-alpha.18",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index c3425a1372..09c1f151e8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.17",
-    "@budibase/frontend-core": "2.3.18-alpha.17",
-    "@budibase/string-templates": "2.3.18-alpha.17",
+    "@budibase/bbui": "2.3.18-alpha.18",
+    "@budibase/frontend-core": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.18",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 26c56d4895..62302a0f15 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.17",
+    "@budibase/bbui": "2.3.18-alpha.18",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 20245a9043..74c17189c8 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 01c6e3dc33..6e8a4edffe 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.17",
-    "@budibase/client": "2.3.18-alpha.17",
+    "@budibase/backend-core": "2.3.18-alpha.18",
+    "@budibase/client": "2.3.18-alpha.18",
     "@budibase/pro": "2.3.18-alpha.17",
-    "@budibase/string-templates": "2.3.18-alpha.17",
-    "@budibase/types": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/types": "2.3.18-alpha.18",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index caf2965e05..fcb428d3ca 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1ce263a016..65cdeb2be0 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a6d34b2816..dcbf9cafba 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.17",
+  "version": "2.3.18-alpha.18",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.17",
+    "@budibase/backend-core": "2.3.18-alpha.18",
     "@budibase/pro": "2.3.18-alpha.17",
-    "@budibase/string-templates": "2.3.18-alpha.17",
-    "@budibase/types": "2.3.18-alpha.17",
+    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/types": "2.3.18-alpha.18",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From c3806c0605fa76bb04192bdaa790e7be463e8717 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 12:39:29 +0000
Subject: [PATCH 214/273] Update pro version to 2.3.18-alpha.18

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 6e8a4edffe..9be247cdf8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.18",
     "@budibase/client": "2.3.18-alpha.18",
-    "@budibase/pro": "2.3.18-alpha.17",
+    "@budibase/pro": "2.3.18-alpha.18",
     "@budibase/string-templates": "2.3.18-alpha.18",
     "@budibase/types": "2.3.18-alpha.18",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index f84bd6f625..8def3666de 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.17.tgz#4b887d161a0ad6f21bf8f582417cfec90c2c417f"
-  integrity sha512-tXza/NP4pA08FjIyToPqJSQcYFL03RFJRdeT6aA0u8Ibd6ASSXZ/iVw7t0VEk57S4G7fftXA5e6Q3XX8PRR2+A==
+"@budibase/backend-core@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.18.tgz#6c6d95f3ccb88bd31044b0ac2113a5f66e7993e0"
+  integrity sha512-6CjyZzEO5WK/NiPIANzOTLUzWfcMyhegIF4zaZCRJ2FSN60I28e3lDSGdqPF6WN3c8ofWeSVvtSSwWX6o2Jz5A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.17"
+    "@budibase/types" "2.3.18-alpha.18"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.17.tgz#4eceff71514ffa5254082bf5b15f9f82f5b1bdf4"
-  integrity sha512-Xsk3kw1MnwGtWI3aNheOdmphSjRjwh0dx/VGTP6MHiFObCKYUxrxm6VmzS9ysw5HxCfyRG8Y2w2EuXoJ08jxtQ==
+"@budibase/pro@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.18.tgz#7c0df888af5187044fb4c282ed46f6cb4a6f7932"
+  integrity sha512-Ma3NOOfiEz47MTlwLNuDh4hqhJ2fGc+SbFM/k1+qvcYO2jqVIuiicA+8ONwDJhO+1RzaK2jMLQ+oRL9N7QI/NA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.17"
+    "@budibase/backend-core" "2.3.18-alpha.18"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.17"
+    "@budibase/types" "2.3.18-alpha.18"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.17.tgz#603a1374b601720ed39e047367fbb71fb5a1c51f"
-  integrity sha512-e+hJBt7LxbOjEcjklfNlzn59yODAgdjd3nhH8d/7Mv9q1tcp92ssjN6gLcFCuNSvFdH861J/ln0ApbkcNAOeTg==
+"@budibase/types@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.18.tgz#e9a2cf39231b379a93f222b66ec07fdec3f84e26"
+  integrity sha512-TaauEc3Z68BmpH6XWMx5yvwbxmGvc2G9s/TuI67/ub0C+efXCN7db1TznuoE0B1ASvAvbrD+81oKkov8WCcc8g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index dcbf9cafba..0992a5e0e8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.18",
-    "@budibase/pro": "2.3.18-alpha.17",
+    "@budibase/pro": "2.3.18-alpha.18",
     "@budibase/string-templates": "2.3.18-alpha.18",
     "@budibase/types": "2.3.18-alpha.18",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index d66da29ec2..b5a0d7d37e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.17.tgz#4b887d161a0ad6f21bf8f582417cfec90c2c417f"
-  integrity sha512-tXza/NP4pA08FjIyToPqJSQcYFL03RFJRdeT6aA0u8Ibd6ASSXZ/iVw7t0VEk57S4G7fftXA5e6Q3XX8PRR2+A==
+"@budibase/backend-core@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.18.tgz#6c6d95f3ccb88bd31044b0ac2113a5f66e7993e0"
+  integrity sha512-6CjyZzEO5WK/NiPIANzOTLUzWfcMyhegIF4zaZCRJ2FSN60I28e3lDSGdqPF6WN3c8ofWeSVvtSSwWX6o2Jz5A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.17"
+    "@budibase/types" "2.3.18-alpha.18"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.17.tgz#4eceff71514ffa5254082bf5b15f9f82f5b1bdf4"
-  integrity sha512-Xsk3kw1MnwGtWI3aNheOdmphSjRjwh0dx/VGTP6MHiFObCKYUxrxm6VmzS9ysw5HxCfyRG8Y2w2EuXoJ08jxtQ==
+"@budibase/pro@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.18.tgz#7c0df888af5187044fb4c282ed46f6cb4a6f7932"
+  integrity sha512-Ma3NOOfiEz47MTlwLNuDh4hqhJ2fGc+SbFM/k1+qvcYO2jqVIuiicA+8ONwDJhO+1RzaK2jMLQ+oRL9N7QI/NA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.17"
+    "@budibase/backend-core" "2.3.18-alpha.18"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.17"
+    "@budibase/types" "2.3.18-alpha.18"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.17":
-  version "2.3.18-alpha.17"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.17.tgz#603a1374b601720ed39e047367fbb71fb5a1c51f"
-  integrity sha512-e+hJBt7LxbOjEcjklfNlzn59yODAgdjd3nhH8d/7Mv9q1tcp92ssjN6gLcFCuNSvFdH861J/ln0ApbkcNAOeTg==
+"@budibase/types@2.3.18-alpha.18":
+  version "2.3.18-alpha.18"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.18.tgz#e9a2cf39231b379a93f222b66ec07fdec3f84e26"
+  integrity sha512-TaauEc3Z68BmpH6XWMx5yvwbxmGvc2G9s/TuI67/ub0C+efXCN7db1TznuoE0B1ASvAvbrD+81oKkov8WCcc8g==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From d213a2f3b0b19931f8b03005bd3f0c7403729b99 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 13:26:19 +0000
Subject: [PATCH 215/273] v2.3.18-alpha.19

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

diff --git a/lerna.json b/lerna.json
index 076c79595a..d7ab71f166 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e1a7a83f45..3a3b35aff0 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.18",
+    "@budibase/types": "2.3.18-alpha.19",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 019b007c27..7c1a24f4eb 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.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.19",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 85c45f83a1..5bc9389ef7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.18",
-    "@budibase/client": "2.3.18-alpha.18",
-    "@budibase/frontend-core": "2.3.18-alpha.18",
-    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/bbui": "2.3.18-alpha.19",
+    "@budibase/client": "2.3.18-alpha.19",
+    "@budibase/frontend-core": "2.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.19",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ae989fa1a6..d0d8bd828c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.18",
-    "@budibase/string-templates": "2.3.18-alpha.18",
-    "@budibase/types": "2.3.18-alpha.18",
+    "@budibase/backend-core": "2.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.19",
+    "@budibase/types": "2.3.18-alpha.19",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 09c1f151e8..401bcc61c7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.18",
-    "@budibase/frontend-core": "2.3.18-alpha.18",
-    "@budibase/string-templates": "2.3.18-alpha.18",
+    "@budibase/bbui": "2.3.18-alpha.19",
+    "@budibase/frontend-core": "2.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.19",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 62302a0f15..c4fc442fb6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.18",
+    "@budibase/bbui": "2.3.18-alpha.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 74c17189c8..9f0d266c41 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 605180e2ec..e901a296e2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.18",
-    "@budibase/client": "2.3.18-alpha.18",
+    "@budibase/backend-core": "2.3.18-alpha.19",
+    "@budibase/client": "2.3.18-alpha.19",
     "@budibase/pro": "2.3.18-alpha.18",
-    "@budibase/string-templates": "2.3.18-alpha.18",
-    "@budibase/types": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.19",
+    "@budibase/types": "2.3.18-alpha.19",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fcb428d3ca..6a3e8868b1 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 65cdeb2be0..4196bd1a36 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0992a5e0e8..e1deb352d1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.18",
+  "version": "2.3.18-alpha.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.18",
+    "@budibase/backend-core": "2.3.18-alpha.19",
     "@budibase/pro": "2.3.18-alpha.18",
-    "@budibase/string-templates": "2.3.18-alpha.18",
-    "@budibase/types": "2.3.18-alpha.18",
+    "@budibase/string-templates": "2.3.18-alpha.19",
+    "@budibase/types": "2.3.18-alpha.19",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 7d9ef8c74066343af23a77e572959ce39b64b06f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 13:29:54 +0000
Subject: [PATCH 216/273] Update pro version to 2.3.18-alpha.19

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

diff --git a/packages/server/package.json b/packages/server/package.json
index e901a296e2..5410241306 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.19",
     "@budibase/client": "2.3.18-alpha.19",
-    "@budibase/pro": "2.3.18-alpha.18",
+    "@budibase/pro": "2.3.18-alpha.19",
     "@budibase/string-templates": "2.3.18-alpha.19",
     "@budibase/types": "2.3.18-alpha.19",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 8def3666de..09882fe0ae 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.18.tgz#6c6d95f3ccb88bd31044b0ac2113a5f66e7993e0"
-  integrity sha512-6CjyZzEO5WK/NiPIANzOTLUzWfcMyhegIF4zaZCRJ2FSN60I28e3lDSGdqPF6WN3c8ofWeSVvtSSwWX6o2Jz5A==
+"@budibase/backend-core@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.19.tgz#78e401d779afd2cd4b88cff3b0541696f366d8cd"
+  integrity sha512-hft+QscukDPvleR5qE+MSVNVJce8lvq9BPBV7JK0CnJZn7qyKe47l0shUCbpjN/yVL33pb4RRlKeC12qKlSrFQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.18"
+    "@budibase/types" "2.3.18-alpha.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.18.tgz#7c0df888af5187044fb4c282ed46f6cb4a6f7932"
-  integrity sha512-Ma3NOOfiEz47MTlwLNuDh4hqhJ2fGc+SbFM/k1+qvcYO2jqVIuiicA+8ONwDJhO+1RzaK2jMLQ+oRL9N7QI/NA==
+"@budibase/pro@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.19.tgz#9defc7201aa9f9591d18738335ef59e3dfbe4b4a"
+  integrity sha512-E8WCEJXYbOb+qNTSc2cHT7tN1+25SPtdAyRcvC8nRyV1AucOh80G/lTiA8SxlsZIC7Dzy5tcaFsMebsiySlUkg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.18"
+    "@budibase/backend-core" "2.3.18-alpha.19"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.18"
+    "@budibase/types" "2.3.18-alpha.19"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.18.tgz#e9a2cf39231b379a93f222b66ec07fdec3f84e26"
-  integrity sha512-TaauEc3Z68BmpH6XWMx5yvwbxmGvc2G9s/TuI67/ub0C+efXCN7db1TznuoE0B1ASvAvbrD+81oKkov8WCcc8g==
+"@budibase/types@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.19.tgz#0d9b2686d5da555c8c62b87311dfed597e169189"
+  integrity sha512-x4VZvF+nDuULY8pfL6BlaI8pA7XNuhRhSsja+UXlSU8vtg1QCjb68mtINm90E/dvAVHnDzVGtp5gBd59dTuXNw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e1deb352d1..084f856968 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.19",
-    "@budibase/pro": "2.3.18-alpha.18",
+    "@budibase/pro": "2.3.18-alpha.19",
     "@budibase/string-templates": "2.3.18-alpha.19",
     "@budibase/types": "2.3.18-alpha.19",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index b5a0d7d37e..71b50625e5 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.18.tgz#6c6d95f3ccb88bd31044b0ac2113a5f66e7993e0"
-  integrity sha512-6CjyZzEO5WK/NiPIANzOTLUzWfcMyhegIF4zaZCRJ2FSN60I28e3lDSGdqPF6WN3c8ofWeSVvtSSwWX6o2Jz5A==
+"@budibase/backend-core@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.19.tgz#78e401d779afd2cd4b88cff3b0541696f366d8cd"
+  integrity sha512-hft+QscukDPvleR5qE+MSVNVJce8lvq9BPBV7JK0CnJZn7qyKe47l0shUCbpjN/yVL33pb4RRlKeC12qKlSrFQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.18"
+    "@budibase/types" "2.3.18-alpha.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.18.tgz#7c0df888af5187044fb4c282ed46f6cb4a6f7932"
-  integrity sha512-Ma3NOOfiEz47MTlwLNuDh4hqhJ2fGc+SbFM/k1+qvcYO2jqVIuiicA+8ONwDJhO+1RzaK2jMLQ+oRL9N7QI/NA==
+"@budibase/pro@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.19.tgz#9defc7201aa9f9591d18738335ef59e3dfbe4b4a"
+  integrity sha512-E8WCEJXYbOb+qNTSc2cHT7tN1+25SPtdAyRcvC8nRyV1AucOh80G/lTiA8SxlsZIC7Dzy5tcaFsMebsiySlUkg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.18"
+    "@budibase/backend-core" "2.3.18-alpha.19"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.18"
+    "@budibase/types" "2.3.18-alpha.19"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.18":
-  version "2.3.18-alpha.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.18.tgz#e9a2cf39231b379a93f222b66ec07fdec3f84e26"
-  integrity sha512-TaauEc3Z68BmpH6XWMx5yvwbxmGvc2G9s/TuI67/ub0C+efXCN7db1TznuoE0B1ASvAvbrD+81oKkov8WCcc8g==
+"@budibase/types@2.3.18-alpha.19":
+  version "2.3.18-alpha.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.19.tgz#0d9b2686d5da555c8c62b87311dfed597e169189"
+  integrity sha512-x4VZvF+nDuULY8pfL6BlaI8pA7XNuhRhSsja+UXlSU8vtg1QCjb68mtINm90E/dvAVHnDzVGtp5gBd59dTuXNw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 2dfca0f67c9d00fbc46cd739c0d8f37caad10b51 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 1 Mar 2023 14:32:01 +0000
Subject: [PATCH 217/273] Fix settings doc id in new installs

---
 packages/backend-core/src/configs/configs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index 38e7bcbb29..b628f64b13 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -54,7 +54,7 @@ export async function getSettingsConfigDoc(): Promise<SettingsConfig> {
 
   if (!config) {
     config = {
-      _id: generateConfigID(ConfigType.GOOGLE),
+      _id: generateConfigID(ConfigType.SETTINGS),
       type: ConfigType.SETTINGS,
       config: {},
     }

From a192ea0caa9e13caea71e6933b2f3df6d10a7082 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 1 Mar 2023 14:48:10 +0000
Subject: [PATCH 218/273] Only allow admins to access audit logs

---
 packages/builder/src/stores/portal/menu.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
index 56956fc330..3ffb62d881 100644
--- a/packages/builder/src/stores/portal/menu.js
+++ b/packages/builder/src/stores/portal/menu.js
@@ -75,11 +75,15 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
         title: "Usage",
         href: "/builder/portal/account/usage",
       },
-      {
-        title: "Audit Logs",
-        href: "/builder/portal/account/auditLogs",
-      },
+
     ]
+    if ($auth.isAdmin) {
+      accountSubPages.push(
+        {
+          title: "Audit Logs",
+          href: "/builder/portal/account/auditLogs",
+        })
+    }
     if ($admin.cloud && $auth?.user?.accountPortalAccess) {
       accountSubPages.push({
         title: "Upgrade",

From c83684ed830d8577b843ddd398b4dd8d9600c1db Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 1 Mar 2023 14:49:44 +0000
Subject: [PATCH 219/273] Prevent showing user exists for password disabled
 actions

---
 .../backend-core/src/middleware/authenticated.ts |  3 ++-
 .../worker/src/api/controllers/global/auth.ts    |  2 +-
 .../src/api/routes/global/tests/auth.spec.ts     | 16 +++-------------
 packages/worker/src/sdk/auth/auth.ts             |  2 +-
 packages/worker/src/tests/api/auth.ts            | 12 +++++++-----
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index d7e6346b3f..0708581570 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -154,7 +154,8 @@ export default function (
         return next()
       }
     } catch (err: any) {
-      console.error("Auth Error", err?.message || err)
+      console.error(`Auth Error: ${err.message}`)
+      console.error(err)
       // invalid token, clear the cookie
       if (err && err.name === "JsonWebTokenError") {
         clearCookie(ctx, Cookie.Auth)
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 92cf014a48..362723abd9 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -62,7 +62,7 @@ export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
 
   const user = await userSdk.getUserByEmail(email)
   if (user && (await userSdk.isPreventPasswordActions(user))) {
-    ctx.throw(400, "Password login is disabled for this user")
+    ctx.throw(403, "Invalid credentials")
   }
 
   return passport.authenticate(
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index 9b5392fc73..f79bfb538c 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -106,12 +106,12 @@ describe("/api/global/auth", () => {
             tenantId,
             email,
             password,
-            { status: 400 }
+            { status: 403 }
           )
 
           expect(response.body).toEqual({
-            message: "Password login is disabled for this user",
-            status: 400,
+            message: "Invalid credentials",
+            status: 403,
           })
         }
 
@@ -171,17 +171,7 @@ describe("/api/global/auth", () => {
           const { res } = await config.api.auth.requestPasswordReset(
             sendMailMock,
             user.email,
-            { status: 400 }
           )
-
-          expect(res.body).toEqual({
-            message: "Password reset is disabled for this user",
-            status: 400,
-            error: {
-              code: "http",
-              type: "generic",
-            },
-          })
           expect(sendMailMock).not.toHaveBeenCalled()
         }
 
diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts
index 8e9cff18dd..98830c576d 100644
--- a/packages/worker/src/sdk/auth/auth.ts
+++ b/packages/worker/src/sdk/auth/auth.ts
@@ -59,7 +59,7 @@ export const reset = async (email: string) => {
 
   // exit if user has sso
   if (await userSdk.isPreventPasswordActions(user)) {
-    throw new HTTPError("Password reset is disabled for this user", 400)
+    return
   }
 
   // send password reset
diff --git a/packages/worker/src/tests/api/auth.ts b/packages/worker/src/tests/api/auth.ts
index bd0471ca74..552d4da505 100644
--- a/packages/worker/src/tests/api/auth.ts
+++ b/packages/worker/src/tests/api/auth.ts
@@ -61,11 +61,13 @@ export class AuthAPI extends TestAPI {
 
     let code: string | undefined
     if (res.status === 200) {
-      const emailCall = sendMailMock.mock.calls[0][0]
-      const parts = emailCall.html.split(
-        `http://localhost:10000/builder/auth/reset?code=`
-      )
-      code = parts[1].split('"')[0].split("&")[0]
+      if (sendMailMock.mock.calls.length) {
+        const emailCall = sendMailMock.mock.calls[0][0]
+        const parts = emailCall.html.split(
+          `http://localhost:10000/builder/auth/reset?code=`
+        )
+        code = parts[1].split('"')[0].split("&")[0]
+      }
     }
 
     return { code, res }

From d8c0233141af633dd261704ee24b714be8e66a01 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 14:52:44 +0000
Subject: [PATCH 220/273] v2.3.18-alpha.20

---
 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 d7ab71f166..ac697c6bd3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 3a3b35aff0..58e2b3e927 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.19",
+    "@budibase/types": "2.3.18-alpha.20",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7c1a24f4eb..595ba27069 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.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "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.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.20",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5bc9389ef7..7c01f3083c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.19",
-    "@budibase/client": "2.3.18-alpha.19",
-    "@budibase/frontend-core": "2.3.18-alpha.19",
-    "@budibase/string-templates": "2.3.18-alpha.19",
+    "@budibase/bbui": "2.3.18-alpha.20",
+    "@budibase/client": "2.3.18-alpha.20",
+    "@budibase/frontend-core": "2.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.20",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d0d8bd828c..4f16f81669 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "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.3.18-alpha.19",
-    "@budibase/string-templates": "2.3.18-alpha.19",
-    "@budibase/types": "2.3.18-alpha.19",
+    "@budibase/backend-core": "2.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.20",
+    "@budibase/types": "2.3.18-alpha.20",
     "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 401bcc61c7..aecd01364f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "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.3.18-alpha.19",
-    "@budibase/frontend-core": "2.3.18-alpha.19",
-    "@budibase/string-templates": "2.3.18-alpha.19",
+    "@budibase/bbui": "2.3.18-alpha.20",
+    "@budibase/frontend-core": "2.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.20",
     "@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 c4fc442fb6..edb47d4cdd 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.19",
+    "@budibase/bbui": "2.3.18-alpha.20",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 9f0d266c41..295dccfd17 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 5410241306..da9018520b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.19",
-    "@budibase/client": "2.3.18-alpha.19",
+    "@budibase/backend-core": "2.3.18-alpha.20",
+    "@budibase/client": "2.3.18-alpha.20",
     "@budibase/pro": "2.3.18-alpha.19",
-    "@budibase/string-templates": "2.3.18-alpha.19",
-    "@budibase/types": "2.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.20",
+    "@budibase/types": "2.3.18-alpha.20",
     "@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 6a3e8868b1..107311a948 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "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 4196bd1a36..4e3512f896 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "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 084f856968..3e34eed399 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.19",
+  "version": "2.3.18-alpha.20",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.19",
+    "@budibase/backend-core": "2.3.18-alpha.20",
     "@budibase/pro": "2.3.18-alpha.19",
-    "@budibase/string-templates": "2.3.18-alpha.19",
-    "@budibase/types": "2.3.18-alpha.19",
+    "@budibase/string-templates": "2.3.18-alpha.20",
+    "@budibase/types": "2.3.18-alpha.20",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 692d10d4becdb683463e6ea55a81866ff0b89ed0 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 1 Mar 2023 14:54:00 +0000
Subject: [PATCH 221/273] lint

---
 packages/builder/src/stores/portal/menu.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
index 3ffb62d881..d791a4ac91 100644
--- a/packages/builder/src/stores/portal/menu.js
+++ b/packages/builder/src/stores/portal/menu.js
@@ -75,14 +75,12 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
         title: "Usage",
         href: "/builder/portal/account/usage",
       },
-
     ]
     if ($auth.isAdmin) {
-      accountSubPages.push(
-        {
-          title: "Audit Logs",
-          href: "/builder/portal/account/auditLogs",
-        })
+      accountSubPages.push({
+        title: "Audit Logs",
+        href: "/builder/portal/account/auditLogs",
+      })
     }
     if ($admin.cloud && $auth?.user?.accountPortalAccess) {
       accountSubPages.push({

From eb9615cc73b21fff4dcb7250d8f0cef9225e0d61 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 14:55:46 +0000
Subject: [PATCH 222/273] Update pro version to 2.3.18-alpha.20

---
 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 da9018520b..b000f96d92 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.20",
     "@budibase/client": "2.3.18-alpha.20",
-    "@budibase/pro": "2.3.18-alpha.19",
+    "@budibase/pro": "2.3.18-alpha.20",
     "@budibase/string-templates": "2.3.18-alpha.20",
     "@budibase/types": "2.3.18-alpha.20",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 09882fe0ae..d8e7d4bfe9 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.19.tgz#78e401d779afd2cd4b88cff3b0541696f366d8cd"
-  integrity sha512-hft+QscukDPvleR5qE+MSVNVJce8lvq9BPBV7JK0CnJZn7qyKe47l0shUCbpjN/yVL33pb4RRlKeC12qKlSrFQ==
+"@budibase/backend-core@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.20.tgz#ab5c88005c84e1151116fe33477641452f766a38"
+  integrity sha512-NPvVLSghrk4L5tzt/1hDg4KQnr11aOLC8lCR4vE1qA/Nqg4MQjU0unNWXiefqZeDx0PZtz+7Q+/Eq9ZGlwqYww==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.19"
+    "@budibase/types" "2.3.18-alpha.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.19.tgz#9defc7201aa9f9591d18738335ef59e3dfbe4b4a"
-  integrity sha512-E8WCEJXYbOb+qNTSc2cHT7tN1+25SPtdAyRcvC8nRyV1AucOh80G/lTiA8SxlsZIC7Dzy5tcaFsMebsiySlUkg==
+"@budibase/pro@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.20.tgz#89aa6e1283f94e62c9d1238a358e2cd197f61bff"
+  integrity sha512-gDpmGIq+4LlTbZnG5iUzidhhaxd25aqEuO4J0LJ/p9Mg8UyTuBi8xfXovfBXa9/jpS/fSk1804obWIjIKZEp1w==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.19"
+    "@budibase/backend-core" "2.3.18-alpha.20"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.19"
+    "@budibase/types" "2.3.18-alpha.20"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.19.tgz#0d9b2686d5da555c8c62b87311dfed597e169189"
-  integrity sha512-x4VZvF+nDuULY8pfL6BlaI8pA7XNuhRhSsja+UXlSU8vtg1QCjb68mtINm90E/dvAVHnDzVGtp5gBd59dTuXNw==
+"@budibase/types@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.20.tgz#58e2350dac36e90ed690b9c6e547b93c78efcd19"
+  integrity sha512-bi2GWQ3OAVq0NMCYUB8SGAfz1l08yo7Qj8oQXoA3HztMkCmc9VpgFvZG7HLG4uCHKj2RgulA+54Yi3gStICp4w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3e34eed399..876268161a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.20",
-    "@budibase/pro": "2.3.18-alpha.19",
+    "@budibase/pro": "2.3.18-alpha.20",
     "@budibase/string-templates": "2.3.18-alpha.20",
     "@budibase/types": "2.3.18-alpha.20",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 71b50625e5..4dc1912559 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.19.tgz#78e401d779afd2cd4b88cff3b0541696f366d8cd"
-  integrity sha512-hft+QscukDPvleR5qE+MSVNVJce8lvq9BPBV7JK0CnJZn7qyKe47l0shUCbpjN/yVL33pb4RRlKeC12qKlSrFQ==
+"@budibase/backend-core@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.20.tgz#ab5c88005c84e1151116fe33477641452f766a38"
+  integrity sha512-NPvVLSghrk4L5tzt/1hDg4KQnr11aOLC8lCR4vE1qA/Nqg4MQjU0unNWXiefqZeDx0PZtz+7Q+/Eq9ZGlwqYww==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.19"
+    "@budibase/types" "2.3.18-alpha.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.19.tgz#9defc7201aa9f9591d18738335ef59e3dfbe4b4a"
-  integrity sha512-E8WCEJXYbOb+qNTSc2cHT7tN1+25SPtdAyRcvC8nRyV1AucOh80G/lTiA8SxlsZIC7Dzy5tcaFsMebsiySlUkg==
+"@budibase/pro@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.20.tgz#89aa6e1283f94e62c9d1238a358e2cd197f61bff"
+  integrity sha512-gDpmGIq+4LlTbZnG5iUzidhhaxd25aqEuO4J0LJ/p9Mg8UyTuBi8xfXovfBXa9/jpS/fSk1804obWIjIKZEp1w==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.19"
+    "@budibase/backend-core" "2.3.18-alpha.20"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.19"
+    "@budibase/types" "2.3.18-alpha.20"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.19":
-  version "2.3.18-alpha.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.19.tgz#0d9b2686d5da555c8c62b87311dfed597e169189"
-  integrity sha512-x4VZvF+nDuULY8pfL6BlaI8pA7XNuhRhSsja+UXlSU8vtg1QCjb68mtINm90E/dvAVHnDzVGtp5gBd59dTuXNw==
+"@budibase/types@2.3.18-alpha.20":
+  version "2.3.18-alpha.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.20.tgz#58e2350dac36e90ed690b9c6e547b93c78efcd19"
+  integrity sha512-bi2GWQ3OAVq0NMCYUB8SGAfz1l08yo7Qj8oQXoA3HztMkCmc9VpgFvZG7HLG4uCHKj2RgulA+54Yi3gStICp4w==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 88ce23e720e70058aae6f9e2579c8c62d8c4f96e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 15:13:55 +0000
Subject: [PATCH 223/273] v2.3.18-alpha.21

---
 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 ac697c6bd3..977b671eb7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 58e2b3e927..b56a7ef2e3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.20",
+    "@budibase/types": "2.3.18-alpha.21",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 595ba27069..65372c7b0d 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.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "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.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.21",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7c01f3083c..a3c35117f9 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.20",
-    "@budibase/client": "2.3.18-alpha.20",
-    "@budibase/frontend-core": "2.3.18-alpha.20",
-    "@budibase/string-templates": "2.3.18-alpha.20",
+    "@budibase/bbui": "2.3.18-alpha.21",
+    "@budibase/client": "2.3.18-alpha.21",
+    "@budibase/frontend-core": "2.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.21",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4f16f81669..965c485570 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "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.3.18-alpha.20",
-    "@budibase/string-templates": "2.3.18-alpha.20",
-    "@budibase/types": "2.3.18-alpha.20",
+    "@budibase/backend-core": "2.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.21",
+    "@budibase/types": "2.3.18-alpha.21",
     "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 aecd01364f..6c9afa1fd2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "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.3.18-alpha.20",
-    "@budibase/frontend-core": "2.3.18-alpha.20",
-    "@budibase/string-templates": "2.3.18-alpha.20",
+    "@budibase/bbui": "2.3.18-alpha.21",
+    "@budibase/frontend-core": "2.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.21",
     "@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 edb47d4cdd..010ca21ae3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.20",
+    "@budibase/bbui": "2.3.18-alpha.21",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 295dccfd17..deb86013b4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b000f96d92..a59201ac55 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.20",
-    "@budibase/client": "2.3.18-alpha.20",
+    "@budibase/backend-core": "2.3.18-alpha.21",
+    "@budibase/client": "2.3.18-alpha.21",
     "@budibase/pro": "2.3.18-alpha.20",
-    "@budibase/string-templates": "2.3.18-alpha.20",
-    "@budibase/types": "2.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.21",
+    "@budibase/types": "2.3.18-alpha.21",
     "@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 107311a948..59354ec465 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "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 4e3512f896..10091e6c01 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "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 876268161a..6affd4c667 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.20",
+  "version": "2.3.18-alpha.21",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.20",
+    "@budibase/backend-core": "2.3.18-alpha.21",
     "@budibase/pro": "2.3.18-alpha.20",
-    "@budibase/string-templates": "2.3.18-alpha.20",
-    "@budibase/types": "2.3.18-alpha.20",
+    "@budibase/string-templates": "2.3.18-alpha.21",
+    "@budibase/types": "2.3.18-alpha.21",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From ac8efa2535909b13013183ecdbd337199c2b8586 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 15:17:01 +0000
Subject: [PATCH 224/273] Update pro version to 2.3.18-alpha.21

---
 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 a59201ac55..8ed9b88de9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.21",
     "@budibase/client": "2.3.18-alpha.21",
-    "@budibase/pro": "2.3.18-alpha.20",
+    "@budibase/pro": "2.3.18-alpha.21",
     "@budibase/string-templates": "2.3.18-alpha.21",
     "@budibase/types": "2.3.18-alpha.21",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index d8e7d4bfe9..303a254665 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.20.tgz#ab5c88005c84e1151116fe33477641452f766a38"
-  integrity sha512-NPvVLSghrk4L5tzt/1hDg4KQnr11aOLC8lCR4vE1qA/Nqg4MQjU0unNWXiefqZeDx0PZtz+7Q+/Eq9ZGlwqYww==
+"@budibase/backend-core@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.21.tgz#27197d800397a898358918c0fe0507603fd6feec"
+  integrity sha512-vT2wC7hmS2ssa5rOdgkAKHwJA+5I7R2GFqcBbYHOS/b13tM/Okcecuoid2t+13eBGxh9p9fzY1lp8w0RbB/Mkw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.20"
+    "@budibase/types" "2.3.18-alpha.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.20.tgz#89aa6e1283f94e62c9d1238a358e2cd197f61bff"
-  integrity sha512-gDpmGIq+4LlTbZnG5iUzidhhaxd25aqEuO4J0LJ/p9Mg8UyTuBi8xfXovfBXa9/jpS/fSk1804obWIjIKZEp1w==
+"@budibase/pro@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.21.tgz#bff5d6124bc9ed0bff1c91620f60faf32428f574"
+  integrity sha512-qHfGiFYUz4B0CBb78jqUJOLAyxBiwWTkHquCyYGfleI6bFJvV2ypI36GTPyvh3uYXiPAHmk78wTPQTNSka4eFA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.20"
+    "@budibase/backend-core" "2.3.18-alpha.21"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.20"
+    "@budibase/types" "2.3.18-alpha.21"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.20.tgz#58e2350dac36e90ed690b9c6e547b93c78efcd19"
-  integrity sha512-bi2GWQ3OAVq0NMCYUB8SGAfz1l08yo7Qj8oQXoA3HztMkCmc9VpgFvZG7HLG4uCHKj2RgulA+54Yi3gStICp4w==
+"@budibase/types@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.21.tgz#847d216d348b8fce69d20f4ebff9456977360a43"
+  integrity sha512-IsFkj9lc3+bMThsiGjTJ+W0YMAo4EnY5igOUkhiLF4Osf6EUfTklTaDNGUDc4xsmFvj/0VN2A5Wlied9orbbKA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6affd4c667..fcf4d381f0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.21",
-    "@budibase/pro": "2.3.18-alpha.20",
+    "@budibase/pro": "2.3.18-alpha.21",
     "@budibase/string-templates": "2.3.18-alpha.21",
     "@budibase/types": "2.3.18-alpha.21",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 4dc1912559..8c19fadafc 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.20.tgz#ab5c88005c84e1151116fe33477641452f766a38"
-  integrity sha512-NPvVLSghrk4L5tzt/1hDg4KQnr11aOLC8lCR4vE1qA/Nqg4MQjU0unNWXiefqZeDx0PZtz+7Q+/Eq9ZGlwqYww==
+"@budibase/backend-core@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.21.tgz#27197d800397a898358918c0fe0507603fd6feec"
+  integrity sha512-vT2wC7hmS2ssa5rOdgkAKHwJA+5I7R2GFqcBbYHOS/b13tM/Okcecuoid2t+13eBGxh9p9fzY1lp8w0RbB/Mkw==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.20"
+    "@budibase/types" "2.3.18-alpha.21"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.20.tgz#89aa6e1283f94e62c9d1238a358e2cd197f61bff"
-  integrity sha512-gDpmGIq+4LlTbZnG5iUzidhhaxd25aqEuO4J0LJ/p9Mg8UyTuBi8xfXovfBXa9/jpS/fSk1804obWIjIKZEp1w==
+"@budibase/pro@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.21.tgz#bff5d6124bc9ed0bff1c91620f60faf32428f574"
+  integrity sha512-qHfGiFYUz4B0CBb78jqUJOLAyxBiwWTkHquCyYGfleI6bFJvV2ypI36GTPyvh3uYXiPAHmk78wTPQTNSka4eFA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.20"
+    "@budibase/backend-core" "2.3.18-alpha.21"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.20"
+    "@budibase/types" "2.3.18-alpha.21"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.20":
-  version "2.3.18-alpha.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.20.tgz#58e2350dac36e90ed690b9c6e547b93c78efcd19"
-  integrity sha512-bi2GWQ3OAVq0NMCYUB8SGAfz1l08yo7Qj8oQXoA3HztMkCmc9VpgFvZG7HLG4uCHKj2RgulA+54Yi3gStICp4w==
+"@budibase/types@2.3.18-alpha.21":
+  version "2.3.18-alpha.21"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.21.tgz#847d216d348b8fce69d20f4ebff9456977360a43"
+  integrity sha512-IsFkj9lc3+bMThsiGjTJ+W0YMAo4EnY5igOUkhiLF4Osf6EUfTklTaDNGUDc4xsmFvj/0VN2A5Wlied9orbbKA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 467ad71dcc93ddbd739a74aa2848071c66e7c568 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 1 Mar 2023 15:30:15 +0000
Subject: [PATCH 225/273] Move enforceable sso to enterprise

---
 .../builder/src/pages/builder/portal/settings/auth/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index af272b5d7c..0e82dd31e7 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -368,7 +368,7 @@
         </div>
         {#if !$licensing.enforceableSSO}
           <Tags>
-            <Tag icon="LockClosed">Business plan</Tag>
+            <Tag icon="LockClosed">Enterprise plan</Tag>
           </Tags>
         {/if}
       </div>

From 6917abb6e70530590712f480f5b3d9a84096423d Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 1 Mar 2023 15:31:46 +0000
Subject: [PATCH 226/273] lint

---
 packages/worker/src/api/routes/global/tests/auth.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index f79bfb538c..6c133df652 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -170,7 +170,7 @@ describe("/api/global/auth", () => {
         async function testSSOUser() {
           const { res } = await config.api.auth.requestPasswordReset(
             sendMailMock,
-            user.email,
+            user.email
           )
           expect(sendMailMock).not.toHaveBeenCalled()
         }

From 4798271b3a4d8c38a42c587b8f12687698429851 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 15:40:29 +0000
Subject: [PATCH 227/273] v2.3.18-alpha.22

---
 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 977b671eb7..a81b247eda 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b56a7ef2e3..c7997eaee8 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.21",
+    "@budibase/types": "2.3.18-alpha.22",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 65372c7b0d..14cd1625d6 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.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "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.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.22",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a3c35117f9..e4d7423d4a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.21",
-    "@budibase/client": "2.3.18-alpha.21",
-    "@budibase/frontend-core": "2.3.18-alpha.21",
-    "@budibase/string-templates": "2.3.18-alpha.21",
+    "@budibase/bbui": "2.3.18-alpha.22",
+    "@budibase/client": "2.3.18-alpha.22",
+    "@budibase/frontend-core": "2.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.22",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 965c485570..29249a3d19 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "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.3.18-alpha.21",
-    "@budibase/string-templates": "2.3.18-alpha.21",
-    "@budibase/types": "2.3.18-alpha.21",
+    "@budibase/backend-core": "2.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.22",
+    "@budibase/types": "2.3.18-alpha.22",
     "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 6c9afa1fd2..e3655d9aca 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "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.3.18-alpha.21",
-    "@budibase/frontend-core": "2.3.18-alpha.21",
-    "@budibase/string-templates": "2.3.18-alpha.21",
+    "@budibase/bbui": "2.3.18-alpha.22",
+    "@budibase/frontend-core": "2.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.22",
     "@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 010ca21ae3..de3114300e 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.21",
+    "@budibase/bbui": "2.3.18-alpha.22",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index deb86013b4..11ef8df0a8 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 8ed9b88de9..c8c9f8e177 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.21",
-    "@budibase/client": "2.3.18-alpha.21",
+    "@budibase/backend-core": "2.3.18-alpha.22",
+    "@budibase/client": "2.3.18-alpha.22",
     "@budibase/pro": "2.3.18-alpha.21",
-    "@budibase/string-templates": "2.3.18-alpha.21",
-    "@budibase/types": "2.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.22",
+    "@budibase/types": "2.3.18-alpha.22",
     "@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 59354ec465..0ec2481cef 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "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 10091e6c01..dbb09cb4d4 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "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 fcf4d381f0..3435c7772f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.21",
+  "version": "2.3.18-alpha.22",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.21",
+    "@budibase/backend-core": "2.3.18-alpha.22",
     "@budibase/pro": "2.3.18-alpha.21",
-    "@budibase/string-templates": "2.3.18-alpha.21",
-    "@budibase/types": "2.3.18-alpha.21",
+    "@budibase/string-templates": "2.3.18-alpha.22",
+    "@budibase/types": "2.3.18-alpha.22",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From b8c3dce88770a74c05648f119d2d09098950931e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 15:43:27 +0000
Subject: [PATCH 228/273] Update pro version to 2.3.18-alpha.22

---
 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 c8c9f8e177..f034e989b9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.22",
     "@budibase/client": "2.3.18-alpha.22",
-    "@budibase/pro": "2.3.18-alpha.21",
+    "@budibase/pro": "2.3.18-alpha.22",
     "@budibase/string-templates": "2.3.18-alpha.22",
     "@budibase/types": "2.3.18-alpha.22",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 303a254665..5d58e761da 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.21.tgz#27197d800397a898358918c0fe0507603fd6feec"
-  integrity sha512-vT2wC7hmS2ssa5rOdgkAKHwJA+5I7R2GFqcBbYHOS/b13tM/Okcecuoid2t+13eBGxh9p9fzY1lp8w0RbB/Mkw==
+"@budibase/backend-core@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.22.tgz#d3007f22edbc323e4e66eb8c3bda2543b3e544e8"
+  integrity sha512-ksft4P7p1v+DRYvpEsNKCb96FwhXZEjVTVDrezjHIfu8WQIYs8jj73oSlHE7e3Jke6dqFzfsK5Mqa13/w/+lRQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.21"
+    "@budibase/types" "2.3.18-alpha.22"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.21.tgz#bff5d6124bc9ed0bff1c91620f60faf32428f574"
-  integrity sha512-qHfGiFYUz4B0CBb78jqUJOLAyxBiwWTkHquCyYGfleI6bFJvV2ypI36GTPyvh3uYXiPAHmk78wTPQTNSka4eFA==
+"@budibase/pro@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.22.tgz#5ae0586b0eccaaa83cfb73572e3594f3d316cccc"
+  integrity sha512-BRLl7oMRnWKl7KxF7koWAqkZOjTLFcmgbRrB1Sn3B085KS/D0qE+UTMoskoqHfvKVGZaNKpWzAR9mZysSp3aNA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.21"
+    "@budibase/backend-core" "2.3.18-alpha.22"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.21"
+    "@budibase/types" "2.3.18-alpha.22"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.21.tgz#847d216d348b8fce69d20f4ebff9456977360a43"
-  integrity sha512-IsFkj9lc3+bMThsiGjTJ+W0YMAo4EnY5igOUkhiLF4Osf6EUfTklTaDNGUDc4xsmFvj/0VN2A5Wlied9orbbKA==
+"@budibase/types@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.22.tgz#e98dace1f3a9ee09d454e7da42355875c497606f"
+  integrity sha512-A7wwQkS3yYau09tIGsCq6cwnKpnZGO63dqspaS93AO2Mzy199tMKIlI0F28akhfBqzM6V0VAZ0AWAjn6Jg47JA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3435c7772f..5db25f5af4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.22",
-    "@budibase/pro": "2.3.18-alpha.21",
+    "@budibase/pro": "2.3.18-alpha.22",
     "@budibase/string-templates": "2.3.18-alpha.22",
     "@budibase/types": "2.3.18-alpha.22",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 8c19fadafc..f814dbb447 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.21.tgz#27197d800397a898358918c0fe0507603fd6feec"
-  integrity sha512-vT2wC7hmS2ssa5rOdgkAKHwJA+5I7R2GFqcBbYHOS/b13tM/Okcecuoid2t+13eBGxh9p9fzY1lp8w0RbB/Mkw==
+"@budibase/backend-core@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.22.tgz#d3007f22edbc323e4e66eb8c3bda2543b3e544e8"
+  integrity sha512-ksft4P7p1v+DRYvpEsNKCb96FwhXZEjVTVDrezjHIfu8WQIYs8jj73oSlHE7e3Jke6dqFzfsK5Mqa13/w/+lRQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.21"
+    "@budibase/types" "2.3.18-alpha.22"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.21.tgz#bff5d6124bc9ed0bff1c91620f60faf32428f574"
-  integrity sha512-qHfGiFYUz4B0CBb78jqUJOLAyxBiwWTkHquCyYGfleI6bFJvV2ypI36GTPyvh3uYXiPAHmk78wTPQTNSka4eFA==
+"@budibase/pro@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.22.tgz#5ae0586b0eccaaa83cfb73572e3594f3d316cccc"
+  integrity sha512-BRLl7oMRnWKl7KxF7koWAqkZOjTLFcmgbRrB1Sn3B085KS/D0qE+UTMoskoqHfvKVGZaNKpWzAR9mZysSp3aNA==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.21"
+    "@budibase/backend-core" "2.3.18-alpha.22"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.21"
+    "@budibase/types" "2.3.18-alpha.22"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.21":
-  version "2.3.18-alpha.21"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.21.tgz#847d216d348b8fce69d20f4ebff9456977360a43"
-  integrity sha512-IsFkj9lc3+bMThsiGjTJ+W0YMAo4EnY5igOUkhiLF4Osf6EUfTklTaDNGUDc4xsmFvj/0VN2A5Wlied9orbbKA==
+"@budibase/types@2.3.18-alpha.22":
+  version "2.3.18-alpha.22"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.22.tgz#e98dace1f3a9ee09d454e7da42355875c497606f"
+  integrity sha512-A7wwQkS3yYau09tIGsCq6cwnKpnZGO63dqspaS93AO2Mzy199tMKIlI0F28akhfBqzM6V0VAZ0AWAjn6Jg47JA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From bba6f6941ce9da58725eacd89d9336dfde947571 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 16:38:19 +0000
Subject: [PATCH 229/273] Minor fix for audit log system - after the switch to
 use an async queue for handling of audit log storage, context was lost - in
 multi-tenant environments need to carry the tenant ID into the queue job so
 that context can be applied.

---
 .../events/processors/AuditLogsProcessor.ts   | 43 ++++++++++---------
 packages/types/src/sdk/auditLogs.ts           |  1 +
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index fd68b66871..d888d4f438 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -8,7 +8,7 @@ import {
   HostInfo,
 } from "@budibase/types"
 import { EventProcessor } from "./types"
-import { getAppId } from "../../context"
+import { getAppId, doInTenant } from "../../context"
 import BullQueue from "bull"
 import { createQueue, JobQueue } from "../../queue"
 import { isAudited } from "../../utils"
@@ -26,28 +26,30 @@ export default class AuditLogsProcessor implements EventProcessor {
       JobQueue.AUDIT_LOG
     )
     return AuditLogsProcessor.auditLogQueue.process(async job => {
-      let properties = job.data.properties
-      if (properties.audited) {
-        properties = {
-          ...properties,
-          ...properties.audited,
+      return doInTenant(job.data.tenantId, async () => {
+        let properties = job.data.properties
+        if (properties.audited) {
+          properties = {
+            ...properties,
+            ...properties.audited,
+          }
+          delete properties.audited
         }
-        delete properties.audited
-      }
 
-      // this feature is disabled by default due to privacy requirements
-      // in some countries - available as env var in-case it is desired
-      // in self host deployments
-      let hostInfo: HostInfo | undefined = {}
-      if (env.ENABLE_AUDIT_LOG_IP_ADDR) {
-        hostInfo = job.data.opts.hostInfo
-      }
+        // this feature is disabled by default due to privacy requirements
+        // in some countries - available as env var in-case it is desired
+        // in self host deployments
+        let hostInfo: HostInfo | undefined = {}
+        if (env.ENABLE_AUDIT_LOG_IP_ADDR) {
+          hostInfo = job.data.opts.hostInfo
+        }
 
-      await writeAuditLogs(job.data.event, properties, {
-        userId: job.data.opts.userId,
-        timestamp: job.data.opts.timestamp,
-        appId: job.data.opts.appId,
-        hostInfo,
+        await writeAuditLogs(job.data.event, properties, {
+          userId: job.data.opts.userId,
+          timestamp: job.data.opts.timestamp,
+          appId: job.data.opts.appId,
+          hostInfo,
+        })
       })
     })
   }
@@ -72,6 +74,7 @@ export default class AuditLogsProcessor implements EventProcessor {
           appId: getAppId(),
           hostInfo: identity.hostInfo,
         },
+        tenantId: identity.tenantId!,
       })
     }
   }
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index 0322d2e862..cf12a79688 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -18,4 +18,5 @@ export type AuditLogQueueEvent = {
   event: Event
   properties: any
   opts: AuditWriteOpts
+  tenantId: string
 }

From 0338a8e341d4d6891a31748a1adaf88ee5ffd82e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 17:34:57 +0000
Subject: [PATCH 230/273] v2.3.18-alpha.23

---
 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 a81b247eda..f489e313bb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c7997eaee8..90574207e3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.22",
+    "@budibase/types": "2.3.18-alpha.23",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 14cd1625d6..1f31710eb2 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.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "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.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.23",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e4d7423d4a..9b790f42c0 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.22",
-    "@budibase/client": "2.3.18-alpha.22",
-    "@budibase/frontend-core": "2.3.18-alpha.22",
-    "@budibase/string-templates": "2.3.18-alpha.22",
+    "@budibase/bbui": "2.3.18-alpha.23",
+    "@budibase/client": "2.3.18-alpha.23",
+    "@budibase/frontend-core": "2.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.23",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 29249a3d19..37023c4988 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "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.3.18-alpha.22",
-    "@budibase/string-templates": "2.3.18-alpha.22",
-    "@budibase/types": "2.3.18-alpha.22",
+    "@budibase/backend-core": "2.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.23",
+    "@budibase/types": "2.3.18-alpha.23",
     "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 e3655d9aca..f08826a423 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "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.3.18-alpha.22",
-    "@budibase/frontend-core": "2.3.18-alpha.22",
-    "@budibase/string-templates": "2.3.18-alpha.22",
+    "@budibase/bbui": "2.3.18-alpha.23",
+    "@budibase/frontend-core": "2.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.23",
     "@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 de3114300e..3a6ad17f1b 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.22",
+    "@budibase/bbui": "2.3.18-alpha.23",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 11ef8df0a8..b76ae28e27 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index f034e989b9..bfbfa28322 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.22",
-    "@budibase/client": "2.3.18-alpha.22",
+    "@budibase/backend-core": "2.3.18-alpha.23",
+    "@budibase/client": "2.3.18-alpha.23",
     "@budibase/pro": "2.3.18-alpha.22",
-    "@budibase/string-templates": "2.3.18-alpha.22",
-    "@budibase/types": "2.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.23",
+    "@budibase/types": "2.3.18-alpha.23",
     "@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 0ec2481cef..b2157fce57 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "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 dbb09cb4d4..75103ae043 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "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 5db25f5af4..87c2542270 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.22",
+  "version": "2.3.18-alpha.23",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.22",
+    "@budibase/backend-core": "2.3.18-alpha.23",
     "@budibase/pro": "2.3.18-alpha.22",
-    "@budibase/string-templates": "2.3.18-alpha.22",
-    "@budibase/types": "2.3.18-alpha.22",
+    "@budibase/string-templates": "2.3.18-alpha.23",
+    "@budibase/types": "2.3.18-alpha.23",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 6fdc328cd99d9557cb8982cf3ab3e63fe59a1cd8 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 17:37:52 +0000
Subject: [PATCH 231/273] Update pro version to 2.3.18-alpha.23

---
 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 bfbfa28322..6be5c21cdc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.23",
     "@budibase/client": "2.3.18-alpha.23",
-    "@budibase/pro": "2.3.18-alpha.22",
+    "@budibase/pro": "2.3.18-alpha.23",
     "@budibase/string-templates": "2.3.18-alpha.23",
     "@budibase/types": "2.3.18-alpha.23",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 5d58e761da..4fdfe24319 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.22.tgz#d3007f22edbc323e4e66eb8c3bda2543b3e544e8"
-  integrity sha512-ksft4P7p1v+DRYvpEsNKCb96FwhXZEjVTVDrezjHIfu8WQIYs8jj73oSlHE7e3Jke6dqFzfsK5Mqa13/w/+lRQ==
+"@budibase/backend-core@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.23.tgz#521f8e441b4f5072322441459e60e6320fbe8d2d"
+  integrity sha512-3mqzGt+jqQl762ER5BhIrDuLuMYu77ATZyDr/7oZIILYzhSuzo34uvdbnPyOFLYzmjindk0cl/79imgVAPYK1Q==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.22"
+    "@budibase/types" "2.3.18-alpha.23"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.22.tgz#5ae0586b0eccaaa83cfb73572e3594f3d316cccc"
-  integrity sha512-BRLl7oMRnWKl7KxF7koWAqkZOjTLFcmgbRrB1Sn3B085KS/D0qE+UTMoskoqHfvKVGZaNKpWzAR9mZysSp3aNA==
+"@budibase/pro@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.23.tgz#a0fd95f551108fece6de04465515c76e4f6ed316"
+  integrity sha512-WZQD2gcE73p8Xw+Sx7WKlCrZeevgXvKB4AAwcuBJmtmvkG+1s/V65mt9s/qe5QakUhZTLbmE4mgufBLncqr/Lw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.22"
+    "@budibase/backend-core" "2.3.18-alpha.23"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.22"
+    "@budibase/types" "2.3.18-alpha.23"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.22.tgz#e98dace1f3a9ee09d454e7da42355875c497606f"
-  integrity sha512-A7wwQkS3yYau09tIGsCq6cwnKpnZGO63dqspaS93AO2Mzy199tMKIlI0F28akhfBqzM6V0VAZ0AWAjn6Jg47JA==
+"@budibase/types@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.23.tgz#386a605d8170f650193871c875644a6a8fd5d8cf"
+  integrity sha512-r4CRDNHWuVduq5v3Y5QfxS3zOypF+D4cUVTvLIvZ2DstnJV3MquXlajTJReMJUMhCThJJSNDpD56KwblGWcUew==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 87c2542270..087a1d18f3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.23",
-    "@budibase/pro": "2.3.18-alpha.22",
+    "@budibase/pro": "2.3.18-alpha.23",
     "@budibase/string-templates": "2.3.18-alpha.23",
     "@budibase/types": "2.3.18-alpha.23",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index f814dbb447..18b4e3fc1e 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.22.tgz#d3007f22edbc323e4e66eb8c3bda2543b3e544e8"
-  integrity sha512-ksft4P7p1v+DRYvpEsNKCb96FwhXZEjVTVDrezjHIfu8WQIYs8jj73oSlHE7e3Jke6dqFzfsK5Mqa13/w/+lRQ==
+"@budibase/backend-core@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.23.tgz#521f8e441b4f5072322441459e60e6320fbe8d2d"
+  integrity sha512-3mqzGt+jqQl762ER5BhIrDuLuMYu77ATZyDr/7oZIILYzhSuzo34uvdbnPyOFLYzmjindk0cl/79imgVAPYK1Q==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.22"
+    "@budibase/types" "2.3.18-alpha.23"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.22.tgz#5ae0586b0eccaaa83cfb73572e3594f3d316cccc"
-  integrity sha512-BRLl7oMRnWKl7KxF7koWAqkZOjTLFcmgbRrB1Sn3B085KS/D0qE+UTMoskoqHfvKVGZaNKpWzAR9mZysSp3aNA==
+"@budibase/pro@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.23.tgz#a0fd95f551108fece6de04465515c76e4f6ed316"
+  integrity sha512-WZQD2gcE73p8Xw+Sx7WKlCrZeevgXvKB4AAwcuBJmtmvkG+1s/V65mt9s/qe5QakUhZTLbmE4mgufBLncqr/Lw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.22"
+    "@budibase/backend-core" "2.3.18-alpha.23"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.22"
+    "@budibase/types" "2.3.18-alpha.23"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.22":
-  version "2.3.18-alpha.22"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.22.tgz#e98dace1f3a9ee09d454e7da42355875c497606f"
-  integrity sha512-A7wwQkS3yYau09tIGsCq6cwnKpnZGO63dqspaS93AO2Mzy199tMKIlI0F28akhfBqzM6V0VAZ0AWAjn6Jg47JA==
+"@budibase/types@2.3.18-alpha.23":
+  version "2.3.18-alpha.23"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.23.tgz#386a605d8170f650193871c875644a6a8fd5d8cf"
+  integrity sha512-r4CRDNHWuVduq5v3Y5QfxS3zOypF+D4cUVTvLIvZ2DstnJV3MquXlajTJReMJUMhCThJJSNDpD56KwblGWcUew==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From c5fc4ea521327d35e10d8f75173b1039f2c621cb Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 1 Mar 2023 17:40:33 +0000
Subject: [PATCH 232/273] Fix for group picker in the user details page to
 accommodate missing userGroups value on a user

---
 packages/builder/src/components/settings/UserGroupPicker.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/settings/UserGroupPicker.svelte b/packages/builder/src/components/settings/UserGroupPicker.svelte
index 1c69e48da1..b1b59cda7a 100644
--- a/packages/builder/src/components/settings/UserGroupPicker.svelte
+++ b/packages/builder/src/components/settings/UserGroupPicker.svelte
@@ -18,7 +18,7 @@
     return list.map(item => {
       return {
         ...item,
-        selected: selected.find(x => x === item._id) != null,
+        selected: selected?.find(x => x === item._id) != null,
       }
     })
   }

From 6a6bbb38c4ed43a095f54d46b9d750277cb980dd Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Wed, 1 Mar 2023 17:41:50 +0000
Subject: [PATCH 233/273] Support navigate to link in new tab (#9800)

* Support navigate to link in new tab

* Add dropdown for Navigate To type

* lint

* Remove labels
---
 .../actions/NavigateTo.svelte                 | 66 +++++++++++++++----
 packages/client/src/stores/routes.js          | 21 +++---
 packages/client/src/utils/buttonActions.js    |  4 +-
 3 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
index d90b645315..dca2887fb4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
@@ -1,22 +1,66 @@
 <script>
-  import { Label, Checkbox } from "@budibase/bbui"
+  import { store } from "builderStore"
+  import { onMount } from "svelte"
+  import { Label, Checkbox, Select } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let parameters
   export let bindings = []
+
+  $: urlOptions = $store.screens
+    .map(screen => screen.routing?.route)
+    .filter(x => x != null)
+
+  const typeOptions = [
+    {
+      label: "Screen",
+      value: "screen",
+    },
+    {
+      label: "URL",
+      value: "url",
+    },
+  ]
+
+  onMount(() => {
+    if (!parameters.type) {
+      parameters.type = "screen"
+    }
+  })
 </script>
 
 <div class="root">
-  <Label small>Screen</Label>
-  <DrawerBindableInput
-    title="Destination URL"
-    placeholder="/screen"
-    value={parameters.url}
-    on:change={value => (parameters.url = value.detail)}
-    {bindings}
+  <Label small>Destination</Label>
+  <Select
+    placeholder={null}
+    bind:value={parameters.type}
+    options={typeOptions}
+    on:change={() => (parameters.url = "")}
   />
-  <div />
-  <Checkbox text="Open screen in modal" bind:value={parameters.peek} />
+  {#if parameters.type === "screen"}
+    <DrawerBindableCombobox
+      title="Destination"
+      placeholder="/screen"
+      value={parameters.url}
+      on:change={value => (parameters.url = value.detail)}
+      {bindings}
+      options={urlOptions}
+      appendBindingsAsOptions={false}
+    />
+    <div />
+    <Checkbox text="Open screen in modal" bind:value={parameters.peek} />
+  {:else}
+    <DrawerBindableInput
+      title="Destination"
+      placeholder="/url"
+      value={parameters.url}
+      on:change={value => (parameters.url = value.detail)}
+      {bindings}
+    />
+    <div />
+    <Checkbox text="New Tab" bind:value={parameters.externalNewTab} />
+  {/if}
 </div>
 
 <style>
@@ -24,7 +68,7 @@
     display: grid;
     align-items: center;
     gap: var(--spacing-m);
-    grid-template-columns: auto 1fr;
+    grid-template-columns: auto;
     max-width: 400px;
     margin: 0 auto;
   }
diff --git a/packages/client/src/stores/routes.js b/packages/client/src/stores/routes.js
index 69cd42d5f5..8e318af2e3 100644
--- a/packages/client/src/stores/routes.js
+++ b/packages/client/src/stores/routes.js
@@ -66,22 +66,27 @@ const createRouteStore = () => {
       return state
     })
   }
-  const navigate = (url, peek) => {
+  const navigate = (url, peek, externalNewTab) => {
     if (get(builderStore).inBuilder) {
       return
     }
     if (url) {
       // If we're already peeking, don't peek again
       const isPeeking = get(store).queryParams?.peek
-      if (peek && !isPeeking) {
+      const external = !url.startsWith("/")
+      if (peek && !isPeeking && !external) {
         peekStore.actions.showPeek(url)
-      } else {
-        const external = !url.startsWith("/")
-        if (external) {
-          window.location.href = url
-        } else {
-          push(url)
+      } else if (external) {
+        if (url.startsWith("www")) {
+          url = `https://${url}`
         }
+        if (externalNewTab) {
+          window.open(url, "_blank")
+        } else {
+          window.location.href = url
+        }
+      } else {
+        push(url)
       }
     }
   }
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 55bd4d987d..895584b782 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -140,8 +140,8 @@ const triggerAutomationHandler = async action => {
 }
 
 const navigationHandler = action => {
-  const { url, peek } = action.parameters
-  routeStore.actions.navigate(url, peek)
+  const { url, peek, externalNewTab } = action.parameters
+  routeStore.actions.navigate(url, peek, externalNewTab)
 }
 
 const queryExecutionHandler = async action => {

From 9c6d598d8a9fba688e2ed51afd62372af0fb2635 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 17:56:00 +0000
Subject: [PATCH 234/273] v2.3.18-alpha.24

---
 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 f489e313bb..c1db9b332f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 90574207e3..db951f597a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.23",
+    "@budibase/types": "2.3.18-alpha.24",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 1f31710eb2..d9ccc4fcd8 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.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "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.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.24",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9b790f42c0..a06ed7080b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.23",
-    "@budibase/client": "2.3.18-alpha.23",
-    "@budibase/frontend-core": "2.3.18-alpha.23",
-    "@budibase/string-templates": "2.3.18-alpha.23",
+    "@budibase/bbui": "2.3.18-alpha.24",
+    "@budibase/client": "2.3.18-alpha.24",
+    "@budibase/frontend-core": "2.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.24",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 37023c4988..a9c946dcc0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "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.3.18-alpha.23",
-    "@budibase/string-templates": "2.3.18-alpha.23",
-    "@budibase/types": "2.3.18-alpha.23",
+    "@budibase/backend-core": "2.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.24",
+    "@budibase/types": "2.3.18-alpha.24",
     "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 f08826a423..66967d509a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "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.3.18-alpha.23",
-    "@budibase/frontend-core": "2.3.18-alpha.23",
-    "@budibase/string-templates": "2.3.18-alpha.23",
+    "@budibase/bbui": "2.3.18-alpha.24",
+    "@budibase/frontend-core": "2.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.24",
     "@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 3a6ad17f1b..c282e24e43 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.23",
+    "@budibase/bbui": "2.3.18-alpha.24",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b76ae28e27..8e399988fd 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 6be5c21cdc..8bb59ff528 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.23",
-    "@budibase/client": "2.3.18-alpha.23",
+    "@budibase/backend-core": "2.3.18-alpha.24",
+    "@budibase/client": "2.3.18-alpha.24",
     "@budibase/pro": "2.3.18-alpha.23",
-    "@budibase/string-templates": "2.3.18-alpha.23",
-    "@budibase/types": "2.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.24",
+    "@budibase/types": "2.3.18-alpha.24",
     "@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 b2157fce57..87242506d4 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "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 75103ae043..e88355741a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "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 087a1d18f3..20af77ef90 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.23",
+  "version": "2.3.18-alpha.24",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.23",
+    "@budibase/backend-core": "2.3.18-alpha.24",
     "@budibase/pro": "2.3.18-alpha.23",
-    "@budibase/string-templates": "2.3.18-alpha.23",
-    "@budibase/types": "2.3.18-alpha.23",
+    "@budibase/string-templates": "2.3.18-alpha.24",
+    "@budibase/types": "2.3.18-alpha.24",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 28f8c12e2bf274252676523829b39c30869cec41 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 17:58:55 +0000
Subject: [PATCH 235/273] Update pro version to 2.3.18-alpha.24

---
 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 8bb59ff528..aae350d499 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.24",
     "@budibase/client": "2.3.18-alpha.24",
-    "@budibase/pro": "2.3.18-alpha.23",
+    "@budibase/pro": "2.3.18-alpha.24",
     "@budibase/string-templates": "2.3.18-alpha.24",
     "@budibase/types": "2.3.18-alpha.24",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4fdfe24319..16e68f7907 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.23.tgz#521f8e441b4f5072322441459e60e6320fbe8d2d"
-  integrity sha512-3mqzGt+jqQl762ER5BhIrDuLuMYu77ATZyDr/7oZIILYzhSuzo34uvdbnPyOFLYzmjindk0cl/79imgVAPYK1Q==
+"@budibase/backend-core@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.24.tgz#9d8e2461a1bf0506d3ee5ca44946a851bf40f640"
+  integrity sha512-VLsw43QnCiQThqMEGfnuy9sLvEPB4PE7t/1/OrTTXzxWuK++K48yG6wI8R0hus9orENilYDDgHQOkNkQNDronQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.23"
+    "@budibase/types" "2.3.18-alpha.24"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.23.tgz#a0fd95f551108fece6de04465515c76e4f6ed316"
-  integrity sha512-WZQD2gcE73p8Xw+Sx7WKlCrZeevgXvKB4AAwcuBJmtmvkG+1s/V65mt9s/qe5QakUhZTLbmE4mgufBLncqr/Lw==
+"@budibase/pro@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.24.tgz#13827ef77a1b9d97b99f40fe92a6ab339cbe16ae"
+  integrity sha512-28S1go0poazeeDeBrOMZ9MRnwpLBTC2mw+O7TB5p8GOB7FyLgpxDiX5ZVSVtMxWd+IGuZXeKfcrUUHT7yjd8OQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.23"
+    "@budibase/backend-core" "2.3.18-alpha.24"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.23"
+    "@budibase/types" "2.3.18-alpha.24"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.23.tgz#386a605d8170f650193871c875644a6a8fd5d8cf"
-  integrity sha512-r4CRDNHWuVduq5v3Y5QfxS3zOypF+D4cUVTvLIvZ2DstnJV3MquXlajTJReMJUMhCThJJSNDpD56KwblGWcUew==
+"@budibase/types@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.24.tgz#6e3bcc43c62ffa76408d534ad8b0c126861fea87"
+  integrity sha512-ajDnifCrzY+/s1oeILG9gVtkeVOtBtGsyxFV6r3mj6kY674Kjwj5cM43goSoYR5SzhZAPTHT8Rqaaxac3mSpHA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 20af77ef90..62bedf3481 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.24",
-    "@budibase/pro": "2.3.18-alpha.23",
+    "@budibase/pro": "2.3.18-alpha.24",
     "@budibase/string-templates": "2.3.18-alpha.24",
     "@budibase/types": "2.3.18-alpha.24",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 18b4e3fc1e..872429ac96 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.23.tgz#521f8e441b4f5072322441459e60e6320fbe8d2d"
-  integrity sha512-3mqzGt+jqQl762ER5BhIrDuLuMYu77ATZyDr/7oZIILYzhSuzo34uvdbnPyOFLYzmjindk0cl/79imgVAPYK1Q==
+"@budibase/backend-core@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.24.tgz#9d8e2461a1bf0506d3ee5ca44946a851bf40f640"
+  integrity sha512-VLsw43QnCiQThqMEGfnuy9sLvEPB4PE7t/1/OrTTXzxWuK++K48yG6wI8R0hus9orENilYDDgHQOkNkQNDronQ==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.23"
+    "@budibase/types" "2.3.18-alpha.24"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.23.tgz#a0fd95f551108fece6de04465515c76e4f6ed316"
-  integrity sha512-WZQD2gcE73p8Xw+Sx7WKlCrZeevgXvKB4AAwcuBJmtmvkG+1s/V65mt9s/qe5QakUhZTLbmE4mgufBLncqr/Lw==
+"@budibase/pro@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.24.tgz#13827ef77a1b9d97b99f40fe92a6ab339cbe16ae"
+  integrity sha512-28S1go0poazeeDeBrOMZ9MRnwpLBTC2mw+O7TB5p8GOB7FyLgpxDiX5ZVSVtMxWd+IGuZXeKfcrUUHT7yjd8OQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.23"
+    "@budibase/backend-core" "2.3.18-alpha.24"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.23"
+    "@budibase/types" "2.3.18-alpha.24"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.23":
-  version "2.3.18-alpha.23"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.23.tgz#386a605d8170f650193871c875644a6a8fd5d8cf"
-  integrity sha512-r4CRDNHWuVduq5v3Y5QfxS3zOypF+D4cUVTvLIvZ2DstnJV3MquXlajTJReMJUMhCThJJSNDpD56KwblGWcUew==
+"@budibase/types@2.3.18-alpha.24":
+  version "2.3.18-alpha.24"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.24.tgz#6e3bcc43c62ffa76408d534ad8b0c126861fea87"
+  integrity sha512-ajDnifCrzY+/s1oeILG9gVtkeVOtBtGsyxFV6r3mj6kY674Kjwj5cM43goSoYR5SzhZAPTHT8Rqaaxac3mSpHA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From d8e9132b37b599d10f756782f65e32e12ac703d2 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 1 Mar 2023 18:33:37 +0000
Subject: [PATCH 236/273] allow proxy service rate limits to be controlled with
 helm

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

diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml
index 6064905c4c..dfddee8ba0 100644
--- a/charts/budibase/templates/proxy-service-deployment.yaml
+++ b/charts/budibase/templates/proxy-service-deployment.yaml
@@ -42,6 +42,14 @@ spec:
           value: {{ tpl .Values.services.proxy.upstreams.minio . | quote }}
         - name: COUCHDB_UPSTREAM_URL
           value: {{ .Values.services.couchdb.url | default (tpl .Values.services.proxy.upstreams.couchdb .) | quote }}
+        {{ if .Values.services.proxy.proxyRateLimitWebhooksPerSecond }}
+        - name: PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND
+          value: {{ .Values.services.proxy.proxyRateLimitWebhooksPerSecond | quote }}
+        {{ end }}
+        {{ if .Values.services.proxy.proxyRateLimitApiPerSecond }}
+        - name: PROXY_RATE_LIMIT_API_PER_SECOND
+          value: {{ .Values.services.proxy.proxyRateLimitApiPerSecond | quote }}
+        {{ end }}
         - name: RESOLVER
           {{ if .Values.services.proxy.resolver }}
           value: {{ .Values.services.proxy.resolver }}

From eba18a415994d93f005c0f36fa57e5816fca8412 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 19:01:13 +0000
Subject: [PATCH 237/273] Fix for #9739 - there was an issue with the mango
 syntax, when working with multi attachment columns it was using an AND
 comparator instead of OR, it should be searching for rows that contain any
 attachment column, not all attachment columns.

---
 packages/backend-core/src/migrations/migrations.ts | 6 +++++-
 packages/server/src/sdk/app/rows/attachments.ts    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 2e3524775f..48d3b14a4a 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -86,7 +86,11 @@ export const runMigration = async (
     count++
     const lengthStatement = length > 1 ? `[${count}/${length}]` : ""
 
-    const db = getDB(dbName)
+    const db = getDB(dbName, { skip_setup: true })
+    // DB doesn't exist - no-op required
+    if (!(await db.exists())) {
+      continue
+    }
     try {
       const doc = await getMigrationsDoc(db)
 
diff --git a/packages/server/src/sdk/app/rows/attachments.ts b/packages/server/src/sdk/app/rows/attachments.ts
index 67f58f8f2c..bd04f64146 100644
--- a/packages/server/src/sdk/app/rows/attachments.ts
+++ b/packages/server/src/sdk/app/rows/attachments.ts
@@ -13,13 +13,13 @@ function generateAttachmentFindParams(
 ) {
   const params: CouchFindOptions = {
     selector: {
+      $or: attachmentCols.map(col => ({ [col]: { $exists: true } })),
       _id: {
         $regex: `^${DocumentType.ROW}${SEPARATOR}${tableId}`,
       },
     },
     limit: FIND_LIMIT,
   }
-  attachmentCols.forEach(col => (params.selector[col] = { $exists: true }))
   if (bookmark) {
     params.bookmark = bookmark
   }

From 923e9d8ec462726ec9db3b117e8933eec316727d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 19:17:45 +0000
Subject: [PATCH 238/273] Adding in test check.

---
 packages/backend-core/src/migrations/migrations.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 48d3b14a4a..43d3e7fe72 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -17,6 +17,7 @@ import {
   MigrationNoOpOptions,
   App,
 } from "@budibase/types"
+import env from "../environment"
 
 export const getMigrationsDoc = async (db: any) => {
   // get the migrations doc
@@ -88,7 +89,8 @@ export const runMigration = async (
 
     const db = getDB(dbName, { skip_setup: true })
     // DB doesn't exist - no-op required
-    if (!(await db.exists())) {
+    const dbExists = await db.exists()
+    if (!env.isTest() && !dbExists) {
       continue
     }
     try {

From 5b150e774888f4fcd0387c778a685f0f32bd40cb Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 19:43:40 +0000
Subject: [PATCH 239/273] Removing migration change and fixing #9738 - making
 sure that exports with excludeRows enabled don't include attachments.

---
 .../backend-core/src/migrations/migrations.ts |  7 +---
 .../server/src/sdk/app/backups/constants.ts   |  1 +
 .../server/src/sdk/app/backups/exports.ts     | 32 ++++++++++++++-----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 43d3e7fe72..6bc16846e1 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -17,7 +17,6 @@ import {
   MigrationNoOpOptions,
   App,
 } from "@budibase/types"
-import env from "../environment"
 
 export const getMigrationsDoc = async (db: any) => {
   // get the migrations doc
@@ -88,11 +87,7 @@ export const runMigration = async (
     const lengthStatement = length > 1 ? `[${count}/${length}]` : ""
 
     const db = getDB(dbName, { skip_setup: true })
-    // DB doesn't exist - no-op required
-    const dbExists = await db.exists()
-    if (!env.isTest() && !dbExists) {
-      continue
-    }
+
     try {
       const doc = await getMigrationsDoc(db)
 
diff --git a/packages/server/src/sdk/app/backups/constants.ts b/packages/server/src/sdk/app/backups/constants.ts
index 2f011ea2de..0584fcb3d0 100644
--- a/packages/server/src/sdk/app/backups/constants.ts
+++ b/packages/server/src/sdk/app/backups/constants.ts
@@ -1,2 +1,3 @@
 export const DB_EXPORT_FILE = "db.txt"
 export const GLOBAL_DB_EXPORT_FILE = "global.txt"
+export const STATIC_APP_FILES = ["manifest.json", "budibase-client.js"]
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 25bd1f4795..c10f106451 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -7,10 +7,15 @@ import {
   TABLE_ROW_PREFIX,
   USER_METDATA_PREFIX,
 } from "../../../db/utils"
-import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
+import {
+  DB_EXPORT_FILE,
+  GLOBAL_DB_EXPORT_FILE,
+  STATIC_APP_FILES,
+} from "./constants"
 import fs from "fs"
 import { join } from "path"
 import env from "../../../environment"
+
 const uuid = require("uuid/v4")
 const tar = require("tar")
 const MemoryStream = require("memorystream")
@@ -91,14 +96,25 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   const prodAppId = dbCore.getProdAppID(appId)
   const appPath = `${prodAppId}/`
   // export bucket contents
-  let tmpPath
+  let tmpPath = createTempFolder(uuid())
   if (!env.isTest()) {
-    tmpPath = await objectStore.retrieveDirectory(
-      ObjectStoreBuckets.APPS,
-      appPath
-    )
-  } else {
-    tmpPath = createTempFolder(uuid())
+    // write just the static files
+    if (config?.excludeRows) {
+      for (let path of STATIC_APP_FILES) {
+        const contents = await objectStore.retrieve(
+          ObjectStoreBuckets.APPS,
+          join(appPath, path)
+        )
+        fs.writeFileSync(join(tmpPath, path), contents)
+      }
+    }
+    // get all of the files
+    else {
+      tmpPath = await objectStore.retrieveDirectory(
+        ObjectStoreBuckets.APPS,
+        appPath
+      )
+    }
   }
   const downloadedPath = join(tmpPath, appPath)
   if (fs.existsSync(downloadedPath)) {

From b787fafb32a24afe7d3c8eed996aa6f47d219b6c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 19:45:59 +0000
Subject: [PATCH 240/273] Removing skip setup, tests depend on this behaviour -
 will update in separate PR.

---
 packages/backend-core/src/migrations/migrations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
index 6bc16846e1..ab72091d56 100644
--- a/packages/backend-core/src/migrations/migrations.ts
+++ b/packages/backend-core/src/migrations/migrations.ts
@@ -86,7 +86,7 @@ export const runMigration = async (
     count++
     const lengthStatement = length > 1 ? `[${count}/${length}]` : ""
 
-    const db = getDB(dbName, { skip_setup: true })
+    const db = getDB(dbName)
 
     try {
       const doc = await getMigrationsDoc(db)

From b32be0283a5f4eca1e06993f0c1f33c82210f0a4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Mar 2023 19:55:26 +0000
Subject: [PATCH 241/273] v2.3.19

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

diff --git a/lerna.json b/lerna.json
index dc96b47dea..e10bd71048 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18",
+  "version": "2.3.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e4b47dd0a1..5d9f19dcc1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@budibase/nano": "10.1.1",
-    "@budibase/types": "^2.3.18",
+    "@budibase/types": "^2.3.19",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b2903c4811..4f9e56912f 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.3.18",
+  "version": "2.3.19",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.18",
+    "@budibase/string-templates": "^2.3.19",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 39435e2fd2..3f86a5e012 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.18",
-    "@budibase/client": "^2.3.18",
-    "@budibase/frontend-core": "^2.3.18",
-    "@budibase/string-templates": "^2.3.18",
+    "@budibase/bbui": "^2.3.19",
+    "@budibase/client": "^2.3.19",
+    "@budibase/frontend-core": "^2.3.19",
+    "@budibase/string-templates": "^2.3.19",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index edebd25e3a..57ed1764e0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,9 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.18",
-    "@budibase/string-templates": "^2.3.18",
-    "@budibase/types": "^2.3.18",
+    "@budibase/backend-core": "^2.3.19",
+    "@budibase/string-templates": "^2.3.19",
+    "@budibase/types": "^2.3.19",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index f11fe4360d..0b780f55cd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.18",
-    "@budibase/frontend-core": "^2.3.18",
-    "@budibase/string-templates": "^2.3.18",
+    "@budibase/bbui": "^2.3.19",
+    "@budibase/frontend-core": "^2.3.19",
+    "@budibase/string-templates": "^2.3.19",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 723560309f..28a486038c 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.18",
+    "@budibase/bbui": "^2.3.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 4b84e6d726..7c04aab3ae 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index edee3c2634..8b9f39c83f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.18",
-    "@budibase/client": "^2.3.18",
+    "@budibase/backend-core": "^2.3.19",
+    "@budibase/client": "^2.3.19",
     "@budibase/pro": "2.3.18",
-    "@budibase/string-templates": "^2.3.18",
-    "@budibase/types": "^2.3.18",
+    "@budibase/string-templates": "^2.3.19",
+    "@budibase/types": "^2.3.19",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index f3f8c67fab..79010f1674 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index c674aedc53..d73a3e2231 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8e781bf5d7..c85e209056 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.18",
+    "@budibase/backend-core": "^2.3.19",
     "@budibase/pro": "2.3.18",
-    "@budibase/string-templates": "^2.3.18",
-    "@budibase/types": "^2.3.18",
+    "@budibase/string-templates": "^2.3.19",
+    "@budibase/types": "^2.3.19",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 30ae091c7e0e064025add1746d99fab273c24945 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Mar 2023 19:59:11 +0000
Subject: [PATCH 242/273] Update pro version to 2.3.19

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 8b9f39c83f..2863b6d970 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.19",
     "@budibase/client": "^2.3.19",
-    "@budibase/pro": "2.3.18",
+    "@budibase/pro": "2.3.19",
     "@budibase/string-templates": "^2.3.19",
     "@budibase/types": "^2.3.19",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3304ea07a4..128879a9dd 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1273,13 +1273,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50"
-  integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw==
+"@budibase/backend-core@2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5"
+  integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.18"
+    "@budibase/types" "^2.3.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1374,13 +1374,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3"
-  integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw==
+"@budibase/pro@2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4"
+  integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw==
   dependencies:
-    "@budibase/backend-core" "2.3.18"
-    "@budibase/types" "2.3.18"
+    "@budibase/backend-core" "2.3.19"
+    "@budibase/types" "2.3.19"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1406,10 +1406,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.18", "@budibase/types@^2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329"
-  integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw==
+"@budibase/types@2.3.19", "@budibase/types@^2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a"
+  integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c85e209056..afa445ba9f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.19",
-    "@budibase/pro": "2.3.18",
+    "@budibase/pro": "2.3.19",
     "@budibase/string-templates": "^2.3.19",
     "@budibase/types": "^2.3.19",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 9197f589f5..00af12a1b9 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -470,13 +470,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18.tgz#e14c920aae45b8ef564f00fbe9bb03710fd0de50"
-  integrity sha512-KtCDs6w29TlIbnvG7XBl6ZLhhUvvn4abc1JYoSd01s39k4Y3eFAoeTqIbqkhBiCPJOD1aSF6gc79NaUOn+4SCw==
+"@budibase/backend-core@2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5"
+  integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.18"
+    "@budibase/types" "^2.3.19"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -521,13 +521,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18.tgz#70ce3039d9b206b9a11f09c65c77f84175bb7ec3"
-  integrity sha512-ktHsq2zkjSmS/UmObQGEi+krLGGxZlbcuTL03Ub+alHOatEV8hQVUebcqIEcikhehTdSk1KJktnZ87JCH7WcGw==
+"@budibase/pro@2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4"
+  integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw==
   dependencies:
-    "@budibase/backend-core" "2.3.18"
-    "@budibase/types" "2.3.18"
+    "@budibase/backend-core" "2.3.19"
+    "@budibase/types" "2.3.19"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -535,10 +535,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.18", "@budibase/types@^2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18.tgz#8276c490b326e62ac36baeab56e94272e40fd329"
-  integrity sha512-914MrlKkQZp+saC6Hge7OISO4bMCu4S3ATnkdkhHtY7Fi4ZIhfm0ytLChdf+YedUta9fkZYSmow3z8xIgvEIzw==
+"@budibase/types@2.3.19", "@budibase/types@^2.3.19":
+  version "2.3.19"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a"
+  integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 74498242435548ec0e5202bda0b21f37696cdead Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 21:39:53 +0000
Subject: [PATCH 243/273] v2.3.18-alpha.25

---
 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 c1db9b332f..db20e1c6c2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index db951f597a..6e2fb68978 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.24",
+    "@budibase/types": "2.3.18-alpha.25",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d9ccc4fcd8..82e0c8c24d 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.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "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.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.25",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a06ed7080b..fb429bc314 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.24",
-    "@budibase/client": "2.3.18-alpha.24",
-    "@budibase/frontend-core": "2.3.18-alpha.24",
-    "@budibase/string-templates": "2.3.18-alpha.24",
+    "@budibase/bbui": "2.3.18-alpha.25",
+    "@budibase/client": "2.3.18-alpha.25",
+    "@budibase/frontend-core": "2.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.25",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a9c946dcc0..dda3e62836 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "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.3.18-alpha.24",
-    "@budibase/string-templates": "2.3.18-alpha.24",
-    "@budibase/types": "2.3.18-alpha.24",
+    "@budibase/backend-core": "2.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.25",
+    "@budibase/types": "2.3.18-alpha.25",
     "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 66967d509a..9ded204c2f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "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.3.18-alpha.24",
-    "@budibase/frontend-core": "2.3.18-alpha.24",
-    "@budibase/string-templates": "2.3.18-alpha.24",
+    "@budibase/bbui": "2.3.18-alpha.25",
+    "@budibase/frontend-core": "2.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.25",
     "@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 c282e24e43..4f25067e5a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.24",
+    "@budibase/bbui": "2.3.18-alpha.25",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 8e399988fd..37d8602133 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index aae350d499..fefa964ab9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.24",
-    "@budibase/client": "2.3.18-alpha.24",
+    "@budibase/backend-core": "2.3.18-alpha.25",
+    "@budibase/client": "2.3.18-alpha.25",
     "@budibase/pro": "2.3.18-alpha.24",
-    "@budibase/string-templates": "2.3.18-alpha.24",
-    "@budibase/types": "2.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.25",
+    "@budibase/types": "2.3.18-alpha.25",
     "@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 87242506d4..eaec582bee 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "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 e88355741a..30ab7b17bd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "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 62bedf3481..e919d8aab3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.24",
+  "version": "2.3.18-alpha.25",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.24",
+    "@budibase/backend-core": "2.3.18-alpha.25",
     "@budibase/pro": "2.3.18-alpha.24",
-    "@budibase/string-templates": "2.3.18-alpha.24",
-    "@budibase/types": "2.3.18-alpha.24",
+    "@budibase/string-templates": "2.3.18-alpha.25",
+    "@budibase/types": "2.3.18-alpha.25",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 2127717987077c826ab784027587e547de7cc0e1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 21:42:43 +0000
Subject: [PATCH 244/273] Update pro version to 2.3.18-alpha.25

---
 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 fefa964ab9..9f47c79945 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.25",
     "@budibase/client": "2.3.18-alpha.25",
-    "@budibase/pro": "2.3.18-alpha.24",
+    "@budibase/pro": "2.3.18-alpha.25",
     "@budibase/string-templates": "2.3.18-alpha.25",
     "@budibase/types": "2.3.18-alpha.25",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 16e68f7907..3ffdcff940 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.24.tgz#9d8e2461a1bf0506d3ee5ca44946a851bf40f640"
-  integrity sha512-VLsw43QnCiQThqMEGfnuy9sLvEPB4PE7t/1/OrTTXzxWuK++K48yG6wI8R0hus9orENilYDDgHQOkNkQNDronQ==
+"@budibase/backend-core@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.25.tgz#3b6c42b36dd3be415fe434483a33ab8df59430c3"
+  integrity sha512-tzMH5moPAWZ6gpphsvO8rxxssxrUb5b1DYwdIoHKSx9wA1Yy1Sb0FYaieSq5wLwQcFWgJq4vu/lU5xSpSRexbA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.24"
+    "@budibase/types" "2.3.18-alpha.25"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.24.tgz#13827ef77a1b9d97b99f40fe92a6ab339cbe16ae"
-  integrity sha512-28S1go0poazeeDeBrOMZ9MRnwpLBTC2mw+O7TB5p8GOB7FyLgpxDiX5ZVSVtMxWd+IGuZXeKfcrUUHT7yjd8OQ==
+"@budibase/pro@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.25.tgz#4cd2bb8ed24efb56aed501241292043aae79325b"
+  integrity sha512-cq8YRcAIUArGVZpJXk3/1g8ZzkNNYMU4SoIQBo6IPjPU5SUNyuZkvNXQnPfYhtWV22uyygemWQY3wVgOKxRMFQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.24"
+    "@budibase/backend-core" "2.3.18-alpha.25"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.24"
+    "@budibase/types" "2.3.18-alpha.25"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.24.tgz#6e3bcc43c62ffa76408d534ad8b0c126861fea87"
-  integrity sha512-ajDnifCrzY+/s1oeILG9gVtkeVOtBtGsyxFV6r3mj6kY674Kjwj5cM43goSoYR5SzhZAPTHT8Rqaaxac3mSpHA==
+"@budibase/types@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.25.tgz#e4dca540379dd5554d595ca8c41151a08142a495"
+  integrity sha512-SH+qLCVbxePV0c/mn5dJ4EAB3c87CvVZrqKCAO2oLOwqmupGd7cc307IF9CUXiY8aK9KTv6fJmjcHAx0L0TCTA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e919d8aab3..29dcee8dc4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.25",
-    "@budibase/pro": "2.3.18-alpha.24",
+    "@budibase/pro": "2.3.18-alpha.25",
     "@budibase/string-templates": "2.3.18-alpha.25",
     "@budibase/types": "2.3.18-alpha.25",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 872429ac96..762c66b593 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.24.tgz#9d8e2461a1bf0506d3ee5ca44946a851bf40f640"
-  integrity sha512-VLsw43QnCiQThqMEGfnuy9sLvEPB4PE7t/1/OrTTXzxWuK++K48yG6wI8R0hus9orENilYDDgHQOkNkQNDronQ==
+"@budibase/backend-core@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.25.tgz#3b6c42b36dd3be415fe434483a33ab8df59430c3"
+  integrity sha512-tzMH5moPAWZ6gpphsvO8rxxssxrUb5b1DYwdIoHKSx9wA1Yy1Sb0FYaieSq5wLwQcFWgJq4vu/lU5xSpSRexbA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.24"
+    "@budibase/types" "2.3.18-alpha.25"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.24.tgz#13827ef77a1b9d97b99f40fe92a6ab339cbe16ae"
-  integrity sha512-28S1go0poazeeDeBrOMZ9MRnwpLBTC2mw+O7TB5p8GOB7FyLgpxDiX5ZVSVtMxWd+IGuZXeKfcrUUHT7yjd8OQ==
+"@budibase/pro@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.25.tgz#4cd2bb8ed24efb56aed501241292043aae79325b"
+  integrity sha512-cq8YRcAIUArGVZpJXk3/1g8ZzkNNYMU4SoIQBo6IPjPU5SUNyuZkvNXQnPfYhtWV22uyygemWQY3wVgOKxRMFQ==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.24"
+    "@budibase/backend-core" "2.3.18-alpha.25"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.24"
+    "@budibase/types" "2.3.18-alpha.25"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.24":
-  version "2.3.18-alpha.24"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.24.tgz#6e3bcc43c62ffa76408d534ad8b0c126861fea87"
-  integrity sha512-ajDnifCrzY+/s1oeILG9gVtkeVOtBtGsyxFV6r3mj6kY674Kjwj5cM43goSoYR5SzhZAPTHT8Rqaaxac3mSpHA==
+"@budibase/types@2.3.18-alpha.25":
+  version "2.3.18-alpha.25"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.25.tgz#e4dca540379dd5554d595ca8c41151a08142a495"
+  integrity sha512-SH+qLCVbxePV0c/mn5dJ4EAB3c87CvVZrqKCAO2oLOwqmupGd7cc307IF9CUXiY8aK9KTv6fJmjcHAx0L0TCTA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 4c43ba29439ccaa0ace3a4b39860ae60ccbb6307 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 1 Mar 2023 21:56:30 +0000
Subject: [PATCH 245/273] Bypass password onboarding for enforced sso (#9851)

---
 packages/builder/src/constants/index.js       |   5 +
 .../src/pages/builder/invite/index.svelte     | 239 +++++++++---------
 .../_components/OnboardingTypeModal.svelte    |  15 +-
 .../builder/portal/users/users/index.svelte   |  17 +-
 .../worker/src/api/routes/global/users.ts     |   4 +-
 packages/worker/src/sdk/users/users.ts        |   7 +-
 packages/worker/src/utilities/redis.ts        |   2 +-
 7 files changed, 159 insertions(+), 130 deletions(-)

diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index f68202f81e..99c731231d 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -62,3 +62,8 @@ export const PluginSource = {
   GITHUB: "Github",
   FILE: "File Upload",
 }
+
+export const OnboardingType = {
+  EMAIL: "email",
+  PASSWORD: "password",
+}
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 35231117c4..606a1162ce 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -13,6 +13,7 @@
   let formData = {}
   let onboarding = false
   let errors = {}
+  let loaded = false
 
   $: company = $organisation.company || "Budibase"
 
@@ -39,6 +40,11 @@
       if (invite?.email) {
         formData.email = invite?.email
       }
+      if ($organisation.isSSOEnforced) {
+        // auto accept invite and redirect to login
+        await users.acceptInvite(inviteCode)
+        $goto("../auth")
+      }
     } catch (error) {
       notifications.error(error.message)
     }
@@ -61,130 +67,135 @@
     try {
       await organisation.init()
       await getInvite()
+      loaded = true
     } catch (error) {
       notifications.error("Error getting invite config")
     }
   })
 </script>
 
-<TestimonialPage>
-  <Layout gap="M" noPadding>
-    <img alt="logo" src={$organisation.logoUrl || Logo} />
-    <Layout gap="XS" noPadding>
-      <Heading size="M">Join {company}</Heading>
-      <Body size="M">Create your account to access your budibase apps!</Body>
-    </Layout>
+{#if loaded}
+  <TestimonialPage>
+    <Layout gap="M" noPadding>
+      <img alt="logo" src={$organisation.logoUrl || Logo} />
+      <Layout gap="XS" noPadding>
+        <Heading size="M">Join {company}</Heading>
+        <Body size="M">Create your account to access your budibase apps!</Body>
+      </Layout>
 
-    <Layout gap="S" noPadding>
-      <FancyForm bind:this={form}>
-        <FancyInput
-          label="Email"
-          value={formData.email}
-          disabled={true}
-          error={errors.email}
-        />
-        <FancyInput
-          label="First name"
-          value={formData.firstName}
-          on:change={e => {
-            formData = {
-              ...formData,
-              firstName: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {
-              firstName: !formData.firstName
-                ? "Please enter your first name"
-                : undefined,
-            }
-
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.firstName}
-          disabled={onboarding}
-        />
-        <FancyInput
-          label="Last name (optional)"
-          value={formData.lastName}
-          on:change={e => {
-            formData = {
-              ...formData,
-              lastName: e.detail,
-            }
-          }}
-          disabled={onboarding}
-        />
-        <FancyInput
-          label="Password"
-          value={formData.password}
-          type="password"
-          on:change={e => {
-            formData = {
-              ...formData,
-              password: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {}
-
-            fieldError["password"] = !formData.password
-              ? "Please enter a password"
-              : undefined
-
-            fieldError["confirmationPassword"] =
-              !passwordsMatch(
-                formData.password,
-                formData.confirmationPassword
-              ) && formData.confirmationPassword
-                ? "Passwords must match"
-                : undefined
-
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.password}
-          disabled={onboarding}
-        />
-        <FancyInput
-          label="Repeat password"
-          value={formData.confirmationPassword}
-          type="password"
-          on:change={e => {
-            formData = {
-              ...formData,
-              confirmationPassword: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {
-              confirmationPassword:
-                !passwordsMatch(
-                  formData.password,
-                  formData.confirmationPassword
-                ) && formData.password
-                  ? "Passwords must match"
+      <Layout gap="S" noPadding>
+        <FancyForm bind:this={form}>
+          <FancyInput
+            label="Email"
+            value={formData.email}
+            disabled={true}
+            error={errors.email}
+          />
+          <FancyInput
+            label="First name"
+            value={formData.firstName}
+            on:change={e => {
+              formData = {
+                ...formData,
+                firstName: e.detail,
+              }
+            }}
+            validate={() => {
+              let fieldError = {
+                firstName: !formData.firstName
+                  ? "Please enter your first name"
                   : undefined,
-            }
+              }
 
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.confirmationPassword}
-          disabled={onboarding}
-        />
-      </FancyForm>
+              errors = handleError({ ...errors, ...fieldError })
+            }}
+            error={errors.firstName}
+            disabled={onboarding}
+          />
+          <FancyInput
+            label="Last name (optional)"
+            value={formData.lastName}
+            on:change={e => {
+              formData = {
+                ...formData,
+                lastName: e.detail,
+              }
+            }}
+            disabled={onboarding}
+          />
+          {#if !$organisation.isSSOEnforced}
+            <FancyInput
+              label="Password"
+              value={formData.password}
+              type="password"
+              on:change={e => {
+                formData = {
+                  ...formData,
+                  password: e.detail,
+                }
+              }}
+              validate={() => {
+                let fieldError = {}
+
+                fieldError["password"] = !formData.password
+                  ? "Please enter a password"
+                  : undefined
+
+                fieldError["confirmationPassword"] =
+                  !passwordsMatch(
+                    formData.password,
+                    formData.confirmationPassword
+                  ) && formData.confirmationPassword
+                    ? "Passwords must match"
+                    : undefined
+
+                errors = handleError({ ...errors, ...fieldError })
+              }}
+              error={errors.password}
+              disabled={onboarding}
+            />
+            <FancyInput
+              label="Repeat password"
+              value={formData.confirmationPassword}
+              type="password"
+              on:change={e => {
+                formData = {
+                  ...formData,
+                  confirmationPassword: e.detail,
+                }
+              }}
+              validate={() => {
+                let fieldError = {
+                  confirmationPassword:
+                    !passwordsMatch(
+                      formData.password,
+                      formData.confirmationPassword
+                    ) && formData.password
+                      ? "Passwords must match"
+                      : undefined,
+                }
+
+                errors = handleError({ ...errors, ...fieldError })
+              }}
+              error={errors.confirmationPassword}
+              disabled={onboarding}
+            />
+          {/if}
+        </FancyForm>
+      </Layout>
+      <div>
+        <Button
+          size="L"
+          disabled={Object.keys(errors).length > 0 || onboarding}
+          cta
+          on:click={acceptInvite}
+        >
+          Create account
+        </Button>
+      </div>
     </Layout>
-    <div>
-      <Button
-        size="L"
-        disabled={Object.keys(errors).length > 0 || onboarding}
-        cta
-        on:click={acceptInvite}
-      >
-        Create account
-      </Button>
-    </div>
-  </Layout>
-</TestimonialPage>
+  </TestimonialPage>
+{/if}
 
 <style>
   img {
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
index 7ec6d338d5..0048853545 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
@@ -1,9 +1,8 @@
 <script>
   import { ModalContent, Body, Layout, Icon } from "@budibase/bbui"
+  import { OnboardingType } from "../../../../../../constants"
 
   export let chooseCreationType
-  let emailOnboardingKey = "emailOnboarding"
-  let basicOnboaridngKey = "basicOnboarding"
 
   let selectedOnboardingType
 </script>
@@ -20,9 +19,9 @@
   <Layout noPadding gap="S">
     <div
       class="onboarding-type item"
-      class:selected={selectedOnboardingType == emailOnboardingKey}
+      class:selected={selectedOnboardingType == OnboardingType.EMAIL}
       on:click={() => {
-        selectedOnboardingType = emailOnboardingKey
+        selectedOnboardingType = OnboardingType.EMAIL
       }}
     >
       <div class="content onboarding-type-wrap">
@@ -32,7 +31,7 @@
         </div>
       </div>
       <div style="color: var(--spectrum-global-color-green-600); float: right">
-        {#if selectedOnboardingType == emailOnboardingKey}
+        {#if selectedOnboardingType == OnboardingType.EMAIL}
           <div class="checkmark-spacing">
             <Icon size="S" name="CheckmarkCircle" />
           </div>
@@ -42,9 +41,9 @@
 
     <div
       class="onboarding-type item"
-      class:selected={selectedOnboardingType == basicOnboaridngKey}
+      class:selected={selectedOnboardingType == OnboardingType.PASSWORD}
       on:click={() => {
-        selectedOnboardingType = basicOnboaridngKey
+        selectedOnboardingType = OnboardingType.PASSWORD
       }}
     >
       <div class="content onboarding-type-wrap">
@@ -54,7 +53,7 @@
         </div>
       </div>
       <div style="color: var(--spectrum-global-color-green-600); float: right">
-        {#if selectedOnboardingType == basicOnboaridngKey}
+        {#if selectedOnboardingType == OnboardingType.PASSWORD}
           <div class="checkmark-spacing">
             <Icon size="S" name="CheckmarkCircle" />
           </div>
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 0776b1adc4..4f80e1a942 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -13,7 +13,7 @@
     Divider,
   } from "@budibase/bbui"
   import AddUserModal from "./_components/AddUserModal.svelte"
-  import { users, groups, auth, licensing } from "stores/portal"
+  import { users, groups, auth, licensing, organisation } from "stores/portal"
   import { onMount } from "svelte"
   import DeleteRowsButton from "components/backend/DataTable/buttons/DeleteRowsButton.svelte"
   import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte"
@@ -27,6 +27,7 @@
   import { get } from "svelte/store"
   import { Constants, Utils, fetchData } from "@budibase/frontend-core"
   import { API } from "api"
+  import { OnboardingType } from "../../../../../constants"
 
   const fetch = fetchData({
     API,
@@ -105,10 +106,18 @@
   const debouncedUpdateFetch = Utils.debounce(updateFetch, 250)
 
   const showOnboardingTypeModal = async addUsersData => {
+    // no-op if users already exist
     userData = await removingDuplicities(addUsersData)
-    if (!userData?.users?.length) return
+    if (!userData?.users?.length) {
+      return
+    }
 
-    onboardingTypeModal.show()
+    if ($organisation.isSSOEnforced) {
+      // bypass the onboarding type selection of sso is enforced
+      await chooseCreationType(OnboardingType.EMAIL)
+    } else {
+      onboardingTypeModal.show()
+    }
   }
 
   async function createUserFlow() {
@@ -181,7 +190,7 @@
   }
 
   async function chooseCreationType(onboardingType) {
-    if (onboardingType === "emailOnboarding") {
+    if (onboardingType === OnboardingType.EMAIL) {
       await createUserFlow()
     } else {
       await createUsers()
diff --git a/packages/worker/src/api/routes/global/users.ts b/packages/worker/src/api/routes/global/users.ts
index db182a99c6..a6312679c3 100644
--- a/packages/worker/src/api/routes/global/users.ts
+++ b/packages/worker/src/api/routes/global/users.ts
@@ -50,8 +50,8 @@ function buildInviteAcceptValidation() {
   // prettier-ignore
   return auth.joiValidator.body(Joi.object({
     inviteCode: Joi.string().required(),
-    password: Joi.string().required(),
-    firstName: Joi.string().required(),
+    password: Joi.string().optional(),
+    firstName: Joi.string().optional(),
     lastName: Joi.string().optional(),
   }).required().unknown(true))
 }
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 9de90eae03..126f91d3e1 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -140,7 +140,12 @@ const buildUser = async (
     hashedPassword = opts.hashPassword ? await utils.hash(password) : password
   } else if (dbUser) {
     hashedPassword = dbUser.password
-  } else if (opts.requirePassword) {
+  }
+
+  // passwords are never required if sso is enforced
+  const requirePasswords =
+    opts.requirePassword && !(await pro.features.isSSOEnforced())
+  if (!hashedPassword && requirePasswords) {
     throw "Password must be specified."
   }
 
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index ecfc027cad..7b3f251c0e 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -47,7 +47,7 @@ async function getACode(db: string, code: string, deleteCode = true) {
   const client = await getClient(db)
   const value = await client.get(code)
   if (!value) {
-    throw "Invalid code."
+    throw new Error("Invalid code.")
   }
   if (deleteCode) {
     await client.delete(code)

From c49eb263779042812038c32fb7faa57f375bfb03 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Mar 2023 22:03:30 +0000
Subject: [PATCH 246/273] v2.3.18-alpha.26

---
 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 db20e1c6c2..1cc1c9bda0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6e2fb68978..bc31903fa5 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.25",
+    "@budibase/types": "2.3.18-alpha.26",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 82e0c8c24d..097679e422 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.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "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.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.26",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index fb429bc314..54c6fa3caa 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.25",
-    "@budibase/client": "2.3.18-alpha.25",
-    "@budibase/frontend-core": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.25",
+    "@budibase/bbui": "2.3.18-alpha.26",
+    "@budibase/client": "2.3.18-alpha.26",
+    "@budibase/frontend-core": "2.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.26",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index dda3e62836..220706891c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "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.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.25",
-    "@budibase/types": "2.3.18-alpha.25",
+    "@budibase/backend-core": "2.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.26",
+    "@budibase/types": "2.3.18-alpha.26",
     "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 9ded204c2f..04755ec366 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "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.3.18-alpha.25",
-    "@budibase/frontend-core": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.25",
+    "@budibase/bbui": "2.3.18-alpha.26",
+    "@budibase/frontend-core": "2.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.26",
     "@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 4f25067e5a..efa81204b8 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.25",
+    "@budibase/bbui": "2.3.18-alpha.26",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 37d8602133..b5b20ed6a2 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 9f47c79945..b715f8b151 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.25",
-    "@budibase/client": "2.3.18-alpha.25",
+    "@budibase/backend-core": "2.3.18-alpha.26",
+    "@budibase/client": "2.3.18-alpha.26",
     "@budibase/pro": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.25",
-    "@budibase/types": "2.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.26",
+    "@budibase/types": "2.3.18-alpha.26",
     "@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 eaec582bee..9e102cefce 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "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 30ab7b17bd..d31356109e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "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 29dcee8dc4..b21916f89f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.25",
+  "version": "2.3.18-alpha.26",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.25",
+    "@budibase/backend-core": "2.3.18-alpha.26",
     "@budibase/pro": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.25",
-    "@budibase/types": "2.3.18-alpha.25",
+    "@budibase/string-templates": "2.3.18-alpha.26",
+    "@budibase/types": "2.3.18-alpha.26",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 7819908fe22efa01dc7078c1354c85c82be5510f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 1 Mar 2023 22:03:34 +0000
Subject: [PATCH 247/273] Pin node version in release-selfhost job

---
 .github/workflows/release-selfhost.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index 12fb8f5a9d..f5a2f643c3 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -16,9 +16,13 @@ jobs:
 
       - uses: actions/checkout@v2
         with: 
-          node-version: 14.x
           fetch_depth: 0
 
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
       - name: Get the latest budibase release version
         id: version
         run: |

From 25a7fa669f07d74755b42163375cb61b80793857 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Mar 2023 22:19:27 +0000
Subject: [PATCH 248/273] v2.3.20

---
 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 e10bd71048..1aee9f2bad 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.19",
+  "version": "2.3.20",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 5d9f19dcc1..8e8ec24808 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@budibase/nano": "10.1.1",
-    "@budibase/types": "^2.3.19",
+    "@budibase/types": "^2.3.20",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4f9e56912f..5668cadb01 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.3.19",
+  "version": "2.3.20",
   "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.3.19",
+    "@budibase/string-templates": "^2.3.20",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3f86a5e012..4bcc1d3f34 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.19",
-    "@budibase/client": "^2.3.19",
-    "@budibase/frontend-core": "^2.3.19",
-    "@budibase/string-templates": "^2.3.19",
+    "@budibase/bbui": "^2.3.20",
+    "@budibase/client": "^2.3.20",
+    "@budibase/frontend-core": "^2.3.20",
+    "@budibase/string-templates": "^2.3.20",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 57ed1764e0..253ecb4991 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "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.3.19",
-    "@budibase/string-templates": "^2.3.19",
-    "@budibase/types": "^2.3.19",
+    "@budibase/backend-core": "^2.3.20",
+    "@budibase/string-templates": "^2.3.20",
+    "@budibase/types": "^2.3.20",
     "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 0b780f55cd..79ef96bd4b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "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.3.19",
-    "@budibase/frontend-core": "^2.3.19",
-    "@budibase/string-templates": "^2.3.19",
+    "@budibase/bbui": "^2.3.20",
+    "@budibase/frontend-core": "^2.3.20",
+    "@budibase/string-templates": "^2.3.20",
     "@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 28a486038c..873c37e448 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.19",
+    "@budibase/bbui": "^2.3.20",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 7c04aab3ae..dc98d62eb4 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 2863b6d970..0f08df6e5c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.19",
-    "@budibase/client": "^2.3.19",
+    "@budibase/backend-core": "^2.3.20",
+    "@budibase/client": "^2.3.20",
     "@budibase/pro": "2.3.19",
-    "@budibase/string-templates": "^2.3.19",
-    "@budibase/types": "^2.3.19",
+    "@budibase/string-templates": "^2.3.20",
+    "@budibase/types": "^2.3.20",
     "@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 79010f1674..4381fbf553 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "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 d73a3e2231..04eb024cd1 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "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 afa445ba9f..534a780cc9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.19",
+  "version": "2.3.20",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.19",
+    "@budibase/backend-core": "^2.3.20",
     "@budibase/pro": "2.3.19",
-    "@budibase/string-templates": "^2.3.19",
-    "@budibase/types": "^2.3.19",
+    "@budibase/string-templates": "^2.3.20",
+    "@budibase/types": "^2.3.20",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 75fad908808be4e0d64e632e8f362893d50da113 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Mar 2023 22:23:56 +0000
Subject: [PATCH 249/273] Update pro version to 2.3.20

---
 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 0f08df6e5c..861fd483a0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.3.20",
     "@budibase/client": "^2.3.20",
-    "@budibase/pro": "2.3.19",
+    "@budibase/pro": "2.3.20",
     "@budibase/string-templates": "^2.3.20",
     "@budibase/types": "^2.3.20",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 128879a9dd..6cd14fb4a3 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1273,13 +1273,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5"
-  integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA==
+"@budibase/backend-core@2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c"
+  integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.19"
+    "@budibase/types" "^2.3.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1374,13 +1374,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4"
-  integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw==
+"@budibase/pro@2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e"
+  integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw==
   dependencies:
-    "@budibase/backend-core" "2.3.19"
-    "@budibase/types" "2.3.19"
+    "@budibase/backend-core" "2.3.20"
+    "@budibase/types" "2.3.20"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1406,10 +1406,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.19", "@budibase/types@^2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a"
-  integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w==
+"@budibase/types@2.3.20", "@budibase/types@^2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126"
+  integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 534a780cc9..57dd890ed8 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.3.20",
-    "@budibase/pro": "2.3.19",
+    "@budibase/pro": "2.3.20",
     "@budibase/string-templates": "^2.3.20",
     "@budibase/types": "^2.3.20",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 00af12a1b9..0fb6ceac67 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -470,13 +470,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.19.tgz#af84b20e4c53d2b98fe33192726ddab717fc4aa5"
-  integrity sha512-Wl41ecGwZy0SVpMaKxiGDBiXN1cJWUKACmTlImsFr291Pc+ZgNQZWDM8DXyV+RPD05Pd0pI8PfJcD2hVe3L9fA==
+"@budibase/backend-core@2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c"
+  integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA==
   dependencies:
     "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.19"
+    "@budibase/types" "^2.3.20"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -521,13 +521,13 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.19.tgz#da67da8985c334d51b0fdc40aeb21b8d9a60aed4"
-  integrity sha512-Qu6LQWpiGWkSgad17xLyED9II8kCVAyO7P5h5qYmK6X1qMuVmOcY1TFMYouZ9ssxX09u3psKlGqLe1K2JCT3Gw==
+"@budibase/pro@2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e"
+  integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw==
   dependencies:
-    "@budibase/backend-core" "2.3.19"
-    "@budibase/types" "2.3.19"
+    "@budibase/backend-core" "2.3.20"
+    "@budibase/types" "2.3.20"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -535,10 +535,10 @@
     lru-cache "^7.14.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.19", "@budibase/types@^2.3.19":
-  version "2.3.19"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.19.tgz#98f11df4eff3bece824a64162c2d801c2c19df7a"
-  integrity sha512-8IfsEhPIG8nIeaku67JXUaPqnH9wTLgpclV9EPOfnFpAy6z08ezfWIa5fmjtrIab+B60nljgGZputKhUQtYJ9w==
+"@budibase/types@2.3.20", "@budibase/types@^2.3.20":
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126"
+  integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From ff5c6efddbf15175299eecd8d34f3deba48c0fe4 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 08:13:09 +0000
Subject: [PATCH 250/273] v2.3.18-alpha.27

---
 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 1cc1c9bda0..41f8a39616 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bc31903fa5..733c60c8c6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.26",
+    "@budibase/types": "2.3.18-alpha.27",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 097679e422..4f27387b6e 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.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "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.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.27",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 54c6fa3caa..d60c6ca4ee 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.26",
-    "@budibase/client": "2.3.18-alpha.26",
-    "@budibase/frontend-core": "2.3.18-alpha.26",
-    "@budibase/string-templates": "2.3.18-alpha.26",
+    "@budibase/bbui": "2.3.18-alpha.27",
+    "@budibase/client": "2.3.18-alpha.27",
+    "@budibase/frontend-core": "2.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.27",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 220706891c..3b9d4fd4e2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "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.3.18-alpha.26",
-    "@budibase/string-templates": "2.3.18-alpha.26",
-    "@budibase/types": "2.3.18-alpha.26",
+    "@budibase/backend-core": "2.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.27",
+    "@budibase/types": "2.3.18-alpha.27",
     "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 04755ec366..a75d25512f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "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.3.18-alpha.26",
-    "@budibase/frontend-core": "2.3.18-alpha.26",
-    "@budibase/string-templates": "2.3.18-alpha.26",
+    "@budibase/bbui": "2.3.18-alpha.27",
+    "@budibase/frontend-core": "2.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.27",
     "@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 efa81204b8..c8e2e7c59f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.26",
+    "@budibase/bbui": "2.3.18-alpha.27",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index b5b20ed6a2..c155938ddf 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index b715f8b151..8222ce9937 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.26",
-    "@budibase/client": "2.3.18-alpha.26",
+    "@budibase/backend-core": "2.3.18-alpha.27",
+    "@budibase/client": "2.3.18-alpha.27",
     "@budibase/pro": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.26",
-    "@budibase/types": "2.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.27",
+    "@budibase/types": "2.3.18-alpha.27",
     "@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 9e102cefce..dcfab71a8d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "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 d31356109e..833733c290 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "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 b21916f89f..d46965e125 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.26",
+  "version": "2.3.18-alpha.27",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.26",
+    "@budibase/backend-core": "2.3.18-alpha.27",
     "@budibase/pro": "2.3.18-alpha.25",
-    "@budibase/string-templates": "2.3.18-alpha.26",
-    "@budibase/types": "2.3.18-alpha.26",
+    "@budibase/string-templates": "2.3.18-alpha.27",
+    "@budibase/types": "2.3.18-alpha.27",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 6c62d0b214166803a344acfd597edc4daa5512b6 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 08:16:03 +0000
Subject: [PATCH 251/273] Update pro version to 2.3.18-alpha.27

---
 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 8222ce9937..c7b9fcd4a2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.27",
     "@budibase/client": "2.3.18-alpha.27",
-    "@budibase/pro": "2.3.18-alpha.25",
+    "@budibase/pro": "2.3.18-alpha.27",
     "@budibase/string-templates": "2.3.18-alpha.27",
     "@budibase/types": "2.3.18-alpha.27",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3ffdcff940..7e01dbe37c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.25.tgz#3b6c42b36dd3be415fe434483a33ab8df59430c3"
-  integrity sha512-tzMH5moPAWZ6gpphsvO8rxxssxrUb5b1DYwdIoHKSx9wA1Yy1Sb0FYaieSq5wLwQcFWgJq4vu/lU5xSpSRexbA==
+"@budibase/backend-core@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.27.tgz#b474d2b157cb0d53a691627a886838a2158edcd2"
+  integrity sha512-TD49GoF6utUJgbWrDRrrnp9oTROzrBEEwJIeDxvoUTE2lZpu0bv+tatIV8zxJjeAIiHXoumDfZrDt+vkHejFRg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.25"
+    "@budibase/types" "2.3.18-alpha.27"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.25.tgz#4cd2bb8ed24efb56aed501241292043aae79325b"
-  integrity sha512-cq8YRcAIUArGVZpJXk3/1g8ZzkNNYMU4SoIQBo6IPjPU5SUNyuZkvNXQnPfYhtWV22uyygemWQY3wVgOKxRMFQ==
+"@budibase/pro@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.27.tgz#e78a06e137dff347f38b92fbefaf9f24cd87978b"
+  integrity sha512-c6Sem80hG8tU3yoTlXtdFfExYnq7UKd6yHbFzLTPvJwcZVH02ywCjJKXMNy4MvG7Fnh8L/bmFCRdxrwYN+suMg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.25"
+    "@budibase/backend-core" "2.3.18-alpha.27"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.25"
+    "@budibase/types" "2.3.18-alpha.27"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.25.tgz#e4dca540379dd5554d595ca8c41151a08142a495"
-  integrity sha512-SH+qLCVbxePV0c/mn5dJ4EAB3c87CvVZrqKCAO2oLOwqmupGd7cc307IF9CUXiY8aK9KTv6fJmjcHAx0L0TCTA==
+"@budibase/types@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.27.tgz#5cac032bb07727a3f8a5f88482769a38f849bd64"
+  integrity sha512-3Swyq+2qCjA61zUN5lrYyp789ncc92Nxxs3KVVE27LEqci2jkxHIG2N2JvCH1yti16TnBJSHn/cOlLVHe8VEgQ==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d46965e125..58b6c50956 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.27",
-    "@budibase/pro": "2.3.18-alpha.25",
+    "@budibase/pro": "2.3.18-alpha.27",
     "@budibase/string-templates": "2.3.18-alpha.27",
     "@budibase/types": "2.3.18-alpha.27",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 762c66b593..1e62ce8450 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.25.tgz#3b6c42b36dd3be415fe434483a33ab8df59430c3"
-  integrity sha512-tzMH5moPAWZ6gpphsvO8rxxssxrUb5b1DYwdIoHKSx9wA1Yy1Sb0FYaieSq5wLwQcFWgJq4vu/lU5xSpSRexbA==
+"@budibase/backend-core@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.27.tgz#b474d2b157cb0d53a691627a886838a2158edcd2"
+  integrity sha512-TD49GoF6utUJgbWrDRrrnp9oTROzrBEEwJIeDxvoUTE2lZpu0bv+tatIV8zxJjeAIiHXoumDfZrDt+vkHejFRg==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.25"
+    "@budibase/types" "2.3.18-alpha.27"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.25.tgz#4cd2bb8ed24efb56aed501241292043aae79325b"
-  integrity sha512-cq8YRcAIUArGVZpJXk3/1g8ZzkNNYMU4SoIQBo6IPjPU5SUNyuZkvNXQnPfYhtWV22uyygemWQY3wVgOKxRMFQ==
+"@budibase/pro@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.27.tgz#e78a06e137dff347f38b92fbefaf9f24cd87978b"
+  integrity sha512-c6Sem80hG8tU3yoTlXtdFfExYnq7UKd6yHbFzLTPvJwcZVH02ywCjJKXMNy4MvG7Fnh8L/bmFCRdxrwYN+suMg==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.25"
+    "@budibase/backend-core" "2.3.18-alpha.27"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.25"
+    "@budibase/types" "2.3.18-alpha.27"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.25":
-  version "2.3.18-alpha.25"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.25.tgz#e4dca540379dd5554d595ca8c41151a08142a495"
-  integrity sha512-SH+qLCVbxePV0c/mn5dJ4EAB3c87CvVZrqKCAO2oLOwqmupGd7cc307IF9CUXiY8aK9KTv6fJmjcHAx0L0TCTA==
+"@budibase/types@2.3.18-alpha.27":
+  version "2.3.18-alpha.27"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.27.tgz#5cac032bb07727a3f8a5f88482769a38f849bd64"
+  integrity sha512-3Swyq+2qCjA61zUN5lrYyp789ncc92Nxxs3KVVE27LEqci2jkxHIG2N2JvCH1yti16TnBJSHn/cOlLVHe8VEgQ==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From ecfe685a2fdbdbc3132349d79540e7c51b25b88f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 2 Mar 2023 10:06:24 +0000
Subject: [PATCH 252/273] account for system events

---
 .../auditLogs/_components/UserRenderer.svelte | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 16e2a7be04..e36648447b 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -12,18 +12,20 @@
   }
 </script>
 
-<div
-  class="container"
-  on:mouseover={() => (showTooltip = true)}
-  on:focus={() => (showTooltip = true)}
-  on:mouseleave={() => (showTooltip = false)}
->
-  <Avatar size="M" initials={getInitials(row?.user)} />
-</div>
-{#if showTooltip}
-  <div class="tooltip">
-    <Tooltip textWrapping text={row?.user.email} direction="bottom" />
+{#if row?.user?.email}
+  <div
+    class="container"
+    on:mouseover={() => (showTooltip = true)}
+    on:focus={() => (showTooltip = true)}
+    on:mouseleave={() => (showTooltip = false)}
+  >
+    <Avatar size="M" initials={getInitials(row.user)} />
   </div>
+  {#if showTooltip}
+    <div class="tooltip">
+      <Tooltip textWrapping text={row.user.email} direction="bottom" />
+    </div>
+  {/if}
 {/if}
 
 <style>

From 23359329786ff1f50a54fb1267ac3757b06460c1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Mar 2023 10:20:49 +0000
Subject: [PATCH 253/273] Some updates to core types - used in pro update.

---
 packages/backend-core/src/cache/appMetadata.ts   |  4 ++--
 packages/types/src/api/web/global/auditLogs.ts   | 11 +++++++++--
 packages/types/src/documents/global/auditLogs.ts |  6 ++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/cache/appMetadata.ts b/packages/backend-core/src/cache/appMetadata.ts
index d24c4a3140..5b66c356d3 100644
--- a/packages/backend-core/src/cache/appMetadata.ts
+++ b/packages/backend-core/src/cache/appMetadata.ts
@@ -1,6 +1,6 @@
 import { getAppClient } from "../redis/init"
 import { doWithDB, DocumentType } from "../db"
-import { Database } from "@budibase/types"
+import { Database, App } from "@budibase/types"
 
 const AppState = {
   INVALID: "invalid",
@@ -65,7 +65,7 @@ export async function getAppMetadata(appId: string) {
   if (isInvalid(metadata)) {
     throw { status: 404, message: "No app metadata found" }
   }
-  return metadata
+  return metadata as App
 }
 
 /**
diff --git a/packages/types/src/api/web/global/auditLogs.ts b/packages/types/src/api/web/global/auditLogs.ts
index 8ce0e742d2..a890f3a751 100644
--- a/packages/types/src/api/web/global/auditLogs.ts
+++ b/packages/types/src/api/web/global/auditLogs.ts
@@ -26,9 +26,16 @@ export enum AuditLogResourceStatus {
   DELETED = "deleted",
 }
 
+export type DeletedResourceInfo = {
+  _id: string
+  status: AuditLogResourceStatus
+  email?: string
+  name?: string
+}
+
 export interface AuditLogEnriched {
-  app?: App | { _id: string; status: AuditLogResourceStatus }
-  user: User | { _id: string; status: AuditLogResourceStatus }
+  app?: App | DeletedResourceInfo
+  user: User | DeletedResourceInfo
   event: Event
   timestamp: string
   name: string
diff --git a/packages/types/src/documents/global/auditLogs.ts b/packages/types/src/documents/global/auditLogs.ts
index 7902997b39..091c7b8418 100644
--- a/packages/types/src/documents/global/auditLogs.ts
+++ b/packages/types/src/documents/global/auditLogs.ts
@@ -3,6 +3,11 @@ import { Event } from "../../sdk"
 
 export const AuditLogSystemUser = "SYSTEM"
 
+export type FallbackInfo = {
+  appName?: string
+  email?: string
+}
+
 export interface AuditLogDoc extends Document {
   appId?: string
   event: Event
@@ -10,4 +15,5 @@ export interface AuditLogDoc extends Document {
   timestamp: string
   metadata: any
   name: string
+  fallback?: FallbackInfo
 }

From 2bc0e988af155304f5dab02b9a543463ac4b2112 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Mar 2023 13:39:26 +0000
Subject: [PATCH 254/273] Getting proper tenant ID for use by audit logs queue.

---
 .../backend-core/src/events/processors/AuditLogsProcessor.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index d888d4f438..94b4e1b09f 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -8,7 +8,7 @@ import {
   HostInfo,
 } from "@budibase/types"
 import { EventProcessor } from "./types"
-import { getAppId, doInTenant } from "../../context"
+import { getAppId, doInTenant, getTenantId } from "../../context"
 import BullQueue from "bull"
 import { createQueue, JobQueue } from "../../queue"
 import { isAudited } from "../../utils"
@@ -74,7 +74,7 @@ export default class AuditLogsProcessor implements EventProcessor {
           appId: getAppId(),
           hostInfo: identity.hostInfo,
         },
-        tenantId: identity.tenantId!,
+        tenantId: getTenantId(),
       })
     }
   }

From aa02c0ca307a3dec944481d0c95f4345331e14a1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 2 Mar 2023 14:30:04 +0000
Subject: [PATCH 255/273] fix issue with user searching

---
 packages/bbui/src/Form/Core/Multiselect.svelte               | 2 ++
 packages/bbui/src/Form/Core/Picker.svelte                    | 5 +++--
 packages/bbui/src/Form/Multiselect.svelte                    | 2 ++
 .../src/pages/builder/portal/account/auditLogs/index.svelte  | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index 8860fcbf0b..1d04c210f4 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,6 +15,7 @@
   export let sort = false
   export let autoWidth = false
   export let fetchTerm = null
+  export let useFetch = false
   export let customPopoverHeight
 
   const dispatch = createEventDispatcher()
@@ -86,6 +87,7 @@
   isPlaceholder={!value?.length}
   {autocomplete}
   bind:fetchTerm
+  {useFetch}
   {isOptionSelected}
   {getOptionLabel}
   {getOptionValue}
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index 104596c8cb..bd575600b1 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -33,6 +33,7 @@
   export let autocomplete = false
   export let sort = false
   export let fetchTerm = null
+  export let useFetch = false
   export let customPopoverHeight
   export let align = "left"
   export let footer = null
@@ -150,9 +151,9 @@
   >
     {#if autocomplete}
       <Search
-        value={fetchTerm ? fetchTerm : searchTerm}
+        value={useFetch ? fetchTerm : searchTerm}
         on:change={event =>
-          fetchTerm ? (fetchTerm = event.detail) : (searchTerm = event.detail)}
+          useFetch ? (fetchTerm = event.detail) : (searchTerm = event.detail)}
         {disabled}
         placeholder="Search"
       />
diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index 2237cd1dce..185eb7069b 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -17,6 +17,7 @@
   export let autoWidth = false
   export let autocomplete = false
   export let fetchTerm = null
+  export let useFetch = false
   export let customPopoverHeight
 
   const dispatch = createEventDispatcher()
@@ -41,6 +42,7 @@
     {autocomplete}
     {customPopoverHeight}
     bind:fetchTerm
+    {useFetch}
     on:change={onChange}
     on:click
   />
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 739877db26..7b35cfa6b7 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -257,6 +257,7 @@
     <div class="select">
       <Multiselect
         bind:fetchTerm={userSearchTerm}
+        useFetch
         placeholder="All users"
         label="Users"
         autocomplete

From 51b5dc98b4258ac032a5d77c5efc7c9cd70082f4 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 2 Mar 2023 14:38:15 +0000
Subject: [PATCH 256/273] Account portal no passwords sso (#9861)

* Structures and types updates for account-portal-no-passwords-sso

* lint
---
 .../tests/utilities/structures/accounts.ts    | 56 ++++++++++++++++++-
 .../tests/utilities/structures/sso.ts         | 13 +++--
 packages/types/src/documents/global/user.ts   |  7 ++-
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/packages/backend-core/tests/utilities/structures/accounts.ts b/packages/backend-core/tests/utilities/structures/accounts.ts
index 6bfeedf196..62a9ac19d1 100644
--- a/packages/backend-core/tests/utilities/structures/accounts.ts
+++ b/packages/backend-core/tests/utilities/structures/accounts.ts
@@ -8,6 +8,8 @@ import {
   CloudAccount,
   Hosting,
   SSOAccount,
+  CreateAccount,
+  CreatePassswordAccount,
 } from "@budibase/types"
 import _ from "lodash"
 
@@ -29,6 +31,10 @@ export const account = (): Account => {
   }
 }
 
+export function selfHostAccount() {
+  return account()
+}
+
 export const cloudAccount = (): CloudAccount => {
   return {
     ...account(),
@@ -47,9 +53,9 @@ function provider(): AccountSSOProvider {
   return _.sample(Object.values(AccountSSOProvider)) as AccountSSOProvider
 }
 
-export function ssoAccount(): SSOAccount {
+export function ssoAccount(account: Account = cloudAccount()): SSOAccount {
   return {
-    ...cloudAccount(),
+    ...account,
     authType: AuthType.SSO,
     oauth2: {
       accessToken: generator.string(),
@@ -61,3 +67,49 @@ export function ssoAccount(): SSOAccount {
     thirdPartyProfile: {},
   }
 }
+
+export const cloudCreateAccount: CreatePassswordAccount = {
+  email: "cloud@budibase.com",
+  tenantId: "cloud",
+  hosting: Hosting.CLOUD,
+  authType: AuthType.PASSWORD,
+  password: "Password123!",
+  tenantName: "cloud",
+  name: "Budi Armstrong",
+  size: "10+",
+  profession: "Software Engineer",
+}
+
+export const cloudSSOCreateAccount: CreateAccount = {
+  email: "cloud-sso@budibase.com",
+  tenantId: "cloud-sso",
+  hosting: Hosting.CLOUD,
+  authType: AuthType.SSO,
+  tenantName: "cloudsso",
+  name: "Budi Armstrong",
+  size: "10+",
+  profession: "Software Engineer",
+}
+
+export const selfCreateAccount: CreatePassswordAccount = {
+  email: "self@budibase.com",
+  tenantId: "self",
+  hosting: Hosting.SELF,
+  authType: AuthType.PASSWORD,
+  password: "Password123!",
+  tenantName: "self",
+  name: "Budi Armstrong",
+  size: "10+",
+  profession: "Software Engineer",
+}
+
+export const selfSSOCreateAccount: CreateAccount = {
+  email: "self-sso@budibase.com",
+  tenantId: "self-sso",
+  hosting: Hosting.SELF,
+  authType: AuthType.SSO,
+  tenantName: "selfsso",
+  name: "Budi Armstrong",
+  size: "10+",
+  profession: "Software Engineer",
+}
diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts
index a5957c9233..7413fa3c09 100644
--- a/packages/backend-core/tests/utilities/structures/sso.ts
+++ b/packages/backend-core/tests/utilities/structures/sso.ts
@@ -1,6 +1,7 @@
 import {
   GoogleInnerConfig,
   JwtClaims,
+  OAuth2,
   OIDCInnerConfig,
   OIDCWellKnownConfig,
   SSOAuthDetails,
@@ -14,6 +15,13 @@ import * as shared from "./shared"
 import _ from "lodash"
 import { user } from "./shared"
 
+export function OAuth(): OAuth2 {
+  return {
+    refreshToken: generator.string(),
+    accessToken: generator.string(),
+  }
+}
+
 export function authDetails(userDoc?: User): SSOAuthDetails {
   if (!userDoc) {
     userDoc = user()
@@ -28,10 +36,7 @@ export function authDetails(userDoc?: User): SSOAuthDetails {
 
   return {
     email: userDoc.email,
-    oauth2: {
-      refreshToken: generator.string(),
-      accessToken: generator.string(),
-    },
+    oauth2: OAuth(),
     profile,
     provider,
     providerType: providerType(),
diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts
index 2ef13a7412..af48dbb758 100644
--- a/packages/types/src/documents/global/user.ts
+++ b/packages/types/src/documents/global/user.ts
@@ -48,13 +48,18 @@ export interface User extends Document {
     global: boolean
   }
   password?: string
-  status?: string
+  status?: UserStatus
   createdAt?: number // override the default createdAt behaviour - users sdk historically set this to Date.now()
   dayPassRecordedAt?: string
   userGroups?: string[]
   onboardedAt?: string
 }
 
+export enum UserStatus {
+  ACTIVE = "active",
+  INACTIVE = "inactive",
+}
+
 export interface UserRoles {
   [key: string]: string
 }

From 6a23388cb220793647c30b04e352ce4999df0df5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 14:45:56 +0000
Subject: [PATCH 257/273] v2.3.18-alpha.28

---
 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 41f8a39616..df41bd3ba2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 733c60c8c6..71e7c84387 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.27",
+    "@budibase/types": "2.3.18-alpha.28",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4f27387b6e..4afcdc43c3 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.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "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.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.28",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d60c6ca4ee..3ac2b4d916 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.27",
-    "@budibase/client": "2.3.18-alpha.27",
-    "@budibase/frontend-core": "2.3.18-alpha.27",
-    "@budibase/string-templates": "2.3.18-alpha.27",
+    "@budibase/bbui": "2.3.18-alpha.28",
+    "@budibase/client": "2.3.18-alpha.28",
+    "@budibase/frontend-core": "2.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.28",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3b9d4fd4e2..6b7936f057 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "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.3.18-alpha.27",
-    "@budibase/string-templates": "2.3.18-alpha.27",
-    "@budibase/types": "2.3.18-alpha.27",
+    "@budibase/backend-core": "2.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.28",
+    "@budibase/types": "2.3.18-alpha.28",
     "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 a75d25512f..a477a4cdde 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "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.3.18-alpha.27",
-    "@budibase/frontend-core": "2.3.18-alpha.27",
-    "@budibase/string-templates": "2.3.18-alpha.27",
+    "@budibase/bbui": "2.3.18-alpha.28",
+    "@budibase/frontend-core": "2.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.28",
     "@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 c8e2e7c59f..dec2e06ef2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.27",
+    "@budibase/bbui": "2.3.18-alpha.28",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c155938ddf..a8c11f2b21 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index c7b9fcd4a2..16a4f8ce82 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.27",
-    "@budibase/client": "2.3.18-alpha.27",
+    "@budibase/backend-core": "2.3.18-alpha.28",
+    "@budibase/client": "2.3.18-alpha.28",
     "@budibase/pro": "2.3.18-alpha.27",
-    "@budibase/string-templates": "2.3.18-alpha.27",
-    "@budibase/types": "2.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.28",
+    "@budibase/types": "2.3.18-alpha.28",
     "@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 dcfab71a8d..f55512220b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "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 833733c290..259d30aaa3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "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 58b6c50956..fe319b257c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.27",
+  "version": "2.3.18-alpha.28",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.27",
+    "@budibase/backend-core": "2.3.18-alpha.28",
     "@budibase/pro": "2.3.18-alpha.27",
-    "@budibase/string-templates": "2.3.18-alpha.27",
-    "@budibase/types": "2.3.18-alpha.27",
+    "@budibase/string-templates": "2.3.18-alpha.28",
+    "@budibase/types": "2.3.18-alpha.28",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From c11d5e58c00fca84bf60fbdf8fd2872eba824617 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 14:49:01 +0000
Subject: [PATCH 258/273] Update pro version to 2.3.18-alpha.28

---
 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 16a4f8ce82..19110c981f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.28",
     "@budibase/client": "2.3.18-alpha.28",
-    "@budibase/pro": "2.3.18-alpha.27",
+    "@budibase/pro": "2.3.18-alpha.28",
     "@budibase/string-templates": "2.3.18-alpha.28",
     "@budibase/types": "2.3.18-alpha.28",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 7e01dbe37c..4f6b027bc0 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.27.tgz#b474d2b157cb0d53a691627a886838a2158edcd2"
-  integrity sha512-TD49GoF6utUJgbWrDRrrnp9oTROzrBEEwJIeDxvoUTE2lZpu0bv+tatIV8zxJjeAIiHXoumDfZrDt+vkHejFRg==
+"@budibase/backend-core@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.28.tgz#22b68afcd0ebfd7e0dbab927cfd31478f927eee2"
+  integrity sha512-xPnqlJhby9dcTxS3juHR+KkV/hBc0n2vTxRc53zshdpCEfF16w62ZPmCuH4uoref18X9G5NqdHtnmQHe5nZWwA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.27"
+    "@budibase/types" "2.3.18-alpha.28"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.27.tgz#e78a06e137dff347f38b92fbefaf9f24cd87978b"
-  integrity sha512-c6Sem80hG8tU3yoTlXtdFfExYnq7UKd6yHbFzLTPvJwcZVH02ywCjJKXMNy4MvG7Fnh8L/bmFCRdxrwYN+suMg==
+"@budibase/pro@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.28.tgz#06b77954fdb8f6a487261cb22622ec0a6807b928"
+  integrity sha512-u4677znQkFeJywzRXLXP1t12b35mcs+TW4wWAi4ZEQ+TSIHeml7mbBl7aRV+0CL5YKC09CYnrXHyUBDb3s9M9g==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.27"
+    "@budibase/backend-core" "2.3.18-alpha.28"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.27"
+    "@budibase/types" "2.3.18-alpha.28"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.27.tgz#5cac032bb07727a3f8a5f88482769a38f849bd64"
-  integrity sha512-3Swyq+2qCjA61zUN5lrYyp789ncc92Nxxs3KVVE27LEqci2jkxHIG2N2JvCH1yti16TnBJSHn/cOlLVHe8VEgQ==
+"@budibase/types@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.28.tgz#f3d14fbce808ab3d5944a49b72884794e35d5472"
+  integrity sha512-FEBmwsGWPn3XjNc9U2fnQplfEG6vrWUoMVd9wV97xXnLf9Q6wnOlJ4QJatrvXAlpNi6PNyq5ad1ypbEQuGDjBw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fe319b257c..3f20f842ab 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.28",
-    "@budibase/pro": "2.3.18-alpha.27",
+    "@budibase/pro": "2.3.18-alpha.28",
     "@budibase/string-templates": "2.3.18-alpha.28",
     "@budibase/types": "2.3.18-alpha.28",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 1e62ce8450..8ca1ca92b8 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.27.tgz#b474d2b157cb0d53a691627a886838a2158edcd2"
-  integrity sha512-TD49GoF6utUJgbWrDRrrnp9oTROzrBEEwJIeDxvoUTE2lZpu0bv+tatIV8zxJjeAIiHXoumDfZrDt+vkHejFRg==
+"@budibase/backend-core@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.28.tgz#22b68afcd0ebfd7e0dbab927cfd31478f927eee2"
+  integrity sha512-xPnqlJhby9dcTxS3juHR+KkV/hBc0n2vTxRc53zshdpCEfF16w62ZPmCuH4uoref18X9G5NqdHtnmQHe5nZWwA==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.27"
+    "@budibase/types" "2.3.18-alpha.28"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.27.tgz#e78a06e137dff347f38b92fbefaf9f24cd87978b"
-  integrity sha512-c6Sem80hG8tU3yoTlXtdFfExYnq7UKd6yHbFzLTPvJwcZVH02ywCjJKXMNy4MvG7Fnh8L/bmFCRdxrwYN+suMg==
+"@budibase/pro@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.28.tgz#06b77954fdb8f6a487261cb22622ec0a6807b928"
+  integrity sha512-u4677znQkFeJywzRXLXP1t12b35mcs+TW4wWAi4ZEQ+TSIHeml7mbBl7aRV+0CL5YKC09CYnrXHyUBDb3s9M9g==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.27"
+    "@budibase/backend-core" "2.3.18-alpha.28"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.27"
+    "@budibase/types" "2.3.18-alpha.28"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.27":
-  version "2.3.18-alpha.27"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.27.tgz#5cac032bb07727a3f8a5f88482769a38f849bd64"
-  integrity sha512-3Swyq+2qCjA61zUN5lrYyp789ncc92Nxxs3KVVE27LEqci2jkxHIG2N2JvCH1yti16TnBJSHn/cOlLVHe8VEgQ==
+"@budibase/types@2.3.18-alpha.28":
+  version "2.3.18-alpha.28"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.28.tgz#f3d14fbce808ab3d5944a49b72884794e35d5472"
+  integrity sha512-FEBmwsGWPn3XjNc9U2fnQplfEG6vrWUoMVd9wV97xXnLf9Q6wnOlJ4QJatrvXAlpNi6PNyq5ad1ypbEQuGDjBw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 82c0706d36bc0b17d7651541aa134abfadc80c4f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 15:17:09 +0000
Subject: [PATCH 259/273] v2.3.18-alpha.29

---
 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 df41bd3ba2..0fadf15477 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 71e7c84387..a214f97a89 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.1",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.28",
+    "@budibase/types": "2.3.18-alpha.29",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4afcdc43c3..4b39e9f91e 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.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "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.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.29",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3ac2b4d916..09c5f5fd7f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.28",
-    "@budibase/client": "2.3.18-alpha.28",
-    "@budibase/frontend-core": "2.3.18-alpha.28",
-    "@budibase/string-templates": "2.3.18-alpha.28",
+    "@budibase/bbui": "2.3.18-alpha.29",
+    "@budibase/client": "2.3.18-alpha.29",
+    "@budibase/frontend-core": "2.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.29",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6b7936f057..e883e3a444 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "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.3.18-alpha.28",
-    "@budibase/string-templates": "2.3.18-alpha.28",
-    "@budibase/types": "2.3.18-alpha.28",
+    "@budibase/backend-core": "2.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.29",
+    "@budibase/types": "2.3.18-alpha.29",
     "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 a477a4cdde..90ef59874c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "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.3.18-alpha.28",
-    "@budibase/frontend-core": "2.3.18-alpha.28",
-    "@budibase/string-templates": "2.3.18-alpha.28",
+    "@budibase/bbui": "2.3.18-alpha.29",
+    "@budibase/frontend-core": "2.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.29",
     "@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 dec2e06ef2..4f468211b1 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.28",
+    "@budibase/bbui": "2.3.18-alpha.29",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index a8c11f2b21..f0e33631c2 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 19110c981f..def0665d5a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.28",
-    "@budibase/client": "2.3.18-alpha.28",
+    "@budibase/backend-core": "2.3.18-alpha.29",
+    "@budibase/client": "2.3.18-alpha.29",
     "@budibase/pro": "2.3.18-alpha.28",
-    "@budibase/string-templates": "2.3.18-alpha.28",
-    "@budibase/types": "2.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.29",
+    "@budibase/types": "2.3.18-alpha.29",
     "@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 f55512220b..e8d7702075 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "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 259d30aaa3..7b5603e741 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "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 3f20f842ab..e2fa981a65 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.28",
+  "version": "2.3.18-alpha.29",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.28",
+    "@budibase/backend-core": "2.3.18-alpha.29",
     "@budibase/pro": "2.3.18-alpha.28",
-    "@budibase/string-templates": "2.3.18-alpha.28",
-    "@budibase/types": "2.3.18-alpha.28",
+    "@budibase/string-templates": "2.3.18-alpha.29",
+    "@budibase/types": "2.3.18-alpha.29",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 381bf816aa9f473805b120cc51c77102468d6ec1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Mar 2023 15:20:14 +0000
Subject: [PATCH 260/273] Update pro version to 2.3.18-alpha.29

---
 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 def0665d5a..ed6ca35fd1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.29",
     "@budibase/client": "2.3.18-alpha.29",
-    "@budibase/pro": "2.3.18-alpha.28",
+    "@budibase/pro": "2.3.18-alpha.29",
     "@budibase/string-templates": "2.3.18-alpha.29",
     "@budibase/types": "2.3.18-alpha.29",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4f6b027bc0..eda16a9955 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.28.tgz#22b68afcd0ebfd7e0dbab927cfd31478f927eee2"
-  integrity sha512-xPnqlJhby9dcTxS3juHR+KkV/hBc0n2vTxRc53zshdpCEfF16w62ZPmCuH4uoref18X9G5NqdHtnmQHe5nZWwA==
+"@budibase/backend-core@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.29.tgz#ddae082878a80dc64430afdbc221d47d7cba91ed"
+  integrity sha512-b8CyVjJxXdRkfEJ9Bd8eu53p0+92VZJaxUTv8aVqQfZTu61iqvqyaiNVRcPZb/PxyJHEAD7cGv+8ZD65LLCK1A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.28"
+    "@budibase/types" "2.3.18-alpha.29"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.28.tgz#06b77954fdb8f6a487261cb22622ec0a6807b928"
-  integrity sha512-u4677znQkFeJywzRXLXP1t12b35mcs+TW4wWAi4ZEQ+TSIHeml7mbBl7aRV+0CL5YKC09CYnrXHyUBDb3s9M9g==
+"@budibase/pro@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.29.tgz#55949d72ebc10958a62ca41e4875c749f017117f"
+  integrity sha512-ZDI8XcUQd7FRwD5h8Ho0zTycqhbEq5ISoVyMTwGEHzSMd/ipBup7KlWvGLgO1RJFlWg7HfEWsDRNHMHMtiw57Q==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.28"
+    "@budibase/backend-core" "2.3.18-alpha.29"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.28"
+    "@budibase/types" "2.3.18-alpha.29"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.28.tgz#f3d14fbce808ab3d5944a49b72884794e35d5472"
-  integrity sha512-FEBmwsGWPn3XjNc9U2fnQplfEG6vrWUoMVd9wV97xXnLf9Q6wnOlJ4QJatrvXAlpNi6PNyq5ad1ypbEQuGDjBw==
+"@budibase/types@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.29.tgz#cdd07f08d4f45f9fb8cf221bd6d2ad808d6136e3"
+  integrity sha512-+tfMD2F+Ko0IqUOsYB1MZuKnFzTZ0yIkYjjI/pPmDrSGrenuXKSr7jrpAOyl7UCacd62+hWzfhqV8Ga1JhKgrw==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e2fa981a65..ad6c9e1191 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.29",
-    "@budibase/pro": "2.3.18-alpha.28",
+    "@budibase/pro": "2.3.18-alpha.29",
     "@budibase/string-templates": "2.3.18-alpha.29",
     "@budibase/types": "2.3.18-alpha.29",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 8ca1ca92b8..e21c43d53b 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.28.tgz#22b68afcd0ebfd7e0dbab927cfd31478f927eee2"
-  integrity sha512-xPnqlJhby9dcTxS3juHR+KkV/hBc0n2vTxRc53zshdpCEfF16w62ZPmCuH4uoref18X9G5NqdHtnmQHe5nZWwA==
+"@budibase/backend-core@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.29.tgz#ddae082878a80dc64430afdbc221d47d7cba91ed"
+  integrity sha512-b8CyVjJxXdRkfEJ9Bd8eu53p0+92VZJaxUTv8aVqQfZTu61iqvqyaiNVRcPZb/PxyJHEAD7cGv+8ZD65LLCK1A==
   dependencies:
     "@budibase/nano" "10.1.1"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.28"
+    "@budibase/types" "2.3.18-alpha.29"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.28.tgz#06b77954fdb8f6a487261cb22622ec0a6807b928"
-  integrity sha512-u4677znQkFeJywzRXLXP1t12b35mcs+TW4wWAi4ZEQ+TSIHeml7mbBl7aRV+0CL5YKC09CYnrXHyUBDb3s9M9g==
+"@budibase/pro@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.29.tgz#55949d72ebc10958a62ca41e4875c749f017117f"
+  integrity sha512-ZDI8XcUQd7FRwD5h8Ho0zTycqhbEq5ISoVyMTwGEHzSMd/ipBup7KlWvGLgO1RJFlWg7HfEWsDRNHMHMtiw57Q==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.28"
+    "@budibase/backend-core" "2.3.18-alpha.29"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.28"
+    "@budibase/types" "2.3.18-alpha.29"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.28":
-  version "2.3.18-alpha.28"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.28.tgz#f3d14fbce808ab3d5944a49b72884794e35d5472"
-  integrity sha512-FEBmwsGWPn3XjNc9U2fnQplfEG6vrWUoMVd9wV97xXnLf9Q6wnOlJ4QJatrvXAlpNi6PNyq5ad1ypbEQuGDjBw==
+"@budibase/types@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.29.tgz#cdd07f08d4f45f9fb8cf221bd6d2ad808d6136e3"
+  integrity sha512-+tfMD2F+Ko0IqUOsYB1MZuKnFzTZ0yIkYjjI/pPmDrSGrenuXKSr7jrpAOyl7UCacd62+hWzfhqV8Ga1JhKgrw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 2125331b1467e8fdd51b9c1740eef6bfef313417 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Mar 2023 18:21:45 +0000
Subject: [PATCH 261/273] First pass - converting CLI to Typescript.

---
 packages/cli/.gitignore                       |   1 +
 packages/cli/package.json                     |  19 +-
 packages/cli/src/analytics/Client.js          |  32 -
 packages/cli/src/analytics/Client.ts          |  33 +
 .../cli/src/analytics/{index.js => index.ts}  |  17 +-
 .../cli/src/backups/{index.js => index.ts}    |  38 +-
 .../{objectStore.js => objectStore.ts}        |  18 +-
 .../cli/src/backups/{utils.js => utils.ts}    |  43 +-
 packages/cli/src/constants.js                 |  25 -
 packages/cli/src/constants.ts                 |   4 +
 packages/cli/src/core/{db.js => db.ts}        |  15 +-
 .../src/{environment.js => environment.ts}    |   0
 packages/cli/src/events.js                    |  11 -
 packages/cli/src/events.ts                    |  11 +
 packages/cli/src/{exec.js => exec.ts}         |  14 +-
 .../src/hosting/{genUser.js => genUser.ts}    |   7 +-
 .../cli/src/hosting/{index.js => index.ts}    |  22 +-
 packages/cli/src/hosting/{init.js => init.ts} |  37 +-
 .../hosting/{makeFiles.js => makeFiles.ts}    |  44 +-
 .../cli/src/hosting/{start.js => start.ts}    |  16 +-
 .../cli/src/hosting/{status.js => status.ts}  |  12 +-
 packages/cli/src/hosting/{stop.js => stop.ts} |  12 +-
 packages/cli/src/hosting/types.ts             |   4 +
 .../cli/src/hosting/{update.js => update.ts}  |  16 +-
 .../cli/src/hosting/{utils.js => utils.ts}    |  33 +-
 .../cli/src/hosting/{watch.js => watch.ts}    |  13 +-
 packages/cli/src/{index.js => index.ts}       |  10 +-
 packages/cli/src/options.js                   |   8 -
 packages/cli/src/options.ts                   |   8 +
 .../cli/src/plugins/{index.js => index.ts}    |  52 +-
 .../src/plugins/{skeleton.js => skeleton.ts}  |  23 +-
 .../cli/src/{prebuilds.js => prebuilds.ts}    |  13 +-
 .../cli/src/{questions.js => questions.ts}    |  12 +-
 .../src/structures/{Command.js => Command.ts} |  43 +-
 .../{ConfigManager.js => ConfigManager.ts}    |  14 +-
 packages/cli/src/{utils.js => utils.ts}       |  63 +-
 packages/cli/tsconfig.build.json              |  24 +
 packages/cli/tsconfig.json                    |  32 +
 packages/cli/yarn.lock                        | 612 +++++++++++++++++-
 packages/types/src/sdk/cli/constants.ts       |  21 +
 packages/types/src/sdk/cli/index.ts           |   1 +
 packages/types/src/sdk/index.ts               |   1 +
 42 files changed, 1054 insertions(+), 380 deletions(-)
 delete mode 100644 packages/cli/src/analytics/Client.js
 create mode 100644 packages/cli/src/analytics/Client.ts
 rename packages/cli/src/analytics/{index.js => index.ts} (76%)
 rename packages/cli/src/backups/{index.js => index.ts} (79%)
 rename packages/cli/src/backups/{objectStore.js => objectStore.ts} (81%)
 rename packages/cli/src/backups/{utils.js => utils.ts} (66%)
 delete mode 100644 packages/cli/src/constants.js
 create mode 100644 packages/cli/src/constants.ts
 rename packages/cli/src/core/{db.js => db.ts} (69%)
 rename packages/cli/src/{environment.js => environment.ts} (100%)
 delete mode 100644 packages/cli/src/events.js
 create mode 100644 packages/cli/src/events.ts
 rename packages/cli/src/{exec.js => exec.ts} (55%)
 rename packages/cli/src/hosting/{genUser.js => genUser.ts} (68%)
 rename packages/cli/src/hosting/{index.js => index.ts} (68%)
 rename packages/cli/src/hosting/{init.js => init.ts} (60%)
 rename packages/cli/src/hosting/{makeFiles.js => makeFiles.ts} (76%)
 rename packages/cli/src/hosting/{start.js => start.ts} (69%)
 rename packages/cli/src/hosting/{status.js => status.ts} (50%)
 rename packages/cli/src/hosting/{stop.js => stop.ts} (54%)
 create mode 100644 packages/cli/src/hosting/types.ts
 rename packages/cli/src/hosting/{update.js => update.ts} (80%)
 rename packages/cli/src/hosting/{utils.js => utils.ts} (72%)
 rename packages/cli/src/hosting/{watch.js => watch.ts} (71%)
 rename packages/cli/src/{index.js => index.ts} (74%)
 delete mode 100644 packages/cli/src/options.js
 create mode 100644 packages/cli/src/options.ts
 rename packages/cli/src/plugins/{index.js => index.ts} (82%)
 rename packages/cli/src/plugins/{skeleton.js => skeleton.ts} (75%)
 rename packages/cli/src/{prebuilds.js => prebuilds.ts} (87%)
 rename packages/cli/src/{questions.js => questions.ts} (70%)
 rename packages/cli/src/structures/{Command.js => Command.ts} (74%)
 rename packages/cli/src/structures/{ConfigManager.js => ConfigManager.ts} (83%)
 rename packages/cli/src/{utils.js => utils.ts} (52%)
 create mode 100644 packages/cli/tsconfig.build.json
 create mode 100644 packages/cli/tsconfig.json
 create mode 100644 packages/types/src/sdk/cli/constants.ts
 create mode 100644 packages/types/src/sdk/cli/index.ts

diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore
index 655ef7b624..8d8de9a0da 100644
--- a/packages/cli/.gitignore
+++ b/packages/cli/.gitignore
@@ -6,3 +6,4 @@ docker-error.log
 envoy.yaml
 *.tar.gz
 prebuilds/
+dist/
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e883e3a444..2144bbbac4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -2,15 +2,16 @@
   "name": "@budibase/cli",
   "version": "2.3.18-alpha.29",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
-  "main": "src/index.js",
+  "main": "dist/index.js",
   "bin": {
-    "budi": "src/index.js"
+    "budi": "dist/index.js"
   },
   "author": "Budibase",
   "license": "GPL-3.0",
   "scripts": {
     "prebuild": "rm -rf prebuilds 2> /dev/null && cp -r node_modules/leveldown/prebuilds prebuilds",
-    "build": "yarn prebuild && renamer --find .node --replace .fake 'prebuilds/**' && pkg . --out-path build && yarn postbuild",
+    "tsc": "tsc -p tsconfig.build.json",
+    "build": "npx prebuild && renamer --find .node --replace .fake 'prebuilds/**' && npx tsc && pkg . --out-path build && npx postbuild",
     "postbuild": "rm -rf prebuilds 2> /dev/null"
   },
   "pkg": {
@@ -29,7 +30,6 @@
     "@budibase/backend-core": "2.3.18-alpha.29",
     "@budibase/string-templates": "2.3.18-alpha.29",
     "@budibase/types": "2.3.18-alpha.29",
-    "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
     "commander": "7.1.0",
@@ -40,7 +40,7 @@
     "inquirer": "8.0.0",
     "joi": "17.6.0",
     "lookpath": "1.1.0",
-    "node-fetch": "2",
+    "node-fetch": "2.6.7",
     "pkg": "5.8.0",
     "posthog-node": "1.0.7",
     "pouchdb": "7.3.0",
@@ -50,8 +50,15 @@
     "yaml": "^2.1.1"
   },
   "devDependencies": {
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
+    "@types/jest": "^29.4.0",
+    "@types/pouchdb": "^6.4.0",
+    "@types/node-fetch": "2.6.1",
     "copyfiles": "^2.4.1",
     "eslint": "^7.20.0",
-    "renamer": "^4.0.0"
+    "renamer": "^4.0.0",
+    "ts-node": "^10.9.1",
+    "typescript": "4.7.3"
   }
 }
diff --git a/packages/cli/src/analytics/Client.js b/packages/cli/src/analytics/Client.js
deleted file mode 100644
index 717a50198b..0000000000
--- a/packages/cli/src/analytics/Client.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const PostHog = require("posthog-node")
-const { POSTHOG_TOKEN, AnalyticsEvents } = require("../constants")
-const ConfigManager = require("../structures/ConfigManager")
-
-class AnalyticsClient {
-  constructor() {
-    this.client = new PostHog(POSTHOG_TOKEN)
-    this.configManager = new ConfigManager()
-  }
-
-  capture(event) {
-    if (this.configManager.config.analyticsDisabled) return
-
-    this.client.capture(event)
-  }
-
-  enable() {
-    this.configManager.removeKey("analyticsDisabled")
-    this.client.capture({ event: AnalyticsEvents.OptIn, distinctId: "cli" })
-  }
-
-  disable() {
-    this.client.capture({ event: AnalyticsEvents.OptOut, distinctId: "cli" })
-    this.configManager.setValue("analyticsDisabled", true)
-  }
-
-  status() {
-    return this.configManager.config.analyticsDisabled ? "disabled" : "enabled"
-  }
-}
-
-module.exports = AnalyticsClient
diff --git a/packages/cli/src/analytics/Client.ts b/packages/cli/src/analytics/Client.ts
new file mode 100644
index 0000000000..19b171026d
--- /dev/null
+++ b/packages/cli/src/analytics/Client.ts
@@ -0,0 +1,33 @@
+import PostHog from "posthog-node"
+import { POSTHOG_TOKEN, AnalyticsEvent } from "../constants"
+import { ConfigManager } from "../structures/ConfigManager"
+
+export class AnalyticsClient {
+  client: PostHog
+  configManager: ConfigManager
+
+  constructor() {
+    this.client = new PostHog(POSTHOG_TOKEN, {})
+    this.configManager = new ConfigManager()
+  }
+
+  capture(event: { distinctId: string; event: string; properties?: any }) {
+    if (this.configManager.config.analyticsDisabled) return
+
+    this.client.capture(event)
+  }
+
+  enable() {
+    this.configManager.removeKey("analyticsDisabled")
+    this.client.capture({ event: AnalyticsEvent.OptIn, distinctId: "cli" })
+  }
+
+  disable() {
+    this.client.capture({ event: AnalyticsEvent.OptOut, distinctId: "cli" })
+    this.configManager.setValue("analyticsDisabled", true)
+  }
+
+  status() {
+    return this.configManager.config.analyticsDisabled ? "disabled" : "enabled"
+  }
+}
diff --git a/packages/cli/src/analytics/index.js b/packages/cli/src/analytics/index.ts
similarity index 76%
rename from packages/cli/src/analytics/index.js
rename to packages/cli/src/analytics/index.ts
index d85323d1d0..077104c165 100644
--- a/packages/cli/src/analytics/index.js
+++ b/packages/cli/src/analytics/index.ts
@@ -1,7 +1,7 @@
-const Command = require("../structures/Command")
-const { CommandWords } = require("../constants")
-const { success, error } = require("../utils")
-const AnalyticsClient = require("./Client")
+import { Command } from "../structures/Command"
+import { CommandWord } from "../constants"
+import { success, error } from "../utils"
+import { AnalyticsClient } from "./Client"
 
 const client = new AnalyticsClient()
 
@@ -14,11 +14,10 @@ async function optOut() {
         "Successfully opted out of Budibase analytics. You can opt in at any time by running 'budi analytics opt-in'"
       )
     )
-  } catch (err) {
+  } catch (err: any) {
     console.log(
       error(
-        "Error opting out of Budibase analytics. Please try again later.",
-        err
+        `Error opting out of Budibase analytics. Please try again later - ${err}`
       )
     )
   }
@@ -50,7 +49,7 @@ async function status() {
   }
 }
 
-const command = new Command(`${CommandWords.ANALYTICS}`)
+export default new Command(`${CommandWord.ANALYTICS}`)
   .addHelp("Control the analytics you send to Budibase.")
   .addSubOption("--optin", "Opt in to sending analytics to Budibase", optIn)
   .addSubOption("--optout", "Opt out of sending analytics to Budibase.", optOut)
@@ -59,5 +58,3 @@ const command = new Command(`${CommandWords.ANALYTICS}`)
     "Check whether you are currently opted in to Budibase analytics.",
     status
   )
-
-exports.command = command
diff --git a/packages/cli/src/backups/index.js b/packages/cli/src/backups/index.ts
similarity index 79%
rename from packages/cli/src/backups/index.js
rename to packages/cli/src/backups/index.ts
index 47b54fa9a0..2b148f34af 100644
--- a/packages/cli/src/backups/index.js
+++ b/packages/cli/src/backups/index.ts
@@ -1,28 +1,30 @@
-const Command = require("../structures/Command")
-const { CommandWords } = require("../constants")
-const fs = require("fs")
-const { join } = require("path")
-const { getAllDbs } = require("../core/db")
-const tar = require("tar")
-const { progressBar, httpCall } = require("../utils")
-const {
+import { Command } from "../structures/Command"
+import { CommandWord } from "../constants"
+import fs from "fs"
+import { join } from "path"
+import { getAllDbs } from "../core/db"
+import { progressBar, httpCall } from "../utils"
+import {
   TEMP_DIR,
   COUCH_DIR,
   MINIO_DIR,
   getConfig,
   replication,
   getPouches,
-} = require("./utils")
-const { exportObjects, importObjects } = require("./objectStore")
+} from "./utils"
+import { exportObjects, importObjects } from "./objectStore"
+const tar = require("tar")
 
-async function exportBackup(opts) {
+type BackupOpts = { env?: string; import?: string; export?: string }
+
+async function exportBackup(opts: BackupOpts) {
   const envFile = opts.env || undefined
-  let filename = opts["export"] || opts
+  let filename = opts["export"] || (opts as string)
   if (typeof filename !== "string") {
     filename = `backup-${new Date().toISOString()}.tar.gz`
   }
   const config = await getConfig(envFile)
-  const dbList = await getAllDbs(config["COUCH_DB_URL"])
+  const dbList = (await getAllDbs(config["COUCH_DB_URL"])) as string[]
   const { Remote, Local } = getPouches(config)
   if (fs.existsSync(TEMP_DIR)) {
     fs.rmSync(TEMP_DIR, { recursive: true })
@@ -55,9 +57,9 @@ async function exportBackup(opts) {
   console.log(`Generated export file - ${filename}`)
 }
 
-async function importBackup(opts) {
+async function importBackup(opts: BackupOpts) {
   const envFile = opts.env || undefined
-  const filename = opts["import"] || opts
+  const filename = opts["import"] || (opts as string)
   const config = await getConfig(envFile)
   if (!filename || !fs.existsSync(filename)) {
     console.error("Cannot import without specifying a valid file to import")
@@ -99,7 +101,7 @@ async function importBackup(opts) {
   fs.rmSync(TEMP_DIR, { recursive: true })
 }
 
-async function pickOne(opts) {
+async function pickOne(opts: BackupOpts) {
   if (opts["import"]) {
     return importBackup(opts)
   } else if (opts["export"]) {
@@ -107,7 +109,7 @@ async function pickOne(opts) {
   }
 }
 
-const command = new Command(`${CommandWords.BACKUPS}`)
+export default new Command(`${CommandWord.BACKUPS}`)
   .addHelp(
     "Allows building backups of Budibase, as well as importing a backup to a new instance."
   )
@@ -126,5 +128,3 @@ const command = new Command(`${CommandWords.BACKUPS}`)
     "Provide an environment variable file to configure the CLI.",
     pickOne
   )
-
-exports.command = command
diff --git a/packages/cli/src/backups/objectStore.js b/packages/cli/src/backups/objectStore.ts
similarity index 81%
rename from packages/cli/src/backups/objectStore.js
rename to packages/cli/src/backups/objectStore.ts
index 407659d54a..d801f6e453 100644
--- a/packages/cli/src/backups/objectStore.js
+++ b/packages/cli/src/backups/objectStore.ts
@@ -1,8 +1,8 @@
-const { objectStore } = require("@budibase/backend-core")
-const fs = require("fs")
-const { join } = require("path")
-const { TEMP_DIR, MINIO_DIR } = require("./utils")
-const { progressBar } = require("../utils")
+import { objectStore } from "@budibase/backend-core"
+import fs from "fs"
+import { join } from "path"
+import { TEMP_DIR, MINIO_DIR } from "./utils"
+import { progressBar } from "../utils"
 const {
   ObjectStoreBuckets,
   ObjectStore,
@@ -13,10 +13,10 @@ const {
 
 const bucketList = Object.values(ObjectStoreBuckets)
 
-exports.exportObjects = async () => {
+export async function exportObjects() {
   const path = join(TEMP_DIR, MINIO_DIR)
   fs.mkdirSync(path)
-  let fullList = []
+  let fullList: any[] = []
   let errorCount = 0
   for (let bucket of bucketList) {
     const client = ObjectStore(bucket)
@@ -26,7 +26,7 @@ exports.exportObjects = async () => {
       errorCount++
       continue
     }
-    const list = await client.listObjectsV2().promise()
+    const list = (await client.listObjectsV2().promise()) as { Contents: any[] }
     fullList = fullList.concat(list.Contents.map(el => ({ ...el, bucket })))
   }
   if (errorCount === bucketList.length) {
@@ -48,7 +48,7 @@ exports.exportObjects = async () => {
   bar.stop()
 }
 
-exports.importObjects = async () => {
+export async function importObjects() {
   const path = join(TEMP_DIR, MINIO_DIR)
   const buckets = fs.readdirSync(path)
   let total = 0
diff --git a/packages/cli/src/backups/utils.js b/packages/cli/src/backups/utils.ts
similarity index 66%
rename from packages/cli/src/backups/utils.js
rename to packages/cli/src/backups/utils.ts
index 21d3504373..30e79ac17b 100644
--- a/packages/cli/src/backups/utils.js
+++ b/packages/cli/src/backups/utils.ts
@@ -1,12 +1,13 @@
-const dotenv = require("dotenv")
-const fs = require("fs")
-const { string } = require("../questions")
-const { getPouch } = require("../core/db")
-const { env: environment } = require("@budibase/backend-core")
+import dotenv from "dotenv"
+import fs from "fs"
+import { string } from "../questions"
+import { getPouch } from "../core/db"
+import { env as environment } from "@budibase/backend-core"
+import PouchDB from "pouchdb"
 
-exports.TEMP_DIR = ".temp"
-exports.COUCH_DIR = "couchdb"
-exports.MINIO_DIR = "minio"
+export const TEMP_DIR = ".temp"
+export const COUCH_DIR = "couchdb"
+export const MINIO_DIR = "minio"
 
 const REQUIRED = [
   { value: "MAIN_PORT", default: "10000" },
@@ -19,7 +20,7 @@ const REQUIRED = [
   { value: "MINIO_SECRET_KEY" },
 ]
 
-exports.checkURLs = config => {
+export function checkURLs(config: Record<string, string>) {
   const mainPort = config["MAIN_PORT"],
     username = config["COUCH_DB_USER"],
     password = config["COUCH_DB_PASSWORD"]
@@ -34,23 +35,23 @@ exports.checkURLs = config => {
   return config
 }
 
-exports.askQuestions = async () => {
+export async function askQuestions() {
   console.log(
     "*** NOTE: use a .env file to load these parameters repeatedly ***"
   )
-  let config = {}
+  let config: Record<string, string> = {}
   for (let property of REQUIRED) {
     config[property.value] = await string(property.value, property.default)
   }
   return config
 }
 
-exports.loadEnvironment = path => {
+export function loadEnvironment(path: string) {
   if (!fs.existsSync(path)) {
     throw "Unable to file specified .env file"
   }
   const env = fs.readFileSync(path, "utf8")
-  const config = exports.checkURLs(dotenv.parse(env))
+  const config = checkURLs(dotenv.parse(env))
   for (let required of REQUIRED) {
     if (!config[required.value]) {
       throw `Cannot find "${required.value}" property in .env file`
@@ -60,12 +61,12 @@ exports.loadEnvironment = path => {
 }
 
 // true is the default value passed by commander
-exports.getConfig = async (envFile = true) => {
+export async function getConfig(envFile: boolean | string = true) {
   let config
   if (envFile !== true) {
-    config = exports.loadEnvironment(envFile)
+    config = loadEnvironment(envFile as string)
   } else {
-    config = await exports.askQuestions()
+    config = await askQuestions()
   }
   // fill out environment
   for (let key of Object.keys(config)) {
@@ -74,12 +75,16 @@ exports.getConfig = async (envFile = true) => {
   return config
 }
 
-exports.replication = async (from, to) => {
+export async function replication(
+  from: PouchDB.Database,
+  to: PouchDB.Database
+) {
   const pouch = getPouch()
   try {
     await pouch.replicate(from, to, {
       batch_size: 1000,
-      batch_limit: 5,
+      batches_limit: 5,
+      // @ts-ignore
       style: "main_only",
     })
   } catch (err) {
@@ -87,7 +92,7 @@ exports.replication = async (from, to) => {
   }
 }
 
-exports.getPouches = config => {
+export function getPouches(config: Record<string, string>) {
   const Remote = getPouch(config["COUCH_DB_URL"])
   const Local = getPouch()
   return { Remote, Local }
diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js
deleted file mode 100644
index 6b0265ffd2..0000000000
--- a/packages/cli/src/constants.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const { Event } = require("@budibase/types")
-
-exports.CommandWords = {
-  BACKUPS: "backups",
-  HOSTING: "hosting",
-  ANALYTICS: "analytics",
-  HELP: "help",
-  PLUGIN: "plugins",
-}
-
-exports.InitTypes = {
-  QUICK: "quick",
-  DIGITAL_OCEAN: "do",
-}
-
-exports.AnalyticsEvents = {
-  OptOut: "analytics:opt:out",
-  OptIn: "analytics:opt:in",
-  SelfHostInit: "hosting:init",
-  PluginInit: Event.PLUGIN_INIT,
-}
-
-exports.POSTHOG_TOKEN = "phc_yGOn4i7jWKaCTapdGR6lfA4AvmuEQ2ijn5zAVSFYPlS"
-
-exports.GENERATED_USER_EMAIL = "admin@admin.com"
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
new file mode 100644
index 0000000000..6fa5822986
--- /dev/null
+++ b/packages/cli/src/constants.ts
@@ -0,0 +1,4 @@
+export { CommandWord, InitType, AnalyticsEvent } from "@budibase/types"
+
+export const POSTHOG_TOKEN = "phc_yGOn4i7jWKaCTapdGR6lfA4AvmuEQ2ijn5zAVSFYPlS"
+export const GENERATED_USER_EMAIL = "admin@admin.com"
diff --git a/packages/cli/src/core/db.js b/packages/cli/src/core/db.ts
similarity index 69%
rename from packages/cli/src/core/db.js
rename to packages/cli/src/core/db.ts
index 38f383d99e..f2afb8bcd4 100644
--- a/packages/cli/src/core/db.js
+++ b/packages/cli/src/core/db.ts
@@ -1,12 +1,12 @@
-const PouchDB = require("pouchdb")
-const { checkSlashesInUrl } = require("../utils")
-const fetch = require("node-fetch")
+import PouchDB from "pouchdb"
+import { checkSlashesInUrl } from "../utils"
+import fetch from "node-fetch"
 
 /**
  * Fully qualified URL including username and password, or nothing for local
  */
-exports.getPouch = (url = undefined) => {
-  let POUCH_DB_DEFAULTS = {}
+export function getPouch(url?: string) {
+  let POUCH_DB_DEFAULTS
   if (!url) {
     POUCH_DB_DEFAULTS = {
       prefix: undefined,
@@ -19,11 +19,12 @@ exports.getPouch = (url = undefined) => {
   }
   const replicationStream = require("pouchdb-replication-stream")
   PouchDB.plugin(replicationStream.plugin)
+  // @ts-ignore
   PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
-  return PouchDB.defaults(POUCH_DB_DEFAULTS)
+  return PouchDB.defaults(POUCH_DB_DEFAULTS) as PouchDB.Static
 }
 
-exports.getAllDbs = async url => {
+export async function getAllDbs(url: string) {
   const response = await fetch(
     checkSlashesInUrl(encodeURI(`${url}/_all_dbs`)),
     {
diff --git a/packages/cli/src/environment.js b/packages/cli/src/environment.ts
similarity index 100%
rename from packages/cli/src/environment.js
rename to packages/cli/src/environment.ts
diff --git a/packages/cli/src/events.js b/packages/cli/src/events.js
deleted file mode 100644
index 63d4fca1ea..0000000000
--- a/packages/cli/src/events.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const AnalyticsClient = require("./analytics/Client")
-
-const client = new AnalyticsClient()
-
-exports.captureEvent = (event, properties) => {
-  client.capture({
-    distinctId: "cli",
-    event,
-    properties,
-  })
-}
diff --git a/packages/cli/src/events.ts b/packages/cli/src/events.ts
new file mode 100644
index 0000000000..c05a596c0a
--- /dev/null
+++ b/packages/cli/src/events.ts
@@ -0,0 +1,11 @@
+import { AnalyticsClient } from "./analytics/Client"
+
+const client = new AnalyticsClient()
+
+export function captureEvent(event: string, properties: any) {
+  client.capture({
+    distinctId: "cli",
+    event,
+    properties,
+  })
+}
diff --git a/packages/cli/src/exec.js b/packages/cli/src/exec.ts
similarity index 55%
rename from packages/cli/src/exec.js
rename to packages/cli/src/exec.ts
index 4df486aed6..b121ca0e03 100644
--- a/packages/cli/src/exec.js
+++ b/packages/cli/src/exec.ts
@@ -1,21 +1,21 @@
-const util = require("util")
-const exec = util.promisify(require("child_process").exec)
+import util from "util"
+const runCommand = util.promisify(require("child_process").exec)
 
-exports.exec = async (command, dir = "./") => {
-  const { stdout } = await exec(command, { cwd: dir })
+export async function exec(command: string, dir = "./") {
+  const { stdout } = await runCommand(command, { cwd: dir })
   return stdout
 }
 
-exports.utilityInstalled = async utilName => {
+export async function utilityInstalled(utilName: string) {
   try {
-    await exports.exec(`${utilName} --version`)
+    await exec(`${utilName} --version`)
     return true
   } catch (err) {
     return false
   }
 }
 
-exports.runPkgCommand = async (command, dir = "./") => {
+export async function runPkgCommand(command: string, dir = "./") {
   const yarn = await exports.utilityInstalled("yarn")
   const npm = await exports.utilityInstalled("npm")
   if (!yarn && !npm) {
diff --git a/packages/cli/src/hosting/genUser.js b/packages/cli/src/hosting/genUser.ts
similarity index 68%
rename from packages/cli/src/hosting/genUser.js
rename to packages/cli/src/hosting/genUser.ts
index 7ee11179af..e02bb20e1f 100644
--- a/packages/cli/src/hosting/genUser.js
+++ b/packages/cli/src/hosting/genUser.ts
@@ -2,15 +2,16 @@ const { success } = require("../utils")
 const { updateDockerComposeService } = require("./utils")
 const randomString = require("randomstring")
 const { GENERATED_USER_EMAIL } = require("../constants")
+import { DockerCompose } from "./types"
 
-exports.generateUser = async (password, silent) => {
+export async function generateUser(password: string | null, silent: boolean) {
   const email = GENERATED_USER_EMAIL
   if (!password) {
     password = randomString.generate({ length: 6 })
   }
-  updateDockerComposeService(service => {
+  updateDockerComposeService((service: DockerCompose) => {
     service.environment["BB_ADMIN_USER_EMAIL"] = email
-    service.environment["BB_ADMIN_USER_PASSWORD"] = password
+    service.environment["BB_ADMIN_USER_PASSWORD"] = password as string
   })
   if (!silent) {
     console.log(
diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.ts
similarity index 68%
rename from packages/cli/src/hosting/index.js
rename to packages/cli/src/hosting/index.ts
index d8133c4959..3326061c9a 100644
--- a/packages/cli/src/hosting/index.js
+++ b/packages/cli/src/hosting/index.ts
@@ -1,14 +1,14 @@
-const Command = require("../structures/Command")
-const { CommandWords } = require("../constants")
-const { init } = require("./init")
-const { start } = require("./start")
-const { stop } = require("./stop")
-const { status } = require("./status")
-const { update } = require("./update")
-const { generateUser } = require("./genUser")
-const { watchPlugins } = require("./watch")
+import { Command } from "../structures/Command"
+import { CommandWord } from "../constants"
+import { init } from "./init"
+import { start } from "./start"
+import { stop } from "./stop"
+import { status } from "./status"
+import { update } from "./update"
+import { generateUser } from "./genUser"
+import { watchPlugins } from "./watch"
 
-const command = new Command(`${CommandWords.HOSTING}`)
+export default new Command(`${CommandWord.HOSTING}`)
   .addHelp("Controls self hosting on the Budibase platform.")
   .addSubOption(
     "--init [type]",
@@ -46,5 +46,3 @@ const command = new Command(`${CommandWords.HOSTING}`)
     generateUser
   )
   .addSubOption("--single", "Specify this with init to use the single image.")
-
-exports.command = command
diff --git a/packages/cli/src/hosting/init.js b/packages/cli/src/hosting/init.ts
similarity index 60%
rename from packages/cli/src/hosting/init.js
rename to packages/cli/src/hosting/init.ts
index 88063f1732..7e0bb7269e 100644
--- a/packages/cli/src/hosting/init.js
+++ b/packages/cli/src/hosting/init.ts
@@ -1,24 +1,25 @@
-const { InitTypes, AnalyticsEvents } = require("../constants")
-const { confirmation } = require("../questions")
-const { captureEvent } = require("../events")
-const makeFiles = require("./makeFiles")
-const axios = require("axios")
-const { parseEnv } = require("../utils")
-const { checkDockerConfigured, downloadFiles } = require("./utils")
-const { watchPlugins } = require("./watch")
-const { generateUser } = require("./genUser")
+import { InitType, AnalyticsEvent } from "../constants"
+import { confirmation } from "../questions"
+import { captureEvent } from "../events"
+import * as makeFiles from "./makeFiles"
+import { parseEnv } from "../utils"
+import { checkDockerConfigured, downloadFiles } from "./utils"
+import { watchPlugins } from "./watch"
+import { generateUser } from "./genUser"
+import fetch from "node-fetch"
 
 const DO_USER_DATA_URL = "http://169.254.169.254/metadata/v1/user-data"
 
-async function getInitConfig(type, isQuick, port) {
-  const config = isQuick ? makeFiles.QUICK_CONFIG : {}
-  if (type === InitTypes.DIGITAL_OCEAN) {
+async function getInitConfig(type: string, isQuick: boolean, port: number) {
+  const config: any = isQuick ? makeFiles.QUICK_CONFIG : {}
+  if (type === InitType.DIGITAL_OCEAN) {
     try {
-      const output = await axios.get(DO_USER_DATA_URL)
-      const response = parseEnv(output.data)
+      const output = await fetch(DO_USER_DATA_URL)
+      const data = await output.text()
+      const response = parseEnv(data)
       for (let [key, value] of Object.entries(makeFiles.ConfigMap)) {
         if (response[key]) {
-          config[value] = response[key]
+          config[value as string] = response[key]
         }
       }
     } catch (err) {
@@ -32,7 +33,7 @@ async function getInitConfig(type, isQuick, port) {
   return config
 }
 
-exports.init = async opts => {
+export async function init(opts: any) {
   let type, isSingle, watchDir, genUser, port, silent
   if (typeof opts === "string") {
     type = opts
@@ -44,7 +45,7 @@ exports.init = async opts => {
     port = opts["port"]
     silent = opts["silent"]
   }
-  const isQuick = type === InitTypes.QUICK || type === InitTypes.DIGITAL_OCEAN
+  const isQuick = type === InitType.QUICK || type === InitType.DIGITAL_OCEAN
   await checkDockerConfigured()
   if (!isQuick) {
     const shouldContinue = await confirmation(
@@ -55,7 +56,7 @@ exports.init = async opts => {
       return
     }
   }
-  captureEvent(AnalyticsEvents.SelfHostInit, {
+  captureEvent(AnalyticsEvent.SelfHostInit, {
     type,
   })
   const config = await getInitConfig(type, isQuick, port)
diff --git a/packages/cli/src/hosting/makeFiles.js b/packages/cli/src/hosting/makeFiles.ts
similarity index 76%
rename from packages/cli/src/hosting/makeFiles.js
rename to packages/cli/src/hosting/makeFiles.ts
index abb0736858..9574e107a6 100644
--- a/packages/cli/src/hosting/makeFiles.js
+++ b/packages/cli/src/hosting/makeFiles.ts
@@ -1,15 +1,15 @@
-const { number } = require("../questions")
-const { success, stringifyToDotEnv } = require("../utils")
-const fs = require("fs")
-const path = require("path")
+import { number } from "../questions"
+import { success, stringifyToDotEnv } from "../utils"
+import fs from "fs"
+import path from "path"
+import yaml from "yaml"
+import { getAppService } from "./utils"
 const randomString = require("randomstring")
-const yaml = require("yaml")
-const { getAppService } = require("./utils")
 
 const SINGLE_IMAGE = "budibase/budibase:latest"
 const VOL_NAME = "budibase_data"
-const COMPOSE_PATH = path.resolve("./docker-compose.yaml")
-const ENV_PATH = path.resolve("./.env")
+export const COMPOSE_PATH = path.resolve("./docker-compose.yaml")
+export const ENV_PATH = path.resolve("./.env")
 
 function getSecrets(opts = { single: false }) {
   const secrets = [
@@ -19,7 +19,7 @@ function getSecrets(opts = { single: false }) {
     "REDIS_PASSWORD",
     "INTERNAL_API_KEY",
   ]
-  const obj = {}
+  const obj: Record<string, string> = {}
   secrets.forEach(secret => (obj[secret] = randomString.generate()))
   // setup couch creds separately
   if (opts && opts.single) {
@@ -32,7 +32,7 @@ function getSecrets(opts = { single: false }) {
   return obj
 }
 
-function getSingleCompose(port) {
+function getSingleCompose(port: number) {
   const singleComposeObj = {
     version: "3",
     services: {
@@ -53,7 +53,7 @@ function getSingleCompose(port) {
   return yaml.stringify(singleComposeObj)
 }
 
-function getEnv(port) {
+function getEnv(port: number) {
   const partOne = stringifyToDotEnv({
     MAIN_PORT: port,
   })
@@ -77,19 +77,21 @@ function getEnv(port) {
   ].join("\n")
 }
 
-exports.ENV_PATH = ENV_PATH
-exports.COMPOSE_PATH = COMPOSE_PATH
-
-module.exports.ConfigMap = {
+export const ConfigMap = {
   MAIN_PORT: "port",
 }
 
-module.exports.QUICK_CONFIG = {
+export const QUICK_CONFIG = {
   key: "budibase",
   port: 10000,
 }
 
-async function make(path, contentsFn, inputs = {}, silent) {
+async function make(
+  path: string,
+  contentsFn: Function,
+  inputs: any = {},
+  silent: boolean
+) {
   const port =
     inputs.port ||
     (await number(
@@ -107,15 +109,15 @@ async function make(path, contentsFn, inputs = {}, silent) {
   }
 }
 
-module.exports.makeEnv = async (inputs = {}, silent) => {
+export async function makeEnv(inputs: any = {}, silent: boolean) {
   return make(ENV_PATH, getEnv, inputs, silent)
 }
 
-module.exports.makeSingleCompose = async (inputs = {}, silent) => {
+export async function makeSingleCompose(inputs: any = {}, silent: boolean) {
   return make(COMPOSE_PATH, getSingleCompose, inputs, silent)
 }
 
-module.exports.getEnvProperty = property => {
+export function getEnvProperty(property: string) {
   const props = fs.readFileSync(ENV_PATH, "utf8").split(property)
   if (props[0].charAt(0) === "=") {
     property = props[0]
@@ -125,7 +127,7 @@ module.exports.getEnvProperty = property => {
   return property.split("=")[1].split("\n")[0]
 }
 
-module.exports.getComposeProperty = property => {
+export function getComposeProperty(property: string) {
   const { service } = getAppService(COMPOSE_PATH)
   if (property === "port" && Array.isArray(service.ports)) {
     const port = service.ports[0]
diff --git a/packages/cli/src/hosting/start.js b/packages/cli/src/hosting/start.ts
similarity index 69%
rename from packages/cli/src/hosting/start.js
rename to packages/cli/src/hosting/start.ts
index 33b5eb92ce..75e3df451f 100644
--- a/packages/cli/src/hosting/start.js
+++ b/packages/cli/src/hosting/start.ts
@@ -1,14 +1,10 @@
-const {
-  checkDockerConfigured,
-  checkInitComplete,
-  handleError,
-} = require("./utils")
-const { info, success } = require("../utils")
-const makeFiles = require("./makeFiles")
-const compose = require("docker-compose")
-const fs = require("fs")
+import { checkDockerConfigured, checkInitComplete, handleError } from "./utils"
+import { info, success } from "../utils"
+import * as makeFiles from "./makeFiles"
+import compose from "docker-compose"
+import fs from "fs"
 
-exports.start = async () => {
+export async function start() {
   await checkDockerConfigured()
   checkInitComplete()
   console.log(
diff --git a/packages/cli/src/hosting/status.js b/packages/cli/src/hosting/status.ts
similarity index 50%
rename from packages/cli/src/hosting/status.js
rename to packages/cli/src/hosting/status.ts
index 2b98392133..8a0803bc26 100644
--- a/packages/cli/src/hosting/status.js
+++ b/packages/cli/src/hosting/status.ts
@@ -1,12 +1,8 @@
-const {
-  checkDockerConfigured,
-  checkInitComplete,
-  handleError,
-} = require("./utils")
-const { info } = require("../utils")
-const compose = require("docker-compose")
+import { checkDockerConfigured, checkInitComplete, handleError } from "./utils"
+import { info } from "../utils"
+import compose from "docker-compose"
 
-exports.status = async () => {
+export async function status() {
   await checkDockerConfigured()
   checkInitComplete()
   console.log(info("Budibase status"))
diff --git a/packages/cli/src/hosting/stop.js b/packages/cli/src/hosting/stop.ts
similarity index 54%
rename from packages/cli/src/hosting/stop.js
rename to packages/cli/src/hosting/stop.ts
index 5f38c93484..cff5e83028 100644
--- a/packages/cli/src/hosting/stop.js
+++ b/packages/cli/src/hosting/stop.ts
@@ -1,12 +1,8 @@
-const {
-  checkDockerConfigured,
-  checkInitComplete,
-  handleError,
-} = require("./utils")
-const { info, success } = require("../utils")
-const compose = require("docker-compose")
+import { checkDockerConfigured, checkInitComplete, handleError } from "./utils"
+import { info, success } from "../utils"
+import compose from "docker-compose"
 
-exports.stop = async () => {
+export async function stop() {
   await checkDockerConfigured()
   checkInitComplete()
   console.log(info("Stopping services, this may take a moment."))
diff --git a/packages/cli/src/hosting/types.ts b/packages/cli/src/hosting/types.ts
new file mode 100644
index 0000000000..ee50ccebfc
--- /dev/null
+++ b/packages/cli/src/hosting/types.ts
@@ -0,0 +1,4 @@
+export interface DockerCompose {
+  environment: Record<string, string>
+  volumes: string[]
+}
diff --git a/packages/cli/src/hosting/update.js b/packages/cli/src/hosting/update.ts
similarity index 80%
rename from packages/cli/src/hosting/update.js
rename to packages/cli/src/hosting/update.ts
index 7d3367ce57..b935488746 100644
--- a/packages/cli/src/hosting/update.js
+++ b/packages/cli/src/hosting/update.ts
@@ -1,20 +1,20 @@
-const {
+import {
   checkDockerConfigured,
   checkInitComplete,
   downloadFiles,
   handleError,
   getServices,
-} = require("./utils")
-const { confirmation } = require("../questions")
-const compose = require("docker-compose")
-const { COMPOSE_PATH } = require("./makeFiles")
-const { info, success } = require("../utils")
-const { start } = require("./start")
+} from "./utils"
+import { confirmation } from "../questions"
+import compose from "docker-compose"
+import { COMPOSE_PATH } from "./makeFiles"
+import { info, success } from "../utils"
+import { start } from "./start"
 
 const BB_COMPOSE_SERVICES = ["app-service", "worker-service", "proxy-service"]
 const BB_SINGLE_SERVICE = ["budibase"]
 
-exports.update = async () => {
+export async function update() {
   const { services } = getServices(COMPOSE_PATH)
   const isSingle = Object.keys(services).length === 1
   await checkDockerConfigured()
diff --git a/packages/cli/src/hosting/utils.js b/packages/cli/src/hosting/utils.ts
similarity index 72%
rename from packages/cli/src/hosting/utils.js
rename to packages/cli/src/hosting/utils.ts
index 952974ee83..80b224deb3 100644
--- a/packages/cli/src/hosting/utils.js
+++ b/packages/cli/src/hosting/utils.ts
@@ -1,15 +1,16 @@
-const { lookpath } = require("lookpath")
-const fs = require("fs")
-const makeFiles = require("./makeFiles")
-const { logErrorToFile, downloadFile, error } = require("../utils")
-const yaml = require("yaml")
+import { lookpath } from "lookpath"
+import fs from "fs"
+import * as makeFiles from "./makeFiles"
+import { logErrorToFile, downloadFile, error } from "../utils"
+import yaml from "yaml"
+import { DockerCompose } from "./types"
 
 const ERROR_FILE = "docker-error.log"
 const FILE_URLS = [
   "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml",
 ]
 
-exports.downloadFiles = async () => {
+export async function downloadFiles() {
   const promises = []
   for (let url of FILE_URLS) {
     const fileName = url.split("/").slice(-1)[0]
@@ -18,7 +19,7 @@ exports.downloadFiles = async () => {
   await Promise.all(promises)
 }
 
-exports.checkDockerConfigured = async () => {
+export async function checkDockerConfigured() {
   const error =
     "docker/docker-compose has not been installed, please follow instructions at: https://docs.budibase.com/docs/docker-compose"
   const docker = await lookpath("docker")
@@ -28,7 +29,7 @@ exports.checkDockerConfigured = async () => {
   }
 }
 
-exports.checkInitComplete = () => {
+export function checkInitComplete() {
   if (
     !fs.existsSync(makeFiles.ENV_PATH) &&
     !fs.existsSync(makeFiles.COMPOSE_PATH)
@@ -37,10 +38,10 @@ exports.checkInitComplete = () => {
   }
 }
 
-exports.handleError = async func => {
+export async function handleError(func: Function) {
   try {
     await func()
-  } catch (err) {
+  } catch (err: any) {
     if (err && err.err) {
       logErrorToFile(ERROR_FILE, err.err)
     }
@@ -48,14 +49,14 @@ exports.handleError = async func => {
   }
 }
 
-exports.getServices = path => {
+export function getServices(path: string) {
   const dockerYaml = fs.readFileSync(path, "utf8")
   const parsedYaml = yaml.parse(dockerYaml)
   return { yaml: parsedYaml, services: parsedYaml.services }
 }
 
-exports.getAppService = path => {
-  const { yaml, services } = exports.getServices(path),
+export function getAppService(path: string) {
+  const { yaml, services } = getServices(path),
     serviceList = Object.keys(services)
   let service
   if (services["app-service"]) {
@@ -66,14 +67,16 @@ exports.getAppService = path => {
   return { yaml, service }
 }
 
-exports.updateDockerComposeService = updateFn => {
+export function updateDockerComposeService(
+  updateFn: (service: DockerCompose) => void
+) {
   const opts = ["docker-compose.yaml", "docker-compose.yml"]
   const dockerFilePath = opts.find(name => fs.existsSync(name))
   if (!dockerFilePath) {
     console.log(error("Unable to locate docker-compose YAML."))
     return
   }
-  const { yaml: parsedYaml, service } = exports.getAppService(dockerFilePath)
+  const { yaml: parsedYaml, service } = getAppService(dockerFilePath)
   if (!service) {
     console.log(
       error(
diff --git a/packages/cli/src/hosting/watch.js b/packages/cli/src/hosting/watch.ts
similarity index 71%
rename from packages/cli/src/hosting/watch.js
rename to packages/cli/src/hosting/watch.ts
index 56f1c8e201..4bd7f6f568 100644
--- a/packages/cli/src/hosting/watch.js
+++ b/packages/cli/src/hosting/watch.ts
@@ -1,9 +1,10 @@
-const { resolve } = require("path")
-const fs = require("fs")
-const { error, success } = require("../utils")
-const { updateDockerComposeService } = require("./utils")
+import { resolve } from "path"
+import fs from "fs"
+import { error, success } from "../utils"
+import { updateDockerComposeService } from "./utils"
+import { DockerCompose } from "./types"
 
-exports.watchPlugins = async (pluginPath, silent) => {
+export async function watchPlugins(pluginPath: string, silent: boolean) {
   const PLUGIN_PATH = "/plugins"
   // get absolute path
   pluginPath = resolve(pluginPath)
@@ -15,7 +16,7 @@ exports.watchPlugins = async (pluginPath, silent) => {
     )
     return
   }
-  updateDockerComposeService(service => {
+  updateDockerComposeService((service: DockerCompose) => {
     // set environment variable
     service.environment["PLUGINS_DIR"] = PLUGIN_PATH
     // add volumes to parsed yaml
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.ts
similarity index 74%
rename from packages/cli/src/index.js
rename to packages/cli/src/index.ts
index 9d1004fc20..77e4d6da8e 100644
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.ts
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-require("./prebuilds")
-require("./environment")
+import "./prebuilds"
+import "./environment"
+import { getCommands } from "./options"
+import { Command } from "commander"
+import { getHelpDescription } from "./utils"
 const json = require("../package.json")
-const { getCommands } = require("./options")
-const { Command } = require("commander")
-const { getHelpDescription } = require("./utils")
 
 // add hosting config
 async function init() {
diff --git a/packages/cli/src/options.js b/packages/cli/src/options.js
deleted file mode 100644
index 1e58ee2725..0000000000
--- a/packages/cli/src/options.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const analytics = require("./analytics")
-const hosting = require("./hosting")
-const backups = require("./backups")
-const plugins = require("./plugins")
-
-exports.getCommands = () => {
-  return [hosting.command, analytics.command, backups.command, plugins.command]
-}
diff --git a/packages/cli/src/options.ts b/packages/cli/src/options.ts
new file mode 100644
index 0000000000..4fc6d9e952
--- /dev/null
+++ b/packages/cli/src/options.ts
@@ -0,0 +1,8 @@
+import analytics from "./analytics"
+import hosting from "./hosting"
+import backups from "./backups"
+import plugins from "./plugins"
+
+export function getCommands() {
+  return [hosting, analytics, backups, plugins]
+}
diff --git a/packages/cli/src/plugins/index.js b/packages/cli/src/plugins/index.ts
similarity index 82%
rename from packages/cli/src/plugins/index.js
rename to packages/cli/src/plugins/index.ts
index 5786c521b2..cfafd67720 100644
--- a/packages/cli/src/plugins/index.js
+++ b/packages/cli/src/plugins/index.ts
@@ -1,18 +1,22 @@
-const Command = require("../structures/Command")
-const { CommandWords, AnalyticsEvents, InitTypes } = require("../constants")
-const { getSkeleton, fleshOutSkeleton } = require("./skeleton")
-const questions = require("../questions")
-const fs = require("fs")
-const { PLUGIN_TYPE_ARR } = require("@budibase/types")
-const { plugins } = require("@budibase/backend-core")
-const { runPkgCommand } = require("../exec")
-const { join } = require("path")
-const { success, error, info, moveDirectory } = require("../utils")
-const { captureEvent } = require("../events")
+import { Command } from "../structures/Command"
+import { CommandWord, AnalyticsEvent, InitType } from "../constants"
+import { getSkeleton, fleshOutSkeleton } from "./skeleton"
+import * as questions from "../questions"
+import fs from "fs"
+import { PluginType, PLUGIN_TYPE_ARR } from "@budibase/types"
+import { plugins } from "@budibase/backend-core"
+import { runPkgCommand } from "../exec"
+import { join } from "path"
+import { success, error, info, moveDirectory } from "../utils"
+import { captureEvent } from "../events"
+import { GENERATED_USER_EMAIL } from "../constants"
+import { init as hostingInit } from "../hosting/init"
+import { start as hostingStart } from "../hosting/start"
 const fp = require("find-free-port")
-const { GENERATED_USER_EMAIL } = require("../constants")
-const { init: hostingInit } = require("../hosting/init")
-const { start: hostingStart } = require("../hosting/start")
+
+type PluginOpts = {
+  init?: PluginType
+}
 
 function checkInPlugin() {
   if (!fs.existsSync("package.json")) {
@@ -27,7 +31,7 @@ function checkInPlugin() {
   }
 }
 
-async function askAboutTopLevel(name) {
+async function askAboutTopLevel(name: string) {
   const files = fs.readdirSync(process.cwd())
   // we are in an empty git repo, don't ask
   if (files.find(file => file === ".git")) {
@@ -45,8 +49,8 @@ async function askAboutTopLevel(name) {
   }
 }
 
-async function init(opts) {
-  const type = opts["init"] || opts
+async function init(opts: PluginOpts) {
+  const type = opts["init"] || (opts as PluginType)
   if (!type || !PLUGIN_TYPE_ARR.includes(type)) {
     console.log(
       error(
@@ -82,7 +86,7 @@ async function init(opts) {
   } else {
     console.log(info(`Plugin created in directory "${name}"`))
   }
-  captureEvent(AnalyticsEvents.PluginInit, {
+  captureEvent(AnalyticsEvent.PluginInit, {
     type,
     name,
     description,
@@ -109,7 +113,7 @@ async function verify() {
     version = pkgJson.version
     plugins.validate(schemaJson)
     return { name, version }
-  } catch (err) {
+  } catch (err: any) {
     if (err && err.message && err.message.includes("not valid JSON")) {
       console.log(error(`schema.json is not valid JSON: ${err.message}`))
     } else {
@@ -120,7 +124,7 @@ async function verify() {
 
 async function build() {
   const verified = await verify()
-  if (!verified.name) {
+  if (!verified?.name) {
     return
   }
   console.log(success("Verified!"))
@@ -132,7 +136,7 @@ async function build() {
 
 async function watch() {
   const verified = await verify()
-  if (!verified.name) {
+  if (!verified?.name) {
     return
   }
   const output = join("dist", `${verified.name}-${verified.version}.tar.gz`)
@@ -150,7 +154,7 @@ async function dev() {
   const [port] = await fp(10000)
   const password = "admin"
   await hostingInit({
-    init: InitTypes.QUICK,
+    init: InitType.QUICK,
     single: true,
     watchPluginDir: pluginDir,
     genUser: password,
@@ -168,7 +172,7 @@ async function dev() {
   console.log(success("Password: ") + info(password))
 }
 
-const command = new Command(`${CommandWords.PLUGIN}`)
+export default new Command(`${CommandWord.PLUGIN}`)
   .addHelp(
     "Custom plugins for Budibase, init, build and verify your components and datasources with this tool."
   )
@@ -192,5 +196,3 @@ const command = new Command(`${CommandWords.PLUGIN}`)
     "Run a development environment which automatically watches the current directory.",
     dev
   )
-
-exports.command = command
diff --git a/packages/cli/src/plugins/skeleton.js b/packages/cli/src/plugins/skeleton.ts
similarity index 75%
rename from packages/cli/src/plugins/skeleton.js
rename to packages/cli/src/plugins/skeleton.ts
index 76b9aa2d8a..0146588b38 100644
--- a/packages/cli/src/plugins/skeleton.js
+++ b/packages/cli/src/plugins/skeleton.ts
@@ -1,21 +1,21 @@
-const fetch = require("node-fetch")
+import fetch from "node-fetch"
+import fs from "fs"
+import os from "os"
+import { join } from "path"
+import { processStringSync } from "@budibase/string-templates"
 const download = require("download")
-const fs = require("fs")
-const os = require("os")
-const { join } = require("path")
 const tar = require("tar")
-const { processStringSync } = require("@budibase/string-templates")
 
 const HBS_FILES = ["package.json.hbs", "schema.json.hbs", "README.md.hbs"]
 
-async function getSkeletonUrl(type) {
+async function getSkeletonUrl(type: string) {
   const resp = await fetch(
     "https://api.github.com/repos/budibase/budibase-skeleton/releases/latest"
   )
   if (resp.status >= 300) {
     throw new Error("Failed to retrieve skeleton metadata")
   }
-  const json = await resp.json()
+  const json = (await resp.json()) as { assets: any[] }
   for (let asset of json["assets"]) {
     if (asset.name && asset.name.includes(type)) {
       return asset["browser_download_url"]
@@ -24,7 +24,7 @@ async function getSkeletonUrl(type) {
   throw new Error("No skeleton found in latest release.")
 }
 
-exports.getSkeleton = async (type, name) => {
+export async function getSkeleton(type: string, name: string) {
   const url = await getSkeletonUrl(type)
   const tarballFile = join(os.tmpdir(), "skeleton.tar.gz")
 
@@ -40,7 +40,12 @@ exports.getSkeleton = async (type, name) => {
   fs.rmSync(tarballFile)
 }
 
-exports.fleshOutSkeleton = async (type, name, description, version) => {
+export async function fleshOutSkeleton(
+  type: string,
+  name: string,
+  description: string,
+  version: string
+) {
   for (let file of HBS_FILES) {
     const oldFile = join(name, file),
       newFile = join(name, file.substring(0, file.length - 4))
diff --git a/packages/cli/src/prebuilds.js b/packages/cli/src/prebuilds.ts
similarity index 87%
rename from packages/cli/src/prebuilds.js
rename to packages/cli/src/prebuilds.ts
index 0decdc6c63..bfdae90cf3 100644
--- a/packages/cli/src/prebuilds.js
+++ b/packages/cli/src/prebuilds.ts
@@ -1,7 +1,8 @@
-const os = require("os")
-const { join } = require("path")
-const fs = require("fs")
-const { error } = require("./utils")
+import os from "os"
+import { join } from "path"
+import fs from "fs"
+import { error } from "./utils"
+
 const PREBUILDS = "prebuilds"
 const ARCH = `${os.platform()}-${os.arch()}`
 const PREBUILD_DIR = join(process.execPath, "..", PREBUILDS, ARCH)
@@ -26,8 +27,8 @@ function checkForBinaries() {
   }
 }
 
-function cleanup(evt) {
-  if (!isNaN(evt)) {
+function cleanup(evt?: number) {
+  if (evt && !isNaN(evt)) {
     return
   }
   if (evt) {
diff --git a/packages/cli/src/questions.js b/packages/cli/src/questions.ts
similarity index 70%
rename from packages/cli/src/questions.js
rename to packages/cli/src/questions.ts
index ea0c412a60..4f4cf77e97 100644
--- a/packages/cli/src/questions.js
+++ b/packages/cli/src/questions.ts
@@ -1,6 +1,6 @@
 const inquirer = require("inquirer")
 
-exports.confirmation = async question => {
+export async function confirmation(question: string) {
   const config = {
     type: "confirm",
     message: question,
@@ -10,8 +10,8 @@ exports.confirmation = async question => {
   return (await inquirer.prompt(config)).confirmation
 }
 
-exports.string = async (question, defaultString = null) => {
-  const config = {
+export async function string(question: string, defaultString?: string) {
+  const config: any = {
     type: "input",
     name: "string",
     message: question,
@@ -22,12 +22,12 @@ exports.string = async (question, defaultString = null) => {
   return (await inquirer.prompt(config)).string
 }
 
-exports.number = async (question, defaultNumber) => {
-  const config = {
+export async function number(question: string, defaultNumber?: number) {
+  const config: any = {
     type: "input",
     name: "number",
     message: question,
-    validate: value => {
+    validate: (value: string) => {
       let valid = !isNaN(parseFloat(value))
       return valid || "Please enter a number"
     },
diff --git a/packages/cli/src/structures/Command.js b/packages/cli/src/structures/Command.ts
similarity index 74%
rename from packages/cli/src/structures/Command.js
rename to packages/cli/src/structures/Command.ts
index e383c14263..cf9f93758b 100644
--- a/packages/cli/src/structures/Command.js
+++ b/packages/cli/src/structures/Command.ts
@@ -1,19 +1,31 @@
-const {
+import {
   getSubHelpDescription,
   getHelpDescription,
   error,
   capitaliseFirstLetter,
-} = require("../utils")
+} from "../utils"
 
-class Command {
-  constructor(command, func = null) {
+type CommandOpt = {
+  command: string
+  help: string
+  func?: Function
+  extras: any[]
+}
+
+export class Command {
+  command: string
+  opts: CommandOpt[]
+  func?: Function
+  help?: string
+
+  constructor(command: string, func?: Function) {
     // if there are options, need to just get the command name
     this.command = command
     this.opts = []
     this.func = func
   }
 
-  convertToCommander(lookup) {
+  convertToCommander(lookup: string) {
     const parts = lookup.toLowerCase().split("-")
     // camel case, separate out first
     const first = parts.shift()
@@ -22,21 +34,26 @@ class Command {
       .join("")
   }
 
-  addHelp(help) {
+  addHelp(help: string) {
     this.help = help
     return this
   }
 
-  addSubOption(command, help, func, extras = []) {
+  addSubOption(
+    command: string,
+    help: string,
+    func?: Function,
+    extras: any[] = []
+  ) {
     this.opts.push({ command, help, func, extras })
     return this
   }
 
-  configure(program) {
+  configure(program: any) {
     const thisCmd = this
     let command = program.command(thisCmd.command)
     if (this.help) {
-      command = command.description(getHelpDescription(thisCmd.help))
+      command = command.description(getHelpDescription(thisCmd.help!))
     }
     for (let opt of thisCmd.opts) {
       command = command.option(opt.command, getSubHelpDescription(opt.help))
@@ -45,7 +62,7 @@ class Command {
       "--help",
       getSubHelpDescription(`Get help with ${this.command} options`)
     )
-    command.action(async options => {
+    command.action(async (options: Record<string, string>) => {
       try {
         let executed = false,
           found = false
@@ -53,7 +70,7 @@ class Command {
           let lookup = opt.command.split(" ")[0].replace("--", "")
           // need to handle how commander converts watch-plugin-dir to watchPluginDir
           lookup = this.convertToCommander(lookup)
-          found = !executed && options[lookup]
+          found = !executed && !!options[lookup]
           if (found && opt.func) {
             const input =
               Object.keys(options).length > 1 ? options : options[lookup]
@@ -69,11 +86,9 @@ class Command {
           console.log(error(`Unknown ${this.command} option.`))
           command.help()
         }
-      } catch (err) {
+      } catch (err: any) {
         console.log(error(err))
       }
     })
   }
 }
-
-module.exports = Command
diff --git a/packages/cli/src/structures/ConfigManager.js b/packages/cli/src/structures/ConfigManager.ts
similarity index 83%
rename from packages/cli/src/structures/ConfigManager.js
rename to packages/cli/src/structures/ConfigManager.ts
index 35799b8e92..e428395a40 100644
--- a/packages/cli/src/structures/ConfigManager.js
+++ b/packages/cli/src/structures/ConfigManager.ts
@@ -3,7 +3,9 @@ const path = require("path")
 const os = require("os")
 const { error } = require("../utils")
 
-class ConfigManager {
+export class ConfigManager {
+  path: string
+
   constructor() {
     this.path = path.join(os.homedir(), ".budibase.json")
     if (!fs.existsSync(this.path)) {
@@ -24,26 +26,24 @@ class ConfigManager {
     }
   }
 
-  set config(json) {
+  set config(json: any) {
     fs.writeFileSync(this.path, JSON.stringify(json))
   }
 
-  getValue(key) {
+  getValue(key: string) {
     return this.config[key]
   }
 
-  setValue(key, value) {
+  setValue(key: string, value: any) {
     this.config = {
       ...this.config,
       [key]: value,
     }
   }
 
-  removeKey(key) {
+  removeKey(key: string) {
     const updated = { ...this.config }
     delete updated[key]
     this.config = updated
   }
 }
-
-module.exports = ConfigManager
diff --git a/packages/cli/src/utils.js b/packages/cli/src/utils.ts
similarity index 52%
rename from packages/cli/src/utils.js
rename to packages/cli/src/utils.ts
index d041fb498a..9634458c90 100644
--- a/packages/cli/src/utils.js
+++ b/packages/cli/src/utils.ts
@@ -1,21 +1,18 @@
-const chalk = require("chalk")
-const fs = require("fs")
-const axios = require("axios")
-const path = require("path")
+import chalk from "chalk"
+import fs from "fs"
+import path from "path"
+import { join } from "path"
+import fetch from "node-fetch"
 const progress = require("cli-progress")
-const { join } = require("path")
 
-exports.downloadFile = async (url, filePath) => {
+export async function downloadFile(url: string, filePath: string) {
   filePath = path.resolve(filePath)
   const writer = fs.createWriteStream(filePath)
 
-  const response = await axios({
-    url,
+  const response = await fetch(url, {
     method: "GET",
-    responseType: "stream",
   })
-
-  response.data.pipe(writer)
+  response.body?.pipe(writer)
 
   return new Promise((resolve, reject) => {
     writer.on("finish", resolve)
@@ -23,41 +20,41 @@ exports.downloadFile = async (url, filePath) => {
   })
 }
 
-exports.httpCall = async (url, method) => {
-  const response = await axios({
-    url,
+export async function httpCall(url: string, method: string) {
+  const response = await fetch(url, {
     method,
   })
-  return response.data
+  return response.body
 }
 
-exports.getHelpDescription = string => {
-  return chalk.cyan(string)
+export function getHelpDescription(str: string) {
+  return chalk.cyan(str)
 }
 
-exports.getSubHelpDescription = string => {
-  return chalk.green(string)
+export function getSubHelpDescription(str: string) {
+  return chalk.green(str)
 }
 
-exports.error = error => {
-  return chalk.red(`Error - ${error}`)
+export function error(err: string | number) {
+  process.exitCode = -1
+  return chalk.red(`Error - ${err}`)
 }
 
-exports.success = success => {
-  return chalk.green(success)
+export function success(str: string) {
+  return chalk.green(str)
 }
 
-exports.info = info => {
-  return chalk.cyan(info)
+export function info(str: string) {
+  return chalk.cyan(str)
 }
 
-exports.logErrorToFile = (file, error) => {
+export function logErrorToFile(file: string, error: string) {
   fs.writeFileSync(path.resolve(`./${file}`), `Budibase Error\n${error}`)
 }
 
-exports.parseEnv = env => {
+export function parseEnv(env: string) {
   const lines = env.toString().split("\n")
-  let result = {}
+  let result: Record<string, string> = {}
   for (const line of lines) {
     const match = line.match(/^([^=:#]+?)[=:](.*)/)
     if (match) {
@@ -67,17 +64,17 @@ exports.parseEnv = env => {
   return result
 }
 
-exports.progressBar = total => {
+export function progressBar(total: number) {
   const bar = new progress.SingleBar({}, progress.Presets.shades_classic)
   bar.start(total, 0)
   return bar
 }
 
-exports.checkSlashesInUrl = url => {
+export function checkSlashesInUrl(url: string) {
   return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
 }
 
-exports.moveDirectory = (oldPath, newPath) => {
+export function moveDirectory(oldPath: string, newPath: string) {
   const files = fs.readdirSync(oldPath)
   // check any file exists already
   for (let file of files) {
@@ -93,11 +90,11 @@ exports.moveDirectory = (oldPath, newPath) => {
   fs.rmdirSync(oldPath)
 }
 
-exports.capitaliseFirstLetter = str => {
+export function capitaliseFirstLetter(str: string) {
   return str.charAt(0).toUpperCase() + str.slice(1)
 }
 
-exports.stringifyToDotEnv = json => {
+export function stringifyToDotEnv(json: Record<string, string | number>) {
   let str = ""
   for (let [key, value] of Object.entries(json)) {
     str += `${key}=${value}\n`
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
new file mode 100644
index 0000000000..8b2d44aec8
--- /dev/null
+++ b/packages/cli/tsconfig.build.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "module": "commonjs",
+    "lib": ["es2020"],
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "incremental": true,
+    "types": [ "node", "jest" ],
+    "outDir": "dist",
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/*.spec.ts",
+    "**/*.spec.js"
+  ]
+}
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
new file mode 100644
index 0000000000..6a65126481
--- /dev/null
+++ b/packages/cli/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": true,
+    "declaration": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "paths": {
+      "@budibase/types": ["../types/src"],
+      "@budibase/backend-core": ["../backend-core/src"],
+      "@budibase/backend-core/*": ["../backend-core/*"],
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
+    }
+  },
+  "ts-node": {
+    "require": ["tsconfig-paths/register"],
+    "swc": true
+  },
+  "references": [
+    { "path": "../types" },
+    { "path": "../backend-core" },
+    { "path": "../../../budibase-pro/packages/pro" }
+  ],
+  "include": [
+    "src/**/*",
+    "package.json"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}
\ No newline at end of file
diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock
index 638c8e6aa3..d5d0888bb6 100644
--- a/packages/cli/yarn.lock
+++ b/packages/cli/yarn.lock
@@ -9,6 +9,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.12.13":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/generator@7.18.2":
   version "7.18.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
@@ -33,7 +40,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/highlight@^7.10.4":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
   integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
@@ -71,6 +78,13 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -112,6 +126,50 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jest/create-cache-key-function@^27.4.2":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-27.5.1.tgz#7448fae15602ea95c828f5eceed35c202a820b31"
+  integrity sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+
+"@jest/expect-utils@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.3.tgz#95ce4df62952f071bcd618225ac7c47eaa81431e"
+  integrity sha512-/6JWbkxHOP8EoS8jeeTd9dTfc9Uawi+43oLKHfp6zzux3U2hqOOVnV3ai4RpDYHOccL6g+5nrxpoc8DmJxtXVQ==
+  dependencies:
+    jest-get-type "^29.4.3"
+
+"@jest/schemas@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788"
+  integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==
+  dependencies:
+    "@sinclair/typebox" "^0.25.16"
+
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
+"@jest/types@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.3.tgz#9069145f4ef09adf10cec1b2901b2d390031431f"
+  integrity sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -121,7 +179,7 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@3.1.0":
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
@@ -136,6 +194,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -182,11 +248,332 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
+"@sinclair/typebox@^0.25.16":
+  version "0.25.24"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
+  integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
+
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
+"@swc/core-darwin-arm64@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.37.tgz#a92e075ae35f18a64aaf3823ea175f03564f8da1"
+  integrity sha512-iIyVqqioUpVeT/hbBVfkrsjfCyL4idNH+LVKGmoTAWaTTSB0+UNhNuA7Wh2CqIHWh1Mv7IlumitWPcqsVDdoEw==
+
+"@swc/core-darwin-x64@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.37.tgz#a3cc06c87140a2ca0b8e7ef1f3d5cc34dd080429"
+  integrity sha512-dao5nXPWKxtaxqak4ZkRyBoApNIelW/glantQhPhj0FjMjuIQc+v03ldJ8XDByWOG+6xuVUTheANCtEccxoQBw==
+
+"@swc/core-linux-arm-gnueabihf@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.37.tgz#f7d8f8523830c6be653f608839d4bd5598457f1f"
+  integrity sha512-/mVrc8H/f062CUkqKGmBiil2VIYu4mKawHxERfeP1y38X5K/OwjG5s9MgO9TVxy+Ly6vejwj70kRhSa3hVp1Bw==
+
+"@swc/core-linux-arm64-gnu@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.37.tgz#b162febd9de14fb08000c722b063be2bb5aefa6b"
+  integrity sha512-eRQ3KaZI0j5LidTfOIi/kUVOOMuVmw1HCdt/Z1TAUKoHMLVxY8xcJ3pEE3/+ednI60EmHpwpJRs6LelXyL6uzQ==
+
+"@swc/core-linux-arm64-musl@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.37.tgz#3b1a628e880fbb1a5e2a7a46d42e8aa878c6bfdd"
+  integrity sha512-w2BRLODyxNQY2rfHZMZ5ir6QrrnGBPlnIslTrgKmVbn1OjZoxUCtuqhrYnCmybaAc4DOkeH02TqynEFXrm+EMw==
+
+"@swc/core-linux-x64-gnu@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.37.tgz#ed443ad77dc90e415267d02a38e4113047b2d3d8"
+  integrity sha512-CfoH8EsZJZ9kunjMUjBNYD5fFuO86zw+K/o4wEw72Yg6ZEiqPmeIlCKU8tpTv4sK+CbhUXrmVzMB5tqsb2jALQ==
+
+"@swc/core-linux-x64-musl@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.37.tgz#de607a4985458bd6e8b0e40f0d62d0e26bd8df1e"
+  integrity sha512-9YPrHYNdoG7PK11gV51GfL45biI2dic+YTqHUDKyykemsD7Ot1zUFX7Ty//pdvpKcKSff6SrHbfFACD5ziNirA==
+
+"@swc/core-win32-arm64-msvc@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.37.tgz#d5851a47d7df183929b9746d56f76c282f940e6a"
+  integrity sha512-h17Ek8/wCDje6BrXOvCXBM80oBRmTSMMdLyt87whTl5xqYlWYYs9oQIzZndNRTlNpTgjGO8Ns2eo4kwVxIkBIA==
+
+"@swc/core-win32-ia32-msvc@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.37.tgz#06ad7016f61b56aec4abf60eab3a91b786f9e294"
+  integrity sha512-1BR175E1olGy/zdt94cgdb6ps/lBNissAOaxyBk8taFpcjy3zpdP30yAoH0GIsC6isnZ5JfArbOJNRXXO5tE0Q==
+
+"@swc/core-win32-x64-msvc@1.3.37":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.37.tgz#60139a7089003a7447a4efef9704ae8fde21995e"
+  integrity sha512-1siDQ7dccQ1pesJmgAL3BUBbRPtfbNInOWnZOkiie/DfFqGQ117QKnCVyjUvwFKfTQx1+3UUTDmMSlRd00SlXg==
+
+"@swc/core@^1.3.25":
+  version "1.3.37"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.37.tgz#644653fa7deb20c7c342e7fd019c7abc44ecf1bf"
+  integrity sha512-VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw==
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.3.37"
+    "@swc/core-darwin-x64" "1.3.37"
+    "@swc/core-linux-arm-gnueabihf" "1.3.37"
+    "@swc/core-linux-arm64-gnu" "1.3.37"
+    "@swc/core-linux-arm64-musl" "1.3.37"
+    "@swc/core-linux-x64-gnu" "1.3.37"
+    "@swc/core-linux-x64-musl" "1.3.37"
+    "@swc/core-win32-arm64-msvc" "1.3.37"
+    "@swc/core-win32-ia32-msvc" "1.3.37"
+    "@swc/core-win32-x64-msvc" "1.3.37"
+
+"@swc/jest@^0.2.24":
+  version "0.2.24"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.24.tgz#35d9377ede049613cd5fdd6c24af2b8dcf622875"
+  integrity sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==
+  dependencies:
+    "@jest/create-cache-key-function" "^27.4.2"
+    jsonc-parser "^3.2.0"
+
+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+
+"@types/debug@*":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
+  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.4.0.tgz#a8444ad1704493e84dbf07bb05990b275b3b9206"
+  integrity sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
+"@types/node-fetch@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+  integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
+"@types/node@*":
+  version "18.14.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.4.tgz#0e64ec0b35a772e1e3d849f9a0ff61782d0cb647"
+  integrity sha512-VhCw7I7qO2X49+jaKcAUwi3rR+hbxT5VcYF493+Z5kMLI0DL568b7JI4IDJaxWFH0D/xwmGJNoXisyX+w7GH/g==
+
+"@types/pouchdb-adapter-cordova-sqlite@*":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-1.0.1.tgz#49e5ee6df7cc0c23196fcb340f43a560e74eb1d6"
+  integrity sha512-nqlXpW1ho3KBg1mUQvZgH2755y3z/rw4UA7ZJCPMRTHofxGMY8izRVw5rHBL4/7P615or0J2udpRYxgkT3D02g==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-fruitdown@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-fruitdown/-/pouchdb-adapter-fruitdown-6.1.3.tgz#9b140ad9645cc56068728acf08ec19ac0046658e"
+  integrity sha512-Wz1Z1JLOW1hgmFQjqnSkmyyfH7by/iWb4abKn684WMvQfmxx6BxKJpJ4+eulkVPQzzgMMSgU1MpnQOm9FgRkbw==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-http/-/pouchdb-adapter-http-6.1.3.tgz#6e592d5f48deb6274a21ddac1498dd308096bcf3"
+  integrity sha512-9Z4TLbF/KJWy/D2sWRPBA+RNU0odQimfdvlDX+EY7rGcd3aVoH8qjD/X0Xcd/0dfBH5pKrNIMFFQgW/TylRCmA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-idb@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-idb/-/pouchdb-adapter-idb-6.1.4.tgz#cb9a18864585d600820cd325f007614c5c3989cd"
+  integrity sha512-KIAXbkF4uYUz0ZwfNEFLtEkK44mEWopAsD76UhucH92XnJloBysav+TjI4FFfYQyTjoW3S1s6V+Z14CUJZ0F6w==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-leveldb@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-leveldb/-/pouchdb-adapter-leveldb-6.1.3.tgz#17c7e75d75b992050bca15991e97fba575c61bb3"
+  integrity sha512-ex8NFqQGFwEpFi7AaZ5YofmuemfZNsL3nTFZBUCAKYMBkazQij1pe2ILLStSvJr0XS0qxgXjCEW19T5Wqiiskg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-localstorage@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-localstorage/-/pouchdb-adapter-localstorage-6.1.3.tgz#0dde02ba6b9d6073a295a20196563942ba9a54bd"
+  integrity sha512-oor040tye1KKiGLWYtIy7rRT7C2yoyX3Tf6elEJRpjOA7Ja/H8lKc4LaSh9ATbptIcES6MRqZDxtp7ly9hsW3Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-memory@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-memory/-/pouchdb-adapter-memory-6.1.3.tgz#9eabdbc890fcf58960ee8b68b8685f837e75c844"
+  integrity sha512-gVbsIMzDzgZYThFVT4eVNsmuZwVm/4jDxP1sjlgc3qtDIxbtBhGgyNfcskwwz9Zu5Lv1avkDsIWvcxQhnvRlHg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-node-websql@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-node-websql/-/pouchdb-adapter-node-websql-6.1.3.tgz#aa18bc68af8cf509acd12c400010dcd5fab2243d"
+  integrity sha512-F/P+os6Jsa7CgHtH64+Z0HfwIcj0hIRB5z8gNhF7L7dxPWoAfkopK5H2gydrP3sQrlGyN4WInF+UJW/Zu1+FKg==
+  dependencies:
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-adapter-websql@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-websql/-/pouchdb-adapter-websql-6.1.4.tgz#359fbe42ccac0ac90b492ddb8c32fafd0aa96d79"
+  integrity sha512-zMJQCtXC40hBsIDRn0GhmpeGMK0f9l/OGWfLguvczROzxxcOD7REI+e6SEmX7gJKw5JuMvlfuHzkQwjmvSJbtg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-browser@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-browser/-/pouchdb-browser-6.1.3.tgz#8f33d6ef58d6817d1f6d36979148a1c7f63244d8"
+  integrity sha512-EdYowrWxW9SWBMX/rux2eq7dbHi5Zeyzz+FF/IAsgQKnUxgeCO5VO2j4zTzos0SDyJvAQU+EYRc11r7xGn5tvA==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-core@*":
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.10.tgz#d1ea1549e7fad6cb579f71459b1bc27252e06a5a"
+  integrity sha512-mKhjLlWWXyV3PTTjDhzDV1kc2dolO7VYFa75IoKM/hr8Er9eo8RIbS7mJLfC8r/C3p6ihZu9yZs1PWC1LQ0SOA==
+  dependencies:
+    "@types/debug" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb-find@*":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-7.3.0.tgz#b917030e9f4bf6e56bf8c3b9fe4b2a25e989009a"
+  integrity sha512-sFPli5tBjGX9UfXioik1jUzPdcN84eV82n0lmEFuoPepWqkLjQcyri0eOa++HYOaNPyMDhKFBqEALEZivK2dRg==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-http@*":
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-http/-/pouchdb-http-6.1.3.tgz#09576c0d409da1f8dee34ec5b768415e2472ea52"
+  integrity sha512-0e9E5SqNOyPl/3FnEIbENssB4FlJsNYuOy131nxrZk36S+y1R/6qO7ZVRypWpGTqBWSuVd7gCsq2UDwO/285+w==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-mapreduce@*":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-mapreduce/-/pouchdb-mapreduce-6.1.7.tgz#9ab32d1e0f234f1bf6d1e4c5d7e216e9e23ac0a3"
+  integrity sha512-WzBwm7tmO9QhfRzVaWT4v6JQSS/fG2OoUDrWrhX87rPe2Pn6laPvdK5li6myNRxCoI/l5e8Jd+oYBAFnaiFucA==
+  dependencies:
+    "@types/pouchdb-core" "*"
+
+"@types/pouchdb-node@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-node/-/pouchdb-node-6.1.4.tgz#5214c0169fcfd2237d373380bbd65a934feb5dfb"
+  integrity sha512-wnTCH8X1JOPpNOfVhz8HW0AvmdHh6pt40MuRj0jQnK7QEHsHS79WujsKTKSOF8QXtPwpvCNSsI7ut7H7tfxxJQ==
+  dependencies:
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/pouchdb-replication@*":
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb-replication/-/pouchdb-replication-6.4.4.tgz#743406c90f13a988fa3e346ea74ce40acd170d00"
+  integrity sha512-BsE5LKpjJK4iAf6Fx5kyrMw+33V+Ip7uWldUnU2BYrrvtR+MLD22dcImm7DZN1st2wPPb91i0XEnQzvP0w1C/Q==
+  dependencies:
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-find" "*"
+
+"@types/pouchdb@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.0.tgz#f9c41ca64b23029f9bf2eb4bf6956e6431cb79f8"
+  integrity sha512-eGCpX+NXhd5VLJuJMzwe3L79fa9+IDTrAG3CPaf4s/31PD56hOrhDJTSmRELSXuiqXr6+OHzzP0PldSaWsFt7w==
+  dependencies:
+    "@types/pouchdb-adapter-cordova-sqlite" "*"
+    "@types/pouchdb-adapter-fruitdown" "*"
+    "@types/pouchdb-adapter-http" "*"
+    "@types/pouchdb-adapter-idb" "*"
+    "@types/pouchdb-adapter-leveldb" "*"
+    "@types/pouchdb-adapter-localstorage" "*"
+    "@types/pouchdb-adapter-memory" "*"
+    "@types/pouchdb-adapter-node-websql" "*"
+    "@types/pouchdb-adapter-websql" "*"
+    "@types/pouchdb-browser" "*"
+    "@types/pouchdb-core" "*"
+    "@types/pouchdb-http" "*"
+    "@types/pouchdb-mapreduce" "*"
+    "@types/pouchdb-node" "*"
+    "@types/pouchdb-replication" "*"
+
+"@types/stack-utils@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+
+"@types/yargs-parser@*":
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+
+"@types/yargs@^16.0.0":
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3"
+  integrity sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@types/yargs@^17.0.8":
+  version "17.0.22"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
+  integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 abort-controller@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -221,11 +608,21 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
+acorn-walk@^8.1.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
 acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.4.1:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -289,6 +686,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -309,6 +711,11 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -351,6 +758,11 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -364,13 +776,6 @@ axios-retry@^3.1.9:
     "@babel/runtime" "^7.15.4"
     is-retry-allowed "^2.2.0"
 
-axios@0.21.2:
-  version "0.21.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.2.tgz#21297d5084b2aeeb422f5d38e7be4fbb82239017"
-  integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
 axios@^0.21.1:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
@@ -519,6 +924,11 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
+ci-info@^3.2.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -588,6 +998,13 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 command-line-args@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
@@ -658,6 +1075,11 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -774,6 +1196,11 @@ deferred-leveldown@~5.3.0:
     abstract-leveldown "~6.2.1"
     inherits "^2.0.3"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -784,6 +1211,16 @@ detect-libc@^1.0.3:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
 
+diff-sequences@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
+  integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -888,6 +1325,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -1017,6 +1459,17 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
+expect@^29.0.0:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.3.tgz#5e47757316df744fe3b8926c3ae8a3ebdafff7fe"
+  integrity sha512-uC05+Q7eXECFpgDrHdXA4k2rpMyStAYPItEDLyQDo5Ta7fVkJnNA/4zh/OIVkVVNZ1oOK1PipQoyNjuZ6sz6Dg==
+  dependencies:
+    "@jest/expect-utils" "^29.4.3"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.4.3"
+    jest-message-util "^29.4.3"
+    jest-util "^29.4.3"
+
 ext-list@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
@@ -1191,6 +1644,15 @@ follow-redirects@^1.14.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 from2@^2.1.1, from2@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
@@ -1348,7 +1810,7 @@ got@^8.3.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.10, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.10, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -1604,6 +2066,58 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
+jest-diff@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.3.tgz#42f4eb34d0bf8c0fb08b0501069b87e8e84df347"
+  integrity sha512-YB+ocenx7FZ3T5O9lMVMeLYV4265socJKtkwgk/6YUz/VsEzYDkiMuMhWzZmxm3wDRQvayJu/PjkjjSkjoHsCA==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.4.3"
+
+jest-get-type@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
+  integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
+
+jest-matcher-utils@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.3.tgz#ea68ebc0568aebea4c4213b99f169ff786df96a0"
+  integrity sha512-TTciiXEONycZ03h6R6pYiZlSkvYgT0l8aa49z/DLSGYjex4orMUcafuLXYyyEDWB1RKglq00jzwY00Ei7yFNVg==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.4.3"
+
+jest-message-util@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.3.tgz#65b5280c0fdc9419503b49d4f48d4999d481cb5b"
+  integrity sha512-1Y8Zd4ZCN7o/QnWdMmT76If8LuDv23Z1DRovBj/vcSFNlGCJGoO8D1nJDw1AdyAGUk0myDLFGN5RbNeJyCRGCw==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.4.3"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.4.3"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-util@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.3.tgz#851a148e23fc2b633c55f6dad2e45d7f4579f496"
+  integrity sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==
+  dependencies:
+    "@jest/types" "^29.4.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 joi@17.6.0:
   version "17.6.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"
@@ -1663,6 +2177,11 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
+jsonc-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -1857,6 +2376,11 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -1879,11 +2403,18 @@ micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@^1.28.0:
+mime-db@1.52.0, mime-db@^1.28.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -1991,7 +2522,7 @@ node-abi@^2.21.0:
   dependencies:
     semver "^5.4.1"
 
-node-fetch@2, node-fetch@2.6.7, node-fetch@^2.6.6:
+node-fetch@2.6.7, node-fetch@^2.6.6:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -2137,7 +2668,7 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-picomatch@^2.3.1:
+picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -2300,6 +2831,15 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
 
+pretty-format@^29.0.0, pretty-format@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.3.tgz#25500ada21a53c9e8423205cf0337056b201244c"
+  integrity sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 printj@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz#9af6b1d55647a1587ac44f4c1654a4b95b8e12cb"
@@ -2374,6 +2914,11 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-is@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
 readable-stream@1.1.14, readable-stream@^1.0.27-1:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -2656,6 +3201,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+stack-utils@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
 stream-meter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d"
@@ -2911,6 +3463,25 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+ts-node@^10.9.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -2940,6 +3511,11 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+typescript@4.7.3:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
+  integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
+
 typical@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
@@ -3015,6 +3591,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -3131,3 +3712,8 @@ yauzl@^2.4.2:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
diff --git a/packages/types/src/sdk/cli/constants.ts b/packages/types/src/sdk/cli/constants.ts
new file mode 100644
index 0000000000..2311a44e6a
--- /dev/null
+++ b/packages/types/src/sdk/cli/constants.ts
@@ -0,0 +1,21 @@
+import { Event } from "../events"
+
+export enum CommandWord {
+  BACKUPS = "backups",
+  HOSTING = "hosting",
+  ANALYTICS = "analytics",
+  HELP = "help",
+  PLUGIN = "plugins"
+}
+
+export enum InitType {
+  QUICK = "quick",
+  DIGITAL_OCEAN = "do",
+}
+
+export const AnalyticsEvent = {
+  OptOut: "analytics:opt:out",
+  OptIn: "analytics:opt:in",
+  SelfHostInit: "hosting:init",
+  PluginInit: Event.PLUGIN_INIT,
+}
\ No newline at end of file
diff --git a/packages/types/src/sdk/cli/index.ts b/packages/types/src/sdk/cli/index.ts
new file mode 100644
index 0000000000..23fdb69814
--- /dev/null
+++ b/packages/types/src/sdk/cli/index.ts
@@ -0,0 +1 @@
+export * from "./constants"
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index ccd59bf720..8fc5fb287e 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -15,3 +15,4 @@ export * from "./environmentVariables"
 export * from "./auditLogs"
 export * from "./sso"
 export * from "./user"
+export * from "./cli"

From 4d0116a55308ce52eb0f7a47377f3e1e483ab6b6 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Mar 2023 18:22:58 +0000
Subject: [PATCH 262/273] Linting.

---
 packages/types/src/sdk/cli/constants.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/types/src/sdk/cli/constants.ts b/packages/types/src/sdk/cli/constants.ts
index 2311a44e6a..17d570b8be 100644
--- a/packages/types/src/sdk/cli/constants.ts
+++ b/packages/types/src/sdk/cli/constants.ts
@@ -5,7 +5,7 @@ export enum CommandWord {
   HOSTING = "hosting",
   ANALYTICS = "analytics",
   HELP = "help",
-  PLUGIN = "plugins"
+  PLUGIN = "plugins",
 }
 
 export enum InitType {
@@ -18,4 +18,4 @@ export const AnalyticsEvent = {
   OptIn: "analytics:opt:in",
   SelfHostInit: "hosting:init",
   PluginInit: Event.PLUGIN_INIT,
-}
\ No newline at end of file
+}

From 207889f095c2c40bfdf36f5494345f2d03056775 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Mar 2023 19:30:24 +0000
Subject: [PATCH 263/273] Updating dependencies.

---
 packages/backend-core/package.json |    2 +-
 packages/backend-core/yarn.lock    |    8 +-
 packages/cli/package.json          |    4 +-
 packages/cli/yarn.lock             | 2436 +++++++++++++++++++++++++++-
 4 files changed, 2412 insertions(+), 38 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a214f97a89..c0f5148728 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -22,7 +22,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/nano": "10.1.1",
+    "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
     "@budibase/types": "2.3.18-alpha.29",
     "@shopify/jest-koa-mocks": "5.0.1",
diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock
index 5f8edb3df6..91c5c6c9f3 100644
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@@ -475,10 +475,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/nano@10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
-  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+"@budibase/nano@10.1.2":
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.2.tgz#10fae5a1ab39be6a81261f40e7b7ec6d21cbdd4a"
+  integrity sha512-1w+YN2n/M5aZ9hBKCP4NEjdQbT8BfCLRizkdvm0Je665eEHw3aE1hvo8mon9Ro9QuDdxj1DfDMMFnym6/QUwpQ==
   dependencies:
     "@types/tough-cookie" "^4.0.2"
     axios "^1.1.3"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2144bbbac4..91f95dca23 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -10,8 +10,10 @@
   "license": "GPL-3.0",
   "scripts": {
     "prebuild": "rm -rf prebuilds 2> /dev/null && cp -r node_modules/leveldown/prebuilds prebuilds",
+    "rename": "renamer --find .node --replace .fake 'prebuilds/**'",
     "tsc": "tsc -p tsconfig.build.json",
-    "build": "npx prebuild && renamer --find .node --replace .fake 'prebuilds/**' && npx tsc && pkg . --out-path build && npx postbuild",
+    "pkg": "pkg . --out-path build --no-bytecode --public --public-packages \"*\" -C GZip",
+    "build": "yarn prebuild && yarn rename && yarn tsc && yarn pkg && yarn postbuild",
     "postbuild": "rm -rf prebuilds 2> /dev/null"
   },
   "pkg": {
diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock
index d5d0888bb6..f2021969a7 100644
--- a/packages/cli/yarn.lock
+++ b/packages/cli/yarn.lock
@@ -78,6 +78,112 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@budibase/backend-core@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.29.tgz#ddae082878a80dc64430afdbc221d47d7cba91ed"
+  integrity sha512-b8CyVjJxXdRkfEJ9Bd8eu53p0+92VZJaxUTv8aVqQfZTu61iqvqyaiNVRcPZb/PxyJHEAD7cGv+8ZD65LLCK1A==
+  dependencies:
+    "@budibase/nano" "10.1.1"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.18-alpha.29"
+    "@shopify/jest-koa-mocks" "5.0.1"
+    "@techpass/passport-openidconnect" "0.3.2"
+    aws-cloudfront-sign "2.2.0"
+    aws-sdk "2.1030.0"
+    bcrypt "5.0.1"
+    bcryptjs "2.4.3"
+    bull "4.10.1"
+    correlation-id "4.0.0"
+    dotenv "16.0.1"
+    emitter-listener "1.1.2"
+    ioredis "4.28.0"
+    joi "17.6.0"
+    jsonwebtoken "9.0.0"
+    koa-passport "4.1.4"
+    lodash "4.17.21"
+    lodash.isarguments "3.1.0"
+    node-fetch "2.6.7"
+    passport-google-oauth "2.0.0"
+    passport-jwt "4.0.0"
+    passport-local "1.0.0"
+    passport-oauth2-refresh "^2.1.0"
+    posthog-node "1.3.0"
+    pouchdb "7.3.0"
+    pouchdb-find "7.2.2"
+    redlock "4.2.0"
+    sanitize-s3-objectkey "0.0.1"
+    semver "7.3.7"
+    tar-fs "2.1.1"
+    uuid "8.3.2"
+    zlib "1.0.5"
+
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
+"@budibase/nano@10.1.1":
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
+  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+  dependencies:
+    "@types/tough-cookie" "^4.0.2"
+    axios "^1.1.3"
+    http-cookie-agent "^4.0.2"
+    node-abort-controller "^3.0.1"
+    qs "^6.11.0"
+    tough-cookie "^4.1.2"
+
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
+  dependencies:
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/string-templates@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.18-alpha.29.tgz#ce2d489aac503018bfdaab152c1d00c845ce0155"
+  integrity sha512-hSdnjwm4lm/5yeXami2TdXZg0FE+C+GFJn8PSdTKQ2eZt+vCrhgR9rqk8odSho+5+rkFbQf2uTNAIxyZFBZNRA==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
+"@budibase/types@2.3.18-alpha.29":
+  version "2.3.18-alpha.29"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.29.tgz#cdd07f08d4f45f9fb8cf221bd6d2ad808d6136e3"
+  integrity sha512-+tfMD2F+Ko0IqUOsYB1MZuKnFzTZ0yIkYjjI/pPmDrSGrenuXKSr7jrpAOyl7UCacd62+hWzfhqV8Ga1JhKgrw==
+
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -210,6 +316,51 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@mapbox/node-pre-gyp@^1.0.0":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c"
+  integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==
+  dependencies:
+    detect-libc "^2.0.0"
+    https-proxy-agent "^5.0.0"
+    make-dir "^3.1.0"
+    node-fetch "^2.6.7"
+    nopt "^5.0.0"
+    npmlog "^5.0.1"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.11"
+
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
+  integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3"
+  integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367"
+  integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399"
+  integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f"
+  integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407"
+  integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -231,6 +382,14 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@shopify/jest-koa-mocks@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
+  integrity sha512-4YskS9q8+TEHNoyopmuoy2XyhInyqeOl7CF5ShJs19sm6m0EA/jGGvgf/osv2PeTfuf42/L2G9CzWUSg49yTSg==
+  dependencies:
+    koa "^2.13.4"
+    node-mocks-http "^1.11.0"
+
 "@sideway/address@^4.1.3":
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@@ -332,6 +491,17 @@
     "@jest/create-cache-key-function" "^27.4.2"
     jsonc-parser "^3.2.0"
 
+"@techpass/passport-openidconnect@0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.2.tgz#f8fd5d97256286665dbf26dac92431f977ab1e63"
+  integrity sha512-fnCtEiexXSHA029B//hJcCJlLJrT3lhpNCyA0rnz58Qttz0BLGCVv6yMT8HmOnGThH6vcDOVwdgKM3kbCQtEhw==
+  dependencies:
+    base64url "^3.0.1"
+    oauth "^0.9.15"
+    passport-strategy "^1.0.0"
+    request "^2.88.0"
+    webfinger "^0.4.2"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
@@ -555,6 +725,11 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
+"@types/tough-cookie@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
@@ -574,6 +749,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 abort-controller@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -603,12 +783,20 @@ abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3:
     level-supports "~1.0.0"
     xtend "~4.0.0"
 
+accepts@^1.3.5, accepts@^1.3.7:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+  dependencies:
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
 acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
+acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -618,19 +806,19 @@ acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.4.1:
+acorn@^8.4.1, acorn@^8.7.0:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -696,6 +884,11 @@ aproba@^1.0.3:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
 archive-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70"
@@ -703,6 +896,14 @@ archive-type@^4.0.0:
   dependencies:
     file-type "^4.2.0"
 
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 are-we-there-yet@~1.1.2:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
@@ -716,7 +917,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -728,6 +929,21 @@ argsarray@0.0.1:
   resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"
   integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg==
 
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+
 array-back@^3.0.1, array-back@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
@@ -743,6 +959,15 @@ array-back@^6.2.0, array-back@^6.2.2:
   resolved "https://registry.yarnpkg.com/array-back/-/array-back-6.2.2.tgz#f567d99e9af88a6d3d2f9dfcc21db6f9ba9fd157"
   integrity sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==
 
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -753,6 +978,28 @@ array-uniq@1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.2.tgz#5fcc373920775723cfd64d65c64bef53bf9eba6d"
   integrity sha512-GVYjmpL05al4dNlKJm53mKE4w9OOLiuVHWorsIA3YVz+Hu0hcn6PtE3Ydl0EqU7v+7ABC4mjjWsnLUxbpno+CA==
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
+
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -768,6 +1015,50 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
+aws-cloudfront-sign@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d"
+  integrity sha512-qG+rwZMP3KRTPPbVmWY8DlrT56AkA4iVOeo23vkdK2EXeW/brJFN2haSNKzVz+oYhFMEIzVVloeAcrEzuRkuVQ==
+  dependencies:
+    lodash "^3.6.0"
+
+aws-sdk@2.1030.0:
+  version "2.1030.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1030.0.tgz#24a856af3d2b8b37c14a8f59974993661c66fd82"
+  integrity sha512-to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.15.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
+  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
+
 axios-retry@^3.1.9:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.3.1.tgz#47624646138aedefbad2ac32f226f4ee94b6dcab"
@@ -776,6 +1067,13 @@ axios-retry@^3.1.9:
     "@babel/runtime" "^7.15.4"
     is-retry-allowed "^2.2.0"
 
+axios@0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
+  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+  dependencies:
+    follow-redirects "^1.14.4"
+
 axios@^0.21.1:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
@@ -783,16 +1081,63 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.1.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024"
+  integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.3.1:
+base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+base64url@3.x.x, base64url@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
+  integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bcrypt@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.1.tgz#f1a2c20f208e2ccdceea4433df0c8b2c54ecdf71"
+  integrity sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.0"
+    node-addon-api "^3.1.0"
+
+bcryptjs@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
+
 bl@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -810,6 +1155,11 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -818,6 +1168,22 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -843,16 +1209,35 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
 
+buffer-from@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
 buffer-from@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+buffer@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
 buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -861,6 +1246,44 @@ buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+bull@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/bull/-/bull-4.10.1.tgz#f14974b6089358b62b495a2cbf838aadc098e43f"
+  integrity sha512-Fp21tRPb2EaZPVfmM+ONZKVz2RA+to+zGgaTLyCKt3JMSU8OOBqK8143OQrnGuGpsyE5G+9FevFAGhdZZfQP2g==
+  dependencies:
+    cron-parser "^4.2.1"
+    debuglog "^1.0.0"
+    get-port "^5.1.1"
+    ioredis "^4.28.5"
+    lodash "^4.17.21"
+    msgpackr "^1.5.2"
+    p-timeout "^3.2.0"
+    semver "^7.3.2"
+    uuid "^8.3.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cache-content-type@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c"
+  integrity sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==
+  dependencies:
+    mime-types "^2.1.18"
+    ylru "^1.2.0"
+
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
@@ -874,11 +1297,24 @@ cacheable-request@^2.1.1:
     normalize-url "2.0.1"
     responselike "1.0.2"
 
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+
 chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -929,6 +1365,16 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
   integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -969,11 +1415,29 @@ clone-response@1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
+cluster-key-slot@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
+  integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -998,7 +1462,12 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-combined-stream@^1.0.8:
+color-support@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -1035,6 +1504,11 @@ commander@^2.8.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
 component-type@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
@@ -1045,18 +1519,43 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-content-disposition@^0.5.2:
+content-disposition@^0.5.2, content-disposition@^0.5.3, content-disposition@~0.5.2:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
   integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
     safe-buffer "5.2.1"
 
+content-type@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
+cookies@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
+  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
+  dependencies:
+    depd "~2.0.0"
+    keygrip "~1.1.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+
 copyfiles@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5"
@@ -1070,16 +1569,35 @@ copyfiles@^2.4.1:
     untildify "^4.0.0"
     yargs "^16.1.0"
 
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+correlation-id@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/correlation-id/-/correlation-id-4.0.0.tgz#c1d3038e5f30d7bfeae5728ff96f27a7506bc2c0"
+  integrity sha512-WvXtJBlovvOBKqTz/YwWP2gm6CXJZJArfGimp9s/ehmhJMPFbmnPMQe3K60Q9idGNixMvKojMjleyDhZEFdHfg==
+  dependencies:
+    uuid "^8.3.1"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cron-parser@^4.2.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.7.1.tgz#1e325a6a18e797a634ada1e2599ece0b6b5ed177"
+  integrity sha512-WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==
+  dependencies:
+    luxon "^3.2.1"
+
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1099,13 +1617,37 @@ current-module-paths@^1.1.0:
   resolved "https://registry.yarnpkg.com/current-module-paths/-/current-module-paths-1.1.0.tgz#5d5bf214281d80aea264e642f028e672098238f6"
   integrity sha512-HGhLUszcgprjKmzvQoCQda8iEWsQn3sWVzPdttyJVR5cjfVDYcoyozQA5D1YXgab9v84SPMpSuD+YrPX6i1IMQ==
 
-debug@4, debug@^4.0.1, debug@^4.1.1:
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
+dayjs@^1.10.4:
+  version "1.11.7"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
+  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+
+debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debuglog@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
+
 decode-uri-component@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
@@ -1178,6 +1720,11 @@ decompress@^4.2.1:
     pify "^2.3.0"
     strip-dirs "^2.0.0"
 
+deep-equal@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==
+
 deep-extend@^0.6.0, deep-extend@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -1188,6 +1735,13 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 deferred-leveldown@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058"
@@ -1196,6 +1750,28 @@ deferred-leveldown@~5.3.0:
     abstract-leveldown "~6.2.1"
     inherits "^2.0.3"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1206,11 +1782,36 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
+denque@^1.1.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
+  integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
+
+depd@^1.1.0, depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
+
+depd@^2.0.0, depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+destroy@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
+
 detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
 
+detect-libc@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+
 diff-sequences@^29.4.3:
   version "29.4.3"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
@@ -1272,11 +1873,43 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
   integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+
+emitter-listener@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
+  dependencies:
+    shimmer "^1.2.0"
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+encodeurl@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
+
 encoding-down@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b"
@@ -1308,6 +1941,11 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
 errno@~0.1.1:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -1320,6 +1958,11 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escape-html@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -1454,6 +2097,24 @@ event-target-shim@^5.0.0:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
+events@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-template@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
@@ -1485,6 +2146,26 @@ ext-name@^5.0.0:
     ext-list "^2.0.0"
     sort-keys-length "^1.0.0"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -1494,6 +2175,30 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+extsprintf@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -1539,6 +2244,13 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fetch-cookie@0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
+  integrity sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==
+  dependencies:
+    tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0"
+
 fetch-cookie@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407"
@@ -1607,6 +2319,16 @@ filenamify@^3.0.0:
     strip-outer "^1.0.0"
     trim-repeated "^1.0.0"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -1644,6 +2366,21 @@ follow-redirects@^1.14.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
+follow-redirects@^1.14.4, follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -1653,6 +2390,36 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@^0.5.2, fresh@~0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
+
 from2@^2.1.1, from2@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
@@ -1666,6 +2433,11 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-exists-sync@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==
+
 fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -1698,6 +2470,21 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.1"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -1717,6 +2504,28 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
+  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -1737,6 +2546,25 @@ get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
+
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 github-from-package@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
@@ -1815,6 +2643,48 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -1830,6 +2700,11 @@ has-symbol-support-x@^1.4.1:
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
   integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
@@ -1837,11 +2712,64 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
-has-unicode@^2.0.0:
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -1849,11 +2777,64 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
+http-assert@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
+  integrity sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==
+  dependencies:
+    deep-equal "~1.0.1"
+    http-errors "~1.8.0"
+
 http-cache-semantics@3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
+http-cookie-agent@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69"
+  integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw==
+  dependencies:
+    agent-base "^6.0.2"
+
+http-errors@^1.6.3, http-errors@~1.8.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -1869,7 +2850,12 @@ iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ieee754@^1.1.13:
+ieee754@1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+ieee754@^1.1.13, ieee754@^1.1.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -1965,7 +2951,55 @@ into-stream@^6.0.0:
     from2 "^2.3.0"
     p-is-promise "^3.0.0"
 
-is-buffer@~1.1.6:
+ioredis@4.28.0:
+  version "4.28.0"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.0.tgz#5a2be3f37ff2075e2332f280eaeb02ab4d9ff0d3"
+  integrity sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    lodash.isarguments "^3.1.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
+ioredis@^4.28.5:
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.5.tgz#5c149e6a8d76a7f8fa8a504ffc85b7d5b6797f9f"
+  integrity sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==
+  dependencies:
+    cluster-key-slot "^1.1.0"
+    debug "^4.3.1"
+    denque "^1.1.0"
+    lodash.defaults "^4.2.0"
+    lodash.flatten "^4.4.0"
+    lodash.isarguments "^3.1.0"
+    p-map "^2.1.0"
+    redis-commands "1.7.0"
+    redis-errors "^1.2.0"
+    redis-parser "^3.0.0"
+    standard-as-callback "^2.1.0"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-buffer@^1.1.5, is-buffer@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -1984,6 +3018,57 @@ is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -2001,6 +3086,13 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-function@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -2013,6 +3105,20 @@ is-natural-number@^4.0.1:
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
   integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -2023,11 +3129,25 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
 is-retry-allowed@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
@@ -2038,17 +3158,34 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
 
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
@@ -2058,6 +3195,28 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -2118,6 +3277,11 @@ jest-util@^29.4.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jmespath@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
+  integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==
+
 joi@17.6.0:
   version "17.6.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2"
@@ -2147,6 +3311,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -2167,12 +3336,17 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stringify-safe@^5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
@@ -2191,6 +3365,66 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonwebtoken@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
+jsonwebtoken@^8.2.0:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
+  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^5.6.0"
+
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
+keygrip@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
+  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
+  dependencies:
+    tsscmp "1.0.6"
+
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -2198,6 +3432,79 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0, kind-of@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+koa-compose@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
+  integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
+
+koa-convert@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/koa-convert/-/koa-convert-2.0.0.tgz#86a0c44d81d40551bae22fee6709904573eea4f5"
+  integrity sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==
+  dependencies:
+    co "^4.6.0"
+    koa-compose "^4.1.0"
+
+koa-passport@4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/koa-passport/-/koa-passport-4.1.4.tgz#5f1665c1c2a37ace79af9f970b770885ca30ccfa"
+  integrity sha512-dJBCkl4X+zdYxbI2V2OtoGy0PUenpvp2ZLLWObc8UJhsId0iQpTFT8RVcuA0709AL2txGwRHnSPoT1bYNGa6Kg==
+  dependencies:
+    passport "^0.4.0"
+
+koa@^2.13.4:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/koa/-/koa-2.14.1.tgz#defb9589297d8eb1859936e777f3feecfc26925c"
+  integrity sha512-USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw==
+  dependencies:
+    accepts "^1.3.5"
+    cache-content-type "^1.0.0"
+    content-disposition "~0.5.2"
+    content-type "^1.0.4"
+    cookies "~0.8.0"
+    debug "^4.3.2"
+    delegates "^1.0.0"
+    depd "^2.0.0"
+    destroy "^1.0.4"
+    encodeurl "^1.0.2"
+    escape-html "^1.0.3"
+    fresh "~0.5.2"
+    http-assert "^1.3.0"
+    http-errors "^1.6.3"
+    is-generator-function "^1.0.7"
+    koa-compose "^4.1.0"
+    koa-convert "^2.0.0"
+    on-finished "^2.3.0"
+    only "~0.0.2"
+    parseurl "^1.3.2"
+    statuses "^1.5.0"
+    type-is "^1.6.16"
+    vary "^1.1.2"
+
 level-codec@9.0.2, level-codec@^9.0.0:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc"
@@ -2309,31 +3616,106 @@ load-module@^4.2.1:
   dependencies:
     array-back "^6.2.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
+
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
+
+lodash.isarguments@3.1.0, lodash.isarguments@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
+
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
+
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
+
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash.once@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
+
 lodash.pick@^4.0.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
-lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+lodash@^3.6.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
+
 lookpath@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.1.0.tgz#932d68371a2f0b4a5644f03d6a2b4728edba96d2"
@@ -2361,6 +3743,11 @@ ltgt@2.2.1, ltgt@^2.1.2:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
+luxon@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.2.1.tgz#14f1af209188ad61212578ea7e3d518d18cee45f"
+  integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -2376,11 +3763,30 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
+  dependencies:
+    object-visit "^1.0.0"
+
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
@@ -2390,11 +3796,45 @@ md5@^2.3.0:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+
+merge-descriptors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+methods@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
+
+micromatch@^3.1.5:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -2408,13 +3848,18 @@ mime-db@1.52.0, mime-db@^1.28.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
+mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -2442,6 +3887,11 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass@^3.0.0:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
@@ -2449,6 +3899,11 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^4.0.0:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06"
+  integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==
+
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -2457,6 +3912,14 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
@@ -2467,16 +3930,42 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.3:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+msgpackr-extract@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
+  integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==
+  dependencies:
+    node-gyp-build-optional-packages "5.0.7"
+  optionalDependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2"
+
+msgpackr@^1.5.2:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.8.4.tgz#5d6b10eb4937f324381a382a95aef6ebd18fcc1f"
+  integrity sha512-BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg==
+  optionalDependencies:
+    msgpackr-extract "^3.0.1"
+
 multistream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8"
@@ -2490,6 +3979,23 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
@@ -2515,6 +4021,16 @@ ndjson@^1.4.3:
     split2 "^2.1.0"
     through2 "^2.0.3"
 
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
+neo-async@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 node-abi@^2.21.0:
   version "2.30.1"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"
@@ -2522,6 +4038,21 @@ node-abi@^2.21.0:
   dependencies:
     semver "^5.4.1"
 
+node-abort-controller@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
+  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
+
+node-addon-api@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
+node-fetch@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
 node-fetch@2.6.7, node-fetch@^2.6.6:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -2529,11 +4060,39 @@ node-fetch@2.6.7, node-fetch@^2.6.6:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@^2.6.7:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
+  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-gyp-build-optional-packages@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
+  integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
+
 node-gyp-build@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
   integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==
 
+node-mocks-http@^1.11.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/node-mocks-http/-/node-mocks-http-1.12.1.tgz#838e176019daf177caff6bb8534e3a32646e7531"
+  integrity sha512-jrA7Sn3qI6GsHgWtUW3gMj0vO6Yz0nJjzg3jRZYjcfj4tzi8oWPauDK1qHVJoAxTbwuDHF1JiM9GISZ/ocI/ig==
+  dependencies:
+    accepts "^1.3.7"
+    content-disposition "^0.5.3"
+    depd "^1.1.0"
+    fresh "^0.5.2"
+    merge-descriptors "^1.0.1"
+    methods "^1.1.2"
+    mime "^1.3.4"
+    parseurl "^1.3.3"
+    range-parser "^1.2.0"
+    type-is "^1.6.18"
+
 noms@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
@@ -2542,6 +4101,13 @@ noms@0.0.0:
     inherits "^2.0.1"
     readable-stream "~1.0.31"
 
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
@@ -2561,16 +4127,71 @@ npmlog@^4.0.1:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^3.0.0"
+    set-blocking "^2.0.0"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+oauth@0.9.x, oauth@^0.9.15:
+  version "0.9.15"
+  resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
+  integrity sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-inspect@^1.9.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
+  dependencies:
+    isobject "^3.0.1"
+
+on-finished@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -2585,6 +4206,11 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
+only@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
+  integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==
+
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -2629,6 +4255,11 @@ p-is-promise@^3.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"
   integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==
 
+p-map@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
@@ -2636,6 +4267,13 @@ p-timeout@^2.0.1:
   dependencies:
     p-finally "^1.0.0"
 
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -2643,6 +4281,91 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parseurl@^1.3.2, parseurl@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
+
+passport-google-oauth1@1.x.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc"
+  integrity sha512-qpCEhuflJgYrdg5zZIpAq/K3gTqa1CtHjbubsEsidIdpBPLkEVq6tB1I8kBNcH89RdSiYbnKpCBXAZXX/dtx1Q==
+  dependencies:
+    passport-oauth1 "1.x.x"
+
+passport-google-oauth20@2.x.x:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz#0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef"
+  integrity sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==
+  dependencies:
+    passport-oauth2 "1.x.x"
+
+passport-google-oauth@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz#f6eb4bc96dd6c16ec0ecfdf4e05ec48ca54d4dae"
+  integrity sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA==
+  dependencies:
+    passport-google-oauth1 "1.x.x"
+    passport-google-oauth20 "2.x.x"
+
+passport-jwt@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/passport-jwt/-/passport-jwt-4.0.0.tgz#7f0be7ba942e28b9f5d22c2ebbb8ce96ef7cf065"
+  integrity sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==
+  dependencies:
+    jsonwebtoken "^8.2.0"
+    passport-strategy "^1.0.0"
+
+passport-local@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee"
+  integrity sha512-9wCE6qKznvf9mQYYbgJ3sVOHmCWoUNMVFoZzNoznmISbhnNNPhN9xfY3sLmScHMetEJeoY7CXwfhCe7argfQow==
+  dependencies:
+    passport-strategy "1.x.x"
+
+passport-oauth1@1.x.x:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz#5d57f1415c8e28e46b461a12ec1b492934f7c354"
+  integrity sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw==
+  dependencies:
+    oauth "0.9.x"
+    passport-strategy "1.x.x"
+    utils-merge "1.x.x"
+
+passport-oauth2-refresh@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4"
+  integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==
+
+passport-oauth2@1.x.x:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
+  integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ==
+  dependencies:
+    base64url "3.x.x"
+    oauth "0.9.x"
+    passport-strategy "1.x.x"
+    uid2 "0.0.x"
+    utils-merge "1.x.x"
+
+passport-strategy@1.x.x, passport-strategy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
+  integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
+
+passport@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+  integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
+  dependencies:
+    passport-strategy "1.x.x"
+    pause "0.0.1"
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -2663,11 +4386,21 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pause@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
+  integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -2734,6 +4467,11 @@ pkg@5.8.0:
     resolve "^1.22.0"
     stream-meter "^1.0.4"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+
 posthog-node@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-1.0.7.tgz#a7a9525eebff23312117e57cff3ddac82afb2262"
@@ -2748,6 +4486,20 @@ posthog-node@1.0.7:
     remove-trailing-slash "^0.1.1"
     uuid "^8.3.2"
 
+posthog-node@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-1.3.0.tgz#804ed2f213a2f05253f798bf9569d55a9cad94f7"
+  integrity sha512-2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA==
+  dependencies:
+    axios "0.24.0"
+    axios-retry "^3.1.9"
+    component-type "^1.2.1"
+    join-component "^1.1.0"
+    md5 "^2.3.0"
+    ms "^2.1.3"
+    remove-trailing-slash "^0.1.1"
+    uuid "^8.3.2"
+
 pouch-stream@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/pouch-stream/-/pouch-stream-0.4.1.tgz#0c6d8475c9307677627991a2f079b301c3b89bdd"
@@ -2756,6 +4508,84 @@ pouch-stream@^0.4.0:
     inherits "^2.0.1"
     readable-stream "^1.0.27-1"
 
+pouchdb-abstract-mapreduce@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz#dd1b10a83f8d24361dce9aaaab054614b39f766f"
+  integrity sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==
+  dependencies:
+    pouchdb-binary-utils "7.2.2"
+    pouchdb-collate "7.2.2"
+    pouchdb-collections "7.2.2"
+    pouchdb-errors "7.2.2"
+    pouchdb-fetch "7.2.2"
+    pouchdb-mapreduce-utils "7.2.2"
+    pouchdb-md5 "7.2.2"
+    pouchdb-utils "7.2.2"
+
+pouchdb-binary-utils@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz#0690b348052c543b1e67f032f47092ca82bcb10e"
+  integrity sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==
+  dependencies:
+    buffer-from "1.1.1"
+
+pouchdb-collate@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
+  integrity sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w==
+
+pouchdb-collections@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz#aeed77f33322429e3f59d59ea233b48ff0e68572"
+  integrity sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==
+
+pouchdb-errors@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz#80d811d65c766c9d20b755c6e6cc123f8c3c4792"
+  integrity sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==
+  dependencies:
+    inherits "2.0.4"
+
+pouchdb-fetch@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz#492791236d60c899d7e9973f9aca0d7b9cc02230"
+  integrity sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==
+  dependencies:
+    abort-controller "3.0.0"
+    fetch-cookie "0.10.1"
+    node-fetch "2.6.0"
+
+pouchdb-find@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.2.2.tgz#1227afdd761812d508fe0794b3e904518a721089"
+  integrity sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==
+  dependencies:
+    pouchdb-abstract-mapreduce "7.2.2"
+    pouchdb-collate "7.2.2"
+    pouchdb-errors "7.2.2"
+    pouchdb-fetch "7.2.2"
+    pouchdb-md5 "7.2.2"
+    pouchdb-selector-core "7.2.2"
+    pouchdb-utils "7.2.2"
+
+pouchdb-mapreduce-utils@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz#13a46a3cc2a3f3b8e24861da26966904f2963146"
+  integrity sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==
+  dependencies:
+    argsarray "0.0.1"
+    inherits "2.0.4"
+    pouchdb-collections "7.2.2"
+    pouchdb-utils "7.2.2"
+
+pouchdb-md5@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz#415401acc5a844112d765bd1fb4e5d9f38fb0838"
+  integrity sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==
+  dependencies:
+    pouchdb-binary-utils "7.2.2"
+    spark-md5 "3.0.1"
+
 pouchdb-promise@^6.0.4:
   version "6.4.3"
   resolved "https://registry.yarnpkg.com/pouchdb-promise/-/pouchdb-promise-6.4.3.tgz#74516f4acf74957b54debd0fb2c0e5b5a68ca7b3"
@@ -2776,6 +4606,28 @@ pouchdb-replication-stream@1.2.9:
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
+pouchdb-selector-core@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"
+  integrity sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==
+  dependencies:
+    pouchdb-collate "7.2.2"
+    pouchdb-utils "7.2.2"
+
+pouchdb-utils@7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz#c17c4788f1d052b0daf4ef8797bbc4aaa3945aa4"
+  integrity sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==
+  dependencies:
+    argsarray "0.0.1"
+    clone-buffer "1.0.0"
+    immediate "3.3.0"
+    inherits "2.0.4"
+    pouchdb-collections "7.2.2"
+    pouchdb-errors "7.2.2"
+    pouchdb-md5 "7.2.2"
+    uuid "8.1.0"
+
 pouchdb@7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8"
@@ -2855,12 +4707,17 @@ progress@^2.0.0, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -2873,11 +4730,28 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+qs@^6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -2887,6 +4761,11 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -2904,6 +4783,11 @@ randomstring@1.1.5:
   dependencies:
     array-uniq "1.0.2"
 
+range-parser@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -2966,6 +4850,30 @@ readable-stream@~1.0.31:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+redis-commands@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89"
+  integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==
+
+redis-errors@^1.0.0, redis-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
+  integrity sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==
+
+redis-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
+  integrity sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==
+  dependencies:
+    redis-errors "^1.0.0"
+
+redlock@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/redlock/-/redlock-4.2.0.tgz#c26590768559afd5fff76aa1133c94b411ff4f5f"
+  integrity sha512-j+oQlG+dOwcetUt2WJWttu4CZVeRzUrcVcISFmEmfyuwCVSJ93rDT7YSgg7H7rnxwoRyk/jU46kycVka5tW7jA==
+  dependencies:
+    bluebird "^3.7.2"
+
 reduce-flatten@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
@@ -2976,11 +4884,34 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-slash@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d"
@@ -3004,6 +4935,42 @@ renamer@^4.0.0:
     stream-read-all "^3.0.1"
     typical "^7.1.1"
 
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+
+request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -3024,6 +4991,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
+
 resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
@@ -3048,6 +5020,11 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -3079,7 +5056,7 @@ rxjs@^6.6.6:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3089,11 +5066,33 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-"safer-buffer@>= 2.1.2 < 3":
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sanitize-s3-objectkey@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
+  integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ==
+
+sax@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
+  integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==
+
+sax@>=0.1.1, sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 seek-bzip@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
@@ -3101,23 +5100,55 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
-semver@^5.4.1, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
 
-semver@^7.2.1, semver@^7.3.5:
+semver@7.3.7, semver@^7.2.1, semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
-set-blocking@~2.0.0:
+semver@^5.4.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.3.2, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -3130,6 +5161,20 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shimmer@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -3163,6 +5208,36 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -3184,11 +5259,49 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+spark-md5@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d"
+  integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==
+
 spark-md5@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
   integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
@@ -3201,6 +5314,21 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
 stack-utils@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
@@ -3208,6 +5336,29 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
+standard-as-callback@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
+  integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.5.0 < 2", statuses@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+
+step@0.0.x:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2"
+  integrity sha512-qSSeQinUJk2w38vUFobjFoE307GqsozMC8VisOCkJLpklvKPT0ptPHwWOrENoag8rgLudvTkfP3bancwP93/Jw==
+
 stream-meter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d"
@@ -3300,6 +5451,11 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -3340,7 +5496,7 @@ table@^6.0.9:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tar-fs@^2.0.0, tar-fs@^2.1.1:
+tar-fs@2.1.1, tar-fs@^2.0.0, tar-fs@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
@@ -3386,6 +5542,18 @@ tar@6.1.11:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+tar@^6.1.11:
+  version "6.1.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
+  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^4.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -3434,6 +5602,26 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -3441,7 +5629,22 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0":
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
+"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
   integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
@@ -3451,6 +5654,14 @@ to-regex-range@^5.0.1:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -3487,6 +5698,11 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tsscmp@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -3494,6 +5710,11 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -3511,6 +5732,21 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+type-is@^1.6.16, type-is@^1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typescript@4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
@@ -3531,6 +5767,16 @@ typical@^7.1.1:
   resolved "https://registry.yarnpkg.com/typical/-/typical-7.1.1.tgz#ba177ab7ab103b78534463ffa4c0c9754523ac1f"
   integrity sha512-T+tKVNs6Wu7IWiAce5BgMd7OZfNYUndHwc5MknN+UHOudi7sGZzuHdCadllRuqJ3fPtgFtIH9+lt9qRv6lmpfA==
 
+uglify-js@^3.1.4:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
+uid2@0.0.x:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44"
+  integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==
+
 unbzip2-stream@^1.0.9:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -3539,6 +5785,16 @@ unbzip2-stream@^1.0.9:
     buffer "^5.2.1"
     through "^2.3.8"
 
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -3549,6 +5805,14 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -3561,6 +5825,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
+
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -3581,16 +5850,49 @@ url-to-options@^1.0.1:
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
   integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==
 
+url@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
+  integrity sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@8.3.2, uuid@^8.3.2:
+utils-merge@1.x.x:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+
+uuid@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+uuid@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
+  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
+
+uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -3601,11 +5903,41 @@ v8-compile-cache@^2.0.3:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
+vary@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm2@^3.9.4:
+  version "3.9.14"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
+  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
   integrity sha512-Tm7jR1xTzBbPW+6y1tknKiEhz04Wf/1iZkcTJjSFcpNko43+dFW6+OOeQe9taJIug3NdfUAjFKgUSyQrIKaDvQ==
 
+webfinger@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d"
+  integrity sha512-PvvQ/k74HkC3q5G7bGu4VYeKDt3ePZMzT5qFPtEnOL8eyIU1/06OtDn9X5vlkQ23BlegA3eN89rDLiYUife3xQ==
+  dependencies:
+    step "0.0.x"
+    xml2js "0.1.x"
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -3626,7 +5958,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -3638,6 +5970,11 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+
 wordwrapjs@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f"
@@ -3667,6 +6004,26 @@ write-stream@~0.4.3:
   dependencies:
     readable-stream "~0.0.2"
 
+xml2js@0.1.x:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c"
+  integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA==
+  dependencies:
+    sax ">=0.1.1"
+
+xml2js@0.4.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
+
 xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -3713,7 +6070,22 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
+ylru@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
+  integrity sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+zlib@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0"
+  integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==

From 04ef7eeb9ce3f7e2e634259b891d9383892a6907 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 3 Mar 2023 10:03:33 +0000
Subject: [PATCH 264/273] Minor fixes - after removing axios altogether and
 adding a start script to make life easier for running from ts.

---
 packages/backend-core/src/auth/auth.ts   |  3 ++-
 packages/backend-core/src/environment.ts |  1 +
 packages/cli/src/environment.ts          |  1 +
 packages/cli/src/hosting/init.ts         |  4 +--
 packages/cli/src/hosting/update.ts       |  4 +--
 packages/cli/src/hosting/utils.ts        | 17 ++++++-------
 packages/cli/src/utils.ts                | 31 +++++++++++++++---------
 packages/cli/start.sh                    |  3 +++
 8 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100755 packages/cli/start.sh

diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 936d06ddff..7e6fe4bcee 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -28,6 +28,7 @@ import * as events from "../events"
 import * as configs from "../configs"
 import { clearCookie, getCookie } from "../utils"
 import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
+import env from "../environment"
 
 const refresh = require("passport-oauth2-refresh")
 export {
@@ -52,7 +53,7 @@ export const jwt = require("jsonwebtoken")
 _passport.use(new LocalStrategy(local.options, local.authenticate))
 if (jwtPassport.options.secretOrKey) {
   _passport.use(new JwtStrategy(jwtPassport.options, jwtPassport.authenticate))
-} else {
+} else if (!env.DISABLE_JWT_WARNING) {
   logAlert("No JWT Secret supplied, cannot configure JWT strategy")
 }
 
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index cd7bcca11d..8dc2cce487 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -94,6 +94,7 @@ const environment = {
   SMTP_HOST: process.env.SMTP_HOST,
   SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
+  DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
   /**
    * Enable to allow an admin user to login using a password.
    * This can be useful to prevent lockout when configuring SSO.
diff --git a/packages/cli/src/environment.ts b/packages/cli/src/environment.ts
index c8c8fe87e9..9d017f99b2 100644
--- a/packages/cli/src/environment.ts
+++ b/packages/cli/src/environment.ts
@@ -1,2 +1,3 @@
 process.env.NO_JS = "1"
 process.env.JS_BCRYPT = "1"
+process.env.DISABLE_JWT_WARNING = "1"
diff --git a/packages/cli/src/hosting/init.ts b/packages/cli/src/hosting/init.ts
index 7e0bb7269e..04943ce4e7 100644
--- a/packages/cli/src/hosting/init.ts
+++ b/packages/cli/src/hosting/init.ts
@@ -3,7 +3,7 @@ import { confirmation } from "../questions"
 import { captureEvent } from "../events"
 import * as makeFiles from "./makeFiles"
 import { parseEnv } from "../utils"
-import { checkDockerConfigured, downloadFiles } from "./utils"
+import { checkDockerConfigured, downloadDockerCompose } from "./utils"
 import { watchPlugins } from "./watch"
 import { generateUser } from "./genUser"
 import fetch from "node-fetch"
@@ -61,7 +61,7 @@ export async function init(opts: any) {
   })
   const config = await getInitConfig(type, isQuick, port)
   if (!isSingle) {
-    await downloadFiles()
+    await downloadDockerCompose()
     await makeFiles.makeEnv(config, silent)
   } else {
     await makeFiles.makeSingleCompose(config, silent)
diff --git a/packages/cli/src/hosting/update.ts b/packages/cli/src/hosting/update.ts
index b935488746..161cc04ae1 100644
--- a/packages/cli/src/hosting/update.ts
+++ b/packages/cli/src/hosting/update.ts
@@ -1,7 +1,7 @@
 import {
   checkDockerConfigured,
   checkInitComplete,
-  downloadFiles,
+  downloadDockerCompose,
   handleError,
   getServices,
 } from "./utils"
@@ -23,7 +23,7 @@ export async function update() {
     !isSingle &&
     (await confirmation("Do you wish to update you docker-compose.yaml?"))
   ) {
-    await downloadFiles()
+    await downloadDockerCompose()
   }
   await handleError(async () => {
     const status = await compose.ps()
diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts
index 80b224deb3..1abbe29b66 100644
--- a/packages/cli/src/hosting/utils.ts
+++ b/packages/cli/src/hosting/utils.ts
@@ -6,17 +6,16 @@ import yaml from "yaml"
 import { DockerCompose } from "./types"
 
 const ERROR_FILE = "docker-error.log"
-const FILE_URLS = [
-  "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml",
-]
+const COMPOSE_URL =
+  "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml"
 
-export async function downloadFiles() {
-  const promises = []
-  for (let url of FILE_URLS) {
-    const fileName = url.split("/").slice(-1)[0]
-    promises.push(downloadFile(url, `./${fileName}`))
+export async function downloadDockerCompose() {
+  const fileName = COMPOSE_URL.split("/").slice(-1)[0]
+  try {
+    await downloadFile(COMPOSE_URL, `./${fileName}`)
+  } catch (err) {
+    console.error(error(`Failed to retrieve compose file - ${err}`))
   }
-  await Promise.all(promises)
 }
 
 export async function checkDockerConfigured() {
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index 9634458c90..b9aa1ffce0 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -5,18 +5,27 @@ import { join } from "path"
 import fetch from "node-fetch"
 const progress = require("cli-progress")
 
-export async function downloadFile(url: string, filePath: string) {
-  filePath = path.resolve(filePath)
-  const writer = fs.createWriteStream(filePath)
-
-  const response = await fetch(url, {
-    method: "GET",
-  })
-  response.body?.pipe(writer)
-
+export function downloadFile(url: string, filePath: string) {
   return new Promise((resolve, reject) => {
-    writer.on("finish", resolve)
-    writer.on("error", reject)
+    filePath = path.resolve(filePath)
+    fetch(url, {
+      method: "GET",
+    })
+      .then(response => {
+        const writer = fs.createWriteStream(filePath)
+        if (response.body) {
+          response.body.pipe(writer)
+          response.body.on("end", resolve)
+          response.body.on("error", reject)
+        } else {
+          throw new Error(
+            `Unable to retrieve docker-compose file - ${response.status}`
+          )
+        }
+      })
+      .catch(err => {
+        throw err
+      })
   })
 }
 
diff --git a/packages/cli/start.sh b/packages/cli/start.sh
new file mode 100755
index 0000000000..9650f0bbfa
--- /dev/null
+++ b/packages/cli/start.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+dir="$(dirname -- "$(readlink -f "${BASH_SOURCE}")")"
+${dir}/node_modules/ts-node/dist/bin.js ${dir}/src/index.ts $@

From 96208a5e8a496bd36af78707f88cb013a1925012 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 3 Mar 2023 12:05:30 +0000
Subject: [PATCH 265/273] Fixing build issue.

---
 packages/backend-core/src/configs/configs.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index b628f64b13..b461497747 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -42,7 +42,9 @@ export async function getConfig<T extends Config>(
   }
 }
 
-export async function save(config: Config) {
+export async function save(
+  config: Config
+): Promise<{ id: string; rev: string }> {
   const db = context.getGlobalDB()
   return db.put(config)
 }

From 158b33883bd7db035f3ab6bcef168aad7735a808 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 3 Mar 2023 12:08:03 +0000
Subject: [PATCH 266/273] Fixing lint issue.

---
 packages/cli/src/hosting/utils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/src/hosting/utils.ts b/packages/cli/src/hosting/utils.ts
index 1abbe29b66..9e5bd367ed 100644
--- a/packages/cli/src/hosting/utils.ts
+++ b/packages/cli/src/hosting/utils.ts
@@ -67,6 +67,7 @@ export function getAppService(path: string) {
 }
 
 export function updateDockerComposeService(
+  // eslint-disable-next-line no-unused-vars
   updateFn: (service: DockerCompose) => void
 ) {
   const opts = ["docker-compose.yaml", "docker-compose.yml"]

From b44832965d435a933b3db7851c3b1bca36cb1dd2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 3 Mar 2023 13:08:36 +0000
Subject: [PATCH 267/273] Removing pro references.

---
 packages/cli/tsconfig.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 6a65126481..b60cb7eed3 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -9,7 +9,6 @@
       "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
-      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "ts-node": {
@@ -19,7 +18,6 @@
   "references": [
     { "path": "../types" },
     { "path": "../backend-core" },
-    { "path": "../../../budibase-pro/packages/pro" }
   ],
   "include": [
     "src/**/*",

From 486cb0004c81fd783f86557ad676c93c54c410ae Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 13:24:17 +0000
Subject: [PATCH 268/273] v2.3.18-alpha.30

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              | 10 +++++-----
 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, 33 insertions(+), 33 deletions(-)

diff --git a/lerna.json b/lerna.json
index 0fadf15477..a7927118a6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c0f5148728..c78292075a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.18-alpha.29",
+    "@budibase/types": "2.3.18-alpha.30",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4b39e9f91e..f59714c2e5 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.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "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.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.30",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 09c5f5fd7f..23f0104f95 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.29",
-    "@budibase/client": "2.3.18-alpha.29",
-    "@budibase/frontend-core": "2.3.18-alpha.29",
-    "@budibase/string-templates": "2.3.18-alpha.29",
+    "@budibase/bbui": "2.3.18-alpha.30",
+    "@budibase/client": "2.3.18-alpha.30",
+    "@budibase/frontend-core": "2.3.18-alpha.30",
+    "@budibase/string-templates": "2.3.18-alpha.30",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 91f95dca23..8c9a4f06fe 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.29",
-    "@budibase/string-templates": "2.3.18-alpha.29",
-    "@budibase/types": "2.3.18-alpha.29",
+    "@budibase/backend-core": "2.3.18-alpha.30",
+    "@budibase/string-templates": "2.3.18-alpha.30",
+    "@budibase/types": "2.3.18-alpha.30",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
     "commander": "7.1.0",
@@ -55,8 +55,8 @@
     "@swc/core": "^1.3.25",
     "@swc/jest": "^0.2.24",
     "@types/jest": "^29.4.0",
-    "@types/pouchdb": "^6.4.0",
     "@types/node-fetch": "2.6.1",
+    "@types/pouchdb": "^6.4.0",
     "copyfiles": "^2.4.1",
     "eslint": "^7.20.0",
     "renamer": "^4.0.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 90ef59874c..97c88873bd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "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.3.18-alpha.29",
-    "@budibase/frontend-core": "2.3.18-alpha.29",
-    "@budibase/string-templates": "2.3.18-alpha.29",
+    "@budibase/bbui": "2.3.18-alpha.30",
+    "@budibase/frontend-core": "2.3.18-alpha.30",
+    "@budibase/string-templates": "2.3.18-alpha.30",
     "@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 4f468211b1..b6de94c353 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.18-alpha.29",
+    "@budibase/bbui": "2.3.18-alpha.30",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f0e33631c2..0deb2123f7 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index ed6ca35fd1..59f97469ae 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.18-alpha.29",
-    "@budibase/client": "2.3.18-alpha.29",
+    "@budibase/backend-core": "2.3.18-alpha.30",
+    "@budibase/client": "2.3.18-alpha.30",
     "@budibase/pro": "2.3.18-alpha.29",
-    "@budibase/string-templates": "2.3.18-alpha.29",
-    "@budibase/types": "2.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.30",
+    "@budibase/types": "2.3.18-alpha.30",
     "@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 e8d7702075..00c8655fd9 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "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 7b5603e741..61f32e140c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "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 ad6c9e1191..2d378357f3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.18-alpha.29",
+  "version": "2.3.18-alpha.30",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.18-alpha.29",
+    "@budibase/backend-core": "2.3.18-alpha.30",
     "@budibase/pro": "2.3.18-alpha.29",
-    "@budibase/string-templates": "2.3.18-alpha.29",
-    "@budibase/types": "2.3.18-alpha.29",
+    "@budibase/string-templates": "2.3.18-alpha.30",
+    "@budibase/types": "2.3.18-alpha.30",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 6acec42ae53d694a2f8de1b5e9dd3d7814010603 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 13:27:40 +0000
Subject: [PATCH 269/273] Update pro version to 2.3.18-alpha.30

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 59f97469ae..be2cfb9977 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.18-alpha.30",
     "@budibase/client": "2.3.18-alpha.30",
-    "@budibase/pro": "2.3.18-alpha.29",
+    "@budibase/pro": "2.3.18-alpha.30",
     "@budibase/string-templates": "2.3.18-alpha.30",
     "@budibase/types": "2.3.18-alpha.30",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index eda16a9955..a677ce4c69 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.29.tgz#ddae082878a80dc64430afdbc221d47d7cba91ed"
-  integrity sha512-b8CyVjJxXdRkfEJ9Bd8eu53p0+92VZJaxUTv8aVqQfZTu61iqvqyaiNVRcPZb/PxyJHEAD7cGv+8ZD65LLCK1A==
+"@budibase/backend-core@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.30.tgz#6c04637c190df565580980e6b26dee7e80ebd001"
+  integrity sha512-NcR6Qjlw2R6gea61R/6dxDdSizuZO6kRQbVzC/Lcdp1WX/gqqUaTuwwx/qZujYAJcY7yVVG3VihD6shMjM/Jcg==
   dependencies:
-    "@budibase/nano" "10.1.1"
+    "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.29"
+    "@budibase/types" "2.3.18-alpha.30"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1392,10 +1392,10 @@
     to-gfm-code-block "^0.1.1"
     year "^0.2.1"
 
-"@budibase/nano@10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
-  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+"@budibase/nano@10.1.2":
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.2.tgz#10fae5a1ab39be6a81261f40e7b7ec6d21cbdd4a"
+  integrity sha512-1w+YN2n/M5aZ9hBKCP4NEjdQbT8BfCLRizkdvm0Je665eEHw3aE1hvo8mon9Ro9QuDdxj1DfDMMFnym6/QUwpQ==
   dependencies:
     "@types/tough-cookie" "^4.0.2"
     axios "^1.1.3"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.29.tgz#55949d72ebc10958a62ca41e4875c749f017117f"
-  integrity sha512-ZDI8XcUQd7FRwD5h8Ho0zTycqhbEq5ISoVyMTwGEHzSMd/ipBup7KlWvGLgO1RJFlWg7HfEWsDRNHMHMtiw57Q==
+"@budibase/pro@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.30.tgz#24b87f0ac67332fb631a4b47c6a4bfa4107d0240"
+  integrity sha512-dhG7+PSlr7TReXtKQm8DmLKSZgCImt2a0tNSbkftercV3ZP7df9qmqEq7RnY7dQOlVteuF2JPKtIL9HPoksXqw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.29"
+    "@budibase/backend-core" "2.3.18-alpha.30"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.29"
+    "@budibase/types" "2.3.18-alpha.30"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.29.tgz#cdd07f08d4f45f9fb8cf221bd6d2ad808d6136e3"
-  integrity sha512-+tfMD2F+Ko0IqUOsYB1MZuKnFzTZ0yIkYjjI/pPmDrSGrenuXKSr7jrpAOyl7UCacd62+hWzfhqV8Ga1JhKgrw==
+"@budibase/types@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.30.tgz#9fdecace01003c84c537dead309c206a74c6e11c"
+  integrity sha512-4PcmxfWhsxZy7qA1X8YDDl+qXdwi54H3CKOBrVPt/pLIomUhOPZqatQGbhwIWF4j1CKEdalsAilwOC5SkxrWjA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2d378357f3..a82c2f37f3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.18-alpha.30",
-    "@budibase/pro": "2.3.18-alpha.29",
+    "@budibase/pro": "2.3.18-alpha.30",
     "@budibase/string-templates": "2.3.18-alpha.30",
     "@budibase/types": "2.3.18-alpha.30",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index e21c43d53b..b64c2c8087 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.29.tgz#ddae082878a80dc64430afdbc221d47d7cba91ed"
-  integrity sha512-b8CyVjJxXdRkfEJ9Bd8eu53p0+92VZJaxUTv8aVqQfZTu61iqvqyaiNVRcPZb/PxyJHEAD7cGv+8ZD65LLCK1A==
+"@budibase/backend-core@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.30.tgz#6c04637c190df565580980e6b26dee7e80ebd001"
+  integrity sha512-NcR6Qjlw2R6gea61R/6dxDdSizuZO6kRQbVzC/Lcdp1WX/gqqUaTuwwx/qZujYAJcY7yVVG3VihD6shMjM/Jcg==
   dependencies:
-    "@budibase/nano" "10.1.1"
+    "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.29"
+    "@budibase/types" "2.3.18-alpha.30"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -539,10 +539,10 @@
     to-gfm-code-block "^0.1.1"
     year "^0.2.1"
 
-"@budibase/nano@10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
-  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+"@budibase/nano@10.1.2":
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.2.tgz#10fae5a1ab39be6a81261f40e7b7ec6d21cbdd4a"
+  integrity sha512-1w+YN2n/M5aZ9hBKCP4NEjdQbT8BfCLRizkdvm0Je665eEHw3aE1hvo8mon9Ro9QuDdxj1DfDMMFnym6/QUwpQ==
   dependencies:
     "@types/tough-cookie" "^4.0.2"
     axios "^1.1.3"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.29.tgz#55949d72ebc10958a62ca41e4875c749f017117f"
-  integrity sha512-ZDI8XcUQd7FRwD5h8Ho0zTycqhbEq5ISoVyMTwGEHzSMd/ipBup7KlWvGLgO1RJFlWg7HfEWsDRNHMHMtiw57Q==
+"@budibase/pro@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.30.tgz#24b87f0ac67332fb631a4b47c6a4bfa4107d0240"
+  integrity sha512-dhG7+PSlr7TReXtKQm8DmLKSZgCImt2a0tNSbkftercV3ZP7df9qmqEq7RnY7dQOlVteuF2JPKtIL9HPoksXqw==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.29"
+    "@budibase/backend-core" "2.3.18-alpha.30"
     "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.29"
+    "@budibase/types" "2.3.18-alpha.30"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.18-alpha.29":
-  version "2.3.18-alpha.29"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.29.tgz#cdd07f08d4f45f9fb8cf221bd6d2ad808d6136e3"
-  integrity sha512-+tfMD2F+Ko0IqUOsYB1MZuKnFzTZ0yIkYjjI/pPmDrSGrenuXKSr7jrpAOyl7UCacd62+hWzfhqV8Ga1JhKgrw==
+"@budibase/types@2.3.18-alpha.30":
+  version "2.3.18-alpha.30"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.18-alpha.30.tgz#9fdecace01003c84c537dead309c206a74c6e11c"
+  integrity sha512-4PcmxfWhsxZy7qA1X8YDDl+qXdwi54H3CKOBrVPt/pLIomUhOPZqatQGbhwIWF4j1CKEdalsAilwOC5SkxrWjA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From 03964345adda5fdf63c2e3382a89c335265acb9d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 16:56:19 +0000
Subject: [PATCH 270/273] v2.3.21-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 1aee9f2bad..4ba9e95446 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index df015b97cc..bb4ea26902 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.20",
+    "@budibase/types": "2.3.21-alpha.0",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 5668cadb01..478926eebb 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.3.20",
+  "version": "2.3.21-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "^2.3.20",
+    "@budibase/string-templates": "2.3.21-alpha.0",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 775f43df0d..46a1f4e049 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.20",
-    "@budibase/client": "^2.3.20",
-    "@budibase/frontend-core": "^2.3.20",
-    "@budibase/string-templates": "^2.3.20",
+    "@budibase/bbui": "2.3.21-alpha.0",
+    "@budibase/client": "2.3.21-alpha.0",
+    "@budibase/frontend-core": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e727c45d34..29e9a65c89 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.3.20",
-    "@budibase/string-templates": "^2.3.20",
-    "@budibase/types": "^2.3.20",
+    "@budibase/backend-core": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/types": "2.3.21-alpha.0",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 79ef96bd4b..cd17a97161 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.3.20",
-    "@budibase/frontend-core": "^2.3.20",
-    "@budibase/string-templates": "^2.3.20",
+    "@budibase/bbui": "2.3.21-alpha.0",
+    "@budibase/frontend-core": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 873c37e448..630c7e310a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.3.20",
+    "@budibase/bbui": "2.3.21-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index dc98d62eb4..f560f42ab5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 12b02d8d66..a2c1af2f88 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.3.20",
-    "@budibase/client": "^2.3.20",
+    "@budibase/backend-core": "2.3.21-alpha.0",
+    "@budibase/client": "2.3.21-alpha.0",
     "@budibase/pro": "2.3.20",
-    "@budibase/string-templates": "^2.3.20",
-    "@budibase/types": "^2.3.20",
+    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/types": "2.3.21-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 4381fbf553..0aa9d4aa23 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 04eb024cd1..4c9ca2919e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b4c5f6f66c..b2d08ee62c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.20",
+  "version": "2.3.21-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.20",
+    "@budibase/backend-core": "2.3.21-alpha.0",
     "@budibase/pro": "2.3.20",
-    "@budibase/string-templates": "^2.3.20",
-    "@budibase/types": "^2.3.20",
+    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/types": "2.3.21-alpha.0",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 2377f447746944c6ea3fce7d646e628a143d4c35 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 16:59:04 +0000
Subject: [PATCH 271/273] Update pro version to 2.3.21-alpha.0

---
 packages/server/package.json |   2 +-
 packages/server/yarn.lock    | 309 ++++++++++++++++++++++++++++++++---
 packages/worker/package.json |   2 +-
 packages/worker/yarn.lock    |  62 +++----
 4 files changed, 311 insertions(+), 64 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index a2c1af2f88..0dced63547 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.21-alpha.0",
     "@budibase/client": "2.3.21-alpha.0",
-    "@budibase/pro": "2.3.20",
+    "@budibase/pro": "2.3.21-alpha.0",
     "@budibase/string-templates": "2.3.21-alpha.0",
     "@budibase/types": "2.3.21-alpha.0",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4439c6037a..4bd7bd8a3a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,13 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.20":
-  version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c"
-  integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA==
+"@budibase/backend-core@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.0.tgz#7d267b2153c09a82cf6dc1b37a1d5142fcd1a1a4"
+  integrity sha512-zD/LUjQfAZw+A4/mrmu/cFDsm8padMcbUA62bnjLv7/L5gKfGABSpJF8BhIxgv1VZUNt/Ezoo72fiBUXPMWq/g==
   dependencies:
-    "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.20"
+    "@budibase/nano" "10.1.2"
+    "@budibase/pouchdb-replication-stream" "1.2.10"
+    "@budibase/types" "2.3.21-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1309,7 +1310,6 @@
     posthog-node "1.3.0"
     pouchdb "7.3.0"
     pouchdb-find "7.2.2"
-    pouchdb-replication-stream "1.2.9"
     redlock "4.2.0"
     sanitize-s3-objectkey "0.0.1"
     semver "7.3.7"
@@ -1367,10 +1367,35 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/nano@10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038"
-  integrity sha512-kbMIzMkjVtl+xI0UPwVU0/pn8/ccxTyfzwBz6Z+ZiN2oUSb0fJCe0qwA6o8dxwSa8nZu4MbGAeMJl3CJndmWtA==
+"@budibase/handlebars-helpers@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841"
+  integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ==
+  dependencies:
+    array-sort "^1.0.0"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    for-in "^1.0.2"
+    get-object "^0.2.0"
+    get-value "^3.0.1"
+    handlebars "^4.7.7"
+    handlebars-utils "^1.0.6"
+    has-value "^2.0.2"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.1"
+    kind-of "^6.0.3"
+    micromatch "^3.1.5"
+    relative "^3.0.2"
+    striptags "^3.1.1"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
+"@budibase/nano@10.1.2":
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.2.tgz#10fae5a1ab39be6a81261f40e7b7ec6d21cbdd4a"
+  integrity sha512-1w+YN2n/M5aZ9hBKCP4NEjdQbT8BfCLRizkdvm0Je665eEHw3aE1hvo8mon9Ro9QuDdxj1DfDMMFnym6/QUwpQ==
   dependencies:
     "@types/tough-cookie" "^4.0.2"
     axios "^1.1.3"
@@ -1379,18 +1404,33 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-"@budibase/pro@2.3.20":
-  version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e"
-  integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw==
+"@budibase/pouchdb-replication-stream@1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
+  integrity sha512-1zeorOwbelZ7HF5vFB+pKE8Mnh31om8k1M6T3AZXVULYTHLsyJrMTozSv5CJ1P8ZfOIJab09HDzCXDh2icFekg==
   dependencies:
-    "@budibase/backend-core" "2.3.20"
-    "@budibase/types" "2.3.20"
+    argsarray "0.0.1"
+    inherits "^2.0.3"
+    lodash.pick "^4.0.0"
+    ndjson "^1.4.3"
+    pouch-stream "^0.4.0"
+    pouchdb-promise "^6.0.4"
+    through2 "^2.0.0"
+
+"@budibase/pro@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.0.tgz#a7a75cf3c776d5a18989b49b84ac28b11124f520"
+  integrity sha512-UobHSgLYbpvYVe63D1g1If/Payg09e45bgturDGRajNFc8qDQPH7MozXSha/Hf86HMmardRSyBcjFDLj8A5T9A==
+  dependencies:
+    "@budibase/backend-core" "2.3.21-alpha.0"
+    "@budibase/string-templates" "2.3.20"
+    "@budibase/types" "2.3.21-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
     jsonwebtoken "8.5.1"
     lru-cache "^7.14.1"
+    memorystream "^0.3.1"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
@@ -1411,10 +1451,22 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@2.3.20", "@budibase/types@^2.3.20":
+"@budibase/string-templates@2.3.20":
   version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126"
-  integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w==
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588"
+  integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
+"@budibase/types@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.0.tgz#f0a7ad9d92c5e82e66561a5fef11beb281a4910b"
+  integrity sha512-U4rHHOsHc1aMVxwjd/pfqMFLGMFBdgQjUuizH0ONOR1vKWfLED4zZg4cSPLq1w92xZ3vY92caocdtnZDbWNoTg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
@@ -4217,7 +4269,7 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -4264,6 +4316,15 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
 
+array-sort@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
+  dependencies:
+    default-compare "^1.0.0"
+    get-value "^2.0.6"
+    kind-of "^5.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -4407,6 +4468,13 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
+autolinker@~0.28.0:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
+  integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ==
+  dependencies:
+    gulp-header "^1.7.1"
+
 available-typed-arrays@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
@@ -5487,6 +5555,13 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-with-sourcemaps@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
+  dependencies:
+    source-map "^0.6.1"
+
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -5928,6 +6003,13 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
+  dependencies:
+    kind-of "^5.0.2"
+
 default-shell@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc"
@@ -6404,6 +6486,11 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+ent@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -7604,6 +7691,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-object@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
+  integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ==
+  dependencies:
+    is-number "^2.0.2"
+    isobject "^0.2.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -7666,6 +7761,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+get-value@^3.0.0, get-value@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8"
+  integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA==
+  dependencies:
+    isobject "^3.0.1"
+
 getopts@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4"
@@ -7953,7 +8055,24 @@ gtoken@^5.0.4:
     google-p12-pem "^3.1.3"
     jws "^4.0.0"
 
-handlebars@^4.7.7:
+gulp-header@^1.7.1:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84"
+  integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==
+  dependencies:
+    concat-with-sourcemaps "*"
+    lodash.template "^4.4.0"
+    through2 "^2.0.0"
+
+handlebars-utils@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
+  integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw==
+  dependencies:
+    kind-of "^6.0.0"
+    typeof-article "^0.1.1"
+
+handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -8047,6 +8166,14 @@ has-value@^1.0.0:
     has-values "^1.0.0"
     isobject "^3.0.0"
 
+has-value@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658"
+  integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA==
+  dependencies:
+    get-value "^3.0.0"
+    has-values "^2.0.1"
+
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
@@ -8060,6 +8187,13 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d"
+  integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w==
+  dependencies:
+    kind-of "^6.0.2"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
@@ -8072,6 +8206,16 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+helper-md@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f"
+  integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q==
+  dependencies:
+    ent "^2.2.0"
+    extend-shallow "^2.0.1"
+    fs-exists-sync "^0.1.0"
+    remarkable "^1.6.2"
+
 hexoid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
@@ -8106,6 +8250,14 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
+html-tag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed"
+  integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g==
+  dependencies:
+    is-self-closing "^1.0.1"
+    kind-of "^6.0.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -8582,6 +8734,13 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-even@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06"
+  integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg==
+  dependencies:
+    is-odd "^0.1.2"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -8688,6 +8847,13 @@ is-number-object@^1.0.4:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-number@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -8710,6 +8876,13 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
+is-odd@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7"
+  integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw==
+  dependencies:
+    is-number "^3.0.0"
+
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -8750,6 +8923,13 @@ is-retry-allowed@^2.2.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d"
   integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==
 
+is-self-closing@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4"
+  integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg==
+  dependencies:
+    self-closing-tags "^1.0.1"
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -8865,6 +9045,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isobject@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e"
+  integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -10059,7 +10244,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
@@ -10073,12 +10258,12 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -10505,6 +10690,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash._reinterpolate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -10615,6 +10805,21 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
+lodash.template@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
+  dependencies:
+    lodash._reinterpolate "^3.0.0"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -10630,7 +10835,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -10887,7 +11092,7 @@ methods@^1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -13083,6 +13288,21 @@ relative-microtime@^2.0.0:
   resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b"
   integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA==
 
+relative@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f"
+  integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==
+  dependencies:
+    isobject "^2.0.0"
+
+remarkable@^1.6.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
+  integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "~0.28.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -13431,6 +13651,11 @@ seek-bzip@^1.0.5:
   dependencies:
     commander "^2.8.1"
 
+self-closing-tags@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d"
+  integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA==
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -14219,6 +14444,11 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+striptags@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
+  integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==
+
 style-loader@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
@@ -14703,6 +14933,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-gfm-code-block@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
+  integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg==
+
 to-json-schema@0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
@@ -14971,6 +15206,13 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typeof-article@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af"
+  integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw==
+  dependencies:
+    kind-of "^3.1.0"
+
 typeof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
@@ -15331,6 +15573,14 @@ vm2@3.9.11:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
+vm2@^3.9.4:
+  version "3.9.14"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734"
+  integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-walk "^8.2.0"
+
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -15892,6 +16142,11 @@ yauzl@^2.4.2:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+year@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0"
+  integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==
+
 ylru@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b2d08ee62c..e01fb005b9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.21-alpha.0",
-    "@budibase/pro": "2.3.20",
+    "@budibase/pro": "2.3.21-alpha.0",
     "@budibase/string-templates": "2.3.21-alpha.0",
     "@budibase/types": "2.3.21-alpha.0",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index c17daf6288..01f6910ebf 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,24 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-<<<<<<< HEAD
-"@budibase/backend-core@2.3.18-alpha.30":
-  version "2.3.18-alpha.30"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.18-alpha.30.tgz#6c04637c190df565580980e6b26dee7e80ebd001"
-  integrity sha512-NcR6Qjlw2R6gea61R/6dxDdSizuZO6kRQbVzC/Lcdp1WX/gqqUaTuwwx/qZujYAJcY7yVVG3VihD6shMjM/Jcg==
+"@budibase/backend-core@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.0.tgz#7d267b2153c09a82cf6dc1b37a1d5142fcd1a1a4"
+  integrity sha512-zD/LUjQfAZw+A4/mrmu/cFDsm8padMcbUA62bnjLv7/L5gKfGABSpJF8BhIxgv1VZUNt/Ezoo72fiBUXPMWq/g==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.18-alpha.30"
-=======
-"@budibase/backend-core@2.3.20":
-  version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.20.tgz#085f3763cc3e821a276f025fea04980ff2c7c87c"
-  integrity sha512-nD73QHQk0mvRjscyTuWg1S97GVeexJc8xNqrzKSNvBOk0btaLCYgTukYOUCMHzw+sNLnRKFumL98qZDNVcmFgA==
-  dependencies:
-    "@budibase/nano" "10.1.1"
-    "@budibase/types" "^2.3.20"
->>>>>>> 6c7e27b0849438c7d0d11a82fdd712a9b50c4129
+    "@budibase/types" "2.3.21-alpha.0"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -561,7 +551,6 @@
     qs "^6.11.0"
     tough-cookie "^4.1.2"
 
-<<<<<<< HEAD
 "@budibase/pouchdb-replication-stream@1.2.10":
   version "1.2.10"
   resolved "https://registry.yarnpkg.com/@budibase/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.10.tgz#4100df2effd7c823edadddcdbdc380f6827eebf5"
@@ -575,23 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.18-alpha.30":
-  version "2.3.18-alpha.30"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.18-alpha.30.tgz#24b87f0ac67332fb631a4b47c6a4bfa4107d0240"
-  integrity sha512-dhG7+PSlr7TReXtKQm8DmLKSZgCImt2a0tNSbkftercV3ZP7df9qmqEq7RnY7dQOlVteuF2JPKtIL9HPoksXqw==
+"@budibase/pro@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.0.tgz#a7a75cf3c776d5a18989b49b84ac28b11124f520"
+  integrity sha512-UobHSgLYbpvYVe63D1g1If/Payg09e45bgturDGRajNFc8qDQPH7MozXSha/Hf86HMmardRSyBcjFDLj8A5T9A==
   dependencies:
-    "@budibase/backend-core" "2.3.18-alpha.30"
-    "@budibase/string-templates" "2.3.18-alpha.14"
-    "@budibase/types" "2.3.18-alpha.30"
-=======
-"@budibase/pro@2.3.20":
-  version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.20.tgz#d71e3bebd4e03ded95e2397a06ef5d00c603f25e"
-  integrity sha512-1M0dJOXl1fu+R1BcGS2t4QV1jabTGh+wwe0bTHSqkK4UaJfIP52OnRgtswzduV+fB2B3UraF3N+Mtq2x2+Bmqw==
-  dependencies:
-    "@budibase/backend-core" "2.3.20"
-    "@budibase/types" "2.3.20"
->>>>>>> 6c7e27b0849438c7d0d11a82fdd712a9b50c4129
+    "@budibase/backend-core" "2.3.21-alpha.0"
+    "@budibase/string-templates" "2.3.20"
+    "@budibase/types" "2.3.21-alpha.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -600,10 +580,22 @@
     memorystream "^0.3.1"
     node-fetch "^2.6.1"
 
-"@budibase/types@2.3.20", "@budibase/types@^2.3.20":
+"@budibase/string-templates@2.3.20":
   version "2.3.20"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.20.tgz#fc81a28623eb47a7790da40efb032119f8db5126"
-  integrity sha512-aHuAEEiJxX9sP9heu4vQQoAqmzvC8MLM5dH3OATVBxeJz0D79NnEwLVRHGk5fqxaiIlRpCaVSkatwkHXxf/h8w==
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588"
+  integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg==
+  dependencies:
+    "@budibase/handlebars-helpers" "^0.11.8"
+    dayjs "^1.10.4"
+    handlebars "^4.7.6"
+    handlebars-utils "^1.0.6"
+    lodash "^4.17.20"
+    vm2 "^3.9.4"
+
+"@budibase/types@2.3.21-alpha.0":
+  version "2.3.21-alpha.0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.0.tgz#f0a7ad9d92c5e82e66561a5fef11beb281a4910b"
+  integrity sha512-U4rHHOsHc1aMVxwjd/pfqMFLGMFBdgQjUuizH0ONOR1vKWfLED4zZg4cSPLq1w92xZ3vY92caocdtnZDbWNoTg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"

From e043bb4ea89beb0d9229f8bad9aee0212d838822 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 22:33:27 +0000
Subject: [PATCH 272/273] v2.3.21-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  4 ++--
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  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 4ba9e95446..67b7904a53 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bb4ea26902..421304809c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.3.21-alpha.0",
+    "@budibase/types": "2.3.21-alpha.1",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 478926eebb..502d32c7b0 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.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.1",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 46a1f4e049..acc537e593 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.0",
-    "@budibase/client": "2.3.21-alpha.0",
-    "@budibase/frontend-core": "2.3.21-alpha.0",
-    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/bbui": "2.3.21-alpha.1",
+    "@budibase/client": "2.3.21-alpha.1",
+    "@budibase/frontend-core": "2.3.21-alpha.1",
+    "@budibase/string-templates": "2.3.21-alpha.1",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 29e9a65c89..bfced9355d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.3.21-alpha.0",
-    "@budibase/string-templates": "2.3.21-alpha.0",
-    "@budibase/types": "2.3.21-alpha.0",
+    "@budibase/backend-core": "2.3.21-alpha.1",
+    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/types": "2.3.21-alpha.1",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index cd17a97161..067f25e790 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.0",
-    "@budibase/frontend-core": "2.3.21-alpha.0",
-    "@budibase/string-templates": "2.3.21-alpha.0",
+    "@budibase/bbui": "2.3.21-alpha.1",
+    "@budibase/frontend-core": "2.3.21-alpha.1",
+    "@budibase/string-templates": "2.3.21-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 630c7e310a..90040e88c3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.3.21-alpha.0",
+    "@budibase/bbui": "2.3.21-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f560f42ab5..4745854121 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 0dced63547..5c74067468 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.21-alpha.0",
-    "@budibase/client": "2.3.21-alpha.0",
+    "@budibase/backend-core": "2.3.21-alpha.1",
+    "@budibase/client": "2.3.21-alpha.1",
     "@budibase/pro": "2.3.21-alpha.0",
-    "@budibase/string-templates": "2.3.21-alpha.0",
-    "@budibase/types": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/types": "2.3.21-alpha.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 0aa9d4aa23..5e3fcecbcb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 4c9ca2919e..c4b238276d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e01fb005b9..5caa3d06e5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.21-alpha.0",
+  "version": "2.3.21-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.3.21-alpha.0",
+    "@budibase/backend-core": "2.3.21-alpha.1",
     "@budibase/pro": "2.3.21-alpha.0",
-    "@budibase/string-templates": "2.3.21-alpha.0",
-    "@budibase/types": "2.3.21-alpha.0",
+    "@budibase/string-templates": "2.3.21-alpha.1",
+    "@budibase/types": "2.3.21-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 56a188bb64770bf4e887b04a2a4505b16eb89f04 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 3 Mar 2023 22:36:42 +0000
Subject: [PATCH 273/273] Update pro version to 2.3.21-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 5c74067468..d9b1e1a9a1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "2.3.21-alpha.1",
     "@budibase/client": "2.3.21-alpha.1",
-    "@budibase/pro": "2.3.21-alpha.0",
+    "@budibase/pro": "2.3.21-alpha.1",
     "@budibase/string-templates": "2.3.21-alpha.1",
     "@budibase/types": "2.3.21-alpha.1",
     "@bull-board/api": "3.7.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 4bd7bd8a3a..b3996e5a3c 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.0.tgz#7d267b2153c09a82cf6dc1b37a1d5142fcd1a1a4"
-  integrity sha512-zD/LUjQfAZw+A4/mrmu/cFDsm8padMcbUA62bnjLv7/L5gKfGABSpJF8BhIxgv1VZUNt/Ezoo72fiBUXPMWq/g==
+"@budibase/backend-core@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.1.tgz#151eaee7f30a3c9bf8e5ab3c30bdbb67a34f9b26"
+  integrity sha512-YyclBgY7YGjlzjI2fNRSj4vJfudXB+1KjZBvZ5EhGKvPZDqhIE+I+7nXRxxFxTtEe0m+p673KjntgREybXPZaQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.21-alpha.0"
+    "@budibase/types" "2.3.21-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.0.tgz#a7a75cf3c776d5a18989b49b84ac28b11124f520"
-  integrity sha512-UobHSgLYbpvYVe63D1g1If/Payg09e45bgturDGRajNFc8qDQPH7MozXSha/Hf86HMmardRSyBcjFDLj8A5T9A==
+"@budibase/pro@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.1.tgz#c7ccff06c36b7dafbdaafdfb525c2ca72ebfd050"
+  integrity sha512-oxOM+0le4SNk2b9jI9sym8qBwi4Uu1soJG68TSdoLluHXzQsXJNrwueO5FY8PS+50Y2HmeIQPCVw2fGWRC7Cjg==
   dependencies:
-    "@budibase/backend-core" "2.3.21-alpha.0"
+    "@budibase/backend-core" "2.3.21-alpha.1"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21-alpha.0"
+    "@budibase/types" "2.3.21-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.0.tgz#f0a7ad9d92c5e82e66561a5fef11beb281a4910b"
-  integrity sha512-U4rHHOsHc1aMVxwjd/pfqMFLGMFBdgQjUuizH0ONOR1vKWfLED4zZg4cSPLq1w92xZ3vY92caocdtnZDbWNoTg==
+"@budibase/types@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.1.tgz#d606f5f8d47ad5e50f80b09ae0434802b810c041"
+  integrity sha512-55Hk7/s7IV4+u1IjuKwlHKPKutsKbHbNbKPK0FStiZgCMG7/+GPysRWdSY9VgLL9XPHOlQ5dtI6jzuWU7ihH/g==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5caa3d06e5..913f0378bf 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -37,7 +37,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "2.3.21-alpha.1",
-    "@budibase/pro": "2.3.21-alpha.0",
+    "@budibase/pro": "2.3.21-alpha.1",
     "@budibase/string-templates": "2.3.21-alpha.1",
     "@budibase/types": "2.3.21-alpha.1",
     "@koa/router": "8.0.8",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 01f6910ebf..0b5f083bb4 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.0.tgz#7d267b2153c09a82cf6dc1b37a1d5142fcd1a1a4"
-  integrity sha512-zD/LUjQfAZw+A4/mrmu/cFDsm8padMcbUA62bnjLv7/L5gKfGABSpJF8BhIxgv1VZUNt/Ezoo72fiBUXPMWq/g==
+"@budibase/backend-core@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.21-alpha.1.tgz#151eaee7f30a3c9bf8e5ab3c30bdbb67a34f9b26"
+  integrity sha512-YyclBgY7YGjlzjI2fNRSj4vJfudXB+1KjZBvZ5EhGKvPZDqhIE+I+7nXRxxFxTtEe0m+p673KjntgREybXPZaQ==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.3.21-alpha.0"
+    "@budibase/types" "2.3.21-alpha.1"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.0.tgz#a7a75cf3c776d5a18989b49b84ac28b11124f520"
-  integrity sha512-UobHSgLYbpvYVe63D1g1If/Payg09e45bgturDGRajNFc8qDQPH7MozXSha/Hf86HMmardRSyBcjFDLj8A5T9A==
+"@budibase/pro@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.21-alpha.1.tgz#c7ccff06c36b7dafbdaafdfb525c2ca72ebfd050"
+  integrity sha512-oxOM+0le4SNk2b9jI9sym8qBwi4Uu1soJG68TSdoLluHXzQsXJNrwueO5FY8PS+50Y2HmeIQPCVw2fGWRC7Cjg==
   dependencies:
-    "@budibase/backend-core" "2.3.21-alpha.0"
+    "@budibase/backend-core" "2.3.21-alpha.1"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.3.21-alpha.0"
+    "@budibase/types" "2.3.21-alpha.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.3.21-alpha.0":
-  version "2.3.21-alpha.0"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.0.tgz#f0a7ad9d92c5e82e66561a5fef11beb281a4910b"
-  integrity sha512-U4rHHOsHc1aMVxwjd/pfqMFLGMFBdgQjUuizH0ONOR1vKWfLED4zZg4cSPLq1w92xZ3vY92caocdtnZDbWNoTg==
+"@budibase/types@2.3.21-alpha.1":
+  version "2.3.21-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.21-alpha.1.tgz#d606f5f8d47ad5e50f80b09ae0434802b810c041"
+  integrity sha512-55Hk7/s7IV4+u1IjuKwlHKPKutsKbHbNbKPK0FStiZgCMG7/+GPysRWdSY9VgLL9XPHOlQ5dtI6jzuWU7ihH/g==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"