Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience

2022-09-07 13:37:58 +01:00 · 2022-09-07 13:37:58 +01:00 · 93f2903585
parent ae3bd8cc17 27e4af4b67
commit 93f2903585
38 changed files with 321 additions and 184 deletions
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@ -162,7 +162,10 @@ spec:
        name: bbapps
        ports:
        - containerPort: {{ .Values.services.apps.port }}
-        resources: {}
+        {{ with .Values.services.apps.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
    {{- with .Values.affinity }}
      affinity:
        {{- toYaml . | nindent 8 }}
--- a/charts/budibase/templates/couchdb-backup.yaml
+++ b/charts/budibase/templates/couchdb-backup.yaml
@ -38,7 +38,10 @@ spec:
        image: redgeoff/replicate-couchdb-cluster
        imagePullPolicy: Always
        name: couchdb-backup
-        resources: {}
+        {{ with .Values.services.couchdb.backup.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
    {{- with .Values.affinity }}
      affinity:
        {{- toYaml . | nindent 8 }}
--- a/charts/budibase/templates/minio-service-deployment.yaml
+++ b/charts/budibase/templates/minio-service-deployment.yaml
@ -56,7 +56,10 @@ spec:
        name: minio-service
        ports:
        - containerPort: {{ .Values.services.objectStore.port }}
-        resources: {}
+        {{ with .Values.services.objectStore.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
        volumeMounts:
        - mountPath: /data
          name: minio-data
--- a/charts/budibase/templates/proxy-service-deployment.yaml
+++ b/charts/budibase/templates/proxy-service-deployment.yaml
@ -30,7 +30,10 @@ spec:
        name: proxy-service
        ports:
        - containerPort: {{ .Values.services.proxy.port }}
-        resources: {}
+        {{ with .Values.services.proxy.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
        volumeMounts:
    {{- with .Values.affinity }}
      affinity:
--- a/charts/budibase/templates/redis-service-deployment.yaml
+++ b/charts/budibase/templates/redis-service-deployment.yaml
@ -35,7 +35,10 @@ spec:
        name: redis-service
        ports:
        - containerPort: {{ .Values.services.redis.port }}
-        resources: {}
+        {{ with .Values.services.redis.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
        volumeMounts:
        - mountPath: /data
          name: redis-data
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@ -151,7 +151,10 @@ spec:
        name: bbworker
        ports:
        - containerPort: {{ .Values.services.worker.port }}
-        resources: {}
+        {{ with .Values.services.worker.resources }}
+        resources:
+        {{- toYaml . | nindent 10 }}
+        {{ end }}
    {{- with .Values.affinity }}
      affinity:
        {{- toYaml . | nindent 8 }}
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@ -60,19 +60,6 @@ ingress:
              port:
                number: 10000

-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
 autoscaling:
  enabled: false
  minReplicas: 1
@ -125,16 +112,19 @@ services:
  proxy:
    port: 10000
    replicaCount: 1
+    resources: {}

  apps:
    port: 4002
    replicaCount: 1
    logLevel: info
+    resources: {}
 #    nodeDebug: "" # set the value of NODE_DEBUG

  worker:
    port: 4003
    replicaCount: 1
+    resources: {}

  couchdb:
    enabled: true
@ -148,6 +138,7 @@ services:
      target: ""
      # backup interval in seconds
      interval: ""
+      resources: {}

  redis:
    enabled: true # disable if using external redis
@ -161,6 +152,7 @@ services:
    ## If undefined (the default) or set to null, no storageClassName spec is
    ##   set, choosing the default provisioner.
    storageClass: ""
+    resources: {}

  objectStore:
    minio: true
@ -177,6 +169,7 @@ services:
    ## If undefined (the default) or set to null, no storageClassName spec is
    ##   set, choosing the default provisioner.
    storageClass: ""
+    resources: {}

 # Override values in couchDB subchart
 couchdb:
--- a/examples/nextjs-api-sales/package.json
+++ b/examples/nextjs-api-sales/package.json
@ -11,7 +11,7 @@
  "dependencies": {
    "bulma": "^0.9.3",
    "next": "12.1.0",
-    "node-fetch": "^3.2.2",
+    "node-fetch": "^3.2.10",
    "node-sass": "^7.0.1",
    "react": "17.0.2",
    "react-dom": "17.0.2",
--- a/examples/nextjs-api-sales/yarn.lock
+++ b/examples/nextjs-api-sales/yarn.lock
@ -2020,10 +2020,10 @@ node-domexception@^1.0.0:
  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==

-node-fetch@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.2.tgz#16d33fbe32ca7c6ca1ca8ba5dfea1dd885c59f04"
-  integrity sha512-Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w==
+node-fetch@^3.2.10:
+  version "3.2.10"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.10.tgz#e8347f94b54ae18b57c9c049ef641cef398a85c8"
+  integrity sha512-MhuzNwdURnZ1Cp4XTazr69K0BTizsBroX7Zx3UgDSVcZYKF/6p0CBe4EUb/hLqmzVhl0UpYfgRljQ4yxE+iCxA==
  dependencies:
    data-uri-to-buffer "^4.0.0"
    fetch-blob "^3.1.4"
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/backend-core",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Budibase backend core libraries used in server and worker",
  "main": "dist/src/index.js",
  "types": "dist/src/index.d.ts",
@ -20,7 +20,8 @@
    "test:watch": "jest --watchAll"
  },
  "dependencies": {
-    "@budibase/types": "1.3.4-alpha.1",
+    "@budibase/types": "1.3.12-alpha.1",
+    "@shopify/jest-koa-mocks": "5.0.1",
    "@techpass/passport-openidconnect": "0.3.2",
    "aws-sdk": "2.1030.0",
    "bcrypt": "5.0.1",
@ -60,7 +61,6 @@
    ]
  },
  "devDependencies": {
-    "@shopify/jest-koa-mocks": "3.1.5",
    "@types/jest": "27.5.1",
    "@types/koa": "2.0.52",
    "@types/lodash": "4.14.180",
--- a/packages/backend-core/yarn.lock
+++ b/packages/backend-core/yarn.lock
@ -543,13 +543,13 @@
    semver "^7.3.5"
    tar "^6.1.11"

-"@shopify/jest-koa-mocks@3.1.5":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-3.1.5.tgz#11f77ccfbcaf35cf5ee2c6108a286e61e6bea084"
-  integrity sha512-gQ3/7ELerv00TWO37AGFX5mT9CsFCS+3/UbKMuoIlKEU0QH2OX8BV9WBf/EKw7adCDNlxss0lqV6J8kf5pgr4A==
+"@shopify/jest-koa-mocks@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
+  integrity sha512-4YskS9q8+TEHNoyopmuoy2XyhInyqeOl7CF5ShJs19sm6m0EA/jGGvgf/osv2PeTfuf42/L2G9CzWUSg49yTSg==
  dependencies:
    koa "^2.13.4"
-    node-mocks-http "^1.5.8"
+    node-mocks-http "^1.11.0"

 "@sideway/address@^4.1.3":
  version "4.1.4"
@ -3914,7 +3914,7 @@ node-int64@^0.4.0:
  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==

-node-mocks-http@^1.5.8:
+node-mocks-http@^1.11.0:
  version "1.11.0"
  resolved "https://registry.yarnpkg.com/node-mocks-http/-/node-mocks-http-1.11.0.tgz#defc0febf6b935f08245397d47534a8de592996e"
  integrity sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "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.3.4-alpha.1",
+    "@budibase/string-templates": "1.3.12-alpha.1",
    "@spectrum-css/actionbutton": "^1.0.1",
    "@spectrum-css/actiongroup": "^1.0.1",
    "@spectrum-css/avatar": "^3.0.2",
--- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
+++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
@ -74,11 +74,11 @@ filterTests(["smoke", "all"], () => {
                .contains("Update role")
                .click({ force: true })
            })
-            cy.reload({ timeout: 5000 })
+            cy.reload()
            cy.wait(1000)
        }
        // Confirm roles exist within Configure roles table
-        cy.get(interact.SPECTRUM_TABLE, { timeout: 2000 })
+        cy.get(interact.SPECTRUM_TABLE, { timeout: 20000 })
          .eq(0)
          .within(assginedRoles => {
            expect(assginedRoles).to.contain("Admin")
@ -180,7 +180,7 @@ filterTests(["smoke", "all"], () => {
      cy.reload()

      // Confirm details have been saved
-      cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => {
+      cy.get(interact.FIELD, { timeout: 20000 }).eq(1).within(() => {
        cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb")
      })
      cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => {
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@ -20,7 +20,7 @@ filterTests(["all"], () => {
    //Use the tree to delete a selected component
    const deleteSelectedComponent = () => {
      cy.get(
-        ".nav-items-container .nav-item.selected .actions > div > .icon"
+        ".nav-item.selected .actions > div > .icon"
      ).click({
        force: true,
      })
@ -91,7 +91,7 @@ filterTests(["all"], () => {
      cy.searchAndAddComponent("Paragraph").then(componentId => {
        cy.get("[data-cy=setting-_instanceName] input").type(componentId).blur()
        cy.get(
-          ".nav-items-container .nav-item.selected .actions > div > .icon"
+          ".nav-item.selected .actions > div > .icon"
        ).click({
          force: true,
        })
@ -145,7 +145,7 @@ filterTests(["all"], () => {
            return testFieldFocusOnCreate(label)
          })
          .then(() => {
-            cy.get(".nav-items-container .nav-item")
+            cy.get(".nav-item")
              .contains(formId)
              .click({ force: true })
            deleteSelectedComponent()
@ -195,7 +195,7 @@ filterTests(["all"], () => {
            return testFocusOnCreate(label)
          })
          .then(() => {
-            cy.get(".nav-items-container .nav-item")
+            cy.get(".nav-item")
              .contains(providerId)
              .click({ force: true })
            deleteSelectedComponent()
@ -218,7 +218,7 @@ filterTests(["all"], () => {
          .find(".component-placeholder")
          .should("not.exist")
        cy.getComponent(imageId).find(`img[alt=${imageId}]`).should("exist")
-        cy.get(".nav-items-container .nav-item")
+        cy.get(".nav-item")
          .contains(imageId)
          .click({ force: true })
        deleteSelectedComponent()
@ -242,7 +242,7 @@ filterTests(["all"], () => {
        cy.getComponent(markdownId)
          .find(".editor-preview-full h1")
          .contains("Hi")
-        cy.get(".nav-items-container .nav-item")
+        cy.get(".nav-item")
          .contains(markdownId)
          .click({ force: true })
        deleteSelectedComponent()
@ -265,7 +265,7 @@ filterTests(["all"], () => {
          .find(".component-placeholder")
          .should("not.exist")
        cy.getComponent(iconId).find("i.ri-save-fill").should("exist")
-        cy.get(".nav-items-container .nav-item")
+        cy.get(".nav-item")
          .contains(iconId)
          .click({ force: true })
        deleteSelectedComponent()
--- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js
+++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
@ -162,7 +162,7 @@ filterTests(["all"], () => {
        switchSchema("randomText")

        // No tables displayed
-        cy.get(".spectrum-Body", { timeout: 5000 }).eq(2).should("contain", "No tables found")
+        cy.get(".spectrum-Body", { timeout: 10000 }).eq(2, { timeout: 10000 }).should("contain", "No tables found")

        // Previously created query should be visible
        cy.get(".spectrum-Table").should("contain", queryName)
@ -173,7 +173,7 @@ filterTests(["all"], () => {
        switchSchema("1")

        // Confirm tables exist - Check for specific one
-        cy.get(".spectrum-Table", { timeout: 5000 }).eq(0).should("contain", "test")
+        cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "test")
        cy.get(".spectrum-Table")
          .eq(0)
          .find(".spectrum-Table-row")
@ -187,7 +187,7 @@ filterTests(["all"], () => {
        switchSchema("public")

        // Confirm tables exist - again
-        cy.get(".spectrum-Table", { timeout: 5000 }).eq(0).should("contain", "REGIONS")
+        cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "REGIONS")
        cy.get(".spectrum-Table")
          .eq(0)
          .find(".spectrum-Table-row")
--- a/packages/builder/cypress/integration/datasources/rest.spec.js
+++ b/packages/builder/cypress/integration/datasources/rest.spec.js
@ -14,7 +14,7 @@ filterTests(["smoke", "all"], () => {
      // Select REST data source
      cy.selectExternalDatasource(datasource)
      // Enter incorrect api & attempt to send query
-      cy.get(".spectrum-Button", { timeout: 500 }).contains("Add query").click({ force: true })
+      cy.get(".query-buttons", { timeout: 1000 }).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 })
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@ -4,7 +4,7 @@ Cypress.on("uncaught:exception", () => {

 // ACCOUNTS & USERS
 Cypress.Commands.add("login", (email, password) => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.url()
    .should("include", "/builder/")
    .then(url => {
@ -33,7 +33,7 @@ Cypress.Commands.add("login", (email, password) => {
 })

 Cypress.Commands.add("logOut", () => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 2000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  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 })
@ -43,7 +43,7 @@ Cypress.Commands.add("logOut", () => {

 Cypress.Commands.add("logoutNoAppGrid", () => {
  // Logs user out when app grid is not present
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  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 })
@ -68,11 +68,14 @@ Cypress.Commands.add("createUser", (email, permission) => {
          .click({ force: true })
      })
    }
-    // Add user and wait for modal to change
-    cy.get(".spectrum-Button").contains("Add user").click({ force: true })
+    // Add user
+    cy.get(".spectrum-Button").contains("Add users").click({ force: true })
    cy.get(".spectrum-ActionButton").contains("Add email").should("not.exist")
  })
  // Onboarding modal
+  cy.get(".spectrum-Dialog-grid", { timeout: 5000 }).contains(
+    "Choose your onboarding"
+  )
  cy.get(".spectrum-Dialog-grid").within(() => {
    cy.get(".onboarding-type").eq(1).click()
    cy.get(".spectrum-Button").contains("Done").click({ force: true })
@ -163,7 +166,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
  const shouldCreateDefaultTable =
    typeof addDefaultTable != "boolean" ? true : addDefaultTable

-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.url({ timeout: 30000 }).should("include", "/apps")
  cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true })

@ -197,7 +200,7 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => {
 })

 Cypress.Commands.add("deleteApp", name => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.wait(2000)
  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
    .its("body")
@ -254,7 +257,7 @@ Cypress.Commands.add("deleteApp", name => {
 })

 Cypress.Commands.add("deleteAllApps", () => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.wait(500)
  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, {
    timeout: 5000,
@ -351,7 +354,7 @@ Cypress.Commands.add("alterAppVersion", (appId, version) => {
 })

 Cypress.Commands.add("importApp", (exportFilePath, name) => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })

  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
    .its("body")
@ -386,7 +389,7 @@ Cypress.Commands.add("importApp", (exportFilePath, name) => {

 // Filters visible with 1 or more
 Cypress.Commands.add("searchForApplication", appName => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.wait(2000)

  // No app filter functionality if only 1 app exists
@ -409,7 +412,7 @@ Cypress.Commands.add("searchForApplication", appName => {

 // Assumes there are no others
 Cypress.Commands.add("applicationInAppTable", appName => {
-  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 })
+  cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 })
  cy.get(".appTable", { timeout: 5000 }).within(() => {
    cy.get(".title").contains(appName).should("exist")
  })
@ -454,8 +457,8 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
    cy.get(".spectrum-ButtonGroup").contains("Create").click()
  })
  // Ensure modal has closed and table is created
-  cy.get(".spectrum-Modal").should("not.exist")
-  cy.get(".spectrum-Tabs-content", { timeout: 1000 }).should(
+  cy.get(".spectrum-Modal", { timeout: 2000 }).should("not.exist")
+  cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should(
    "contain",
    tableName
  )
@ -634,30 +637,31 @@ Cypress.Commands.add(
  (datasourceNames, accessLevelLabel) => {
    cy.contains("Design").click()
    cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
-    cy.get(".spectrum-Modal").within(() => {
-      cy.get(".item").contains("Autogenerated screens").click()
+    cy.get(".spectrum-Dialog-grid").within(() => {
+      cy.get("[data-cy='autogenerated-screens']").click()
+      cy.intercept("**/api/datasources").as("autoScreens")
      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+      cy.wait("@autoScreens")
    })
-    cy.get(".spectrum-Modal [data-cy='data-source-modal']", {
-      timeout: 500,
-    }).within(() => {
+    cy.get("[data-cy='autogenerated-screens']").should("not.exist")
+    cy.get("[data-cy='data-source-modal']", { timeout: 10000 }).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")
+          .contains(datasourceNames[i], { timeout: 20000 })
+          .click({ force: true })
+        // Ensure the check mark is visible
        cy.get(".data-source-entry")
          .contains(datasourceNames[i])
-          .get(".data-source-check")
+          .get(".data-source-check", { timeout: 20000 })
          .should("exist")
      }

      cy.get(".spectrum-Button").contains("Confirm").click({ force: true })
    })

-    cy.get(".spectrum-Modal").within(() => {
+    cy.get(".spectrum-Modal", { timeout: 10000 }).within(() => {
      if (accessLevelLabel) {
-        cy.get(".spectrum-Picker-label").click()
-        cy.wait(500)
+        cy.get(".spectrum-Picker-label", { timeout: 10000 }).click()
        cy.contains(accessLevelLabel).click()
      }
      cy.get(".spectrum-Button").contains("Done").click({ force: true })
@ -912,8 +916,9 @@ Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
 Cypress.Commands.add("closeModal", () => {
  cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => {
    cy.get(".close-icon").click()
-    cy.wait(1000) // Wait for modal to close
  })
+  // Confirm modal has closed
+  cy.get(".spectrum-Modal", { timeout: 10000 }).should("not.exist")
 })

 Cypress.Commands.add("expandBudibaseConnection", () => {
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -69,10 +69,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "1.3.4-alpha.1",
-    "@budibase/client": "1.3.4-alpha.1",
-    "@budibase/frontend-core": "1.3.4-alpha.1",
-    "@budibase/string-templates": "1.3.4-alpha.1",
+    "@budibase/bbui": "1.3.12-alpha.1",
+    "@budibase/client": "1.3.12-alpha.1",
+    "@budibase/frontend-core": "1.3.12-alpha.1",
+    "@budibase/string-templates": "1.3.12-alpha.1",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentKeyHandler.svelte
@ -54,7 +54,7 @@
    },
  }

-  const handleKeyAction = async (component, key, ctrlKey = false) => {
+  const handleKeyAction = async (event, component, key, ctrlKey = false) => {
    if (!component || !key) {
      return false
    }
@ -70,6 +70,9 @@
      const handler = keyHandlers[key]
      if (!handler) {
        return false
+      } else if (event) {
+        event.preventDefault()
+        event.stopPropagation()
      }
      return handler(component)
    } catch (error) {
@ -89,14 +92,19 @@
      return
    }
    // Key events are always for the selected component
-    return handleKeyAction($selectedComponent, e.key, e.ctrlKey || e.metaKey)
+    return await handleKeyAction(
+      e,
+      $selectedComponent,
+      e.key,
+      e.ctrlKey || e.metaKey
+    )
  }

  const handleComponentMenu = async e => {
    // Menu events can be for any component
    const { id, key, ctrlKey } = e.detail
    const component = findComponent($selectedScreen.props, id)
-    return await handleKeyAction(component, key, ctrlKey)
+    return await handleKeyAction(null, component, key, ctrlKey)
  }

  onMount(() => {
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
@ -26,9 +26,9 @@
    "outputPath": "build"
  },
  "dependencies": {
-    "@budibase/backend-core": "^1.3.4-alpha.1",
-    "@budibase/string-templates": "^1.3.4-alpha.1",
-    "@budibase/types": "^1.3.4-alpha.1",
+    "@budibase/backend-core": "^1.3.12-alpha.1",
+    "@budibase/string-templates": "^1.3.12-alpha.1",
+    "@budibase/types": "^1.3.12-alpha.1",
    "axios": "0.21.2",
    "chalk": "4.1.0",
    "cli-progress": "3.11.2",
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "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.3.4-alpha.1",
-    "@budibase/frontend-core": "1.3.4-alpha.1",
-    "@budibase/string-templates": "1.3.4-alpha.1",
+    "@budibase/bbui": "1.3.12-alpha.1",
+    "@budibase/frontend-core": "1.3.12-alpha.1",
+    "@budibase/string-templates": "1.3.12-alpha.1",
    "@spectrum-css/button": "^3.0.3",
    "@spectrum-css/card": "^3.0.3",
    "@spectrum-css/divider": "^1.0.3",
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@ -1,12 +1,12 @@
 {
  "name": "@budibase/frontend-core",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Budibase frontend core libraries used in builder and client",
  "author": "Budibase",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "dependencies": {
-    "@budibase/bbui": "1.3.4-alpha.1",
+    "@budibase/bbui": "1.3.12-alpha.1",
    "lodash": "^4.17.21",
    "svelte": "^3.46.2"
  }
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "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.3.4-alpha.1",
-    "@budibase/client": "1.3.4-alpha.1",
-    "@budibase/pro": "1.3.4-alpha.1",
-    "@budibase/string-templates": "1.3.4-alpha.1",
-    "@budibase/types": "1.3.4-alpha.1",
+    "@budibase/backend-core": "1.3.12-alpha.1",
+    "@budibase/client": "1.3.12-alpha.1",
+    "@budibase/pro": "1.3.12-alpha.1",
+    "@budibase/string-templates": "1.3.12-alpha.1",
+    "@budibase/types": "1.3.12-alpha.1",
    "@bull-board/api": "3.7.0",
    "@bull-board/koa": "3.9.4",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@ -1,11 +1,11 @@
 import {
  DatasourceFieldType,
+  DatasourcePlus,
  Integration,
+  QueryJson,
  QueryType,
  Table,
  TableSchema,
-  QueryJson,
-  DatasourcePlus,
 } from "@budibase/types"
 import { OAuth2Client } from "google-auth-library"
 import { buildExternalTableId } from "./utils"
@ -286,8 +286,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
  async createTable(name?: string) {
    try {
      await this.connect()
-      const sheet = await this.client.addSheet({ title: name })
-      return sheet
+      return await this.client.addSheet({ title: name })
    } catch (err) {
      console.error("Error creating new table in google sheets", err)
      throw err
@ -375,7 +374,8 @@ class GoogleSheetsIntegration implements DatasourcePlus {
      const rows = await sheet.getRows()
      const row = rows[query.rowIndex]
      if (row) {
-        const updateValues = query.row
+        const updateValues =
+          typeof query.row === "string" ? JSON.parse(query.row) : query.row
        for (let key in updateValues) {
          row[key] = updateValues[key]
        }
--- a/packages/server/src/integrations/redis.ts
+++ b/packages/server/src/integrations/redis.ts
@ -92,7 +92,7 @@ class RedisIntegration {
  }

  async disconnect() {
-    this.client.disconnect()
+    return this.client.disconnect()
  }

  async redisContext(query: Function) {
@ -101,7 +101,7 @@ class RedisIntegration {
    } catch (err) {
      throw new Error(`Redis error: ${err}`)
    } finally {
-      this.disconnect()
+      await this.disconnect()
    }
  }

@ -117,26 +117,34 @@ class RedisIntegration {

  async read(query: { key: string }) {
    return this.redisContext(async () => {
-      const response = await this.client.get(query.key)
-      return response
+      return await this.client.get(query.key)
    })
  }

  async delete(query: { key: string }) {
    return this.redisContext(async () => {
-      const response = await this.client.del(query.key)
-      return response
+      return await this.client.del(query.key)
    })
  }

  async command(query: { json: string }) {
    return this.redisContext(async () => {
-      const commands = query.json.trim().split(" ")
-      const pipeline = this.client.pipeline([commands])
-      const result = await pipeline.exec()
-      return {
-        response: result[0][1],
+      // commands split line by line
+      const commands = query.json.trim().split("\n")
+      let pipelineCommands = []
+
+      // process each command separately
+      for (let command of commands) {
+        const tokenised = command.trim().split(" ")
+        // Pipeline only accepts lower case commands
+        tokenised[0] = tokenised[0].toLowerCase()
+        pipelineCommands.push(tokenised)
      }
+
+      const pipeline = this.client.pipeline(pipelineCommands)
+      const result = await pipeline.exec()
+
+      return result.map((output: string | string[]) => output[1])
    })
  }
 }
--- a/packages/server/src/integrations/tests/redis.spec.ts
+++ b/packages/server/src/integrations/tests/redis.spec.ts
@ -29,7 +29,7 @@ describe("Redis Integration", () => {
      key: "key",
      value: "value",
    }
-    const response = await config.integration.create(body)
+    await config.integration.create(body)
    expect(await config.redis.get("key")).toEqual("value")
  })

@ -49,7 +49,7 @@ describe("Redis Integration", () => {
    expect(await config.redis.get(body.key)).toEqual(null)
  })

-  it("calls the command method with the correct params", async () => {
+  it("calls the pipeline method with the correct params", async () => {
    const body = {
      json: "KEYS *",
    }
@ -61,7 +61,24 @@ describe("Redis Integration", () => {

    await config.integration.command(body)
    expect(config.integration.client.pipeline).toHaveBeenCalledWith([
-      ["KEYS", "*"],
+      ["keys", "*"],
+    ])
+  })
+
+  it("calls the pipeline method with several separated commands when there are newlines", async () => {
+    const body = {
+      json: 'SET foo "bar"\nGET foo',
+    }
+
+    // ioredis-mock doesn't support pipelines
+    config.integration.client.pipeline = jest.fn(() => ({
+      exec: jest.fn(() => [[]]),
+    }))
+
+    await config.integration.command(body)
+    expect(config.integration.client.pipeline).toHaveBeenCalledWith([
+      ["set", "foo", '"bar"'],
+      ["get", "foo"],
    ])
  })
 })
--- a/packages/server/tsconfig.build.json
+++ b/packages/server/tsconfig.build.json
@ -19,6 +19,7 @@
  "exclude": [
    "node_modules",
    "dist",
+    "src/tests",
    "**/*.spec.ts",
    "**/*.spec.js"
  ]
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@ -1094,12 +1094,13 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

-"@budibase/backend-core@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.1.tgz#5c7547bdf22da936ab6fea8c5fc3ad1b9d54a910"
-  integrity sha512-TH4AyFm31kduVYdciw0TLhkGbilSi6vtE2h0qbnr5QV8SszZ8iKt3vUljTHS0PsH2V/S7qLQVEqZ2blkpRHO0A==
+"@budibase/backend-core@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.12-alpha.1.tgz#a38f36610a4880b5f8c18192d82244a431c28a86"
+  integrity sha512-V1rtNBMob3BJjOGeMyvro2tqYoC85TSIO8wyJf1c4DRpPN0rW3s6MjSmVItqtZlbrcnHmxKFr4PDFDIBJaHnbg==
  dependencies:
-    "@budibase/types" "1.3.4-alpha.1"
+    "@budibase/types" "1.3.12-alpha.1"
+    "@shopify/jest-koa-mocks" "5.0.1"
    "@techpass/passport-openidconnect" "0.3.2"
    aws-sdk "2.1030.0"
    bcrypt "5.0.1"
@ -1178,13 +1179,13 @@
    svelte-flatpickr "^3.2.3"
    svelte-portal "^1.0.0"

-"@budibase/pro@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.1.tgz#fa58c6a0e58d620ddd329389ae896b823a4dd50e"
-  integrity sha512-e8dReYYw+weqYYAQC0zkatBgACaXcbM71kneUTYaX7DnYg7WGY3EHyfajjlQXq+gxmVuXc6wkY28dIozG+/8TQ==
+"@budibase/pro@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.12-alpha.1.tgz#5161f3c646e275fd7f9a72abf817fb407cfd6efe"
+  integrity sha512-lzsZeZuUGqs8eRsCB3T7yBo4yS7z7L3N2qW9Pzh7/VBwFv4NdQH56tniXCf3oFfxsQ+6xH++vklfRxddID/Dfg==
  dependencies:
-    "@budibase/backend-core" "1.3.4-alpha.1"
-    "@budibase/types" "1.3.4-alpha.1"
+    "@budibase/backend-core" "1.3.12-alpha.1"
+    "@budibase/types" "1.3.12-alpha.1"
    "@koa/router" "8.0.8"
    joi "17.6.0"
    node-fetch "^2.6.1"
@ -1207,10 +1208,10 @@
    svelte-apexcharts "^1.0.2"
    svelte-flatpickr "^3.1.0"

-"@budibase/types@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.1.tgz#e75aaf70b5c5a3e7b9fde6f77cb91447dffe0d2d"
-  integrity sha512-DpjO3bkPiOCDtIsvPWU4p6SGBAsN80vtr7zz3Cjrv7p98050fWzkUBPAISOTCWTq59OpF6dUhmMmOQuN6OrK+g==
+"@budibase/types@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.12-alpha.1.tgz#18fda1652a757479be45fe096235af1b966ca49c"
+  integrity sha512-dNP+9zRKX7cYjwL+0/zdlYnMGMUWSyw3Vi+YmWNdXVcQnMXsc9gSbODBQMNv4YNqXBBC+0xgo/A5wRqWhZFL6g==

 "@bull-board/api@3.7.0":
  version "3.7.0"
@ -2274,6 +2275,14 @@
    "@sentry/types" "6.17.7"
    tslib "^1.9.3"

+"@shopify/jest-koa-mocks@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
+  integrity sha512-4YskS9q8+TEHNoyopmuoy2XyhInyqeOl7CF5ShJs19sm6m0EA/jGGvgf/osv2PeTfuf42/L2G9CzWUSg49yTSg==
+  dependencies:
+    koa "^2.13.4"
+    node-mocks-http "^1.11.0"
+
 "@sideway/address@^4.1.3":
  version "4.1.4"
  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@ -3283,7 +3292,7 @@ abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3:
    level-supports "~1.0.0"
    xtend "~4.0.0"

-accepts@^1.3.5:
+accepts@^1.3.5, accepts@^1.3.7:
  version "1.3.8"
  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@ -4838,7 +4847,7 @@ container-info@^1.0.1:
  resolved "https://registry.yarnpkg.com/container-info/-/container-info-1.1.0.tgz#6fcb94e93eacd397c6316ca2834491ede44e55ee"
  integrity sha512-eD2zLAmxGS2kmL4f1jY8BdOqnmpL6X70kvzTBW/9FIQnxoxiBJ4htMsTmtPLPWRs7NHYFvqKQ1VtppV08mdsQA==

-content-disposition@^0.5.2, content-disposition@~0.5.2:
+content-disposition@^0.5.2, content-disposition@^0.5.3, content-disposition@~0.5.2:
  version "0.5.4"
  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
@ -5290,7 +5299,7 @@ depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

-depd@^1.1.2, depd@~1.1.2:
+depd@^1.1.0, depd@^1.1.2, depd@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
@ -6615,7 +6624,7 @@ fragment-cache@^0.2.1:
  dependencies:
    map-cache "^0.2.2"

-fresh@~0.5.2:
+fresh@^0.5.2, fresh@~0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
@ -9458,7 +9467,7 @@ koa@2.7.0:
    type-is "^1.6.16"
    vary "^1.1.2"

-koa@^2.13.1:
+koa@^2.13.1, koa@^2.13.4:
  version "2.13.4"
  resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e"
  integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==
@ -10037,6 +10046,11 @@ memorystream@0.3.1:
  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==

+merge-descriptors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+
 merge-stream@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@ -10440,6 +10454,22 @@ node-int64@^0.4.0:
  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==

+node-mocks-http@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/node-mocks-http/-/node-mocks-http-1.11.0.tgz#defc0febf6b935f08245397d47534a8de592996e"
+  integrity sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==
+  dependencies:
+    accepts "^1.3.7"
+    content-disposition "^0.5.3"
+    depd "^1.1.0"
+    fresh "^0.5.2"
+    merge-descriptors "^1.0.1"
+    methods "^1.1.2"
+    mime "^1.3.4"
+    parseurl "^1.3.3"
+    range-parser "^1.2.0"
+    type-is "^1.6.18"
+
 node-releases@^2.0.5:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
@ -10986,7 +11016,7 @@ parse5@6.0.1:
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==

-parseurl@^1.3.2:
+parseurl@^1.3.2, parseurl@^1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@ -11845,6 +11875,11 @@ randombytes@^2.1.0:
  dependencies:
    safe-buffer "^5.1.0"

+range-parser@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@^2.2.0:
  version "2.5.1"
  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
@ -13893,7 +13928,7 @@ type-fest@^0.8.1:
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==

-type-is@^1.6.14, type-is@^1.6.16:
+type-is@^1.6.14, type-is@^1.6.16, type-is@^1.6.18:
  version "1.6.18"
  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/types/package.json
+++ b/packages/types/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/types",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Budibase types",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.12-alpha.1",
  "description": "Budibase background service",
  "main": "src/index.ts",
  "repository": {
@ -35,10 +35,10 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/backend-core": "1.3.4-alpha.1",
-    "@budibase/pro": "1.3.4-alpha.1",
-    "@budibase/string-templates": "1.3.4-alpha.1",
-    "@budibase/types": "1.3.4-alpha.1",
+    "@budibase/backend-core": "1.3.12-alpha.1",
+    "@budibase/pro": "1.3.12-alpha.1",
+    "@budibase/string-templates": "1.3.12-alpha.1",
+    "@budibase/types": "1.3.12-alpha.1",
    "@koa/router": "8.0.8",
    "@sentry/node": "6.17.7",
    "@techpass/passport-openidconnect": "0.3.2",
--- a/packages/worker/src/api/controllers/system/tenants.js
+++ b/packages/worker/src/api/controllers/system/tenants.js
@ -1,6 +1,7 @@
 const { StaticDatabases, doWithDB } = require("@budibase/backend-core/db")
 const { getTenantId } = require("@budibase/backend-core/tenancy")
 const { deleteTenant } = require("@budibase/backend-core/deprovision")
+const { quotas } = require("@budibase/pro")

 exports.exists = async ctx => {
  const tenantId = ctx.request.params
@ -48,6 +49,7 @@ exports.delete = async ctx => {

  try {
    await deleteTenant(tenantId)
+    await quotas.bustCache()
    ctx.status = 204
  } catch (err) {
    ctx.log.error(err)
--- a/packages/worker/src/api/routes/system/tests/accounts.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/accounts.spec.ts
@ -47,10 +47,7 @@ describe("accounts", () => {

        const response = await api.accounts.destroyMetadata(id)

-        expect(response.status).toBe(404)
-        expect(response.body.message).toBe(
-          `id=${accounts.formatAccountMetadataId(id)} does not exist`
-        )
+        expect(response.status).toBe(204)
      })
    })
  })
--- a/packages/worker/src/sdk/accounts/accounts.ts
+++ b/packages/worker/src/sdk/accounts/accounts.ts
@ -46,8 +46,14 @@ export const destroyMetadata = async (accountId: string) => {
  await db.doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: any) => {
    const metadata = await getMetadata(accountId)
    if (!metadata) {
-      throw new HTTPError(`id=${accountId} does not exist`, 404)
+      return
+    }
+    try {
+      await db.remove(accountId, metadata._rev)
+    } catch (e: any) {
+      if (e.status !== 404) {
+        throw e
+      }
    }
-    await db.remove(accountId, metadata._rev)
  })
 }
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@ -189,23 +189,34 @@ export const save = async (
  const tenantId = tenancy.getTenantId()
  const db = tenancy.getGlobalDB()
  let { email, _id } = user
+  if (!email && !_id) {
+    throw new Error("_id or email is required")
+  }

  let dbUser: User | undefined
  if (_id) {
    // try to get existing user from db
-    dbUser = (await db.get(_id)) as User
-    if (email && dbUser.email !== email) {
-      throw "Email address cannot be changed"
+    try {
+      dbUser = (await db.get(_id)) as User
+      if (email && dbUser.email !== email) {
+        throw "Email address cannot be changed"
+      }
+      email = dbUser.email
+    } catch (e: any) {
+      if (e.status === 404) {
+        // do nothing, save this new user with the id specified - required for SSO auth
+      } else {
+        throw e
+      }
    }
-    email = dbUser.email
-  } else if (email) {
+  }
+
+  if (!dbUser && email) {
    // no id was specified - load from email instead
    dbUser = await usersCore.getGlobalUserByEmail(email)
    if (dbUser && dbUser._id !== _id) {
      throw `Unavailable`
    }
-  } else {
-    throw new Error("_id or email is required")
  }

  await validateUniqueUser(email, tenantId)
--- a/packages/worker/tsconfig.build.json
+++ b/packages/worker/tsconfig.build.json
@ -19,6 +19,7 @@
  "exclude": [
    "node_modules",
    "dist",
+    "src/tests",
    "**/*.spec.ts",
    "**/*.spec.js"
  ]
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@ -291,12 +291,13 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

-"@budibase/backend-core@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.4-alpha.1.tgz#5c7547bdf22da936ab6fea8c5fc3ad1b9d54a910"
-  integrity sha512-TH4AyFm31kduVYdciw0TLhkGbilSi6vtE2h0qbnr5QV8SszZ8iKt3vUljTHS0PsH2V/S7qLQVEqZ2blkpRHO0A==
+"@budibase/backend-core@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.3.12-alpha.1.tgz#a38f36610a4880b5f8c18192d82244a431c28a86"
+  integrity sha512-V1rtNBMob3BJjOGeMyvro2tqYoC85TSIO8wyJf1c4DRpPN0rW3s6MjSmVItqtZlbrcnHmxKFr4PDFDIBJaHnbg==
  dependencies:
-    "@budibase/types" "1.3.4-alpha.1"
+    "@budibase/types" "1.3.12-alpha.1"
+    "@shopify/jest-koa-mocks" "5.0.1"
    "@techpass/passport-openidconnect" "0.3.2"
    aws-sdk "2.1030.0"
    bcrypt "5.0.1"
@ -325,21 +326,21 @@
    uuid "8.3.2"
    zlib "1.0.5"

-"@budibase/pro@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.4-alpha.1.tgz#fa58c6a0e58d620ddd329389ae896b823a4dd50e"
-  integrity sha512-e8dReYYw+weqYYAQC0zkatBgACaXcbM71kneUTYaX7DnYg7WGY3EHyfajjlQXq+gxmVuXc6wkY28dIozG+/8TQ==
+"@budibase/pro@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.3.12-alpha.1.tgz#5161f3c646e275fd7f9a72abf817fb407cfd6efe"
+  integrity sha512-lzsZeZuUGqs8eRsCB3T7yBo4yS7z7L3N2qW9Pzh7/VBwFv4NdQH56tniXCf3oFfxsQ+6xH++vklfRxddID/Dfg==
  dependencies:
-    "@budibase/backend-core" "1.3.4-alpha.1"
-    "@budibase/types" "1.3.4-alpha.1"
+    "@budibase/backend-core" "1.3.12-alpha.1"
+    "@budibase/types" "1.3.12-alpha.1"
    "@koa/router" "8.0.8"
    joi "17.6.0"
    node-fetch "^2.6.1"

-"@budibase/types@1.3.4-alpha.1":
-  version "1.3.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.4-alpha.1.tgz#e75aaf70b5c5a3e7b9fde6f77cb91447dffe0d2d"
-  integrity sha512-DpjO3bkPiOCDtIsvPWU4p6SGBAsN80vtr7zz3Cjrv7p98050fWzkUBPAISOTCWTq59OpF6dUhmMmOQuN6OrK+g==
+"@budibase/types@1.3.12-alpha.1":
+  version "1.3.12-alpha.1"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.3.12-alpha.1.tgz#18fda1652a757479be45fe096235af1b966ca49c"
+  integrity sha512-dNP+9zRKX7cYjwL+0/zdlYnMGMUWSyw3Vi+YmWNdXVcQnMXsc9gSbODBQMNv4YNqXBBC+0xgo/A5wRqWhZFL6g==

 "@cspotcode/source-map-consumer@0.8.0":
  version "0.8.0"
@ -741,6 +742,14 @@
    "@sentry/types" "6.17.7"
    tslib "^1.9.3"

+"@shopify/jest-koa-mocks@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.0.1.tgz#fba490b6b7985fbb571eb9974897d396a3642e94"
+  integrity sha512-4YskS9q8+TEHNoyopmuoy2XyhInyqeOl7CF5ShJs19sm6m0EA/jGGvgf/osv2PeTfuf42/L2G9CzWUSg49yTSg==
+  dependencies:
+    koa "^2.13.4"
+    node-mocks-http "^1.11.0"
+
 "@sideway/address@^4.1.3":
  version "4.1.4"
  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@ -1208,7 +1217,7 @@ abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3:
    level-supports "~1.0.0"
    xtend "~4.0.0"

-accepts@^1.3.5:
+accepts@^1.3.5, accepts@^1.3.7:
  version "1.3.8"
  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@ -2054,7 +2063,7 @@ container-info@^1.0.1:
  resolved "https://registry.yarnpkg.com/container-info/-/container-info-1.1.0.tgz#6fcb94e93eacd397c6316ca2834491ede44e55ee"
  integrity sha512-eD2zLAmxGS2kmL4f1jY8BdOqnmpL6X70kvzTBW/9FIQnxoxiBJ4htMsTmtPLPWRs7NHYFvqKQ1VtppV08mdsQA==

-content-disposition@~0.5.2:
+content-disposition@^0.5.3, content-disposition@~0.5.2:
  version "0.5.4"
  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
@ -2308,7 +2317,7 @@ depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

-depd@^1.1.2, depd@~1.1.2:
+depd@^1.1.0, depd@^1.1.2, depd@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
@ -3045,7 +3054,7 @@ forwarded-parse@^2.1.0:
  resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325"
  integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==

-fresh@~0.5.2:
+fresh@^0.5.2, fresh@~0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
@ -4653,7 +4662,7 @@ koa-static@5.0.0:
    debug "^3.1.0"
    koa-send "^5.0.0"

-koa@2.13.4:
+koa@2.13.4, koa@^2.13.4:
  version "2.13.4"
  resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e"
  integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==
@ -5000,6 +5009,11 @@ memdown@1.4.1:
    ltgt "~2.2.0"
    safe-buffer "~5.1.1"

+merge-descriptors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+
 merge-stream@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@ -5040,7 +5054,7 @@ mime@2.6.0:
  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==

-mime@^1.4.1:
+mime@^1.3.4, mime@^1.4.1:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@ -5201,6 +5215,22 @@ node-int64@^0.4.0:
  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==

+node-mocks-http@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/node-mocks-http/-/node-mocks-http-1.11.0.tgz#defc0febf6b935f08245397d47534a8de592996e"
+  integrity sha512-jS/WzSOcKbOeGrcgKbenZeNhxUNnP36Yw11+hL4TTxQXErGfqYZ+MaYNNvhaTiGIJlzNSqgQkk9j8dSu1YWSuw==
+  dependencies:
+    accepts "^1.3.7"
+    content-disposition "^0.5.3"
+    depd "^1.1.0"
+    fresh "^0.5.2"
+    merge-descriptors "^1.0.1"
+    methods "^1.1.2"
+    mime "^1.3.4"
+    parseurl "^1.3.3"
+    range-parser "^1.2.0"
+    type-is "^1.6.18"
+
 node-releases@^2.0.5:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
@ -5468,7 +5498,7 @@ parse5@6.0.1:
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==

-parseurl@^1.3.2:
+parseurl@^1.3.2, parseurl@^1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@ -6061,6 +6091,11 @@ quick-lru@^5.1.1:
  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==

+range-parser@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@^2.2.0:
  version "2.5.1"
  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
@ -7168,7 +7203,7 @@ type-fest@^0.8.1:
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==

-type-is@^1.6.14, type-is@^1.6.16:
+type-is@^1.6.14, type-is@^1.6.16, type-is@^1.6.18:
  version "1.6.18"
  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==