From 4b69f5ec9c84ceed9da7545288f06b5d3d153016 Mon Sep 17 00:00:00 2001
From: MihailHadzhiev2022 <mihail@budibase.com>
Date: Mon, 23 May 2022 11:36:54 +0300
Subject: [PATCH 01/36] adding interact locators for APP_Publish_WORK_FLOW

---
 .../integration/appPublishWorkflow.spec.js    | 33 ++++++++++---------
 packages/builder/cypress/support/interact.js  | 10 ++++++
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js
index d18233e0e7..bb5cbee0d5 100644
--- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js
+++ b/packages/builder/cypress/integration/appPublishWorkflow.spec.js
@@ -1,4 +1,5 @@
 import filterTests from "../support/filterTests"
+const interact = require('../support/interact')
 
 filterTests(['all'], () => {
   context("Publish Application Workflow", () => {
@@ -11,29 +12,29 @@ filterTests(['all'], () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(1000)
 
-      cy.get(".appTable .app-status").eq(0)
+      cy.get(interact.APP_TABLE_STATUS).eq(0)
       .within(() => {
         cy.contains("Unpublished")
         cy.get("svg[aria-label='GlobeStrike']").should("exist")
       })
 
-      cy.get(".appTable .app-row-actions").eq(0)
+      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
       .within(() => {
-        cy.get(".spectrum-Button").contains("Preview")
-        cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Preview")
+        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Edit").click({ force: true })
       })
       
-      cy.get(".deployment-top-nav svg[aria-label='GlobeStrike']").should("exist")
-      cy.get(".deployment-top-nav svg[aria-label='Globe']").should("not.exist")
+      cy.get(interact.DEPLOYMENT_TOP_NAV_GLOBESTRIKE).should("exist")
+      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("not.exist")
     })
 
     it("Should publish an application and correctly reflect that", () => {
       //Assuming the previous test was run and the unpublished app is open in edit mode.
-      cy.get(".toprightnav button.spectrum-Button").contains("Publish").click({ force : true })
+      cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force : true })
 
       cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
       .within(() => {
-        cy.get(".spectrum-Button").contains("Publish").click({ force : true })
+        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Publish").click({ force : true })
         cy.wait(1000)
       });
 
@@ -43,7 +44,7 @@ filterTests(['all'], () => {
       .within(() => {
         let appUrl = Cypress.config().baseUrl + '/app/cypress-tests'
         cy.get("[data-cy='deployed-app-url'] input").should('have.value', appUrl)
-        cy.get(".spectrum-Button").contains("Done").click({ force: true })
+        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Done").click({ force: true })
       })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
@@ -61,13 +62,13 @@ filterTests(['all'], () => {
         cy.get(".spectrum-Button").contains("Edit").click({ force: true })
       })
 
-      cy.get(".deployment-top-nav svg[aria-label='Globe']").should("exist").click({ force: true })
+      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true })
       
-      cy.get("[data-cy='publish-popover-menu']").should("be.visible")
+      cy.get(interact.PUBLISH_POPOVER_MENU).should("be.visible")
       .within(() => {
-        cy.get("[data-cy='publish-popover-action']").should("exist")
+        cy.get(interact.PUBLISH_POPOVER_ACTION).should("exist")
         cy.get("button").contains("View app").should("exist")
-        cy.get(".publish-popover-message").should("have.text", "Last published a few seconds ago")
+        cy.get(interact.PUBLISH_POPOVER_MESSAGE).should("have.text", "Last published a few seconds ago")
       })
     })
 
@@ -76,7 +77,7 @@ filterTests(['all'], () => {
       
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .app-status").eq(0)
+      cy.get(interact.APP_TABLE_STATUS).eq(0)
       .within(() => {
         cy.contains("Published")
         cy.get("svg[aria-label='Globe']").should("exist")
@@ -84,8 +85,8 @@ filterTests(['all'], () => {
 
       cy.get(".appTable .app-row-actions").eq(0)
       .within(() => {
-        cy.get(".spectrum-Button").contains("View app")
-        cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        cy.get(interact.SPECTRUM_BUTTON).contains("View app")
+        cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true })
       })
 
       //The published status 
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index 11794d940d..691c98db73 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -24,3 +24,13 @@ export const OPTION_TYPE_PROP_CONTROL = '[data-cy="optionsType-prop-control'
 //AddRadioButtons
 export const SPECTRUM_POPOVER = ".spectrum-Popover"
 export const OPTION_SOURCE_PROP_CONROL = '[data-cy="optionsSource-prop-control'
+export const APP_TABLE_STATUS = ".appTable .app-status"
+export const APP_TABLE_ROW_ACTION = ".appTable .app-row-actions"
+export const DEPLOYMENT_TOP_NAV_GLOBESTRIKE =
+  ".deployment-top-nav svg[aria-label=GlobeStrike]"
+export const DEPLOYMENT_TOP_GLOBE = ".deployment-top-nav svg[aria-label=Globe]"
+export const PUBLISH_POPOVER_MENU = '[data-cy="publish-popover-menu"]'
+export const PUBLISH_POPOVER_ACTION = '[data-cy="publish-popover-action"]'
+export const PUBLISH_POPOVER_MESSAGE = ".publish-popover-message"
+export const SPECTRUM_BUTTON = ".spectrum-Button"
+export const TOPRIGHTNAV_BUTTON_SPECTRUM = ".toprightnav button.spectrum-Button"

From fcb0d6667488f49ac1af416b4e3418d13a8cec5c Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 26 May 2022 13:00:19 +0100
Subject: [PATCH 02/36] Make sure linkedRows is an array before map

---
 .../builder/src/components/common/LinkedRowSelector.svelte    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 592ee47565..5c49c17560 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -8,7 +8,9 @@
   export let linkedRows = []
 
   let rows = []
-  let linkedIds = (linkedRows || [])?.map(row => row?._id || row)
+  let linkedIds = (Array.isArray(linkedRows) ? linkedRows : [])?.map(
+    row => row?._id || row
+  )
 
   $: linkedRows = linkedIds
   $: label = capitalise(schema.name)

From 5bd19b9e42c7e3d71685a13a53757c11fd2b6862 Mon Sep 17 00:00:00 2001
From: MihailHadzhiev2022 <mihail@budibase.com>
Date: Mon, 30 May 2022 15:45:04 +0300
Subject: [PATCH 03/36] Adding interact locators for createComponent cypress
 test

---
 .../integration/createComponents.spec.js      | 19 ++++++++++---------
 packages/builder/cypress/support/interact.js  |  8 ++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index e13439d9c6..d44991f085 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -1,6 +1,7 @@
 // TODO for now components are skipped, might not be good to keep doing this
 
 import filterTests from "../support/filterTests"
+const interact = require('../support/interact')
 
 filterTests(['all'], () => {
   xcontext("Create Components", () => {
@@ -31,32 +32,32 @@ filterTests(['all'], () => {
 
     it("should change the text of the headline", () => {
       const text = "Lorem ipsum dolor sit amet."
-      cy.get("[data-cy=Settings]").click()
-      cy.get("[data-cy=setting-text] input")
+      cy.get(interact.DATA_CY_SETTINGS).click()
+      cy.get(interact.SETTINGS_INPUT)
         .type(text)
         .blur()
       cy.getComponent(headlineId).should("have.text", text)
     })
 
     it("should change the size of the headline", () => {
-      cy.get("[data-cy=Design]").click()
+      cy.get(interact.DATA_CY_DESIGN).click()
       cy.contains("Typography").click()
-      cy.get("[data-cy=font-size-prop-control]").click()
+      cy.get(interact.DATA_CY_FSPCONTROL).click()
       cy.contains("60px").click()
       cy.getComponent(headlineId).should("have.css", "font-size", "60px")
     })
 
     it("should create a form and reset to match schema", () => {
       cy.addComponent("Form", "Form").then(() => {
-        cy.get("[data-cy=Settings]").click()
-        cy.get("[data-cy=setting-dataSource]")
+        cy.get(interact.DATA_CY_SETTINGS).click()
+        cy.get(interact.DATA_CY_DATASOURCE)
           .contains("Choose option")
           .click()
-        cy.get(".dropdown")
+        cy.get(interact.DROPDOWN)
           .contains("dog")
           .click()
         cy.addComponent("Form", "Field Group").then(fieldGroupId => {
-          cy.get("[data-cy=Settings]").click()
+          cy.get(interact.DATA_CY_SETTINGS).click()
           cy.contains("Update Form Fields").click()
           cy.get(".modal")
             .get("button.primary")
@@ -84,7 +85,7 @@ filterTests(['all'], () => {
         cy.get(".ui-nav ul .nav-item.selected .ri-more-line").click({
           force: true,
         })
-        cy.get(".dropdown-container")
+        cy.get(interact.DROPDOWN_CONTAINER)
           .contains("Delete")
           .click()
         cy.get(".modal")
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index 691c98db73..082ce3eca9 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -34,3 +34,11 @@ export const PUBLISH_POPOVER_ACTION = '[data-cy="publish-popover-action"]'
 export const PUBLISH_POPOVER_MESSAGE = ".publish-popover-message"
 export const SPECTRUM_BUTTON = ".spectrum-Button"
 export const TOPRIGHTNAV_BUTTON_SPECTRUM = ".toprightnav button.spectrum-Button"
+
+//createComponents
+export const DATA_CY_SETTINGS = "[data-cy=Settings]"
+export const SETTINGS_INPUT = "[data-cy=setting-text] input"
+export const DATA_CY_DESIGN = "[data-cy=Design]"
+export const DATA_CY_FSPCONTROL = "[data-cy=font-size-prop-control]"
+export const DATA_CY_DATASOURCE = "[data-cy=setting-dataSource]"
+export const DROPDOWN_CONTAINER = ".dropdown-container"

From 86d8bd1070748f4d35337c81489fcfefe29ab8ce Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 30 May 2022 17:58:29 +0100
Subject: [PATCH 04/36] livenessProbes for worker and app services

---
 charts/budibase/templates/app-service-deployment.yaml    | 6 ++++++
 charts/budibase/templates/worker-service-deployment.yaml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 98a949418c..a8711fc0eb 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -119,6 +119,12 @@ spec:
 
         image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.services.apps.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 5
         name: bbapps
         ports:
         - containerPort: {{ .Values.services.apps.port }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 15ff05e214..8a053032d6 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -119,6 +119,12 @@ spec:
           value: {{ .Values.globals.google.secret | quote }}
         image: budibase/worker:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.services.worker.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 5
         name: bbworker
         ports:
         - containerPort: {{ .Values.services.worker.port }}

From 5177b77ae503062a52debfaf62eb5b18301564c1 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 30 May 2022 17:59:46 +0100
Subject: [PATCH 05/36] bump K8S chart version

---
 charts/budibase/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml
index 694c8c77fe..227a515432 100644
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -11,7 +11,7 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 0.2.9
+version: 0.2.10
 appVersion: 1.0.48
 dependencies:
   - name: couchdb

From 06a32ed35733411b1979341a9e13cbe3e6669f91 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 30 May 2022 21:22:06 +0100
Subject: [PATCH 06/36] Fixing issue with server not shutting down correctly
 when an error occurs, making sure that everything clears up gracefully.

---
 packages/backend-core/src/redis/index.js      |  2 +-
 packages/server/src/api/index.js              |  4 +++-
 .../server/src/api/routes/public/index.ts     | 11 +++++++++-
 packages/server/src/app.ts                    | 15 +++++++++++--
 packages/server/src/automations/bullboard.js  |  8 +++++++
 packages/server/src/automations/index.js      |  7 +++++-
 packages/server/src/threads/index.ts          | 22 +++++++++++++++++++
 .../src/utilities/queue/inMemoryQueue.js      |  7 ++++++
 packages/worker/src/index.ts                  | 19 +++++++++++-----
 9 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/packages/backend-core/src/redis/index.js b/packages/backend-core/src/redis/index.js
index 0ee17265ce..158b5e3841 100644
--- a/packages/backend-core/src/redis/index.js
+++ b/packages/backend-core/src/redis/index.js
@@ -23,7 +23,7 @@ function connectionError(timeout, err) {
   if (CLOSED) {
     return
   }
-  CLIENT.end()
+  CLIENT.disconnect()
   CLOSED = true
   // always clear this on error
   clearTimeout(timeout)
diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js
index 4bf9d9e14d..1aae78cb30 100644
--- a/packages/server/src/api/index.js
+++ b/packages/server/src/api/index.js
@@ -12,6 +12,7 @@ const { mainRoutes, staticRoutes, publicRoutes } = require("./routes")
 const pkg = require("../../package.json")
 const env = require("../environment")
 const { middleware: pro } = require("@budibase/pro")
+const { shutdown } = require("./routes/public")
 
 const router = new Router()
 
@@ -90,4 +91,5 @@ router.use(publicRoutes.allowedMethods())
 router.use(staticRoutes.routes())
 router.use(staticRoutes.allowedMethods())
 
-module.exports = router
+module.exports.router = router
+module.exports.shutdown = shutdown
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 6f1c69560e..ca49a1a7d6 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -29,6 +29,7 @@ function getApiLimitPerSecond(): number {
   return parseInt(env.API_REQ_LIMIT_PER_SEC)
 }
 
+let rateLimitStore: any = null
 if (!env.isTest()) {
   const REDIS_OPTS = getRedisOptions()
   let options
@@ -47,8 +48,9 @@ if (!env.isTest()) {
       database: 1,
     }
   }
+  rateLimitStore = new Stores.Redis(options)
   RateLimit.defaultOptions({
-    store: new Stores.Redis(options),
+    store: rateLimitStore,
   })
 }
 // rate limiting, allows for 2 requests per second
@@ -128,3 +130,10 @@ applyRoutes(queryEndpoints, PermissionTypes.QUERY, "queryId")
 applyRoutes(rowEndpoints, PermissionTypes.TABLE, "tableId", "rowId")
 
 export default publicRouter
+
+export const shutdown = () => {
+  if (rateLimitStore) {
+    rateLimitStore.client.disconnect()
+    rateLimitStore = null
+  }
+}
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 8efc383194..fd8d052936 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -14,6 +14,8 @@ const automations = require("./automations/index")
 const Sentry = require("@sentry/node")
 const fileSystem = require("./utilities/fileSystem")
 const bullboard = require("./automations/bullboard")
+const context = require("@budibase/backend-core/context")
+const { Thread } = require("./threads")
 import redis from "./utilities/redis"
 import * as migrations from "./migrations"
 
@@ -49,7 +51,7 @@ app.context.eventEmitter = eventEmitter
 app.context.auth = {}
 
 // api routes
-app.use(api.routes())
+app.use(api.router.routes())
 
 if (env.isProd()) {
   env._set("NODE_ENV", "production")
@@ -68,11 +70,20 @@ if (env.isProd()) {
 const server = http.createServer(app.callback())
 destroyable(server)
 
+let shuttingDown = false
 server.on("close", async () => {
-  if (env.NODE_ENV !== "jest") {
+  // already in process
+  if (shuttingDown) {
+    return
+  }
+  shuttingDown = true
+  if (!env.isTest()) {
     console.log("Server Closed")
   }
+  await automations.shutdown()
   await redis.shutdown()
+  await Thread.shutdown()
+  api.shutdown()
 })
 
 module.exports = server.listen(env.PORT || 0, async () => {
diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js
index 32336c4714..cba6594ae7 100644
--- a/packages/server/src/automations/bullboard.js
+++ b/packages/server/src/automations/bullboard.js
@@ -45,4 +45,12 @@ exports.init = () => {
   return serverAdapter.registerPlugin()
 }
 
+exports.shutdown = async () => {
+  if (automationQueue) {
+    clearInterval(cleanupInternal)
+    await automationQueue.close()
+    automationQueue = null
+  }
+}
+
 exports.queue = automationQueue
diff --git a/packages/server/src/automations/index.js b/packages/server/src/automations/index.js
index 87f35ce763..e543365183 100644
--- a/packages/server/src/automations/index.js
+++ b/packages/server/src/automations/index.js
@@ -1,5 +1,5 @@
 const { processEvent } = require("./utils")
-const { queue } = require("./bullboard")
+const { queue, shutdown } = require("./bullboard")
 
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
@@ -14,4 +14,9 @@ exports.init = function () {
 exports.getQueues = () => {
   return [queue]
 }
+
+exports.shutdown = () => {
+  return shutdown()
+}
+
 exports.queue = queue
diff --git a/packages/server/src/threads/index.ts b/packages/server/src/threads/index.ts
index c19453cf44..8516b62596 100644
--- a/packages/server/src/threads/index.ts
+++ b/packages/server/src/threads/index.ts
@@ -28,6 +28,8 @@ export class Thread {
   workers: any
   timeoutMs: any
 
+  static workerRefs: any[] = []
+
   constructor(type: any, opts: any = { timeoutMs: null, count: 1 }) {
     this.type = type
     this.count = opts.count ? opts.count : 1
@@ -46,6 +48,7 @@ export class Thread {
         workerOpts.maxCallTime = opts.timeoutMs
       }
       this.workers = workerFarm(workerOpts, typeToFile(type))
+      Thread.workerRefs.push(this.workers)
     }
   }
 
@@ -73,4 +76,23 @@ export class Thread {
       })
     })
   }
+
+  static shutdown() {
+    return new Promise<void>(resolve => {
+      if (Thread.workerRefs.length === 0) {
+        resolve()
+      }
+      let count = 0
+      function complete() {
+        count++
+        if (count >= Thread.workerRefs.length) {
+          resolve()
+        }
+      }
+      for (let worker of Thread.workerRefs) {
+        workerFarm.end(worker, complete)
+      }
+      Thread.workerRefs = []
+    })
+  }
 }
diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js
index aebc0ba919..375092609e 100644
--- a/packages/server/src/utilities/queue/inMemoryQueue.js
+++ b/packages/server/src/utilities/queue/inMemoryQueue.js
@@ -75,6 +75,13 @@ class InMemoryQueue {
     this._emitter.emit("message")
   }
 
+  /**
+   * replicating the close function from bull, which waits for jobs to finish.
+   */
+  async close() {
+    return []
+  }
+
   /**
    * This removes a cron which has been implemented, this is part of Bull API.
    * @param {string} cronJobId The cron which is to be removed.
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 1cec2868c6..9e265f1b4c 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -28,7 +28,6 @@ app.keys = ["secret", "key"]
 // set up top level koa middleware
 app.use(koaBody({ multipart: true }))
 app.use(koaSession(app))
-
 app.use(
   logger({
     prettyPrint: {
@@ -62,13 +61,23 @@ if (env.isProd()) {
 const server = http.createServer(app.callback())
 destroyable(server)
 
+let shuttingDown = false
 server.on("close", async () => {
-  if (env.isProd()) {
+  if (shuttingDown) {
+    return
+  }
+  shuttingDown = true
+  if (!env.isTest()) {
     console.log("Server Closed")
   }
   await redis.shutdown()
 })
 
+const shutdown = () => {
+  server.close()
+  server.destroy()
+}
+
 module.exports = server.listen(parseInt(env.PORT || 4002), async () => {
   console.log(`Worker running on ${JSON.stringify(server.address())}`)
   await redis.init()
@@ -76,11 +85,9 @@ module.exports = server.listen(parseInt(env.PORT || 4002), async () => {
 
 process.on("uncaughtException", err => {
   console.error(err)
-  server.close()
-  server.destroy()
+  shutdown()
 })
 
 process.on("SIGTERM", () => {
-  server.close()
-  server.destroy()
+  shutdown()
 })

From 81edc7a18a0aae47f16224df750d61144d3efcb0 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 30 May 2022 21:24:23 +0100
Subject: [PATCH 07/36] Adding process exits.

---
 packages/server/src/app.ts   | 1 +
 packages/worker/src/index.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index fd8d052936..78ce595fe8 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -84,6 +84,7 @@ server.on("close", async () => {
   await redis.shutdown()
   await Thread.shutdown()
   api.shutdown()
+  process.exit()
 })
 
 module.exports = server.listen(env.PORT || 0, async () => {
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 9e265f1b4c..32c4dd4ad5 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -71,6 +71,7 @@ server.on("close", async () => {
     console.log("Server Closed")
   }
   await redis.shutdown()
+  process.exit()
 })
 
 const shutdown = () => {

From b7075de0cd31a59143d73f91a9071f03f14534ee Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 30 May 2022 21:54:24 +0100
Subject: [PATCH 08/36] Adding checking for zlib error, to try and stop if it
 occurs.

---
 packages/server/src/app.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 78ce595fe8..16912754b4 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -102,6 +102,11 @@ const shutdown = () => {
 }
 
 process.on("uncaughtException", err => {
+  // @ts-ignore
+  // don't worry about this error, comes from zlib isn't important
+  if (err && err["code"] === "ERR_INVALID_CHAR") {
+    return
+  }
   console.error(err)
   shutdown()
 })

From 320075feac1827d4a46497aff40f19220044924b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 31 May 2022 07:41:43 +0100
Subject: [PATCH 09/36] add API_REQ_LIMIT_PER_SEC

---
 charts/budibase/templates/app-service-deployment.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index a8711fc0eb..8a9ba51a6c 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -78,6 +78,8 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
+        - name: API_REQ_LIMIT_PER_SEC
+          value: {{ .Values.globals.apps.publicApiRateLimitPerSecond | quote }}
         - name: MULTI_TENANCY
           value: {{ .Values.globals.multiTenancy | quote }}
         - name: LOG_LEVEL

From e439d7097b35705d0983592bbbb96ebb81bf0921 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 31 May 2022 10:16:22 +0100
Subject: [PATCH 10/36] Review comments and test fix.

---
 packages/backend-core/logging.js     |  1 +
 packages/backend-core/src/logging.js | 16 ++++++++++++++++
 packages/server/src/app.ts           | 14 +++++++++-----
 packages/worker/src/index.ts         | 11 ++++++++---
 4 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 packages/backend-core/logging.js
 create mode 100644 packages/backend-core/src/logging.js

diff --git a/packages/backend-core/logging.js b/packages/backend-core/logging.js
new file mode 100644
index 0000000000..da40fe3100
--- /dev/null
+++ b/packages/backend-core/logging.js
@@ -0,0 +1 @@
+module.exports = require("./src/logging")
diff --git a/packages/backend-core/src/logging.js b/packages/backend-core/src/logging.js
new file mode 100644
index 0000000000..425d7f8133
--- /dev/null
+++ b/packages/backend-core/src/logging.js
@@ -0,0 +1,16 @@
+const NonErrors = ["AccountError"]
+
+function isSuppressed(e) {
+  return e && e["suppressAlert"]
+}
+
+module.exports.logAlert = (message, e = null) => {
+  if (e && NonErrors.includes(e.name) && isSuppressed(e)) {
+    return
+  }
+  let errorJson = ""
+  if (e) {
+    errorJson = ": " + JSON.stringify(e, Object.getOwnPropertyNames(e))
+  }
+  console.error(`bb-alert: ${message} ${errorJson}`)
+}
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 16912754b4..f73c90c895 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -14,7 +14,7 @@ const automations = require("./automations/index")
 const Sentry = require("@sentry/node")
 const fileSystem = require("./utilities/fileSystem")
 const bullboard = require("./automations/bullboard")
-const context = require("@budibase/backend-core/context")
+const { logAlert } = require("@budibase/backend-core/logging")
 const { Thread } = require("./threads")
 import redis from "./utilities/redis"
 import * as migrations from "./migrations"
@@ -70,7 +70,8 @@ if (env.isProd()) {
 const server = http.createServer(app.callback())
 destroyable(server)
 
-let shuttingDown = false
+let shuttingDown = false,
+  errCode = 0
 server.on("close", async () => {
   // already in process
   if (shuttingDown) {
@@ -84,7 +85,9 @@ server.on("close", async () => {
   await redis.shutdown()
   await Thread.shutdown()
   api.shutdown()
-  process.exit()
+  if (!env.isTest()) {
+    process.exit(errCode)
+  }
 })
 
 module.exports = server.listen(env.PORT || 0, async () => {
@@ -107,7 +110,8 @@ process.on("uncaughtException", err => {
   if (err && err["code"] === "ERR_INVALID_CHAR") {
     return
   }
-  console.error(err)
+  errCode = -1
+  logAlert("Uncaught exception.", err)
   shutdown()
 })
 
@@ -119,7 +123,7 @@ process.on("SIGTERM", () => {
 // not recommended in a clustered environment
 if (!env.HTTP_MIGRATIONS) {
   migrations.migrate().catch(err => {
-    console.error("Error performing migrations. Exiting.\n", err)
+    logAlert("Error performing migrations. Exiting.", err)
     shutdown()
   })
 }
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 32c4dd4ad5..fb395a7e6a 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -12,6 +12,7 @@ const destroyable = require("server-destroy")
 const koaBody = require("koa-body")
 const koaSession = require("koa-session")
 const { passport } = require("@budibase/backend-core/auth")
+const { logAlert } = require("@budibase/backend-core/logging")
 const logger = require("koa-pino-logger")
 const http = require("http")
 const api = require("./api")
@@ -61,7 +62,8 @@ if (env.isProd()) {
 const server = http.createServer(app.callback())
 destroyable(server)
 
-let shuttingDown = false
+let shuttingDown = false,
+  errCode = 0
 server.on("close", async () => {
   if (shuttingDown) {
     return
@@ -71,7 +73,9 @@ server.on("close", async () => {
     console.log("Server Closed")
   }
   await redis.shutdown()
-  process.exit()
+  if (!env.isTest()) {
+    process.exit(errCode)
+  }
 })
 
 const shutdown = () => {
@@ -85,7 +89,8 @@ module.exports = server.listen(parseInt(env.PORT || 4002), async () => {
 })
 
 process.on("uncaughtException", err => {
-  console.error(err)
+  errCode = -1
+  logAlert("Uncaught exception.", err)
   shutdown()
 })
 

From 7b804dba8818fcb9d928d4e631a7241b0cbf351b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 31 May 2022 13:03:59 +0100
Subject: [PATCH 11/36] make rate limit optional

---
 charts/budibase/templates/app-service-deployment.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 8a9ba51a6c..2e5e923b3e 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -78,8 +78,10 @@ spec:
           value: {{ .Values.services.objectStore.url }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
+        {{ if .Values.services.worker.publicApiRateLimitPerSecond }}
         - name: API_REQ_LIMIT_PER_SEC
           value: {{ .Values.globals.apps.publicApiRateLimitPerSecond | quote }}
+        {{ end }}
         - name: MULTI_TENANCY
           value: {{ .Values.globals.multiTenancy | quote }}
         - name: LOG_LEVEL

From 21f755d186a998e3e74858025ec43c1bb41b774c Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 31 May 2022 12:20:29 +0000
Subject: [PATCH 12/36] v1.0.190-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 716f366af9..a1e439750b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 453c6e164f..193db30eb6 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 78628f9e68..414e8ec1a8 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "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.189",
+    "@budibase/string-templates": "^1.0.190-alpha.0",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9dcda69a53..0162e1f5cd 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.189",
-    "@budibase/client": "^1.0.189",
-    "@budibase/frontend-core": "^1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/bbui": "^1.0.190-alpha.0",
+    "@budibase/client": "^1.0.190-alpha.0",
+    "@budibase/frontend-core": "^1.0.190-alpha.0",
+    "@budibase/string-templates": "^1.0.190-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a500b8b539..e3c8605a3b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 31980da192..b25fbcc48d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "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.189",
-    "@budibase/frontend-core": "^1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/bbui": "^1.0.190-alpha.0",
+    "@budibase/frontend-core": "^1.0.190-alpha.0",
+    "@budibase/string-templates": "^1.0.190-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index ca4e82c56c..d5adba5e67 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "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.189",
+    "@budibase/bbui": "^1.0.190-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 19397b9283..70d04eded9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.189",
-    "@budibase/client": "^1.0.189",
+    "@budibase/backend-core": "^1.0.190-alpha.0",
+    "@budibase/client": "^1.0.190-alpha.0",
     "@budibase/pro": "1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/string-templates": "^1.0.190-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 43d48b0a6e..a74a223fb5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 698b57a393..d6b769d448 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.189",
+  "version": "1.0.190-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.189",
+    "@budibase/backend-core": "^1.0.190-alpha.0",
     "@budibase/pro": "1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/string-templates": "^1.0.190-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From edaa71e6688af1e1cc003e700479588f6144c6b8 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 31 May 2022 12:21:56 +0000
Subject: [PATCH 13/36] Update pro version to 1.0.190-alpha.0

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 70d04eded9..48fc9b2087 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.190-alpha.0",
     "@budibase/client": "^1.0.190-alpha.0",
-    "@budibase/pro": "1.0.189",
+    "@budibase/pro": "1.0.190-alpha.0",
     "@budibase/string-templates": "^1.0.190-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d6b769d448..b23f344d66 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.190-alpha.0",
-    "@budibase/pro": "1.0.189",
+    "@budibase/pro": "1.0.190-alpha.0",
     "@budibase/string-templates": "^1.0.190-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 1a378dfe50e9a4f53900e6431eb280524390ad69 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 31 May 2022 13:07:37 +0000
Subject: [PATCH 14/36] v1.0.190

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 716f366af9..62038b6bcd 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.189",
+  "version": "1.0.190",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ef0cf443d6..c1191133b4 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 78628f9e68..c202f06816 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "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.189",
+    "@budibase/string-templates": "^1.0.190",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6341151474..b7da564c2c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.189",
-    "@budibase/client": "^1.0.189",
-    "@budibase/frontend-core": "^1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/bbui": "^1.0.190",
+    "@budibase/client": "^1.0.190",
+    "@budibase/frontend-core": "^1.0.190",
+    "@budibase/string-templates": "^1.0.190",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a500b8b539..afdb206c7a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 31980da192..744b9d66eb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "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.189",
-    "@budibase/frontend-core": "^1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/bbui": "^1.0.190",
+    "@budibase/frontend-core": "^1.0.190",
+    "@budibase/string-templates": "^1.0.190",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index ca4e82c56c..668fff6741 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "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.189",
+    "@budibase/bbui": "^1.0.190",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 19397b9283..10b0aba22b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.189",
-    "@budibase/client": "^1.0.189",
+    "@budibase/backend-core": "^1.0.190",
+    "@budibase/client": "^1.0.190",
     "@budibase/pro": "1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/string-templates": "^1.0.190",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 43d48b0a6e..73d758f2fe 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 698b57a393..1c0b0a8af1 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.189",
+  "version": "1.0.190",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.189",
+    "@budibase/backend-core": "^1.0.190",
     "@budibase/pro": "1.0.189",
-    "@budibase/string-templates": "^1.0.189",
+    "@budibase/string-templates": "^1.0.190",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 0fbad42b99ff6698a4ee35974513c06a522284db Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 31 May 2022 13:08:58 +0000
Subject: [PATCH 15/36] Update pro version to 1.0.190

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 10b0aba22b..0db449b93d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.190",
     "@budibase/client": "^1.0.190",
-    "@budibase/pro": "1.0.189",
+    "@budibase/pro": "1.0.190",
     "@budibase/string-templates": "^1.0.190",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1c0b0a8af1..a23f4a75fe 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.190",
-    "@budibase/pro": "1.0.189",
+    "@budibase/pro": "1.0.190",
     "@budibase/string-templates": "^1.0.190",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 5f9a79722351f52ddddc54fba5b5f9ef0804ea97 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 31 May 2022 13:57:52 +0000
Subject: [PATCH 16/36] v1.0.191

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 62038b6bcd..806b5a6cab 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.190",
+  "version": "1.0.191",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c1191133b4..685bb2ccf1 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c202f06816..bff9ae4f0f 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "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.190",
+    "@budibase/string-templates": "^1.0.191",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b7da564c2c..4145dac7e9 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.190",
-    "@budibase/client": "^1.0.190",
-    "@budibase/frontend-core": "^1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/bbui": "^1.0.191",
+    "@budibase/client": "^1.0.191",
+    "@budibase/frontend-core": "^1.0.191",
+    "@budibase/string-templates": "^1.0.191",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index afdb206c7a..802c3025c5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 744b9d66eb..de9a2aaa21 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "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.190",
-    "@budibase/frontend-core": "^1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/bbui": "^1.0.191",
+    "@budibase/frontend-core": "^1.0.191",
+    "@budibase/string-templates": "^1.0.191",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 668fff6741..74fc1c9baa 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "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.190",
+    "@budibase/bbui": "^1.0.191",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 0db449b93d..f0b78c5149 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.190",
-    "@budibase/client": "^1.0.190",
+    "@budibase/backend-core": "^1.0.191",
+    "@budibase/client": "^1.0.191",
     "@budibase/pro": "1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/string-templates": "^1.0.191",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 73d758f2fe..80b565a6e8 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a23f4a75fe..d63487eeb5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.190",
+  "version": "1.0.191",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.190",
+    "@budibase/backend-core": "^1.0.191",
     "@budibase/pro": "1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/string-templates": "^1.0.191",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 50f5107291d5cdf3efb6c3580172aad460195557 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Tue, 31 May 2022 13:59:30 +0000
Subject: [PATCH 17/36] Update pro version to 1.0.191

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

diff --git a/packages/server/package.json b/packages/server/package.json
index f0b78c5149..9bdb36d043 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.191",
     "@budibase/client": "^1.0.191",
-    "@budibase/pro": "1.0.190",
+    "@budibase/pro": "1.0.191",
     "@budibase/string-templates": "^1.0.191",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d63487eeb5..d63d7cbe09 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.191",
-    "@budibase/pro": "1.0.190",
+    "@budibase/pro": "1.0.191",
     "@budibase/string-templates": "^1.0.191",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 7b687df638d2d8ab6d79ea341b63229a0a23ed5a Mon Sep 17 00:00:00 2001
From: MihailHadzhiev2022 <mihail@budibase.com>
Date: Tue, 31 May 2022 17:01:11 +0300
Subject: [PATCH 18/36] Small fixes

---
 .../integration/addMultiOptionDatatype.spec.js       |  2 +-
 .../cypress/integration/createComponents.spec.js     | 12 ++++++------
 packages/builder/cypress/support/interact.js         |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
index 3e0ba92ba4..38ae881db8 100644
--- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
+++ b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js
@@ -41,7 +41,7 @@ filterTests(['all'], () => {
       }
       // Check items have been selected
       cy.getComponent(componentId)
-        .find(interact.SPECTRUM_Picker_LABEL)
+        .find(interact.SPECTRUM_PICKER_LABEL)
         .contains("(5)")
       })
     })
diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index d44991f085..43a76c700e 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -32,7 +32,7 @@ filterTests(['all'], () => {
 
     it("should change the text of the headline", () => {
       const text = "Lorem ipsum dolor sit amet."
-      cy.get(interact.DATA_CY_SETTINGS).click()
+      cy.get(interact.SETTINGS).click()
       cy.get(interact.SETTINGS_INPUT)
         .type(text)
         .blur()
@@ -40,16 +40,16 @@ filterTests(['all'], () => {
     })
 
     it("should change the size of the headline", () => {
-      cy.get(interact.DATA_CY_DESIGN).click()
+      cy.get(interact.DESIGN).click()
       cy.contains("Typography").click()
-      cy.get(interact.DATA_CY_FSPCONTROL).click()
+      cy.get(interact.FONT_SIZE_PROP_CONTROL).click()
       cy.contains("60px").click()
       cy.getComponent(headlineId).should("have.css", "font-size", "60px")
     })
 
     it("should create a form and reset to match schema", () => {
       cy.addComponent("Form", "Form").then(() => {
-        cy.get(interact.DATA_CY_SETTINGS).click()
+        cy.get(interact.SETTINGS).click()
         cy.get(interact.DATA_CY_DATASOURCE)
           .contains("Choose option")
           .click()
@@ -57,7 +57,7 @@ filterTests(['all'], () => {
           .contains("dog")
           .click()
         cy.addComponent("Form", "Field Group").then(fieldGroupId => {
-          cy.get(interact.DATA_CY_SETTINGS).click()
+          cy.get(interact.SETTINGS).click()
           cy.contains("Update Form Fields").click()
           cy.get(".modal")
             .get("button.primary")
@@ -71,7 +71,7 @@ filterTests(['all'], () => {
             .find("input")
             .should("have.length", 2)
           cy.getComponent(fieldGroupId)
-            .find(".spectrum-Picker")
+            .find(interact.SPECTRUM_PICKER)
             .should("have.length", 1)
         })
       })
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index 082ce3eca9..3ed4da2244 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -17,7 +17,7 @@ export const CATEGORY_DATA = '[data-cy="category-Data"]'
 export const COMPONENT_DATA_PROVIDER = '[data-cy="component-Data Provider"]'
 export const DATASOURCE_PROP_CONTROL = '[data-cy="dataSource-prop-control"]'
 export const DROPDOWN = ".dropdown"
-export const SPECTRUM_Picker_LABEL = ".spectrum-Picker-label"
+export const SPECTRUM_PICKER_LABEL = ".spectrum-Picker-label"
 export const DATASOURCE_FIELD_CONTROL = '[data-cy="field-prop-control"]'
 export const OPTION_TYPE_PROP_CONTROL = '[data-cy="optionsType-prop-control'
 
@@ -36,9 +36,10 @@ export const SPECTRUM_BUTTON = ".spectrum-Button"
 export const TOPRIGHTNAV_BUTTON_SPECTRUM = ".toprightnav button.spectrum-Button"
 
 //createComponents
-export const DATA_CY_SETTINGS = "[data-cy=Settings]"
+export const SETTINGS = "[data-cy=Settings]"
 export const SETTINGS_INPUT = "[data-cy=setting-text] input"
-export const DATA_CY_DESIGN = "[data-cy=Design]"
-export const DATA_CY_FSPCONTROL = "[data-cy=font-size-prop-control]"
+export const DESIGN = "[data-cy=Design]"
+export const FONT_SIZE_PROP_CONTRO = "[data-cy=font-size-prop-control]"
 export const DATA_CY_DATASOURCE = "[data-cy=setting-dataSource]"
 export const DROPDOWN_CONTAINER = ".dropdown-container"
+export const SPECTRUM_PICKER = ".spectrum-Picker"

From 14deb5aebbd5b18b560b3c66a94d68a2967ba396 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 31 May 2022 14:16:46 +0000
Subject: [PATCH 19/36] v1.0.191-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 62038b6bcd..d6ca00a41a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index c6742ba7ec..823e9e6ca7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c202f06816..b677d0c01c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "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.190",
+    "@budibase/string-templates": "^1.0.191-alpha.0",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 809c39c3dc..de0faa2880 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.190",
-    "@budibase/client": "^1.0.190",
-    "@budibase/frontend-core": "^1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/bbui": "^1.0.191-alpha.0",
+    "@budibase/client": "^1.0.191-alpha.0",
+    "@budibase/frontend-core": "^1.0.191-alpha.0",
+    "@budibase/string-templates": "^1.0.191-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index afdb206c7a..ccc5ea5b5c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 744b9d66eb..be519c19f5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "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.190",
-    "@budibase/frontend-core": "^1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/bbui": "^1.0.191-alpha.0",
+    "@budibase/frontend-core": "^1.0.191-alpha.0",
+    "@budibase/string-templates": "^1.0.191-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 668fff6741..102a5eac49 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "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.190",
+    "@budibase/bbui": "^1.0.191-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 0db449b93d..03e419ecdf 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.190",
-    "@budibase/client": "^1.0.190",
+    "@budibase/backend-core": "^1.0.191-alpha.0",
+    "@budibase/client": "^1.0.191-alpha.0",
     "@budibase/pro": "1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/string-templates": "^1.0.191-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 73d758f2fe..8587f310ea 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a23f4a75fe..bcd84aea5a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.190",
+  "version": "1.0.191-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.190",
+    "@budibase/backend-core": "^1.0.191-alpha.0",
     "@budibase/pro": "1.0.190",
-    "@budibase/string-templates": "^1.0.190",
+    "@budibase/string-templates": "^1.0.191-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 3581423e1683150c6362017fe4f0230674f04be1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 31 May 2022 14:18:09 +0000
Subject: [PATCH 20/36] Update pro version to 1.0.191-alpha.0

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 03e419ecdf..a3bca2d3fa 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.191-alpha.0",
     "@budibase/client": "^1.0.191-alpha.0",
-    "@budibase/pro": "1.0.190",
+    "@budibase/pro": "1.0.191-alpha.0",
     "@budibase/string-templates": "^1.0.191-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index bcd84aea5a..e613f910ec 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.191-alpha.0",
-    "@budibase/pro": "1.0.190",
+    "@budibase/pro": "1.0.191-alpha.0",
     "@budibase/string-templates": "^1.0.191-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 62652bd0d35791232fb8f8c28b56a3abea3fb7af Mon Sep 17 00:00:00 2001
From: MihailHadzhiev2022 <mihail@budibase.com>
Date: Tue, 31 May 2022 18:39:05 +0300
Subject: [PATCH 21/36] refactoring autoScreensUI test

---
 .../cypress/integration/autoScreensUI.spec.js | 45 ++++++++++---------
 packages/builder/cypress/support/interact.js  |  7 +++
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/packages/builder/cypress/integration/autoScreensUI.spec.js b/packages/builder/cypress/integration/autoScreensUI.spec.js
index 2c2a43e711..eebeac3e71 100644
--- a/packages/builder/cypress/integration/autoScreensUI.spec.js
+++ b/packages/builder/cypress/integration/autoScreensUI.spec.js
@@ -1,4 +1,5 @@
 import filterTests from "../support/filterTests"
+const interact = require('../support/interact')
 
 filterTests(['smoke', 'all'], () => {
   context("Auto Screens UI", () => {
@@ -12,10 +13,10 @@ filterTests(['smoke', 'all'], () => {
       cy.closeModal();
 
       cy.contains("Design").click()
-      cy.get("[aria-label=AddCircle]").click()
-      cy.get(".spectrum-Modal").within(() => {
-        cy.get(".item.disabled").contains("Autogenerated screens")
-        cy.get(".confirm-wrap .spectrum-Button").should('be.disabled')
+      cy.get(interact.LABEL_ADD_CIRCLE).click()
+      cy.get(interact.SPECTRUM_MODAL).within(() => {
+        cy.get(interact.ITEM_DISABLED).contains("Autogenerated screens")
+        cy.get(interact.CONFIRM_WRAP_SPE_BUTTON).should('be.disabled')
       })
 
       cy.deleteAllApps()
@@ -26,14 +27,14 @@ filterTests(['smoke', 'all'], () => {
 
       cy.selectExternalDatasource("REST")
       cy.selectExternalDatasource("S3")
-      cy.get(".spectrum-Modal").within(() => {
-        cy.get(".spectrum-Button").contains("Save and continue to query").click({ force : true })
+      cy.get(interact.SPECTRUM_MODAL).within(() => {
+        cy.get(interact.SPECTRUM_BUTTON).contains("Save and continue to query").click({ force : true })
       })
       
       cy.navigateToAutogeneratedModal()
 
-      cy.get('.data-source-entry').should('have.length', 1)
-      cy.get('.data-source-entry')
+      cy.get(interact.DATA_SOURCE_ENTRY).should('have.length', 1)
+      cy.get(interact.DATA_SOURCE_ENTRY)
 
       cy.deleteAllApps()
     });
@@ -43,8 +44,8 @@ filterTests(['smoke', 'all'], () => {
       // Create Autogenerated screens from the internal table
       cy.createDatasourceScreen(["Cypress Tests"])
       // Confirm screens have been auto generated
-      cy.get(".nav-items-container").contains("cypress-tests").click({ force: true })
-      cy.get(".nav-items-container").should('contain', 'cypress-tests/:id')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("cypress-tests").click({ force: true })
+      cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'cypress-tests/:id')
         .and('contain', 'cypress-tests/new/row')
     })
 
@@ -56,12 +57,12 @@ filterTests(['smoke', 'all'], () => {
       // Create Autogenerated screens from the internal tables
       cy.createDatasourceScreen([initialTable, secondTable])
       // Confirm screens have been auto generated
-      cy.get(".nav-items-container").contains("cypress-tests").click({ force: true })
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("cypress-tests").click({ force: true })
       // Previously generated tables are suffixed with numbers - as expected
-      cy.get(".nav-items-container").should('contain', 'cypress-tests-2/:id')
+      cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'cypress-tests-2/:id')
         .and('contain', 'cypress-tests-2/new/row')
-      cy.get(".nav-items-container").contains("table-two").click()
-      cy.get(".nav-items-container").should('contain', 'table-two/:id')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("table-two").click()
+      cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'table-two/:id')
         .and('contain', 'table-two/new/row')
     })
 
@@ -71,17 +72,17 @@ filterTests(['smoke', 'all'], () => {
       cy.createTable("Table Four")
       cy.createDatasourceScreen(["Table Three", "Table Four"], "Admin")
 
-      cy.get(".nav-items-container").contains("table-three").click()
-      cy.get(".nav-items-container").should('contain', 'table-three/:id')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("table-three").click()
+      cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'table-three/:id')
       .and('contain', 'table-three/new/row')
 
-      cy.get(".nav-items-container").contains("table-four").click()
-      cy.get(".nav-items-container").should('contain', 'table-four/:id')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("table-four").click()
+      cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'table-four/:id')
       .and('contain', 'table-four/new/row')
 
       //The access level should now be set to admin. Previous screens should be filtered.
-      cy.get(".nav-items-container").contains("table-two").should('not.exist')
-      cy.get(".nav-items-container").contains("cypress-tests").should('not.exist')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("table-two").should('not.exist')
+      cy.get(interact.NAV_ITEMS_CONTAINER).contains("cypress-tests").should('not.exist')
     })
 
     if (Cypress.env("TEST_ENV")) {
@@ -94,8 +95,8 @@ filterTests(['smoke', 'all'], () => {
         // Create Autogenerated screens from a MySQL table - MySQL contains books table
         cy.createDatasourceScreen(["books"])
         
-        cy.get(".nav-items-container").contains("books").click()
-        cy.get(".nav-items-container").should('contain', 'books/:id')
+        cy.get(interact.NAV_ITEMS_CONTAINER).contains("books").click()
+        cy.get(interact.NAV_ITEMS_CONTAINER).should('contain', 'books/:id')
           .and('contain', 'books/new/row')
       })
     }
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index 3ed4da2244..5a45b8620b 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -43,3 +43,10 @@ export const FONT_SIZE_PROP_CONTRO = "[data-cy=font-size-prop-control]"
 export const DATA_CY_DATASOURCE = "[data-cy=setting-dataSource]"
 export const DROPDOWN_CONTAINER = ".dropdown-container"
 export const SPECTRUM_PICKER = ".spectrum-Picker"
+
+//autoScreens
+export const LABEL_ADD_CIRCLE = "[aria-label=AddCircle]"
+export const ITEM_DISABLED = ".item.disabled"
+export const CONFIRM_WRAP_SPE_BUTTON = ".confirm-wrap .spectrum-Button"
+export const DATA_SOURCE_ENTRY = ".data-source-entry"
+export const NAV_ITEMS_CONTAINER = ".nav-items-container"

From c387863923a5b9109bf054349e6a5427c8212aec Mon Sep 17 00:00:00 2001
From: MihailHadzhiev2022 <mihail@budibase.com>
Date: Wed, 1 Jun 2022 10:23:15 +0300
Subject: [PATCH 22/36] adding locators for PublishWorkFlow test

---
 .../integration/appPublishWorkflow.spec.js    | 36 +++++++++----------
 .../cypress/integration/createApp.spec.js     |  2 +-
 packages/builder/cypress/support/interact.js  |  8 +++++
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js
index 018a726ebe..d05a97f691 100644
--- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js
+++ b/packages/builder/cypress/integration/appPublishWorkflow.spec.js
@@ -15,7 +15,7 @@ filterTests(['all'], () => {
       cy.get(interact.APP_TABLE_STATUS).eq(0)
       .within(() => {
         cy.contains("Unpublished")
-        cy.get("svg[aria-label='GlobeStrike']").should("exist")
+        cy.get(interact.GLOBESTRIKE).should("exist")
       })
 
       cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
@@ -32,34 +32,34 @@ filterTests(['all'], () => {
       //Assuming the previous test was run and the unpublished app is open in edit mode.
       cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force : true })
 
-      cy.get(".spectrum-Modal [data-cy='deploy-app-modal']").should("be.visible")
+      cy.get(interact.DEPLOY_APP_MODAL).should("be.visible")
       .within(() => {
-        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Publish").click({ force : true })
+        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(".spectrum-Modal [data-cy='deploy-app-success-modal']")
+      cy.get(interact.DEPLOY_APP_MODAL)
       .should("be.visible")
       .within(() => {
         let appUrl = Cypress.config().baseUrl + '/app/cypress-tests'
-        cy.get("[data-cy='deployed-app-url'] input").should('have.value', appUrl)
-        cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Done").click({ force: true })
+        cy.get(interact.DEPLOY_APP_URL_INPUT).should('have.value', appUrl)
+        cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true })
       })
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(1000)
 
-      cy.get(".appTable .app-status").eq(0)
+      cy.get(interact.APP_TABLE_STATUS).eq(0)
       .within(() => {
         cy.contains("Published")
-        cy.get("svg[aria-label='Globe']").should("exist")
+        cy.get(interact.GLOBE).should("exist")
       })
 
-      cy.get(".appTable .app-row-actions").eq(0)
+      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
       .within(() => {
-        cy.get(".spectrum-Button").contains("View")
-        cy.get(".spectrum-Button").contains("Edit").click({ force: true })
+        cy.get(interact.SPECTRUM_BUTTON).contains("View")
+        cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true })
       })
 
       cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true })
@@ -83,30 +83,30 @@ filterTests(['all'], () => {
         cy.get("svg[aria-label='Globe']").should("exist")
       })
 
-      cy.get(".appTable .app-row-actions").eq(0)
+      cy.get(interact.APP_TABLE_ROW_ACTION).eq(0)
       .within(() => {
         cy.get(interact.SPECTRUM_BUTTON).contains("View app")
         cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true })
       })
 
       //The published status 
-      cy.get(".deployment-top-nav svg[aria-label='Globe']").should("exist")
+      cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist")
       .click({ force: true })
 
-      cy.get("[data-cy='publish-popover-menu']").should("be.visible")
+      cy.get(interact.PUBLISH_POPOVER_MENU).should("be.visible")
       cy.get("[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']")
       .click({ force : true })
 
-      cy.get("[data-cy='unpublish-modal']").should("be.visible")
+      cy.get(interact.UNPUBLISH_MODAL).should("be.visible")
       .within(() => {
-        cy.get(".confirm-wrap button").click({ force: true }
+        cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true }
       )})
 
-      cy.get(".deployment-top-nav svg[aria-label='GlobeStrike']").should("exist")
+      cy.get(interact.DEPLOYMENT_TOP_NAV_GLOBESTRIKE).should("exist")
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
 
-      cy.get(".appTable .app-status").eq(0).contains("Unpublished")
+      cy.get(interact.APP_TABLE_STATUS).eq(0).contains("Unpublished")
 
     })
   })
diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js
index ce5e2bd0c2..df617e3d9f 100644
--- a/packages/builder/cypress/integration/createApp.spec.js
+++ b/packages/builder/cypress/integration/createApp.spec.js
@@ -30,7 +30,7 @@ filterTests(['smoke', 'all'], () => {
         .its("body")
         .then(val => {
           if (val.length > 0) {
-            cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Templates").click({force: true})
+            cy.get(interact.SPECTRUM_BUTTON).contains("Templates").click({force: true})
           }
         })
 
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index 5a45b8620b..22ab13a48b 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -50,3 +50,11 @@ export const ITEM_DISABLED = ".item.disabled"
 export const CONFIRM_WRAP_SPE_BUTTON = ".confirm-wrap .spectrum-Button"
 export const DATA_SOURCE_ENTRY = ".data-source-entry"
 export const NAV_ITEMS_CONTAINER = ".nav-items-container"
+
+//publishWorkFlow
+export const DEPLOY_APP_MODAL = ".spectrum-Modal [data-cy=deploy-app-modal]"
+export const DEPLOY_APP_URL_INPUT = "[data-cy=deployed-app-url] input"
+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"

From c4a7598c9a81e36f24c557e89d310c8145ac3a22 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Jun 2022 08:57:05 +0000
Subject: [PATCH 23/36] v1.0.192-alpha.0

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 806b5a6cab..9ede449567 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 589c676fb5..4cd391705d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index bff9ae4f0f..15cc1e81ad 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "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.191",
+    "@budibase/string-templates": "^1.0.192-alpha.0",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 8df9541552..2e53e1ed95 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.191",
-    "@budibase/client": "^1.0.191",
-    "@budibase/frontend-core": "^1.0.191",
-    "@budibase/string-templates": "^1.0.191",
+    "@budibase/bbui": "^1.0.192-alpha.0",
+    "@budibase/client": "^1.0.192-alpha.0",
+    "@budibase/frontend-core": "^1.0.192-alpha.0",
+    "@budibase/string-templates": "^1.0.192-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 802c3025c5..14a8570cdd 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index de9a2aaa21..9053761ba5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "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.191",
-    "@budibase/frontend-core": "^1.0.191",
-    "@budibase/string-templates": "^1.0.191",
+    "@budibase/bbui": "^1.0.192-alpha.0",
+    "@budibase/frontend-core": "^1.0.192-alpha.0",
+    "@budibase/string-templates": "^1.0.192-alpha.0",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 74fc1c9baa..977ef56096 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "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.191",
+    "@budibase/bbui": "^1.0.192-alpha.0",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 9bdb36d043..cf91b623fd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.191",
-    "@budibase/client": "^1.0.191",
+    "@budibase/backend-core": "^1.0.192-alpha.0",
+    "@budibase/client": "^1.0.192-alpha.0",
     "@budibase/pro": "1.0.191",
-    "@budibase/string-templates": "^1.0.191",
+    "@budibase/string-templates": "^1.0.192-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 80b565a6e8..4117fa2f39 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d63d7cbe09..6bd12763ec 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.191",
+  "version": "1.0.192-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.191",
+    "@budibase/backend-core": "^1.0.192-alpha.0",
     "@budibase/pro": "1.0.191",
-    "@budibase/string-templates": "^1.0.191",
+    "@budibase/string-templates": "^1.0.192-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 6b892934ac6887e4bd27e0302877f212c89f2eff Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Jun 2022 08:58:28 +0000
Subject: [PATCH 24/36] Update pro version to 1.0.192-alpha.0

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

diff --git a/packages/server/package.json b/packages/server/package.json
index cf91b623fd..60dca9dac9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.192-alpha.0",
     "@budibase/client": "^1.0.192-alpha.0",
-    "@budibase/pro": "1.0.191",
+    "@budibase/pro": "1.0.192-alpha.0",
     "@budibase/string-templates": "^1.0.192-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 6bd12763ec..ec1842537a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.192-alpha.0",
-    "@budibase/pro": "1.0.191",
+    "@budibase/pro": "1.0.192-alpha.0",
     "@budibase/string-templates": "^1.0.192-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 5c750164f8e9c8e2a180db365208f1b39887f64f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Jun 2022 09:34:58 +0000
Subject: [PATCH 25/36] v1.0.192-alpha.1

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9ede449567..2c7d20bb53 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 4cd391705d..884fe9b53c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 15cc1e81ad..11a29766b1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-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.0.192-alpha.0",
+    "@budibase/string-templates": "^1.0.192-alpha.1",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2e53e1ed95..9a4ca2ee72 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.192-alpha.0",
-    "@budibase/client": "^1.0.192-alpha.0",
-    "@budibase/frontend-core": "^1.0.192-alpha.0",
-    "@budibase/string-templates": "^1.0.192-alpha.0",
+    "@budibase/bbui": "^1.0.192-alpha.1",
+    "@budibase/client": "^1.0.192-alpha.1",
+    "@budibase/frontend-core": "^1.0.192-alpha.1",
+    "@budibase/string-templates": "^1.0.192-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 14a8570cdd..90f4608841 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 9053761ba5..4ee45345d6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-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.0.192-alpha.0",
-    "@budibase/frontend-core": "^1.0.192-alpha.0",
-    "@budibase/string-templates": "^1.0.192-alpha.0",
+    "@budibase/bbui": "^1.0.192-alpha.1",
+    "@budibase/frontend-core": "^1.0.192-alpha.1",
+    "@budibase/string-templates": "^1.0.192-alpha.1",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 977ef56096..46d8a7784a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-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.0.192-alpha.0",
+    "@budibase/bbui": "^1.0.192-alpha.1",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 60dca9dac9..325aa508ae 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.192-alpha.0",
-    "@budibase/client": "^1.0.192-alpha.0",
+    "@budibase/backend-core": "^1.0.192-alpha.1",
+    "@budibase/client": "^1.0.192-alpha.1",
     "@budibase/pro": "1.0.192-alpha.0",
-    "@budibase/string-templates": "^1.0.192-alpha.0",
+    "@budibase/string-templates": "^1.0.192-alpha.1",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 4117fa2f39..a796953180 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index ec1842537a..72f06cc5c7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.192-alpha.0",
+  "version": "1.0.192-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.192-alpha.0",
+    "@budibase/backend-core": "^1.0.192-alpha.1",
     "@budibase/pro": "1.0.192-alpha.0",
-    "@budibase/string-templates": "^1.0.192-alpha.0",
+    "@budibase/string-templates": "^1.0.192-alpha.1",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 303b0a32e0aa1263dff059a119f3420733c9330a Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 1 Jun 2022 09:36:32 +0000
Subject: [PATCH 26/36] Update pro version to 1.0.192-alpha.1

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 325aa508ae..966262b480 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.192-alpha.1",
     "@budibase/client": "^1.0.192-alpha.1",
-    "@budibase/pro": "1.0.192-alpha.0",
+    "@budibase/pro": "1.0.192-alpha.1",
     "@budibase/string-templates": "^1.0.192-alpha.1",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 72f06cc5c7..5df4464ba7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.192-alpha.1",
-    "@budibase/pro": "1.0.192-alpha.0",
+    "@budibase/pro": "1.0.192-alpha.1",
     "@budibase/string-templates": "^1.0.192-alpha.1",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 95d1af6c856ca6b7b105185789214dd1b243f5c7 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 11:16:17 +0000
Subject: [PATCH 27/36] v1.0.192

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2c7d20bb53..41dbaeb646 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 884fe9b53c..59b018031c 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 11a29766b1..47fae37691 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "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.192-alpha.1",
+    "@budibase/string-templates": "^1.0.192",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9a4ca2ee72..56a08c5895 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.192-alpha.1",
-    "@budibase/client": "^1.0.192-alpha.1",
-    "@budibase/frontend-core": "^1.0.192-alpha.1",
-    "@budibase/string-templates": "^1.0.192-alpha.1",
+    "@budibase/bbui": "^1.0.192",
+    "@budibase/client": "^1.0.192",
+    "@budibase/frontend-core": "^1.0.192",
+    "@budibase/string-templates": "^1.0.192",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 90f4608841..42541f68a1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 4ee45345d6..a54ba7d291 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "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.192-alpha.1",
-    "@budibase/frontend-core": "^1.0.192-alpha.1",
-    "@budibase/string-templates": "^1.0.192-alpha.1",
+    "@budibase/bbui": "^1.0.192",
+    "@budibase/frontend-core": "^1.0.192",
+    "@budibase/string-templates": "^1.0.192",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 46d8a7784a..6ab5eece4c 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "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.192-alpha.1",
+    "@budibase/bbui": "^1.0.192",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 966262b480..45ae69792e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.192-alpha.1",
-    "@budibase/client": "^1.0.192-alpha.1",
+    "@budibase/backend-core": "^1.0.192",
+    "@budibase/client": "^1.0.192",
     "@budibase/pro": "1.0.192-alpha.1",
-    "@budibase/string-templates": "^1.0.192-alpha.1",
+    "@budibase/string-templates": "^1.0.192",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a796953180..98de99db7f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 5df4464ba7..aff177d4fe 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.192-alpha.1",
+  "version": "1.0.192",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.192-alpha.1",
+    "@budibase/backend-core": "^1.0.192",
     "@budibase/pro": "1.0.192-alpha.1",
-    "@budibase/string-templates": "^1.0.192-alpha.1",
+    "@budibase/string-templates": "^1.0.192",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 3a398a6f7cc6472b638599dcb0aa59d65f05622a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 11:17:39 +0000
Subject: [PATCH 28/36] Update pro version to 1.0.192

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

diff --git a/packages/server/package.json b/packages/server/package.json
index 45ae69792e..474c745200 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.192",
     "@budibase/client": "^1.0.192",
-    "@budibase/pro": "1.0.192-alpha.1",
+    "@budibase/pro": "1.0.192",
     "@budibase/string-templates": "^1.0.192",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index aff177d4fe..fe3dc63f9f 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.192",
-    "@budibase/pro": "1.0.192-alpha.1",
+    "@budibase/pro": "1.0.192",
     "@budibase/string-templates": "^1.0.192",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From e578ffe12ea6cda078836628b6e69f41a7048301 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 12:38:18 +0000
Subject: [PATCH 29/36] v1.0.193

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 41dbaeb646..9a56e1aa66 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.192",
+  "version": "1.0.193",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 59b018031c..7a651ffd69 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 47fae37691..c20519a7bf 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "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.192",
+    "@budibase/string-templates": "^1.0.193",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 56a08c5895..f42192726c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.192",
-    "@budibase/client": "^1.0.192",
-    "@budibase/frontend-core": "^1.0.192",
-    "@budibase/string-templates": "^1.0.192",
+    "@budibase/bbui": "^1.0.193",
+    "@budibase/client": "^1.0.193",
+    "@budibase/frontend-core": "^1.0.193",
+    "@budibase/string-templates": "^1.0.193",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 42541f68a1..46a12559d9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index a54ba7d291..a72cb937ec 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "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.192",
-    "@budibase/frontend-core": "^1.0.192",
-    "@budibase/string-templates": "^1.0.192",
+    "@budibase/bbui": "^1.0.193",
+    "@budibase/frontend-core": "^1.0.193",
+    "@budibase/string-templates": "^1.0.193",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 6ab5eece4c..e3f1d298f6 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "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.192",
+    "@budibase/bbui": "^1.0.193",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 474c745200..e94d7fa427 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.192",
-    "@budibase/client": "^1.0.192",
+    "@budibase/backend-core": "^1.0.193",
+    "@budibase/client": "^1.0.193",
     "@budibase/pro": "1.0.192",
-    "@budibase/string-templates": "^1.0.192",
+    "@budibase/string-templates": "^1.0.193",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 98de99db7f..562653f1f5 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fe3dc63f9f..d28af126f9 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.192",
+  "version": "1.0.193",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.192",
+    "@budibase/backend-core": "^1.0.193",
     "@budibase/pro": "1.0.192",
-    "@budibase/string-templates": "^1.0.192",
+    "@budibase/string-templates": "^1.0.193",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 273f15421de4621b99d6ee2ef1d98e44640bfbd3 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 12:39:37 +0000
Subject: [PATCH 30/36] Update pro version to 1.0.193

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

diff --git a/packages/server/package.json b/packages/server/package.json
index e94d7fa427..c974d542ca 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.193",
     "@budibase/client": "^1.0.193",
-    "@budibase/pro": "1.0.192",
+    "@budibase/pro": "1.0.193",
     "@budibase/string-templates": "^1.0.193",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d28af126f9..1aabad6191 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.193",
-    "@budibase/pro": "1.0.192",
+    "@budibase/pro": "1.0.193",
     "@budibase/string-templates": "^1.0.193",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 35b007d13c87f6129e4653ab267d3416b9314dc6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Wed, 1 Jun 2022 15:20:56 +0100
Subject: [PATCH 31/36] fix users list on app overview

---
 packages/worker/src/api/routes/global/users.js   |  3 ++-
 packages/worker/src/middleware/builderOrAdmin.js | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 packages/worker/src/middleware/builderOrAdmin.js

diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js
index 5d28d18eb7..d9791362f4 100644
--- a/packages/worker/src/api/routes/global/users.js
+++ b/packages/worker/src/api/routes/global/users.js
@@ -6,6 +6,7 @@ const Joi = require("joi")
 const cloudRestricted = require("../../../middleware/cloudRestricted")
 const { buildUserSaveValidation } = require("../../utilities/validation")
 const selfController = require("../../controllers/global/self")
+const builderOrAdmin = require("../../../middleware/builderOrAdmin")
 
 const router = Router()
 
@@ -44,7 +45,7 @@ router
     buildUserSaveValidation(),
     controller.save
   )
-  .get("/api/global/users", adminOnly, controller.fetch)
+  .get("/api/global/users", builderOrAdmin, controller.fetch)
   .delete("/api/global/users/:id", adminOnly, controller.destroy)
   .get("/api/global/roles/:appId")
   .post(
diff --git a/packages/worker/src/middleware/builderOrAdmin.js b/packages/worker/src/middleware/builderOrAdmin.js
new file mode 100644
index 0000000000..6440766298
--- /dev/null
+++ b/packages/worker/src/middleware/builderOrAdmin.js
@@ -0,0 +1,10 @@
+module.exports = async (ctx, next) => {
+  if (
+    !ctx.internal &&
+    (!ctx.user || !ctx.user.builder || !ctx.user.builder.global) &&
+    (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)
+  ) {
+    ctx.throw(403, "Builder user only endpoint.")
+  }
+  return next()
+}

From 594e16cb4f19e2473dd728f2f2460400ba666b07 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 14:49:52 +0000
Subject: [PATCH 32/36] v1.0.194

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 9a56e1aa66..5aa055cbf8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.193",
+  "version": "1.0.194",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 7a651ffd69..b3256e376f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index c20519a7bf..40f47eb603 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "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.193",
+    "@budibase/string-templates": "^1.0.194",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f42192726c..0b5f8bfdc7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.193",
-    "@budibase/client": "^1.0.193",
-    "@budibase/frontend-core": "^1.0.193",
-    "@budibase/string-templates": "^1.0.193",
+    "@budibase/bbui": "^1.0.194",
+    "@budibase/client": "^1.0.194",
+    "@budibase/frontend-core": "^1.0.194",
+    "@budibase/string-templates": "^1.0.194",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 46a12559d9..be38832927 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index a72cb937ec..860711380f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "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.193",
-    "@budibase/frontend-core": "^1.0.193",
-    "@budibase/string-templates": "^1.0.193",
+    "@budibase/bbui": "^1.0.194",
+    "@budibase/frontend-core": "^1.0.194",
+    "@budibase/string-templates": "^1.0.194",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index e3f1d298f6..d8f8963732 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "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.193",
+    "@budibase/bbui": "^1.0.194",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index c974d542ca..f5585e3de7 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.193",
-    "@budibase/client": "^1.0.193",
+    "@budibase/backend-core": "^1.0.194",
+    "@budibase/client": "^1.0.194",
     "@budibase/pro": "1.0.193",
-    "@budibase/string-templates": "^1.0.193",
+    "@budibase/string-templates": "^1.0.194",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 562653f1f5..855c1c6600 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1aabad6191..66b2736df7 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.193",
+  "version": "1.0.194",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.193",
+    "@budibase/backend-core": "^1.0.194",
     "@budibase/pro": "1.0.193",
-    "@budibase/string-templates": "^1.0.193",
+    "@budibase/string-templates": "^1.0.194",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 5ebf471c28034cb0bf5d91941435975aced2995f Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 1 Jun 2022 14:51:28 +0000
Subject: [PATCH 33/36] Update pro version to 1.0.194

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

diff --git a/packages/server/package.json b/packages/server/package.json
index f5585e3de7..311e90aea9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.194",
     "@budibase/client": "^1.0.194",
-    "@budibase/pro": "1.0.193",
+    "@budibase/pro": "1.0.194",
     "@budibase/string-templates": "^1.0.194",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 66b2736df7..03f28ff6ce 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.194",
-    "@budibase/pro": "1.0.193",
+    "@budibase/pro": "1.0.194",
     "@budibase/string-templates": "^1.0.194",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",

From 493607b85330b30e9e5711bed609f587038d0eab Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Sun, 5 Jun 2022 16:43:04 +0100
Subject: [PATCH 34/36] update google sheets strategy to use the standard
 passport strategy

---
 .../middleware/passport/datasource/google.js  | 22 +++++++++--------
 .../src/middleware/passport/google.js         |  4 ++--
 .../PlusConfigForm.svelte                     |  6 ++++-
 .../server/src/integrations/googlesheets.ts   |  8 +++++--
 packages/server/yarn.lock                     | 24 ++++++++++++-------
 packages/worker/yarn.lock                     | 24 ++++++++++++-------
 6 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/packages/backend-core/src/middleware/passport/datasource/google.js b/packages/backend-core/src/middleware/passport/datasource/google.js
index 53719b8350..8f2022c2d7 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.js
+++ b/packages/backend-core/src/middleware/passport/datasource/google.js
@@ -1,4 +1,5 @@
 const google = require("../google")
+const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 const { Cookies, Configs } = require("../../../constants")
 const { clearCookie, getCookie } = require("../../../utils")
 const { getScopedConfig, getPlatformUrl } = require("../../../db/utils")
@@ -46,19 +47,20 @@ async function postAuth(passport, ctx, next) {
   const platformUrl = await getPlatformUrl({ tenantAware: false })
 
   let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`
-  const strategy = await google.strategyFactory(
-    config,
-    callbackUrl,
-    (accessToken, refreshToken, profile, done) => {
-      clearCookie(ctx, Cookies.DatasourceAuth)
-      done(null, { refreshToken })
-    }
-  )
-
   const authStateCookie = getCookie(ctx, Cookies.DatasourceAuth)
 
   return passport.authenticate(
-    strategy,
+    new GoogleStrategy(
+      {
+        clientID: config.clientID,
+        clientSecret: config.clientSecret,
+        callbackURL: callbackUrl,
+      },
+      (accessToken, refreshToken, profile, done) => {
+        clearCookie(ctx, Cookies.DatasourceAuth)
+        done(null, { accessToken, refreshToken })
+      }
+    ),
     { successRedirect: "/", failureRedirect: "/error" },
     async (err, tokens) => {
       // update the DB for the datasource with all the user info
diff --git a/packages/backend-core/src/middleware/passport/google.js b/packages/backend-core/src/middleware/passport/google.js
index b12a668327..858029ca80 100644
--- a/packages/backend-core/src/middleware/passport/google.js
+++ b/packages/backend-core/src/middleware/passport/google.js
@@ -11,8 +11,8 @@ const buildVerifyFn = saveUserFn => {
       profile: profile,
       email: profile._json.email,
       oauth2: {
-        accessToken: accessToken,
-        refreshToken: refreshToken,
+        accessToken,
+        refreshToken,
       },
     }
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
index c94e750c29..cd19523476 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@@ -91,7 +91,11 @@
       notifications.success(`Datasource ${name} tables updated successfully.`)
       await tables.fetch()
     } catch (error) {
-      notifications.error("Error updating datasource schema")
+      notifications.error(
+        `Error updating datasource schema ${
+          error?.message ? `: ${error.message}` : ""
+        }`
+      )
     }
   }
 
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index e6d79bfdde..7b17b7246d 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -164,11 +164,15 @@ module GoogleSheetsModule {
         }
       )
 
+      const json = await response.json()
+
       if (response.status !== 200) {
-        throw new Error("Error authenticating with google sheets.")
+        throw new Error(
+          `Error authenticating with google sheets. ${json.error_description}`
+        )
       }
 
-      return response.json()
+      return json
     }
 
     async connect() {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0c2e0d8733..c8dad37383 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1014,14 +1014,15 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.187":
-  version "1.0.187"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.187.tgz#bf2d6de627185e5388d567762491334bc1d2d546"
-  integrity sha512-C9FqOf+/SNNWk7bZU7PfnzDvXM5ntnZFgpX1bI/bfHH3xYGw6jOFB2BpoTaV2sQGq14wfmo9e9vNHqYIT9tPrg==
+"@budibase/backend-core@1.0.194":
+  version "1.0.194"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.194.tgz#08b2b1aec3c88efbc7cfb14145ce6f199475c538"
+  integrity sha512-BbnJFtAioJeD9tQfSwc2uftFK8SagREgSfUYv06dfnf/NsmkrONzZiTon1oA57S7ifcSiu+WZf87lNX0k8pwfQ==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
     bcrypt "^5.0.1"
+    dotenv "^16.0.1"
     emitter-listener "^1.1.2"
     ioredis "^4.27.1"
     jsonwebtoken "^8.5.1"
@@ -1091,12 +1092,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.187":
-  version "1.0.187"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.187.tgz#40ed5e9809f924e5d0c7bbb7d09a602ea47dfe92"
-  integrity sha512-whEcWAcgkIL4EHgh08jp8itR37LZYlZxFLl0GYY5AOIguEScJ1FRe9WcYFNW0Pw768uaq7IE7hKkrAzWetzu4g==
+"@budibase/pro@1.0.194":
+  version "1.0.194"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.194.tgz#fbf977b292b9a6dbf7b072b2e0379dcf4379943a"
+  integrity sha512-LSqVwlhKWwFNnC3acvLnCzbeBoze1Ma6GELE/b5ZxS65owsigu0KC6T/UuujEbU9xqbFJ3R6uV+4Fz4NUibLIw==
   dependencies:
-    "@budibase/backend-core" "1.0.187"
+    "@budibase/backend-core" "1.0.194"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":
@@ -5046,6 +5047,11 @@ dotenv@8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
+dotenv@^16.0.1:
+  version "16.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
+  integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 679b7093af..a5f5b6b95a 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -293,14 +293,15 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.187":
-  version "1.0.187"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.187.tgz#bf2d6de627185e5388d567762491334bc1d2d546"
-  integrity sha512-C9FqOf+/SNNWk7bZU7PfnzDvXM5ntnZFgpX1bI/bfHH3xYGw6jOFB2BpoTaV2sQGq14wfmo9e9vNHqYIT9tPrg==
+"@budibase/backend-core@1.0.194":
+  version "1.0.194"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.194.tgz#08b2b1aec3c88efbc7cfb14145ce6f199475c538"
+  integrity sha512-BbnJFtAioJeD9tQfSwc2uftFK8SagREgSfUYv06dfnf/NsmkrONzZiTon1oA57S7ifcSiu+WZf87lNX0k8pwfQ==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
     bcrypt "^5.0.1"
+    dotenv "^16.0.1"
     emitter-listener "^1.1.2"
     ioredis "^4.27.1"
     jsonwebtoken "^8.5.1"
@@ -321,12 +322,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.187":
-  version "1.0.187"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.187.tgz#40ed5e9809f924e5d0c7bbb7d09a602ea47dfe92"
-  integrity sha512-whEcWAcgkIL4EHgh08jp8itR37LZYlZxFLl0GYY5AOIguEScJ1FRe9WcYFNW0Pw768uaq7IE7hKkrAzWetzu4g==
+"@budibase/pro@1.0.194":
+  version "1.0.194"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.194.tgz#fbf977b292b9a6dbf7b072b2e0379dcf4379943a"
+  integrity sha512-LSqVwlhKWwFNnC3acvLnCzbeBoze1Ma6GELE/b5ZxS65owsigu0KC6T/UuujEbU9xqbFJ3R6uV+4Fz4NUibLIw==
   dependencies:
-    "@budibase/backend-core" "1.0.187"
+    "@budibase/backend-core" "1.0.194"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":
@@ -2258,6 +2259,11 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv@^16.0.1:
+  version "16.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
+  integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"

From 635042233847368d0622251f059055ac558c967a Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Sun, 5 Jun 2022 15:55:19 +0000
Subject: [PATCH 35/36] v1.0.195

---
 lerna.json                             |  2 +-
 packages/backend-core/package.json     |  2 +-
 packages/bbui/package.json             |  4 ++--
 packages/builder/package.json          | 10 +++++-----
 packages/cli/package.json              |  2 +-
 packages/client/package.json           |  8 ++++----
 packages/frontend-core/package.json    |  4 ++--
 packages/server/package.json           |  8 ++++----
 packages/string-templates/package.json |  2 +-
 packages/worker/package.json           |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 5aa055cbf8..e0e118f679 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.194",
+  "version": "1.0.195",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index b3256e376f..995da8d79b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 40f47eb603..42bd804a6c 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "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.194",
+    "@budibase/string-templates": "^1.0.195",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 0b5f8bfdc7..8f2792eb72 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.194",
-    "@budibase/client": "^1.0.194",
-    "@budibase/frontend-core": "^1.0.194",
-    "@budibase/string-templates": "^1.0.194",
+    "@budibase/bbui": "^1.0.195",
+    "@budibase/client": "^1.0.195",
+    "@budibase/frontend-core": "^1.0.195",
+    "@budibase/string-templates": "^1.0.195",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index be38832927..9b9acde1cb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 860711380f..aecbcff644 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "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.194",
-    "@budibase/frontend-core": "^1.0.194",
-    "@budibase/string-templates": "^1.0.194",
+    "@budibase/bbui": "^1.0.195",
+    "@budibase/frontend-core": "^1.0.195",
+    "@budibase/string-templates": "^1.0.195",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index d8f8963732..45306bf0ca 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "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.194",
+    "@budibase/bbui": "^1.0.195",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 311e90aea9..d6a581b295 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.194",
-    "@budibase/client": "^1.0.194",
+    "@budibase/backend-core": "^1.0.195",
+    "@budibase/client": "^1.0.195",
     "@budibase/pro": "1.0.194",
-    "@budibase/string-templates": "^1.0.194",
+    "@budibase/string-templates": "^1.0.195",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 855c1c6600..27c897d91a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 03f28ff6ce..9bdabc34ea 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.194",
+  "version": "1.0.195",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -32,9 +32,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.194",
+    "@budibase/backend-core": "^1.0.195",
     "@budibase/pro": "1.0.194",
-    "@budibase/string-templates": "^1.0.194",
+    "@budibase/string-templates": "^1.0.195",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

From 067ad97474b316fed9a50ddba6f7972b0c34f45c Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Sun, 5 Jun 2022 15:56:52 +0000
Subject: [PATCH 36/36] Update pro version to 1.0.195

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

diff --git a/packages/server/package.json b/packages/server/package.json
index d6a581b295..4d9e13f3af 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,7 @@
     "@apidevtools/swagger-parser": "^10.0.3",
     "@budibase/backend-core": "^1.0.195",
     "@budibase/client": "^1.0.195",
-    "@budibase/pro": "1.0.194",
+    "@budibase/pro": "1.0.195",
     "@budibase/string-templates": "^1.0.195",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 9bdabc34ea..77f296dc02 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -33,7 +33,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@budibase/backend-core": "^1.0.195",
-    "@budibase/pro": "1.0.194",
+    "@budibase/pro": "1.0.195",
     "@budibase/string-templates": "^1.0.195",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",