Merge remote-tracking branch 'origin/develop' into sso-rest-requests

.github/workflows/budibase_ci.yml

@@ -71,7 +71,7 @@ jobs:
     - name: Upload to S3
       if: github.ref == 'refs/heads/new-design-ui' 
       run: | 
-        tar -czvf new_ui.tar.gz packages/server/assets packages/server/index.html 
+        tar -czvf new_ui.tar.gz packages/server/builder/assets packages/server/builder/index.html 
         aws s3 cp new_ui.tar.gz s3://prod-budi-app-assets/beta:design_ui/
         aws s3 cp packages/client/dist/budibase-client.js s3://prod-budi-app-assets/beta:design_ui/budibase-client.js
         aws cloudfront create-invalidation --distribution-id E3ELKP4RCEHVLW --paths "/beta:design_ui/*"

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.0.212-alpha.6",
+    "@budibase/types": "^1.0.212-alpha.10",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",

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"

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",
@@ -93,13 +91,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}`,
   }
 }
@@ -440,6 +442,26 @@ export const getPlatformUrl = async (
   return platformUrl
 }
 
+export function pagination(
+  data: any[],
+  pageSize: number,
+  { paginate, property } = { paginate: true, property: "_id" }
+) {
+  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,
+  }
+}
+
 export async function getScopedConfig(db: any, params: any) {
   const configDoc = await getScopedFullConfig(db, params)
   return configDoc && configDoc.config ? configDoc.config : configDoc

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]
+}

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.212-alpha.6",
+    "@budibase/string-templates": "^1.0.212-alpha.10",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/builder/cypress.json

@@ -13,7 +13,7 @@
     "HOST_IP": ""
   },
   "retries": {
-    "runMode": 2,
+    "runMode": 1,
     "openMode": 0
   }
 }

packages/builder/cypress/integration/addMultiOptionDatatype.spec.js

@@ -16,18 +16,15 @@ filterTests(['all'], () => {
 
   it("should add form with multi select picker, containing 5 options", () => {
     cy.navigateToFrontend()
-    cy.wait(500)
     // Add data provider
-    cy.get(interact.CATEGORY_DATA).click()
+    cy.get(interact.CATEGORY_DATA, { timeout: 500 }).click()
     cy.get(interact.COMPONENT_DATA_PROVIDER).click()
     cy.get(interact.DATASOURCE_PROP_CONTROL).click()
     cy.get(interact.DROPDOWN).contains("Multi Data").click()
-    cy.wait(500)
     // Add Form with schema to match table
     cy.addComponent("Form", "Form")
     cy.get(interact.DATASOURCE_PROP_CONTROL).click()
     cy.get(interact.DROPDOWN).contains("Multi Data").click()
-    cy.wait(500)
     // Add multi-select picker to form
     cy.addComponent("Form", "Multi-select Picker").then(componentId => {
       cy.get(interact.DATASOURCE_FIELD_CONTROL).type("Test Data").type("{enter}")

packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js

@@ -0,0 +1,131 @@
+import filterTests from "../../support/filterTests"
+const interact = require('../../support/interact')
+
+filterTests(["smoke", "all"], () => {
+  context("Account Portals", () => {
+    
+    const bbUserEmail = "bbuser@test.com"
+    
+    before(() => {
+      cy.login()
+      cy.deleteApp("Cypress Tests")
+      cy.createApp("Cypress Tests")
+      
+      // Create new user
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000})
+      cy.createUser(bbUserEmail)
+      cy.contains("bbuser").click()
+      cy.wait(500)
+
+      // Reset password
+      cy.get(".spectrum-ActionButton-label", { timeout: 2000 }).contains("Force password reset").click({ force: true })
+      
+      cy.get(".spectrum-Dialog-grid")
+      .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd')
+
+      cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true })
+      
+      // Login as new user and set password
+      cy.logOut()
+      cy.get('@pwd').then((pwd) => {
+        cy.login(bbUserEmail, pwd)
+      })
+      
+      for (let i = 0; i < 2; i++) {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
+      }
+      cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true })
+      cy.logoutNoAppGrid()
+    })
+    
+    it("should verify Admin Portal", () => {
+        cy.login()
+        cy.contains("Users").click()
+        cy.contains("bbuser").click()
+
+        // Enable Development & Administration access
+        cy.wait(500)
+        for (let i = 4; i < 6; i++) {
+            cy.get(interact.FIELD).eq(i).within(() => {
+              cy.get(interact.SPECTRUM_SWITCH_INPUT).click({ force: true })
+              cy.get(interact.SPECTRUM_SWITCH_INPUT).should('be.enabled')
+            })
+        }
+        bbUserLogin()
+
+        // Verify available options for Admin portal
+        cy.get(".spectrum-SideNav")
+        .should('contain', 'Apps')
+        //.and('contain', 'Usage')
+        .and('contain', 'Users')
+        .and('contain', 'Auth')
+        .and('contain', 'Email')
+        .and('contain', 'Organisation')
+        .and('contain', 'Theming')
+        .and('contain', 'Update')
+        //.and('contain', 'Upgrade')
+
+        cy.logOut()
+    })
+
+    it("should verify Development Portal", () => {
+      // Only Development access should be enabled
+      cy.login()
+      cy.contains("Users").click()
+      cy.contains("bbuser").click()
+      cy.wait(500)
+      cy.get(interact.FIELD).eq(5).within(() => {
+        cy.get(interact.SPECTRUM_SWITCH_INPUT).click({ force: true })
+      })
+
+      bbUserLogin()
+
+      // Verify available options for Admin portal
+      cy.get(interact.SPECTRUM_SIDENAV)
+        .should('contain', 'Apps')
+        //.and('contain', 'Usage')
+        .and('not.contain', 'Users')
+        .and('not.contain', 'Auth')
+        .and('not.contain', 'Email')
+        .and('not.contain', 'Organisation')
+        .and('contain', 'Theming')
+        .and('not.contain', 'Update')
+        .and('not.contain', 'Upgrade')
+
+        cy.logOut()
+    })
+
+    it("should verify Standard Portal", () => {
+      // Development access should be disabled (Admin access is already disabled)
+      cy.login()
+      cy.contains("Users").click()
+      cy.contains("bbuser").click()
+      cy.wait(500)
+      cy.get(interact.FIELD).eq(4).within(() => {
+        cy.get(interact.SPECTRUM_SWITCH_INPUT).click({ force: true })
+      })
+
+      bbUserLogin()
+
+      // Verify Standard Portal
+      cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections
+      cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button
+      cy.get(".app").should('not.exist') // No apps -> no roles assigned to user
+      cy.get(interact.CONTAINER).should('contain', bbUserEmail) // Message containing users email
+
+      cy.logoutNoAppGrid()
+    })
+
+    const bbUserLogin = () => {
+      // Login as bbuser
+      cy.logOut()
+      cy.login(bbUserEmail, "test")
+    }
+
+    after(() => {
+      cy.login()
+      // Delete BB user
+      cy.deleteUser(bbUserEmail)
+    })
+  })
+})

packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js

@@ -1,28 +1,34 @@
-import filterTests from "../support/filterTests"
+import filterTests from "../../support/filterTests"
-const interact = require('../support/interact')
+const interact = require('../../support/interact')
 
 filterTests(["smoke", "all"], () => {
-  context("Create a User and Assign Roles", () => {
+  context("User Management", () => {
     before(() => {
       cy.login()
       cy.deleteApp("Cypress Tests")
       cy.createApp("Cypress Tests")
     })
 
-    it("should create a user", () => {
+    it("should create a user via basic onboarding", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 1000})
-      cy.wait(1000)
       cy.createUser("bbuser@test.com")
       cy.get(interact.SPECTRUM_TABLE).should("contain", "bbuser")
     })
 
-    it("should confirm there is No Access for a New User", () => {
+    it("should confirm basic permission for a New User", () => {
-      // Click into the user
+      // Basic permission = development & administraton disabled
       cy.contains("bbuser").click()
-      cy.wait(500)
+      // Confirm development and admin access are disabled
-      // Get No Access table - Confirm it has apps in it
+      for (let i = 4; i < 6; i++) {
-      cy.get(interact.SPECTRUM_TABLE).eq(1).should("not.contain", "No rows found")
+        cy.wait(500)
-      // Get Configure Roles table - Confirm it has no apps
+        cy.get(interact.FIELD).eq(i).within(() => {
+          //cy.get(interact.SPECTRUM_SWITCH_INPUT).should('be.disabled')
+          cy.get(".spectrum-Switch-switch").should('not.be.checked')
+        })
+      }
+      // Existing apps appear within the No Access table
+      cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).eq(1).should("not.contain", "No rows found")
+      // Configure roles table should not contain apps
       cy.get(interact.SPECTRUM_TABLE).eq(0).contains("No rows found")
     })
 
@@ -40,20 +46,16 @@ filterTests(["smoke", "all"], () => {
                   cy.createApp(name)
                 } else {
                   cy.visit(`${Cypress.config().baseUrl}/builder`)
-                  cy.wait(500)
+                  cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true })
-                  cy.get(interact.CREATE_APP_BUTTON).click({ force: true })
                   cy.createAppFromScratch(name)
                 }
               }
             }
           })
         // Navigate back to the user
-        cy.visit(`${Cypress.config().baseUrl}/builder`)
+        cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 500})
-        cy.wait(500)
         cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click()
-        cy.wait(500)
+        cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).contains("bbuser").click()
-        cy.get(interact.SPECTRUM_TABLE).contains("bbuser").click()
-        cy.wait(1000)
         for (let i = 0; i < 3; i++) {
           cy.get(interact.SPECTRUM_TABLE, { timeout: 3000})
             .eq(1)
@@ -62,31 +64,28 @@ filterTests(["smoke", "all"], () => {
             .find(interact.SPECTRUM_TABLE_CELL)
             .eq(0)
             .click()
-          cy.wait(500)
+          cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 500 })
-          cy.get(interact.SPECTRUM_DIALOG_GRID)
             .contains("Choose an option")
             .click()
             .then(() => {
-              cy.wait(1000)
               if (i == 0) {
-                cy.get(interact.SPECTRUM_MENU).contains("Admin").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Admin").click({ force: true })
               }
               else if (i == 1) {
-                cy.get(interact.SPECTRUM_MENU).contains("Power").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Power").click({ force: true })
               }
               else if (i == 2) {
-                cy.get(interact.SPECTRUM_MENU).contains("Basic").click({ force: true })
+                cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Basic").click({ force: true })
               }
-              cy.wait(1000)
+              cy.get(interact.SPECTRUM_BUTTON, { timeout: 1000 })
-              cy.get(interact.SPECTRUM_BUTTON)
                 .contains("Update role")
                 .click({ force: true })
             })
             cy.reload()
+            cy.wait(1000)
         }
         // Confirm roles exist within Configure roles table
-        cy.wait(2000)
+        cy.get(interact.SPECTRUM_TABLE, { timeout: 2000 })
-        cy.get(interact.SPECTRUM_TABLE)
           .eq(0)
           .within(assginedRoles => {
             expect(assginedRoles).to.contain("Admin")
@@ -112,21 +111,19 @@ filterTests(["smoke", "all"], () => {
                 .click()
                 .then(() => {
                   cy.get(interact.SPECTRUM_PICKER).eq(1).click({ force: true })
-                  cy.wait(500)
+                  cy.get(interact.SPECTRUM_POPOVER, { timeout: 500 }).contains("No Access").click()
-                  cy.get(interact.SPECTRUM_POPOVER).contains("No Access").click()
                 })
               cy.get(interact.SPECTRUM_BUTTON)
                 .contains("Update role")
                 .click({ force: true })
-              cy.wait(1000)
             }
           })
         // Confirm Configure roles table no longer has any apps in it
-        cy.get(interact.SPECTRUM_TABLE).eq(0).contains("No rows found")
+        cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).eq(0).contains("No rows found")
       })
     }
 
-    it("should enable Developer access", () => {
+    it("should enable Developer access and verify application access", () => {
       // Enable Developer access
       cy.get(interact.FIELD)
         .eq(4)
@@ -158,15 +155,15 @@ filterTests(["smoke", "all"], () => {
         })
     })
 
-    it("should disable Developer access", () => {
+    it("should disable Developer access and verify application access", () => {
       // Disable Developer access
-      cy.get(".field")
+      cy.get(interact.FIELD)
         .eq(4)
         .within(() => {
           cy.get(".spectrum-Switch-input").click({ force: true })
         })
       // Configure roles table should now be empty
-      cy.get(".container")
+      cy.get(interact.CONTAINER)
         .contains("Configure roles")
         .parent()
         .within(() => {
@@ -174,22 +171,64 @@ filterTests(["smoke", "all"], () => {
         })
     })
 
+    it("Should edit user details within user details page", () => {
+      // Add First name
+      cy.get(interact.FIELD, { timeout: 500 }).eq(2).within(() => {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).type("bb")
+      })
+      // Add Last name
+      cy.get(interact.FIELD).eq(3).within(() => {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("test")
+      })
+      cy.get(interact.FIELD).eq(0).click()
+      // Reload page
+      cy.reload()
+
+      // Confirm details have been saved
+      cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb")
+      })
+      cy.get(interact.FIELD).eq(3).within(() => {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 500 }).should('have.value', "test")
+      })
+    })
+
+    it("should reset the users password", () => {
+      cy.get(interact.REGENERATE, { timeout: 500 }).contains("Force password reset").click({ force: true })
+
+      // Reset password modal
+      cy.get(interact.SPECTRUM_DIALOG_GRID)
+      .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd')
+      cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true })
+
+      // Logout, then login with new password
+      cy.logOut()
+      cy.get('@pwd').then((pwd) => {
+        cy.login("bbuser@test.com", pwd)
+      })
+
+      // Reset password screen
+      for (let i = 0; i < 2; i++) {
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
+      }
+      cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true })
+
+      // Confirm user logged in afer password change
+      cy.get(".avatar > .icon").click({ force: true })
+
+      cy.get(".spectrum-Menu-item").contains("Update user information").click({ force: true })
+      cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
+      .eq(0)
+      .invoke('val').should('eq', 'bbuser@test.com')
+      
+      // Logout and login as previous user
+      cy.logoutNoAppGrid()
+      cy.login()
+      })
+
     it("should delete a user", () => {
-      // Click Delete user button
+      cy.deleteUser("bbuser@test.com")
-      cy.get(interact.SPECTRUM_BUTTON)
+      cy.get(interact.SPECTRUM_TABLE, { timeout: 4000 }).should("not.have.text", "bbuser")
-        .contains("Delete user")
-        .click({ force: true })
-        .then(() => {
-          // Confirm deletion within modal
-          cy.wait(500)
-          cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
-            cy.get(interact.SPECTRUM_BUTTON)
-              .contains("Delete user")
-              .click({ force: true })
-            cy.wait(4000)
-          })
-        })
-      cy.get(interact.SPECTRUM_TABLE).should("not.have.text", "bbuser")
     })
   })
 })

packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js

@@ -0,0 +1,108 @@
+import filterTests from "../../support/filterTests"
+const interact = require('../../support/interact')
+
+filterTests(["smoke", "all"], () => {
+  context("User Settings Menu", () => {
+    
+    before(() => {
+      cy.login()
+    })
+    
+    it("should update user information via user settings menu", () => {
+        const fname = "test"
+        const lname = "user"
+
+        cy.visit(`${Cypress.config().baseUrl}/builder`)
+        cy.updateUserInformation(fname, lname)
+
+        // Go to user info and confirm name update
+        cy.contains("Users").click()
+        cy.contains("test@test.com").click()
+
+        cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
+            cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', fname)
+          })
+        cy.get(interact.FIELD).eq(3).within(() => {
+            cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', lname)
+          })
+    })
+
+    it("should allow copying of the users API key", () => {
+        cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true })
+        cy.get(interact.SPECTRUM_MENU_ITEM).contains("View API key").click({ force: true })
+        cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => {
+            cy.get(interact.SPECTRUM_ICON).click({force: true})
+        })
+        // There may be timing issues with this on the smoke build
+        cy.wait(500)
+        cy.get(".spectrum-Toast-content")
+        .contains("URL copied to clipboard")
+        .should("be.visible")
+    })
+
+    it("should allow API key regeneration", () => {
+        // Get initial API key value
+        cy.get(interact.SPECTRUM_DIALOG_CONTENT)
+        .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('keyOne')
+
+        // Click re-generate key button
+        cy.get("button").contains("Re-generate key").click({ force: true })
+
+        // Verify API key was changed
+        cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => {
+            cy.get('@keyOne').then((keyOne) => {
+                cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').should('not.eq', keyOne)
+            })
+        })
+        cy.closeModal()
+    })
+
+    it("should update password", () => {
+        // Access Update password modal
+        cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true })
+        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true })
+
+        // Enter new password and update
+        cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
+            for (let i = 0; i < 2; i++) {
+                // password set to 'newpwd'
+                cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("newpwd")
+              }
+            cy.get("button").contains("Update password").click({ force: true })
+        })
+
+        // Logout & in with new password
+        cy.logOut()
+        cy.login("test@test.com", "newpwd")
+    })
+
+    it("should open and close developer mode", () => {
+        cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true })
+        
+        // Close developer mode & verify
+        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Close developer mode").click({ force: true })
+        cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections
+        cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button
+        cy.get(".app").should('not.exist') // At least one app should be available
+
+        // Open developer mode & verify
+        cy.get(".avatar > .icon").click({ force: true })
+        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Open developer mode").click({ force: true })
+        cy.get(interact.SPECTRUM_SIDENAV).should('exist') // config sections available
+        cy.get(interact.CREATE_APP_BUTTON).should('exist') // create app button available
+        cy.get(interact.APP_TABLE).should('exist') // App table available
+    })
+
+    after(() => {
+        // Change password back to original value
+        cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true })
+        cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true })
+        cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
+            for (let i = 0; i < 2; i++) {
+                cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test")
+              }
+            cy.get("button").contains("Update password").click({ force: true })
+        })
+      })
+  })
+})

packages/builder/cypress/integration/appOverview.spec.js

@@ -136,7 +136,6 @@ filterTests(["all"], () => {
         .within(() => {
           cy.get(".confirm-wrap button").click({ force: true })
         })
-      cy.wait(1000)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.get(".appTable .app-row-actions button")
@@ -158,12 +157,9 @@ filterTests(["all"], () => {
         .contains("Manage")
         .eq(0)
         .click({ force: true })
-      cy.wait(1000)
+      cy.get(".edit-hover", { timeout: 1000 }).eq(0).click({ force: true })
-      cy.get(".app-overview-actions-icon").within(() => {
-        cy.get(".spectrum-Icon").click({ force: true })
-      })
-      cy.get(".spectrum-Menu").contains("Edit icon").click()
       // Select random icon
+      cy.wait(400)
       cy.get(".grid").within(() => {
         cy.get(".icon-item")
           .eq(Math.floor(Math.random() * 23) + 1)
@@ -182,6 +178,7 @@ filterTests(["all"], () => {
       cy.get("@iconChange").its("response.statusCode").should("eq", 200)
       // Confirm icon has changed from default
       // Confirm colour has been applied
+      cy.get(".spectrum-ActionButton-label").contains("Back").click({ force: true })
       cy.get(".appTable", { timeout: 2000 }).within(() => {
         cy.get("[aria-label]")
           .eq(0)
@@ -265,10 +262,9 @@ filterTests(["all"], () => {
         //Downgrade the app for the test
         cy.alterAppVersion(appId, "0.0.1-alpha.0").then(() => {
           cy.reload()
-          cy.wait(1000)
           cy.log("Current deployment version: " + clientPackage.version)
 
-          cy.get(".version-status a").contains("Update").click()
+          cy.get(".version-status a", { timeout: 1000 }).contains("Update").click()
           cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
           cy.get(".version-section .page-action button")
@@ -336,8 +332,7 @@ filterTests(["all"], () => {
         })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
+      cy.get(".appTable .app-row-actions button", { timeout: 1000 })
-      cy.get(".appTable .app-row-actions button")
         .contains("Manage")
         .eq(0)
         .click({ force: true })
@@ -345,8 +340,7 @@ filterTests(["all"], () => {
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
 
       cy.get(".details-section .page-action .spectrum-Button").scrollIntoView()
-      cy.wait(1000)
+      cy.get(".details-section .page-action .spectrum-Button", { timeout: 1000 }).should(
-      cy.get(".details-section .page-action .spectrum-Button").should(
         "be.disabled"
       )
     })
@@ -375,27 +369,21 @@ filterTests(["all"], () => {
             .contains("Copy App ID")
             .click({ force: true })
         })
-
+      
       cy.get(".spectrum-Toast-content")
-        .contains("App ID copied to clipboard.")
+      .contains("App ID copied to clipboard.")
-        .should("be.visible")
+      .should("be.visible")
     })
 
-    it("Should allow unpublishing of the application", () => {
+    it("Should allow unpublishing of the application via the Unpublish link", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.get(".appTable .app-row-actions button")
         .contains("Manage")
         .eq(0)
         .click({ force: true })
-      cy.get(".app-overview-actions-icon > .icon").click({ force: true })
 
-      cy.get("[data-cy='app-overview-menu-popover']")
+      cy.get(`[data-cy="app-status"]`).within(() => {
-        .eq(0)
+        cy.contains("Unpublish").click({ force: true })
-        .within(() => {
-          cy.get(".spectrum-Menu-item")
-            .contains("Unpublish")
-            .click({ force: true })
-          cy.wait(500)
         })
 
       cy.get("[data-cy='unpublish-modal']")
@@ -406,9 +394,8 @@ filterTests(["all"], () => {
 
       cy.get(".overview-tab [data-cy='app-status']").within(() => {
         cy.get(".status-display").contains("Unpublished")
-        cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should(
+        cy.get(".status-display .icon svg[aria-label='GlobeStrike']")
-          "exist"
+        .should("exist")
-        )
       })
     })
 

packages/builder/cypress/integration/appPublishWorkflow.spec.js

@@ -11,9 +11,8 @@ filterTests(['all'], () => {
 
     it("Should reflect the unpublished status correctly", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
 
-      cy.get(interact.APP_TABLE_STATUS).eq(0)
+      cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0)
       .within(() => {
         cy.contains("Unpublished")
         cy.get(interact.GLOBESTRIKE).should("exist")
@@ -35,11 +34,10 @@ filterTests(['all'], () => {
       cy.get(interact.DEPLOY_APP_MODAL).should("be.visible")
       .within(() => {
         cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force : true })
-        cy.wait(1000)
       });
 
       //Verify that the app url is presented correctly to the user
-      cy.get(interact.DEPLOY_SUCCESS_MODAL)
+      cy.get(interact.DEPLOY_SUCCESS_MODAL, { timeout: 1000 })
       .should("be.visible")
       .within(() => {
         let appUrl = Cypress.config().baseUrl + '/app/cypress-tests'
@@ -48,9 +46,8 @@ filterTests(['all'], () => {
       })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
 
-      cy.get(interact.APP_TABLE_STATUS).eq(0)
+      cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0)
       .within(() => {
         cy.contains("Published")
         cy.get(interact.GLOBE).should("exist")
@@ -58,7 +55,7 @@ filterTests(['all'], () => {
 
       cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
       .within(() => {
-        cy.get(interact.SPECTRUM_BUTTON).contains("View")
+        cy.get(interact.SPECTRUM_BUTTON).contains("Manage")
         cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true })
       })
 
@@ -83,24 +80,25 @@ filterTests(['all'], () => {
         cy.get("svg[aria-label='Globe']").should("exist")
       })
 
-      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
+      cy.get(interact.APP_TABLE).eq(0)
       .within(() => {
-        cy.get(interact.SPECTRUM_BUTTON).contains("View")
         cy.get(interact.APP_TABLE_APP_NAME).click({ force: true })
       })
 
-      cy.get(interact.SPECTRUM_LINK).contains('Unpublish').click();
+      cy.get(interact.DEPLOYMENT_TOP_NAV).click()
+      cy.get(interact.PUBLISH_POPOVER_ACTION).click({ force: true })
+      cy.get(interact.UNPUBLISH_MODAL)
+        .within(() => {
+          cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true })
+        })
 
       cy.get(interact.UNPUBLISH_MODAL).should("be.visible")
       .within(() => {
         cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true }
       )})
 
-      cy.get(interact.DEPLOYMENT_TOP_NAV_GLOBESTRIKE).should("exist")
-
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-
+      cy.get(interact.APP_TABLE_STATUS, { timeout: 1000 }).eq(0).contains("Unpublished")
-      cy.get(interact.APP_TABLE_STATUS).eq(0).contains("Unpublished")
 
     })
   })

packages/builder/cypress/integration/autoScreensUI.spec.js

@@ -5,6 +5,7 @@ filterTests(['smoke', 'all'], () => {
   context("Auto Screens UI", () => {
     before(() => {
       cy.login()
+      cy.deleteAllApps()
     })
 
     it("should disable the autogenerated screen options if no sources are available", () => {

packages/builder/cypress/integration/createApp.spec.js

@@ -6,14 +6,14 @@ filterTests(['smoke', 'all'], () => {
 
     before(() => {
       cy.login()
-      cy.deleteApp("Cypress Tests")
+      cy.deleteAllApps()
     })
 
     if (!(Cypress.env("TEST_ENV"))) {
       it("should show the new user UI/UX", () => {
-        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/create`) //added /portal/apps/create
+        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/create`, { timeout: 5000 }) //added /portal/apps/create
+        cy.wait(1000)
         cy.get(interact.CREATE_APP_BUTTON).contains('Start from scratch').should("exist")
-        cy.get(interact.CREATE_APP_BUTTON).should("exist")
         
         cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist")
         cy.get(interact.TEMPLATE_CATEGORY).should("exist")
@@ -23,7 +23,7 @@ filterTests(['smoke', 'all'], () => {
     }
 
     it("should provide filterable templates", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
       cy.wait(500)
 
       cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
@@ -48,11 +48,10 @@ filterTests(['smoke', 'all'], () => {
     })
 
     it("should enforce a valid url before submission", () => {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
-      cy.wait(500)
 
       // Start create app process. If apps already exist, click second button
-      cy.get(interact.CREATE_APP_BUTTON).click({ force: true })
+      cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true })
       cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
         .its("body")
         .then(val => {
@@ -92,21 +91,16 @@ filterTests(['smoke', 'all'], () => {
 
     it("should create the first application from scratch", () => {
       const appName = "Cypress Tests"
-      cy.createApp(appName)
+      cy.createApp(appName, false)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
 
       cy.applicationInAppTable(appName)
       cy.deleteApp(appName)
     })
 
     it("should create the first application from scratch with a default name", () => {
-      cy.createApp()
+      cy.createApp("", false)
-
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
-
       cy.applicationInAppTable("My app")
       cy.deleteApp("My app")
     })
@@ -116,26 +110,22 @@ filterTests(['smoke', 'all'], () => {
 
       cy.updateUserInformation("Ted", "Userman")
       
-      cy.createApp()
+      cy.createApp("", false)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
 
       cy.applicationInAppTable("Teds app")
       cy.deleteApp("Teds app")
-      cy.wait(2000)
 
       //Accomodate names that end in 'S'
       cy.updateUserInformation("Chris", "Userman")
       
-      cy.createApp()
+      cy.createApp("", false)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(1000)
 
       cy.applicationInAppTable("Chris app")
       cy.deleteApp("Chris app")
-      cy.wait(2000)
 
       cy.updateUserInformation("", "")
     })
@@ -145,7 +135,7 @@ filterTests(['smoke', 'all'], () => {
 
       cy.importApp(exportedApp, "")
 
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 2000 })
 
       cy.applicationInAppTable("My app")
       
@@ -224,14 +214,12 @@ filterTests(['smoke', 'all'], () => {
       cy.createApp(appName)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
 
       // Create second app
       const secondAppName = "Second App Demo"
       cy.createApp(secondAppName)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
 
       //Both applications should exist and be searchable
       cy.searchForApplication(appName)

packages/builder/cypress/integration/createAutomation.spec.js

@@ -16,17 +16,15 @@ filterTests(['smoke', 'all'], () => {
       cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
         cy.get("input").type("Add Row")
         cy.contains("Row Created").click({ force: true })
-        cy.wait(500)
+        cy.get(interact.SPECTRUM_BUTTON_CTA, { timeout: 500 }).click()
-        cy.get(interact.SPECTRUM_BUTTON_CTA).click()
       })
 
       // Setup trigger
       cy.get(interact.SPECTRUM_PICKER_LABEL).click()
       cy.wait(500)
       cy.contains("dog").click()
-      cy.wait(2000)
       // Create action
-      cy.get('[aria-label="AddCircle"]').eq(1).click()
+      cy.get('[aria-label="AddCircle"]', { timeout: 2000 }).eq(1).click()
       cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
         cy.wait(1000)
         cy.contains("Create Row").trigger('mouseover').click().click()
@@ -43,11 +41,9 @@ filterTests(['smoke', 'all'], () => {
       cy.contains("Finish and test automation").click()
 
       cy.get(interact.MODAL_INNER_WRAPPER).within(() => {
-        cy.wait(1000)
+        cy.get(interact.SPECTRUM_PICKER_LABEL, { timeout: 1000 }).click()
-        cy.get(interact.SPECTRUM_PICKER_LABEL).click()
         cy.contains("dog").click()
-        cy.wait(1000)
+        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 })
-        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)
           .first()
           .type("automationGoodboy")
         cy.get(interact.SPECTRUM_TEXTFIELD_INPUT)

packages/builder/cypress/integration/createTable.spec.js

@@ -10,9 +10,8 @@ filterTests(["smoke", "all"], () => {
 
     it("should create a new Table", () => {
       cy.createTable("dog")
-      cy.wait(1000)
       // Check if Table exists
-      cy.get(interact.TABLE_TITLE_H1).should("have.text", "dog")
+      cy.get(interact.TABLE_TITLE_H1, { timeout: 1000 }).should("have.text", "dog")
     })
 
     it("adds a new column to the table", () => {
@@ -40,7 +39,7 @@ filterTests(["smoke", "all"], () => {
 
     it("edits a row", () => {
       cy.contains("button", "Edit").click({ force: true })
-      cy.wait(1000)
+      cy.wait(500)
       cy.get(interact.SPECTRUM_MODAL_INPUT).clear()
       cy.get(interact.SPECTRUM_MODAL_INPUT).type("Updated")
       cy.contains("Save").click()
@@ -63,8 +62,7 @@ filterTests(["smoke", "all"], () => {
           cy.addRow([i])
         }
         cy.reload()
-        cy.wait(2000)
+        cy.get(interact.SPECTRUM_PAGINATION, { timeout: 2000 }).within(() => {
-        cy.get(interact.SPECTRUM_PAGINATION).within(() => {
           cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).click()
         })
         cy.get(interact.SPECTRUM_PAGINATION).within(() => {
@@ -79,10 +77,9 @@ filterTests(["smoke", "all"], () => {
           cy.get(interact.SPECTRUM_BUTTON).click({ force: true })
         })
         cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Delete").click({ force: true })
-        cy.wait(1000)
 
         // Confirm table only has one page
-        cy.get(interact.SPECTRUM_PAGINATION).within(() => {
+        cy.get(interact.SPECTRUM_PAGINATION, { timeout: 1000 }).within(() => {
           cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).should("not.be.enabled")
         })
       })

packages/builder/cypress/integration/createView.spec.js

@@ -69,8 +69,8 @@ filterTests(['smoke', 'all'], () => {
 
         cy.get(interact.SPECTRUM_BUTTON).contains("Save").click({ force: true })
       })
-      cy.wait(1000)
 
+      cy.wait(1000)
       cy.get(interact.TITLE).then($headers => {
         expect($headers).to.have.length(7)
         const headers = Array.from($headers).map(header =>

packages/builder/cypress/integration/customThemingProperties.spec.js

@@ -34,7 +34,6 @@ filterTests(['all'], () => {
       Large = 16px */
       it("should test button roundness", () => {
         const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
-        cy.wait(1000)
         // Add button, change roundness and confirm value
         cy.addComponent("Button", null).then((componentId) => {
           buttonRoundnessValues.forEach(function (item, index){

packages/builder/cypress/integration/datasources/datasourceWizard.spec.js

@@ -17,11 +17,10 @@ filterTests(['all'], () => {
       // Navigate back within datasource wizard
       cy.get(".spectrum-Dialog-grid").within(() => {
         cy.get(".spectrum-Button").contains("Back").click({ force: true })
-        cy.wait(1000)
       })
     
       // Select PostgreSQL datasource again
-      cy.get(".item-list").contains(datasource).click()
+      cy.get(".item-list", { timeout: 1000 }).contains(datasource).click()
       cy.get(".spectrum-Dialog-grid").within(() => {
         cy.get(".spectrum-Button").contains("Continue").click({ force: true })
       })

packages/builder/cypress/integration/datasources/mySql.spec.js

@@ -111,10 +111,9 @@ filterTests(["all"], () => {
           // Save relationship & reload page
           cy.get(".spectrum-Button").contains("Save").click({ force: true })
           cy.reload()
-          cy.wait(1000)
         })
         // Confirm table length & relationship name
-        cy.get(".spectrum-Table")
+        cy.get(".spectrum-Table", { timeout: 1000 })
           .eq(1)
           .find(".spectrum-Table-row")
           .its("length")
@@ -136,15 +135,15 @@ filterTests(["all"], () => {
               cy.get(".spectrum-Table")
                 .eq(1)
                 .within(() => {
-                  cy.get(".spectrum-Table-row").eq(0).click({ force: true })
+                  cy.get(".spectrum-Table-cell").eq(0).click({ force: true })
-                  cy.wait(500)
                 })
-              cy.get(".spectrum-Dialog-grid").within(() => {
+              cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
                 cy.get(".spectrum-Button")
                   .contains("Delete")
                   .click({ force: true })
               })
               cy.reload()
+              cy.wait(500)
             }
             // Confirm relationships no longer exist
             cy.get(".spectrum-Body").should(
@@ -217,9 +216,8 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Button")
           .contains("Delete Query")
           .click({ force: true })
-        cy.wait(1000)
         // Confirm deletion
-        cy.get(".nav-item").should("not.contain", queryName)
+        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName)
       })
     }
   })

packages/builder/cypress/integration/datasources/oracle.spec.js

@@ -20,7 +20,7 @@ filterTests(["all"], () => {
           .click({ force: true })
         cy.wait(500)
         // Confirm config contains localhost
-        cy.get(".spectrum-Textfield-input")
+        cy.get(".spectrum-Textfield-input", { timeout: 500 })
           .eq(1)
           .should("have.value", "localhost")
         // Add another Oracle data source, configure & skip table fetch
@@ -140,9 +140,8 @@ filterTests(["all"], () => {
                 .eq(1)
                 .within(() => {
                   cy.get(".spectrum-Table-row").eq(0).click()
-                  cy.wait(500)
                 })
-              cy.get(".spectrum-Dialog-grid").within(() => {
+              cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
                 cy.get(".spectrum-Button")
                   .contains("Delete")
                   .click({ force: true })
@@ -221,10 +220,9 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Button")
           .contains("Delete Query")
           .click({ force: true })
-        cy.wait(1000)
 
         // Confirm deletion
-        cy.get(".nav-item").should("not.contain", queryName)
+        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName)
       })
     }
   })

packages/builder/cypress/integration/datasources/postgreSql.spec.js

@@ -35,6 +35,7 @@ filterTests(["all"], () => {
         // Check response from datasource after adding configuration
         cy.wait("@datasource")
         cy.get("@datasource").its("response.statusCode").should("eq", 200)
+        cy.wait(2000)
         // Confirm fetch tables was successful
         cy.get(".spectrum-Table")
           .eq(0)
@@ -113,13 +114,13 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Table")
           .eq(1)
           .within(() => {
-            cy.get(".spectrum-Table-row").eq(0).click({ force: true })
+            cy.get(".spectrum-Table-cell").eq(0).click({ force: true })
-            cy.wait(500)
           })
-        cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
           cy.get(".spectrum-Button").contains("Delete").click({ force: true })
         })
         cy.reload()
+        cy.wait(500)
         // Confirm relationship was deleted
         cy.get(".spectrum-Table")
           .eq(1)
@@ -159,7 +160,7 @@ filterTests(["all"], () => {
         switchSchema("randomText")
 
         // No tables displayed
-        cy.get(".spectrum-Body").eq(2).should("contain", "No tables found")
+        cy.get(".spectrum-Body", { timeout: 5000 }).eq(2).should("contain", "No tables found")
 
         // Previously created query should be visible
         cy.get(".spectrum-Table").should("contain", queryName)
@@ -170,7 +171,7 @@ filterTests(["all"], () => {
         switchSchema("1")
 
         // Confirm tables exist - Check for specific one
-        cy.get(".spectrum-Table").eq(0).should("contain", "test")
+        cy.get(".spectrum-Table", { timeout: 5000 }).eq(0).should("contain", "test")
         cy.get(".spectrum-Table")
           .eq(0)
           .find(".spectrum-Table-row")
@@ -184,7 +185,7 @@ filterTests(["all"], () => {
         switchSchema("public")
 
         // Confirm tables exist - again
-        cy.get(".spectrum-Table").eq(0).should("contain", "REGIONS")
+        cy.get(".spectrum-Table", { timeout: 5000 }).eq(0).should("contain", "REGIONS")
         cy.get(".spectrum-Table")
           .eq(0)
           .find(".spectrum-Table-row")
@@ -230,7 +231,9 @@ filterTests(["all"], () => {
         // Run and Save query
         cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
         cy.wait(500)
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+        cy.get(".spectrum-Button", { timeout: 500 }).contains("Save Query").click({ force: true })
+        //cy.reload()
+        //cy.wait(500)
         cy.get(".nav-item").should("contain", queryRename)
       })
 
@@ -247,9 +250,8 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Button")
           .contains("Delete Query")
           .click({ force: true })
-        cy.wait(1000)
         // Confirm deletion
-        cy.get(".nav-item").should("not.contain", queryName)
+        cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName)
       })
 
       const switchSchema = schema => {
@@ -271,7 +273,7 @@ filterTests(["all"], () => {
             .click({ force: true })
         })
         cy.reload()
-        cy.wait(5000)
+        cy.wait(1000)
       }
     }
   })

packages/builder/cypress/integration/datasources/rest.spec.js

@@ -14,8 +14,7 @@ filterTests(["smoke", "all"], () => {
       // Select REST data source
       cy.selectExternalDatasource(datasource)
       // Enter incorrect api & attempt to send query
-      cy.wait(500)
+      cy.get(".spectrum-Button", { timeout: 500 }).contains("Add query").click({ force: true })
-      cy.get(".spectrum-Button").contains("Add query").click({ force: true })
       cy.intercept("**/preview").as("queryError")
       cy.get("input").clear().type("random text")
       cy.get(".spectrum-Button").contains("Send").click({ force: true })
@@ -36,8 +35,7 @@ filterTests(["smoke", "all"], () => {
       // createRestQuery confirms query creation
       cy.createRestQuery("GET", restUrl, "/breweries")
       // Confirm status code response within REST datasource
-      cy.wait(1000)
+      cy.get(".stats", { timeout: 1000 }).within(() => {
-      cy.get(".stats").within(() => {
         cy.get(".spectrum-FieldLabel")
         .eq(0)
         .should("contain", 200)

packages/builder/cypress/integration/renameAnApplication.spec.js

@@ -13,16 +13,13 @@ filterTests(["all"], () => {
       const appRename = "Cypress Renamed"
       // Rename app, Search for app, Confirm name was changed
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
       renameApp(appName, appRename)
       cy.reload()
-      cy.wait(1000)
       cy.searchForApplication(appRename)
       cy.get(interact.APP_TABLE).find(interact.TITLE).should("have.length", 1)
       cy.applicationInAppTable(appRename)
       // Set app name back to Cypress Tests
       cy.reload()
-      cy.wait(1000)
       renameApp(appRename, appName)
     })
 
@@ -43,7 +40,6 @@ filterTests(["all"], () => {
       })
       // Rename app, Search for app, Confirm name was changed
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
       renameApp(appName, appRename, true)
       cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1)
       cy.applicationInAppTable(appRename)
@@ -52,13 +48,9 @@ filterTests(["all"], () => {
     it("Should try to rename an application to have no name", () => {
       const appName = "Cypress Tests"
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
       renameApp(appName, " ", false, true)
-      cy.wait(500)
       // Close modal and confirm name has not been changed
-      cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Cancel").click()
+      cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click()
-      cy.reload()
-      cy.wait(1000)
       cy.applicationInAppTable(appName)
     })
 
@@ -66,8 +58,7 @@ filterTests(["all"], () => {
       // It is not possible to have applications with the same name
       const appName = "Cypress Tests"
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
+      cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 }
-      cy.get(interact.SPECTRUM_BUTTON)
         .contains("Create app")
         .click({ force: true })
       cy.contains(/Start from scratch/).click()
@@ -90,13 +81,10 @@ filterTests(["all"], () => {
       const numberName = 12345
       const specialCharName = "£$%^"
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
       renameApp(appName, numberName)
       cy.reload()
-      cy.wait(1000)
       cy.applicationInAppTable(numberName)
       cy.reload()
-      cy.wait(1000)
       renameApp(numberName, specialCharName)
       cy.get(interact.ERROR).should(
         "have.text",
@@ -104,13 +92,12 @@ filterTests(["all"], () => {
       )
       // Set app name back to Cypress Tests
       cy.reload()
-      cy.wait(1000)
       renameApp(numberName, appName)
     })
 
     const renameApp = (originalName, changedName, published, noName) => {
       cy.searchForApplication(originalName)
-      cy.get(interact.APP_TABLE).within(() => {
+      cy.get(interact.APP_TABLE, { timeout: 1000 }).within(() => {
         cy.get(".app-row-actions button")
           .contains("Manage")
           .eq(0)

packages/builder/cypress/integration/revertApp.spec.js

@@ -36,8 +36,8 @@ filterTests(['smoke', 'all'], () => {
             cy.get(interact.SPECTRUM_BUTTON_GROUP).within(() => {
                 cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true })
             })
-            cy.wait(1000)
+            cy.wait(1000) // Wait for next modal to finish loading
-            cy.get(interact.SPECTRUM_BUTTON_GROUP).within(() => {
+            cy.get(interact.SPECTRUM_BUTTON_GROUP, { timeout: 1000 }).within(() => {
                 cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true })
             })
 
@@ -50,18 +50,17 @@ filterTests(['smoke', 'all'], () => {
             cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => {
                 // Click Revert
                 cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true })
-                cy.wait(1000)
+                cy.wait(2000) // Wait for app to finish reverting
             })
             // Confirm Paragraph component is still visible
-            cy.get(interact.ROOT).contains("New Paragraph")
+            cy.get(interact.ROOT, { timeout: 1000 }).contains("New Paragraph")
             // Confirm Button component is not visible
-            cy.get(interact.ROOT).should("not.have.text", "New Button")
+            cy.get(interact.ROOT, { timeout: 1000 }).should("not.have.text", "New Button")
-            cy.wait(500)
         })
         
         it("should enter incorrect app name when reverting", () => {
             // Click Revert
-            cy.get(interact.TOP_RIGHT_NAV).within(() => {
+            cy.get(interact.TOP_RIGHT_NAV, { timeout: 1000 }).within(() => {
                 cy.get(interact.AREA_LABEL_REVERT).click({ force: true })
             })
             // Enter incorrect app name

packages/builder/cypress/support/commands.js

@@ -3,7 +3,7 @@ Cypress.on("uncaught:exception", () => {
 })
 
 // ACCOUNTS & USERS
-Cypress.Commands.add("login", () => {
+Cypress.Commands.add("login", (email, password) => {
   cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(2000)
   cy.url().then(url => {
@@ -17,8 +17,13 @@ Cypress.Commands.add("login", () => {
     if (url.includes("builder/auth/login") || url.includes("builder/admin")) {
       // login
       cy.contains("Sign in to Budibase").then(() => {
-        cy.get("input").first().type("test@test.com")
+        if (email == null) {
-        cy.get('input[type="password"]').type("test")
+          cy.get("input").first().type("test@test.com")
+          cy.get('input[type="password"]').type("test")
+        } else {
+          cy.get("input").first().type(email)
+          cy.get('input[type="password"]').type(password)
+        }
         cy.get("button").first().click({ force: true })
         cy.wait(1000)
       })
@@ -27,7 +32,7 @@ Cypress.Commands.add("login", () => {
 })
 
 Cypress.Commands.add("logOut", () => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 2000 })
   cy.get(".user-dropdown .avatar > .icon").click({ force: true })
   cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
     cy.get("li[data-cy='user-logout']").click({ force: true })
@@ -35,24 +40,58 @@ Cypress.Commands.add("logOut", () => {
   cy.wait(2000)
 })
 
+Cypress.Commands.add("logoutNoAppGrid", () => {
+  // Logs user out when app grid is not present
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.get(".avatar > .icon").click({ force: true })
+  cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
+    cy.get(".spectrum-Menu-item").contains("Log out").click({ force: true })
+  })
+  cy.wait(2000)
+})
+
 Cypress.Commands.add("createUser", email => {
   // quick hacky recorded way to create a user
   cy.contains("Users").click()
   cy.get(`[data-cy="add-user"]`).click()
-  cy.get(".spectrum-Picker-label").click()
+  cy.get(".spectrum-Dialog-grid").within(() => {
-  cy.get(".spectrum-Menu-item:nth-child(2) > .spectrum-Menu-itemLabel").click()
+    cy.get(".spectrum-Picker-label").click()
+    cy.get(
+      ".spectrum-Menu-item:nth-child(2) > .spectrum-Menu-itemLabel"
+    ).click()
 
-  //Onboarding type selector
+    // Onboarding type selector
-  cy.get(
+    cy.get(".spectrum-Textfield-input")
-    ":nth-child(2) > .spectrum-Form-itemField > .spectrum-Textfield > .spectrum-Textfield-input"
+      .eq(0)
-  )
+      .first()
-    .first()
+      .type(email, { force: true })
-    .type(email, { force: true })
+    cy.get(".spectrum-Button--cta").click({ force: true })
-  cy.get(".spectrum-Button--cta").click({ force: true })
+  })
+})
+
+Cypress.Commands.add("deleteUser", email => {
+  // Assumes user has access to Users section
+  cy.contains("Users", { timeout: 2000 }).click()
+  cy.contains(email).click()
+
+  // Click Delete user button
+  cy.get(".spectrum-Button")
+    .contains("Delete user")
+    .click({ force: true })
+    .then(() => {
+      // Confirm deletion within modal
+      cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
+        cy.get(".spectrum-Button")
+          .contains("Delete user")
+          .click({ force: true })
+      })
+    })
 })
 
 Cypress.Commands.add("updateUserInformation", (firstName, lastName) => {
-  cy.get(".user-dropdown .avatar > .icon").click({ force: true })
+  cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({
+    force: true,
+  })
 
   cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => {
     cy.get("li[data-cy='user-info']").click({ force: true })
@@ -95,9 +134,8 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
   const shouldCreateDefaultTable =
     typeof addDefaultTable != "boolean" ? true : addDefaultTable
 
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
-  cy.wait(1000)
+  cy.get(`[data-cy="create-app-btn"]`, { timeout: 2000 }).click({ force: true })
-  cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
 
   // If apps already exist
   cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
@@ -117,7 +155,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
     cy.get(".spectrum-ButtonGroup")
       .contains("Create app")
       .click({ force: true })
-    cy.wait(10000)
+    cy.wait(2000)
   })
   if (shouldCreateDefaultTable) {
     cy.createTable("Cypress Tests", true)
@@ -125,7 +163,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
 })
 
 Cypress.Commands.add("deleteApp", name => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
   cy.wait(2000)
   cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
     .its("body")
@@ -150,14 +188,15 @@ Cypress.Commands.add("deleteApp", name => {
           cy.get(actionEleId).within(() => {
             cy.contains("Manage").click({ force: true })
           })
-          cy.wait(1000)
+          cy.wait(500)
 
           // Unpublish first if needed
           cy.get(`[data-cy="app-status"]`).then($status => {
-            if ($status.text().includes("Last published")) {
+            if ($status.text().includes("- Unpublish")) {
-              cy.contains("Unpublish").click()
+              // Exact match for Unpublish
+              cy.contains("Unpublish").click({ force: true })
               cy.get(".spectrum-Modal").within(() => {
-                cy.contains("Unpublish app").click()
+                cy.contains("Unpublish app").click({ force: true })
               })
             }
           })
@@ -276,16 +315,18 @@ Cypress.Commands.add("alterAppVersion", (appId, version) => {
 })
 
 Cypress.Commands.add("importApp", (exportFilePath, name) => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
 
   cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
     .its("body")
     .then(val => {
       if (val.length > 0) {
         cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
-        cy.wait(500)
       }
-      cy.get(`[data-cy="import-app-btn"]`).click({ force: true })
+      cy.wait(500)
+      cy.get(`[data-cy="import-app-btn"]`).click({
+        force: true,
+      })
     })
 
   cy.get(".spectrum-Modal").within(() => {
@@ -303,7 +344,7 @@ Cypress.Commands.add("importApp", (exportFilePath, name) => {
     cy.get(".confirm-wrap button")
       .should("not.be.disabled")
       .click({ force: true })
-    cy.wait(5000)
+    cy.wait(3000)
   })
 })
 
@@ -332,7 +373,8 @@ Cypress.Commands.add("searchForApplication", appName => {
 
 // Assumes there are no others
 Cypress.Commands.add("applicationInAppTable", appName => {
-  cy.get(".appTable").within(() => {
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
+  cy.get(".appTable", { timeout: 2000 }).within(() => {
     cy.get(".title").contains(appName).should("exist")
   })
 })
@@ -360,7 +402,7 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
     cy.navigateToDataSection()
     cy.get(`[data-cy="new-table"]`).click()
   }
-  cy.wait(5000)
+  cy.wait(2000)
   cy.get(".item")
     .contains("Budibase DB")
     .click({ force: true })
@@ -368,8 +410,7 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
       cy.get(".spectrum-Button").contains("Continue").click({ force: true })
     })
   cy.get(".spectrum-Modal").within(() => {
-    cy.wait(1000)
+    cy.get("input", { timeout: 1000 }).first().type(tableName).blur()
-    cy.get("input").first().type(tableName).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create").click()
   })
   cy.contains(tableName).should("be.visible")
@@ -451,8 +492,7 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
           .contains("Add Option")
           .click({ force: true })
           .then(() => {
-            cy.wait(500)
+            cy.get("[placeholder='Label']", { timeout: 500 }).eq(i).type(i)
-            cy.get("[placeholder='Label']").eq(i).type(i)
             cy.get("[placeholder='Value']").eq(i).type(i)
           })
       }
@@ -464,10 +504,14 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
 // DESIGN AREA
 Cypress.Commands.add("addComponent", (category, component) => {
   if (category) {
-    cy.get(`[data-cy="category-${category}"]`).click({ force: true })
+    cy.get(`[data-cy="category-${category}"]`, { timeout: 1000 }).click({
+      force: true,
+    })
   }
   if (component) {
-    cy.get(`[data-cy="component-${component}"]`).click({ force: true })
+    cy.get(`[data-cy="component-${component}"]`, { timeout: 1000 }).click({
+      force: true,
+    })
   }
   cy.wait(1000)
   cy.location().then(loc => {
@@ -496,15 +540,14 @@ Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
   cy.get(".spectrum-Modal").within(() => {
     cy.get("[data-cy='blank-screen']").click()
     cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-    cy.wait(500)
   })
-  cy.get(".spectrum-Dialog-grid").within(() => {
+  cy.wait(500)
+  cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
     cy.get(".spectrum-Form-itemField").eq(0).type(route)
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+    cy.get(".confirm-wrap").contains("Continue").click({ force: true })
-    cy.wait(1000)
   })
 
-  cy.get(".spectrum-Modal").within(() => {
+  cy.get(".spectrum-Modal", { timeout: 1000 }).within(() => {
     if (accessLevelLabel) {
       cy.get(".spectrum-Picker-label").click()
       cy.wait(500)
@@ -522,10 +565,12 @@ Cypress.Commands.add(
     cy.get(".spectrum-Modal").within(() => {
       cy.get(".item").contains("Autogenerated screens").click()
       cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-      cy.wait(500)
     })
-    cy.get(".spectrum-Modal [data-cy='data-source-modal']").within(() => {
+    cy.get(".spectrum-Modal [data-cy='data-source-modal']", {
+      timeout: 500,
+    }).within(() => {
       for (let i = 0; i < datasourceNames.length; i++) {
+        cy.wait(500)
         cy.get(".data-source-entry").contains(datasourceNames[i]).click()
         //Ensure the check mark is visible
         cy.get(".data-source-entry")
@@ -574,7 +619,7 @@ Cypress.Commands.add(
 // NAVIGATION
 Cypress.Commands.add("navigateToFrontend", () => {
   // Clicks on Design tab and then the Home nav item
-  cy.wait(1000)
+  cy.wait(500)
   cy.contains("Design").click()
   cy.get(".spectrum-Search").type("/")
   cy.get(".nav-item").contains("home").click()
@@ -606,11 +651,11 @@ Cypress.Commands.add("selectExternalDatasource", datasourceName => {
     cy.get(".add-button").click()
   })
   // Clicks specified datasource & continue
-  cy.wait(1000)
+  cy.get(".item-list", { timeout: 1000 }).contains(datasourceName).click()
-  cy.get(".item-list").contains(datasourceName).click()
   cy.get(".spectrum-Dialog-grid").within(() => {
     cy.get(".spectrum-Button").contains("Continue").click({ force: true })
   })
+  cy.wait(500)
 })
 
 Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
@@ -618,8 +663,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
   // Adds the config for specified datasource & fetches tables
   // Currently supports MySQL, PostgreSQL, Oracle
   // Host IP Address
-  cy.wait(500)
+  cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => {
-  cy.get(".spectrum-Dialog-grid").within(() => {
     cy.get(".form-row")
       .eq(0)
       .within(() => {
@@ -719,16 +763,18 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
 Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
   // addExternalDatasource should be called prior to this
   // Configures REST datasource & sends query
-  cy.wait(1000)
+  cy.get(".spectrum-Button", { timeout: 1000 })
-  cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+    .contains("Add query")
+    .click({ force: true })
   // Select Method & add Rest URL
   cy.get(".spectrum-Picker-label").eq(1).click()
   cy.get(".spectrum-Menu").contains(method).click()
   cy.get("input").clear().type(restUrl)
   // Send query
   cy.get(".spectrum-Button").contains("Send").click({ force: true })
-  cy.wait(500)
+  cy.get(".spectrum-Button", { timeout: 500 })
-  cy.get(".spectrum-Button").contains("Save").click({ force: true })
+    .contains("Save")
+    .click({ force: true })
   cy.get(".hierarchy-items-container")
     .should("contain", method)
     .and("contain", queryPrettyName)

packages/builder/cypress/support/interact.js

@@ -62,6 +62,7 @@ export const GLOBESTRIKE = "svg[aria-label=GlobeStrike]"
 export const GLOBE = "svg[aria-label=Globe]"
 export const UNPUBLISH_MODAL = "[data-cy=unpublish-modal]"
 export const CONFIRM_WRAP_BUTTON = ".confirm-wrap button"
+export const DEPLOYMENT_TOP_NAV = ".deployment-top-nav"
 
 //changeAppiconAndColour
 export const APP_ROW_ACTION = ".app-row-actions-icon"
@@ -97,13 +98,16 @@ export const ACTION_SPECTRUM_ICON = ".actions .spectrum-Icon"
 export const SPECTRUM_MENU_CHILD2 = ".spectrum-Menu > :nth-child(2)"
 export const DELETE_TABLE_CONFIRM = '[data-cy="delete-table-confirm"]'
 
-//createUSerAndRoles
+//adminAndManagement Folder
 export const SPECTRUM_TABLE = ".spectrum-Table"
 export const SPECTRUM_SIDENAV = ".spectrum-SideNav"
 export const SPECTRUM_TABLE_ROW = ".spectrum-Table-row"
 export const SPECTRUM_TABLE_CELL = ".spectrum-Table-cell"
 export const FIELD = ".field"
 export const CONTAINER = ".container"
+export const REGENERATE = ".regenerate"
+export const SPECTRUM_DIALOG_CONTENT = ".spectrum-Dialog-content"
+export const SPECTRUM_ICON = ".spectrum-Icon"
 
 //createView
 export const SPECTRUM_MENU_ITEM_LABEL = ".spectrum-Menu-itemLabel"
@@ -113,14 +117,17 @@ export const TOP_RIGHT_NAV = ".toprightnav"
 export const AREA_LABEL_REVERT = "[aria-label=Revert]"
 export const ROOT = ".root"
 
-//quertLevelTransformers
+//queryLevelTransformers
 export const SPECTRUM_TABS_ITEM = ".spectrum-Tabs-itemLabel"
 export const CODEMIRROR_TEXTAREA = ".CodeMirror textarea"
 
-//renemaApplication
+//renameApplication
 export const WRAPPER = ".wrapper"
 export const ERROR = ".error"
 export const AREA_LABEL_MORE = "[aria-label=More]"
 export const APP_ROW_ACTION_MENU_POPOVER =
   '[data-cy="app-row-actions-menu-popover"]'
-export const SPECTRUM_MENU_ITEMM = ".spectrum-Menu-item"
+export const SPECTRUM_MENU_ITEM = ".spectrum-Menu-item"
+
+//commands
+export const HOME_LOGO = ".home-logo"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.6",
+    "@budibase/bbui": "^1.0.212-alpha.10",
-    "@budibase/client": "^1.0.212-alpha.6",
+    "@budibase/client": "^1.0.212-alpha.10",
-    "@budibase/frontend-core": "^1.0.212-alpha.6",
+    "@budibase/frontend-core": "^1.0.212-alpha.10",
-    "@budibase/string-templates": "^1.0.212-alpha.6",
+    "@budibase/string-templates": "^1.0.212-alpha.10",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/components/backend/DatasourceNavigator/icons/SQLServer.svelte

@@ -4,396 +4,40 @@
 </script>
 
 <svg
+  xmlns="http://www.w3.org/2000/svg"
+  version="1.1"
   {width}
   {height}
-  xmlns="http://www.w3.org/2000/svg"
+  viewBox="-16 -16 150 150"
-  viewBox="0 0 1478.201 1195.111"
+  style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
 >
-  <g transform="matrix(.569 0 0 .569 199.451 -82.735)">
+  <g
-    <linearGradient
+    ><path
-      id="a"
+      style="opacity:1"
-      gradientUnits="userSpaceOnUse"
+      fill="#f44336"
-      x1="-2901.952"
+      d="M 0.5,-0.5 C 20.1667,-0.5 39.8333,-0.5 59.5,-0.5C 59.5,19.5 59.5,39.5 59.5,59.5C 39.5,59.5 19.5,59.5 -0.5,59.5C -0.5,39.8333 -0.5,20.1667 -0.5,0.5C 0.166667,0.5 0.5,0.166667 0.5,-0.5 Z"
-      y1="923.573"
+    /></g
-      x2="-2061.249"
+  >
-      y2="1420.331"
+  <g
-      gradientTransform="matrix(.1234 0 0 -.1234 1158.33 1550.273)"
+    ><path
-    >
+      style="opacity:0.999"
-      <stop offset="0" stop-color="#909ca9" />
+      fill="#4caf4f"
-      <stop offset="1" stop-color="#ededee" />
+      d="M 67.5,-0.5 C 87.1667,-0.5 106.833,-0.5 126.5,-0.5C 126.5,0.166667 126.833,0.5 127.5,0.5C 127.5,20.1667 127.5,39.8333 127.5,59.5C 107.5,59.5 87.5,59.5 67.5,59.5C 67.5,39.5 67.5,19.5 67.5,-0.5 Z"
-    </linearGradient>
+    /></g
-    <path
+  >
-      fill="url(#a)"
+  <g
-      d="M1410.773 814.195l-286.9 93.683-249.599 110.161-69.829 18.435c-17.784
+    ><path
-      16.916-36.431 34.049-56.599 51.397-22.119 19.082-42.72 36.433-58.553
+      style="opacity:1"
-      49.008-17.564 13.88-43.587 39.902-56.814 56.38-19.735 24.721-35.348
+      fill="#2095f3"
-      50.96-42.071 71.13-11.928 36.433-6.07 73.297 16.916 107.346 29.492 43.369
+      d="M -0.5,67.5 C 19.5,67.5 39.5,67.5 59.5,67.5C 59.5,87.5 59.5,107.5 59.5,127.5C 39.8333,127.5 20.1667,127.5 0.5,127.5C 0.5,126.833 0.166667,126.5 -0.5,126.5C -0.5,106.833 -0.5,87.1667 -0.5,67.5 Z"
-      88.261 87.606 156.785 117.749 34.916 15.4 93.683 35.132 137.92 46.19
+    /></g
-      73.512 18.651 215.771 38.819 294.054 41.857 15.828.65 37.082.65 37.947 0
+  >
-      1.737-1.088 13.881-24.289 27.979-53.129 48.142-98.238 82.838-190.402
+  <g
-      101.703-269.119 11.276-47.706 20.166-111.246 26.019-186.492 1.521-21.036
+    ><path
-      2.169-91.514.868-115.37-1.953-39.033-5.423-70.692-10.84-101.703-.868-4.555-1.088-8.676-.652-8.892.865-.65
+      style="opacity:1"
-      3.467-1.517 38.815-11.712l-7.153-16.912v-.005h.004zm-65.49 38.386c2.602 0
+      fill="#fec107"
-      9.539 66.573 11.273 108.646.436 8.89.216 14.745-.216 14.745-1.733
+      d="M 127.5,67.5 C 127.5,87.1667 127.5,106.833 127.5,126.5C 126.833,126.5 126.5,126.833 126.5,127.5C 106.833,127.5 87.1667,127.5 67.5,127.5C 67.5,107.5 67.5,87.5 67.5,67.5C 87.5,67.5 107.5,67.5 127.5,67.5 Z"
-      0-36.649-20.599-61.583-36.212-21.687-13.663-62.888-40.988-69.393-46.192-2.173-1.517-1.957-1.733
+    /></g
-      15.828-7.807 30.14-10.194 101.706-33.18 104.091-33.18zm-146.161
+  >
-      48.143c1.953 0 6.937 2.816 18.865 10.191 44.671 27.974 105.393 61.805
-      131.415 73.083 8.022 3.469 8.887 2.166-9.542 14.746-39.468 26.889-88.697
-      53.344-148.983 80.018-10.624 4.771-19.514 8.456-19.73 8.456-.432 0
-      .865-5.418 2.598-11.925 14.53-54.001 22.772-108.647
-      23.208-152.452.216-21.687.216-21.687 2.169-22.334-.436.217-.22.217 0
-      .217zm-30.142 11.492c1.297 1.299.432 49.877-1.304 63.104-3.903
-      31.662-9.975 61.153-19.947 94.335-2.386 8.018-4.558 14.745-4.987
-      15.177-.872
-      1.083-30.581-27.975-40.339-39.251-16.916-19.518-30.141-39.035-39.9-58.117-4.988-9.759-12.793-28.84-12.144-29.492
-      3.469-2.385 117.753-46.622 118.621-45.756zm-141.826 55.731c.216 0 .432 0
-      .652.216.432.434 1.953 3.905 3.254 7.807 6.937 18.867 22.548 46.624 35.997
-      64.407 14.746 19.518 34.048 40.334 50.091 53.996 5.207 4.337 9.975 8.456
-      10.624 9.108 1.304 1.302 1.737 1.083-33.612 14.53-40.981 15.613-85.656
-      31.226-136.835 47.706a6825.474 6825.474 0 0 0-36.643
-      11.928c-1.955.652-1.303-.434 4.335-9.323 25.371-39.686 63.97-117.536
-      85.657-172.618 3.687-9.542 7.373-19.082 8.025-21.251.868-3.038 1.95-4.121
-      4.768-5.64 1.518-.43 3.038-.866 3.687-.866zm-43.367 17.999c.649.436-10.411
-      23.637-21.254 44.889-21.036 40.985-44.022 81.323-74.815 130.331-5.204
-      8.456-10.19 16.265-10.842 17.132-1.083 1.519-1.519
-      1.083-4.988-5.638-7.373-14.53-13.447-33.181-16.699-50.313-3.254-16.916-2.602-46.406
-      1.086-64.621 2.816-13.444 2.602-13.227 9.107-16.481 27.757-14.095
-      117.537-56.166 118.405-55.299zm374.073 15.182v9.107c0 48.359-5.204
-      114.716-12.797 163.077-1.301 8.456-2.389 15.393-2.602 15.613 0
-      0-6.288-1.733-13.661-3.905-32.527-10.193-67.875-25.156-99.754-42.718-21.038-11.494-51.612-30.363-50.743-31.231.213-.215
-      9.323-4.986 19.947-10.625 42.509-22.118 83.274-45.972 118.622-69.609
-      13.229-8.892 33.176-23.202 37.518-27.107l3.47-2.602zm-537.802 64.185c.867
-      0 .65 1.735-.651 9.542-.868 5.64-1.951 16.049-2.382 23.202-1.739 31.662
-      3.469 55.084 19.082 87.177 4.337 8.892 7.809 16.265 7.589 16.48-1.519
-      1.303-145.074 43.375-190.183 55.734-13.444 3.685-25.152 6.939-26.024
-      7.153-1.515.436-1.733.22-1.083-3.47 4.987-31.875 29.276-73.512
-      63.104-108.644 22.554-23.419 40.554-37.08 71.347-54.648 22.119-12.575
-      56.165-31.439 58.767-32.309.002-.217.218-.217.434-.217zm338.295
-      60.503c.216-.216 5.42 2.605 11.708 6.29 46.408 26.891 111.03 51.83 166.108
-      64.623l4.991 1.086-6.941 3.899c-28.84 16.049-123.606 55.515-220.538
-      91.732-14.098 5.202-27.975 10.409-30.581 11.492-2.602 1.083-4.988
-      1.735-4.988 1.519 0-.22 3.906-7.809 8.89-17.132 27.107-50.744
-      54.433-112.547 68.311-155.485 1.739-4.12 2.82-7.805 3.04-8.024zm-34.48
-      11.278c.22.221-1.517 4.771-3.687 9.975-18.865 45.756-43.59 95.636-75.249
-      151.583-8.022 14.314-14.746 25.808-14.966 25.808-.213
-      0-6.721-3.906-14.527-8.676-45.976-28.192-86.743-62.888-113.414-96.501l-3.905-4.771
-      19.732-5.422c70.696-19.298 130.762-40.116 190.4-65.704 8.459-3.471
-      15.4-6.292 15.616-6.292zm214.253 74.815s.217.217 0 0c.216 4.988-10.844
-      49.661-19.953 81.969-7.589 27.107-14.098 48.361-26.022 85.874-5.204
-      16.485-9.755 30.143-9.975 30.143-.216
-      0-1.517-.216-2.818-.647-64.405-11.714-122.089-27.977-176.303-49.661-15.182-6.074-36.866-15.833-38.167-16.916-.432-.438
-      12.58-6.506 29.06-13.663 98.669-43.154 201.024-92.164 236.153-113.196
-      4.119-2.603 7.373-3.903 8.025-3.903zm-494.646 16.916c.434.432-27.107
-      40.118-65.709 94.114-13.444 18.867-29.057 40.985-34.911 49.225-5.856
-      8.241-14.746 21.253-19.734 29.06l-9.112
-      14.096-9.759-8.24c-11.494-9.544-31.442-29.927-40.333-41.204-18.651-23.201-31.226-47.706-36.214-70.04-2.386-10.411-2.386-15.618-.22-16.265
-      3.252-.867 61.153-14.53 115.37-27.11 30.143-6.937 65.054-15.177
-      77.632-18.213 12.579-3.041 22.774-5.423 22.99-5.423zm27.756 10.626l6.937
-      7.806c31.231 34.914 63.108 60.724 101.708 83.272 6.941 3.906 12.144 7.373
-      11.708 7.594-1.514 1.083-134.016 48.136-195.385 69.389-34.478
-      12.143-62.888 21.901-63.102 21.901-.216
-      0-2.169-1.299-4.341-2.818l-3.901-2.82 6.288-9.106c20.383-29.493
-      45.976-61.803 101.707-129.028l38.381-46.19zm173.053 123.822c.213-.215
-      9.755 3.252 21.464 7.594 28.195 10.624 50.527 17.345 80.456 24.936 36.866
-      9.326 90.211 18.434 121.657 21.035 4.771.432 7.373.868 6.505
-      1.519-1.521.868-33.395 11.494-56.816 18.867-37.302 11.708-151.149
-      45.32-243.962 71.995-17.132 4.987-31.879 9.108-32.746
-      9.323-2.166.436-9.325-1.519-9.325-2.386 0-.431 5.204-7.153 11.494-14.527
-      31.225-37.3 62.238-78.935 88.044-118.403 7.154-10.846 13.229-19.736
-      13.229-19.953zm-38.17 1.087c.216.216-15.179 24.936-42.066 67.439-11.496
-      17.999-24.291 38.383-28.846 45.54-4.337 6.939-10.842 17.784-14.527
-      23.854l-6.29
-      11.061-3.252-.868c-7.809-2.169-62.672-21.471-77.202-27.325-18-7.157-36.649-15.829-50.529-23.202-17.346-9.326-39.03-23.206-37.297-23.637.433-.216
-      30.143-8.243 65.922-17.999 94.984-25.809 147.678-40.77 182.161-51.612
-      6.29-1.952 11.71-3.471 11.926-3.251zm269.985 63.318h.216c.868 2.171-34.26
-      99.755-47.06 130.547-2.815 6.939-3.896 8.677-5.417
-      8.456-3.687-.213-54.646-7.37-85.66-11.925-53.994-8.24-144.641-24.073-167.409-29.275l-5.204-1.083
-      32.307-7.378c69.396-15.613 102.791-24.069 136.619-34.478 42.722-13.011
-      85.011-29.276 127.729-49.225 6.722-3.037 12.361-5.422 13.879-5.639z"
-    />
-    <linearGradient
-      id="b"
-      gradientUnits="userSpaceOnUse"
-      x1="-2882.7"
-      y1="10288.81"
-      x2="-2206.249"
-      y2="10288.81"
-      gradientTransform="matrix(.1234 0 0 -.1234 1158.33 1550.273)"
-    >
-      <stop offset="0" stop-color="#939fab" />
-      <stop offset="1" stop-color="#dcdee1" />
-    </linearGradient>
-    <path
-      fill="url(#b)"
-      d="M1114.983 145.414c-4.771-.647-81.757 27.11-131.415 47.275-67.01
-      27.327-119.052 53.351-151.148 75.899-11.925 8.461-26.891 23.422-29.273
-      29.276-.867 2.169-1.303 4.771-1.303 7.373l29.06 27.541 69.175 22.119
-      164.594 29.493 188.228 32.312 1.953-16.264c-.649
-      0-1.085-.216-1.73-.216l-24.728-3.905-4.984-8.89c-25.59-45.107-53.781-101.056-70.261-138.789-12.793-29.276-24.938-63.102-31.662-87.391-3.687-14.746-4.119-15.613-6.501-15.829v-.005h-.005zm-3.474
-      11.063h.223c.213.214 1.081 6.29 1.95 13.442 3.683 30.364 10.411 59.635
-      21.035 91.297 8.022 23.855 8.022 22.555-1.301
-      19.734-22.119-6.07-121.221-23.202-193-33.177-11.494-1.519-21.253-3.036-21.253-3.252-.867-.867
-      51.827-28.41 75.031-39.25 29.709-13.665 111.246-47.711
-      117.315-48.794zm-209.047 97.15l8.461 2.816c45.97 15.616 161.551 37.736
-      225.31 42.94 7.154.651 13.229 1.303 13.442 1.303.216.216-5.852
-      3.469-13.661 7.154-30.79 15.397-64.621 34.264-88.042 48.794-6.937
-      4.335-13.229 7.807-14.094 7.807-.868
-      0-5.42-.868-10.191-1.519l-8.674-1.303-21.683-21.253c-38.167-37.08-68.094-65.704-79.588-76.549l-11.28-10.19zm-8.671
-      6.721l30.576 38.168c16.696 21.035 33.611 41.635 37.301 46.187 3.683 4.557
-      6.721 8.245 6.505
-      8.461-.868.65-44.236-7.809-67.226-13.011-23.637-5.423-33.395-8.025-47.924-12.577l-11.928-3.905v-3.038c.216-14.53
-      18.651-36.214 49.877-58.331l2.819-1.954zm259.791 52.046c.869 0 1.95 1.951
-      4.552 7.806 7.373 16.263 30.364 60.07 35.997 68.526 1.74 2.822 4.771
-      3.038-25.802-1.95-73.512-11.93-97.152-15.829-97.152-16.263 0-.216
-      2.169-1.735 4.988-3.254 22.771-12.575 45.756-28.624 66.142-45.756
-      4.988-4.121 9.542-8.024 10.407-8.676.216-.433.652-.649.868-.433z"
-    />
-    <radialGradient
-      id="c"
-      cx="-14217.448"
-      cy="7277.705"
-      r="898.12"
-      gradientTransform="matrix(-.1185 -.0178 -.036 .237 -198.955 -1314.415)"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop offset="0" stop-color="#ee352c" />
-      <stop offset="1" stop-color="#a91d22" />
-    </radialGradient>
-    <path
-      fill="url(#c)"
-      d="M804.66 294.828s-4.768 7.593-.215 18.87c2.822 6.937 11.061 15.393
-      20.384 24.069 0 0 96.5 94.114 108.211 107.561 53.344 61.585 76.549 122.305
-      78.718 206.012 1.301 53.78-8.894 101.054-34.264 155.919-45.106
-      98.453-140.307 207.098-287.117 327.67l21.472-7.157c13.878-10.411
-      32.745-21.467 76.982-45.756 102.137-55.952 217.071-107.346 358.028-160.258
-      202.971-76.335 536.715-165.681
-      726.676-194.736l19.737-3.038-3.038-4.771c-17.345-26.891-29.276-43.587-43.59-61.369-41.633-51.612-92.157-93.463-153.964-128.161-85.007-47.489-194.956-84.571-334.173-112.112-26.239-5.207-83.923-15.181-130.763-22.337-99.321-15.393-163.51-26.021-234.203-38.165-25.37-4.339-63.323-10.843-88.478-16.263-13.011-2.822-37.947-8.676-57.464-15.398-15.613-6.075-38.168-12.147-42.939-30.58zm55.952
-      54.216c.214-.214 3.683 1.083 8.24 2.602 8.24 2.816 18.865 6.07 31.446
-      9.542a1599.47 1599.47 0 0 0 28.624 7.589c13.011 3.251 23.852 6.288 24.068
-      6.288 1.521 1.519 23.424 71.558 30.797 98.449 2.815 10.195 4.988 18.867
-      4.771
-      18.867-.223.22-2.605-3.469-5.423-8.456-25.373-44.673-65.491-89.995-111.899-126.428-6.069-4.333-10.624-8.237-10.624-8.453zm106.692
-      29.492c1.085 0 5.856.651 11.708 1.951 36.866 8.24 103.008 20.818 145.293
-      27.975 7.157 1.083 12.797 2.387 12.797 2.818 0 .436-2.605 1.951-5.859
-      3.688-7.153 3.685-35.997 20.815-45.536 27.322-24.073 16.047-45.756
-      33.395-61.371 49.008-6.288 6.29-11.712 11.494-11.712
-      11.494s-1.297-3.685-2.386-8.242c-7.802-30.143-24.069-74.816-38.815-106.258-2.386-4.986-4.339-9.541-4.339-9.973
-      0 .433 0 .217.22.217zm187.795 35.781c1.301.432 3.47 7.806 7.806 24.069
-      8.025 31.446 11.712 66.576 10.411 99.321-.436 9.108-.868 17.564-1.304
-      18.651l-.649
-      2.166-11.276-3.685c-23.204-7.373-60.935-18.435-93.245-27.541-18.436-4.988-33.395-9.542-33.395-9.975
-      0-1.303 26.891-28.192 38.383-38.383 21.898-19.303 81.316-65.275
-      83.269-64.623zm14.963 2.166c.652-.647 89.779 14.746 130.331 22.554 30.145
-      5.854 73.948 14.963 76.549 16.049 1.301.432-3.254 3.034-17.784
-      9.539-57.248 25.808-99.754 49.008-142.036 77.202-11.06 7.373-20.386
-      13.444-20.602 13.444-.216 0-.433-6.287-.433-13.878
-      0-41.201-8.241-82.838-23.424-117.968-1.517-3.47-2.818-6.722-2.601-6.942zm230.516
-      45.542c.652.65-2.169 18.217-4.771 28.624-7.806 32.312-28.84 80.24-54.643
-      125.343-4.558 8.024-8.677 14.53-9.114
-      14.746-.429.216-6.285-3.038-13.009-6.941-25.154-14.746-53.778-28.624-85.007-41.637-8.671-3.685-16.263-6.723-16.48-7.153-1.521-1.303
-      68.308-47.493 105.174-69.612 29.276-17.781 76.982-44.239
-      77.85-43.37zm16.48 2.601c1.953 0 41.421 10.844 62.019 16.916 50.963 15.181
-      109.512 36.648 147.679 53.996l15.828 7.159-11.056 2.6c-93.245
-      21.467-173.049 46.192-250.034 77.418-6.289 2.602-11.928 4.771-12.357
-      4.771-.436 0 1.733-4.987 4.552-11.061 23.204-49.225 38.167-100.62
-      41.85-144.427.221-4.121.867-7.372 1.519-7.372zm-392.938 90.213c.649-.652
-      30.793 6.506 47.057 11.056 24.721 6.942 77.198 24.505 77.198 25.808 0
-      .216-5.853 5.204-12.79 11.278-28.408 23.637-55.734 48.572-88.481
-      80.234-9.759 9.328-17.997 16.917-18.429 16.917-.436
-      0-.649-1.304-.436-3.038 4.987-36.433
-      3.906-83.272-3.034-130.763-.653-6.074-1.302-11.276-1.085-11.492zm633.433.652c.429.431-13.881
-      22.984-22.988 35.777-13.009 18.649-32.098 43.375-75.252 97.588-22.765
-      28.622-48.358 60.936-56.812 71.778-8.678 10.842-15.831 19.948-16.051
-      19.948-.216
-      0-3.031-3.901-6.069-8.671-24.289-36.433-53.349-68.311-87.829-96.935-6.505-5.423-13.658-11.278-16.044-13.013-2.386-1.734-4.339-3.469-4.339-3.685
-      0-.649 36.862-16.483 64.841-27.757 49.01-19.952 115.794-43.805
-      165.892-59.203 26.24-8.239 54.215-16.263 54.651-15.827zm16.696
-      4.334c.865-.215 6.072 2.387 12.361 6.07 52.697 30.143 104.305 68.962
-      145.077 108.864 11.492 11.278 39.9 40.77 39.464 40.986 0
-      0-9.975.867-21.683 1.733-91.296 6.942-208.178 26.239-320.511 53.345-7.589
-      1.733-14.31 3.252-14.746 3.252-.429 0 8.025-8.456 18.653-18.647
-      65.922-63.538 96.067-103.656 131.628-175.22 4.986-10.623 9.325-19.731
-      9.757-20.383-.216 0-.216 0 0 0zm-482.936 49.446c3.038.647 31.229 13.88
-      52.48 24.503 19.517 9.755 48.794 25.372 50.311 26.671.216.216-10.195
-      5.638-22.984 11.928-40.772 20.384-75.684 39.682-112.118 61.802-10.408
-      6.29-19.082 11.497-19.298 11.497-.868 0-.652-.872 5.204-11.497
-      19.518-35.561 35.129-78.065 44.023-119.486.864-3.252 1.733-5.418
-      2.382-5.418zm-28.192 5.202c.652.652-6.721 27.323-11.273 41.853-8.894
-      27.541-23.856 62.02-38.383 88.043-3.474 6.069-8.677 14.961-11.496
-      19.948l-5.42
-      8.674-12.144-11.707c-14.094-13.663-25.59-22.12-40.333-29.712-5.859-3.033-10.411-5.638-10.411-6.069
-      0-1.735 37.082-35.347 65.49-59.635 20.383-17.566 63.321-52.045
-      63.97-51.395zm172.404 70.913l10.627 6.937c24.282 15.833 52.906 36.866
-      74.813 55.298 12.357 10.19 36.21 31.662 40.985 36.866l2.598 2.822-17.561
-      4.986c-99.321 27.538-176.087 52.043-265.649 85.007-9.975 3.685-18.433
-      6.721-19.085 6.721-1.297 0-2.385 1.083 19.954-19.519 57.251-52.691
-      107.992-110.812 145.726-167.411l7.592-11.707zm-45.324
-      11.276c.432.432-29.276 42.284-47.06 65.922-21.251 28.192-58.985
-      75.465-85.007 106.256-10.84 12.797-20.163 23.422-20.599
-      23.64-.652.216-.868-3.036-.868-8.024
-      0-26.242-6.721-54.216-18.433-78.068-4.988-9.975-5.856-12.361-4.768-13.444
-      4.119-3.688 67.223-39.686 107.123-61.153 26.89-14.312 68.956-35.563
-      69.612-35.129zm-274.107 67.225c.652 0 5.64 2.6 11.279 5.638 13.878 7.589
-      26.239 16.046 37.298 25.156.432.432-5.204 4.988-12.577 10.406-20.602
-      14.746-51.828 38.385-70.041 52.915-19.088 15.18-19.734 15.613-17.568
-      12.361 14.314-21.903 21.467-34.264 29.06-50.093 6.721-14.094 13.442-30.793
-      18.213-45.323 1.734-6.289 3.904-11.06 4.336-11.06zm73.083
-      57.248c1.081-.214 2.386 1.735 8.238 10.411 12.361 18.429 21.903 43.154
-      24.292 63.104l.429 4.339-29.705 11.494c-53.133 20.599-102.139
-      40.985-135.322 56.162-9.322 4.339-25.587 12.144-36.211 17.352-10.627
-      5.418-19.301 9.539-19.301 9.323s6.721-5.204 14.961-11.278c64.844-47.055
-      121.007-98.669 163.076-150.279 4.555-5.423 8.677-10.411
-      9.107-10.627l.436-.001zm-33.612 8.242c.868.867-23.853 28.84-40.768
-      45.971-41.853 42.723-83.273 76.12-134.669 108.649-6.505 4.119-12.359
-      7.804-13.011 8.24-1.519.867.432-1.303 22.986-25.808 14.314-15.397
-      25.155-28.408 37.516-44.453 8.24-10.624 9.759-12.143 21.688-20.604
-      31.878-22.987 105.39-72.864 106.258-71.995z"
-    />
-  </g>
-  <path
-    fill="#231F1F"
-    d="M265.747 900.102c-2.276 0-4.553.217-6.809.217-45.975 2.45-76.983
-    22.683-95.113 62.195-15.506 35.735-13.813 82.446.174 118.4 16.265 35.131
-    42.547 53.672 86.416 60.675 9.282 1.52 15.506 6.616 33.483 27.606l22.12
-    25.915h40.118l-26.676-26.892c-14.746-14.745-26.673-27.584-26.673-28.712
-    0-1.127 5.641-3.599 12.469-5.68 22.51-6.812 41.203-24.202 54.279-50.854
-    10.583-21.402 12.102-28.018 13.619-54.646
-    3.969-79.26-37.82-128.813-107.409-128.247l.002.023zm35.173 207.27c-19.517
-    9.453-47.857 11.34-66.356
-    4.553-19.127-7.025-37.646-26.889-45.975-49.377-9.259-24.591-7.937-69.956
-    2.646-90.386 17.023-32.528 39.534-47.49 72.43-47.49 48.792 0 76.549 29.884
-    80.171 86.048 2.863 46.885-12.838 82.058-42.895
-    96.632l-.021.02zm693.025-139.568c-16.828 0-29.709 6.811-38.385 20.231l-6.809
-    10.627v-27.628h-29.123v165.678h29.104v-52.956c0-48.424.604-54.084
-    7.371-67.335 9.326-18.172 25.371-27.234 40.879-22.897l10.408
-    3.036v-28.712h-13.445v-.044zm-171.098-1.519c-5.705 0-11.756.76-17.781
-    2.084-38.971 10.19-60.938 47.489-59.594 85.873 0 32.139 6.244 48.206 21.752
-    65.057 31.77 26.065 60.502 28.146 99.275 14.161 6.615-2.819 13.814-6.072
-    13.814-6.072v-26.065l-13.814 7.156c-31.379 13.661-55.016
-    13.661-73.949-2.43-12.076-12.296-17.391-27.042-19.84-43.868h117.426v-22.339c0-45.539-27.41-74.294-67.313-73.557h.024zm-47.492
-    72.647s4.338-28.407 20.428-39.554c7.744-5.466 16.633-8.11 25.328-8.11 8.719
-    0 17.414 2.818 24.592 8.306 14.748 11.341 17.219 39.143 17.219
-    39.143h-87.566v.215h-.001zm-702.111-29.881c-31.573-19.128-45.582-32.921-43.869-49.185
-    4.9-44.997 60.503-38.773
-    91.295-21.749l.219-30.272s-17.024-7.373-41.421-7.764c-37.429-.564-61.63
-    11.709-72.97 36.691-16.656 36.865-1.908 64.665 51.396 95.677 29.925 17.412
-    43.152 32.528 43.152 49.008 0 34.047-41.05 45.931-83.401
-    24.57-8.716-4.337-16.09-7.959-16.48-7.959-1.519 9.651-.736 32.745-.736
-    32.745s13.012 5.466 32.527 9.236c48.4 9.65 92.445-13.054 96.608-49.919
-    3.622-34.609-8.893-52.761-56.318-81.104l-.002.025zm1178.454-43.155c-5.682
-    0-11.711.78-18 2.103-38.924 10.192-60.85 47.492-59.354 85.876 0 32.095 6.225
-    48.011 21.729 64.838 31.771 26.089 60.504 28.191 99.473 14.184 6.592-2.818
-    13.77-6.026 13.77-6.026v-26.109l-13.791 7.197c-31.443 13.619-55.082
-    13.619-73.947-2.471-12.145-12.274-17.414-26.847-19.865-43.871h117.232v-22.336c0-45.321-27.412-74.099-67.313-73.339l.066-.046zm-47.492
-    72.646s4.381-28.365 20.449-39.729c7.721-5.485 16.611-8.132 25.307-8.132
-    8.674 0 17.414 2.819 24.594 8.327 14.746 11.342 17.219 39.338 17.219
-    39.338h-87.545l-.024.196zm-533.809-29.123c-31.573-19.083-45.54-32.92-43.848-49.185
-    4.9-45.02 60.504-38.773
-    91.296-21.749l.218-30.272s-17.024-7.374-41.421-7.722c-37.429-.563-61.63
-    11.711-72.991 36.692-16.633 36.864-1.692 64.666 51.437 95.677 29.884 17.393
-    43.111 32.312 43.111 48.792 0 34.047-41.029 46.126-83.381
-    24.569-8.674-4.337-16.046-7.916-16.48-7.916-1.519 9.649-.736 32.746-.736
-    32.746s12.858 5.27 32.31 9.237c48.445 9.672 92.51-13.012 96.653-49.877
-    3.6-34.437-8.891-52.587-56.167-80.952v-.04zm752.421-42.005c-16.828 0-29.859
-    6.829-38.383 20.254l-6.811
-    10.582v-27.583h-29.123V1136.3h29.102v-52.954c0-48.403.584-54.085
-    7.375-67.313 9.324-18.15 25.369-27.235 40.875-22.878l10.408
-    3.035v-28.775h-13.443zm-984.021
-    41.05V902.941h-29.361v233.728h123.478v-27.604h-94.116v-100.601zm679.015
-    32.896l-24.201 62.975-23.27-63.322-23.637-70.173h-30.055c19.475 55.212
-    40.658 111.376 62.02 165.829 9.26.216 18.541 0 27.799 0l32.682-82.058
-    33.287-83.75h-28.732s-12.688 33.266-25.914 70.521l.021-.022zM506.455
-    839.251c4.728 0 8.674-1.516 11.927-4.769 3.208-3.211 4.9-6.984 4.9-11.711
-    0-4.728-1.692-8.675-4.9-11.711-3.253-3.035-7.005-4.555-11.711-4.555-4.769
-    0-8.717 1.52-11.927 4.728-3.252 3.211-4.727 7.158-4.727 11.712 0 4.771 1.519
-    8.716 4.727 11.711 3.037 3.034 6.984 4.553 11.711
-    4.553v.042zm-10.408-26.889c2.818-2.818 6.245-4.121 10.625-4.121 4.121 0
-    7.548 1.303 10.411 4.121 2.819 2.819 4.337 6.245 4.337 10.409 0 4.163-1.518
-    7.764-4.337 10.582-2.862 2.817-6.29 4.163-10.411 4.163-4.185
-    0-7.59-1.301-10.408-4.163-2.819-2.818-4.337-6.419-4.337-10.582 0-4.164
-    1.301-7.589 4.12-10.409zm7.003 11.928h1.908c1.346 0 2.668 1.3 3.795
-    3.773l2.279 5.116h3.577l-2.818-5.683c-1.149-2.275-2.276-3.598-3.6-3.969
-    1.67-.39 2.992-.953 3.947-2.082.952-.974 1.3-2.298 1.3-3.795
-    0-1.734-.542-3.034-1.69-3.989-1.302-1.084-3.384-1.669-6.074-1.669h-6.026v21.187h3.035v-8.891l.367.002zm0-9.846h2.647c1.908
-    0 3.253.39 3.99.953.716.564.911 1.303.911 2.646 0 2.45-1.52 3.601-4.337
-    3.601h-3.252v-7.2h.041zm-485.018
-    7.958c0-7.373-.216-12.858-.39-16.09h.174c.758 3.814 1.691 6.657 2.45
-    8.543l28.19 62.975h4.728l28.19-63.538c.761-1.733 1.52-4.337
-    2.452-7.959h.216c-.563 6.29-.758 11.754-.758
-    16.112v55.581h9.648v-82.622h-12.1L54.919 852.87c-.955 2.276-2.278
-    5.683-3.969
-    10.193h-.392c-.563-2.234-1.886-5.639-3.772-9.803l-25.33-58.053H8.598v82.621h9.281v-55.385l.153-.041zm96.045.154h8.329v51.458h-8.329v-51.458zm4.164-18.868c1.736
-    0 3.21-.587 4.337-1.734 1.15-1.129 1.91-2.603 1.91-4.337
-    0-1.692-.565-3.211-1.887-4.337-1.171-1.15-2.668-1.737-4.381-1.737-1.69
-    0-3.208.587-4.338 1.737-1.146 1.126-1.907 2.645-1.907 4.337 0 1.887.586
-    3.208 1.907 4.337 1.304 1.147 2.647 1.734 4.338 1.734h.021zm63.54
-    71.455v-9.066c-4.555 3.405-9.456 5.098-14.53 5.098-6.07
-    0-10.995-2.081-14.595-6.07-3.577-3.947-5.485-9.436-5.485-16.266 0-7.156
-    1.908-12.84 5.854-17.177 3.795-4.163 8.719-6.245 14.748-6.245 4.922 0 9.647
-    1.52 14.009 4.557v-9.65c-3.968-2.082-8.5-3.037-13.619-3.037-9.456 0-16.827
-    3.037-22.335 8.894-5.466 5.854-8.285 13.813-8.285 23.42 0 8.543 2.45 15.722
-    7.548 21.209 5.312 5.637 12.102 8.5 20.428 8.5 6.438-.178 11.707-1.523
-    16.262-4.167zm23.831-27.433c0-6.788 1.518-12.273 4.337-16.049 2.647-3.403
-    5.855-5.116 9.65-5.116 3.21 0 5.486.585 7.155
-    1.908v-9.846c-1.3-.563-3.187-.758-5.637-.758-3.405 0-6.439 1.146-9.107
-    3.253-2.819 2.231-5.074 5.638-6.397
-    9.975h-.216v-12.08h-9.433v58.985h9.454V847.71h.194zm54.279 31.443c8.892 0
-    16.048-2.863 21.36-8.543 5.29-5.641 7.936-13.229 7.936-22.686
-    0-9.647-2.427-17.021-7.372-22.51-4.9-5.483-11.711-8.132-20.603-8.132s-16.048
-    2.647-21.36 7.764c-5.681 5.641-8.674 13.599-8.674 23.813 0 8.891 2.429
-    16.265 7.548 21.751 5.29 5.68 12.295 8.521 21.165
-    8.521v.022zm-13.445-48.055c3.6-3.795 8.329-5.683 14.182-5.683 6.074 0 10.627
-    1.888 14.01 5.683 3.404 3.969 5.097 9.63 5.097 17.197 0 7.198-1.519
-    12.859-4.729 16.654-3.208 3.969-7.936 6.071-14.183 6.071-6.071
-    0-10.777-2.104-14.377-6.071-3.577-3.99-5.291-9.456-5.291-16.654-.368-7.156
-    1.519-13.01 5.291-17.197zm84.141 42.916c3.599-3.208 5.509-7.155 5.509-12.102
-    0-4.337-1.52-7.936-4.338-10.777-2.3-2.275-5.854-4.337-10.994-6.419-4.556-1.906-7.374-3.6-8.893-4.923-1.517-1.517-2.45-3.402-2.45-6.071
-    0-2.45.955-4.337 2.821-5.855 1.908-1.516 4.337-2.253 7.59-2.253 5.096 0
-    9.454 1.343 13.443 4.185v-9.456c-3.816-1.906-7.958-2.817-12.686-2.817-6.071
-    0-11.189 1.671-14.964 4.899-3.969 3.212-5.854 7.375-5.854 12.274 0 4.337 1.3
-    7.938 3.771 10.582 2.082 2.256 5.641 4.556 10.583 6.614 4.729 2.083 7.938
-    3.968 9.65 5.485 1.691 1.52 2.45 3.405 2.45 5.641 0 5.506-3.772 8.349-11.146
-    8.349-5.682 0-10.776-1.866-15.333-5.638v10.189c4.121 2.475 9.066 3.601 14.53
-    3.601 7.005-.368 12.49-2.081 16.264-5.486l.047-.022zm45.019-56.73c-8.893
-    0-16.048 2.647-21.361 7.764-5.638 5.641-8.674 13.599-8.674 23.813 0 8.891
-    2.452 16.265 7.547 21.751 5.313 5.68 12.295 8.521 21.187 8.521 9.107 0
-    16.048-2.861 21.36-8.545 5.313-5.637 7.958-13.227 7.958-22.683
-    0-9.65-2.472-17.022-7.374-22.509-5.115-5.487-11.927-8.133-20.601-8.133l-.042.021zm18.345
-    31.012c0 7.198-1.518 12.859-4.727 16.654-3.21 3.969-7.938 6.071-14.184
-    6.071-6.074 0-10.778-2.104-14.379-6.071-3.577-3.99-5.29-9.456-5.29-16.654
-    0-7.59 1.888-13.444 5.683-17.393 3.576-3.773 8.306-5.682 14.182-5.682 5.854
-    0 10.561 1.907 13.964 5.682 3.037 4.163 4.729 9.824 4.729
-    17.393h.022zm25.547 29.513h9.433v-51.068h13.813v-7.938H428.93v-9.108c0-8.282
-    3.208-12.446 9.845-12.446 2.234 0 4.511.563 6.203
-    1.518v-8.521c-1.692-.759-3.969-.932-6.812-.932-5.095 0-9.258 1.519-12.664
-    4.727-3.969 3.773-6.071 8.674-6.071
-    15.312v9.672h-9.978v7.936h9.978v50.876l.067-.028zm38.75-16.091c0 11.538
-    5.098 17.414 15.506 17.414 3.774 0 6.614-.606 8.891-1.951v-8.11c-1.734
-    1.302-3.795 1.91-6.071 1.91-3.208
-    0-5.464-.762-6.788-2.475-1.345-1.689-2.103-4.554-2.103-8.501v-33.286h14.961v-7.938h-14.961v-17.39c-3.253
-    1.127-6.44 2.082-9.456
-    3.034v14.355h-10.192v7.938h10.192v34.979l.021.021zm1014.88
-    108.73c-3.209-3.034-7.004-4.553-11.709-4.553-4.77 0-8.719 1.519-11.928
-    4.771-3.209 3.188-4.729 7.155-4.729 11.711 0 4.728 1.52 8.675 4.705 11.709
-    3.211 3.036 7.156 4.556 11.928 4.556 4.705 0 8.674-1.52 11.928-4.729
-    3.188-3.253 4.879-7.004
-    4.879-11.709-.174-4.771-1.887-8.719-5.096-11.754l.022-.002zm-1.517
-    22.338c-2.82 2.818-6.246 4.119-10.41 4.119-4.119
-    0-7.545-1.301-10.408-4.119-2.818-2.863-4.338-6.441-4.338-10.627 0-4.121
-    1.301-7.545 4.164-10.408 2.818-2.817 6.225-4.121 10.582-4.121 4.121 0 7.549
-    1.304 10.41 4.121 2.818 2.863 4.336 6.287 4.336 10.408 0 4.382-1.301
-    7.764-4.336 10.627zm-8.502-9.651c1.691-.39 3.037-1.149 3.969-2.081.955-.977
-    1.303-2.301 1.303-3.815
-    0-1.692-.543-3.037-1.691-3.969-1.301-1.085-3.404-1.671-6.07-1.671h-6.029v21.164h3.037v-8.891h1.885c1.303
-    0 2.604 1.3 3.773 3.773l2.254
-    5.096h3.602l-2.818-5.683c-.977-2.472-2.105-3.601-3.252-3.97l.037.047zm-2.082-1.907h-3.252v-7.155h2.668c1.887
-    0 3.209.345 3.969.932.758.563.932 1.301.932 2.646 0 2.45-1.518 3.579-4.336
-    3.579l.019-.002zM933.443
-    816.353h2.646v-21.187h7.002v-2.646h-16.652v2.646h7.006v21.187h-.002zm16.047-15.917c0-2.062
-    0-3.753-.152-4.705.174 1.126.564 1.887.738 2.45l8.133
-    18.172h1.301l8.152-18.347c.219-.563.393-1.301.76-2.275-.174 1.887-.174
-    3.401-.174 4.553v16.048h2.82V792.52h-3.406l-7.371 16.438c-.174.587-.762
-    1.734-1.129
-    3.037h-.217c-.152-.761-.541-1.519-1.084-2.818l-7.373-16.655h-3.816v23.854h2.666v-15.917l.152-.023z"
-  />
 </svg>

packages/builder/src/helpers/pagination.js

@@ -0,0 +1,66 @@
+import { writable } from "svelte/store"
+
+function defaultValue() {
+  return {
+    nextPage: null,
+    page: undefined,
+    hasPrevPage: false,
+    hasNextPage: false,
+    loading: 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
+      state.loading = false
+      return state
+    })
+  }
+
+  function loading(loading = true) {
+    update(state => {
+      state.loading = loading
+      return state
+    })
+  }
+
+  function reset() {
+    set(defaultValue())
+  }
+
+  return {
+    subscribe,
+    prevPage,
+    nextPage,
+    fetched,
+    loading,
+    reset,
+  }
+}

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")
     }

packages/builder/src/pages/builder/portal/manage/users/index.svelte

@@ -12,41 +12,36 @@
     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 { onMount } from "svelte"
+  import { createPaginationStore } from "helpers/pagination"
 
   const schema = {
     email: {},
     developmentAccess: { displayName: "Development Access", type: "boolean" },
     adminAccess: { displayName: "Admin Access", type: "boolean" },
-    // role: { type: "options" },
     group: {},
-    // access: {},
-    // group: {}
   }
 
-  let search
+  let pageInfo = createPaginationStore()
-  $: filteredUsers = $users
+  let search = undefined
-    .filter(user => user.email.includes(search || ""))
+  $: page = $pageInfo.page
-    .map(user => ({
+  $: fetchUsers(page, search)
-      ...user,
-      group: ["All users"],
-      developmentAccess: !!user.builder?.global,
-      adminAccess: !!user.admin?.global,
-    }))
 
   let createUserModal
 
-  onMount(async () => {
+  async function fetchUsers(page, search) {
     try {
-      await users.init()
+      pageInfo.loading()
+      await users.search({ page, search })
+      pageInfo.fetched($users.hasNextPage, $users.nextPage)
     } catch (error) {
       notifications.error("Error getting user list")
     }
-  })
+  }
 </script>
 
 <Layout noPadding>
@@ -75,17 +70,31 @@
     <Table
       on:click={({ detail }) => $goto(`./${detail._id}`)}
       {schema}
-      data={filteredUsers || $users}
+      data={$users.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
       customRenderers={[{ column: "group", component: TagsRenderer }]}
     />
+    <div class="pagination">
+      <Pagination
+        page={$pageInfo.pageNumber}
+        hasPrevPage={$pageInfo.loading ? false : $pageInfo.hasPrevPage}
+        hasNextPage={$pageInfo.loading ? false : $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>

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 {
+  import { Icon, Heading, Link, Avatar, Layout } from "@budibase/bbui"
-    Icon,
-    Heading,
-    Link,
-    Avatar,
-    notifications,
-    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
+  $: fetchAppEditor(appEditorId)
-    ? []
-    : $users.filter(user => user._id === 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">

packages/builder/src/stores/portal/users.js

@@ -3,11 +3,24 @@ import { API } from "api"
 import { update } from "lodash"
 
 export function createUsersStore() {
-  const { subscribe, set } = writable([])
+  const { subscribe, set } = writable({})
 
-  async function init() {
+  // opts can contain page and search params
-    const users = await API.getUsers()
+  async function search(opts = {}) {
-    set(users)
+    const paged = await API.searchUsers(opts)
+    set({
+      ...paged,
+      ...opts,
+    })
+    return paged
+  }
+
+  async function get(userId) {
+    try {
+      return await API.getUser(userId)
+    } catch (err) {
+      return null
+    }
   }
 
   async function invite({ email, builder, admin }) {
@@ -47,7 +60,8 @@ export function createUsersStore() {
       body.admin = { global: true }
     }
     await API.saveUser(body)
-    await init()
+    // re-search from first page
+    await search()
   }
 
   async function del(id) {
@@ -61,7 +75,8 @@ export function createUsersStore() {
 
   return {
     subscribe,
-    init,
+    search,
+    get,
     invite,
     acceptInvite,
     create,

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.6",
+    "@budibase/bbui": "^1.0.212-alpha.10",
-    "@budibase/frontend-core": "^1.0.212-alpha.6",
+    "@budibase/frontend-core": "^1.0.212-alpha.10",
-    "@budibase/string-templates": "^1.0.212-alpha.6",
+    "@budibase/string-templates": "^1.0.212-alpha.10",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.212-alpha.6",
+    "@budibase/bbui": "^1.0.212-alpha.10",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/frontend-core/src/api/user.js

@@ -8,6 +8,34 @@ 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.
+   */
+  searchUsers: async ({ page, search } = {}) => {
+    const opts = {}
+    if (page) {
+      opts.page = page
+    }
+    if (search) {
+      opts.search = search
+    }
+    return await API.post({
+      url: `/api/global/users/search`,
+      body: opts,
+    })
+  },
+
+  /**
+   * Get a single user by ID.
+   */
+  getUser: async userId => {
+    return await API.get({
+      url: `/api/global/users/${userId}`,
+    })
+  },
+
   /**
    * Creates a user for an app.
    * @param user the user to create

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.212-alpha.6",
+    "@budibase/backend-core": "^1.0.212-alpha.10",
-    "@budibase/client": "^1.0.212-alpha.6",
+    "@budibase/client": "^1.0.212-alpha.10",
-    "@budibase/pro": "1.0.212-alpha.6",
+    "@budibase/pro": "1.0.212-alpha.10",
-    "@budibase/string-templates": "^1.0.212-alpha.6",
+    "@budibase/string-templates": "^1.0.212-alpha.10",
-    "@budibase/types": "^1.0.212-alpha.6",
+    "@budibase/types": "^1.0.212-alpha.10",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.212-alpha.6",
+  "version": "1.0.212-alpha.10",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,10 +34,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.212-alpha.6",
+    "@budibase/backend-core": "^1.0.212-alpha.10",
-    "@budibase/pro": "1.0.212-alpha.6",
+    "@budibase/pro": "1.0.212-alpha.10",
-    "@budibase/string-templates": "^1.0.212-alpha.6",
+    "@budibase/string-templates": "^1.0.212-alpha.10",
-    "@budibase/types": "^1.0.212-alpha.6",
+    "@budibase/types": "^1.0.212-alpha.10",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

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(
+        const userExists = await checkAnyUserExists()
-          getGlobalUserParams(null, {
-            include_docs: true,
-            limit: 1,
-          })
-        )
         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",
           },

packages/worker/src/api/controllers/global/roles.js

@@ -7,7 +7,7 @@ const {
 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")
+const { allUsers } = require("../../../sdk/users")
 
 exports.fetch = async ctx => {
   const tenantId = ctx.user.tenantId
@@ -49,10 +49,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]

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 = await users.save(ctx.request.body)
-    ctx.body = user
   } 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) => {
+    const userExists = await checkAnyUserExists()
-      return db.allDocs(
+    if (userExists) {
-        dbUtils.getGlobalUserParams(null, {
-          include_docs: true,
-        })
-      )
-    })
-
-    if (response.rows.some((row: any) => row.doc.admin)) {
       ctx.throw(
         403,
         "You cannot initialise once an global user has been created."
@@ -96,6 +88,17 @@ export const destroy = async (ctx: any) => {
   }
 }
 
+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) {
+      delete user.password
+    }
+  }
+  ctx.body = paginated
+}
+
 // called internally by app server user fetch
 export const fetch = async (ctx: any) => {
   const all = await users.allUsers()

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(

packages/worker/src/sdk/users/users.ts

@@ -17,9 +17,8 @@ import {
 } from "@budibase/backend-core"
 import { MigrationType } from "@budibase/types"
 
-/**
+const PAGE_LIMIT = 8
- * Retrieves all users from the current tenancy.
+
- */
 export const allUsers = async () => {
   const db = tenancy.getGlobalDB()
   const response = await db.allDocs(
@@ -30,6 +29,37 @@ export const allUsers = async () => {
   return response.rows.map((row: any) => row.doc)
 }
 
+export const paginatedUsers = async ({
+  page,
+  search,
+}: { page?: string; search?: string } = {}) => {
+  const db = tenancy.getGlobalDB()
+  // get one extra document, to have the next page
+  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,
+  })
+}
+
 /**
  * Gets a user by ID from the global database, based on the current tenancy.
  */

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")
+  }
+}