From 98c486655b71ac397666d1d4dd8194d6677ceffc Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 29 Jun 2022 19:11:00 +0100
Subject: [PATCH 1/5] Adding user pagination, removing usages of the global
 user list from builder and replacing with direct user lookups where possible,
 still need to apply filtering to username/email serverside.

---
 packages/backend-core/src/db/utils.ts         | 27 +++++++++++-
 packages/builder/src/helpers/pagination.js    | 31 ++++++++++++++
 .../builder/portal/manage/users/index.svelte  | 42 +++++++++++++++----
 .../overview/_components/OverviewTab.svelte   | 30 ++++---------
 packages/builder/src/stores/portal/users.js   | 26 +++++++++---
 packages/frontend-core/src/api/user.js        | 15 ++++++-
 .../src/api/controllers/global/users.ts       |  7 ++--
 packages/worker/src/sdk/users/users.ts        | 15 +++++++
 8 files changed, 150 insertions(+), 43 deletions(-)
 create mode 100644 packages/builder/src/helpers/pagination.js

diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index dc7a0454c3..fc4094ad9f 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -93,13 +93,17 @@ export function generateGlobalUserID(id?: any) {
 /**
  * Gets parameters for retrieving users.
  */
-export function getGlobalUserParams(globalId: any, otherProps = {}) {
+export function getGlobalUserParams(globalId: any, otherProps: any = {}) {
   if (!globalId) {
     globalId = ""
   }
+  const startkey = otherProps?.startkey
   return {
     ...otherProps,
-    startkey: `${DocumentTypes.USER}${SEPARATOR}${globalId}`,
+    // need to include this incase pagination
+    startkey: startkey
+      ? startkey
+      : `${DocumentTypes.USER}${SEPARATOR}${globalId}`,
     endkey: `${DocumentTypes.USER}${SEPARATOR}${globalId}${UNICODE_MAX}`,
   }
 }
@@ -434,6 +438,25 @@ export const getPlatformUrl = async (opts = { tenantAware: true }) => {
   return platformUrl
 }
 
+export function pagination(
+  response: any,
+  pageSize: number,
+  paginate: boolean = true
+) {
+  const data = response.rows.map((row: any) => {
+    return row.doc ? row.doc : row
+  })
+  if (!paginate) {
+    return { data, hasNextPage: false }
+  }
+  const hasNextPage = data.length > pageSize
+  return {
+    data: data.slice(0, pageSize),
+    hasNextPage,
+    nextPage: hasNextPage ? data[pageSize]?._id : undefined,
+  }
+}
+
 export async function getScopedConfig(db: any, params: any) {
   const configDoc = await getScopedFullConfig(db, params)
   return configDoc && configDoc.config ? configDoc.config : configDoc
diff --git a/packages/builder/src/helpers/pagination.js b/packages/builder/src/helpers/pagination.js
new file mode 100644
index 0000000000..8f524d8d9f
--- /dev/null
+++ b/packages/builder/src/helpers/pagination.js
@@ -0,0 +1,31 @@
+export class PageInfo {
+  constructor(fetch) {
+    this.reset()
+    this.fetch = fetch
+  }
+
+  async goToNextPage() {
+    this.pageNumber++
+    this.prevPage = this.page
+    this.page = this.nextPage
+    this.hasPrevPage = this.pageNumber > 1
+    await this.fetch(this.page)
+  }
+
+  async goToPrevPage() {
+    this.pageNumber--
+    this.nextPage = this.page
+    this.page = this.prevPage
+    this.hasPrevPage = this.pageNumber > 1
+    await this.fetch(this.page)
+  }
+
+  reset() {
+    this.prevPage = null
+    this.nextPage = null
+    this.page = undefined
+    this.hasPrevPage = false
+    this.hasNextPage = false
+    this.pageNumber = 1
+  }
+}
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index 1d9c245480..ef1ba2a24a 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -12,25 +12,26 @@
     Layout,
     Modal,
     notifications,
+    Pagination,
   } from "@budibase/bbui"
   import TagsRenderer from "./_components/TagsTableRenderer.svelte"
   import AddUserModal from "./_components/AddUserModal.svelte"
   import { users } from "stores/portal"
+  import { PageInfo } from "helpers/pagination"
   import { onMount } from "svelte"
 
   const schema = {
     email: {},
     developmentAccess: { displayName: "Development Access", type: "boolean" },
     adminAccess: { displayName: "Admin Access", type: "boolean" },
-    // role: { type: "options" },
     group: {},
-    // access: {},
-    // group: {}
   }
 
+  let pageInfo = new PageInfo(fetchUsers)
   let search
-  $: filteredUsers = $users
-    .filter(user => user.email.includes(search || ""))
+  $: checkRefreshed($users.page)
+  $: filteredUsers = $users.data
+    ?.filter(user => user?.email?.includes(search || ""))
     .map(user => ({
       ...user,
       group: ["All users"],
@@ -40,12 +41,28 @@
 
   let createUserModal
 
-  onMount(async () => {
+  async function checkRefreshed(page) {
+    // the users have been reset, go back to first page
+    if (!page && pageInfo.page) {
+      pageInfo.reset()
+      pageInfo.pageNumber = pageInfo.pageNumber
+      pageInfo.hasNextPage = $users.hasNextPage
+      pageInfo.nextPage = $users.nextPage
+    }
+  }
+
+  async function fetchUsers(page) {
     try {
-      await users.init()
+      await users.fetch(page)
+      pageInfo.hasNextPage = $users.hasNextPage
+      pageInfo.nextPage = $users.nextPage
     } catch (error) {
       notifications.error("Error getting user list")
     }
+  }
+
+  onMount(async () => {
+    await fetchUsers()
   })
 </script>
 
@@ -75,12 +92,21 @@
     <Table
       on:click={({ detail }) => $goto(`./${detail._id}`)}
       {schema}
-      data={filteredUsers || $users}
+      data={filteredUsers || $users.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
       customRenderers={[{ column: "group", component: TagsRenderer }]}
     />
+    <div class="pagination">
+      <Pagination
+        page={pageInfo.pageNumber}
+        hasPrevPage={pageInfo.hasPrevPage}
+        hasNextPage={pageInfo.hasNextPage}
+        goToPrevPage={() => pageInfo.goToPrevPage()}
+        goToNextPage={() => pageInfo.goToNextPage()}
+      />
+    </div>
   </Layout>
 </Layout>
 
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
index 7b7258cada..6957f2ea9a 100644
--- a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte
@@ -1,14 +1,7 @@
 <script>
   import DashCard from "components/common/DashCard.svelte"
   import { AppStatus } from "constants"
-  import {
-    Icon,
-    Heading,
-    Link,
-    Avatar,
-    notifications,
-    Layout,
-  } from "@budibase/bbui"
+  import { Icon, Heading, Link, Avatar, Layout } from "@budibase/bbui"
   import { store } from "builderStore"
   import clientPackage from "@budibase/client/package.json"
   import { processStringSync } from "@budibase/string-templates"
@@ -20,29 +13,22 @@
   export let navigateTab
   const dispatch = createEventDispatcher()
 
-  const userInit = async () => {
-    try {
-      await users.init()
-    } catch (error) {
-      notifications.error("Error getting user list")
-    }
-  }
-
   const unpublishApp = () => {
     dispatch("unpublish", app)
   }
 
-  let userPromise = userInit()
+  let appEditor, appEditorPromise
 
   $: updateAvailable = clientPackage.version !== $store.version
   $: isPublished = app && app?.status === AppStatus.DEPLOYED
   $: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy
   $: appEditorText = appEditor?.firstName || appEditor?.email
-  $: filteredUsers = !appEditorId
-    ? []
-    : $users.filter(user => user._id === appEditorId)
+  $: fetchAppEditor(appEditorId)
 
-  $: appEditor = filteredUsers.length ? filteredUsers[0] : null
+  async function fetchAppEditor(editorId) {
+    appEditorPromise = users.get(editorId)
+    appEditor = await appEditorPromise
+  }
 
   const getInitials = user => {
     let initials = ""
@@ -90,7 +76,7 @@
       </DashCard>
       <DashCard title={"Last Edited"} dataCy={"edited-by"}>
         <div class="last-edited-content">
-          {#await userPromise}
+          {#await appEditorPromise}
             <Avatar size="M" initials={"-"} />
           {:then _}
             <div class="updated-by">
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
index 0b6b8f563a..5e29d6e80f 100644
--- a/packages/builder/src/stores/portal/users.js
+++ b/packages/builder/src/stores/portal/users.js
@@ -3,11 +3,23 @@ import { API } from "api"
 import { update } from "lodash"
 
 export function createUsersStore() {
-  const { subscribe, set } = writable([])
+  const { subscribe, set } = writable({})
 
-  async function init() {
-    const users = await API.getUsers()
-    set(users)
+  async function fetch(page) {
+    const paged = await API.getUsers(page)
+    set({
+      ...paged,
+      page,
+    })
+    return paged
+  }
+
+  async function get(userId) {
+    try {
+      return await API.getUser(userId)
+    } catch (err) {
+      return null
+    }
   }
 
   async function invite({ email, builder, admin }) {
@@ -47,7 +59,8 @@ export function createUsersStore() {
       body.admin = { global: true }
     }
     await API.saveUser(body)
-    await init()
+    // re-fetch from first page
+    await fetch()
   }
 
   async function del(id) {
@@ -61,7 +74,8 @@ export function createUsersStore() {
 
   return {
     subscribe,
-    init,
+    fetch,
+    get,
     invite,
     acceptInvite,
     create,
diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js
index 9eade435da..a82f7f84dc 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.js
@@ -2,9 +2,20 @@ export const buildUserEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  getUsers: async () => {
+  getUsers: async page => {
+    const input = page ? { page } : {}
+    const params = new URLSearchParams(input)
     return await API.get({
-      url: "/api/global/users",
+      url: `/api/global/users?${params.toString()}`,
+    })
+  },
+
+  /**
+   * Get a single user by ID.
+   */
+  getUser: async userId => {
+    return await API.get({
+      url: `/api/global/users/${userId}`,
     })
   },
 
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index b78c1c5762..27ca780e9e 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -98,14 +98,15 @@ export const destroy = async (ctx: any) => {
 
 // called internally by app server user fetch
 export const fetch = async (ctx: any) => {
-  const all = await users.allUsers()
+  const { page } = ctx.request.query
+  const paginated = await users.paginatedUsers(page)
   // user hashed password shouldn't ever be returned
-  for (let user of all) {
+  for (let user of paginated.data) {
     if (user) {
       delete user.password
     }
   }
-  ctx.body = all
+  ctx.body = paginated
 }
 
 // called internally by app server user find
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index c2e29c7dae..3391e5f869 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -17,6 +17,8 @@ import {
 } from "@budibase/backend-core"
 import { MigrationType } from "@budibase/types"
 
+const PAGE_LIMIT = 10
+
 /**
  * Retrieves all users from the current tenancy.
  */
@@ -30,6 +32,19 @@ export const allUsers = async () => {
   return response.rows.map((row: any) => row.doc)
 }
 
+export const paginatedUsers = async (page?: string) => {
+  const db = tenancy.getGlobalDB()
+  // get one extra document, to have the next page
+  const response = await db.allDocs(
+    dbUtils.getGlobalUserParams(null, {
+      include_docs: true,
+      limit: PAGE_LIMIT + 1,
+      startkey: page,
+    })
+  )
+  return dbUtils.pagination(response, PAGE_LIMIT)
+}
+
 /**
  * Gets a user by ID from the global database, based on the current tenancy.
  */

From 63646b0c38426e833f6e82a631ab363d25a1c299 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 30 Jun 2022 12:01:15 +0100
Subject: [PATCH 2/5] Adding fix for global user retrieval as part of admin
 creation.

---
 .../src/api/controllers/global/configs.js       | 11 +++--------
 .../worker/src/api/controllers/global/users.ts  | 16 ++++------------
 packages/worker/src/utilities/users.js          | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 packages/worker/src/utilities/users.js

diff --git a/packages/worker/src/api/controllers/global/configs.js b/packages/worker/src/api/controllers/global/configs.js
index 227b86d181..6de428c1b1 100644
--- a/packages/worker/src/api/controllers/global/configs.js
+++ b/packages/worker/src/api/controllers/global/configs.js
@@ -1,7 +1,6 @@
 const {
   generateConfigID,
   getConfigParams,
-  getGlobalUserParams,
   getScopedFullConfig,
   getAllApps,
 } = require("@budibase/backend-core/db")
@@ -20,6 +19,7 @@ const {
   bustCache,
 } = require("@budibase/backend-core/cache")
 const { events } = require("@budibase/backend-core")
+const { checkAnyUserExists } = require("../../../utilities/users")
 
 const BB_TENANT_CDN = "https://tenants.cdn.budi.live"
 
@@ -405,12 +405,7 @@ exports.configChecklist = async function (ctx) {
         })
 
         // They have set up an global user
-        const users = await db.allDocs(
-          getGlobalUserParams(null, {
-            include_docs: true,
-            limit: 1,
-          })
-        )
+        const userExists = await checkAnyUserExists()
         return {
           apps: {
             checked: apps.length > 0,
@@ -423,7 +418,7 @@ exports.configChecklist = async function (ctx) {
             link: "/builder/portal/manage/email",
           },
           adminUser: {
-            checked: users && users.rows.length >= 1,
+            checked: userExists,
             label: "Create your first user",
             link: "/builder/portal/manage/users",
           },
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 27ca780e9e..32d392a690 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -8,16 +8,15 @@ import {
   events,
   errors,
   accounts,
-  db as dbUtils,
   users as usersCore,
   tenancy,
   cache,
 } from "@budibase/backend-core"
+import { checkAnyUserExists } from "../../../utilities/users"
 
 export const save = async (ctx: any) => {
   try {
-    const user = await users.save(ctx.request.body)
-    ctx.body = user
+    ctx.body = await users.save(ctx.request.body)
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
   }
@@ -39,15 +38,8 @@ export const adminUser = async (ctx: any) => {
       ctx.throw(403, "Organisation already exists.")
     }
 
-    const response = await tenancy.doWithGlobalDB(tenantId, async (db: any) => {
-      return db.allDocs(
-        dbUtils.getGlobalUserParams(null, {
-          include_docs: true,
-        })
-      )
-    })
-
-    if (response.rows.some((row: any) => row.doc.admin)) {
+    const userExists = await checkAnyUserExists()
+    if (userExists) {
       ctx.throw(
         403,
         "You cannot initialise once an global user has been created."
diff --git a/packages/worker/src/utilities/users.js b/packages/worker/src/utilities/users.js
new file mode 100644
index 0000000000..93057ca34f
--- /dev/null
+++ b/packages/worker/src/utilities/users.js
@@ -0,0 +1,17 @@
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
+const { getGlobalUserParams } = require("@budibase/backend-core/db")
+
+exports.checkAnyUserExists = async () => {
+  try {
+    const db = getGlobalDB()
+    const users = await db.allDocs(
+      getGlobalUserParams(null, {
+        include_docs: true,
+        limit: 1,
+      })
+    )
+    return users && users.rows.length >= 1
+  } catch (err) {
+    throw new Error("Unable to retrieve user list")
+  }
+}

From 062d834950d1e9e87f455c9abc2be1e22cacb5f7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 30 Jun 2022 15:39:26 +0100
Subject: [PATCH 3/5] Updating user page to search through the backend and
 building a basic pagination store that can be used for it.

---
 packages/backend-core/src/db/constants.js     |  1 +
 packages/backend-core/src/db/utils.ts         | 17 ++--
 packages/backend-core/src/users.js            | 22 +++++
 packages/builder/src/helpers/pagination.js    | 81 ++++++++++++-------
 .../users/_components/AddUserModal.svelte     |  3 +
 .../builder/portal/manage/users/index.svelte  | 58 +++++--------
 packages/builder/src/stores/portal/users.js   |  7 +-
 packages/frontend-core/src/api/user.js        | 14 +++-
 .../src/api/controllers/global/roles.js       | 17 +++-
 .../src/api/controllers/global/users.ts       |  3 +-
 packages/worker/src/sdk/users/users.ts        | 51 ++++++------
 11 files changed, 165 insertions(+), 109 deletions(-)

diff --git a/packages/backend-core/src/db/constants.js b/packages/backend-core/src/db/constants.js
index 10c6e174d7..12626fb90e 100644
--- a/packages/backend-core/src/db/constants.js
+++ b/packages/backend-core/src/db/constants.js
@@ -1,4 +1,5 @@
 exports.SEPARATOR = "_"
+exports.UNICODE_MAX = "\ufff0"
 
 const PRE_APP = "app"
 const PRE_DEV = "dev"
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index fc4094ad9f..54af4fc7a2 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -1,7 +1,7 @@
 import { newid } from "../hashing"
 import { DEFAULT_TENANT_ID, Configs } from "../constants"
 import env from "../environment"
-import { SEPARATOR, DocumentTypes } from "./constants"
+import { SEPARATOR, DocumentTypes, UNICODE_MAX } from "./constants"
 import { getTenantId, getGlobalDBName, getGlobalDB } from "../tenancy"
 import fetch from "node-fetch"
 import { doWithDB, allDbs } from "./index"
@@ -12,8 +12,6 @@ import { isDevApp, isDevAppID } from "./conversions"
 import { APP_PREFIX } from "./constants"
 import * as events from "../events"
 
-const UNICODE_MAX = "\ufff0"
-
 export const ViewNames = {
   USER_BY_EMAIL: "by_email",
   BY_API_KEY: "by_api_key",
@@ -439,21 +437,22 @@ export const getPlatformUrl = async (opts = { tenantAware: true }) => {
 }
 
 export function pagination(
-  response: any,
+  data: any[],
   pageSize: number,
-  paginate: boolean = true
+  { paginate, property } = { paginate: true, property: "_id" }
 ) {
-  const data = response.rows.map((row: any) => {
-    return row.doc ? row.doc : row
-  })
   if (!paginate) {
     return { data, hasNextPage: false }
   }
   const hasNextPage = data.length > pageSize
+  let nextPage = undefined
+  if (hasNextPage) {
+    nextPage = property ? data[pageSize]?.[property] : data[pageSize]?._id
+  }
   return {
     data: data.slice(0, pageSize),
     hasNextPage,
-    nextPage: hasNextPage ? data[pageSize]?._id : undefined,
+    nextPage,
   }
 }
 
diff --git a/packages/backend-core/src/users.js b/packages/backend-core/src/users.js
index 4acccda2a0..0c1350a674 100644
--- a/packages/backend-core/src/users.js
+++ b/packages/backend-core/src/users.js
@@ -1,5 +1,6 @@
 const { ViewNames } = require("./db/utils")
 const { queryGlobalView } = require("./db/views")
+const { UNICODE_MAX } = require("./db/constants")
 
 /**
  * Given an email address this will use a view to search through
@@ -19,3 +20,24 @@ exports.getGlobalUserByEmail = async email => {
 
   return response
 }
+
+/**
+ * Performs a starts with search on the global email view.
+ */
+exports.searchGlobalUsersByEmail = async (email, opts) => {
+  if (typeof email !== "string") {
+    throw new Error("Must provide a string to search by")
+  }
+  const lcEmail = email.toLowerCase()
+  // handle if passing up startkey for pagination
+  const startkey = opts && opts.startkey ? opts.startkey : lcEmail
+  let response = await queryGlobalView(ViewNames.USER_BY_EMAIL, {
+    ...opts,
+    startkey,
+    endkey: `${lcEmail}${UNICODE_MAX}`,
+  })
+  if (!response) {
+    response = []
+  }
+  return Array.isArray(response) ? response : [response]
+}
diff --git a/packages/builder/src/helpers/pagination.js b/packages/builder/src/helpers/pagination.js
index 8f524d8d9f..9399d34d12 100644
--- a/packages/builder/src/helpers/pagination.js
+++ b/packages/builder/src/helpers/pagination.js
@@ -1,31 +1,56 @@
-export class PageInfo {
-  constructor(fetch) {
-    this.reset()
-    this.fetch = fetch
-  }
+import { writable } from "svelte/store"
 
-  async goToNextPage() {
-    this.pageNumber++
-    this.prevPage = this.page
-    this.page = this.nextPage
-    this.hasPrevPage = this.pageNumber > 1
-    await this.fetch(this.page)
-  }
-
-  async goToPrevPage() {
-    this.pageNumber--
-    this.nextPage = this.page
-    this.page = this.prevPage
-    this.hasPrevPage = this.pageNumber > 1
-    await this.fetch(this.page)
-  }
-
-  reset() {
-    this.prevPage = null
-    this.nextPage = null
-    this.page = undefined
-    this.hasPrevPage = false
-    this.hasNextPage = false
-    this.pageNumber = 1
+function defaultValue() {
+  return {
+    nextPage: null,
+    page: undefined,
+    hasPrevPage: false,
+    hasNextPage: false,
+    pageNumber: 1,
+    pages: [],
+  }
+}
+
+export function createPaginationStore() {
+  const { subscribe, set, update } = writable(defaultValue())
+
+  function prevPage() {
+    update(state => {
+      state.pageNumber--
+      state.nextPage = state.pages.pop()
+      state.page = state.pages[state.pages.length - 1]
+      state.hasPrevPage = state.pageNumber > 1
+      return state
+    })
+  }
+
+  function nextPage() {
+    update(state => {
+      state.pageNumber++
+      state.page = state.nextPage
+      state.pages.push(state.page)
+      state.hasPrevPage = state.pageNumber > 1
+      return state
+    })
+  }
+
+  function fetched(hasNextPage, nextPage) {
+    update(state => {
+      state.hasNextPage = hasNextPage
+      state.nextPage = nextPage
+      return state
+    })
+  }
+
+  function reset() {
+    set(defaultValue())
+  }
+
+  return {
+    subscribe,
+    prevPage,
+    nextPage,
+    fetched,
+    reset,
   }
 }
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
index 5583a48b7d..88a8fb6c5d 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
@@ -10,7 +10,9 @@
   } from "@budibase/bbui"
   import { createValidationStore, emailValidator } from "helpers/validation"
   import { users } from "stores/portal"
+  import { createEventDispatcher } from "svelte"
 
+  const dispatch = createEventDispatcher()
   const password = Math.random().toString(36).substring(2, 22)
   const options = ["Email onboarding", "Basic onboarding"]
   const [email, error, touched] = createValidationStore("", emailValidator)
@@ -39,6 +41,7 @@
         forceResetPassword: true,
       })
       notifications.success("Successfully created user")
+      dispatch("created")
     } catch (error) {
       notifications.error("Error creating user")
     }
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index ef1ba2a24a..bc14b7e8d2 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -17,8 +17,7 @@
   import TagsRenderer from "./_components/TagsTableRenderer.svelte"
   import AddUserModal from "./_components/AddUserModal.svelte"
   import { users } from "stores/portal"
-  import { PageInfo } from "helpers/pagination"
-  import { onMount } from "svelte"
+  import { createPaginationStore } from "helpers/pagination"
 
   const schema = {
     email: {},
@@ -27,43 +26,21 @@
     group: {},
   }
 
-  let pageInfo = new PageInfo(fetchUsers)
-  let search
-  $: checkRefreshed($users.page)
-  $: filteredUsers = $users.data
-    ?.filter(user => user?.email?.includes(search || ""))
-    .map(user => ({
-      ...user,
-      group: ["All users"],
-      developmentAccess: !!user.builder?.global,
-      adminAccess: !!user.admin?.global,
-    }))
+  let pageInfo = createPaginationStore()
+  let search = undefined
+  $: page = $pageInfo.page
+  $: fetchUsers(page, search)
 
   let createUserModal
 
-  async function checkRefreshed(page) {
-    // the users have been reset, go back to first page
-    if (!page && pageInfo.page) {
-      pageInfo.reset()
-      pageInfo.pageNumber = pageInfo.pageNumber
-      pageInfo.hasNextPage = $users.hasNextPage
-      pageInfo.nextPage = $users.nextPage
-    }
-  }
-
-  async function fetchUsers(page) {
+  async function fetchUsers(page, search) {
     try {
-      await users.fetch(page)
-      pageInfo.hasNextPage = $users.hasNextPage
-      pageInfo.nextPage = $users.nextPage
+      await users.fetch({ page, search })
+      pageInfo.fetched($users.hasNextPage, $users.nextPage)
     } catch (error) {
       notifications.error("Error getting user list")
     }
   }
-
-  onMount(async () => {
-    await fetchUsers()
-  })
 </script>
 
 <Layout noPadding>
@@ -92,7 +69,7 @@
     <Table
       on:click={({ detail }) => $goto(`./${detail._id}`)}
       {schema}
-      data={filteredUsers || $users.data}
+      data={$users.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
@@ -100,18 +77,23 @@
     />
     <div class="pagination">
       <Pagination
-        page={pageInfo.pageNumber}
-        hasPrevPage={pageInfo.hasPrevPage}
-        hasNextPage={pageInfo.hasNextPage}
-        goToPrevPage={() => pageInfo.goToPrevPage()}
-        goToNextPage={() => pageInfo.goToNextPage()}
+        page={$pageInfo.pageNumber}
+        hasPrevPage={$pageInfo.hasPrevPage}
+        hasNextPage={$pageInfo.hasNextPage}
+        goToPrevPage={pageInfo.prevPage}
+        goToNextPage={pageInfo.nextPage}
       />
     </div>
   </Layout>
 </Layout>
 
 <Modal bind:this={createUserModal}>
-  <AddUserModal />
+  <AddUserModal
+    on:created={async () => {
+      pageInfo.reset()
+      await fetchUsers()
+    }}
+  />
 </Modal>
 
 <style>
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
index 5e29d6e80f..1e612f6537 100644
--- a/packages/builder/src/stores/portal/users.js
+++ b/packages/builder/src/stores/portal/users.js
@@ -5,11 +5,12 @@ import { update } from "lodash"
 export function createUsersStore() {
   const { subscribe, set } = writable({})
 
-  async function fetch(page) {
-    const paged = await API.getUsers(page)
+  // opts can contain page and search params
+  async function fetch(opts = {}) {
+    const paged = await API.getUsers(opts)
     set({
       ...paged,
-      page,
+      ...opts,
     })
     return paged
   }
diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js
index a82f7f84dc..a7a9fae9f1 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.js
@@ -1,10 +1,18 @@
 export const buildUserEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
+   * @param {string} page The page to retrieve
+   * @param {string} search The starts with string to search username/email by.
    */
-  getUsers: async page => {
-    const input = page ? { page } : {}
-    const params = new URLSearchParams(input)
+  getUsers: async ({ page, search } = {}) => {
+    const opts = {}
+    if (page) {
+      opts.page = page
+    }
+    if (search) {
+      opts.search = search
+    }
+    const params = new URLSearchParams(opts)
     return await API.get({
       url: `/api/global/users?${params.toString()}`,
     })
diff --git a/packages/worker/src/api/controllers/global/roles.js b/packages/worker/src/api/controllers/global/roles.js
index 4b620f8691..aacf0102f1 100644
--- a/packages/worker/src/api/controllers/global/roles.js
+++ b/packages/worker/src/api/controllers/global/roles.js
@@ -3,11 +3,22 @@ const {
   getAllApps,
   getProdAppID,
   DocumentTypes,
+  getGlobalUserParams,
 } = require("@budibase/backend-core/db")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalDB } = require("@budibase/backend-core/tenancy")
-const { users } = require("../../../sdk")
+
+// TODO: this function needs to be removed and replaced
+export const allUsers = async () => {
+  const db = getGlobalDB()
+  const response = await db.allDocs(
+    getGlobalUserParams(null, {
+      include_docs: true,
+    })
+  )
+  return response.rows.map(row => row.doc)
+}
 
 exports.fetch = async ctx => {
   const tenantId = ctx.user.tenantId
@@ -49,10 +60,10 @@ exports.find = async ctx => {
 exports.removeAppRole = async ctx => {
   const { appId } = ctx.params
   const db = getGlobalDB()
-  const allUsers = await users.allUsers(ctx)
+  const users = await allUsers(ctx)
   const bulk = []
   const cacheInvalidations = []
-  for (let user of allUsers) {
+  for (let user of users) {
     if (user.roles[appId]) {
       cacheInvalidations.push(userCache.invalidateUser(user._id))
       delete user.roles[appId]
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 32d392a690..34a199be0f 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -90,8 +90,7 @@ export const destroy = async (ctx: any) => {
 
 // called internally by app server user fetch
 export const fetch = async (ctx: any) => {
-  const { page } = ctx.request.query
-  const paginated = await users.paginatedUsers(page)
+  const paginated = await users.paginatedUsers(ctx.request.query)
   // user hashed password shouldn't ever be returned
   for (let user of paginated.data) {
     if (user) {
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 3391e5f869..db254badeb 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -17,32 +17,37 @@ import {
 } from "@budibase/backend-core"
 import { MigrationType } from "@budibase/types"
 
-const PAGE_LIMIT = 10
+const PAGE_LIMIT = 8
 
-/**
- * Retrieves all users from the current tenancy.
- */
-export const allUsers = async () => {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbUtils.getGlobalUserParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const paginatedUsers = async (page?: string) => {
+export const paginatedUsers = async ({
+  page,
+  search,
+}: { page?: string; search?: string } = {}) => {
   const db = tenancy.getGlobalDB()
   // get one extra document, to have the next page
-  const response = await db.allDocs(
-    dbUtils.getGlobalUserParams(null, {
-      include_docs: true,
-      limit: PAGE_LIMIT + 1,
-      startkey: page,
-    })
-  )
-  return dbUtils.pagination(response, PAGE_LIMIT)
+  const opts: any = {
+    include_docs: true,
+    limit: PAGE_LIMIT + 1,
+  }
+  // add a startkey if the page was specified (anchor)
+  if (page) {
+    opts.startkey = page
+  }
+  // property specifies what to use for the page/anchor
+  let userList, property
+  // no search, query allDocs
+  if (!search) {
+    const response = await db.allDocs(dbUtils.getGlobalUserParams(null, opts))
+    userList = response.rows.map((row: any) => row.doc)
+    property = "_id"
+  } else {
+    userList = await usersCore.searchGlobalUsersByEmail(search, opts)
+    property = "email"
+  }
+  return dbUtils.pagination(userList, PAGE_LIMIT, {
+    paginate: true,
+    property,
+  })
 }
 
 /**

From 1efd77c7901a092fb7914e4681c268bd4af841de Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 30 Jun 2022 16:01:14 +0100
Subject: [PATCH 4/5] Updating to maintain the old worker API for deprecation
 purposes, but removing from frontend usage.

---
 .../builder/portal/manage/users/index.svelte    |  2 +-
 packages/builder/src/stores/portal/users.js     | 10 +++++-----
 packages/frontend-core/src/api/user.js          | 17 +++++++++++++----
 .../worker/src/api/controllers/global/roles.js  | 13 +------------
 .../worker/src/api/controllers/global/users.ts  | 17 ++++++++++++++---
 packages/worker/src/api/routes/global/users.js  |  1 +
 packages/worker/src/sdk/users/users.ts          | 10 ++++++++++
 7 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index bc14b7e8d2..061c686317 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -35,7 +35,7 @@
 
   async function fetchUsers(page, search) {
     try {
-      await users.fetch({ page, search })
+      await users.search({ page, search })
       pageInfo.fetched($users.hasNextPage, $users.nextPage)
     } catch (error) {
       notifications.error("Error getting user list")
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
index 1e612f6537..12bce413b9 100644
--- a/packages/builder/src/stores/portal/users.js
+++ b/packages/builder/src/stores/portal/users.js
@@ -6,8 +6,8 @@ export function createUsersStore() {
   const { subscribe, set } = writable({})
 
   // opts can contain page and search params
-  async function fetch(opts = {}) {
-    const paged = await API.getUsers(opts)
+  async function search(opts = {}) {
+    const paged = await API.searchUsers(opts)
     set({
       ...paged,
       ...opts,
@@ -60,8 +60,8 @@ export function createUsersStore() {
       body.admin = { global: true }
     }
     await API.saveUser(body)
-    // re-fetch from first page
-    await fetch()
+    // re-search from first page
+    await search()
   }
 
   async function del(id) {
@@ -75,7 +75,7 @@ export function createUsersStore() {
 
   return {
     subscribe,
-    fetch,
+    search,
     get,
     invite,
     acceptInvite,
diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js
index a7a9fae9f1..b86e02c75b 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.js
@@ -1,10 +1,19 @@
 export const buildUserEndpoints = API => ({
+  /**
+   * Gets a list of users in the current tenant.
+   */
+  getUsers: async () => {
+    return await API.get({
+      url: "/api/global/users",
+    })
+  },
+
   /**
    * Gets a list of users in the current tenant.
    * @param {string} page The page to retrieve
    * @param {string} search The starts with string to search username/email by.
    */
-  getUsers: async ({ page, search } = {}) => {
+  searchUsers: async ({ page, search } = {}) => {
     const opts = {}
     if (page) {
       opts.page = page
@@ -12,9 +21,9 @@ export const buildUserEndpoints = API => ({
     if (search) {
       opts.search = search
     }
-    const params = new URLSearchParams(opts)
-    return await API.get({
-      url: `/api/global/users?${params.toString()}`,
+    return await API.post({
+      url: `/api/global/users/search`,
+      body: opts,
     })
   },
 
diff --git a/packages/worker/src/api/controllers/global/roles.js b/packages/worker/src/api/controllers/global/roles.js
index aacf0102f1..0859fc1a21 100644
--- a/packages/worker/src/api/controllers/global/roles.js
+++ b/packages/worker/src/api/controllers/global/roles.js
@@ -3,22 +3,11 @@ const {
   getAllApps,
   getProdAppID,
   DocumentTypes,
-  getGlobalUserParams,
 } = require("@budibase/backend-core/db")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const { getGlobalDB } = require("@budibase/backend-core/tenancy")
-
-// TODO: this function needs to be removed and replaced
-export const allUsers = async () => {
-  const db = getGlobalDB()
-  const response = await db.allDocs(
-    getGlobalUserParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map(row => row.doc)
-}
+const { allUsers } = require("../../../sdk/users")
 
 exports.fetch = async ctx => {
   const tenantId = ctx.user.tenantId
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index 34a199be0f..f84a44098a 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -88,9 +88,8 @@ export const destroy = async (ctx: any) => {
   }
 }
 
-// called internally by app server user fetch
-export const fetch = async (ctx: any) => {
-  const paginated = await users.paginatedUsers(ctx.request.query)
+export const search = async (ctx: any) => {
+  const paginated = await users.paginatedUsers(ctx.request.body)
   // user hashed password shouldn't ever be returned
   for (let user of paginated.data) {
     if (user) {
@@ -100,6 +99,18 @@ export const fetch = async (ctx: any) => {
   ctx.body = paginated
 }
 
+// called internally by app server user fetch
+export const fetch = async (ctx: any) => {
+  const all = await users.allUsers()
+  // user hashed password shouldn't ever be returned
+  for (let user of all) {
+    if (user) {
+      delete user.password
+    }
+  }
+  ctx.body = all
+}
+
 // called internally by app server user find
 export const find = async (ctx: any) => {
   ctx.body = await users.getUser(ctx.params.id)
diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js
index 10739957fc..726e61413e 100644
--- a/packages/worker/src/api/routes/global/users.js
+++ b/packages/worker/src/api/routes/global/users.js
@@ -46,6 +46,7 @@ router
     controller.save
   )
   .get("/api/global/users", builderOrAdmin, controller.fetch)
+  .post("/api/global/users/search", builderOrAdmin, controller.search)
   .delete("/api/global/users/:id", adminOnly, controller.destroy)
   .get("/api/global/roles/:appId")
   .post(
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index db254badeb..35a4083df9 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -19,6 +19,16 @@ import { MigrationType } from "@budibase/types"
 
 const PAGE_LIMIT = 8
 
+export const allUsers = async () => {
+  const db = tenancy.getGlobalDB()
+  const response = await db.allDocs(
+    dbUtils.getGlobalUserParams(null, {
+      include_docs: true,
+    })
+  )
+  return response.rows.map((row: any) => row.doc)
+}
+
 export const paginatedUsers = async ({
   page,
   search,

From 44d478c317c8231fe72a8a34898cd3d067dfc41e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 30 Jun 2022 17:02:50 +0100
Subject: [PATCH 5/5] Adding loading control to make sure that pagination can't
 be spammed in between loads.

---
 packages/builder/src/helpers/pagination.js             | 10 ++++++++++
 .../src/pages/builder/portal/manage/users/index.svelte |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/helpers/pagination.js b/packages/builder/src/helpers/pagination.js
index 9399d34d12..122973f1a1 100644
--- a/packages/builder/src/helpers/pagination.js
+++ b/packages/builder/src/helpers/pagination.js
@@ -6,6 +6,7 @@ function defaultValue() {
     page: undefined,
     hasPrevPage: false,
     hasNextPage: false,
+    loading: false,
     pageNumber: 1,
     pages: [],
   }
@@ -38,6 +39,14 @@ export function createPaginationStore() {
     update(state => {
       state.hasNextPage = hasNextPage
       state.nextPage = nextPage
+      state.loading = false
+      return state
+    })
+  }
+
+  function loading(loading = true) {
+    update(state => {
+      state.loading = loading
       return state
     })
   }
@@ -51,6 +60,7 @@ export function createPaginationStore() {
     prevPage,
     nextPage,
     fetched,
+    loading,
     reset,
   }
 }
diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
index 061c686317..0da8c1345a 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@@ -35,6 +35,7 @@
 
   async function fetchUsers(page, search) {
     try {
+      pageInfo.loading()
       await users.search({ page, search })
       pageInfo.fetched($users.hasNextPage, $users.nextPage)
     } catch (error) {
@@ -78,8 +79,8 @@
     <div class="pagination">
       <Pagination
         page={$pageInfo.pageNumber}
-        hasPrevPage={$pageInfo.hasPrevPage}
-        hasNextPage={$pageInfo.hasNextPage}
+        hasPrevPage={$pageInfo.loading ? false : $pageInfo.hasPrevPage}
+        hasNextPage={$pageInfo.loading ? false : $pageInfo.hasNextPage}
         goToPrevPage={pageInfo.prevPage}
         goToNextPage={pageInfo.nextPage}
       />