From 4093516a0db895c684e448ee9b4ae420b972dbb0 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 27 Apr 2023 12:46:40 +0100
Subject: [PATCH 01/71] Initial commit of filter UX behaviour

---
 .../_components/BuilderSidePanel.svelte       | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 9a6d9ea1d3..b31488e492 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -28,6 +28,10 @@
   let inviting = false
   let searchFocus = false
 
+  //Or searching = true?
+  let filtered = true
+  $: console.log("filtering enabled ", filtered)
+
   let appInvites = []
   let filteredInvites = []
   let filteredUsers = []
@@ -52,15 +56,31 @@
   }
 
   const filterInvites = async query => {
-    appInvites = await getInvites()
-    if (!query || query == "") {
-      filteredInvites = appInvites
+    if (!prodAppId) {
       return
     }
-    filteredInvites = appInvites.filter(invite => invite.email.includes(query))
+
+    appInvites = await getInvites()
+
+    //On Focus behaviour
+    if (!filtered && (!query || query == "")) {
+      filteredInvites = [...appInvites]
+      return
+    }
+
+    filteredInvites = appInvites.filter(invite => {
+      const inviteInfo = invite.info?.apps
+      if ((!query || query == "") && inviteInfo && prodAppId) {
+        return Object.keys(inviteInfo).includes(prodAppId)
+      }
+      return invite.email.includes(query)
+    })
   }
 
-  $: filterInvites(query)
+  $: filtered, prodAppId, filterInvites(query)
+  $: if (searchFocus === true) {
+    filtered = false
+  }
 
   const usersFetch = fetchData({
     API,
@@ -351,7 +371,7 @@
 
   onMount(() => {
     rendered = true
-    searchFocus = true
+    // searchFocus = true
   })
 
   function handleKeyDown(evt) {
@@ -417,7 +437,6 @@
         autocomplete="off"
         disabled={inviting}
         value={query}
-        autofocus
         on:input={e => {
           query = e.target.value.trim()
         }}
@@ -428,16 +447,20 @@
 
     <span
       class="search-input-icon"
-      class:searching={query}
+      class:searching={query || !filtered}
       on:click={() => {
+        if (!filtered) {
+          filtered = true
+        }
         if (!query) {
           return
         }
         query = null
         userOnboardResponse = null
+        filtered = true
       }}
     >
-      <Icon name={query ? "Close" : "Search"} />
+      <Icon name={!filtered || query ? "Close" : "Search"} />
     </span>
   </div>
 
@@ -481,6 +504,8 @@
                   </div>
                 </div>
                 <div class="auth-entity-access">
+                  <!-- {#key filteredInvites} -->
+                  <!-- {invite.info.apps?.[prodAppId]} -->
                   <RoleSelect
                     placeholder={false}
                     value={invite.info.apps?.[prodAppId]}
@@ -496,6 +521,7 @@
                     autoWidth
                     align="right"
                   />
+                  <!-- {/key} -->
                 </div>
               </div>
             {/each}

From bb981603174bfc4f79b3e85b0bd703c1bb7965f9 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 2 May 2023 14:35:15 +0100
Subject: [PATCH 02/71] On focus search behaviour renders to 100 invites, all
 groups and the first page of current users

---
 .../_components/BuilderSidePanel.svelte       | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index b31488e492..7341dcd35c 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -28,9 +28,9 @@
   let inviting = false
   let searchFocus = false
 
-  //Or searching = true?
-  let filtered = true
-  $: console.log("filtering enabled ", filtered)
+  // Initially filter entities without app access
+  // Show all when false
+  let filterByAppAccess = true
 
   let appInvites = []
   let filteredInvites = []
@@ -38,7 +38,6 @@
   let filteredGroups = []
   let selectedGroup
   let userOnboardResponse = null
-
   let userLimitReachedModal
 
   $: queryIsEmail = emailValidator(query) === true
@@ -63,8 +62,9 @@
     appInvites = await getInvites()
 
     //On Focus behaviour
-    if (!filtered && (!query || query == "")) {
-      filteredInvites = [...appInvites]
+    if (!filterByAppAccess && (!query || query == "")) {
+      filteredInvites =
+        appInvites.length > 100 ? appInvites.slice(0, 100) : [...appInvites]
       return
     }
 
@@ -77,9 +77,9 @@
     })
   }
 
-  $: filtered, prodAppId, filterInvites(query)
+  $: filterByAppAccess, prodAppId, filterInvites(query)
   $: if (searchFocus === true) {
-    filtered = false
+    filterByAppAccess = false
   }
 
   const usersFetch = fetchData({
@@ -99,9 +99,9 @@
     }
     await usersFetch.update({
       query: {
-        appId: query ? null : prodAppId,
+        appId: query || !filterByAppAccess ? null : prodAppId,
         email: query,
-        paginated: query ? null : false,
+        paginated: query || !filterByAppAccess ? null : false,
       },
     })
     await usersFetch.refresh()
@@ -127,7 +127,12 @@
   }
 
   const debouncedUpdateFetch = Utils.debounce(searchUsers, 250)
-  $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded)
+  $: debouncedUpdateFetch(
+    query,
+    $store.builderSidePanel,
+    loaded,
+    filterByAppAccess
+  )
 
   const updateAppUser = async (user, role) => {
     if (!prodAppId) {
@@ -202,9 +207,10 @@
   }
 
   const searchGroups = (userGroups, query) => {
-    let filterGroups = query?.length
-      ? userGroups
-      : getAppGroups(userGroups, prodAppId)
+    let filterGroups =
+      query?.length || !filterByAppAccess
+        ? userGroups
+        : getAppGroups(userGroups, prodAppId)
     return filterGroups
       .filter(group => {
         if (!query?.length) {
@@ -234,7 +240,7 @@
   }
 
   // Adds the 'role' attribute and sets it to the current app.
-  $: enrichedGroups = getEnrichedGroups($groups)
+  $: enrichedGroups = getEnrichedGroups($groups, filterByAppAccess)
   $: filteredGroups = searchGroups(enrichedGroups, query)
   $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers)
   $: allUsers = [...filteredUsers, ...groupUsers]
@@ -246,7 +252,7 @@
     specific roles for the app.
   */
   const buildGroupUsers = (userGroups, filteredUsers) => {
-    if (query) {
+    if (query || !filterByAppAccess) {
       return []
     }
     // Must exclude users who have explicit privileges
@@ -371,7 +377,6 @@
 
   onMount(() => {
     rendered = true
-    // searchFocus = true
   })
 
   function handleKeyDown(evt) {
@@ -447,20 +452,20 @@
 
     <span
       class="search-input-icon"
-      class:searching={query || !filtered}
+      class:searching={query || !filterByAppAccess}
       on:click={() => {
-        if (!filtered) {
-          filtered = true
+        if (!filterByAppAccess) {
+          filterByAppAccess = true
         }
         if (!query) {
           return
         }
         query = null
         userOnboardResponse = null
-        filtered = true
+        filterByAppAccess = true
       }}
     >
-      <Icon name={!filtered || query ? "Close" : "Search"} />
+      <Icon name={!filterByAppAccess || query ? "Close" : "Search"} />
     </span>
   </div>
 
@@ -581,7 +586,7 @@
 
         {#if filteredUsers?.length}
           <div class="auth-entity-section">
-            <div class="auth-entity-header ">
+            <div class="auth-entity-header">
               <div class="auth-entity-title">Users</div>
               <div class="auth-entity-access-title">Access</div>
             </div>

From 20885a708d56969502c4c4505f95a32f3c8eeabd Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 3 May 2023 12:23:21 +0100
Subject: [PATCH 03/71] Feedback updates

---
 .../_components/BuilderSidePanel.svelte       | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 7341dcd35c..5b35e65ed9 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -28,10 +28,6 @@
   let inviting = false
   let searchFocus = false
 
-  // Initially filter entities without app access
-  // Show all when false
-  let filterByAppAccess = true
-
   let appInvites = []
   let filteredInvites = []
   let filteredUsers = []
@@ -62,7 +58,7 @@
     appInvites = await getInvites()
 
     //On Focus behaviour
-    if (!filterByAppAccess && (!query || query == "")) {
+    if (searchFocus && !query) {
       filteredInvites =
         appInvites.length > 100 ? appInvites.slice(0, 100) : [...appInvites]
       return
@@ -77,10 +73,7 @@
     })
   }
 
-  $: filterByAppAccess, prodAppId, filterInvites(query)
-  $: if (searchFocus === true) {
-    filterByAppAccess = false
-  }
+  $: searchFocus, prodAppId, filterInvites(query)
 
   const usersFetch = fetchData({
     API,
@@ -99,9 +92,9 @@
     }
     await usersFetch.update({
       query: {
-        appId: query || !filterByAppAccess ? null : prodAppId,
+        appId: query || searchFocus ? null : prodAppId,
         email: query,
-        paginated: query || !filterByAppAccess ? null : false,
+        paginated: query || searchFocus ? null : false,
       },
     })
     await usersFetch.refresh()
@@ -127,12 +120,7 @@
   }
 
   const debouncedUpdateFetch = Utils.debounce(searchUsers, 250)
-  $: debouncedUpdateFetch(
-    query,
-    $store.builderSidePanel,
-    loaded,
-    filterByAppAccess
-  )
+  $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded, searchFocus)
 
   const updateAppUser = async (user, role) => {
     if (!prodAppId) {
@@ -208,7 +196,7 @@
 
   const searchGroups = (userGroups, query) => {
     let filterGroups =
-      query?.length || !filterByAppAccess
+      query?.length || searchFocus
         ? userGroups
         : getAppGroups(userGroups, prodAppId)
     return filterGroups
@@ -240,7 +228,7 @@
   }
 
   // Adds the 'role' attribute and sets it to the current app.
-  $: enrichedGroups = getEnrichedGroups($groups, filterByAppAccess)
+  $: enrichedGroups = getEnrichedGroups($groups, searchFocus)
   $: filteredGroups = searchGroups(enrichedGroups, query)
   $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers)
   $: allUsers = [...filteredUsers, ...groupUsers]
@@ -252,7 +240,7 @@
     specific roles for the app.
   */
   const buildGroupUsers = (userGroups, filteredUsers) => {
-    if (query || !filterByAppAccess) {
+    if (query || searchFocus) {
       return []
     }
     // Must exclude users who have explicit privileges
@@ -452,20 +440,19 @@
 
     <span
       class="search-input-icon"
-      class:searching={query || !filterByAppAccess}
+      class:searching={query || searchFocus}
       on:click={() => {
-        if (!filterByAppAccess) {
-          filterByAppAccess = true
+        if (searchFocus) {
+          searchFocus = false
         }
         if (!query) {
           return
         }
         query = null
         userOnboardResponse = null
-        filterByAppAccess = true
       }}
     >
-      <Icon name={!filterByAppAccess || query ? "Close" : "Search"} />
+      <Icon name={searchFocus || query ? "Close" : "Search"} />
     </span>
   </div>
 
@@ -509,8 +496,6 @@
                   </div>
                 </div>
                 <div class="auth-entity-access">
-                  <!-- {#key filteredInvites} -->
-                  <!-- {invite.info.apps?.[prodAppId]} -->
                   <RoleSelect
                     placeholder={false}
                     value={invite.info.apps?.[prodAppId]}
@@ -526,7 +511,6 @@
                     autoWidth
                     align="right"
                   />
-                  <!-- {/key} -->
                 </div>
               </div>
             {/each}

From 98963c1505105f2aaf122a25695fe46803de23c5 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 11:21:24 +0100
Subject: [PATCH 04/71] Fix for inclusion parsing for arrays and options. View
 table fix to hide edit button

---
 .../components/backend/DataTable/Table.svelte    |  2 ++
 .../backend/DataTable/ViewDataTable.svelte       |  1 +
 .../server/src/api/controllers/table/utils.ts    | 16 ++++++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 4df6e9a306..bf14bdfc0c 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -22,6 +22,7 @@
   export let rowCount
   export let disableSorting = false
   export let customPlaceholder = false
+  export let allowEditing = true
 
   const dispatch = createEventDispatcher()
 
@@ -109,6 +110,7 @@
         {rowCount}
         {disableSorting}
         {customPlaceholder}
+        allowEditRows={allowEditing}
         showAutoColumns={!hideAutocolumns}
         on:clickrelationship={e => selectRelationship(e.detail)}
         on:sort
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 056bc33994..d239cabd59 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -58,6 +58,7 @@
   {loading}
   {type}
   rowCount={10}
+  allowEditing={false}
   bind:hideAutocolumns
 >
   <ViewFilterButton {view} />
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 1a3eda683b..e57da7ae2d 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -129,17 +129,21 @@ export function importToRows(
     // the real schema of the table passed in, not the clone used for
     // incrementing auto IDs
     for (const [fieldName, schema] of Object.entries(originalTable.schema)) {
+      const rowVal = Array.isArray(row[fieldName]) ? row[fieldName] : [row[fieldName]]
       if (
         (schema.type === FieldTypes.OPTIONS ||
-          schema.type === FieldTypes.ARRAY) &&
-        row[fieldName] &&
-        (!schema.constraints!.inclusion ||
-          schema.constraints!.inclusion.indexOf(row[fieldName]) === -1)
+           schema.type === FieldTypes.ARRAY) &&
+        row[fieldName]
       ) {
-        schema.constraints!.inclusion = [
+        
+        let merged = [
           ...schema.constraints!.inclusion!,
-          row[fieldName],
+          ...rowVal
         ]
+        
+        let superSet = new Set(merged);
+        schema.constraints!.inclusion = Array.from(superSet);
+
         schema.constraints!.inclusion.sort()
       }
     }

From f8da7a9f2853c2b40cd95c1b59595ba82a8d5225 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 12:12:47 +0100
Subject: [PATCH 05/71] Linting

---
 .../server/src/api/controllers/table/utils.ts  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index e57da7ae2d..5681095df7 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -129,20 +129,18 @@ export function importToRows(
     // the real schema of the table passed in, not the clone used for
     // incrementing auto IDs
     for (const [fieldName, schema] of Object.entries(originalTable.schema)) {
-      const rowVal = Array.isArray(row[fieldName]) ? row[fieldName] : [row[fieldName]]
+      const rowVal = Array.isArray(row[fieldName])
+        ? row[fieldName]
+        : [row[fieldName]]
       if (
         (schema.type === FieldTypes.OPTIONS ||
-           schema.type === FieldTypes.ARRAY) &&
+          schema.type === FieldTypes.ARRAY) &&
         row[fieldName]
       ) {
-        
-        let merged = [
-          ...schema.constraints!.inclusion!,
-          ...rowVal
-        ]
-        
-        let superSet = new Set(merged);
-        schema.constraints!.inclusion = Array.from(superSet);
+        let merged = [...schema.constraints!.inclusion!, ...rowVal]
+
+        let superSet = new Set(merged)
+        schema.constraints!.inclusion = Array.from(superSet)
 
         schema.constraints!.inclusion.sort()
       }

From 5cf0e57eec977074c1c7e804b56d85ad2465f405 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 4 May 2023 16:01:34 +0100
Subject: [PATCH 06/71] Feedback updates and a fix pass the current query after
 updating a user invite

---
 .../_components/BuilderSidePanel.svelte       | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 5b35e65ed9..9dce1fdf9b 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -28,6 +28,10 @@
   let inviting = false
   let searchFocus = false
 
+  // Initially filter entities without app access
+  // Show all when false
+  let filterByAppAccess = true
+
   let appInvites = []
   let filteredInvites = []
   let filteredUsers = []
@@ -58,7 +62,7 @@
     appInvites = await getInvites()
 
     //On Focus behaviour
-    if (searchFocus && !query) {
+    if (!filterByAppAccess && !query) {
       filteredInvites =
         appInvites.length > 100 ? appInvites.slice(0, 100) : [...appInvites]
       return
@@ -66,14 +70,17 @@
 
     filteredInvites = appInvites.filter(invite => {
       const inviteInfo = invite.info?.apps
-      if ((!query || query == "") && inviteInfo && prodAppId) {
+      if (!query && inviteInfo && prodAppId) {
         return Object.keys(inviteInfo).includes(prodAppId)
       }
       return invite.email.includes(query)
     })
   }
 
-  $: searchFocus, prodAppId, filterInvites(query)
+  $: filterByAppAccess, prodAppId, filterInvites(query)
+  $: if (searchFocus === true) {
+    filterByAppAccess = false
+  }
 
   const usersFetch = fetchData({
     API,
@@ -92,9 +99,9 @@
     }
     await usersFetch.update({
       query: {
-        appId: query || searchFocus ? null : prodAppId,
+        appId: query || !filterByAppAccess ? null : prodAppId,
         email: query,
-        paginated: query || searchFocus ? null : false,
+        paginated: query || !filterByAppAccess ? null : false,
       },
     })
     await usersFetch.refresh()
@@ -120,7 +127,12 @@
   }
 
   const debouncedUpdateFetch = Utils.debounce(searchUsers, 250)
-  $: debouncedUpdateFetch(query, $store.builderSidePanel, loaded, searchFocus)
+  $: debouncedUpdateFetch(
+    query,
+    $store.builderSidePanel,
+    loaded,
+    filterByAppAccess
+  )
 
   const updateAppUser = async (user, role) => {
     if (!prodAppId) {
@@ -196,7 +208,7 @@
 
   const searchGroups = (userGroups, query) => {
     let filterGroups =
-      query?.length || searchFocus
+      query?.length || !filterByAppAccess
         ? userGroups
         : getAppGroups(userGroups, prodAppId)
     return filterGroups
@@ -228,7 +240,7 @@
   }
 
   // Adds the 'role' attribute and sets it to the current app.
-  $: enrichedGroups = getEnrichedGroups($groups, searchFocus)
+  $: enrichedGroups = getEnrichedGroups($groups, filterByAppAccess)
   $: filteredGroups = searchGroups(enrichedGroups, query)
   $: groupUsers = buildGroupUsers(filteredGroups, filteredUsers)
   $: allUsers = [...filteredUsers, ...groupUsers]
@@ -240,7 +252,7 @@
     specific roles for the app.
   */
   const buildGroupUsers = (userGroups, filteredUsers) => {
-    if (query || searchFocus) {
+    if (query || !filterByAppAccess) {
       return []
     }
     // Must exclude users who have explicit privileges
@@ -335,12 +347,12 @@
         [prodAppId]: role,
       },
     })
-    await filterInvites()
+    await filterInvites(query)
   }
 
   const onUninviteAppUser = async invite => {
     await uninviteAppUser(invite)
-    await filterInvites()
+    await filterInvites(query)
   }
 
   // Purge only the app from the invite or recind the invite if only 1 app remains?
@@ -440,19 +452,20 @@
 
     <span
       class="search-input-icon"
-      class:searching={query || searchFocus}
+      class:searching={query || !filterByAppAccess}
       on:click={() => {
-        if (searchFocus) {
-          searchFocus = false
+        if (!filterByAppAccess) {
+          filterByAppAccess = true
         }
         if (!query) {
           return
         }
         query = null
         userOnboardResponse = null
+        filterByAppAccess = true
       }}
     >
-      <Icon name={searchFocus || query ? "Close" : "Search"} />
+      <Icon name={!filterByAppAccess || query ? "Close" : "Search"} />
     </span>
   </div>
 

From 0aeb06bb2b4da2eaaa97b24bab712eb05fad63d1 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 5 May 2023 13:39:59 +0100
Subject: [PATCH 07/71] Merge commit

---
 packages/server/src/api/controllers/table/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index bc967a90f4..8e248d57ea 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -97,6 +97,9 @@ export async function bulkImport(ctx: UserCtx) {
   // right now we don't trigger anything for bulk import because it
   // can only be done in the builder, but in the future we may need to
   // think about events for bulk items
+
+  //const resp = pickApi({ tableId }).save(ctx)
+
   ctx.status = 200
   ctx.body = { message: `Bulk rows created.` }
 }

From b387f969d92c7e60cb0902124c56d8591b3f7155 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 8 May 2023 15:59:12 +0100
Subject: [PATCH 08/71] allow passwordless redis

---
 packages/backend-core/src/environment.ts       |  2 +-
 packages/server/src/api/routes/public/index.ts |  9 ++++++---
 yarn.lock                                      | 12 ++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 155f09e6d9..72cd1a4af0 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -95,7 +95,7 @@ const environment = {
   GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL || "localhost:6379",
-  REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase",
+  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   MOCK_REDIS: process.env.MOCK_REDIS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index bed798f75b..287f6c11de 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -42,13 +42,16 @@ if (!env.isTest()) {
         host: REDIS_OPTS.host,
         port: REDIS_OPTS.port,
       },
-      password:
-        REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password,
+    }
+
+    if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) {
+      // @ts-ignore
+      options.password = REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password
     }
 
     if (!env.REDIS_CLUSTERED) {
-      // Can't set direct redis db in clustered env
       // @ts-ignore
+      // Can't set direct redis db in clustered env
       options.database = 1
     }
   }
diff --git a/yarn.lock b/yarn.lock
index d293366bb3..4b2bab4ec2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.6":
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.6.tgz#337027168d17a44717c2648b3209a0e2daddcf7d"
-  integrity sha512-RldUn/WjN7eaYRxL4KBufK1yhVIycJOzoncD+BPgRKstuuuYzPultGZcpNsQQiJkAhNR6QXhG+ovvCUiA+AX6g==
+"@budibase/pro@2.6.7":
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400"
+  integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA==
   dependencies:
-    "@budibase/backend-core" "2.6.6"
+    "@budibase/backend-core" "2.6.7"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.6"
+    "@budibase/types" "2.6.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From eb37dacc733642a4b59bdfaafde5abfeeb01ef94 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 8 May 2023 16:23:49 +0100
Subject: [PATCH 09/71] 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 287f6c11de..6852778e68 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -46,7 +46,8 @@ if (!env.isTest()) {
 
     if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) {
       // @ts-ignore
-      options.password = REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password
+      options.password =
+        REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password
     }
 
     if (!env.REDIS_CLUSTERED) {

From 86f0cd8353aefc899f8acdf5f961cd9f6c8315b7 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 8 May 2023 15:52:34 +0000
Subject: [PATCH 10/71] v2.6.8

---
 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 85c77624b8..202e1c6f49 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.7",
+  "version": "2.6.8",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 4e186dd705..03dae9feca 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.7",
+    "@budibase/types": "^2.6.8",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 23a145e7c5..f0fe559705 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.7",
+  "version": "2.6.8",
   "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.7",
-    "@budibase/string-templates": "^2.6.7",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b32d660471..1b69c7aaac 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.7",
-    "@budibase/frontend-core": "^2.6.7",
-    "@budibase/shared-core": "^2.6.7",
-    "@budibase/string-templates": "^2.6.7",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/frontend-core": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c80530f716..a28c66fe65 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "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.7",
-    "@budibase/string-templates": "^2.6.7",
-    "@budibase/types": "^2.6.7",
+    "@budibase/backend-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index c4d3c1b13b..46f365de5d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "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.7",
-    "@budibase/frontend-core": "^2.6.7",
-    "@budibase/shared-core": "^2.6.7",
-    "@budibase/string-templates": "^2.6.7",
-    "@budibase/types": "^2.6.7",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/frontend-core": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 6d917cb863..e701687d10 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.7",
-    "@budibase/shared-core": "^2.6.7",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
     "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 3df72d79fb..5b528a145a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index a8c04bf14e..4e47134947 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.7",
+  "version": "2.6.8",
   "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.7",
-    "@budibase/client": "^2.6.7",
+    "@budibase/backend-core": "^2.6.8",
+    "@budibase/client": "^2.6.8",
     "@budibase/pro": "2.6.7",
-    "@budibase/shared-core": "^2.6.7",
-    "@budibase/string-templates": "^2.6.7",
-    "@budibase/types": "^2.6.7",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@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 e1e4a01f52..68d9824126 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "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.7"
+    "@budibase/types": "^2.6.8"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a02d13b3b6..105cb98472 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index a39114a76d..1e8e46c44d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "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 59e7f18d76..6e44e82649 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.7",
+  "version": "2.6.8",
   "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.7",
+    "@budibase/backend-core": "^2.6.8",
     "@budibase/pro": "2.6.7",
-    "@budibase/string-templates": "^2.6.7",
-    "@budibase/types": "^2.6.7",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From bd13a2d186819e4159b076c92e23b9852a5e49db Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 8 May 2023 15:54:09 +0000
Subject: [PATCH 11/71] Update pro version to 2.6.8

---
 packages/server/package.json | 2 +-
 packages/worker/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 4e47134947..7be437535e 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.8",
     "@budibase/client": "^2.6.8",
-    "@budibase/pro": "2.6.7",
+    "@budibase/pro": "2.6.8",
     "@budibase/shared-core": "^2.6.8",
     "@budibase/string-templates": "^2.6.8",
     "@budibase/types": "^2.6.8",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6e44e82649..ebbe5d62bd 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.8",
-    "@budibase/pro": "2.6.7",
+    "@budibase/pro": "2.6.8",
     "@budibase/string-templates": "^2.6.8",
     "@budibase/types": "^2.6.8",
     "@koa/router": "8.0.8",

From bbf271961f95cf1d7997eb9d13bb84a8a4d00b23 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 9 May 2023 11:48:49 +0100
Subject: [PATCH 12/71] adding healthcheck to proxy service

---
 hosting/proxy/nginx.prod.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hosting/proxy/nginx.prod.conf b/hosting/proxy/nginx.prod.conf
index dce1a71918..1a4415395b 100644
--- a/hosting/proxy/nginx.prod.conf
+++ b/hosting/proxy/nginx.prod.conf
@@ -82,6 +82,12 @@ http {
     set $couchdb ${COUCHDB_UPSTREAM_URL};
     set $watchtower ${WATCHTOWER_UPSTREAM_URL};
 
+    location /health {
+      access_log off;
+      add_header 'Content-Type' 'application/json';
+      return 200 '{ "status": "OK" }';
+    }
+
     location /app {
       proxy_pass      $apps;
     }

From d33a06c89c810e0348e44d71084c39a8aa73901a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 14:54:43 +0200
Subject: [PATCH 13/71] Send search term to api call

---
 .../groups/_components/GroupUsers.svelte      | 21 +++++++++++++++++--
 packages/frontend-core/src/api/groups.js      |  7 +++++--
 .../frontend-core/src/fetch/GroupUserFetch.js |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 9c18008e44..fbc3dd5ac1 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -1,7 +1,7 @@
 <script>
   import EditUserPicker from "./EditUserPicker.svelte"
 
-  import { Heading, Pagination, Table } from "@budibase/bbui"
+  import { Heading, Pagination, Table, Search } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
   import { goto } from "@roxi/routify"
   import { API } from "api"
@@ -12,7 +12,9 @@
 
   export let groupId
 
-  const fetchGroupUsers = fetchData({
+  let searchTerm
+  let fetchGroupUsers
+  $: fetchGroupUsers = fetchData({
     API,
     datasource: {
       type: "groupUser",
@@ -20,6 +22,7 @@
     options: {
       query: {
         groupId,
+        searchTerm,
       },
     },
   })
@@ -67,6 +70,9 @@
   {/if}
 </div>
 
+<div class="controls-right">
+  <Search bind:value={searchTerm} placeholder="Search" />
+</div>
 <Table
   schema={userSchema}
   data={$fetchGroupUsers?.rows}
@@ -109,4 +115,15 @@
     width: 100%;
     text-align: center;
   }
+
+  .controls-right {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+    gap: var(--spacing-xl);
+  }
+  .controls-right :global(.spectrum-Search) {
+    width: 200px;
+  }
 </style>
diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.js
index cbc5bfd72a..8822409025 100644
--- a/packages/frontend-core/src/api/groups.js
+++ b/packages/frontend-core/src/api/groups.js
@@ -55,10 +55,13 @@ export const buildGroupsEndpoints = API => {
     /**
      * Gets a group users by the group id
      */
-    getGroupUsers: async ({ id, bookmark }) => {
+    getGroupUsers: async ({ id, bookmark, searchTerm }) => {
       let url = `/api/global/groups/${id}/users?`
       if (bookmark) {
-        url += `bookmark=${bookmark}`
+        url += `bookmark=${bookmark}&`
+      }
+      if (searchTerm) {
+        url += `searchTerm=${searchTerm}&`
       }
 
       return await API.get({
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.js b/packages/frontend-core/src/fetch/GroupUserFetch.js
index b0ca9a5388..b6704434c8 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.js
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.js
@@ -31,6 +31,7 @@ export default class GroupUserFetch extends DataFetch {
     try {
       const res = await this.API.getGroupUsers({
         id: query.groupId,
+        searchTerm: query.searchTerm,
         bookmark: cursor,
       })
 

From 5e7a8f18e5e4789c185a5d02b24854649ee0d30e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 14:55:43 +0200
Subject: [PATCH 14/71] Fix loading

---
 .../builder/portal/users/groups/_components/GroupUsers.svelte    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index fbc3dd5ac1..1efb2fb66c 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -76,6 +76,7 @@
 <Table
   schema={userSchema}
   data={$fetchGroupUsers?.rows}
+  loading={$fetchGroupUsers.loading}
   allowEditRows={false}
   customPlaceholder
   customRenderers={customUserTableRenderers}

From 63244e1dde6f630720b7941c2df7e840990c9053 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 15:16:41 +0200
Subject: [PATCH 15/71] Add test

---
 packages/pro                                  |  2 +-
 .../api/routes/global/tests/groups.spec.ts    | 22 +++++++++++++++++++
 packages/worker/src/tests/api/groups.ts       |  8 +++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index a0a7b5e156..ae1dd6f353 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit a0a7b5e1566467cc0625fb69309364c750847962
+Subproject commit ae1dd6f353cb8a124e3738fb1a58214db6b2df08
diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts
index 5b7fb9db9e..c93f7a76e4 100644
--- a/packages/worker/src/api/routes/global/tests/groups.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts
@@ -1,5 +1,8 @@
 import { events } from "@budibase/backend-core"
 import { structures, TestConfiguration, mocks } from "../../../../tests"
+import { UserGroup } from "@budibase/types"
+
+mocks.licenses.useGroups()
 
 describe("/api/global/groups", () => {
   const config = new TestConfiguration()
@@ -113,4 +116,23 @@ describe("/api/global/groups", () => {
       })
     })
   })
+
+  describe("find users", () => {
+    describe("without users", () => {
+      let group: UserGroup
+      beforeAll(async () => {
+        group = structures.groups.UserGroup()
+        await config.api.groups.saveGroup(group)
+      })
+
+      it("should return empty", async () => {
+        const result = await config.api.groups.searchUsers(group._id!)
+        expect(result.body).toEqual({
+          users: [],
+          bookmark: undefined,
+          hasNextPage: false,
+        })
+      })
+    })
+  })
 })
diff --git a/packages/worker/src/tests/api/groups.ts b/packages/worker/src/tests/api/groups.ts
index 5524d2a811..a0d7184360 100644
--- a/packages/worker/src/tests/api/groups.ts
+++ b/packages/worker/src/tests/api/groups.ts
@@ -23,4 +23,12 @@ export class GroupsAPI extends TestAPI {
       .expect("Content-Type", /json/)
       .expect(200)
   }
+
+  searchUsers = (id: string) => {
+    return this.request
+      .get(`/api/global/groups/${id}/users`)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+  }
 }

From 3de3ddfa62db6eacb2f22a02bd9f24953d95427a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 15:42:07 +0200
Subject: [PATCH 16/71] Add tests

---
 .../api/routes/global/tests/groups.spec.ts    | 54 ++++++++++++++++++-
 packages/worker/src/tests/api/groups.ts       | 20 ++++++-
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts
index c93f7a76e4..2ad54fc219 100644
--- a/packages/worker/src/api/routes/global/tests/groups.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts
@@ -1,5 +1,10 @@
 import { events } from "@budibase/backend-core"
-import { structures, TestConfiguration, mocks } from "../../../../tests"
+import {
+  structures,
+  TestConfiguration,
+  mocks,
+  generator,
+} from "../../../../tests"
 import { UserGroup } from "@budibase/types"
 
 mocks.licenses.useGroups()
@@ -134,5 +139,52 @@ describe("/api/global/groups", () => {
         })
       })
     })
+
+    describe("existing users", () => {
+      let groupId: string
+      let users: { _id: string; email: string }[] = []
+
+      beforeAll(async () => {
+        groupId = (
+          await config.api.groups.saveGroup(structures.groups.UserGroup())
+        ).body._id
+
+        await Promise.all(
+          Array.from({ length: 30 }).map(async (_, i) => {
+            const email = `user${i}@${generator.domain()}`
+            const user = await config.api.users.saveUser({
+              ...structures.users.user(),
+              email,
+            })
+            users.push({ _id: user.body._id, email })
+          })
+        )
+        users = users.sort((a, b) => a._id.localeCompare(b._id))
+        await config.api.groups.updateGroupUsers(groupId, {
+          add: users.map(u => u._id),
+          remove: [],
+        })
+      })
+
+      it("should return first page", async () => {
+        const result = await config.api.groups.searchUsers(groupId)
+        expect(result.body).toEqual({
+          users: users.slice(0, 10),
+          bookmark: users[10]._id,
+          hasNextPage: true,
+        })
+      })
+
+      it("given a bookmark, should return skip items", async () => {
+        const result = await config.api.groups.searchUsers(groupId, {
+          bookmark: users[7]._id,
+        })
+        expect(result.body).toEqual({
+          users: users.slice(7, 17),
+          bookmark: users[17]._id,
+          hasNextPage: true,
+        })
+      })
+    })
   })
 })
diff --git a/packages/worker/src/tests/api/groups.ts b/packages/worker/src/tests/api/groups.ts
index a0d7184360..950d3b1364 100644
--- a/packages/worker/src/tests/api/groups.ts
+++ b/packages/worker/src/tests/api/groups.ts
@@ -24,9 +24,25 @@ export class GroupsAPI extends TestAPI {
       .expect(200)
   }
 
-  searchUsers = (id: string) => {
+  searchUsers = (id: string, params?: { bookmark?: string }) => {
+    let url = `/api/global/groups/${id}/users?`
+    if (params?.bookmark) {
+      url += `bookmark=${params.bookmark}&`
+    }
     return this.request
-      .get(`/api/global/groups/${id}/users`)
+      .get(url)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+  }
+
+  updateGroupUsers = (
+    id: string,
+    body: { add: string[]; remove: string[] }
+  ) => {
+    return this.request
+      .post(`/api/global/groups/${id}/users`)
+      .send(body)
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)
       .expect(200)

From c05a93f87541db8f21e54a836041541964fc48ff Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 8 May 2023 15:43:40 +0200
Subject: [PATCH 17/71] Test last page search

---
 .../worker/src/api/routes/global/tests/groups.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts
index 2ad54fc219..102c22af8a 100644
--- a/packages/worker/src/api/routes/global/tests/groups.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts
@@ -185,6 +185,17 @@ describe("/api/global/groups", () => {
           hasNextPage: true,
         })
       })
+
+      it("bookmarking the last page, should return last page info", async () => {
+        const result = await config.api.groups.searchUsers(groupId, {
+          bookmark: users[20]._id,
+        })
+        expect(result.body).toEqual({
+          users: users.slice(20),
+          bookmark: undefined,
+          hasNextPage: false,
+        })
+      })
     })
   })
 })

From f8d1f2714c274660eab3edc2ce5079f72d391af8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 12:33:47 +0200
Subject: [PATCH 18/71] Update pro ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index ae1dd6f353..7703fa7a50 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit ae1dd6f353cb8a124e3738fb1a58214db6b2df08
+Subproject commit 7703fa7a50bd93571938e9335e58f100d56799fe

From 1e6652dc396a341fa836e18b7c3cea4ccd672cee Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 10 May 2023 12:36:01 +0100
Subject: [PATCH 19/71] Fix for importing exported array/option fields. Fix to
 ensure lastid and inclusion updates persisted as a result of an import. Test
 updates for array and option fields

---
 .../server/src/api/controllers/table/index.ts |  2 -
 .../src/api/controllers/table/internal.ts     |  5 ++
 .../server/src/api/controllers/table/utils.ts |  2 -
 .../server/src/api/routes/tests/misc.spec.js  | 89 +++++++++++++++++--
 .../server/src/api/routes/tests/row.spec.js   | 67 ++++++++++++--
 .../src/utilities/rowProcessor/index.ts       |  5 +-
 .../server/src/utilities/rowProcessor/map.ts  | 34 +++----
 7 files changed, 167 insertions(+), 37 deletions(-)

diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index 8e248d57ea..cbbda7b930 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -98,8 +98,6 @@ export async function bulkImport(ctx: UserCtx) {
   // can only be done in the builder, but in the future we may need to
   // think about events for bulk items
 
-  //const resp = pickApi({ tableId }).save(ctx)
-
   ctx.status = 200
   ctx.body = { message: `Bulk rows created.` }
 }
diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts
index 628932bba1..d2a4de575e 100644
--- a/packages/server/src/api/controllers/table/internal.ts
+++ b/packages/server/src/api/controllers/table/internal.ts
@@ -184,8 +184,13 @@ export async function destroy(ctx: any) {
 }
 
 export async function bulkImport(ctx: any) {
+  const db = context.getAppDB()
   const table = await sdk.tables.getTable(ctx.params.tableId)
   const { rows } = ctx.request.body
   await handleDataImport(ctx.user, table, rows)
+
+  // Ensure auto id and other table updates are persisted
+  await db.put(table)
+
   return table
 }
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 5681095df7..f088dbaa8e 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -138,10 +138,8 @@ export function importToRows(
         row[fieldName]
       ) {
         let merged = [...schema.constraints!.inclusion!, ...rowVal]
-
         let superSet = new Set(merged)
         schema.constraints!.inclusion = Array.from(superSet)
-
         schema.constraints!.inclusion.sort()
       }
     }
diff --git a/packages/server/src/api/routes/tests/misc.spec.js b/packages/server/src/api/routes/tests/misc.spec.js
index 6dd82df496..21ebea637f 100644
--- a/packages/server/src/api/routes/tests/misc.spec.js
+++ b/packages/server/src/api/routes/tests/misc.spec.js
@@ -73,18 +73,97 @@ describe("run misc tests", () => {
                 type: "string",
               },
             },
+            e: {
+              name: "Auto ID",
+              type: "number",
+              subtype: "autoID",
+              icon: "ri-magic-line",
+              autocolumn: true,
+              constraints: {
+                type: "number",
+                presence: false,
+                numericality: {
+                  greaterThanOrEqualTo: "",
+                  lessThanOrEqualTo: "",
+                },
+              },
+            },
+            f: {
+              type: "array",
+              constraints: {
+                type: "array",
+                presence: {
+                  "allowEmpty": true
+                },
+                inclusion: [
+                  "One",
+                  "Two",
+                  "Three",
+                ]
+              },
+              name: "Sample Tags",
+              sortable: false
+            },
+            g: {
+              type: "options",
+              constraints: {
+                type: "string",
+                presence: false,
+                inclusion: [
+                  "Alpha",
+                  "Beta",
+                  "Gamma"
+                ]
+              },
+              name: "Sample Opts"
+            }
           },
         })
-
+        
+        // Shift specific row tests to the row spec
         await tableUtils.handleDataImport(
           { userId: "test" },
           table,
-          [{ a: '1', b: '2', c: '3', d: '4'}]
+          [
+            { a: '1', b: '2', c: '3', d: '4', f: "['One']", g: "Alpha" },
+            { a: '5', b: '6', c: '7', d: '8', f: "[]", g: undefined},   
+            { a: '9', b: '10', c: '11', d: '12', f: "['Two','Four']", g: ""},
+            { a: '13', b: '14', c: '15', d: '16', g: "Omega"}
+          ]
         )
+
+        // 4 rows imported, the auto ID starts at 1
+        // We expect the handleDataImport function to update the lastID
+        expect(table.schema.e.lastID).toEqual(4);
+        
+        // Array/Multi - should have added a new value to the inclusion.
+        expect(table.schema.f.constraints.inclusion).toEqual(['Four','One','Three','Two']);
+
+        // Options - should have a new value in the inclusion
+        expect(table.schema.g.constraints.inclusion).toEqual(['Alpha','Beta','Gamma','Omega']);
+
         const rows = await config.getRows()
-        expect(rows[0].a).toEqual("1")
-        expect(rows[0].b).toEqual("2")
-        expect(rows[0].c).toEqual("3")
+        expect(rows.length).toEqual(4);
+
+        const rowOne = rows.find(row => row.e === 1)
+        expect(rowOne.a).toEqual("1")
+        expect(rowOne.f).toEqual(['One'])
+        expect(rowOne.g).toEqual('Alpha')
+
+        const rowTwo = rows.find(row => row.e === 2)
+        expect(rowTwo.a).toEqual("5")
+        expect(rowTwo.f).toEqual([])
+        expect(rowTwo.g).toEqual(undefined)
+        
+        const rowThree = rows.find(row => row.e === 3)
+        expect(rowThree.a).toEqual("9")
+        expect(rowThree.f).toEqual(['Two','Four'])
+        expect(rowThree.g).toEqual(null)
+
+        const rowFour = rows.find(row => row.e === 4)
+        expect(rowFour.a).toEqual("13")
+        expect(rowFour.f).toEqual(undefined)
+        expect(rowFour.g).toEqual('Omega')
       })
     })
   })
diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js
index 4b835a1fb5..105dd21ae0 100644
--- a/packages/server/src/api/routes/tests/row.spec.js
+++ b/packages/server/src/api/routes/tests/row.spec.js
@@ -34,9 +34,9 @@ describe("/rows", () => {
     row = basicRow(table._id)
   })
 
-  const loadRow = async (id, status = 200) =>
+  const loadRow = async (id, tbl_Id, status = 200) =>
     await request
-      .get(`/api/${table._id}/rows/${id}`)
+      .get(`/api/${tbl_Id}/rows/${id}`)
       .set(config.defaultHeaders())
       .expect("Content-Type", /json/)
       .expect(status)
@@ -182,8 +182,32 @@ describe("/rows", () => {
           type: "string",
           presence: false,
           datetime: { earliest: "", latest: "" },
-        },
+        }
       }
+      const arrayField = {
+        type: "array",
+        constraints: {
+          type: "array",
+          presence: false,
+          inclusion: [
+            "One",
+            "Two",
+            "Three",
+          ]
+        },
+        name: "Sample Tags",
+        sortable: false
+      }
+      const optsField = {
+        fieldName: "Sample Opts",
+        name: "Sample Opts",
+        type: "options",
+        constraints: {
+          type: "string",
+          presence: false,
+          inclusion: [ "Alpha", "Beta", "Gamma" ]
+        },
+      },
 
       table = await config.createTable({
         name: "TestTable2",
@@ -212,7 +236,15 @@ describe("/rows", () => {
           attachmentNull: attachment,
           attachmentUndefined: attachment,
           attachmentEmpty: attachment,
-          attachmentEmptyArrayStr: attachment
+          attachmentEmptyArrayStr: attachment,
+          arrayFieldEmptyArrayStr: arrayField,
+          arrayFieldArrayStrKnown: arrayField,
+          arrayFieldNull: arrayField,
+          arrayFieldUndefined: arrayField,
+          optsFieldEmptyStr: optsField,
+          optsFieldUndefined: optsField,
+          optsFieldNull: optsField,
+          optsFieldStrKnown: optsField
         },
       })
 
@@ -241,11 +273,20 @@ describe("/rows", () => {
         attachmentUndefined: undefined,
         attachmentEmpty: "",
         attachmentEmptyArrayStr: "[]",
+        arrayFieldEmptyArrayStr: "[]",
+        arrayFieldUndefined: undefined,
+        arrayFieldNull: null,
+        arrayFieldArrayStrKnown: "['One']",
+        optsFieldEmptyStr: "",
+        optsFieldUndefined: undefined,
+        optsFieldNull: null,
+        optsFieldStrKnown: 'Alpha'
       }
 
-      const id = (await config.createRow(row))._id
+      const createdRow = await config.createRow(row);
+      const id = createdRow._id
 
-      const saved = (await loadRow(id)).body
+      const saved = (await loadRow(id, table._id)).body
 
       expect(saved.stringUndefined).toBe(undefined)
       expect(saved.stringNull).toBe("")
@@ -270,7 +311,15 @@ describe("/rows", () => {
       expect(saved.attachmentNull).toEqual([])
       expect(saved.attachmentUndefined).toBe(undefined)
       expect(saved.attachmentEmpty).toEqual([])
-      expect(saved.attachmentEmptyArrayStr).toEqual([])
+      expect(saved.attachmentEmptyArrayStr).toEqual([])      
+      expect(saved.arrayFieldEmptyArrayStr).toEqual([])
+      expect(saved.arrayFieldNull).toEqual([])
+      expect(saved.arrayFieldUndefined).toEqual(undefined)
+      expect(saved.optsFieldEmptyStr).toEqual(null)
+      expect(saved.optsFieldUndefined).toEqual(undefined)
+      expect(saved.optsFieldNull).toEqual(null)
+      expect(saved.arrayFieldArrayStrKnown).toEqual(['One'])
+      expect(saved.optsFieldStrKnown).toEqual('Alpha')
     })
   })
 
@@ -299,7 +348,7 @@ describe("/rows", () => {
       expect(res.body.name).toEqual("Updated Name")
       expect(res.body.description).toEqual(existing.description)
 
-      const savedRow = await loadRow(res.body._id)
+      const savedRow = await loadRow(res.body._id, table._id)
 
       expect(savedRow.body.description).toEqual(existing.description)
       expect(savedRow.body.name).toEqual("Updated Name")
@@ -401,7 +450,7 @@ describe("/rows", () => {
         .expect(200)
 
       expect(res.body.length).toEqual(2)
-      await loadRow(row1._id, 404)
+      await loadRow(row1._id, table._id, 404)
       await assertRowUsage(rowUsage - 2)
       await assertQueryUsage(queryUsage + 1)
     })
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index a5bb352eeb..44cab4d18b 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -137,8 +137,7 @@ export function inputProcessing(
   opts?: AutoColumnProcessingOpts
 ) {
   let clonedRow = cloneDeep(row)
-  // need to copy the table so it can be differenced on way out
-  const copiedTable = cloneDeep(table)
+
   const dontCleanseKeys = ["type", "_id", "_rev", "tableId"]
   for (let [key, value] of Object.entries(clonedRow)) {
     const field = table.schema[key]
@@ -175,7 +174,7 @@ export function inputProcessing(
   }
 
   // handle auto columns - this returns an object like {table, row}
-  return processAutoColumn(user, copiedTable, clonedRow, opts)
+  return processAutoColumn(user, table, clonedRow, opts)
 }
 
 /**
diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index 808b16178d..cf6823856c 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -2,6 +2,22 @@
 import { FieldTypes } from "../../constants"
 import { logging } from "@budibase/backend-core"
 
+const parseArrayString = value => {
+  if (typeof value === "string") {
+    if (value === "") {
+      return []
+    }
+    let result
+    try {
+      result = JSON.parse(value.replace(/'/g, '"'))
+      return result
+    } catch (e) {
+      logging.logAlert("Could not parse row value", e)
+    }
+  }
+  return value
+}
+
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
  */
@@ -26,9 +42,9 @@ export const TYPE_TRANSFORM_MAP: any = {
     [undefined]: undefined,
   },
   [FieldTypes.ARRAY]: {
-    "": [],
     [null]: [],
     [undefined]: undefined,
+    parse: parseArrayString,
   },
   [FieldTypes.STRING]: {
     "": "",
@@ -70,21 +86,7 @@ export const TYPE_TRANSFORM_MAP: any = {
   [FieldTypes.ATTACHMENT]: {
     [null]: [],
     [undefined]: undefined,
-    parse: attachments => {
-      if (typeof attachments === "string") {
-        if (attachments === "") {
-          return []
-        }
-        let result
-        try {
-          result = JSON.parse(attachments)
-        } catch (e) {
-          logging.logAlert("Could not parse attachments", e)
-        }
-        return result
-      }
-      return attachments
-    },
+    parse: parseArrayString,
   },
   [FieldTypes.BOOLEAN]: {
     "": null,

From 77d1f9250c64164f898915ad33d1584e0c5813c1 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 10 May 2023 12:52:54 +0100
Subject: [PATCH 20/71] Updated import row test to evaluate the name and _id
 fields on the table instead of the entire object.

---
 packages/server/src/api/routes/tests/table.spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/table.spec.js b/packages/server/src/api/routes/tests/table.spec.js
index d28f2232ee..9c6980c1d7 100644
--- a/packages/server/src/api/routes/tests/table.spec.js
+++ b/packages/server/src/api/routes/tests/table.spec.js
@@ -167,7 +167,10 @@ describe("/tables", () => {
 
       expect(events.table.created).not.toHaveBeenCalled()
       expect(events.rows.imported).toBeCalledTimes(1)
-      expect(events.rows.imported).toBeCalledWith(table, 1)
+      expect(events.rows.imported).toBeCalledWith(expect.objectContaining({
+        name: "TestTable",
+        _id: table._id
+      }), 1)
     })
   })
 

From 0882046ea2776fed67547de44930061a9e24cc98 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 14:53:30 +0200
Subject: [PATCH 21/71] Test search by email

---
 packages/pro                                  |  2 +-
 packages/types/src/sdk/db.ts                  |  4 +-
 .../api/routes/global/tests/groups.spec.ts    | 91 +++++++++++++------
 packages/worker/src/tests/api/groups.ts       |  8 +-
 4 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/packages/pro b/packages/pro
index 7703fa7a50..375fbd3d12 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 7703fa7a50bd93571938e9335e58f100d56799fe
+Subproject commit 375fbd3d1229a741ea3962dc42de479118020e95
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 58b3b7e5bc..023f6382e7 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -57,8 +57,8 @@ export type DatabaseDeleteIndexOpts = {
 
 export type DatabaseQueryOpts = {
   include_docs?: boolean
-  startkey?: string
-  endkey?: string
+  startkey?: string | string[]
+  endkey?: string | string[]
   limit?: number
   skip?: number
   descending?: boolean
diff --git a/packages/worker/src/api/routes/global/tests/groups.spec.ts b/packages/worker/src/api/routes/global/tests/groups.spec.ts
index 102c22af8a..afeaae952c 100644
--- a/packages/worker/src/api/routes/global/tests/groups.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/groups.spec.ts
@@ -1,10 +1,6 @@
 import { events } from "@budibase/backend-core"
-import {
-  structures,
-  TestConfiguration,
-  mocks,
-  generator,
-} from "../../../../tests"
+import { generator } from "@budibase/backend-core/tests"
+import { structures, TestConfiguration, mocks } from "../../../../tests"
 import { UserGroup } from "@budibase/types"
 
 mocks.licenses.useGroups()
@@ -166,34 +162,71 @@ describe("/api/global/groups", () => {
         })
       })
 
-      it("should return first page", async () => {
-        const result = await config.api.groups.searchUsers(groupId)
-        expect(result.body).toEqual({
-          users: users.slice(0, 10),
-          bookmark: users[10]._id,
-          hasNextPage: true,
+      describe("pagination", () => {
+        it("should return first page", async () => {
+          const result = await config.api.groups.searchUsers(groupId)
+          expect(result.body).toEqual({
+            users: users.slice(0, 10),
+            bookmark: users[10]._id,
+            hasNextPage: true,
+          })
+        })
+
+        it("given a bookmark, should return skip items", async () => {
+          const result = await config.api.groups.searchUsers(groupId, {
+            bookmark: users[7]._id,
+          })
+          expect(result.body).toEqual({
+            users: users.slice(7, 17),
+            bookmark: users[17]._id,
+            hasNextPage: true,
+          })
+        })
+
+        it("bookmarking the last page, should return last page info", async () => {
+          const result = await config.api.groups.searchUsers(groupId, {
+            bookmark: users[20]._id,
+          })
+          expect(result.body).toEqual({
+            users: users.slice(20),
+            bookmark: undefined,
+            hasNextPage: false,
+          })
         })
       })
 
-      it("given a bookmark, should return skip items", async () => {
-        const result = await config.api.groups.searchUsers(groupId, {
-          bookmark: users[7]._id,
-        })
-        expect(result.body).toEqual({
-          users: users.slice(7, 17),
-          bookmark: users[17]._id,
-          hasNextPage: true,
-        })
-      })
+      describe("search by email", () => {
+        it('should be able to search "starting" by email', async () => {
+          const result = await config.api.groups.searchUsers(groupId, {
+            emailSearch: `user1`,
+          })
 
-      it("bookmarking the last page, should return last page info", async () => {
-        const result = await config.api.groups.searchUsers(groupId, {
-          bookmark: users[20]._id,
+          const matchedUsers = users
+            .filter(u => u.email.startsWith("user1"))
+            .sort((a, b) => a.email.localeCompare(b.email))
+
+          expect(result.body).toEqual({
+            users: matchedUsers.slice(0, 10),
+            bookmark: matchedUsers[10].email,
+            hasNextPage: true,
+          })
         })
-        expect(result.body).toEqual({
-          users: users.slice(20),
-          bookmark: undefined,
-          hasNextPage: false,
+
+        it("should be able to bookmark when searching by email", async () => {
+          const matchedUsers = users
+            .filter(u => u.email.startsWith("user1"))
+            .sort((a, b) => a.email.localeCompare(b.email))
+
+          const result = await config.api.groups.searchUsers(groupId, {
+            emailSearch: `user1`,
+            bookmark: matchedUsers[4].email,
+          })
+
+          expect(result.body).toEqual({
+            users: matchedUsers.slice(4),
+            bookmark: undefined,
+            hasNextPage: false,
+          })
         })
       })
     })
diff --git a/packages/worker/src/tests/api/groups.ts b/packages/worker/src/tests/api/groups.ts
index 950d3b1364..91f7c92c7d 100644
--- a/packages/worker/src/tests/api/groups.ts
+++ b/packages/worker/src/tests/api/groups.ts
@@ -24,11 +24,17 @@ export class GroupsAPI extends TestAPI {
       .expect(200)
   }
 
-  searchUsers = (id: string, params?: { bookmark?: string }) => {
+  searchUsers = (
+    id: string,
+    params?: { bookmark?: string; emailSearch?: string }
+  ) => {
     let url = `/api/global/groups/${id}/users?`
     if (params?.bookmark) {
       url += `bookmark=${params.bookmark}&`
     }
+    if (params?.emailSearch) {
+      url += `emailSearch=${params.emailSearch}&`
+    }
     return this.request
       .get(url)
       .set(this.config.defaultHeaders())

From 0d5c14f22ae1678a569bb28afd88567bd15d23f8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 14:54:30 +0200
Subject: [PATCH 22/71] Rename view

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

diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index aa40f13775..be49b9f261 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -21,7 +21,7 @@ export enum ViewName {
   AUTOMATION_LOGS = "automation_logs",
   ACCOUNT_BY_EMAIL = "account_by_email",
   PLATFORM_USERS_LOWERCASE = "platform_users_lowercase",
-  USER_BY_GROUP = "by_group_user",
+  USER_BY_GROUP = "user_by_group",
   APP_BACKUP_BY_TRIGGER = "by_trigger",
 }
 

From 46963bca69b609709f65a48044da2a14f1d5ea17 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 15:19:45 +0200
Subject: [PATCH 23/71] Search on frontend

---
 .../portal/users/groups/_components/GroupUsers.svelte       | 6 +++---
 packages/frontend-core/src/api/groups.js                    | 6 +++---
 packages/frontend-core/src/fetch/GroupUserFetch.js          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 1efb2fb66c..0848633949 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -12,7 +12,7 @@
 
   export let groupId
 
-  let searchTerm
+  let emailSearch
   let fetchGroupUsers
   $: fetchGroupUsers = fetchData({
     API,
@@ -22,7 +22,7 @@
     options: {
       query: {
         groupId,
-        searchTerm,
+        emailSearch,
       },
     },
   })
@@ -71,7 +71,7 @@
 </div>
 
 <div class="controls-right">
-  <Search bind:value={searchTerm} placeholder="Search" />
+  <Search bind:value={emailSearch} placeholder="Search" />
 </div>
 <Table
   schema={userSchema}
diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.js
index 8822409025..72cbe30718 100644
--- a/packages/frontend-core/src/api/groups.js
+++ b/packages/frontend-core/src/api/groups.js
@@ -55,13 +55,13 @@ export const buildGroupsEndpoints = API => {
     /**
      * Gets a group users by the group id
      */
-    getGroupUsers: async ({ id, bookmark, searchTerm }) => {
+    getGroupUsers: async ({ id, bookmark, emailSearch }) => {
       let url = `/api/global/groups/${id}/users?`
       if (bookmark) {
         url += `bookmark=${bookmark}&`
       }
-      if (searchTerm) {
-        url += `searchTerm=${searchTerm}&`
+      if (emailSearch) {
+        url += `emailSearch=${emailSearch}&`
       }
 
       return await API.get({
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.js b/packages/frontend-core/src/fetch/GroupUserFetch.js
index b6704434c8..bd2cf264c5 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.js
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.js
@@ -31,7 +31,7 @@ export default class GroupUserFetch extends DataFetch {
     try {
       const res = await this.API.getGroupUsers({
         id: query.groupId,
-        searchTerm: query.searchTerm,
+        emailSearch: query.emailSearch,
         bookmark: cursor,
       })
 

From 1434bb9ac9c9b5b399620fd58842aa30e6881173 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 15:23:00 +0200
Subject: [PATCH 24/71] Improve messaging

---
 .../portal/users/groups/_components/GroupUsers.svelte     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 0848633949..75de57521b 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -71,7 +71,7 @@
 </div>
 
 <div class="controls-right">
-  <Search bind:value={emailSearch} placeholder="Search" />
+  <Search bind:value={emailSearch} placeholder="Search email" />
 </div>
 <Table
   schema={userSchema}
@@ -83,7 +83,11 @@
   on:click={e => $goto(`../users/${e.detail._id}`)}
 >
   <div class="placeholder" slot="placeholder">
-    <Heading size="S">This user group doesn't have any users</Heading>
+    <Heading size="S"
+      >{emailSearch
+        ? `No users found matching the email "${emailSearch}"`
+        : "This user group doesn't have any users"}</Heading
+    >
   </div>
 </Table>
 

From 530c8ce8d77159e1663590362964cd66f199033e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 10 May 2023 13:43:51 +0000
Subject: [PATCH 25/71] v2.6.9

---
 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 202e1c6f49..bb1246fb5e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.8",
+  "version": "2.6.9",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 03dae9feca..2ed8f8914c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.8",
+    "@budibase/types": "^2.6.9",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f0fe559705..96e7bc9dc8 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.8",
+  "version": "2.6.9",
   "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.8",
-    "@budibase/string-templates": "^2.6.8",
+    "@budibase/shared-core": "^2.6.9",
+    "@budibase/string-templates": "^2.6.9",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1b69c7aaac..7ac642f560 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.8",
-    "@budibase/frontend-core": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
+    "@budibase/bbui": "^2.6.9",
+    "@budibase/frontend-core": "^2.6.9",
+    "@budibase/shared-core": "^2.6.9",
+    "@budibase/string-templates": "^2.6.9",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a28c66fe65..4a964821de 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "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.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/backend-core": "^2.6.9",
+    "@budibase/string-templates": "^2.6.9",
+    "@budibase/types": "^2.6.9",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 46f365de5d..9bc4194095 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "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.8",
-    "@budibase/frontend-core": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/bbui": "^2.6.9",
+    "@budibase/frontend-core": "^2.6.9",
+    "@budibase/shared-core": "^2.6.9",
+    "@budibase/string-templates": "^2.6.9",
+    "@budibase/types": "^2.6.9",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index e701687d10..c322f0a84d 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.8",
-    "@budibase/shared-core": "^2.6.8",
+    "@budibase/bbui": "^2.6.9",
+    "@budibase/shared-core": "^2.6.9",
     "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 5b528a145a..3e96f57328 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 7be437535e..352feb6ac8 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.8",
+  "version": "2.6.9",
   "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.8",
-    "@budibase/client": "^2.6.8",
+    "@budibase/backend-core": "^2.6.9",
+    "@budibase/client": "^2.6.9",
     "@budibase/pro": "2.6.8",
-    "@budibase/shared-core": "^2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/shared-core": "^2.6.9",
+    "@budibase/string-templates": "^2.6.9",
+    "@budibase/types": "^2.6.9",
     "@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 68d9824126..f659aaea9d 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "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.8"
+    "@budibase/types": "^2.6.9"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 105cb98472..c97b5f8fe3 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1e8e46c44d..034f6562c7 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "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 ebbe5d62bd..1a12ceb889 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.8",
+  "version": "2.6.9",
   "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.8",
+    "@budibase/backend-core": "^2.6.9",
     "@budibase/pro": "2.6.8",
-    "@budibase/string-templates": "^2.6.8",
-    "@budibase/types": "^2.6.8",
+    "@budibase/string-templates": "^2.6.9",
+    "@budibase/types": "^2.6.9",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 70705a8519d490b1b613dd2a36fc2e824b29055c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 10 May 2023 13:45:43 +0000
Subject: [PATCH 26/71] Update pro version to 2.6.9

---
 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 352feb6ac8..ca8d00311b 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.9",
     "@budibase/client": "^2.6.9",
-    "@budibase/pro": "2.6.8",
+    "@budibase/pro": "2.6.9",
     "@budibase/shared-core": "^2.6.9",
     "@budibase/string-templates": "^2.6.9",
     "@budibase/types": "^2.6.9",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1a12ceb889..86804e5326 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.9",
-    "@budibase/pro": "2.6.8",
+    "@budibase/pro": "2.6.9",
     "@budibase/string-templates": "^2.6.9",
     "@budibase/types": "^2.6.9",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 4b2bab4ec2..3792431ed0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.7":
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400"
-  integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA==
+"@budibase/pro@2.6.8":
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.8.tgz#739938cdee6afa138383708401d20eadd3a15555"
+  integrity sha512-nYpD+B9wGLonzOzeOs1Ym9PLgPsQrzui56TmkPPBJpFOAfCo8GLb8fwqDHGuZiEo5e+M96BgcJTAfpOzFQ7wgw==
   dependencies:
-    "@budibase/backend-core" "2.6.7"
+    "@budibase/backend-core" "2.6.8"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.7"
+    "@budibase/types" "2.6.8"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 6d6f8d416cda483e7404cbf00dbd02325832d03e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 10 May 2023 15:46:01 +0200
Subject: [PATCH 27/71] Arrange UI

---
 .../portal/users/groups/_components/GroupUsers.svelte    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 75de57521b..3159425b06 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -62,16 +62,15 @@
 </script>
 
 <div class="header">
-  <Heading size="S">Users</Heading>
   {#if !scimEnabled}
     <EditUserPicker {groupId} onUsersUpdated={fetchGroupUsers.getInitialData} />
   {:else}
     <ScimBanner />
   {/if}
-</div>
 
-<div class="controls-right">
-  <Search bind:value={emailSearch} placeholder="Search email" />
+  <div class="controls-right">
+    <Search bind:value={emailSearch} placeholder="Search email" />
+  </div>
 </div>
 <Table
   schema={userSchema}
@@ -109,7 +108,7 @@
   .header {
     display: flex;
     flex-direction: row;
-    justify-content: flex-start;
+    justify-content: space-between;
     align-items: center;
     gap: var(--spacing-l);
   }

From 58878ac57c2735b9238d49391cff66e88b96c12b Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Thu, 11 May 2023 08:20:52 +0200
Subject: [PATCH 28/71] Adds account locking if user limit is exceeded

---
 .../licensing/AccountLockedModal.svelte       | 31 +++++++++++++++++++
 .../portal/licensing/licensingBanners.js      | 15 +++------
 .../src/components/start/AppRow.svelte        | 11 +++++--
 .../src/pages/builder/apps/index.svelte       |  2 +-
 .../pages/builder/portal/apps/index.svelte    | 28 ++++++++++++++---
 .../users/_components/AddUserModal.svelte     |  4 +--
 .../users/_components/ImportUsersModal.svelte |  6 ++--
 .../builder/portal/users/users/index.svelte   | 12 +++----
 .../builder/src/stores/portal/licensing.js    | 22 ++++++-------
 9 files changed, 89 insertions(+), 42 deletions(-)
 create mode 100644 packages/builder/src/components/portal/licensing/AccountLockedModal.svelte

diff --git a/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte
new file mode 100644
index 0000000000..63bb6dcfd9
--- /dev/null
+++ b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte
@@ -0,0 +1,31 @@
+<script>
+  import { Modal, ModalContent, Body } from "@budibase/bbui"
+
+  let modal
+
+  export let onConfirm
+
+  export function show() {
+    modal.show()
+  }
+
+  export function hide() {
+    modal.hide()
+  }
+</script>
+
+<Modal bind:this={modal} on:hide={modal}>
+  <ModalContent
+    title="Your account is currently locked"
+    size="S"
+    showCancelButton={true}
+    showCloseIcon={false}
+    confirmText={"View plans"}
+    {onConfirm}
+  >
+    <Body size="S"
+      >Due to the free plan user limit being exceeded, your account has been
+      de-activated. Upgrade your plan to re-activate your account.</Body
+    >
+  </ModalContent>
+</Modal>
diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index dafa8cfaed..ea4a1bb946 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -3,7 +3,6 @@ import { temporalStore } from "builderStore"
 import { admin, auth, licensing } from "stores/portal"
 import { get } from "svelte/store"
 import { BANNER_TYPES } from "@budibase/bbui"
-import { capitalise } from "helpers"
 
 const oneDayInSeconds = 86400
 
@@ -146,23 +145,19 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => {
   const userLicensing = get(licensing)
   return {
     key: EXPIRY_KEY,
-    type: BANNER_TYPES.WARNING,
+    type: BANNER_TYPES.NEGATIVE,
     onChange: () => {
       defaultCacheFn(EXPIRY_KEY)
     },
     criteria: () => {
-      return userLicensing.warnUserLimit
+      return userLicensing.errUserLimit
     },
-    message: `${capitalise(
-      userLicensing.license.plan.type
-    )} plan changes - Users will be limited to ${
-      userLicensing.userLimit
-    } users in ${userLicensing.userLimitDays}`,
+    message: "Your Budibase account is de-activated. Upgrade your plan",
     ...{
-      extraButtonText: "Find out more",
+      extraButtonText: "View plans",
       extraButtonAction: () => {
         defaultCacheFn(ExpiringKeys.LICENSING_USERS_ABOVE_LIMIT_BANNER)
-        window.location.href = "/builder/portal/users/users"
+        window.location.href = "https://budibase.com/pricing/"
       },
     },
     showCloseButton: true,
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 34d083a096..194f897fdc 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -6,6 +6,8 @@
 
   export let app
 
+  export let lockedAction
+
   const handleDefaultClick = () => {
     if (window.innerWidth < 640) {
       goToOverview()
@@ -29,7 +31,7 @@
   }
 </script>
 
-<div class="app-row" on:click={handleDefaultClick}>
+<div class="app-row" on:click={lockedAction || handleDefaultClick}>
   <div class="title">
     <div class="app-icon">
       <Icon size="L" name={app.icon?.name || "Apps"} color={app.icon?.color} />
@@ -58,8 +60,11 @@
 
   <div class="app-row-actions">
     <AppLockModal {app} buttonSize="M" />
-    <Button size="S" secondary on:click={goToOverview}>Manage</Button>
-    <Button size="S" primary on:click={goToBuilder}>Edit</Button>
+    <Button size="S" secondary on:click={lockedAction || goToOverview}
+      >Manage</Button
+    >
+    <Button size="S" primary on:click={lockedAction || goToBuilder}>Edit</Button
+    >
   </div>
 </div>
 
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 23f4df5bb5..4b77671345 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -133,7 +133,7 @@
             </Body>
           </Layout>
           <Divider />
-          {#if $licensing.usageMetrics?.dayPasses >= 100}
+          {#if $licensing.usageMetrics?.dayPasses >= 100 || $licensing.errUserLimit}
             <div>
               <Layout gap="S" justifyItems="center">
                 <img class="spaceman" alt="spaceman" src={Spaceman} />
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 783cac49d7..edd308f382 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -14,6 +14,7 @@
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
   import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
+  import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte"
 
   import { store, automationStore } from "builderStore"
   import { API } from "api"
@@ -28,6 +29,7 @@
   let template
   let creationModal
   let appLimitModal
+  let accountLockedModal
   let creatingApp = false
   let searchTerm = ""
   let creatingFromTemplate = false
@@ -49,6 +51,10 @@
   )
   $: automationErrors = getAutomationErrors(enrichedApps)
 
+  const usersLimitLockAction = $licensing?.errUserLimit
+    ? () => accountLockedModal.show()
+    : null
+
   const enrichApps = (apps, user, sortBy) => {
     const enrichedApps = apps.map(app => ({
       ...app,
@@ -189,6 +195,9 @@
         creatingFromTemplate = true
         createAppFromTemplateUrl(initInfo.init_template)
       }
+      if (usersLimitLockAction) {
+        usersLimitLockAction()
+      }
     } catch (error) {
       notifications.error("Error getting init info")
     }
@@ -230,20 +239,30 @@
         <Layout noPadding gap="L">
           <div class="title">
             <div class="buttons">
-              <Button size="M" cta on:click={initiateAppCreation}>
+              <Button
+                size="M"
+                cta
+                on:click={usersLimitLockAction || initiateAppCreation}
+              >
                 Create new app
               </Button>
               {#if $apps?.length > 0}
                 <Button
                   size="M"
                   secondary
-                  on:click={$goto("/builder/portal/apps/templates")}
+                  on:click={usersLimitLockAction ||
+                    $goto("/builder/portal/apps/templates")}
                 >
                   View templates
                 </Button>
               {/if}
               {#if !$apps?.length}
-                <Button size="L" quiet secondary on:click={initiateAppImport}>
+                <Button
+                  size="L"
+                  quiet
+                  secondary
+                  on:click={usersLimitLockAction || initiateAppImport}
+                >
                   Import app
                 </Button>
               {/if}
@@ -267,7 +286,7 @@
 
           <div class="app-table">
             {#each filteredApps as app (app.appId)}
-              <AppRow {app} />
+              <AppRow {app} lockedAction={usersLimitLockAction} />
             {/each}
           </div>
         </Layout>
@@ -294,6 +313,7 @@
 </Modal>
 
 <AppLimitModal bind:this={appLimitModal} />
+<AccountLockedModal bind:this={accountLockedModal} />
 
 <style>
   .title {
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
index 6908639f6f..23048e099d 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
@@ -30,8 +30,8 @@
   $: hasError = userData.find(x => x.error != null)
 
   $: userCount = $licensing.userCount + userData.length
-  $: willReach = licensing.willReachUserLimit(userCount)
-  $: willExceed = licensing.willExceedUserLimit(userCount)
+  $: willReach = licensing.usersLimitReached(userCount)
+  $: willExceed = licensing.usersLimitExceeded(userCount)
 
   function removeInput(idx) {
     userData = userData.filter((e, i) => i !== idx)
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
index b35c6c998f..338cc1e7c1 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
@@ -25,10 +25,10 @@
   $: invalidEmails = []
 
   $: userCount = $licensing.userCount + userEmails.length
-  $: willExceed = licensing.willExceedUserLimit(userCount)
+  $: exceed = licensing.usersLimitExceeded(userCount)
 
   $: importDisabled =
-    !userEmails.length || !validEmails(userEmails) || !usersRole || willExceed
+    !userEmails.length || !validEmails(userEmails) || !usersRole || exceed
 
   const validEmails = userEmails => {
     if ($admin.cloud && userEmails.length > MAX_USERS_UPLOAD_LIMIT) {
@@ -93,7 +93,7 @@
     </label>
   </div>
 
-  {#if willExceed}
+  {#if exceed}
     <div class="user-notification">
       <Icon name="Info" />
       {capitalise($licensing.license.plan.type)} plan is limited to {$licensing.userLimit}
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 8006ae0294..c4ee10d83a 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -246,7 +246,7 @@
     <Body>Add users and control who gets access to your published apps</Body>
   </Layout>
   <Divider />
-  {#if $licensing.warnUserLimit}
+  {#if $licensing.errUserLimit}
     <InlineAlert
       type="error"
       onConfirm={() => {
@@ -258,13 +258,9 @@
       }}
       buttonText={isOwner ? "Upgrade" : "View plans"}
       cta
-      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 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.
-    `}
+      header="Account de-activated"
+      message="Due to the free plan user limit being exceeded, your account has been de-activated.
+      Upgrade your plan to re-activate your account."
     />
   {/if}
   <div class="controls">
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index e6056f1993..9caf7cac02 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -39,21 +39,21 @@ export const createLicensingStore = () => {
     userLimit: undefined,
     userLimitDays: undefined,
     userLimitReached: false,
-    warnUserLimit: false,
+    errUserLimit: false,
   }
 
   const oneDayInMilliseconds = 86400000
 
   const store = writable(DEFAULT)
 
-  function willReachUserLimit(userCount, userLimit) {
+  function usersLimitReached(userCount, userLimit) {
     if (userLimit === UNLIMITED) {
       return false
     }
     return userCount >= userLimit
   }
 
-  function willExceedUserLimit(userCount, userLimit) {
+  function usersLimitExceeded(userCount, userLimit) {
     if (userLimit === UNLIMITED) {
       return false
     }
@@ -130,11 +130,11 @@ export const createLicensingStore = () => {
       })
       actions.setUsageMetrics()
     },
-    willReachUserLimit: userCount => {
-      return willReachUserLimit(userCount, get(store).userLimit)
+    usersLimitReached: userCount => {
+      return usersLimitReached(userCount, get(store).userLimit)
     },
-    willExceedUserLimit(userCount) {
-      return willExceedUserLimit(userCount, get(store).userLimit)
+    usersLimitExceeded(userCount) {
+      return usersLimitExceeded(userCount, get(store).userLimit)
     },
     setUsageMetrics: () => {
       if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) {
@@ -198,11 +198,11 @@ export const createLicensingStore = () => {
         const userQuota = license.quotas.usage.static.users
         const userLimit = userQuota?.value
         const userCount = usage.usageQuota.users
-        const userLimitReached = willReachUserLimit(userCount, userLimit)
-        const userLimitExceeded = willExceedUserLimit(userCount, userLimit)
+        const userLimitReached = usersLimitReached(userCount, userLimit)
+        const userLimitExceeded = usersLimitExceeded(userCount, userLimit)
         const days = dayjs(userQuota?.startDate).diff(dayjs(), "day")
         const userLimitDays = days > 1 ? `${days} days` : "1 day"
-        const warnUserLimit = userQuota?.startDate && userLimitExceeded
+        const errUserLimit = userQuota?.startDate && userLimitExceeded
 
         store.update(state => {
           return {
@@ -219,7 +219,7 @@ export const createLicensingStore = () => {
             userLimit,
             userLimitDays,
             userLimitReached,
-            warnUserLimit,
+            errUserLimit,
           }
         })
       }

From 4d6669b6fe682bf5ca603c516388037cf3be31e3 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Thu, 11 May 2023 09:13:00 +0200
Subject: [PATCH 29/71] Modify modal to open pricing plan

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

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index edd308f382..1680d55ff8 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -50,6 +50,7 @@
         : true)
   )
   $: automationErrors = getAutomationErrors(enrichedApps)
+  $: isOwner = $auth.accountPortalAccess && $admin.cloud
 
   const usersLimitLockAction = $licensing?.errUserLimit
     ? () => accountLockedModal.show()
@@ -313,7 +314,10 @@
 </Modal>
 
 <AppLimitModal bind:this={appLimitModal} />
-<AccountLockedModal bind:this={accountLockedModal} />
+<AccountLockedModal bind:this={accountLockedModal} onConfirm={() =>
+    isOwner
+      ? $licensing.goToUpgradePage()
+      : window.open("https://budibase.com/pricing/", "_blank")} />
 
 <style>
   .title {

From f2fc1c0b604d1046576b04488a789563c637b937 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Thu, 11 May 2023 09:43:54 +0200
Subject: [PATCH 30/71] Refactor: Avoid will...

---
 .../portal/users/users/_components/AddUserModal.svelte    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
index 23048e099d..a4e0ebd4bb 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
@@ -30,8 +30,8 @@
   $: hasError = userData.find(x => x.error != null)
 
   $: userCount = $licensing.userCount + userData.length
-  $: willReach = licensing.usersLimitReached(userCount)
-  $: willExceed = licensing.usersLimitExceeded(userCount)
+  $: reached = licensing.usersLimitReached(userCount)
+  $: exceeded = licensing.usersLimitExceeded(userCount)
 
   function removeInput(idx) {
     userData = userData.filter((e, i) => i !== idx)
@@ -87,7 +87,7 @@
   confirmDisabled={disabled}
   cancelText="Cancel"
   showCloseIcon={false}
-  disabled={hasError || !userData.length || willExceed}
+  disabled={hasError || !userData.length || exceeded}
 >
   <Layout noPadding gap="XS">
     <Label>Email address</Label>
@@ -118,7 +118,7 @@
       </div>
     {/each}
 
-    {#if willReach}
+    {#if reached}
       <div class="user-notification">
         <Icon name="Info" />
         <span>

From 1ebd1c274f49060edd63ca988497559933562f6f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 11 May 2023 13:32:46 +0200
Subject: [PATCH 31/71] Undo key changes

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

diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 023f6382e7..58b3b7e5bc 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -57,8 +57,8 @@ export type DatabaseDeleteIndexOpts = {
 
 export type DatabaseQueryOpts = {
   include_docs?: boolean
-  startkey?: string | string[]
-  endkey?: string | string[]
+  startkey?: string
+  endkey?: string
   limit?: number
   skip?: number
   descending?: boolean

From f7fbce344461145d795302343320dd670d281b0c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 11 May 2023 17:11:13 +0100
Subject: [PATCH 32/71] Fix multiple issues with first app onboarding

---
 .../portal/apps/onboarding/index.svelte       | 147 ++++++++++--------
 1 file changed, 83 insertions(+), 64 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 8e018ae907..546f5f57ba 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -107,8 +107,9 @@
     useSampleData,
     isGoogle,
   }) => {
+    let app
     try {
-      const app = await createApp(useSampleData)
+      app = await createApp(useSampleData)
 
       let datasource
       if (datasourceConfig) {
@@ -134,6 +135,17 @@
       console.log(e)
       creationLoading = false
       notifications.error("There was a problem creating your app")
+
+      // Reset the store so that we don't send up stale headers
+      store.actions.reset()
+
+      // If we successfully created an app, delete it again so that we
+      // can try again once the error has been corrected.
+      // This also ensures onboarding can't be skipped by entering invalid
+      // data credentials.
+      if (app?.appId) {
+        await API.deleteApp(app.appId)
+      }
     }
   }
 </script>
@@ -146,80 +158,87 @@
   />
 </Modal>
 
-<SplitPage>
-  {#if stage === "name"}
-    <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
-  {:else if googleComplete}
-    <div class="centered">
-      <Body
-        >Please login to your Google account in the new tab which as opened to
-        continue.</Body
-      >
-    </div>
-  {:else if integrationsLoading || creationLoading}
-    <div class="centered">
-      <Spinner />
-    </div>
-  {:else if stage === "data"}
-    <DataPanel onBack={() => (stage = "name")}>
-      <div class="dataButton">
-        <FancyButton on:click={() => handleCreateApp({ useSampleData: true })}>
-          <div class="dataButtonContent">
-            <div class="dataButtonIcon">
-              <img
-                alt="Budibase Logo"
-                class="budibaseLogo"
-                src={"https://i.imgur.com/Xhdt1YP.png"}
-              />
-            </div>
-            Budibase Sample data
-          </div>
-        </FancyButton>
+<div class="full-width">
+  <SplitPage>
+    {#if stage === "name"}
+      <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
+    {:else if googleComplete}
+      <div class="centered">
+        <Body
+          >Please login to your Google account in the new tab which as opened to
+          continue.</Body
+        >
       </div>
-      <div class="dataButton">
-        <FancyButton on:click={uploadModal.show}>
-          <div class="dataButtonContent">
-            <div class="dataButtonIcon">
-              <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
-            </div>
-            Upload data (CSV or JSON)
-          </div>
-        </FancyButton>
+    {:else if integrationsLoading || creationLoading}
+      <div class="centered">
+        <Spinner />
       </div>
-      {#each Object.entries(plusIntegrations) as [integrationType, schema]}
+    {:else if stage === "data"}
+      <DataPanel onBack={() => (stage = "name")}>
         <div class="dataButton">
-          <FancyButton on:click={() => (stage = integrationType)}>
+          <FancyButton
+            on:click={() => handleCreateApp({ useSampleData: true })}
+          >
             <div class="dataButtonContent">
               <div class="dataButtonIcon">
-                <IntegrationIcon {integrationType} {schema} />
+                <img
+                  alt="Budibase Logo"
+                  class="budibaseLogo"
+                  src={"https://i.imgur.com/Xhdt1YP.png"}
+                />
               </div>
-              {schema.friendlyName}
+              Budibase Sample data
             </div>
           </FancyButton>
         </div>
-      {/each}
-    </DataPanel>
-  {:else if stage in plusIntegrations}
-    <DatasourceConfigPanel
-      title={plusIntegrations[stage].friendlyName}
-      fields={plusIntegrations[stage].datasource}
-      type={stage}
-      onBack={() => (stage = "data")}
-      onNext={data => {
-        const isGoogle = data.isGoogle
-        delete data.isGoogle
-        return handleCreateApp({ datasourceConfig: data, isGoogle })
-      }}
-    />
-  {:else}
-    <p>There was an problem. Please refresh the page and try again.</p>
-  {/if}
-  <div slot="right">
-    <ExampleApp {name} showData={stage !== "name"} />
-  </div>
-</SplitPage>
+        <div class="dataButton">
+          <FancyButton on:click={uploadModal.show}>
+            <div class="dataButtonContent">
+              <div class="dataButtonIcon">
+                <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
+              </div>
+              Upload data (CSV or JSON)
+            </div>
+          </FancyButton>
+        </div>
+        {#each Object.entries(plusIntegrations) as [integrationType, schema]}
+          <div class="dataButton">
+            <FancyButton on:click={() => (stage = integrationType)}>
+              <div class="dataButtonContent">
+                <div class="dataButtonIcon">
+                  <IntegrationIcon {integrationType} {schema} />
+                </div>
+                {schema.friendlyName}
+              </div>
+            </FancyButton>
+          </div>
+        {/each}
+      </DataPanel>
+    {:else if stage in plusIntegrations}
+      <DatasourceConfigPanel
+        title={plusIntegrations[stage].friendlyName}
+        fields={plusIntegrations[stage].datasource}
+        type={stage}
+        onBack={() => (stage = "data")}
+        onNext={data => {
+          const isGoogle = data.isGoogle
+          delete data.isGoogle
+          return handleCreateApp({ datasourceConfig: data, isGoogle })
+        }}
+      />
+    {:else}
+      <p>There was an problem. Please refresh the page and try again.</p>
+    {/if}
+    <div slot="right">
+      <ExampleApp {name} showData={stage !== "name"} />
+    </div>
+  </SplitPage>
+</div>
 
 <style>
+  .full-width {
+    width: 100%;
+  }
   .centered {
     display: flex;
     justify-content: center;

From eccb0edb0fc4104d923df29574e77788f6556f51 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 11 May 2023 17:35:07 +0000
Subject: [PATCH 33/71] v2.6.10

---
 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 bb1246fb5e..48af3c36b2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.9",
+  "version": "2.6.10",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 2ed8f8914c..9cfc572101 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.9",
+    "@budibase/types": "^2.6.10",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 96e7bc9dc8..60bf76f61a 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.9",
+  "version": "2.6.10",
   "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.9",
-    "@budibase/string-templates": "^2.6.9",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7ac642f560..d015fb61a5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.9",
-    "@budibase/frontend-core": "^2.6.9",
-    "@budibase/shared-core": "^2.6.9",
-    "@budibase/string-templates": "^2.6.9",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/frontend-core": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4a964821de..f59ea2a714 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "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.9",
-    "@budibase/string-templates": "^2.6.9",
-    "@budibase/types": "^2.6.9",
+    "@budibase/backend-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 9bc4194095..4fd715ddf6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "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.9",
-    "@budibase/frontend-core": "^2.6.9",
-    "@budibase/shared-core": "^2.6.9",
-    "@budibase/string-templates": "^2.6.9",
-    "@budibase/types": "^2.6.9",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/frontend-core": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index c322f0a84d..52a75894a3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.9",
-    "@budibase/shared-core": "^2.6.9",
+    "@budibase/bbui": "^2.6.10",
+    "@budibase/shared-core": "^2.6.10",
     "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 3e96f57328..75a205bd30 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index ca8d00311b..a3a72bfcc4 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.9",
+  "version": "2.6.10",
   "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.9",
-    "@budibase/client": "^2.6.9",
+    "@budibase/backend-core": "^2.6.10",
+    "@budibase/client": "^2.6.10",
     "@budibase/pro": "2.6.9",
-    "@budibase/shared-core": "^2.6.9",
-    "@budibase/string-templates": "^2.6.9",
-    "@budibase/types": "^2.6.9",
+    "@budibase/shared-core": "^2.6.10",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@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 f659aaea9d..aa91f71dca 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "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.9"
+    "@budibase/types": "^2.6.10"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c97b5f8fe3..9c80fd31ff 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 034f6562c7..7f54b87c14 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "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 86804e5326..06844df403 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.9",
+  "version": "2.6.10",
   "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.9",
+    "@budibase/backend-core": "^2.6.10",
     "@budibase/pro": "2.6.9",
-    "@budibase/string-templates": "^2.6.9",
-    "@budibase/types": "^2.6.9",
+    "@budibase/string-templates": "^2.6.10",
+    "@budibase/types": "^2.6.10",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0b8cf0f9bc47d04324573359c20600dab619bb15 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 11 May 2023 17:36:44 +0000
Subject: [PATCH 34/71] Update pro version to 2.6.10

---
 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 a3a72bfcc4..7734d3d1ea 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.10",
     "@budibase/client": "^2.6.10",
-    "@budibase/pro": "2.6.9",
+    "@budibase/pro": "2.6.10",
     "@budibase/shared-core": "^2.6.10",
     "@budibase/string-templates": "^2.6.10",
     "@budibase/types": "^2.6.10",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 06844df403..56049f4233 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.10",
-    "@budibase/pro": "2.6.9",
+    "@budibase/pro": "2.6.10",
     "@budibase/string-templates": "^2.6.10",
     "@budibase/types": "^2.6.10",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 3792431ed0..fd80e8cf00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.8":
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.8.tgz#739938cdee6afa138383708401d20eadd3a15555"
-  integrity sha512-nYpD+B9wGLonzOzeOs1Ym9PLgPsQrzui56TmkPPBJpFOAfCo8GLb8fwqDHGuZiEo5e+M96BgcJTAfpOzFQ7wgw==
+"@budibase/pro@2.6.9":
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.9.tgz#a6c00ca1e684efa7f09f66e6b8c878e129915afb"
+  integrity sha512-e/VWKERuB3Vtux5TwvgT7T9YCk51HbIJlHvV++hzGf+3zPF0VRrFq/0WD553Mj3amLHUk8zsBgfOoPPLiaprtg==
   dependencies:
-    "@budibase/backend-core" "2.6.8"
+    "@budibase/backend-core" "2.6.9"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.8"
+    "@budibase/types" "2.6.9"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From e284e4c6e450ce15404b58f21c07f8b4318bc60f Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Fri, 12 May 2023 08:46:15 +0200
Subject: [PATCH 35/71] Update pro submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 79bc94b17b..1bc218c228 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 79bc94b17baba885eb20e72f9abba3ac8b9c0eab
+Subproject commit 1bc218c228538b5bdba8b1b5686b05a7993b3ce9

From f5a4ad58ab08beb5e6090173ba708fa7f4a2644b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 12 May 2023 08:02:21 +0100
Subject: [PATCH 36/71] Fix alphabetical sorting for tables

---
 .../components/backend/TableNavigator/TableNavigator.svelte    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 94b9020203..f1337e88d4 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -6,7 +6,8 @@
   import NavItem from "components/common/NavItem.svelte"
   import { goto, isActive } from "@roxi/routify"
 
-  const alphabetical = (a, b) => a.name?.toLowerCase() > b.name?.toLowerCase()
+  const alphabetical = (a, b) =>
+    a.name?.toLowerCase() > b.name?.toLowerCase() ? 1 : -1
 
   export let sourceId
 

From a00d502acbec98fd6e6a84df3273d68b8189fa99 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 12 May 2023 08:04:34 +0100
Subject: [PATCH 37/71] Add title attribute to reveal full screen URLs when
 hovering in screen list panel

---
 packages/builder/src/components/common/NavItem.svelte          | 3 ++-
 .../[screenId]/screens/_components/ScreenListPanel.svelte      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 1fd43e2c70..73a8d3d647 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -17,6 +17,7 @@
   export let highlighted = false
   export let rightAlignIcon = false
   export let id
+  export let showTooltip = false
 
   const scrollApi = getContext("scroll")
   const dispatch = createEventDispatcher()
@@ -84,7 +85,7 @@
         <Icon color={iconColor} size="S" name={icon} />
       </div>
     {/if}
-    <div class="text">{text}</div>
+    <div class="text" title={showTooltip ? text : null}>{text}</div>
     {#if withActions}
       <div class="actions">
         <slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
index a6fd9089b1..06f9f86eb6 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenListPanel.svelte
@@ -59,6 +59,7 @@
       text={screen.routing.route}
       on:click={() => store.actions.screens.select(screen._id)}
       rightAlignIcon
+      showTooltip
     >
       <ScreenDropdownMenu screenId={screen._id} />
       <RoleIndicator slot="right" roleId={screen.routing.roleId} />

From 6c694762e21669c0e5e74734138f0886ca8e2bc6 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 12 May 2023 14:29:07 +0000
Subject: [PATCH 38/71] v2.6.11

---
 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 48af3c36b2..0e04d5d0e8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.10",
+  "version": "2.6.11",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 9cfc572101..921d3a2a9a 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.10",
+    "@budibase/types": "^2.6.11",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 60bf76f61a..8e1d4c027b 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.10",
+  "version": "2.6.11",
   "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.10",
-    "@budibase/string-templates": "^2.6.10",
+    "@budibase/shared-core": "^2.6.11",
+    "@budibase/string-templates": "^2.6.11",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index d015fb61a5..a31528bc1d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.10",
-    "@budibase/frontend-core": "^2.6.10",
-    "@budibase/shared-core": "^2.6.10",
-    "@budibase/string-templates": "^2.6.10",
+    "@budibase/bbui": "^2.6.11",
+    "@budibase/frontend-core": "^2.6.11",
+    "@budibase/shared-core": "^2.6.11",
+    "@budibase/string-templates": "^2.6.11",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f59ea2a714..ca0b94f477 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "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.10",
-    "@budibase/string-templates": "^2.6.10",
-    "@budibase/types": "^2.6.10",
+    "@budibase/backend-core": "^2.6.11",
+    "@budibase/string-templates": "^2.6.11",
+    "@budibase/types": "^2.6.11",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 4fd715ddf6..8bd70fdf33 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "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.10",
-    "@budibase/frontend-core": "^2.6.10",
-    "@budibase/shared-core": "^2.6.10",
-    "@budibase/string-templates": "^2.6.10",
-    "@budibase/types": "^2.6.10",
+    "@budibase/bbui": "^2.6.11",
+    "@budibase/frontend-core": "^2.6.11",
+    "@budibase/shared-core": "^2.6.11",
+    "@budibase/string-templates": "^2.6.11",
+    "@budibase/types": "^2.6.11",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 52a75894a3..0dec986f29 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.10",
-    "@budibase/shared-core": "^2.6.10",
+    "@budibase/bbui": "^2.6.11",
+    "@budibase/shared-core": "^2.6.11",
     "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 75a205bd30..da5c1873ab 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 7734d3d1ea..d0ccaf7dca 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.10",
+  "version": "2.6.11",
   "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.10",
-    "@budibase/client": "^2.6.10",
+    "@budibase/backend-core": "^2.6.11",
+    "@budibase/client": "^2.6.11",
     "@budibase/pro": "2.6.10",
-    "@budibase/shared-core": "^2.6.10",
-    "@budibase/string-templates": "^2.6.10",
-    "@budibase/types": "^2.6.10",
+    "@budibase/shared-core": "^2.6.11",
+    "@budibase/string-templates": "^2.6.11",
+    "@budibase/types": "^2.6.11",
     "@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 aa91f71dca..f63e5eb079 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "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.10"
+    "@budibase/types": "^2.6.11"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 9c80fd31ff..dee60c950d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 7f54b87c14..dbdfa42f08 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "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 56049f4233..544a2799ed 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.10",
+  "version": "2.6.11",
   "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.10",
+    "@budibase/backend-core": "^2.6.11",
     "@budibase/pro": "2.6.10",
-    "@budibase/string-templates": "^2.6.10",
-    "@budibase/types": "^2.6.10",
+    "@budibase/string-templates": "^2.6.11",
+    "@budibase/types": "^2.6.11",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 0cf7d4ab9ca32c962572c10a16bc46d05cee8aa8 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Fri, 12 May 2023 14:30:41 +0000
Subject: [PATCH 39/71] Update pro version to 2.6.11

---
 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 d0ccaf7dca..96f0d3f4ce 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.11",
     "@budibase/client": "^2.6.11",
-    "@budibase/pro": "2.6.10",
+    "@budibase/pro": "2.6.11",
     "@budibase/shared-core": "^2.6.11",
     "@budibase/string-templates": "^2.6.11",
     "@budibase/types": "^2.6.11",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 544a2799ed..968c443687 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.11",
-    "@budibase/pro": "2.6.10",
+    "@budibase/pro": "2.6.11",
     "@budibase/string-templates": "^2.6.11",
     "@budibase/types": "^2.6.11",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index fd80e8cf00..bcf330184f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.9":
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.9.tgz#a6c00ca1e684efa7f09f66e6b8c878e129915afb"
-  integrity sha512-e/VWKERuB3Vtux5TwvgT7T9YCk51HbIJlHvV++hzGf+3zPF0VRrFq/0WD553Mj3amLHUk8zsBgfOoPPLiaprtg==
+"@budibase/pro@2.6.10":
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.10.tgz#c77ba2e37a9bdc5842edd2b3de958dc5960033bf"
+  integrity sha512-uHXk+wlgfQSJ7N9dIAgF9Hndcl2EGOKWb7jN3gpDWWkoqlOavc5Oc2VUPl7ITQskyC1+CbBwxePBGilf/YuCeA==
   dependencies:
-    "@budibase/backend-core" "2.6.9"
+    "@budibase/backend-core" "2.6.10"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.9"
+    "@budibase/types" "2.6.10"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 3e62cac3a6d4039b3db13fdd1851669fc5265daf Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 08:39:34 +0200
Subject: [PATCH 40/71] Update pro submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 14345384f7..1bc218c228 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 14345384f7a6755d1e2de327104741e0f208f55d
+Subproject commit 1bc218c228538b5bdba8b1b5686b05a7993b3ce9

From 17e2a4d7e47d46efca25f2c8b1986b7c0d1ad62a Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 09:00:20 +0200
Subject: [PATCH 41/71] Refactor -> Avouid explicit usage of pricing url

---
 .../builder/src/pages/builder/portal/apps/index.svelte   | 9 +++++----
 .../src/pages/builder/portal/users/users/index.svelte    | 2 --
 packages/builder/src/stores/portal/licensing.js          | 5 +++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 1680d55ff8..ce1c249087 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -314,10 +314,11 @@
 </Modal>
 
 <AppLimitModal bind:this={appLimitModal} />
-<AccountLockedModal bind:this={accountLockedModal} onConfirm={() =>
-    isOwner
-      ? $licensing.goToUpgradePage()
-      : window.open("https://budibase.com/pricing/", "_blank")} />
+<AccountLockedModal
+  bind:this={accountLockedModal}
+  onConfirm={() =>
+    isOwner ? $licensing.goToUpgradePage() : $licensing.goToPricingPage()}
+/>
 
 <style>
   .title {
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 c4ee10d83a..e75b1961b2 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -236,8 +236,6 @@
       notifications.error("Error fetching user group data")
     }
   })
-
-  let staticUserLimit = $licensing.license.quotas.usage.static.users.value
 </script>
 
 <Layout noPadding gap="M">
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 9caf7cac02..36771a2704 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -12,6 +12,7 @@ export const createLicensingStore = () => {
   const DEFAULT = {
     // navigation
     goToUpgradePage: () => {},
+    goToPricingPage: () => {},
     // the top level license
     license: undefined,
     isFreePlan: true,
@@ -71,10 +72,14 @@ export const createLicensingStore = () => {
       const goToUpgradePage = () => {
         window.location.href = upgradeUrl
       }
+      const goToPricingPage = () => {
+        window.open("https://budibase.com/pricing/", "_blank")
+      }
       store.update(state => {
         return {
           ...state,
           goToUpgradePage,
+          goToPricingPage,
         }
       })
     },

From b4d531f8862b14b3dca333bd0194b4f94403987e Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 09:47:57 +0200
Subject: [PATCH 42/71] Change a literal

---
 .../src/components/portal/licensing/AccountLockedModal.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte
index 63bb6dcfd9..a33d982627 100644
--- a/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte
+++ b/packages/builder/src/components/portal/licensing/AccountLockedModal.svelte
@@ -16,7 +16,7 @@
 
 <Modal bind:this={modal} on:hide={modal}>
   <ModalContent
-    title="Your account is currently locked"
+    title="Your account is currently de-activated"
     size="S"
     showCancelButton={true}
     showCloseIcon={false}

From fe96e70a096e21c873d6bef08408161e1c260086 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 10:05:03 +0200
Subject: [PATCH 43/71] Update submodule

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 1bc218c228..14345384f7 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 1bc218c228538b5bdba8b1b5686b05a7993b3ce9
+Subproject commit 14345384f7a6755d1e2de327104741e0f208f55d

From afce85f15da6f7fd62b5a735dbe804efdca0cde1 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 15 May 2023 12:56:15 +0200
Subject: [PATCH 45/71] Update pro ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 375fbd3d12..348fb43db9 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 375fbd3d1229a741ea3962dc42de479118020e95
+Subproject commit 348fb43db968f8391f64f07fd70abf03f46a9a11

From 419489ddcb74fca8da1d0c7fe1a3b6c6a99b8ac9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 15 May 2023 13:24:23 +0200
Subject: [PATCH 46/71] Update pro ref

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 0292f7605e..64a2025727 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 0292f7605e4d67488aa0660cc950abbf03c099a7
+Subproject commit 64a2025727c25d5813832c92eb360de3947b7aa6

From 15925bc9b64e4e55a5ac750a93a4b73d01f27eb9 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 15 May 2023 11:48:17 +0000
Subject: [PATCH 47/71] Bump version to 2.6.8-alpha.12

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

diff --git a/lerna.json b/lerna.json
index 664712d568..9b1b0599a2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.8-alpha.11",
+  "version": "2.6.8-alpha.12",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

From 99f1470129f63e5dd5eca3ed4f26dc0ce947e7ba Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 15 May 2023 12:06:50 +0000
Subject: [PATCH 48/71] Bump version to 2.6.8-alpha.13

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

diff --git a/lerna.json b/lerna.json
index 9b1b0599a2..cf639eca7c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.8-alpha.12",
+  "version": "2.6.8-alpha.13",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

From 8c71b1fc19c76dd263d35d9a3f8bfcac5cb44f43 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 14:27:59 +0200
Subject: [PATCH 49/71] Check error limit conditions explicitly

---
 packages/builder/package.json                   |  1 +
 packages/builder/src/stores/portal/licensing.js | 11 +++++------
 packages/builder/tsconfig.json                  |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index 702e53c12a..95644fc399 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -62,6 +62,7 @@
     "@budibase/frontend-core": "0.0.1",
     "@budibase/shared-core": "0.0.1",
     "@budibase/string-templates": "0.0.1",
+    "@budibase/types": "0.0.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/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 36771a2704..6e50d3a045 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -4,7 +4,7 @@ import { auth, admin } from "stores/portal"
 import { Constants } from "@budibase/frontend-core"
 import { StripeStatus } from "components/portal/licensing/constants"
 import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
-import dayjs from "dayjs"
+import { Hosting, PlanModel } from "@budibase/types"
 
 const UNLIMITED = -1
 
@@ -38,7 +38,6 @@ export const createLicensingStore = () => {
     // user limits
     userCount: undefined,
     userLimit: undefined,
-    userLimitDays: undefined,
     userLimitReached: false,
     errUserLimit: false,
   }
@@ -205,9 +204,10 @@ export const createLicensingStore = () => {
         const userCount = usage.usageQuota.users
         const userLimitReached = usersLimitReached(userCount, userLimit)
         const userLimitExceeded = usersLimitExceeded(userCount, userLimit)
-        const days = dayjs(userQuota?.startDate).diff(dayjs(), "day")
-        const userLimitDays = days > 1 ? `${days} days` : "1 day"
-        const errUserLimit = userQuota?.startDate && userLimitExceeded
+        const errUserLimit = license.account.hosting === Hosting.CLOUD &&
+          license.plan.model === PlanModel.PER_USER &&
+          userQuota.usage.static.users.value !== UNLIMITED &&
+          userLimitExceeded
 
         store.update(state => {
           return {
@@ -222,7 +222,6 @@ export const createLicensingStore = () => {
             // user limits
             userCount,
             userLimit,
-            userLimitDays,
             userLimitReached,
             errUserLimit,
           }
diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json
index 400f964e30..5d3da40aa3 100644
--- a/packages/builder/tsconfig.json
+++ b/packages/builder/tsconfig.json
@@ -6,7 +6,6 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
-      "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*.js"]
     }

From 661b07f4c69c4b86806b0037fe1c37f0ff6090ef Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 15 May 2023 12:57:37 +0000
Subject: [PATCH 50/71] Bump version to 2.6.8-alpha.14

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

diff --git a/lerna.json b/lerna.json
index cf639eca7c..76dc01dc26 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.8-alpha.13",
+  "version": "2.6.8-alpha.14",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

From 327a8299f22ee2809875ce43061a6279580fcec2 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 16:43:14 +0200
Subject: [PATCH 51/71] Extract isCloud information from admin storage

---
 .../builder/src/stores/portal/licensing.js    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 6e50d3a045..f8f49bb01b 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -4,7 +4,7 @@ import { auth, admin } from "stores/portal"
 import { Constants } from "@budibase/frontend-core"
 import { StripeStatus } from "components/portal/licensing/constants"
 import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
-import { Hosting, PlanModel } from "@budibase/types"
+import { PlanModel } from "@budibase/types"
 
 const UNLIMITED = -1
 
@@ -60,6 +60,15 @@ export const createLicensingStore = () => {
     return userCount > userLimit
   }
 
+  async function isCloud() {
+    let adminStore = get(admin)
+    if (!adminStore.loaded) {
+      await admin.init()
+      adminStore = get(admin)
+    }
+    return adminStore.cloud
+  }
+
   const actions = {
     init: async () => {
       actions.setNavigation()
@@ -132,7 +141,7 @@ export const createLicensingStore = () => {
           quotaUsage,
         }
       })
-      actions.setUsageMetrics()
+      await actions.setUsageMetrics()
     },
     usersLimitReached: userCount => {
       return usersLimitReached(userCount, get(store).userLimit)
@@ -140,7 +149,7 @@ export const createLicensingStore = () => {
     usersLimitExceeded(userCount) {
       return usersLimitExceeded(userCount, get(store).userLimit)
     },
-    setUsageMetrics: () => {
+    setUsageMetrics: async () => {
       if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) {
         const usage = get(store).quotaUsage
         const license = get(auth).user.license
@@ -204,9 +213,9 @@ export const createLicensingStore = () => {
         const userCount = usage.usageQuota.users
         const userLimitReached = usersLimitReached(userCount, userLimit)
         const userLimitExceeded = usersLimitExceeded(userCount, userLimit)
-        const errUserLimit = license.account.hosting === Hosting.CLOUD &&
+        const isCloudAccount = await isCloud()
+        const errUserLimit = isCloudAccount &&
           license.plan.model === PlanModel.PER_USER &&
-          userQuota.usage.static.users.value !== UNLIMITED &&
           userLimitExceeded
 
         store.update(state => {

From 14a7e77e396bd4a60ccb42534854bf1c46d47630 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 16:52:48 +0200
Subject: [PATCH 52/71] ESLint

---
 packages/builder/src/stores/portal/licensing.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index f8f49bb01b..307e640f33 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -214,7 +214,8 @@ export const createLicensingStore = () => {
         const userLimitReached = usersLimitReached(userCount, userLimit)
         const userLimitExceeded = usersLimitExceeded(userCount, userLimit)
         const isCloudAccount = await isCloud()
-        const errUserLimit = isCloudAccount &&
+        const errUserLimit =
+          isCloudAccount &&
           license.plan.model === PlanModel.PER_USER &&
           userLimitExceeded
 

From 1aad88adc8a5b6bf58d491b307117a694a352bba Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 15 May 2023 15:52:59 +0100
Subject: [PATCH 53/71] Fix for CLI startup complaining about version not being
 found.

---
 packages/backend-core/src/environment.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 72cd1a4af0..9163dfeba6 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -69,10 +69,10 @@ function findVersion() {
   try {
     const packageJsonFile = findFileInAncestors("package.json", process.cwd())
     const content = readFileSync(packageJsonFile!, "utf-8")
-    const version = JSON.parse(content).version
-    return version
+    return JSON.parse(content).version
   } catch {
-    throw new Error("Cannot find a valid version in its package.json")
+    // throwing an error here is confusing/causes backend-core to be hard to import
+    return undefined
   }
 }
 

From 0e3a6a199e0770168ed7f68f1c1a16f0fdd97815 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 15 May 2023 16:58:43 +0200
Subject: [PATCH 54/71] Keep @budibase/types at tsconfig.json

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

diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json
index 5d3da40aa3..400f964e30 100644
--- a/packages/builder/tsconfig.json
+++ b/packages/builder/tsconfig.json
@@ -6,6 +6,7 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
+      "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*.js"]
     }

From 005c3556d6c65f5a62f8ba870cf73de54be1da35 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 15 May 2023 15:51:10 +0000
Subject: [PATCH 55/71] v2.6.12

---
 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 0e04d5d0e8..311f72cf4c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.11",
+  "version": "2.6.12",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 921d3a2a9a..34ecb5cdfa 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.11",
+    "@budibase/types": "^2.6.12",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 8e1d4c027b..0ea8c0e130 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.11",
+  "version": "2.6.12",
   "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.11",
-    "@budibase/string-templates": "^2.6.11",
+    "@budibase/shared-core": "^2.6.12",
+    "@budibase/string-templates": "^2.6.12",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index a31528bc1d..18b7d6ed0d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.11",
-    "@budibase/frontend-core": "^2.6.11",
-    "@budibase/shared-core": "^2.6.11",
-    "@budibase/string-templates": "^2.6.11",
+    "@budibase/bbui": "^2.6.12",
+    "@budibase/frontend-core": "^2.6.12",
+    "@budibase/shared-core": "^2.6.12",
+    "@budibase/string-templates": "^2.6.12",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ca0b94f477..e1eaece7cc 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "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.11",
-    "@budibase/string-templates": "^2.6.11",
-    "@budibase/types": "^2.6.11",
+    "@budibase/backend-core": "^2.6.12",
+    "@budibase/string-templates": "^2.6.12",
+    "@budibase/types": "^2.6.12",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index 8bd70fdf33..c54427fabb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "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.11",
-    "@budibase/frontend-core": "^2.6.11",
-    "@budibase/shared-core": "^2.6.11",
-    "@budibase/string-templates": "^2.6.11",
-    "@budibase/types": "^2.6.11",
+    "@budibase/bbui": "^2.6.12",
+    "@budibase/frontend-core": "^2.6.12",
+    "@budibase/shared-core": "^2.6.12",
+    "@budibase/string-templates": "^2.6.12",
+    "@budibase/types": "^2.6.12",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 0dec986f29..cc09ebfc65 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.11",
-    "@budibase/shared-core": "^2.6.11",
+    "@budibase/bbui": "^2.6.12",
+    "@budibase/shared-core": "^2.6.12",
     "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 da5c1873ab..e12010a81a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 96f0d3f4ce..e28fa7c5f1 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.11",
+  "version": "2.6.12",
   "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.11",
-    "@budibase/client": "^2.6.11",
+    "@budibase/backend-core": "^2.6.12",
+    "@budibase/client": "^2.6.12",
     "@budibase/pro": "2.6.11",
-    "@budibase/shared-core": "^2.6.11",
-    "@budibase/string-templates": "^2.6.11",
-    "@budibase/types": "^2.6.11",
+    "@budibase/shared-core": "^2.6.12",
+    "@budibase/string-templates": "^2.6.12",
+    "@budibase/types": "^2.6.12",
     "@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 f63e5eb079..9c4a3eebbe 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "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.11"
+    "@budibase/types": "^2.6.12"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index dee60c950d..2e086f745f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index dbdfa42f08..82fe5df169 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "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 968c443687..5851383373 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.11",
+  "version": "2.6.12",
   "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.11",
+    "@budibase/backend-core": "^2.6.12",
     "@budibase/pro": "2.6.11",
-    "@budibase/string-templates": "^2.6.11",
-    "@budibase/types": "^2.6.11",
+    "@budibase/string-templates": "^2.6.12",
+    "@budibase/types": "^2.6.12",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From eb5672a546e3480937134a786f0dc84987c15050 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Mon, 15 May 2023 15:52:47 +0000
Subject: [PATCH 56/71] Update pro version to 2.6.12

---
 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 e28fa7c5f1..d6f7480a69 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.12",
     "@budibase/client": "^2.6.12",
-    "@budibase/pro": "2.6.11",
+    "@budibase/pro": "2.6.12",
     "@budibase/shared-core": "^2.6.12",
     "@budibase/string-templates": "^2.6.12",
     "@budibase/types": "^2.6.12",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5851383373..47685482a9 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.12",
-    "@budibase/pro": "2.6.11",
+    "@budibase/pro": "2.6.12",
     "@budibase/string-templates": "^2.6.12",
     "@budibase/types": "^2.6.12",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index bcf330184f..2bad4d9e48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.10":
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.10.tgz#c77ba2e37a9bdc5842edd2b3de958dc5960033bf"
-  integrity sha512-uHXk+wlgfQSJ7N9dIAgF9Hndcl2EGOKWb7jN3gpDWWkoqlOavc5Oc2VUPl7ITQskyC1+CbBwxePBGilf/YuCeA==
+"@budibase/pro@2.6.11":
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.11.tgz#87339ba06c462d8757f408847da8283e20a49e21"
+  integrity sha512-i1l5/TK6Mdoua+19zQFGfBxpTL9W2LUYdH6gEWKo/coHo7VQu+sDyoPS2u9MrbT2qahAuYm66v7IlaBC/mBBEA==
   dependencies:
-    "@budibase/backend-core" "2.6.10"
+    "@budibase/backend-core" "2.6.11"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.10"
+    "@budibase/types" "2.6.11"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 728eb3bb09ef16252a16971a75f02270428a6270 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Mon, 15 May 2023 19:22:22 +0100
Subject: [PATCH 57/71] Fix for autoid issue on create row

---
 .../src/api/controllers/row/internal.ts       | 12 ++++-
 .../server/src/api/routes/tests/row.spec.js   | 54 +++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts
index cc1450060c..e3cb419236 100644
--- a/packages/server/src/api/controllers/row/internal.ts
+++ b/packages/server/src/api/controllers/row/internal.ts
@@ -118,8 +118,11 @@ export async function patch(ctx: UserCtx) {
     combinedRow[key] = inputs[key]
   }
 
+  // need to copy the table so it can be differenced on way out
+  const tableClone = cloneDeep(dbTable)
+
   // this returns the table and row incase they have been updated
-  let { table, row } = inputProcessing(ctx.user, dbTable, combinedRow)
+  let { table, row } = inputProcessing(ctx.user, tableClone, combinedRow)
   const validateResult = await utils.validate({
     row,
     table,
@@ -163,7 +166,12 @@ export async function save(ctx: UserCtx) {
 
   // this returns the table and row incase they have been updated
   const dbTable = await db.get(inputs.tableId)
-  let { table, row } = inputProcessing(ctx.user, dbTable, inputs)
+
+  // need to copy the table so it can be differenced on way out
+  const tableClone = cloneDeep(dbTable)
+
+  let { table, row } = inputProcessing(ctx.user, tableClone, inputs)
+
   const validateResult = await utils.validate({
     row,
     table,
diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js
index 105dd21ae0..a8041dac3b 100644
--- a/packages/server/src/api/routes/tests/row.spec.js
+++ b/packages/server/src/api/routes/tests/row.spec.js
@@ -79,6 +79,60 @@ describe("/rows", () => {
       await assertQueryUsage(queryUsage + 1)
     })
 
+    it("Increment row autoId per create row request", async () => {
+      const rowUsage = await getRowUsage()
+      const queryUsage = await getQueryUsage()
+
+      const newTable = await config.createTable({
+        name: "TestTableAuto",
+        type: "table",
+        key: "name",
+        schema: {
+          ...table.schema,
+          "Row ID": {
+            name: "Row ID",
+            type: "number",
+            subtype: "autoID",
+            icon: "ri-magic-line",
+            autocolumn: true,
+            constraints: {
+              type: "number",
+              presence: false,
+              numericality: {
+                greaterThanOrEqualTo: "",
+                lessThanOrEqualTo: "",
+              },
+            },
+          },
+        }
+      })
+
+      const ids = [1,2,3]
+
+      // Performing several create row requests should increment the autoID fields accordingly
+      const createRow = async (id) => {
+        const res = await request
+          .post(`/api/${newTable._id}/rows`)
+          .send({
+            name: "row_" + id
+          })
+          .set(config.defaultHeaders())
+          .expect('Content-Type', /json/)
+          .expect(200)
+        expect(res.res.statusMessage).toEqual(`${newTable.name} saved successfully`)
+        expect(res.body.name).toEqual("row_" + id)
+        expect(res.body._rev).toBeDefined()
+        expect(res.body["Row ID"]).toEqual(id)
+      }
+
+      for (let i=0; i<ids.length; i++ ){
+        await createRow(ids[i])
+      }
+
+      await assertRowUsage(rowUsage + ids.length)
+      await assertQueryUsage(queryUsage + ids.length)
+    })
+
     it("updates a row successfully", async () => {
       const existing = await config.createRow()
       const rowUsage = await getRowUsage()

From f577b880ee5fb18d357fca305e6e154ee35abbf9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 May 2023 10:00:49 +0100
Subject: [PATCH 58/71] Fix for 'TypeError: Cannot read properties of undefined
 (reading 'command')' error that was occurring - program wouldn't load
 successfully with an undefined version number.

---
 packages/cli/src/index.ts  | 4 ++--
 packages/cli/tsconfig.json | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 8082d3f0a0..fc285aebd7 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -2,17 +2,17 @@
 process.env.DISABLE_PINO_LOGGER = "1"
 import "./prebuilds"
 import "./environment"
-import { env } from "@budibase/backend-core"
 import { getCommands } from "./options"
 import { Command } from "commander"
 import { getHelpDescription } from "./utils"
+import { version } from "../package.json"
 
 // add hosting config
 async function init() {
   const program = new Command()
     .addHelpCommand("help", getHelpDescription("Help with Budibase commands."))
     .helpOption(false)
-    .version(env.VERSION)
+    .version(version)
   // add commands
   for (let command of getCommands()) {
     command.configure(program)
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 0fa0bd8f5a..ab306debca 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -5,6 +5,7 @@
     "declaration": true,
     "sourceMap": true,
     "baseUrl": ".",
+    "resolveJsonModule": true,
     "paths": {
       "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
@@ -16,6 +17,6 @@
     "swc": true
   },
   "references": [{ "path": "../types" }, { "path": "../backend-core" }],
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "package.json"],
   "exclude": ["node_modules", "dist"]
 }

From 79a643715695a4bb928844e7852b81929b8ecf35 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 May 2023 10:19:02 +0100
Subject: [PATCH 59/71] Updating path to handle new dist layout.

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

diff --git a/packages/cli/package.json b/packages/cli/package.json
index e1eaece7cc..84d613e877 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -4,7 +4,7 @@
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
-    "budi": "dist/index.js"
+    "budi": "dist/src/index.js"
   },
   "author": "Budibase",
   "license": "GPL-3.0",

From e26daac58ff5bdf3ccb0c9601a525c61bc9b5131 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 10:21:37 +0000
Subject: [PATCH 60/71] v2.6.13

---
 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 311f72cf4c..43f70cc4a8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.12",
+  "version": "2.6.13",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 34ecb5cdfa..57eccb0cb3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.12",
+    "@budibase/types": "^2.6.13",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 0ea8c0e130..f5f4ec62b7 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.12",
+  "version": "2.6.13",
   "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.12",
-    "@budibase/string-templates": "^2.6.12",
+    "@budibase/shared-core": "^2.6.13",
+    "@budibase/string-templates": "^2.6.13",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 18b7d6ed0d..11978c2726 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.12",
-    "@budibase/frontend-core": "^2.6.12",
-    "@budibase/shared-core": "^2.6.12",
-    "@budibase/string-templates": "^2.6.12",
+    "@budibase/bbui": "^2.6.13",
+    "@budibase/frontend-core": "^2.6.13",
+    "@budibase/shared-core": "^2.6.13",
+    "@budibase/string-templates": "^2.6.13",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 84d613e877..0947e19e00 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "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.12",
-    "@budibase/string-templates": "^2.6.12",
-    "@budibase/types": "^2.6.12",
+    "@budibase/backend-core": "^2.6.13",
+    "@budibase/string-templates": "^2.6.13",
+    "@budibase/types": "^2.6.13",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index c54427fabb..d687e056d2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "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.12",
-    "@budibase/frontend-core": "^2.6.12",
-    "@budibase/shared-core": "^2.6.12",
-    "@budibase/string-templates": "^2.6.12",
-    "@budibase/types": "^2.6.12",
+    "@budibase/bbui": "^2.6.13",
+    "@budibase/frontend-core": "^2.6.13",
+    "@budibase/shared-core": "^2.6.13",
+    "@budibase/string-templates": "^2.6.13",
+    "@budibase/types": "^2.6.13",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index cc09ebfc65..2aa2e83473 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.12",
-    "@budibase/shared-core": "^2.6.12",
+    "@budibase/bbui": "^2.6.13",
+    "@budibase/shared-core": "^2.6.13",
     "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 e12010a81a..8b28a5072b 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index d6f7480a69..d5752f2327 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.12",
+  "version": "2.6.13",
   "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.12",
-    "@budibase/client": "^2.6.12",
+    "@budibase/backend-core": "^2.6.13",
+    "@budibase/client": "^2.6.13",
     "@budibase/pro": "2.6.12",
-    "@budibase/shared-core": "^2.6.12",
-    "@budibase/string-templates": "^2.6.12",
-    "@budibase/types": "^2.6.12",
+    "@budibase/shared-core": "^2.6.13",
+    "@budibase/string-templates": "^2.6.13",
+    "@budibase/types": "^2.6.13",
     "@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 9c4a3eebbe..093322406a 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "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.12"
+    "@budibase/types": "^2.6.13"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 2e086f745f..d0c350af22 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 82fe5df169..48168a1c58 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.12",
+  "version": "2.6.13",
   "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 47685482a9..1184fa4795 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.12",
+  "version": "2.6.13",
   "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.12",
+    "@budibase/backend-core": "^2.6.13",
     "@budibase/pro": "2.6.12",
-    "@budibase/string-templates": "^2.6.12",
-    "@budibase/types": "^2.6.12",
+    "@budibase/string-templates": "^2.6.13",
+    "@budibase/types": "^2.6.13",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From aa13a6284b7d60491f2f2cb26f483f0c5d4bdc1e Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 10:23:12 +0000
Subject: [PATCH 61/71] Update pro version to 2.6.13

---
 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 d5752f2327..ff9914999f 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.13",
     "@budibase/client": "^2.6.13",
-    "@budibase/pro": "2.6.12",
+    "@budibase/pro": "2.6.13",
     "@budibase/shared-core": "^2.6.13",
     "@budibase/string-templates": "^2.6.13",
     "@budibase/types": "^2.6.13",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1184fa4795..65703ae063 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.13",
-    "@budibase/pro": "2.6.12",
+    "@budibase/pro": "2.6.13",
     "@budibase/string-templates": "^2.6.13",
     "@budibase/types": "^2.6.13",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 2bad4d9e48..2edf82d830 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.11":
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.11.tgz#87339ba06c462d8757f408847da8283e20a49e21"
-  integrity sha512-i1l5/TK6Mdoua+19zQFGfBxpTL9W2LUYdH6gEWKo/coHo7VQu+sDyoPS2u9MrbT2qahAuYm66v7IlaBC/mBBEA==
+"@budibase/pro@2.6.12":
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.12.tgz#e252ccba3681c5689a2e502b1e92609b3a6c9a79"
+  integrity sha512-AjlC3MazYYlUwQPqFlMkHb0yFmlKI5KOs+5IOKgW0sQFOUXNzSU1CDHAEpAWZsbGea14f9DJ8MZAS20gljJDog==
   dependencies:
-    "@budibase/backend-core" "2.6.11"
+    "@budibase/backend-core" "2.6.12"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.11"
+    "@budibase/types" "2.6.12"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 927396d580c13527e3f711bcfc6fa8a006789bbf Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Tue, 16 May 2023 11:42:47 +0100
Subject: [PATCH 62/71] Update nginx.prod.conf

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

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

From 549f7e452d46507723b05690d0aee4d9f2260685 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 May 2023 12:37:28 +0100
Subject: [PATCH 63/71] Minor change - needed to update the path to prebuilds
 for pkg built CLI versions.

---
 packages/cli/src/prebuilds.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/prebuilds.ts b/packages/cli/src/prebuilds.ts
index bfdae90cf3..17e084160a 100644
--- a/packages/cli/src/prebuilds.ts
+++ b/packages/cli/src/prebuilds.ts
@@ -13,7 +13,7 @@ if (!process.argv[0].includes("node")) {
 }
 
 function checkForBinaries() {
-  const readDir = join(__filename, "..", "..", PREBUILDS, ARCH)
+  const readDir = join(__filename, "..", "..", "..", PREBUILDS, ARCH)
   if (fs.existsSync(PREBUILD_DIR) || !fs.existsSync(readDir)) {
     return
   }

From 897e08d0ec9f2da668a654341417cda791722e05 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 12:03:33 +0000
Subject: [PATCH 64/71] v2.6.14

---
 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 43f70cc4a8..00417d4f8e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.13",
+  "version": "2.6.14",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 57eccb0cb3..39f4fdb616 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.13",
+    "@budibase/types": "^2.6.14",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f5f4ec62b7..52cdc8502f 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.13",
+  "version": "2.6.14",
   "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.13",
-    "@budibase/string-templates": "^2.6.13",
+    "@budibase/shared-core": "^2.6.14",
+    "@budibase/string-templates": "^2.6.14",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 11978c2726..67c28b552d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.13",
-    "@budibase/frontend-core": "^2.6.13",
-    "@budibase/shared-core": "^2.6.13",
-    "@budibase/string-templates": "^2.6.13",
+    "@budibase/bbui": "^2.6.14",
+    "@budibase/frontend-core": "^2.6.14",
+    "@budibase/shared-core": "^2.6.14",
+    "@budibase/string-templates": "^2.6.14",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0947e19e00..3c18b2cf75 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "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.13",
-    "@budibase/string-templates": "^2.6.13",
-    "@budibase/types": "^2.6.13",
+    "@budibase/backend-core": "^2.6.14",
+    "@budibase/string-templates": "^2.6.14",
+    "@budibase/types": "^2.6.14",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index d687e056d2..a69b512798 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "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.13",
-    "@budibase/frontend-core": "^2.6.13",
-    "@budibase/shared-core": "^2.6.13",
-    "@budibase/string-templates": "^2.6.13",
-    "@budibase/types": "^2.6.13",
+    "@budibase/bbui": "^2.6.14",
+    "@budibase/frontend-core": "^2.6.14",
+    "@budibase/shared-core": "^2.6.14",
+    "@budibase/string-templates": "^2.6.14",
+    "@budibase/types": "^2.6.14",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2aa2e83473..9f505fcaf3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.13",
-    "@budibase/shared-core": "^2.6.13",
+    "@budibase/bbui": "^2.6.14",
+    "@budibase/shared-core": "^2.6.14",
     "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 8b28a5072b..20e4988f74 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index ff9914999f..dc525f3747 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.13",
+  "version": "2.6.14",
   "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.13",
-    "@budibase/client": "^2.6.13",
+    "@budibase/backend-core": "^2.6.14",
+    "@budibase/client": "^2.6.14",
     "@budibase/pro": "2.6.13",
-    "@budibase/shared-core": "^2.6.13",
-    "@budibase/string-templates": "^2.6.13",
-    "@budibase/types": "^2.6.13",
+    "@budibase/shared-core": "^2.6.14",
+    "@budibase/string-templates": "^2.6.14",
+    "@budibase/types": "^2.6.14",
     "@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 093322406a..1915522ad6 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "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.13"
+    "@budibase/types": "^2.6.14"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index d0c350af22..cf61e8098f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 48168a1c58..03883ccce8 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "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 65703ae063..433193c889 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.13",
+  "version": "2.6.14",
   "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.13",
+    "@budibase/backend-core": "^2.6.14",
     "@budibase/pro": "2.6.13",
-    "@budibase/string-templates": "^2.6.13",
-    "@budibase/types": "^2.6.13",
+    "@budibase/string-templates": "^2.6.14",
+    "@budibase/types": "^2.6.14",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 5839a65d0ccaf4ff11207fdcb0f49e00ff7c96b7 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 12:05:13 +0000
Subject: [PATCH 65/71] Update pro version to 2.6.14

---
 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 dc525f3747..a27f26b116 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.14",
     "@budibase/client": "^2.6.14",
-    "@budibase/pro": "2.6.13",
+    "@budibase/pro": "2.6.14",
     "@budibase/shared-core": "^2.6.14",
     "@budibase/string-templates": "^2.6.14",
     "@budibase/types": "^2.6.14",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 433193c889..a9bf860195 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.14",
-    "@budibase/pro": "2.6.13",
+    "@budibase/pro": "2.6.14",
     "@budibase/string-templates": "^2.6.14",
     "@budibase/types": "^2.6.14",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 2edf82d830..1181487268 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.12":
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.12.tgz#e252ccba3681c5689a2e502b1e92609b3a6c9a79"
-  integrity sha512-AjlC3MazYYlUwQPqFlMkHb0yFmlKI5KOs+5IOKgW0sQFOUXNzSU1CDHAEpAWZsbGea14f9DJ8MZAS20gljJDog==
+"@budibase/pro@2.6.13":
+  version "2.6.13"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.13.tgz#0f4586b914571e906c820e8eb89de356847a876b"
+  integrity sha512-WXIBYauFW2jI24OXXWgvfX11SFssnr/FYBVfa+z35iR8D/tMWZj5Z9hOBI2s5PoHDbvNc2rIBwCCiI5B4qhiNQ==
   dependencies:
-    "@budibase/backend-core" "2.6.12"
+    "@budibase/backend-core" "2.6.13"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.12"
+    "@budibase/types" "2.6.13"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From 4c4892a157f2a73039dcba834746314ca9a86da1 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 12:24:17 +0000
Subject: [PATCH 66/71] v2.6.15

---
 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 00417d4f8e..377742661b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.14",
+  "version": "2.6.15",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 39f4fdb616..a99417d355 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.6.14",
+    "@budibase/types": "^2.6.15",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 52cdc8502f..422fbe2a7f 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.14",
+  "version": "2.6.15",
   "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.14",
-    "@budibase/string-templates": "^2.6.14",
+    "@budibase/shared-core": "^2.6.15",
+    "@budibase/string-templates": "^2.6.15",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 67c28b552d..8c04bebcfa 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.14",
-    "@budibase/frontend-core": "^2.6.14",
-    "@budibase/shared-core": "^2.6.14",
-    "@budibase/string-templates": "^2.6.14",
+    "@budibase/bbui": "^2.6.15",
+    "@budibase/frontend-core": "^2.6.15",
+    "@budibase/shared-core": "^2.6.15",
+    "@budibase/string-templates": "^2.6.15",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3c18b2cf75..7e9e6db9db 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "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.14",
-    "@budibase/string-templates": "^2.6.14",
-    "@budibase/types": "^2.6.14",
+    "@budibase/backend-core": "^2.6.15",
+    "@budibase/string-templates": "^2.6.15",
+    "@budibase/types": "^2.6.15",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index a69b512798..f833da2725 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "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.14",
-    "@budibase/frontend-core": "^2.6.14",
-    "@budibase/shared-core": "^2.6.14",
-    "@budibase/string-templates": "^2.6.14",
-    "@budibase/types": "^2.6.14",
+    "@budibase/bbui": "^2.6.15",
+    "@budibase/frontend-core": "^2.6.15",
+    "@budibase/shared-core": "^2.6.15",
+    "@budibase/string-templates": "^2.6.15",
+    "@budibase/types": "^2.6.15",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 9f505fcaf3..2e62535f0d 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.14",
-    "@budibase/shared-core": "^2.6.14",
+    "@budibase/bbui": "^2.6.15",
+    "@budibase/shared-core": "^2.6.15",
     "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 20e4988f74..2828e38aa3 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index a27f26b116..c6a9966180 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.14",
+  "version": "2.6.15",
   "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.14",
-    "@budibase/client": "^2.6.14",
+    "@budibase/backend-core": "^2.6.15",
+    "@budibase/client": "^2.6.15",
     "@budibase/pro": "2.6.14",
-    "@budibase/shared-core": "^2.6.14",
-    "@budibase/string-templates": "^2.6.14",
-    "@budibase/types": "^2.6.14",
+    "@budibase/shared-core": "^2.6.15",
+    "@budibase/string-templates": "^2.6.15",
+    "@budibase/types": "^2.6.15",
     "@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 1915522ad6..ab625a89c3 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "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.14"
+    "@budibase/types": "^2.6.15"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index cf61e8098f..d5aad72ccb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 03883ccce8..ac63e4577f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.14",
+  "version": "2.6.15",
   "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 a9bf860195..10b6839a57 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.14",
+  "version": "2.6.15",
   "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.14",
+    "@budibase/backend-core": "^2.6.15",
     "@budibase/pro": "2.6.14",
-    "@budibase/string-templates": "^2.6.14",
-    "@budibase/types": "^2.6.14",
+    "@budibase/string-templates": "^2.6.15",
+    "@budibase/types": "^2.6.15",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

From 08a61e5aefa5d6f8870a03576cde1121b5afcaf3 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 16 May 2023 12:25:45 +0000
Subject: [PATCH 67/71] Update pro version to 2.6.15

---
 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 c6a9966180..d1d31a5e82 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.15",
     "@budibase/client": "^2.6.15",
-    "@budibase/pro": "2.6.14",
+    "@budibase/pro": "2.6.15",
     "@budibase/shared-core": "^2.6.15",
     "@budibase/string-templates": "^2.6.15",
     "@budibase/types": "^2.6.15",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 10b6839a57..23fe510793 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.15",
-    "@budibase/pro": "2.6.14",
+    "@budibase/pro": "2.6.15",
     "@budibase/string-templates": "^2.6.15",
     "@budibase/types": "^2.6.15",
     "@koa/router": "8.0.8",
diff --git a/yarn.lock b/yarn.lock
index 1181487268..aa9bd8b159 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.13":
-  version "2.6.13"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.13.tgz#0f4586b914571e906c820e8eb89de356847a876b"
-  integrity sha512-WXIBYauFW2jI24OXXWgvfX11SFssnr/FYBVfa+z35iR8D/tMWZj5Z9hOBI2s5PoHDbvNc2rIBwCCiI5B4qhiNQ==
+"@budibase/pro@2.6.14":
+  version "2.6.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.14.tgz#88345d2aa6630e4aef4943874c56b66f017c83e1"
+  integrity sha512-86mo0QeBgCGqsSAesBZjOBEwJEcYdcnsJFXzw0UY3jdpMwu+nOdZGwBpLNI10qy88S/cpe44MrtPslQLIJRIcQ==
   dependencies:
-    "@budibase/backend-core" "2.6.13"
+    "@budibase/backend-core" "2.6.14"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.13"
+    "@budibase/types" "2.6.14"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"

From d4478e0332850ecafef7d0e1be98dbcebdfaa97e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 16 May 2023 13:57:12 +0000
Subject: [PATCH 68/71] Bump version to 2.6.16-alpha.0

---
 lerna.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lerna.json b/lerna.json
index a079a1b67d..bb32a4820a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.15",
+  "version": "2.6.16-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",
@@ -31,4 +31,4 @@
       "loadEnvFiles": false
     }
   }
-}
+}
\ No newline at end of file

From 55ec808a827f2f84ef50c50343bc832f3c8d69b4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 16 May 2023 15:47:38 +0100
Subject: [PATCH 69/71] Fixing comment.

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

diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
index d77e44cd9f..6b82df3b57 100644
--- a/packages/worker/src/utilities/redis.ts
+++ b/packages/worker/src/utilities/redis.ts
@@ -7,7 +7,7 @@ function getExpirySecondsForDB(db: string) {
       // a hour
       return 3600
     case redis.utils.Databases.INVITATIONS:
-      // a day
+      // a week
       return 604800
   }
 }

From 9da10b29df02d63fd492f65ddff05beb988c02a7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 16 May 2023 14:50:44 +0000
Subject: [PATCH 70/71] Bump version to 2.6.16-alpha.1

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

diff --git a/lerna.json b/lerna.json
index bb32a4820a..4799ff3b65 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.16-alpha.0",
+  "version": "2.6.16-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",

From b00175b2cfbbed50a17c9f6eba45796379a68864 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 17 May 2023 07:23:34 +0000
Subject: [PATCH 71/71] Bump version to 2.6.16-alpha.2

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

diff --git a/lerna.json b/lerna.json
index 4799ff3b65..e56d307592 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.16-alpha.1",
+  "version": "2.6.16-alpha.2",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",