From 3a7a964ac80acb4b78ef73877bebefaf0361e4d1 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 28 Mar 2022 12:03:44 +0100
Subject: [PATCH 1/8] fix launch.json

---
 .vscode/launch.json                           | 11 +++++-
 .../middleware/passport/datasource/google.js  | 37 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 34951b6310..8cb49d5825 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -22,9 +22,16 @@
             "name": "Budibase Worker",
             "type": "node",
             "request": "launch",
-            "program": "${workspaceFolder}/packages/worker/src/index.js",
+            "runtimeArgs": [
+                "--nolazy",
+                "-r",
+                "ts-node/register/transpile-only"
+            ],
+            "args": [
+                "${workspaceFolder}/packages/worker/src/index.ts"
+            ],
             "cwd": "${workspaceFolder}/packages/worker"
-        }
+        },
     ],
     "compounds": [
         {
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.js b/packages/backend-core/src/middleware/passport/datasource/google.js
index c7553cee50..62d626a30c 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.js
+++ b/packages/backend-core/src/middleware/passport/datasource/google.js
@@ -1,15 +1,37 @@
 const google = require("../google")
-const { Cookies } = require("../../../constants")
+const { Cookies, Configs } = require("../../../constants")
 const { clearCookie, getCookie } = require("../../../utils")
 const { getDB } = require("../../../db")
+const { getScopedConfig } = require("../../../db/utils")
 const environment = require("../../../environment")
+const { getGlobalDB } = require("../../../tenancy")
+
+async function fetchGoogleCreds() {
+  let config
+
+  // try and get the config from the tenant
+  const db = getGlobalDB()
+  const googleConfig = await getScopedConfig(db, {
+    type: Configs.GOOGLE,
+  })
+  if (googleConfig.clientID && googleConfig.clientSecret) {
+    config = googleConfig
+  }
+
+  // fall back to env variables
+  if (!config) {
+    config = {
+      clientID: environment.GOOGLE_CLIENT_ID,
+      clientSecret: environment.GOOGLE_CLIENT_SECRET,
+    }
+  }
+
+  return googleConfig
+}
 
 async function preAuth(passport, ctx, next) {
   // get the relevant config
-  const googleConfig = {
-    clientID: environment.GOOGLE_CLIENT_ID,
-    clientSecret: environment.GOOGLE_CLIENT_SECRET,
-  }
+  const googleConfig = await fetchGoogleCreds()
   let callbackUrl = `${environment.PLATFORM_URL}/api/global/auth/datasource/google/callback`
   const strategy = await google.strategyFactory(googleConfig, callbackUrl)
 
@@ -26,10 +48,7 @@ async function preAuth(passport, ctx, next) {
 
 async function postAuth(passport, ctx, next) {
   // get the relevant config
-  const config = {
-    clientID: environment.GOOGLE_CLIENT_ID,
-    clientSecret: environment.GOOGLE_CLIENT_SECRET,
-  }
+  const config = await fetchGoogleCreds()
 
   let callbackUrl = `${environment.PLATFORM_URL}/api/global/auth/datasource/google/callback`
   const strategy = await google.strategyFactory(

From e109f06fb4ed04feb2b077e06f475d902fb7bd21 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 28 Mar 2022 16:26:37 +0100
Subject: [PATCH 2/8] Fix automation section crashing when a table has been
 deleted and is in use

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index a94a78286c..3d857ec9fb 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -162,7 +162,7 @@
         <Select
           on:change={e => onChange(e, key)}
           value={inputData[key]}
-          options={Object.keys(table.schema)}
+          options={Object.keys(table?.schema || {})}
         />
       {:else if value.customType === "filters"}
         <ActionButton on:click={drawer.show}>Define filters</ActionButton>

From ee6a16827a5accb3a21fb4565168ca9cb7cb7da7 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 28 Mar 2022 16:44:33 +0100
Subject: [PATCH 3/8] fixing google sheets bug, respect google configuration
 hierarchy

---
 .../templates/app-service-deployment.yaml      |  4 ++++
 .../middleware/passport/datasource/google.js   | 18 +++++-------------
 .../src/middleware/passport/google.js          |  5 ++++-
 .../TableIntegrationMenu/PlusConfigForm.svelte |  6 ++++++
 .../server/src/api/controllers/integration.js  | 18 +++++++++++++++++-
 packages/server/src/environment.js             |  2 ++
 .../server/src/integrations/googlesheets.ts    | 17 ++++++++++++++++-
 packages/server/src/integrations/index.ts      |  8 ++++----
 8 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index d9def8c641..86e255d331 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -110,6 +110,10 @@ spec:
           value: {{ .Values.globals.cookieDomain | quote }}
         - name: HTTP_MIGRATIONS
           value: {{ .Values.globals.httpMigrations | quote }}
+        - name: GOOGLE_CLIENT_ID
+          value: {{ .Values.globals.google.clientId | quote }}
+        - name: GOOGLE_CLIENT_SECRET
+          value: {{ .Values.globals.google.secret | quote }}
         image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         name: bbapps
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.js b/packages/backend-core/src/middleware/passport/datasource/google.js
index 62d626a30c..5046815b1f 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.js
+++ b/packages/backend-core/src/middleware/passport/datasource/google.js
@@ -7,26 +7,18 @@ const environment = require("../../../environment")
 const { getGlobalDB } = require("../../../tenancy")
 
 async function fetchGoogleCreds() {
-  let config
-
   // try and get the config from the tenant
   const db = getGlobalDB()
   const googleConfig = await getScopedConfig(db, {
     type: Configs.GOOGLE,
   })
-  if (googleConfig.clientID && googleConfig.clientSecret) {
-    config = googleConfig
+  // or fall back to env variables
+  const config = googleConfig || {
+    clientID: environment.GOOGLE_CLIENT_ID,
+    clientSecret: environment.GOOGLE_CLIENT_SECRET,
   }
 
-  // fall back to env variables
-  if (!config) {
-    config = {
-      clientID: environment.GOOGLE_CLIENT_ID,
-      clientSecret: environment.GOOGLE_CLIENT_SECRET,
-    }
-  }
-
-  return googleConfig
+  return config
 }
 
 async function preAuth(passport, ctx, next) {
diff --git a/packages/backend-core/src/middleware/passport/google.js b/packages/backend-core/src/middleware/passport/google.js
index cb93844c31..8fd0961ea1 100644
--- a/packages/backend-core/src/middleware/passport/google.js
+++ b/packages/backend-core/src/middleware/passport/google.js
@@ -51,7 +51,10 @@ exports.strategyFactory = async function (
     )
   } catch (err) {
     console.error(err)
-    throw new Error("Error constructing google authentication strategy", err)
+    throw new Error(
+      `Error constructing google authentication strategy: ${err}`,
+      err
+    )
   }
 }
 // expose for testing
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
index c94e750c29..66d7d43841 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@@ -15,6 +15,7 @@
   import ArrayRenderer from "components/common/renderers/ArrayRenderer.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { goto } from "@roxi/routify"
+  import GoogleButton from "../_components/GoogleButton.svelte"
 
   export let datasource
   export let save
@@ -160,6 +161,11 @@
       Fetch tables
     </Button>
     <Button cta icon="Add" on:click={createNewTable}>New table</Button>
+    {#if integration.auth}
+      {#if integration.auth.type === "google"}
+        <GoogleButton {datasource} />
+      {/if}
+    {/if}
   </div>
 </div>
 <Body>
diff --git a/packages/server/src/api/controllers/integration.js b/packages/server/src/api/controllers/integration.js
index 75fd9ce80e..f3f3309c02 100644
--- a/packages/server/src/api/controllers/integration.js
+++ b/packages/server/src/api/controllers/integration.js
@@ -1,8 +1,24 @@
+const { cloneDeep } = require("lodash")
 const { definitions } = require("../../integrations")
+const { getTenantId } = require("@budibase/backend-core/tenancy")
+const { SourceNames } = require("../../definitions/datasource")
+const googlesheets = require("../../integrations/googlesheets")
+const env = require("../../environment")
 
 exports.fetch = async function (ctx) {
   ctx.status = 200
-  ctx.body = definitions
+  const defs = cloneDeep(definitions)
+
+  // for google sheets integration google verification
+  if (env.EXCLUDE_QUOTAS_TENANTS) {
+    const excludedTenants = env.EXCLUDE_QUOTAS_TENANTS.split(",")
+    const tenantId = getTenantId()
+    if (excludedTenants.includes(tenantId)) {
+      defs[SourceNames.GOOGLE_SHEETS] = googlesheets.schema
+    }
+  }
+
+  ctx.body = defs
 }
 
 exports.find = async function (ctx) {
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 212a54b87c..bdbbbde79f 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -46,6 +46,8 @@ module.exports = {
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
+  GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
+  GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
   // environment
   NODE_ENV: process.env.NODE_ENV,
   JEST_WORKER_ID: process.env.JEST_WORKER_ID,
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index bb2de26f5d..c58fdea551 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -10,6 +10,7 @@ import { Table, TableSchema } from "../definitions/common"
 import { buildExternalTableId } from "./utils"
 import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
+import env from "../environment"
 
 module GoogleSheetsModule {
   const { getGlobalDB } = require("@budibase/backend-core/tenancy")
@@ -138,13 +139,27 @@ module GoogleSheetsModule {
       try {
         // Initialise oAuth client
         const db = getGlobalDB()
-        const googleConfig = await getScopedConfig(db, {
+        let googleConfig = await getScopedConfig(db, {
           type: Configs.GOOGLE,
         })
+
+        if (!googleConfig) {
+          googleConfig = {
+            clientID: env.GOOGLE_CLIENT_ID,
+            clientSecret: env.GOOGLE_CLIENT_SECRET,
+          }
+        }
+
         const oauthClient = new OAuth2Client({
           clientId: googleConfig.clientID,
           clientSecret: googleConfig.clientSecret,
         })
+        oauthClient.on("tokens", tokens => {
+          oauthClient.setCredentials({
+            refresh_token: googleConfig.refreshToken,
+            access_token: tokens.access_token,
+          })
+        })
         oauthClient.credentials.access_token = this.config.auth.accessToken
         oauthClient.credentials.refresh_token = this.config.auth.refreshToken
         this.client.useOAuth2Client(oauthClient)
diff --git a/packages/server/src/integrations/index.ts b/packages/server/src/integrations/index.ts
index 07f3211fcb..3f5471d332 100644
--- a/packages/server/src/integrations/index.ts
+++ b/packages/server/src/integrations/index.ts
@@ -42,6 +42,7 @@ const INTEGRATIONS = {
   [SourceNames.ARANGODB]: arangodb.integration,
   [SourceNames.REST]: rest.integration,
   [SourceNames.FIREBASE]: firebase.integration,
+  [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
 }
 
 // optionally add oracle integration if the oracle binary can be installed
@@ -51,10 +52,9 @@ if (!(process.arch === "arm64" && process.platform === "darwin")) {
   INTEGRATIONS[SourceNames.ORACLE] = oracle.integration
 }
 
-if (environment.SELF_HOSTED) {
-  DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema
-  INTEGRATIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.integration
-}
+// if (environment.SELF_HOSTED) {
+//   DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema
+// }
 
 module.exports = {
   definitions: DEFINITIONS,

From 04b17fb634bdc5bae7eb629c3cc7753010f99d12 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 28 Mar 2022 16:46:05 +0100
Subject: [PATCH 4/8] re-add gsheets to self host

---
 packages/server/src/integrations/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/integrations/index.ts b/packages/server/src/integrations/index.ts
index 3f5471d332..0a892d7317 100644
--- a/packages/server/src/integrations/index.ts
+++ b/packages/server/src/integrations/index.ts
@@ -52,9 +52,9 @@ if (!(process.arch === "arm64" && process.platform === "darwin")) {
   INTEGRATIONS[SourceNames.ORACLE] = oracle.integration
 }
 
-// if (environment.SELF_HOSTED) {
-//   DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema
-// }
+if (environment.SELF_HOSTED) {
+  DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema
+}
 
 module.exports = {
   definitions: DEFINITIONS,

From f3cc6aa28454ba2ad4c8d21a3b44aff1a255ba30 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 28 Mar 2022 16:56:42 +0100
Subject: [PATCH 5/8] Fix design of automation SchemaSetup

---
 .../automation/SetupPanel/SchemaSetup.svelte  | 53 ++-----------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index 730de6270a..71b10a3569 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Input, Select } from "@budibase/bbui"
+  import { Input, Select, Button } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
 
   const dispatch = createEventDispatcher()
@@ -62,9 +62,6 @@
 </script>
 
 <div class="root">
-  <div class="add-field">
-    <i class="ri-add-line" on:click={addField} />
-  </div>
   <div class="spacer" />
   {#each fieldsArray as field}
     <div class="field">
@@ -88,6 +85,7 @@
       />
     </div>
   {/each}
+  <Button quiet secondary icon="Add" on:click={addField}>Add field</Button>
 </div>
 
 <style>
@@ -103,52 +101,11 @@
 
   .field {
     max-width: 100%;
-    background-color: var(--grey-2);
     margin-bottom: var(--spacing-m);
-    border-style: solid;
-    border-width: 1px;
-    border-color: var(--grey-4);
     display: grid;
-    /*grid-template-rows: auto auto;
-    grid-template-columns: auto;*/
+    grid-template-columns: 1fr 1fr auto;
     position: relative;
-  }
-
-  .field :global(select) {
-    padding: var(--spacing-xs) 2rem var(--spacing-m) var(--spacing-s) !important;
-    font-size: var(--font-size-xs);
-    color: var(--grey-7);
-  }
-
-  .field :global(.pointer) {
-    padding-bottom: var(--spacing-m) !important;
-    color: var(--grey-2);
-  }
-
-  .field :global(input) {
-    padding: var(--spacing-m) var(--spacing-xl) var(--spacing-xs)
-      var(--spacing-m);
-    font-size: var(--font-size-s);
-    font-weight: bold;
-  }
-
-  .remove-field {
-    cursor: pointer;
-    color: var(--grey-6);
-    position: absolute;
-    top: var(--spacing-m);
-    right: 3px;
-  }
-
-  .remove-field:hover {
-    color: var(--black);
-  }
-
-  .add-field {
-    text-align: right;
-  }
-
-  .add-field > i {
-    cursor: pointer;
+    align-items: center;
+    gap: var(--spacing-m);
   }
 </style>

From b4574e42e8cbd1c519bb41828e79f33953e03e4a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 28 Mar 2022 19:10:48 +0100
Subject: [PATCH 6/8] Fix spaces not being allowed in formula columns

---
 .../src/components/common/bindings/ServerBindingPanel.svelte  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
index 5440ba0b18..213e5bbf1d 100644
--- a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
@@ -12,8 +12,8 @@
   const enrichBindings = bindings => {
     return bindings?.map(binding => ({
       ...binding,
-      readableBinding: binding.label || binding.readableBinding,
-      runtimeBinding: binding.path || binding.runtimeBinding,
+      readableBinding: binding.readableBinding || binding.label,
+      runtimeBinding: binding.runtimeBinding || binding.path,
     }))
   }
 </script>

From 4b97a9a1fbb4720bcf62e82dc628af0e5a995dda Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 29 Mar 2022 06:59:36 +0000
Subject: [PATCH 7/8] v1.0.98-alpha.3

---
 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 de7de252e3..860671b5fa 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index dcdd433e7b..07fe67709e 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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 52ce12f6c4..32e1e442f8 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.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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.98-alpha.2",
+    "@budibase/string-templates": "^1.0.98-alpha.3",
     "@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 c0b649a959..54b862e5ff 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.98-alpha.2",
-    "@budibase/client": "^1.0.98-alpha.2",
-    "@budibase/frontend-core": "^1.0.98-alpha.2",
-    "@budibase/string-templates": "^1.0.98-alpha.2",
+    "@budibase/bbui": "^1.0.98-alpha.3",
+    "@budibase/client": "^1.0.98-alpha.3",
+    "@budibase/frontend-core": "^1.0.98-alpha.3",
+    "@budibase/string-templates": "^1.0.98-alpha.3",
     "@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 d9aec51ef4..b2e2545667 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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 c7411e2668..db4a33132d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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.98-alpha.2",
-    "@budibase/frontend-core": "^1.0.98-alpha.2",
-    "@budibase/string-templates": "^1.0.98-alpha.2",
+    "@budibase/bbui": "^1.0.98-alpha.3",
+    "@budibase/frontend-core": "^1.0.98-alpha.3",
+    "@budibase/string-templates": "^1.0.98-alpha.3",
     "@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 6d2e354e45..80b8273ec4 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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.98-alpha.2",
+    "@budibase/bbui": "^1.0.98-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 0fe12ca874..4790758316 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.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.98-alpha.2",
-    "@budibase/client": "^1.0.98-alpha.2",
-    "@budibase/string-templates": "^1.0.98-alpha.2",
+    "@budibase/backend-core": "^1.0.98-alpha.3",
+    "@budibase/client": "^1.0.98-alpha.3",
+    "@budibase/string-templates": "^1.0.98-alpha.3",
     "@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 3d4e79b54e..06c7761d2c 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "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 c3ef2232c9..4b8db56782 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.98-alpha.2",
+  "version": "1.0.98-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.98-alpha.2",
-    "@budibase/string-templates": "^1.0.98-alpha.2",
+    "@budibase/backend-core": "^1.0.98-alpha.3",
+    "@budibase/string-templates": "^1.0.98-alpha.3",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From a7ad4837b2dfdb27814978846e2b5dfc33b3c328 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 29 Mar 2022 07:24:22 +0000
Subject: [PATCH 8/8] v1.0.98-alpha.4

---
 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 860671b5fa..a174900514 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 07fe67709e..bc386809da 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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 32e1e442f8..9e4d725df1 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.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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.98-alpha.3",
+    "@budibase/string-templates": "^1.0.98-alpha.4",
     "@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 54b862e5ff..12f96d3b15 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.98-alpha.3",
-    "@budibase/client": "^1.0.98-alpha.3",
-    "@budibase/frontend-core": "^1.0.98-alpha.3",
-    "@budibase/string-templates": "^1.0.98-alpha.3",
+    "@budibase/bbui": "^1.0.98-alpha.4",
+    "@budibase/client": "^1.0.98-alpha.4",
+    "@budibase/frontend-core": "^1.0.98-alpha.4",
+    "@budibase/string-templates": "^1.0.98-alpha.4",
     "@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 b2e2545667..5236edb870 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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 db4a33132d..399b9996f2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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.98-alpha.3",
-    "@budibase/frontend-core": "^1.0.98-alpha.3",
-    "@budibase/string-templates": "^1.0.98-alpha.3",
+    "@budibase/bbui": "^1.0.98-alpha.4",
+    "@budibase/frontend-core": "^1.0.98-alpha.4",
+    "@budibase/string-templates": "^1.0.98-alpha.4",
     "@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 80b8273ec4..db92971685 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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.98-alpha.3",
+    "@budibase/bbui": "^1.0.98-alpha.4",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 4790758316..ea87152a33 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.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.98-alpha.3",
-    "@budibase/client": "^1.0.98-alpha.3",
-    "@budibase/string-templates": "^1.0.98-alpha.3",
+    "@budibase/backend-core": "^1.0.98-alpha.4",
+    "@budibase/client": "^1.0.98-alpha.4",
+    "@budibase/string-templates": "^1.0.98-alpha.4",
     "@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 06c7761d2c..9d8b0b72d4 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "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 4b8db56782..2ff455a1ad 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.98-alpha.3",
+  "version": "1.0.98-alpha.4",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.98-alpha.3",
-    "@budibase/string-templates": "^1.0.98-alpha.3",
+    "@budibase/backend-core": "^1.0.98-alpha.4",
+    "@budibase/string-templates": "^1.0.98-alpha.4",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",