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 01/14] 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 02/14] 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 03/14] 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 04/14] 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 05/14] 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 06/14] 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 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 07/14] 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 08/14] 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 09/14] 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 10/14] 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 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 11/14] 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 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 12/14] 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 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 13/14] 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 14/14] 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