From af48549e099b62a130e4ddeaa3dbc1236fd2ed56 Mon Sep 17 00:00:00 2001
From: andz-bb <andrew.thompson@budibase.com>
Date: Thu, 27 Apr 2023 16:06:57 +0100
Subject: [PATCH 01/40] fix typo in prompt user modal default text

---
 packages/client/src/utils/buttonActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 895584b782..5a3842f9a4 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -384,7 +384,7 @@ const confirmTextMap = {
   ["Save Row"]: "Are you sure you want to save this row?",
   ["Execute Query"]: "Are you sure you want to execute this query?",
   ["Trigger Automation"]: "Are you sure you want to trigger this automation?",
-  ["Prompt User"]: "Are you sure you want to contiune?",
+  ["Prompt User"]: "Are you sure you want to continue?",
 }
 
 /**

From b07e5095e950be18bafc69103d8c98dd1b5d392c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:13:40 +0100
Subject: [PATCH 02/40] Increase support for lower resolutions in the grid UI
 by using tooltips instead of text for some buttons at low horizontal
 breakpoints

---
 .../buttons/ExistingRelationshipButton.svelte          |  2 +-
 .../components/grid/controls/ColumnWidthButton.svelte  |  7 ++++---
 .../components/grid/controls/HideColumnsButton.svelte  |  7 ++++---
 .../components/grid/controls/RowHeightButton.svelte    |  7 ++++---
 .../src/components/grid/controls/SortButton.svelte     |  7 ++++---
 .../src/components/grid/layout/Grid.svelte             |  5 +++--
 .../frontend-core/src/components/grid/stores/ui.js     | 10 ++++++++++
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index 3d837a54f0..0f4bafb001 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -39,7 +39,7 @@
 {#if datasource}
   <div>
     <ActionButton icon="DataCorrelated" primary quiet on:click={modal.show}>
-      Define existing relationship
+      Define relationship
     </ActionButton>
   </div>
   <Modal bind:this={modal}>
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte
index 754aebbb51..5ffd968d30 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte
@@ -3,7 +3,7 @@
   import { ActionButton, Popover } from "@budibase/bbui"
   import { DefaultColumnWidth } from "../lib/constants"
 
-  const { stickyColumn, columns } = getContext("grid")
+  const { stickyColumn, columns, compact } = getContext("grid")
   const smallSize = 120
   const mediumSize = DefaultColumnWidth
   const largeSize = DefaultColumnWidth * 1.5
@@ -59,12 +59,13 @@
     on:click={() => (open = !open)}
     selected={open}
     disabled={!allCols.length}
+    tooltip={$compact ? "Width" : null}
   >
-    Width
+    {$compact ? "" : "Width"}
   </ActionButton>
 </div>
 
-<Popover bind:open {anchor} align="left">
+<Popover bind:open {anchor} align={$compact ? "right" : "left"}>
   <div class="content">
     {#each sizeOptions as option}
       <ActionButton
diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
index 30904fbebc..79a773347b 100644
--- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { ActionButton, Popover, Toggle } from "@budibase/bbui"
 
-  const { columns, stickyColumn } = getContext("grid")
+  const { columns, stickyColumn, compact } = getContext("grid")
 
   let open = false
   let anchor
@@ -47,12 +47,13 @@
     on:click={() => (open = !open)}
     selected={open || anyHidden}
     disabled={!$columns.length}
+    tooltip={$compact ? "Columns" : ""}
   >
-    Columns
+    {$compact ? "" : "Columns"}
   </ActionButton>
 </div>
 
-<Popover bind:open {anchor} align="left">
+<Popover bind:open {anchor} align={$compact ? "right" : "left"}>
   <div class="content">
     <div class="columns">
       {#if $stickyColumn}
diff --git a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte b/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte
index e9045ac5c7..e9617ce0b6 100644
--- a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte
@@ -7,7 +7,7 @@
     SmallRowHeight,
   } from "../lib/constants"
 
-  const { rowHeight, columns, table } = getContext("grid")
+  const { rowHeight, columns, table, compact } = getContext("grid")
   const sizeOptions = [
     {
       label: "Small",
@@ -41,12 +41,13 @@
     size="M"
     on:click={() => (open = !open)}
     selected={open}
+    tooltip={$compact ? "Height" : null}
   >
-    Height
+    {$compact ? "" : "Height"}
   </ActionButton>
 </div>
 
-<Popover bind:open {anchor} align="left">
+<Popover bind:open {anchor} align={$compact ? "right" : "left"}>
   <div class="content">
     {#each sizeOptions as option}
       <ActionButton
diff --git a/packages/frontend-core/src/components/grid/controls/SortButton.svelte b/packages/frontend-core/src/components/grid/controls/SortButton.svelte
index bd75249216..2018e83e44 100644
--- a/packages/frontend-core/src/components/grid/controls/SortButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/SortButton.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { ActionButton, Popover, Select } from "@budibase/bbui"
 
-  const { sort, columns, stickyColumn } = getContext("grid")
+  const { sort, columns, stickyColumn, compact } = getContext("grid")
 
   let open = false
   let anchor
@@ -90,12 +90,13 @@
     on:click={() => (open = !open)}
     selected={open}
     disabled={!columnOptions.length}
+    tooltip={$compact ? "Sort" : ""}
   >
-    Sort
+    {$compact ? "" : "Sort"}
   </ActionButton>
 </div>
 
-<Popover bind:open {anchor} align="left">
+<Popover bind:open {anchor} align={$compact ? "right" : "left"}>
   <div class="content">
     <Select
       placeholder={null}
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 36a3802164..0db7ec9108 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -112,10 +112,10 @@
       <AddRowButton />
       <AddColumnButton />
       <slot name="controls" />
+      <SortButton />
+      <HideColumnsButton />
       <ColumnWidthButton />
       <RowHeightButton />
-      <HideColumnsButton />
-      <SortButton />
     </div>
     <div class="controls-right">
       <DeleteButton />
@@ -214,6 +214,7 @@
     padding: var(--cell-padding);
     gap: var(--cell-spacing);
     background: var(--background);
+    z-index: 2;
   }
   .controls-left,
   .controls-right {
diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js
index 0636400d59..85afad8a90 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.js
@@ -2,6 +2,7 @@ import { writable, get, derived } from "svelte/store"
 import { tick } from "svelte"
 import {
   DefaultRowHeight,
+  GutterWidth,
   LargeRowHeight,
   MediumRowHeight,
   NewRowID,
@@ -43,6 +44,8 @@ export const deriveStores = context => {
     enrichedRows,
     rowLookupMap,
     rowHeight,
+    stickyColumn,
+    width,
   } = context
 
   // Derive the row that contains the selected cell
@@ -70,6 +73,7 @@ export const deriveStores = context => {
     hoveredRowId.set(null)
   }
 
+  // Derive the amount of content lines to show in cells depending on row height
   const contentLines = derived(rowHeight, $rowHeight => {
     if ($rowHeight === LargeRowHeight) {
       return 3
@@ -79,9 +83,15 @@ export const deriveStores = context => {
     return 1
   })
 
+  // Derive whether we should use the compact UI, depending on width
+  const compact = derived([stickyColumn, width], ([$stickyColumn, $width]) => {
+    return ($stickyColumn?.width || 0) + $width + GutterWidth < 1100
+  })
+
   return {
     focusedRow,
     contentLines,
+    compact,
     ui: {
       actions: {
         blur,

From 023cb2b83bfb246ff7dfd0313b98a5192a9959f8 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:25:00 +0100
Subject: [PATCH 03/40] Replace bulk delete button with inline icons

---
 .../components/grid/cells/GutterCell.svelte   | 22 ++++++++++++--
 ...Button.svelte => BulkDeleteHandler.svelte} | 29 ++-----------------
 .../src/components/grid/layout/Grid.svelte    |  4 +--
 3 files changed, 24 insertions(+), 31 deletions(-)
 rename packages/frontend-core/src/components/grid/controls/{DeleteButton.svelte => BulkDeleteHandler.svelte} (53%)

diff --git a/packages/frontend-core/src/components/grid/cells/GutterCell.svelte b/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
index d9fd09fb6c..00b99c0711 100644
--- a/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
@@ -70,7 +70,15 @@
         </div>
       {/if}
     {/if}
-    {#if $config.allowExpandRows}
+    {#if rowSelected && $config.allowDeleteRows}
+      <div class="delete" on:click={() => dispatch("request-bulk-delete")}>
+        <Icon
+          name="Delete"
+          size="S"
+          color="var(--spectrum-global-color-red-400)"
+        />
+      </div>
+    {:else if $config.allowExpandRows}
       <div
         class="expand"
         class:visible={!disableExpand && (rowFocused || rowHovered)}
@@ -111,9 +119,12 @@
   .number.visible {
     display: flex;
   }
+  .delete,
+  .expand {
+    margin-right: 4px;
+  }
   .expand {
     opacity: 0;
-    margin-right: 4px;
   }
   .expand :global(.spectrum-Icon) {
     pointer-events: none;
@@ -124,4 +135,11 @@
   .expand.visible :global(.spectrum-Icon) {
     pointer-events: all;
   }
+
+  .delete:hover {
+    cursor: pointer;
+  }
+  .delete:hover :global(.spectrum-Icon) {
+    color: var(--spectrum-global-color-red-600) !important;
+  }
 </style>
diff --git a/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
similarity index 53%
rename from packages/frontend-core/src/components/grid/controls/DeleteButton.svelte
rename to packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
index 8ca5f0920d..f87b529390 100644
--- a/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { Modal, ModalContent, Button, notifications } from "@budibase/bbui"
+  import { Modal, ModalContent, notifications } from "@budibase/bbui"
   import { getContext, onMount } from "svelte"
 
-  const { selectedRows, rows, config, subscribe } = getContext("grid")
+  const { selectedRows, rows, subscribe } = getContext("grid")
 
   let modal
 
@@ -27,20 +27,6 @@
   onMount(() => subscribe("request-bulk-delete", () => modal?.show()))
 </script>
 
-{#if selectedRowCount}
-  <div class="delete-button" data-ignore-click-outside="true">
-    <Button
-      icon="Delete"
-      size="M"
-      on:click={modal.show}
-      disabled={!$config.allowEditRows}
-      cta
-    >
-      Delete {selectedRowCount} row{selectedRowCount === 1 ? "" : "s"}
-    </Button>
-  </div>
-{/if}
-
 <Modal bind:this={modal}>
   <ModalContent
     title="Delete rows"
@@ -53,14 +39,3 @@
     row{selectedRowCount === 1 ? "" : "s"}?
   </ModalContent>
 </Modal>
-
-<style>
-  .delete-button :global(.spectrum-Button:not(:disabled)) {
-    background-color: var(--spectrum-global-color-red-400);
-    border-color: var(--spectrum-global-color-red-400);
-  }
-  .delete-button :global(.spectrum-Button:not(:disabled):hover) {
-    background-color: var(--spectrum-global-color-red-500);
-    border-color: var(--spectrum-global-color-red-500);
-  }
-</style>
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 0db7ec9108..8fd4e05196 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -6,7 +6,7 @@
   import { createEventManagers } from "../lib/events"
   import { createAPIClient } from "../../../api"
   import { attachStores } from "../stores"
-  import DeleteButton from "../controls/DeleteButton.svelte"
+  import BulkDeleteHandler from "../controls/BulkDeleteHandler.svelte"
   import BetaButton from "../controls/BetaButton.svelte"
   import GridBody from "./GridBody.svelte"
   import ResizeOverlay from "../overlays/ResizeOverlay.svelte"
@@ -118,7 +118,6 @@
       <RowHeightButton />
     </div>
     <div class="controls-right">
-      <DeleteButton />
       <UserAvatars />
     </div>
   </div>
@@ -146,6 +145,7 @@
       <ProgressCircle />
     </div>
   {/if}
+  <BulkDeleteHandler />
   <KeyboardManager />
 </div>
 

From 80da2fb93a6126b2e0b1be596cb5ee25fb01c838 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:30:18 +0100
Subject: [PATCH 04/40] Prevent row bulk deletion when delete rows flag is set
 to false

---
 .../frontend-core/src/components/grid/layout/Grid.svelte     | 4 +++-
 .../src/components/grid/overlays/KeyboardManager.svelte      | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 8fd4e05196..8903a9bcc9 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -145,7 +145,9 @@
       <ProgressCircle />
     </div>
   {/if}
-  <BulkDeleteHandler />
+  {#if allowDeleteRows}
+    <BulkDeleteHandler />
+  {/if}
   <KeyboardManager />
 </div>
 
diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
index f0f56118d9..e449feb64c 100644
--- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
@@ -13,6 +13,7 @@
     clipboard,
     dispatch,
     selectedRows,
+    config,
   } = getContext("grid")
 
   const ignoredOriginSelectors = [
@@ -40,7 +41,7 @@
         e.preventDefault()
         dispatch("add-row-inline")
       } else if (e.key === "Delete" || e.key === "Backspace") {
-        if (Object.keys($selectedRows).length) {
+        if (Object.keys($selectedRows).length && $config.allowDeleteRows) {
           dispatch("request-bulk-delete")
         }
       }
@@ -106,7 +107,7 @@
           break
         case "Delete":
         case "Backspace":
-          if (Object.keys($selectedRows).length) {
+          if (Object.keys($selectedRows).length && $config.allowDeleteRows) {
             dispatch("request-bulk-delete")
           } else {
             deleteSelectedCell()

From 96fc70f29a3bc17e481b81e8d1c794b6e7eda164 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:32:44 +0100
Subject: [PATCH 05/40] Fix keyboard shortcuts circumventing disabling adding
 rows

---
 .../src/components/grid/layout/Grid.svelte             |  4 +++-
 .../components/grid/overlays/KeyboardManager.svelte    | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 8903a9bcc9..e66c6b8559 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -130,7 +130,9 @@
           <GridBody />
         </div>
         <BetaButton />
-        <NewRow />
+        {#if allowAddRows}
+          <NewRow />
+        {/if}
         <div class="overlays">
           <ResizeOverlay />
           <ReorderOverlay />
diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
index e449feb64c..2a8a2a8af7 100644
--- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
@@ -38,8 +38,10 @@
         e.preventDefault()
         focusFirstCell()
       } else if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
-        e.preventDefault()
-        dispatch("add-row-inline")
+        if ($config.allowAddRows) {
+          e.preventDefault()
+          dispatch("add-row-inline")
+        }
       } else if (e.key === "Delete" || e.key === "Backspace") {
         if (Object.keys($selectedRows).length && $config.allowDeleteRows) {
           dispatch("request-bulk-delete")
@@ -89,7 +91,9 @@
           }
           break
         case "Enter":
-          dispatch("add-row-inline")
+          if ($config.allowAddRows) {
+            dispatch("add-row-inline")
+          }
       }
     } else {
       switch (e.key) {

From b79f466324e69d25b6f475e5efceb30d9ee65fbd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:34:16 +0100
Subject: [PATCH 06/40] Prevent selecting rows with keyboard when disable row
 deletion flag is set

---
 .../src/components/grid/overlays/KeyboardManager.svelte       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
index 2a8a2a8af7..c7fa0a5cb7 100644
--- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
@@ -122,7 +122,9 @@
           break
         case " ":
         case "Space":
-          toggleSelectRow()
+          if ($config.allowDeleteRows) {
+            toggleSelectRow()
+          }
           break
         default:
           startEnteringValue(e.key, e.which)

From 933545ccf7481af13350cc0fe03eaf96a538c223 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:37:38 +0100
Subject: [PATCH 07/40] Hide add column icon when disable column addition flag
 is set

---
 .../components/grid/layout/HeaderRow.svelte   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
index 2ec186a4d6..0eaabdef7f 100644
--- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
@@ -4,8 +4,14 @@
   import HeaderCell from "../cells/HeaderCell.svelte"
   import { Icon } from "@budibase/bbui"
 
-  const { renderedColumns, dispatch, scroll, hiddenColumnsWidth, width } =
-    getContext("grid")
+  const {
+    renderedColumns,
+    dispatch,
+    scroll,
+    hiddenColumnsWidth,
+    width,
+    config,
+  } = getContext("grid")
 
   $: columnsWidth = $renderedColumns.reduce(
     (total, col) => (total += col.width),
@@ -23,13 +29,15 @@
       {/each}
     </div>
   </GridScrollWrapper>
-  <div
-    class="add"
-    style="left:{left}px"
-    on:click={() => dispatch("add-column")}
-  >
-    <Icon name="Add" />
-  </div>
+  {#if $config.allowAddColumns}
+    <div
+      class="add"
+      style="left:{left}px"
+      on:click={() => dispatch("add-column")}
+    >
+      <Icon name="Add" />
+    </div>
+  {/if}
 </div>
 
 <style>

From ab0d859c82ffbe0a7604a8d445bcc402c96a796b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:41:28 +0100
Subject: [PATCH 08/40] Fix z-index of add column icon

---
 packages/frontend-core/src/components/grid/layout/Grid.svelte   | 2 +-
 .../frontend-core/src/components/grid/layout/HeaderRow.svelte   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index e66c6b8559..2035ec4d39 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -244,7 +244,7 @@
     height: 100%;
     display: grid;
     place-items: center;
-    z-index: 10;
+    z-index: 100;
   }
   .grid-loading:before {
     content: "";
diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
index 0eaabdef7f..be9fad00d0 100644
--- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte
@@ -46,7 +46,6 @@
     border-bottom: var(--cell-border);
     position: relative;
     height: var(--default-row-height);
-    z-index: 1;
   }
   .row {
     display: flex;
@@ -62,6 +61,7 @@
     border-right: var(--cell-border);
     border-bottom: var(--cell-border);
     background: var(--spectrum-global-color-gray-100);
+    z-index: 20;
   }
   .add:hover {
     background: var(--spectrum-global-color-gray-200);

From 9c811d1a3bde1a166e8560931cf890537d9a79aa Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 28 Apr 2023 11:47:44 +0100
Subject: [PATCH 09/40] Update position of new row buttons to reduce chance of
 z-index issues with dropdowns as the first new row column

---
 packages/frontend-core/src/components/grid/layout/NewRow.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
index 71c390c946..8048a4e2fa 100644
--- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
@@ -270,7 +270,7 @@
     z-index: 3;
     position: absolute;
     top: calc(var(--row-height) + var(--offset) + 24px);
-    left: var(--gutter-width);
+    left: 18px;
   }
   .button-with-keys {
     display: flex;

From f73af919a7b4f1693206ca1824ab244a156e7537 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Fri, 28 Apr 2023 19:09:22 +0100
Subject: [PATCH 10/40] attaching clustered mode to an env var

---
 packages/backend-core/src/environment.ts | 1 +
 packages/backend-core/src/redis/redis.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 5718494fc4..409b6beff4 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -56,6 +56,7 @@ const environment = {
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL || "localhost:6379",
   REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase",
+  REDIS_CLUSTERED: process.env.REDIS_CLUSTERED || false,
   MOCK_REDIS: process.env.MOCK_REDIS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index 186865ccda..47d33bc32c 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -9,10 +9,11 @@ import {
   SelectableDatabase,
 } from "./utils"
 import * as timers from "../timers"
+import environment from "../environment"
 
 const RETRY_PERIOD_MS = 2000
 const STARTUP_TIMEOUT_MS = 5000
-const CLUSTERED = false
+const CLUSTERED = environment.REDIS_CLUSTERED
 const DEFAULT_SELECT_DB = SelectableDatabase.DEFAULT
 
 // for testing just generate the client once

From e75e91e248ee2e97b2813b359746988c56ebf0a4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Fri, 28 Apr 2023 19:53:15 +0100
Subject: [PATCH 11/40] control all redis clustering through env var

---
 packages/backend-core/src/environment.ts | 2 +-
 packages/backend-core/src/redis/redis.ts | 2 +-
 packages/backend-core/src/redis/utils.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 409b6beff4..d0f540a0b0 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -56,7 +56,7 @@ const environment = {
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL || "localhost:6379",
   REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase",
-  REDIS_CLUSTERED: process.env.REDIS_CLUSTERED || false,
+  REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   MOCK_REDIS: process.env.MOCK_REDIS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index 47d33bc32c..ecc83167dd 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -82,7 +82,7 @@ function init(selectDb = DEFAULT_SELECT_DB) {
   if (client) {
     client.disconnect()
   }
-  const { redisProtocolUrl, opts, host, port } = getRedisOptions(CLUSTERED)
+  const { redisProtocolUrl, opts, host, port } = getRedisOptions()
 
   if (CLUSTERED) {
     client = new Redis.Cluster([{ host, port }], opts)
diff --git a/packages/backend-core/src/redis/utils.ts b/packages/backend-core/src/redis/utils.ts
index 7606c77b87..2c49ee4941 100644
--- a/packages/backend-core/src/redis/utils.ts
+++ b/packages/backend-core/src/redis/utils.ts
@@ -57,7 +57,7 @@ export enum SelectableDatabase {
   UNUSED_14 = 15,
 }
 
-export function getRedisOptions(clustered = false) {
+export function getRedisOptions() {
   let password = env.REDIS_PASSWORD
   let url: string[] | string = env.REDIS_URL.split("//")
   // get rid of the protocol
@@ -83,7 +83,7 @@ export function getRedisOptions(clustered = false) {
   const opts: any = {
     connectTimeout: CONNECT_TIMEOUT_MS,
   }
-  if (clustered) {
+  if (env.REDIS_CLUSTERED) {
     opts.redisOptions = {}
     opts.redisOptions.tls = {}
     opts.redisOptions.password = password

From 36397bb77dac6895886ea1bd647796d59fda19e8 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Fri, 28 Apr 2023 20:23:39 +0100
Subject: [PATCH 12/40] enabling cluster support for ratelimit cache

---
 packages/server/src/api/routes/public/index.ts | 8 ++++++--
 packages/server/src/environment.ts             | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index e2bce1e730..5f93732a06 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -42,8 +42,12 @@ if (!env.isTest()) {
         host: REDIS_OPTS.host,
         port: REDIS_OPTS.port,
       },
-      password: REDIS_OPTS.opts.password,
-      database: 1,
+      password: REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password,
+    }
+
+    if (!env.REDIS_CLUSTERED) {
+      // Can't set direct redis db in clustered env
+      options.database = 1
     }
   }
   rateLimitStore = new Stores.Redis(options)
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index 058e8bdff8..48eb78c41d 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -47,6 +47,7 @@ const environment = {
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+  REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,

From 75d8dd907fe77284526e6babc20903bb5a2ddf66 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 4 May 2023 11:00:04 +0100
Subject: [PATCH 13/40] fix for limit banner re-appearing

---
 .../src/components/portal/licensing/licensingBanners.js        | 3 +++
 .../builder/src/pages/builder/portal/users/users/index.svelte  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index 41c6585b02..dafa8cfaed 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -147,6 +147,9 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => {
   return {
     key: EXPIRY_KEY,
     type: BANNER_TYPES.WARNING,
+    onChange: () => {
+      defaultCacheFn(EXPIRY_KEY)
+    },
     criteria: () => {
       return userLicensing.warnUserLimit
     },
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 984ecd46ff..1b68d5884d 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -261,7 +261,7 @@
       header={`Users will soon be limited to ${staticUserLimit}`}
       message={`Our free plan is going to be limited to ${staticUserLimit} users in ${$licensing.userLimitDays}.
     
-    This means any users exceeding the limit have been de-activated.
+    This means any users exceeding the limit will de-activated.
 
     De-activated users will not able to access the builder or any published apps until you upgrade to one of our paid plans.
     `}

From 1fe7f2fe1b43ba3b0eb88e80fbac89cb4afc032b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 4 May 2023 11:09:21 +0100
Subject: [PATCH 14/40] fix copy

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

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 1b68d5884d..8006ae0294 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -261,7 +261,7 @@
       header={`Users will soon be limited to ${staticUserLimit}`}
       message={`Our free plan is going to be limited to ${staticUserLimit} users in ${$licensing.userLimitDays}.
     
-    This means any users exceeding the limit will de-activated.
+    This means any users exceeding the limit will be de-activated.
 
     De-activated users will not able to access the builder or any published apps until you upgrade to one of our paid plans.
     `}

From 2774e92d8359f093bcbdb236f6737fd8e56e149c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 4 May 2023 10:39:20 +0000
Subject: [PATCH 15/40] v2.6.1

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

diff --git a/lerna.json b/lerna.json
index c27dac0362..4a716b4ca8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.0",
+  "version": "2.6.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a9811a66c5..ee5a62eb0c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.0",
+  "version": "2.6.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.6.0",
+    "@budibase/types": "^2.6.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 4cfad5cced..0964dffb3b 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.6.0",
+  "version": "2.6.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.0",
-    "@budibase/string-templates": "^2.6.0",
+    "@budibase/shared-core": "^2.6.1",
+    "@budibase/string-templates": "^2.6.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 4808196d7c..ce9d5bcfdf 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.0",
-    "@budibase/frontend-core": "^2.6.0",
-    "@budibase/shared-core": "^2.6.0",
-    "@budibase/string-templates": "^2.6.0",
+    "@budibase/bbui": "^2.6.1",
+    "@budibase/frontend-core": "^2.6.1",
+    "@budibase/shared-core": "^2.6.1",
+    "@budibase/string-templates": "^2.6.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 cf40fff35c..016d91c63f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.0",
+  "version": "2.6.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.6.0",
-    "@budibase/string-templates": "^2.6.0",
-    "@budibase/types": "^2.6.0",
+    "@budibase/backend-core": "^2.6.1",
+    "@budibase/string-templates": "^2.6.1",
+    "@budibase/types": "^2.6.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 f2ee5fe215..f7df964b19 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.0",
-    "@budibase/frontend-core": "^2.6.0",
-    "@budibase/shared-core": "^2.6.0",
-    "@budibase/string-templates": "^2.6.0",
-    "@budibase/types": "^2.6.0",
+    "@budibase/bbui": "^2.6.1",
+    "@budibase/frontend-core": "^2.6.1",
+    "@budibase/shared-core": "^2.6.1",
+    "@budibase/string-templates": "^2.6.1",
+    "@budibase/types": "^2.6.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 fad1de2c94..9fe490f0d9 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.0",
+  "version": "2.6.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.6.0",
-    "@budibase/shared-core": "^2.6.0",
+    "@budibase/bbui": "^2.6.1",
+    "@budibase/shared-core": "^2.6.1",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 1a4297153e..0562aef2f0 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.0",
+  "version": "2.6.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 8c27d3fd68..e0f1fb3199 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.0",
-    "@budibase/client": "^2.6.0",
+    "@budibase/backend-core": "^2.6.1",
+    "@budibase/client": "^2.6.1",
     "@budibase/pro": "2.6.0",
-    "@budibase/shared-core": "^2.6.0",
-    "@budibase/string-templates": "^2.6.0",
-    "@budibase/types": "^2.6.0",
+    "@budibase/shared-core": "^2.6.1",
+    "@budibase/string-templates": "^2.6.1",
+    "@budibase/types": "^2.6.1",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index ee57d001da..e34cb2f79a 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.0"
+    "@budibase/types": "^2.6.1"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 096c7772cf..d7bfd47c05 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.0",
+  "version": "2.6.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 ae46a0485d..0fb3ba19ec 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 09eff55365..55649e7493 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.0",
+    "@budibase/backend-core": "^2.6.1",
     "@budibase/pro": "2.6.0",
-    "@budibase/string-templates": "^2.6.0",
-    "@budibase/types": "^2.6.0",
+    "@budibase/string-templates": "^2.6.1",
+    "@budibase/types": "^2.6.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From cde5259e4419696d0a594dfbcb6e5e8cc42689d4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 4 May 2023 10:40:47 +0000
Subject: [PATCH 16/40] Update pro version to 2.6.1

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index e0f1fb3199..3029ff9b63 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.1",
     "@budibase/client": "^2.6.1",
-    "@budibase/pro": "2.6.0",
+    "@budibase/pro": "2.6.1",
     "@budibase/shared-core": "^2.6.1",
     "@budibase/string-templates": "^2.6.1",
     "@budibase/types": "^2.6.1",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 55649e7493..d794854093 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.1",
-    "@budibase/pro": "2.6.0",
+    "@budibase/pro": "2.6.1",
     "@budibase/string-templates": "^2.6.1",
     "@budibase/types": "^2.6.1",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 918a974b7d..c3e31e6ee6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.5.10":
-  version "2.5.10"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.10.tgz#b7d81c1615df7ba51a199c29d5c87dadad3f004e"
-  integrity sha512-c3uAYPyn3BXZyZc1940kIAbNoFOxWVJHQOCz+4AQLRUmMDznSNsOZGhzhdqlc2IL7xL51Oz3Ry5eAVhdPJWb7A==
+"@budibase/pro@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.0.tgz#ac93023ac4b3a5f8c7f39b2ed6240091b084c625"
+  integrity sha512-SBIh/TtT40XAUiF7b+9gEkShzbsWJWvCoti7w4YqrujsvVdbYsrwV8yY/FqaCAiHN4hlAXOEcYmF6lgK2g1Rjg==
   dependencies:
-    "@budibase/backend-core" "2.5.10"
+    "@budibase/backend-core" "2.6.0"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.5.10"
+    "@budibase/types" "2.6.0"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 56a1b068cc93d90445cbb8dc29a25d5250dd74cb Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 11:52:20 +0100
Subject: [PATCH 17/40] Added json parse option for row import attachment
 values

---
 packages/server/src/utilities/rowProcessor/map.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index 8911d62133..d3572094c6 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -70,6 +70,17 @@ export const TYPE_TRANSFORM_MAP: any = {
     "": [],
     [null]: [],
     [undefined]: undefined,
+    parse: (attachments) => {
+      if(typeof attachments === "string"){
+        let result = attachments
+        try {
+          result = JSON.parse(attachments)
+        } catch (e) {
+          console.error("Could not parse attachments", e)
+        }
+        return result;
+      }
+    }
   },
   [FieldTypes.BOOLEAN]: {
     "": null,

From a1fdff8df8633e5a9f531be2c47b765118d72c17 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 12:25:30 +0100
Subject: [PATCH 18/40] Linting

---
 packages/server/src/utilities/rowProcessor/map.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index d3572094c6..cbf1c3ae36 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -70,17 +70,17 @@ export const TYPE_TRANSFORM_MAP: any = {
     "": [],
     [null]: [],
     [undefined]: undefined,
-    parse: (attachments) => {
-      if(typeof attachments === "string"){
+    parse: attachments => {
+      if (typeof attachments === "string") {
         let result = attachments
         try {
           result = JSON.parse(attachments)
         } catch (e) {
           console.error("Could not parse attachments", e)
         }
-        return result;
+        return result
       }
-    }
+    },
   },
   [FieldTypes.BOOLEAN]: {
     "": null,

From 5498cc86bdeec01457cb3eb2fba1a3631048b80b Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 12:58:45 +0100
Subject: [PATCH 19/40] Refactor to fix tests and added an extra empty scenario

---
 packages/server/src/api/routes/tests/row.spec.js  | 3 +++
 packages/server/src/utilities/rowProcessor/map.ts | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js
index 5cbb3d04b4..4b835a1fb5 100644
--- a/packages/server/src/api/routes/tests/row.spec.js
+++ b/packages/server/src/api/routes/tests/row.spec.js
@@ -212,6 +212,7 @@ describe("/rows", () => {
           attachmentNull: attachment,
           attachmentUndefined: attachment,
           attachmentEmpty: attachment,
+          attachmentEmptyArrayStr: attachment
         },
       })
 
@@ -239,6 +240,7 @@ describe("/rows", () => {
         attachmentNull: null,
         attachmentUndefined: undefined,
         attachmentEmpty: "",
+        attachmentEmptyArrayStr: "[]",
       }
 
       const id = (await config.createRow(row))._id
@@ -268,6 +270,7 @@ describe("/rows", () => {
       expect(saved.attachmentNull).toEqual([])
       expect(saved.attachmentUndefined).toBe(undefined)
       expect(saved.attachmentEmpty).toEqual([])
+      expect(saved.attachmentEmptyArrayStr).toEqual([])
     })
   })
 
diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index cbf1c3ae36..669223b302 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -67,12 +67,14 @@ export const TYPE_TRANSFORM_MAP: any = {
     },
   },
   [FieldTypes.ATTACHMENT]: {
-    "": [],
     [null]: [],
     [undefined]: undefined,
     parse: attachments => {
       if (typeof attachments === "string") {
-        let result = attachments
+        if (attachments === "") {
+          return []
+        }
+        let result
         try {
           result = JSON.parse(attachments)
         } catch (e) {
@@ -80,6 +82,7 @@ export const TYPE_TRANSFORM_MAP: any = {
         }
         return result
       }
+      return attachments
     },
   },
   [FieldTypes.BOOLEAN]: {

From 167dfd39d79aed57e8b2db896f40ed5b608555de Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 4 May 2023 13:32:17 +0100
Subject: [PATCH 20/40] fix ts build

---
 packages/backend-core/src/redis/redis.ts       | 3 +--
 packages/server/src/api/routes/public/index.ts | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/redis/redis.ts b/packages/backend-core/src/redis/redis.ts
index ecc83167dd..2d54b51a9f 100644
--- a/packages/backend-core/src/redis/redis.ts
+++ b/packages/backend-core/src/redis/redis.ts
@@ -9,11 +9,10 @@ import {
   SelectableDatabase,
 } from "./utils"
 import * as timers from "../timers"
-import environment from "../environment"
 
 const RETRY_PERIOD_MS = 2000
 const STARTUP_TIMEOUT_MS = 5000
-const CLUSTERED = environment.REDIS_CLUSTERED
+const CLUSTERED = env.REDIS_CLUSTERED
 const DEFAULT_SELECT_DB = SelectableDatabase.DEFAULT
 
 // for testing just generate the client once
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 5f93732a06..107287348c 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -47,6 +47,7 @@ if (!env.isTest()) {
 
     if (!env.REDIS_CLUSTERED) {
       // Can't set direct redis db in clustered env
+      // @ts-ignore
       options.database = 1
     }
   }

From 41c131050ce9f9e8b86f432ae9af60251cc9d100 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 4 May 2023 13:43:53 +0100
Subject: [PATCH 21/40] lint

---
 packages/server/src/api/routes/public/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 107287348c..bed798f75b 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -42,7 +42,8 @@ if (!env.isTest()) {
         host: REDIS_OPTS.host,
         port: REDIS_OPTS.port,
       },
-      password: REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password,
+      password:
+        REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password,
     }
 
     if (!env.REDIS_CLUSTERED) {

From 2086b5d5ddee1e9061107e7e2b958097382154d8 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 4 May 2023 13:33:20 +0000
Subject: [PATCH 22/40] v2.6.2

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

diff --git a/lerna.json b/lerna.json
index 4a716b4ca8..17c0ec2a3b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.1",
+  "version": "2.6.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ee5a62eb0c..1ce7092e16 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.1",
+  "version": "2.6.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.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.1",
+    "@budibase/types": "^2.6.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 0964dffb3b..efe82dcce2 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.6.1",
+  "version": "2.6.2",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.1",
-    "@budibase/string-templates": "^2.6.1",
+    "@budibase/shared-core": "^2.6.2",
+    "@budibase/string-templates": "^2.6.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 ce9d5bcfdf..16cde45ed2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.1",
-    "@budibase/frontend-core": "^2.6.1",
-    "@budibase/shared-core": "^2.6.1",
-    "@budibase/string-templates": "^2.6.1",
+    "@budibase/bbui": "^2.6.2",
+    "@budibase/frontend-core": "^2.6.2",
+    "@budibase/shared-core": "^2.6.2",
+    "@budibase/string-templates": "^2.6.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 016d91c63f..fe4c12e59f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "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.6.1",
-    "@budibase/string-templates": "^2.6.1",
-    "@budibase/types": "^2.6.1",
+    "@budibase/backend-core": "^2.6.2",
+    "@budibase/string-templates": "^2.6.2",
+    "@budibase/types": "^2.6.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 f7df964b19..f56f753694 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.1",
-    "@budibase/frontend-core": "^2.6.1",
-    "@budibase/shared-core": "^2.6.1",
-    "@budibase/string-templates": "^2.6.1",
-    "@budibase/types": "^2.6.1",
+    "@budibase/bbui": "^2.6.2",
+    "@budibase/frontend-core": "^2.6.2",
+    "@budibase/shared-core": "^2.6.2",
+    "@budibase/string-templates": "^2.6.2",
+    "@budibase/types": "^2.6.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 9fe490f0d9..1742619a80 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.1",
+  "version": "2.6.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.6.1",
-    "@budibase/shared-core": "^2.6.1",
+    "@budibase/bbui": "^2.6.2",
+    "@budibase/shared-core": "^2.6.2",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0562aef2f0..bf37a7f72c 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.1",
+  "version": "2.6.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 3029ff9b63..34da1f4f36 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.1",
-    "@budibase/client": "^2.6.1",
+    "@budibase/backend-core": "^2.6.2",
+    "@budibase/client": "^2.6.2",
     "@budibase/pro": "2.6.1",
-    "@budibase/shared-core": "^2.6.1",
-    "@budibase/string-templates": "^2.6.1",
-    "@budibase/types": "^2.6.1",
+    "@budibase/shared-core": "^2.6.2",
+    "@budibase/string-templates": "^2.6.2",
+    "@budibase/types": "^2.6.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index e34cb2f79a..148ec87ad9 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.1"
+    "@budibase/types": "^2.6.2"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d7bfd47c05..5e553eb7d7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.1",
+  "version": "2.6.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 0fb3ba19ec..12d4fedace 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d794854093..7cc88e3a05 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.1",
+    "@budibase/backend-core": "^2.6.2",
     "@budibase/pro": "2.6.1",
-    "@budibase/string-templates": "^2.6.1",
-    "@budibase/types": "^2.6.1",
+    "@budibase/string-templates": "^2.6.2",
+    "@budibase/types": "^2.6.2",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 303a029184b05998111be56197ba0871711daedd Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 4 May 2023 13:34:48 +0000
Subject: [PATCH 23/40] Update pro version to 2.6.2

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 34da1f4f36..7cbc842a4f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.2",
     "@budibase/client": "^2.6.2",
-    "@budibase/pro": "2.6.1",
+    "@budibase/pro": "2.6.2",
     "@budibase/shared-core": "^2.6.2",
     "@budibase/string-templates": "^2.6.2",
     "@budibase/types": "^2.6.2",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7cc88e3a05..d63143d75b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.2",
-    "@budibase/pro": "2.6.1",
+    "@budibase/pro": "2.6.2",
     "@budibase/string-templates": "^2.6.2",
     "@budibase/types": "^2.6.2",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index c3e31e6ee6..a43a6c5b13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.0.tgz#ac93023ac4b3a5f8c7f39b2ed6240091b084c625"
-  integrity sha512-SBIh/TtT40XAUiF7b+9gEkShzbsWJWvCoti7w4YqrujsvVdbYsrwV8yY/FqaCAiHN4hlAXOEcYmF6lgK2g1Rjg==
+"@budibase/pro@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.1.tgz#35e9f100424b68320af95e8b900c547053cd49d3"
+  integrity sha512-gAHSKzvV2WKQWIatg0dqm0uzc4Y/j4ePwN3Ku1m4MMHRDdHtX/YHxH6VVdfMbJ5HG6jlnwoqkFLTb7p25vSUkQ==
   dependencies:
-    "@budibase/backend-core" "2.6.0"
+    "@budibase/backend-core" "2.6.1"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.0"
+    "@budibase/types" "2.6.1"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 0d7959f720310832bb13a6c33ecbb987bd8d176b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 4 May 2023 17:05:36 +0100
Subject: [PATCH 24/40] Fixing some un-identified listeners, queue messages not
 being correctly printed, also improving the mechanism for detecting if in the
 main thread or not.

---
 packages/backend-core/src/queue/listeners.ts | 6 ++++++
 packages/server/src/environment.ts           | 8 +-------
 packages/server/src/threads/index.ts         | 6 ++++++
 packages/server/src/threads/utils.ts         | 4 +---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/queue/listeners.ts b/packages/backend-core/src/queue/listeners.ts
index e1975b5d06..331b690fe9 100644
--- a/packages/backend-core/src/queue/listeners.ts
+++ b/packages/backend-core/src/queue/listeners.ts
@@ -40,6 +40,12 @@ function logging(queue: Queue, jobQueue: JobQueue) {
     case JobQueue.APP_BACKUP:
       eventType = "app-backup-event"
       break
+    case JobQueue.AUDIT_LOG:
+      eventType = "audit-log-event"
+      break
+    case JobQueue.SYSTEM_EVENT_QUEUE:
+      eventType = "system-event"
+      break
   }
   if (process.env.NODE_DEBUG?.includes("bull")) {
     queue
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index bcf9488777..2265d7e75d 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -34,8 +34,6 @@ function parseIntSafe(number?: string) {
   }
 }
 
-let inThread = false
-
 const environment = {
   // important - prefer app port to generic port
   PORT: process.env.APP_PORT || process.env.PORT,
@@ -95,12 +93,8 @@ const environment = {
   isProd: () => {
     return !isDev()
   },
-  // used to check if already in a thread, don't thread further
-  setInThread: () => {
-    inThread = true
-  },
   isInThread: () => {
-    return inThread
+    return process.env.FORKED_PROCESS
   },
 }
 
diff --git a/packages/server/src/threads/index.ts b/packages/server/src/threads/index.ts
index 0723edad34..6876f1a07c 100644
--- a/packages/server/src/threads/index.ts
+++ b/packages/server/src/threads/index.ts
@@ -39,6 +39,12 @@ export class Thread {
       const workerOpts: any = {
         autoStart: true,
         maxConcurrentWorkers: this.count,
+        workerOptions: {
+          env: {
+            ...process.env,
+            FORKED_PROCESS: "1",
+          },
+        },
       }
       if (opts.timeoutMs) {
         this.timeoutMs = opts.timeoutMs
diff --git a/packages/server/src/threads/utils.ts b/packages/server/src/threads/utils.ts
index 5caaeb83d7..37c7a6d3f9 100644
--- a/packages/server/src/threads/utils.ts
+++ b/packages/server/src/threads/utils.ts
@@ -25,11 +25,9 @@ function makeVariableKey(queryId: string, variable: string) {
 
 export function threadSetup() {
   // don't run this if not threading
-  if (env.isTest() || env.DISABLE_THREADING) {
+  if (env.isTest() || env.DISABLE_THREADING || !env.isInThread()) {
     return
   }
-  // when thread starts, make sure it is recorded
-  env.setInThread()
   db.init()
 }
 

From b790a1177e73764b69c2798e308deae668f908a2 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Fri, 5 May 2023 07:50:01 +0100
Subject: [PATCH 25/40] Don't validate empty options picker (#10302)

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

diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts
index a7c467ea61..f6a87dd24c 100644
--- a/packages/server/src/api/controllers/row/utils.ts
+++ b/packages/server/src/api/controllers/row/utils.ts
@@ -69,9 +69,9 @@ export async function validate({
     if (type === FieldTypes.FORMULA || column.autocolumn) {
       continue
     }
-    // special case for options, need to always allow unselected (null)
+    // special case for options, need to always allow unselected (empty)
     if (type === FieldTypes.OPTIONS && constraints.inclusion) {
-      constraints.inclusion.push(null)
+      constraints.inclusion.push(null, "")
     }
     let res
 

From 0aa270ad0acbe953fb3536e8af3546f535c51302 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 06:58:10 +0000
Subject: [PATCH 26/40] v2.6.3

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

diff --git a/lerna.json b/lerna.json
index 17c0ec2a3b..d79ed9b8d3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.2",
+  "version": "2.6.3",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1ce7092e16..1b8627a291 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.2",
+  "version": "2.6.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.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.2",
+    "@budibase/types": "^2.6.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 efe82dcce2..24b910a8a3 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.6.2",
+  "version": "2.6.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.2",
-    "@budibase/string-templates": "^2.6.2",
+    "@budibase/shared-core": "^2.6.3",
+    "@budibase/string-templates": "^2.6.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 16cde45ed2..176881cebc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.2",
-    "@budibase/frontend-core": "^2.6.2",
-    "@budibase/shared-core": "^2.6.2",
-    "@budibase/string-templates": "^2.6.2",
+    "@budibase/bbui": "^2.6.3",
+    "@budibase/frontend-core": "^2.6.3",
+    "@budibase/shared-core": "^2.6.3",
+    "@budibase/string-templates": "^2.6.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 fe4c12e59f..fb20a1e400 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "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.6.2",
-    "@budibase/string-templates": "^2.6.2",
-    "@budibase/types": "^2.6.2",
+    "@budibase/backend-core": "^2.6.3",
+    "@budibase/string-templates": "^2.6.3",
+    "@budibase/types": "^2.6.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 f56f753694..dd609b26e5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.2",
-    "@budibase/frontend-core": "^2.6.2",
-    "@budibase/shared-core": "^2.6.2",
-    "@budibase/string-templates": "^2.6.2",
-    "@budibase/types": "^2.6.2",
+    "@budibase/bbui": "^2.6.3",
+    "@budibase/frontend-core": "^2.6.3",
+    "@budibase/shared-core": "^2.6.3",
+    "@budibase/string-templates": "^2.6.3",
+    "@budibase/types": "^2.6.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 1742619a80..2a75605fbf 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.2",
+  "version": "2.6.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.6.2",
-    "@budibase/shared-core": "^2.6.2",
+    "@budibase/bbui": "^2.6.3",
+    "@budibase/shared-core": "^2.6.3",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index bf37a7f72c..9cc2f8eeec 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.2",
+  "version": "2.6.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 7cbc842a4f..0e2c4e1c58 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.2",
-    "@budibase/client": "^2.6.2",
+    "@budibase/backend-core": "^2.6.3",
+    "@budibase/client": "^2.6.3",
     "@budibase/pro": "2.6.2",
-    "@budibase/shared-core": "^2.6.2",
-    "@budibase/string-templates": "^2.6.2",
-    "@budibase/types": "^2.6.2",
+    "@budibase/shared-core": "^2.6.3",
+    "@budibase/string-templates": "^2.6.3",
+    "@budibase/types": "^2.6.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 148ec87ad9..9d1eff2ef9 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.2"
+    "@budibase/types": "^2.6.3"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 5e553eb7d7..c1161a0b81 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.2",
+  "version": "2.6.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 12d4fedace..f3338889b0 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d63143d75b..f25bc2ae6f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.2",
+    "@budibase/backend-core": "^2.6.3",
     "@budibase/pro": "2.6.2",
-    "@budibase/string-templates": "^2.6.2",
-    "@budibase/types": "^2.6.2",
+    "@budibase/string-templates": "^2.6.3",
+    "@budibase/types": "^2.6.3",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 541c5ef1c2ef99d54c0b07be1c722ee9f7787448 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 06:59:33 +0000
Subject: [PATCH 27/40] Update pro version to 2.6.3

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0e2c4e1c58..ded10fc8fd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.3",
     "@budibase/client": "^2.6.3",
-    "@budibase/pro": "2.6.2",
+    "@budibase/pro": "2.6.3",
     "@budibase/shared-core": "^2.6.3",
     "@budibase/string-templates": "^2.6.3",
     "@budibase/types": "^2.6.3",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index f25bc2ae6f..ca62a606c3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.3",
-    "@budibase/pro": "2.6.2",
+    "@budibase/pro": "2.6.3",
     "@budibase/string-templates": "^2.6.3",
     "@budibase/types": "^2.6.3",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index a43a6c5b13..491e524344 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.1.tgz#35e9f100424b68320af95e8b900c547053cd49d3"
-  integrity sha512-gAHSKzvV2WKQWIatg0dqm0uzc4Y/j4ePwN3Ku1m4MMHRDdHtX/YHxH6VVdfMbJ5HG6jlnwoqkFLTb7p25vSUkQ==
+"@budibase/pro@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.2.tgz#b30602c740c244a2cfbcc962af99140d936311b2"
+  integrity sha512-QXNUitikX6ygCr3pSEkAOx9Yw6LsXZCrwgyVRVA7JyGggVjVFn1zOU23/OfD6E9zhj9bMOQpoKTCBAwuvSSICQ==
   dependencies:
-    "@budibase/backend-core" "2.6.1"
+    "@budibase/backend-core" "2.6.2"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.1"
+    "@budibase/types" "2.6.2"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 1ec5df1299a7d89887bf13d72a954ecd10da9fd7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 5 May 2023 08:56:45 +0100
Subject: [PATCH 28/40] Use magic icon for auto column and show icons in hide
 columns button

---
 .../grid/controls/HideColumnsButton.svelte    | 24 +++++++++++++++----
 .../src/components/grid/lib/utils.js          |  3 +++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
index 79a773347b..691d879ace 100644
--- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext } from "svelte"
-  import { ActionButton, Popover, Toggle } from "@budibase/bbui"
+  import { ActionButton, Popover, Toggle, Icon } from "@budibase/bbui"
+  import { getColumnIcon } from "../lib/utils"
 
   const { columns, stickyColumn, compact } = getContext("grid")
 
@@ -57,16 +58,24 @@
   <div class="content">
     <div class="columns">
       {#if $stickyColumn}
+        <div class="column">
+          <Icon size="S" name={getColumnIcon($stickyColumn)} />
+          {$stickyColumn.label}
+        </div>
         <Toggle disabled size="S" value={true} />
-        <span>{$stickyColumn.label}</span>
       {/if}
       {#each $columns as column}
+        <div class="column">
+          <!--{#if column.schema.autocolumn}-->
+          <Icon size="S" name={getColumnIcon(column)} />
+          <!--{/if}-->
+          {column.label}
+        </div>
         <Toggle
           size="S"
           value={column.visible}
           on:change={e => toggleVisibility(column, e.detail)}
         />
-        <span>{column.label}</span>
       {/each}
     </div>
     <div class="buttons">
@@ -91,6 +100,13 @@
   .columns {
     display: grid;
     align-items: center;
-    grid-template-columns: auto 1fr;
+    grid-template-columns: 1fr auto;
+  }
+  .columns :global(.spectrum-Switch) {
+    margin-right: 0;
+  }
+  .column {
+    display: flex;
+    gap: 8px;
   }
 </style>
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index d830d96dba..4006b3def6 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -21,6 +21,9 @@ const TypeIconMap = {
 }
 
 export const getColumnIcon = column => {
+  if (column.schema.autocolumn) {
+    return "MagicWand"
+  }
   const type = column.schema.type
   return TypeIconMap[type] || "Text"
 }

From e01e91e075aaafec0491ab422cc64cb63699fbae Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 5 May 2023 09:13:06 +0100
Subject: [PATCH 29/40] Fix row selection being cleared when exporting rows,
 and ignore download-js click events in click-outside handler

---
 packages/bbui/src/Actions/click_outside.js    |  6 +++-
 .../buttons/grid/GridExportButton.svelte      | 28 ++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js
index 5b7a059493..add1378812 100644
--- a/packages/bbui/src/Actions/click_outside.js
+++ b/packages/bbui/src/Actions/click_outside.js
@@ -1,4 +1,8 @@
-const ignoredClasses = [".flatpickr-calendar", ".spectrum-Popover"]
+const ignoredClasses = [
+  ".flatpickr-calendar",
+  ".spectrum-Popover",
+  ".download-js-link",
+]
 let clickHandlers = []
 
 /**
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridExportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridExportButton.svelte
index 1661808e9d..b5fe202d11 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridExportButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridExportButton.svelte
@@ -9,13 +9,21 @@
   $: selectedRowArray = Object.keys($selectedRows).map(id => ({ _id: id }))
 </script>
 
-<ExportButton
-  {disabled}
-  view={$tableId}
-  filters={$filter}
-  sorting={{
-    sortColumn: $sort.column,
-    sortOrder: $sort.order,
-  }}
-  selectedRows={selectedRowArray}
-/>
+<span data-ignore-click-outside="true">
+  <ExportButton
+    {disabled}
+    view={$tableId}
+    filters={$filter}
+    sorting={{
+      sortColumn: $sort.column,
+      sortOrder: $sort.order,
+    }}
+    selectedRows={selectedRowArray}
+  />
+</span>
+
+<style>
+  span {
+    display: contents;
+  }
+</style>

From 5b0ba593b86ae43a53941d30258006edc390ec85 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 5 May 2023 09:18:00 +0100
Subject: [PATCH 30/40] Move modal consideration CSS selector up a few levels
 to underlay to prevent modal close clicks triggering external handlers

---
 packages/bbui/src/Actions/click_outside.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js
index add1378812..1961dca47c 100644
--- a/packages/bbui/src/Actions/click_outside.js
+++ b/packages/bbui/src/Actions/click_outside.js
@@ -26,8 +26,8 @@ const handleClick = event => {
     }
 
     // Ignore clicks for modals, unless the handler is registered from a modal
-    const sourceInModal = handler.anchor.closest(".spectrum-Modal") != null
-    const clickInModal = event.target.closest(".spectrum-Modal") != null
+    const sourceInModal = handler.anchor.closest(".spectrum-Underlay") != null
+    const clickInModal = event.target.closest(".spectrum-Underlay") != null
     if (clickInModal && !sourceInModal) {
       return
     }

From b0ff61c9ecb8f9faffdd0136230a7dac792cd06b Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 5 May 2023 09:24:57 +0100
Subject: [PATCH 31/40] Feedback update. Console.error to logging.logalert

---
 packages/server/src/utilities/rowProcessor/map.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index 669223b302..808b16178d 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -1,5 +1,6 @@
 // @ts-nocheck
 import { FieldTypes } from "../../constants"
+import { logging } from "@budibase/backend-core"
 
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
@@ -78,7 +79,7 @@ export const TYPE_TRANSFORM_MAP: any = {
         try {
           result = JSON.parse(attachments)
         } catch (e) {
-          console.error("Could not parse attachments", e)
+          logging.logAlert("Could not parse attachments", e)
         }
         return result
       }

From 86ce8eb831c60315cdfaee75c6da71ceb576842a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 5 May 2023 10:45:34 +0100
Subject: [PATCH 32/40] Fix table ID being passed in to access modal

---
 .../backend/DataTable/buttons/grid/GridFilterButton.svelte  | 6 +++---
 .../DataTable/buttons/grid/GridManageAccessButton.svelte    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte
index aff98deaaf..2283862303 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridFilterButton.svelte
@@ -2,19 +2,19 @@
   import TableFilterButton from "../TableFilterButton.svelte"
   import { getContext } from "svelte"
 
-  const { columns, config, filter, table } = getContext("grid")
+  const { columns, tableId, filter, table } = getContext("grid")
 
   const onFilter = e => {
     filter.set(e.detail || [])
   }
 </script>
 
-{#key $config.tableId}
+{#key $tableId}
   <TableFilterButton
     schema={$table?.schema}
     filters={$filter}
     on:change={onFilter}
     disabled={!$columns.length}
-    tableId={$config.tableId}
+    tableId={$tableId}
   />
 {/key}
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
index d41d0a1a25..154007950a 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
@@ -2,7 +2,7 @@
   import ManageAccessButton from "../ManageAccessButton.svelte"
   import { getContext } from "svelte"
 
-  const { config } = getContext("grid")
+  const { tableId } = getContext("grid")
 </script>
 
-<ManageAccessButton resourceId={$config.tableId} />
+<ManageAccessButton resourceId={$tableId} />

From 438afa03cf8cd98c449f541eac742ba4ab0bd03d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 5 May 2023 10:46:36 +0100
Subject: [PATCH 33/40] Remove commented out code

---
 .../src/components/grid/controls/HideColumnsButton.svelte       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
index 691d879ace..fb66b106c9 100644
--- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte
@@ -66,9 +66,7 @@
       {/if}
       {#each $columns as column}
         <div class="column">
-          <!--{#if column.schema.autocolumn}-->
           <Icon size="S" name={getColumnIcon(column)} />
-          <!--{/if}-->
           {column.label}
         </div>
         <Toggle

From 76ad8bca7cd729e72b0c0e8bd97082298a5e8167 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 10:47:43 +0000
Subject: [PATCH 34/40] v2.6.4

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

diff --git a/lerna.json b/lerna.json
index d79ed9b8d3..85dc6dfb4c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.3",
+  "version": "2.6.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1b8627a291..cfe74a66bd 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.3",
+  "version": "2.6.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.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.3",
+    "@budibase/types": "^2.6.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 24b910a8a3..907c85c4fa 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.6.3",
+  "version": "2.6.4",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.3",
-    "@budibase/string-templates": "^2.6.3",
+    "@budibase/shared-core": "^2.6.4",
+    "@budibase/string-templates": "^2.6.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 176881cebc..688da24130 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.3",
-    "@budibase/frontend-core": "^2.6.3",
-    "@budibase/shared-core": "^2.6.3",
-    "@budibase/string-templates": "^2.6.3",
+    "@budibase/bbui": "^2.6.4",
+    "@budibase/frontend-core": "^2.6.4",
+    "@budibase/shared-core": "^2.6.4",
+    "@budibase/string-templates": "^2.6.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 fb20a1e400..4cc909a927 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "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.6.3",
-    "@budibase/string-templates": "^2.6.3",
-    "@budibase/types": "^2.6.3",
+    "@budibase/backend-core": "^2.6.4",
+    "@budibase/string-templates": "^2.6.4",
+    "@budibase/types": "^2.6.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 dd609b26e5..f88cd69202 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.3",
-    "@budibase/frontend-core": "^2.6.3",
-    "@budibase/shared-core": "^2.6.3",
-    "@budibase/string-templates": "^2.6.3",
-    "@budibase/types": "^2.6.3",
+    "@budibase/bbui": "^2.6.4",
+    "@budibase/frontend-core": "^2.6.4",
+    "@budibase/shared-core": "^2.6.4",
+    "@budibase/string-templates": "^2.6.4",
+    "@budibase/types": "^2.6.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 2a75605fbf..f4afebac5a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.3",
+  "version": "2.6.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.6.3",
-    "@budibase/shared-core": "^2.6.3",
+    "@budibase/bbui": "^2.6.4",
+    "@budibase/shared-core": "^2.6.4",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 9cc2f8eeec..c6785e0e4f 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.3",
+  "version": "2.6.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 ded10fc8fd..127f87530d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.3",
-    "@budibase/client": "^2.6.3",
+    "@budibase/backend-core": "^2.6.4",
+    "@budibase/client": "^2.6.4",
     "@budibase/pro": "2.6.3",
-    "@budibase/shared-core": "^2.6.3",
-    "@budibase/string-templates": "^2.6.3",
-    "@budibase/types": "^2.6.3",
+    "@budibase/shared-core": "^2.6.4",
+    "@budibase/string-templates": "^2.6.4",
+    "@budibase/types": "^2.6.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 9d1eff2ef9..d059a798f7 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.3"
+    "@budibase/types": "^2.6.4"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c1161a0b81..cdf778b471 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.3",
+  "version": "2.6.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 f3338889b0..c450d7d0a6 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ca62a606c3..7d401d810e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.3",
+    "@budibase/backend-core": "^2.6.4",
     "@budibase/pro": "2.6.3",
-    "@budibase/string-templates": "^2.6.3",
-    "@budibase/types": "^2.6.3",
+    "@budibase/string-templates": "^2.6.4",
+    "@budibase/types": "^2.6.4",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 488ce6c072b8cef269e785003e16bd250ba6cc2a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 10:49:18 +0000
Subject: [PATCH 35/40] Update pro version to 2.6.4

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 127f87530d..9621586f3e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.4",
     "@budibase/client": "^2.6.4",
-    "@budibase/pro": "2.6.3",
+    "@budibase/pro": "2.6.4",
     "@budibase/shared-core": "^2.6.4",
     "@budibase/string-templates": "^2.6.4",
     "@budibase/types": "^2.6.4",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7d401d810e..690e6ac73b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.4",
-    "@budibase/pro": "2.6.3",
+    "@budibase/pro": "2.6.4",
     "@budibase/string-templates": "^2.6.4",
     "@budibase/types": "^2.6.4",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 491e524344..583adac597 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.2.tgz#b30602c740c244a2cfbcc962af99140d936311b2"
-  integrity sha512-QXNUitikX6ygCr3pSEkAOx9Yw6LsXZCrwgyVRVA7JyGggVjVFn1zOU23/OfD6E9zhj9bMOQpoKTCBAwuvSSICQ==
+"@budibase/pro@2.6.3":
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.3.tgz#c978a50566cd269256c8e3840fe549f768b05408"
+  integrity sha512-YhUR3afV34JmCO0DMFj4682fIaf06GfVmqz8U68j5MviT7JSctiqfFwF4xJaIYJGrLiXogQATFIEE/mLBBv0pA==
   dependencies:
-    "@budibase/backend-core" "2.6.2"
+    "@budibase/backend-core" "2.6.3"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.2"
+    "@budibase/types" "2.6.3"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From eb5e962e65613d103f405f199f7514a4b5023202 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 11:18:39 +0000
Subject: [PATCH 36/40] v2.6.5

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

diff --git a/lerna.json b/lerna.json
index 85dc6dfb4c..28218ad86c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.4",
+  "version": "2.6.5",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index cfe74a66bd..1ba2a0cbb2 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.4",
+  "version": "2.6.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.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.4",
+    "@budibase/types": "^2.6.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 907c85c4fa..513b64fe1a 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.6.4",
+  "version": "2.6.5",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.4",
-    "@budibase/string-templates": "^2.6.4",
+    "@budibase/shared-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.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 688da24130..7da9a8b2b7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.4",
-    "@budibase/frontend-core": "^2.6.4",
-    "@budibase/shared-core": "^2.6.4",
-    "@budibase/string-templates": "^2.6.4",
+    "@budibase/bbui": "^2.6.5",
+    "@budibase/frontend-core": "^2.6.5",
+    "@budibase/shared-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.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 4cc909a927..ce91f44ec5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "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.6.4",
-    "@budibase/string-templates": "^2.6.4",
-    "@budibase/types": "^2.6.4",
+    "@budibase/backend-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.5",
+    "@budibase/types": "^2.6.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 f88cd69202..9a092bcf39 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.4",
-    "@budibase/frontend-core": "^2.6.4",
-    "@budibase/shared-core": "^2.6.4",
-    "@budibase/string-templates": "^2.6.4",
-    "@budibase/types": "^2.6.4",
+    "@budibase/bbui": "^2.6.5",
+    "@budibase/frontend-core": "^2.6.5",
+    "@budibase/shared-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.5",
+    "@budibase/types": "^2.6.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 f4afebac5a..45427c87ee 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.4",
+  "version": "2.6.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.6.4",
-    "@budibase/shared-core": "^2.6.4",
+    "@budibase/bbui": "^2.6.5",
+    "@budibase/shared-core": "^2.6.5",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c6785e0e4f..3a66811f86 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.4",
+  "version": "2.6.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 9621586f3e..f2d32f0415 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.4",
-    "@budibase/client": "^2.6.4",
+    "@budibase/backend-core": "^2.6.5",
+    "@budibase/client": "^2.6.5",
     "@budibase/pro": "2.6.4",
-    "@budibase/shared-core": "^2.6.4",
-    "@budibase/string-templates": "^2.6.4",
-    "@budibase/types": "^2.6.4",
+    "@budibase/shared-core": "^2.6.5",
+    "@budibase/string-templates": "^2.6.5",
+    "@budibase/types": "^2.6.5",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index d059a798f7..4ca3344cee 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.4"
+    "@budibase/types": "^2.6.5"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index cdf778b471..b5d7f23a7d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.4",
+  "version": "2.6.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 c450d7d0a6..10a6fe210f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 690e6ac73b..5f6418ba93 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.4",
+    "@budibase/backend-core": "^2.6.5",
     "@budibase/pro": "2.6.4",
-    "@budibase/string-templates": "^2.6.4",
-    "@budibase/types": "^2.6.4",
+    "@budibase/string-templates": "^2.6.5",
+    "@budibase/types": "^2.6.5",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From cd08227d21fb983eb5f1f3f96ef35121a91f7523 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 11:20:15 +0000
Subject: [PATCH 37/40] Update pro version to 2.6.5

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index f2d32f0415..21f00563c2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.5",
     "@budibase/client": "^2.6.5",
-    "@budibase/pro": "2.6.4",
+    "@budibase/pro": "2.6.5",
     "@budibase/shared-core": "^2.6.5",
     "@budibase/string-templates": "^2.6.5",
     "@budibase/types": "^2.6.5",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5f6418ba93..1d312a7d6d 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.5",
-    "@budibase/pro": "2.6.4",
+    "@budibase/pro": "2.6.5",
     "@budibase/string-templates": "^2.6.5",
     "@budibase/types": "^2.6.5",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 583adac597..d7853ffbd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.3":
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.3.tgz#c978a50566cd269256c8e3840fe549f768b05408"
-  integrity sha512-YhUR3afV34JmCO0DMFj4682fIaf06GfVmqz8U68j5MviT7JSctiqfFwF4xJaIYJGrLiXogQATFIEE/mLBBv0pA==
+"@budibase/pro@2.6.4":
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.4.tgz#b300b401a4615afc250550e9d84151da42ceebc8"
+  integrity sha512-M8IJDT/RhJuIglV+Nt+3yqtlP6fM+WHcqHQr1PxxkU/dntq4fEwWANLQjV+jsKTOuWd/ZLhngkotf0q/B3C8Fg==
   dependencies:
-    "@budibase/backend-core" "2.6.3"
+    "@budibase/backend-core" "2.6.4"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.3"
+    "@budibase/types" "2.6.4"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 25b42f0a28f833ec604934214e9c47235e6dc3b6 Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Fri, 5 May 2023 12:41:24 +0100
Subject: [PATCH 38/40] Rename Integromat to Make. Update logo. (#10492)

---
 packages/builder/assets/integromat.png          | Bin 26614 -> 0 bytes
 packages/builder/assets/make.svg                |   1 +
 .../FlowChart/ActionModal.svelte                |   2 +-
 .../FlowChart/ExternalActions.js                |   4 ++--
 packages/server/src/automations/actions.ts      |   6 +++---
 .../steps/{integromat.ts => make.ts}            |   7 ++++---
 packages/types/src/documents/app/automation.ts  |   1 +
 7 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 packages/builder/assets/integromat.png
 create mode 100644 packages/builder/assets/make.svg
 rename packages/server/src/automations/steps/{integromat.ts => make.ts} (93%)

diff --git a/packages/builder/assets/integromat.png b/packages/builder/assets/integromat.png
deleted file mode 100644
index 1fbbe63e7444ce8a7959293880d85b72d1ae7724..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26614
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

diff --git a/packages/builder/assets/make.svg b/packages/builder/assets/make.svg
new file mode 100644
index 0000000000..75c33cd0b5
--- /dev/null
+++ b/packages/builder/assets/make.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">   <g id="Make-App-Icon-Circle" transform="translate(3757 -1767)">     <circle id="Ellipse_10" data-name="Ellipse 10" cx="256" cy="256" r="256" transform="translate(-3757 1767)" fill="#6d00cc"/>     <path id="Path_141560" data-name="Path 141560" d="M244.78,14.544a7.187,7.187,0,0,0-7.186,7.192V213.927a7.19,7.19,0,0,0,7.186,7.192h52.063a7.187,7.187,0,0,0,7.186-7.192V21.736a7.183,7.183,0,0,0-7.186-7.192ZM92.066,17.083,5.77,188.795a7.191,7.191,0,0,0,3.192,9.654l46.514,23.379a7.184,7.184,0,0,0,9.654-3.2l86.3-171.711a7.184,7.184,0,0,0-3.2-9.654L101.719,13.886a7.2,7.2,0,0,0-9.654,3.2m72.592.614L127.731,204.876a7.189,7.189,0,0,0,5.632,8.442l51.028,10.306a7.2,7.2,0,0,0,8.481-5.665L229.8,30.786a7.19,7.19,0,0,0-5.637-8.442L173.133,12.038a7.391,7.391,0,0,0-1.427-.144,7.194,7.194,0,0,0-7.048,5.8" transform="translate(-3676.356 1905.425)" fill="#fff"/>   </g> </svg>
\ No newline at end of file
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 3a85c7ed56..7c9f31352f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -94,7 +94,7 @@
             />
             <span class="icon-spacing">
               <Body size="XS">
-                {idx.charAt(0).toUpperCase() + idx.slice(1)}
+                {action.stepTitle || idx.charAt(0).toUpperCase() + idx.slice(1)}
               </Body>
             </span>
           </div>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
index 843445a3c2..c6f8d25640 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
@@ -1,11 +1,11 @@
 import DiscordLogo from "assets/discord.svg"
 import ZapierLogo from "assets/zapier.png"
-import IntegromatLogo from "assets/integromat.png"
+import MakeLogo from "assets/make.svg"
 import SlackLogo from "assets/slack.svg"
 
 export const externalActions = {
   zapier: { name: "zapier", icon: ZapierLogo },
   discord: { name: "discord", icon: DiscordLogo },
   slack: { name: "slack", icon: SlackLogo },
-  integromat: { name: "integromat", icon: IntegromatLogo },
+  integromat: { name: "integromat", icon: MakeLogo },
 }
diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts
index 2a6b760725..94d41deabe 100644
--- a/packages/server/src/automations/actions.ts
+++ b/packages/server/src/automations/actions.ts
@@ -9,7 +9,7 @@ import * as serverLog from "./steps/serverLog"
 import * as discord from "./steps/discord"
 import * as slack from "./steps/slack"
 import * as zapier from "./steps/zapier"
-import * as integromat from "./steps/integromat"
+import * as make from "./steps/make"
 import * as filter from "./steps/filter"
 import * as delay from "./steps/delay"
 import * as queryRow from "./steps/queryRows"
@@ -43,7 +43,7 @@ const ACTION_IMPLS: Record<
   discord: discord.run,
   slack: slack.run,
   zapier: zapier.run,
-  integromat: integromat.run,
+  integromat: make.run,
 }
 export const BUILTIN_ACTION_DEFINITIONS: Record<string, AutomationStepSchema> =
   {
@@ -63,7 +63,7 @@ export const BUILTIN_ACTION_DEFINITIONS: Record<string, AutomationStepSchema> =
     discord: discord.definition,
     slack: slack.definition,
     zapier: zapier.definition,
-    integromat: integromat.definition,
+    integromat: make.definition,
   }
 
 // don't add the bash script/definitions unless in self host
diff --git a/packages/server/src/automations/steps/integromat.ts b/packages/server/src/automations/steps/make.ts
similarity index 93%
rename from packages/server/src/automations/steps/integromat.ts
rename to packages/server/src/automations/steps/make.ts
index d7c78a6dd8..324193c2a4 100644
--- a/packages/server/src/automations/steps/integromat.ts
+++ b/packages/server/src/automations/steps/make.ts
@@ -9,10 +9,11 @@ import {
 } from "@budibase/types"
 
 export const definition: AutomationStepSchema = {
-  name: "Integromat Integration",
-  tagline: "Trigger an Integromat scenario",
+  name: "Make Integration",
+  stepTitle: "Make",
+  tagline: "Trigger a Make scenario",
   description:
-    "Performs a webhook call to Integromat and gets the response (if configured)",
+    "Performs a webhook call to Make and gets the response (if configured)",
   icon: "ri-shut-down-line",
   stepId: AutomationActionStepId.integromat,
   type: AutomationStepType.ACTION,
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index aa600c6375..110a2c0642 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -104,6 +104,7 @@ interface InputOutputBlock {
 
 export interface AutomationStepSchema {
   name: string
+  stepTitle?: string
   tagline: string
   icon: string
   description: string

From 0f8d74157cf9d5011465d43c88e1afcd4762e656 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 11:50:53 +0000
Subject: [PATCH 39/40] v2.6.6

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

diff --git a/lerna.json b/lerna.json
index 28218ad86c..ebac370ac8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.5",
+  "version": "2.6.6",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1ba2a0cbb2..6373218402 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.5",
+  "version": "2.6.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.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.5",
+    "@budibase/types": "^2.6.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 513b64fe1a..9b536c1183 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.6.5",
+  "version": "2.6.6",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "^2.6.5",
-    "@budibase/string-templates": "^2.6.5",
+    "@budibase/shared-core": "^2.6.6",
+    "@budibase/string-templates": "^2.6.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 7da9a8b2b7..442e6482b2 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.5",
-    "@budibase/frontend-core": "^2.6.5",
-    "@budibase/shared-core": "^2.6.5",
-    "@budibase/string-templates": "^2.6.5",
+    "@budibase/bbui": "^2.6.6",
+    "@budibase/frontend-core": "^2.6.6",
+    "@budibase/shared-core": "^2.6.6",
+    "@budibase/string-templates": "^2.6.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 ce91f44ec5..ddf27a462e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "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.6.5",
-    "@budibase/string-templates": "^2.6.5",
-    "@budibase/types": "^2.6.5",
+    "@budibase/backend-core": "^2.6.6",
+    "@budibase/string-templates": "^2.6.6",
+    "@budibase/types": "^2.6.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 9a092bcf39..515c05174b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.5",
-    "@budibase/frontend-core": "^2.6.5",
-    "@budibase/shared-core": "^2.6.5",
-    "@budibase/string-templates": "^2.6.5",
-    "@budibase/types": "^2.6.5",
+    "@budibase/bbui": "^2.6.6",
+    "@budibase/frontend-core": "^2.6.6",
+    "@budibase/shared-core": "^2.6.6",
+    "@budibase/string-templates": "^2.6.6",
+    "@budibase/types": "^2.6.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 45427c87ee..d6e7e13300 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.5",
+  "version": "2.6.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.6.5",
-    "@budibase/shared-core": "^2.6.5",
+    "@budibase/bbui": "^2.6.6",
+    "@budibase/shared-core": "^2.6.6",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 3a66811f86..85bc4e4ba2 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.5",
+  "version": "2.6.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 21f00563c2..ce78c3990b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.5",
-    "@budibase/client": "^2.6.5",
+    "@budibase/backend-core": "^2.6.6",
+    "@budibase/client": "^2.6.6",
     "@budibase/pro": "2.6.5",
-    "@budibase/shared-core": "^2.6.5",
-    "@budibase/string-templates": "^2.6.5",
-    "@budibase/types": "^2.6.5",
+    "@budibase/shared-core": "^2.6.6",
+    "@budibase/string-templates": "^2.6.6",
+    "@budibase/types": "^2.6.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 4ca3344cee..aba3c65793 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.5"
+    "@budibase/types": "^2.6.6"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index b5d7f23a7d..b3deeae198 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.5",
+  "version": "2.6.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 10a6fe210f..39b5e834de 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1d312a7d6d..ed7f8a87fd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.5",
+    "@budibase/backend-core": "^2.6.6",
     "@budibase/pro": "2.6.5",
-    "@budibase/string-templates": "^2.6.5",
-    "@budibase/types": "^2.6.5",
+    "@budibase/string-templates": "^2.6.6",
+    "@budibase/types": "^2.6.6",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 83dabb6fc47911730e335648c6687171fdf5a200 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 5 May 2023 11:52:37 +0000
Subject: [PATCH 40/40] Update pro version to 2.6.6

---
 packages/server/package.json |  2 +-
 packages/worker/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index ce78c3990b..4456c99179 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,7 +47,7 @@
     "@apidevtools/swagger-parser": "10.0.3",
     "@budibase/backend-core": "^2.6.6",
     "@budibase/client": "^2.6.6",
-    "@budibase/pro": "2.6.5",
+    "@budibase/pro": "2.6.6",
     "@budibase/shared-core": "^2.6.6",
     "@budibase/string-templates": "^2.6.6",
     "@budibase/types": "^2.6.6",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ed7f8a87fd..d418a1e304 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -38,7 +38,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^2.6.6",
-    "@budibase/pro": "2.6.5",
+    "@budibase/pro": "2.6.6",
     "@budibase/string-templates": "^2.6.6",
     "@budibase/types": "^2.6.6",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index d7853ffbd9..a0cd7741f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.4":
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.4.tgz#b300b401a4615afc250550e9d84151da42ceebc8"
-  integrity sha512-M8IJDT/RhJuIglV+Nt+3yqtlP6fM+WHcqHQr1PxxkU/dntq4fEwWANLQjV+jsKTOuWd/ZLhngkotf0q/B3C8Fg==
+"@budibase/pro@2.6.5":
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.5.tgz#93cababe9e5f846b85222c9b6b31138baeda76cb"
+  integrity sha512-NHpwFKwTVOQ9xloiidvNgYf41xKYm6TmqJgt8xSO4R7Wbo/lGE4agDFjuivabiaVrnTYHm98heu0t+MFP9uZBg==
   dependencies:
-    "@budibase/backend-core" "2.6.4"
+    "@budibase/backend-core" "2.6.5"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.4"
+    "@budibase/types" "2.6.5"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"