From d0ea6edad39e1d608e0c84efc5d3c4fc7658c7a5 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Fri, 27 Oct 2023 10:55:19 +0100
Subject: [PATCH 01/20] Added selected class to data provider options.

---
 .../settings/controls/DataSourceSelect.svelte    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 29f32aa345..15ed945576 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -284,7 +284,7 @@
     </div>
     <ul>
       {#each tables as table}
-        <li on:click={() => handleSelected(table)}>{table.label}</li>
+        <li class:selected={value.label === table.label} on:click={() => handleSelected(table)}>{table.label}</li>
       {/each}
     </ul>
     {#if views?.length}
@@ -294,7 +294,7 @@
       </div>
       <ul>
         {#each views as view}
-          <li on:click={() => handleSelected(view)}>{view.label}</li>
+          <li class:selected={value.label === view.label} on:click={() => handleSelected(view)}>{view.label}</li>
         {/each}
       </ul>
     {/if}
@@ -306,7 +306,7 @@
       <ul>
         {#each queries as query}
           <li
-            class:selected={value === query}
+            class:selected={value.label === query.label}
             on:click={() => handleSelected(query)}
           >
             {query.label}
@@ -321,7 +321,7 @@
       </div>
       <ul>
         {#each links as link}
-          <li on:click={() => handleSelected(link)}>{link.label}</li>
+          <li class:selected={value.label === link.label} on:click={() => handleSelected(link)}>{link.label}</li>
         {/each}
       </ul>
     {/if}
@@ -332,7 +332,7 @@
       </div>
       <ul>
         {#each fields as field}
-          <li on:click={() => handleSelected(field)}>{field.label}</li>
+          <li class:selected={value.label === field.label} on:click={() => handleSelected(field)}>{field.label}</li>
         {/each}
       </ul>
     {/if}
@@ -343,7 +343,7 @@
       </div>
       <ul>
         {#each jsonArrays as field}
-          <li on:click={() => handleSelected(field)}>{field.label}</li>
+          <li class:selected={value.label === field.label} on:click={() => handleSelected(field)}>{field.label}</li>
         {/each}
       </ul>
     {/if}
@@ -355,7 +355,7 @@
       <ul>
         {#each dataProviders as provider}
           <li
-            class:selected={value === provider}
+            class:selected={value.label === provider.label}
             on:click={() => handleSelected(provider)}
           >
             {provider.label}
@@ -368,7 +368,7 @@
       <Heading size="XS">Other</Heading>
     </div>
     <ul>
-      <li on:click={() => handleSelected(custom)}>{custom.label}</li>
+      <li class:selected={value.label === custom.label} on:click={() => handleSelected(custom)}>{custom.label}</li>
       {#if otherSources?.length}
         {#each otherSources as source}
           <li on:click={() => handleSelected(source)}>{source.label}</li>

From 2b691c169f2c7653a4a14752a1fbff6c36c0c2e8 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Fri, 27 Oct 2023 11:13:24 +0100
Subject: [PATCH 02/20] Ran Prettier to fix linting issue.

---
 .../settings/controls/DataSourceSelect.svelte | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 15ed945576..414d7b75d0 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -284,7 +284,12 @@
     </div>
     <ul>
       {#each tables as table}
-        <li class:selected={value.label === table.label} on:click={() => handleSelected(table)}>{table.label}</li>
+        <li
+          class:selected={value.label === table.label}
+          on:click={() => handleSelected(table)}
+        >
+          {table.label}
+        </li>
       {/each}
     </ul>
     {#if views?.length}
@@ -294,7 +299,12 @@
       </div>
       <ul>
         {#each views as view}
-          <li class:selected={value.label === view.label} on:click={() => handleSelected(view)}>{view.label}</li>
+          <li
+            class:selected={value.label === view.label}
+            on:click={() => handleSelected(view)}
+          >
+            {view.label}
+          </li>
         {/each}
       </ul>
     {/if}
@@ -321,7 +331,12 @@
       </div>
       <ul>
         {#each links as link}
-          <li class:selected={value.label === link.label} on:click={() => handleSelected(link)}>{link.label}</li>
+          <li
+            class:selected={value.label === link.label}
+            on:click={() => handleSelected(link)}
+          >
+            {link.label}
+          </li>
         {/each}
       </ul>
     {/if}
@@ -332,7 +347,12 @@
       </div>
       <ul>
         {#each fields as field}
-          <li class:selected={value.label === field.label} on:click={() => handleSelected(field)}>{field.label}</li>
+          <li
+            class:selected={value.label === field.label}
+            on:click={() => handleSelected(field)}
+          >
+            {field.label}
+          </li>
         {/each}
       </ul>
     {/if}
@@ -343,7 +363,12 @@
       </div>
       <ul>
         {#each jsonArrays as field}
-          <li class:selected={value.label === field.label} on:click={() => handleSelected(field)}>{field.label}</li>
+          <li
+            class:selected={value.label === field.label}
+            on:click={() => handleSelected(field)}
+          >
+            {field.label}
+          </li>
         {/each}
       </ul>
     {/if}
@@ -368,7 +393,12 @@
       <Heading size="XS">Other</Heading>
     </div>
     <ul>
-      <li class:selected={value.label === custom.label} on:click={() => handleSelected(custom)}>{custom.label}</li>
+      <li
+        class:selected={value.label === custom.label}
+        on:click={() => handleSelected(custom)}
+      >
+        {custom.label}
+      </li>
       {#if otherSources?.length}
         {#each otherSources as source}
           <li on:click={() => handleSelected(source)}>{source.label}</li>

From 0461d8654564060b868c23eb412937fa58ed3478 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Mon, 30 Oct 2023 09:57:08 +0000
Subject: [PATCH 03/20] Refactored select to match designs used elsewhere.

---
 .../settings/controls/DataSourceSelect.svelte | 163 ++++++++++++++----
 1 file changed, 134 insertions(+), 29 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 414d7b75d0..10b79b986e 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -282,13 +282,26 @@
     <div class="title">
       <Heading size="XS">Tables</Heading>
     </div>
-    <ul>
+    <ul class="spectrum-Menu" role="listbox">
       {#each tables as table}
         <li
-          class:selected={value.label === table.label}
+          class="spectrum-Menu-item"
+          class:is-selected={value.label === table.label}
+          role="option"
+          aria-selected="true"
+          tabindex="0"
           on:click={() => handleSelected(table)}
         >
-          {table.label}
+          <span class="spectrum-Menu-itemLabel">
+            {table.label}
+          </span>
+          <svg
+            class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+            focusable="false"
+            aria-hidden="true"
+          >
+            <use xlink:href="#spectrum-css-icon-Checkmark100" />
+          </svg>
         </li>
       {/each}
     </ul>
@@ -297,13 +310,26 @@
       <div class="title">
         <Heading size="XS">Views</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each views as view}
           <li
-            class:selected={value.label === view.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === view.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(view)}
           >
-            {view.label}
+            <span class="spectrum-Menu-itemLabel">
+              {view.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -313,13 +339,26 @@
       <div class="title">
         <Heading size="XS">Queries</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each queries as query}
           <li
-            class:selected={value.label === query.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === query.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(query)}
           >
-            {query.label}
+            <span class="spectrum-Menu-itemLabel">
+              {query.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -329,13 +368,26 @@
       <div class="title">
         <Heading size="XS">Relationships</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each links as link}
           <li
-            class:selected={value.label === link.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === link.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(link)}
           >
-            {link.label}
+            <span class="spectrum-Menu-itemLabel">
+              {link.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -345,13 +397,26 @@
       <div class="title">
         <Heading size="XS">Fields</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each fields as field}
           <li
-            class:selected={value.label === field.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === field.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(field)}
           >
-            {field.label}
+            <span class="spectrum-Menu-itemLabel">
+              {field.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -361,13 +426,26 @@
       <div class="title">
         <Heading size="XS">JSON Arrays</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each jsonArrays as field}
           <li
-            class:selected={value.label === field.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === field.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(field)}
           >
-            {field.label}
+            <span class="spectrum-Menu-itemLabel">
+              {field.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -377,13 +455,26 @@
       <div class="title">
         <Heading size="XS">Data Providers</Heading>
       </div>
-      <ul>
+      <ul class="spectrum-Menu" role="listbox">
         {#each dataProviders as provider}
           <li
-            class:selected={value.label === provider.label}
+            class="spectrum-Menu-item"
+            class:is-selected={value.label === provider.label}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
             on:click={() => handleSelected(provider)}
           >
-            {provider.label}
+            <span class="spectrum-Menu-itemLabel">
+              {provider.label}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
           </li>
         {/each}
       </ul>
@@ -392,19 +483,32 @@
     <div class="title">
       <Heading size="XS">Other</Heading>
     </div>
-    <ul>
+    <ul class="spectrum-Menu" role="listbox">
       <li
-        class:selected={value.label === custom.label}
+        class="spectrum-Menu-item"
+        class:is-selected={value.label === custom.label}
+        role="option"
+        aria-selected="true"
+        tabindex="0"
         on:click={() => handleSelected(custom)}
       >
-        {custom.label}
+        <span class="spectrum-Menu-itemLabel">
+          {custom.label}
+        </span>
+        <svg
+          class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+          focusable="false"
+          aria-hidden="true"
+        >
+          <use xlink:href="#spectrum-css-icon-Checkmark100" />
+        </svg>
       </li>
-      {#if otherSources?.length}
-        {#each otherSources as source}
-          <li on:click={() => handleSelected(source)}>{source.label}</li>
-        {/each}
-      {/if}
     </ul>
+    {#if otherSources?.length}
+      {#each otherSources as source}
+        <li on:click={() => handleSelected(source)}>{source.label}</li>
+      {/each}
+    {/if}
   </div>
 </Popover>
 
@@ -438,6 +542,7 @@
     list-style: none;
     padding-left: 0px;
     margin: 0px;
+    width: 100%;
   }
 
   li {

From 8f5646a1ed4cfabff4253a6524057131bec021bc Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Mon, 30 Oct 2023 10:15:53 +0000
Subject: [PATCH 04/20] Fixed linting issue.

---
 .../design/settings/controls/DataSourceSelect.svelte          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 10b79b986e..e7f12fd042 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -552,10 +552,6 @@
     font-size: var(--font-size-m);
   }
 
-  .selected {
-    color: var(--spectrum-global-color-blue-600);
-  }
-
   li:hover {
     background-color: var(--spectrum-global-color-gray-200);
   }

From e9f0baa12f61c6d934acd54cadad1833f8f79400 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Mon, 30 Oct 2023 12:17:36 +0000
Subject: [PATCH 05/20] Added conditional logic to prevent checkmark from
 appearing on other selects outside of types.

---
 .../settings/controls/DataSourceSelect.svelte | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index e7f12fd042..545165a25c 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -286,7 +286,8 @@
       {#each tables as table}
         <li
           class="spectrum-Menu-item"
-          class:is-selected={value.label === table.label}
+          class:is-selected={value?.label === table.label &&
+            value?.type === table.type}
           role="option"
           aria-selected="true"
           tabindex="0"
@@ -314,7 +315,8 @@
         {#each views as view}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === view.label}
+            class:is-selected={value?.label === view.label &&
+              value?.type === view.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -343,7 +345,8 @@
         {#each queries as query}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === query.label}
+            class:is-selected={value?.label === query.label &&
+              value?.type === query.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -372,7 +375,8 @@
         {#each links as link}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === link.label}
+            class:is-selected={value?.label === link.label &&
+              value?.type === link.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -401,7 +405,8 @@
         {#each fields as field}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === field.label}
+            class:is-selected={value?.label === field.label &&
+              value?.type === field.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -430,7 +435,8 @@
         {#each jsonArrays as field}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === field.label}
+            class:is-selected={value?.label === field.label &&
+              value?.type === field.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -459,7 +465,8 @@
         {#each dataProviders as provider}
           <li
             class="spectrum-Menu-item"
-            class:is-selected={value.label === provider.label}
+            class:is-selected={value?.label === provider.label &&
+              value?.type === provider.type}
             role="option"
             aria-selected="true"
             tabindex="0"
@@ -486,7 +493,8 @@
     <ul class="spectrum-Menu" role="listbox">
       <li
         class="spectrum-Menu-item"
-        class:is-selected={value.label === custom.label}
+        class:is-selected={value?.label === custom.label &&
+          value?.type === custom.type}
         role="option"
         aria-selected="true"
         tabindex="0"

From bb19e48a6d90f7230504ea3609c47d73afe36a1d Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Tue, 31 Oct 2023 14:22:15 +0000
Subject: [PATCH 06/20] Added new DataSourceSelect component.

---
 .../settings/controls/DataSourceSelect.svelte | 287 ++++--------------
 .../DataSourceSelectItem/SelectItem.svelte    |  60 ++++
 2 files changed, 123 insertions(+), 224 deletions(-)
 create mode 100644 packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 545165a25c..a56614e4e5 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -32,6 +32,7 @@
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import DataSourceSelect from "components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte"
   import { API } from "api"
 
   export let value = {}
@@ -279,243 +280,81 @@
 </div>
 <Popover bind:this={dropdownRight} anchor={anchorRight}>
   <div class="dropdown">
-    <div class="title">
-      <Heading size="XS">Tables</Heading>
-    </div>
-    <ul class="spectrum-Menu" role="listbox">
-      {#each tables as table}
-        <li
-          class="spectrum-Menu-item"
-          class:is-selected={value?.label === table.label &&
-            value?.type === table.type}
-          role="option"
-          aria-selected="true"
-          tabindex="0"
-          on:click={() => handleSelected(table)}
-        >
-          <span class="spectrum-Menu-itemLabel">
-            {table.label}
-          </span>
-          <svg
-            class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-            focusable="false"
-            aria-hidden="true"
-          >
-            <use xlink:href="#spectrum-css-icon-Checkmark100" />
-          </svg>
-        </li>
-      {/each}
-    </ul>
+    <DataSourceSelect
+      heading="Tables"
+      dataSet={tables}
+      {value}
+      onSelect={handleSelected}
+    />
     {#if views?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">Views</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each views as view}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === view.label &&
-              value?.type === view.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(view)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {view.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="Views"
+        dataSet={views}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
     {#if queries?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">Queries</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each queries as query}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === query.label &&
-              value?.type === query.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(query)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {query.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="Queries"
+        dataSet={queries}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
     {#if links?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">Relationships</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each links as link}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === link.label &&
-              value?.type === link.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(link)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {link.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="Links"
+        dataSet={links}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
     {#if fields?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">Fields</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each fields as field}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === field.label &&
-              value?.type === field.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(field)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {field.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="Fields"
+        dataSet={fields}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
     {#if jsonArrays?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">JSON Arrays</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each jsonArrays as field}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === field.label &&
-              value?.type === field.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(field)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {field.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="JSON Arrays"
+        dataSet={jsonArrays}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
     {#if showDataProviders && dataProviders?.length}
-      <Divider />
-      <div class="title">
-        <Heading size="XS">Data Providers</Heading>
-      </div>
-      <ul class="spectrum-Menu" role="listbox">
-        {#each dataProviders as provider}
-          <li
-            class="spectrum-Menu-item"
-            class:is-selected={value?.label === provider.label &&
-              value?.type === provider.type}
-            role="option"
-            aria-selected="true"
-            tabindex="0"
-            on:click={() => handleSelected(provider)}
-          >
-            <span class="spectrum-Menu-itemLabel">
-              {provider.label}
-            </span>
-            <svg
-              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-              focusable="false"
-              aria-hidden="true"
-            >
-              <use xlink:href="#spectrum-css-icon-Checkmark100" />
-            </svg>
-          </li>
-        {/each}
-      </ul>
+      <DataSourceSelect
+        dividerState={true}
+        heading="Data Providers"
+        dataSet={dataProviders}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
-    <Divider />
-    <div class="title">
-      <Heading size="XS">Other</Heading>
-    </div>
-    <ul class="spectrum-Menu" role="listbox">
-      <li
-        class="spectrum-Menu-item"
-        class:is-selected={value?.label === custom.label &&
-          value?.type === custom.type}
-        role="option"
-        aria-selected="true"
-        tabindex="0"
-        on:click={() => handleSelected(custom)}
-      >
-        <span class="spectrum-Menu-itemLabel">
-          {custom.label}
-        </span>
-        <svg
-          class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-          focusable="false"
-          aria-hidden="true"
-        >
-          <use xlink:href="#spectrum-css-icon-Checkmark100" />
-        </svg>
-      </li>
-    </ul>
+    <DataSourceSelect
+      dividerState={true}
+      heading="Other"
+      dataSet={[custom]}
+      {value}
+      onSelect={handleSelected}
+    />
     {#if otherSources?.length}
-      {#each otherSources as source}
-        <li on:click={() => handleSelected(source)}>{source.label}</li>
-      {/each}
+      <DataSourceSelect
+        dividerState={false}
+        heading=""
+        dataSet={otherSources}
+        {value}
+        onSelect={handleSelected}
+      />
     {/if}
   </div>
 </Popover>
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
new file mode 100644
index 0000000000..1fda2da634
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
@@ -0,0 +1,60 @@
+<script>
+  import { Divider, Heading } from "@budibase/bbui"
+
+  export let dividerState
+  export let heading
+  export let dataSet
+  export let value
+  export let onSelect
+</script>
+
+{#if dividerState}
+  <Divider />
+{/if}
+{#if heading.length > 0}
+  <div class="title">
+    <Heading size="XS">{heading}</Heading>
+  </div>
+{/if}
+<ul class="spectrum-Menu" role="listbox">
+  {#each dataSet as data}
+    <li
+      class="spectrum-Menu-item"
+      class:is-selected={value?.label === data.label &&
+        value?.type === data.type}
+      role="option"
+      aria-selected="true"
+      tabindex="0"
+      on:click={() => onSelect(data)}
+      on:keydown={e => {
+        if (e.key === "Enter" || e.key === "Space") {
+          onSelect(data)
+        }
+      }}
+    >
+      <span class="spectrum-Menu-itemLabel">
+        {data.label}
+      </span>
+      <svg
+        class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+        focusable="false"
+        aria-hidden="true"
+      >
+        <use xlink:href="#spectrum-css-icon-Checkmark100" />
+      </svg>
+    </li>
+  {/each}
+</ul>
+
+<style>
+  .title {
+    padding: 0 var(--spacing-m) var(--spacing-s) var(--spacing-m);
+  }
+
+  ul {
+    list-style: none;
+    padding-left: 0px;
+    margin: 0px;
+    width: 100%;
+  }
+</style>

From df688b059669dc29d5cc5e374077e033012c084f Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Tue, 31 Oct 2023 14:36:50 +0000
Subject: [PATCH 07/20] Fixed linting issues.

---
 .../settings/controls/DataSourceSelect.svelte | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index a56614e4e5..0d8e728403 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -7,10 +7,8 @@
   import {
     Button,
     Popover,
-    Divider,
     Select,
     Layout,
-    Heading,
     Drawer,
     DrawerContent,
     Icon,
@@ -381,27 +379,6 @@
     z-index: 99999999;
     overflow-y: scroll;
   }
-  .title {
-    padding: 0 var(--spacing-m) var(--spacing-s) var(--spacing-m);
-  }
-
-  ul {
-    list-style: none;
-    padding-left: 0px;
-    margin: 0px;
-    width: 100%;
-  }
-
-  li {
-    cursor: pointer;
-    margin: 0px;
-    padding: var(--spacing-s) var(--spacing-m);
-    font-size: var(--font-size-m);
-  }
-
-  li:hover {
-    background-color: var(--spectrum-global-color-gray-200);
-  }
 
   .icon {
     margin-left: 8px;

From 6cf1b13a0c7383b7f7576b25f242378e3da40827 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Wed, 1 Nov 2023 09:30:54 +0000
Subject: [PATCH 08/20] Feedback related amends.

---
 .../design/settings/controls/DataSourceSelect.svelte       | 1 -
 .../controls/DataSourceSelectItem/SelectItem.svelte        | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
index 0d8e728403..af4da10466 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
@@ -348,7 +348,6 @@
     {#if otherSources?.length}
       <DataSourceSelect
         dividerState={false}
-        heading=""
         dataSet={otherSources}
         {value}
         onSelect={handleSelected}
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
index 1fda2da634..f7c79b3862 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
@@ -11,7 +11,7 @@
 {#if dividerState}
   <Divider />
 {/if}
-{#if heading.length > 0}
+{#if heading}
   <div class="title">
     <Heading size="XS">{heading}</Heading>
   </div>
@@ -26,11 +26,6 @@
       aria-selected="true"
       tabindex="0"
       on:click={() => onSelect(data)}
-      on:keydown={e => {
-        if (e.key === "Enter" || e.key === "Space") {
-          onSelect(data)
-        }
-      }}
     >
       <span class="spectrum-Menu-itemLabel">
         {data.label}

From 9c71ccd2c48876618819066cc5946ca2f3128b5e Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Wed, 1 Nov 2023 09:34:10 +0000
Subject: [PATCH 09/20] Moved DataSourceSelect into related folder. Changed
 SelectedItem name. Updated DataSourceSelect imports.

---
 .../design/settings/componentSettings.js      |  2 +-
 ...tItem.svelte => DataSourceCategory.svelte} |  0
 .../DataSourceSelect.svelte                   | 20 +++++++++----------
 .../settings/controls/SchemaSelect.svelte     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/builder/src/components/design/settings/controls/DataSourceSelectItem/{SelectItem.svelte => DataSourceCategory.svelte} (100%)
 rename packages/builder/src/components/design/settings/controls/{ => DataSourceSelectItem}/DataSourceSelect.svelte (96%)

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index 232b4bef31..b81361dfa5 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -1,5 +1,5 @@
 import { Checkbox, Select, RadioGroup, Stepper, Input } from "@budibase/bbui"
-import DataSourceSelect from "./controls/DataSourceSelect.svelte"
+import DataSourceSelect from "./controls/DataSourceSelectItem/DataSourceSelect.svelte"
 import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte"
 import DataProviderSelect from "./controls/DataProviderSelect.svelte"
 import ButtonActionEditor from "./controls/ButtonActionEditor/ButtonActionEditor.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte
similarity index 100%
rename from packages/builder/src/components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte
rename to packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte
similarity index 96%
rename from packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
rename to packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte
index af4da10466..1f059ee972 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte
@@ -30,7 +30,7 @@
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import DataSourceSelect from "components/design/settings/controls/DataSourceSelectItem/SelectItem.svelte"
+  import DataSourceCategory from "components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte"
   import { API } from "api"
 
   export let value = {}
@@ -278,14 +278,14 @@
 </div>
 <Popover bind:this={dropdownRight} anchor={anchorRight}>
   <div class="dropdown">
-    <DataSourceSelect
+    <DataSourceCategory
       heading="Tables"
       dataSet={tables}
       {value}
       onSelect={handleSelected}
     />
     {#if views?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="Views"
         dataSet={views}
@@ -294,7 +294,7 @@
       />
     {/if}
     {#if queries?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="Queries"
         dataSet={queries}
@@ -303,7 +303,7 @@
       />
     {/if}
     {#if links?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="Links"
         dataSet={links}
@@ -312,7 +312,7 @@
       />
     {/if}
     {#if fields?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="Fields"
         dataSet={fields}
@@ -321,7 +321,7 @@
       />
     {/if}
     {#if jsonArrays?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="JSON Arrays"
         dataSet={jsonArrays}
@@ -330,7 +330,7 @@
       />
     {/if}
     {#if showDataProviders && dataProviders?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={true}
         heading="Data Providers"
         dataSet={dataProviders}
@@ -338,7 +338,7 @@
         onSelect={handleSelected}
       />
     {/if}
-    <DataSourceSelect
+    <DataSourceCategory
       dividerState={true}
       heading="Other"
       dataSet={[custom]}
@@ -346,7 +346,7 @@
       onSelect={handleSelected}
     />
     {#if otherSources?.length}
-      <DataSourceSelect
+      <DataSourceCategory
         dividerState={false}
         dataSet={otherSources}
         {value}
diff --git a/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte b/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
index 80e36328f1..745b623e72 100644
--- a/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import DataSourceSelect from "./DataSourceSelect.svelte"
+  import DataSourceSelect from "./DataSourceSelectItem/DataSourceSelect.svelte"
 
   const otherSources = [{ name: "Custom", label: "Custom" }]
 </script>

From c4ff4eb8bb1255d8e268d9e0c31f03f50379bf96 Mon Sep 17 00:00:00 2001
From: Conor Webb <conorwebb59@gmail.com>
Date: Thu, 2 Nov 2023 10:00:40 +0000
Subject: [PATCH 10/20] Updated folder name, fixed ui bug.

---
 .../src/components/design/settings/componentSettings.js        | 2 +-
 .../DataSourceCategory.svelte                                  | 0
 .../DataSourceSelect.svelte                                    | 3 +--
 .../components/design/settings/controls/SchemaSelect.svelte    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename packages/builder/src/components/design/settings/controls/{DataSourceSelectItem => DataSourceSelect}/DataSourceCategory.svelte (100%)
 rename packages/builder/src/components/design/settings/controls/{DataSourceSelectItem => DataSourceSelect}/DataSourceSelect.svelte (99%)

diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index b81361dfa5..c2bd08760a 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -1,5 +1,5 @@
 import { Checkbox, Select, RadioGroup, Stepper, Input } from "@budibase/bbui"
-import DataSourceSelect from "./controls/DataSourceSelectItem/DataSourceSelect.svelte"
+import DataSourceSelect from "./controls/DataSourceSelect/DataSourceSelect.svelte"
 import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte"
 import DataProviderSelect from "./controls/DataProviderSelect.svelte"
 import ButtonActionEditor from "./controls/ButtonActionEditor/ButtonActionEditor.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
similarity index 100%
rename from packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte
rename to packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
similarity index 99%
rename from packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte
rename to packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index 1f059ee972..5cda0ebcca 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelectItem/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -30,7 +30,7 @@
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import DataSourceCategory from "components/design/settings/controls/DataSourceSelectItem/DataSourceCategory.svelte"
+  import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
   import { API } from "api"
 
   export let value = {}
@@ -376,7 +376,6 @@
   .dropdown {
     padding: var(--spacing-m) 0;
     z-index: 99999999;
-    overflow-y: scroll;
   }
 
   .icon {
diff --git a/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte b/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
index 745b623e72..dbeeec53ef 100644
--- a/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import DataSourceSelect from "./DataSourceSelectItem/DataSourceSelect.svelte"
+  import DataSourceSelect from "./DataSourceSelect/DataSourceSelect.svelte"
 
   const otherSources = [{ name: "Custom", label: "Custom" }]
 </script>

From e0bf0f6891e60132615742b01338fb1a2b2a3c0a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 Nov 2023 11:52:18 +0100
Subject: [PATCH 11/20] Fix payloads

---
 .github/workflows/deploy-qa.yml      |  8 +++++---
 .github/workflows/release-master.yml | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml
index d850d289ff..0580ac1c3a 100644
--- a/.github/workflows/deploy-qa.yml
+++ b/.github/workflows/deploy-qa.yml
@@ -11,10 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: peter-evans/repository-dispatch@v2
-        env:
-          PAYLOAD_VERSION: ${{ github.sha }}
-          REF_NAME: ${{ github.ref_name}}
         with:
           repository: budibase/budibase-deploys
           event-type: budicloud-qa-deploy
           token: ${{ secrets.GH_ACCESS_TOKEN }}
+          client-payload: |-
+            {
+              "PAYLOAD_VERSION": "${{ github.sha }}",
+              "REF_NAME": "${{ github.ref_name}}"
+            }
diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index df25182cd6..d579670cf6 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -171,11 +171,13 @@ jobs:
           release_version=$(cat lerna.json | jq -r '.version')
           echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
 
-      - uses: passeidireto/trigger-external-workflow-action@main
-        env:
-          PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }}
-          REF_NAME: ${{ github.ref_name}}
+      - uses: peter-evans/repository-dispatch@v2
         with:
           repository: budibase/budibase-deploys
           event: budicloud-qa-deploy
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
+          client-payload: |-
+            {
+              "PAYLOAD_VERSION": "${{ github.sha }}",
+              "REF_NAME": "${{ github.ref_name}}"
+            }

From f74556cb7aacaaa0cc9447481b830a370c49c41e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Nov 2023 11:19:26 +0000
Subject: [PATCH 12/20] Hardcoding the memory used by the build process to make
 sure it always tries to claim as much as it needs to run the build fully
 (avoid heap errors as seen on feature branch builds).

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

diff --git a/package.json b/package.json
index 417fb31e0e..8a27cde104 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "scripts": {
     "preinstall": "node scripts/syncProPackage.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
-    "build": "lerna run build --stream",
+    "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
     "check:types": "lerna run check:types",
     "build:sdk": "lerna run --stream build:sdk",

From f08c42f338f381951599fac6c6a17b6fe524773a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 Nov 2023 13:15:39 +0100
Subject: [PATCH 13/20] Use ref name as payload version

---
 .github/workflows/release-master.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index d579670cf6..7648ae32e7 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -165,11 +165,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Get the current budibase release version
-        id: version
-        run: |
-          release_version=$(cat lerna.json | jq -r '.version')
-          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
 
       - uses: peter-evans/repository-dispatch@v2
         with:
@@ -178,6 +173,6 @@ jobs:
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
           client-payload: |-
             {
-              "PAYLOAD_VERSION": "${{ github.sha }}",
+              "PAYLOAD_VERSION": "${{ github.ref_name }}",
               "REF_NAME": "${{ github.ref_name}}"
             }

From 2ac06465bfdcb6463ba5c3c484ef70da7b2682bd Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:11:16 +0000
Subject: [PATCH 14/20] Remove docs section (#12248)

---
 pull_request_template.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pull_request_template.md b/pull_request_template.md
index 36e2f425d5..fa0f7f2143 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -1,18 +1,16 @@
 ## Description
+
 _Describe the problem or feature in addition to a link to the relevant github issues._
 
-Addresses: 
+Addresses:
+
 - `<Enter the Link to the issue(s) this PR addresses>`
 - ...more if required
 
 ## App Export
+
 - If possible, attach an app export file along with your request template to make QA testing easier, with minimal setup.
 
 ## Screenshots
+
 _If a UI facing feature, a short video of the happy path, and some screenshots of the new functionality._
-
-## Documentation
-- [ ] I have reviewed the budibase documentatation to verify if this feature requires any changes. If changes or new docs are required I have written them.
-
-
-

From 4751f9b240407abee4e60bc212ecca1994c51710 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 2 Nov 2023 13:23:31 +0000
Subject: [PATCH 15/20] Correcting BUDIBASE_VERSION in single image.

---
 hosting/single/Dockerfile.v2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2
index ec03a1b5a2..272860cca2 100644
--- a/hosting/single/Dockerfile.v2
+++ b/hosting/single/Dockerfile.v2
@@ -120,7 +120,7 @@ VOLUME /data
 ARG BUDIBASE_VERSION
 # Ensuring the version argument is sent
 RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
+ENV BUDIBASE_VERSION $BUDIBASE_VERSION
 
 HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
 

From 52510c5e48506dbd1e0cb1f9cdf03949b101fd6c Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Nov 2023 13:24:05 +0000
Subject: [PATCH 16/20] Bump version to 2.12.5

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

diff --git a/lerna.json b/lerna.json
index f0f51242d1..5dd081ec14 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.12.4",
+  "version": "2.12.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From cc37afa4efd022503049b319ff06fc24d20567ef Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 Nov 2023 15:55:10 +0100
Subject: [PATCH 17/20] Fix passing BUDIBASE_VERSION arg

---
 .github/workflows/release-singleimage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-singleimage.yml b/.github/workflows/release-singleimage.yml
index a3444d5e7a..16b1da186a 100644
--- a/.github/workflows/release-singleimage.yml
+++ b/.github/workflows/release-singleimage.yml
@@ -66,7 +66,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          build-args: BUDIBASE_VERSION=$BUDIBASE_VERSION
+          build-args: BUDIBASE_VERSION=${{ env.BUDIBASE_VERSION }}
           tags: budibase/budibase,budibase/budibase:${{ env.RELEASE_VERSION }}
           file: ./hosting/single/Dockerfile.v2
         env:
@@ -79,7 +79,7 @@ jobs:
           platforms: linux/amd64
           build-args: |
             TARGETBUILD=aas
-            BUDIBASE_VERSION=$BUDIBASE_VERSION
+            BUDIBASE_VERSION=${{ env.BUDIBASE_VERSION }}
           tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }}
           file: ./hosting/single/Dockerfile.v2
         env:

From 2ee77cda993391d59a42cbbddf2830ae3dbe8ac3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 Nov 2023 15:58:02 +0100
Subject: [PATCH 18/20] Fix docker

---
 hosting/single/Dockerfile.v2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/single/Dockerfile.v2 b/hosting/single/Dockerfile.v2
index 272860cca2..ec03a1b5a2 100644
--- a/hosting/single/Dockerfile.v2
+++ b/hosting/single/Dockerfile.v2
@@ -120,7 +120,7 @@ VOLUME /data
 ARG BUDIBASE_VERSION
 # Ensuring the version argument is sent
 RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION $BUDIBASE_VERSION
+ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
 
 HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
 

From d02fffc3e1c6fb52d8216e08efae9892805627f5 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 2 Nov 2023 15:00:07 +0000
Subject: [PATCH 19/20] Bump version to 2.12.6

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

diff --git a/lerna.json b/lerna.json
index 5dd081ec14..ff0cbafedd 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.12.5",
+  "version": "2.12.6",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

From 767124163e41e1b9dd7b465f89fb9b8ef83ea5c6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 Nov 2023 16:35:20 +0100
Subject: [PATCH 20/20] Fix

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

diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index 7648ae32e7..bd1efeb2c4 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -169,7 +169,7 @@ jobs:
       - uses: peter-evans/repository-dispatch@v2
         with:
           repository: budibase/budibase-deploys
-          event: budicloud-qa-deploy
+          event-type: budicloud-qa-deploy
           github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
           client-payload: |-
             {