Revert "Merge pull request #10927 from Budibase/revert-merge-develop-1"

This reverts commit 548b3037e5, reversing changes made to 179f06f106.
2023-06-16 11:34:02 +01:00 · 2023-06-16 11:34:02 +01:00 · 887b980b11
parent 698bbad989
commit 887b980b11
75 changed files with 2501 additions and 1424 deletions
--- a/lerna.json
+++ b/lerna.json
@ -16,7 +16,6 @@
    "packages/worker",
    "packages/pro/packages/pro"
  ],
-  "useWorkspaces": true,
  "command": {
    "publish": {
      "ignoreChanges": [
--- a/package.json
+++ b/package.json
@ -15,10 +15,10 @@
    "husky": "^8.0.3",
    "js-yaml": "^4.1.0",
    "kill-port": "^1.6.1",
-    "lerna": "7.0.0-alpha.0",
+    "lerna": "^7.0.1",
    "madge": "^6.0.0",
    "minimist": "^1.2.8",
-    "nx": "^16.2.1",
+    "nx": "^16.3.2",
    "prettier": "^2.3.1",
    "prettier-plugin-svelte": "^2.3.0",
    "rimraf": "^3.0.2",
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@ -1,10 +1,11 @@
 import * as google from "../sso/google"
 import { Cookie } from "../../../constants"
-import { clearCookie, getCookie } from "../../../utils"
-import { doWithDB } from "../../../db"
 import * as configs from "../../../configs"
-import { BBContext, Database, SSOProfile } from "@budibase/types"
+import * as cache from "../../../cache"
+import * as utils from "../../../utils"
+import { UserCtx, SSOProfile } from "@budibase/types"
 import { ssoSaveUserNoOp } from "../sso/sso"
+
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy

 type Passport = {
@ -22,7 +23,7 @@ async function fetchGoogleCreds() {

 export async function preAuth(
  passport: Passport,
-  ctx: BBContext,
+  ctx: UserCtx,
  next: Function
 ) {
  // get the relevant config
@ -36,8 +37,8 @@ export async function preAuth(
    ssoSaveUserNoOp
  )

-  if (!ctx.query.appId || !ctx.query.datasourceId) {
-    ctx.throw(400, "appId and datasourceId query params not present.")
+  if (!ctx.query.appId) {
+    ctx.throw(400, "appId query param not present.")
  }

  return passport.authenticate(strategy, {
@ -49,7 +50,7 @@ export async function preAuth(

 export async function postAuth(
  passport: Passport,
-  ctx: BBContext,
+  ctx: UserCtx,
  next: Function
 ) {
  // get the relevant config
@ -57,7 +58,7 @@ export async function postAuth(
  const platformUrl = await configs.getPlatformUrl({ tenantAware: false })

  let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`
-  const authStateCookie = getCookie(ctx, Cookie.DatasourceAuth)
+  const authStateCookie = utils.getCookie(ctx, Cookie.DatasourceAuth)

  return passport.authenticate(
    new GoogleStrategy(
@ -69,33 +70,26 @@ export async function postAuth(
      (
        accessToken: string,
        refreshToken: string,
-        profile: SSOProfile,
+        _profile: SSOProfile,
        done: Function
      ) => {
-        clearCookie(ctx, Cookie.DatasourceAuth)
+        utils.clearCookie(ctx, Cookie.DatasourceAuth)
        done(null, { accessToken, refreshToken })
      }
    ),
    { successRedirect: "/", failureRedirect: "/error" },
    async (err: any, tokens: string[]) => {
      const baseUrl = `/builder/app/${authStateCookie.appId}/data`
-      // update the DB for the datasource with all the user info
-      await doWithDB(authStateCookie.appId, async (db: Database) => {
-        let datasource
-        try {
-          datasource = await db.get(authStateCookie.datasourceId)
-        } catch (err: any) {
-          if (err.status === 404) {
-            ctx.redirect(baseUrl)
+
+      const id = utils.newid()
+      await cache.store(
+        `datasource:creation:${authStateCookie.appId}:google:${id}`,
+        {
+          tokens,
        }
-        }
-        if (!datasource.config) {
-          datasource.config = {}
-        }
-        datasource.config.auth = { type: "google", ...tokens }
-        await db.put(datasource)
-        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`)
-      })
+      )
+
+      ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`)
    }
  )(ctx, next)
 }
--- a/packages/backend-core/src/security/encryption.ts
+++ b/packages/backend-core/src/security/encryption.ts
@ -1,12 +1,17 @@
 import crypto from "crypto"
+import fs from "fs"
+import zlib from "zlib"
 import env from "../environment"
+import { join } from "path"

 const ALGO = "aes-256-ctr"
 const SEPARATOR = "-"
 const ITERATIONS = 10000
-const RANDOM_BYTES = 16
 const STRETCH_LENGTH = 32

+const SALT_LENGTH = 16
+const IV_LENGTH = 16
+
 export enum SecretOption {
  API = "api",
  ENCRYPTION = "encryption",
@ -31,15 +36,15 @@ export function getSecret(secretOption: SecretOption): string {
  return secret
 }

-function stretchString(string: string, salt: Buffer) {
-  return crypto.pbkdf2Sync(string, salt, ITERATIONS, STRETCH_LENGTH, "sha512")
+function stretchString(secret: string, salt: Buffer) {
+  return crypto.pbkdf2Sync(secret, salt, ITERATIONS, STRETCH_LENGTH, "sha512")
 }

 export function encrypt(
  input: string,
  secretOption: SecretOption = SecretOption.API
 ) {
-  const salt = crypto.randomBytes(RANDOM_BYTES)
+  const salt = crypto.randomBytes(SALT_LENGTH)
  const stretched = stretchString(getSecret(secretOption), salt)
  const cipher = crypto.createCipheriv(ALGO, stretched, salt)
  const base = cipher.update(input)
@ -60,3 +65,115 @@ export function decrypt(
  const final = decipher.final()
  return Buffer.concat([base, final]).toString()
 }
+
+export async function encryptFile(
+  { dir, filename }: { dir: string; filename: string },
+  secret: string
+) {
+  const outputFileName = `${filename}.enc`
+
+  const filePath = join(dir, filename)
+  const inputFile = fs.createReadStream(filePath)
+  const outputFile = fs.createWriteStream(join(dir, outputFileName))
+
+  const salt = crypto.randomBytes(SALT_LENGTH)
+  const iv = crypto.randomBytes(IV_LENGTH)
+  const stretched = stretchString(secret, salt)
+  const cipher = crypto.createCipheriv(ALGO, stretched, iv)
+
+  outputFile.write(salt)
+  outputFile.write(iv)
+
+  inputFile.pipe(zlib.createGzip()).pipe(cipher).pipe(outputFile)
+
+  return new Promise<{ filename: string; dir: string }>(r => {
+    outputFile.on("finish", () => {
+      r({
+        filename: outputFileName,
+        dir,
+      })
+    })
+  })
+}
+
+async function getSaltAndIV(path: string) {
+  const fileStream = fs.createReadStream(path)
+
+  const salt = await readBytes(fileStream, SALT_LENGTH)
+  const iv = await readBytes(fileStream, IV_LENGTH)
+  fileStream.close()
+  return { salt, iv }
+}
+
+export async function decryptFile(
+  inputPath: string,
+  outputPath: string,
+  secret: string
+) {
+  const { salt, iv } = await getSaltAndIV(inputPath)
+  const inputFile = fs.createReadStream(inputPath, {
+    start: SALT_LENGTH + IV_LENGTH,
+  })
+
+  const outputFile = fs.createWriteStream(outputPath)
+
+  const stretched = stretchString(secret, salt)
+  const decipher = crypto.createDecipheriv(ALGO, stretched, iv)
+
+  const unzip = zlib.createGunzip()
+
+  inputFile.pipe(decipher).pipe(unzip).pipe(outputFile)
+
+  return new Promise<void>((res, rej) => {
+    outputFile.on("finish", () => {
+      outputFile.close()
+      res()
+    })
+
+    inputFile.on("error", e => {
+      outputFile.close()
+      rej(e)
+    })
+
+    decipher.on("error", e => {
+      outputFile.close()
+      rej(e)
+    })
+
+    unzip.on("error", e => {
+      outputFile.close()
+      rej(e)
+    })
+
+    outputFile.on("error", e => {
+      outputFile.close()
+      rej(e)
+    })
+  })
+}
+
+function readBytes(stream: fs.ReadStream, length: number) {
+  return new Promise<Buffer>((resolve, reject) => {
+    let bytesRead = 0
+    const data: Buffer[] = []
+
+    stream.on("readable", () => {
+      let chunk
+
+      while ((chunk = stream.read(length - bytesRead)) !== null) {
+        data.push(chunk)
+        bytesRead += chunk.length
+      }
+
+      resolve(Buffer.concat(data))
+    })
+
+    stream.on("end", () => {
+      reject(new Error("Insufficient data in the stream."))
+    })
+
+    stream.on("error", error => {
+      reject(error)
+    })
+  })
+}
--- a/packages/backend-core/src/security/roles.ts
+++ b/packages/backend-core/src/security/roles.ts
@ -140,9 +140,13 @@ export function lowerBuiltinRoleID(roleId1?: string, roleId2?: string): string {
 * Gets the role object, this is mainly useful for two purposes, to check if the level exists and
 * to check if the role inherits any others.
 * @param {string|null} roleId The level ID to lookup.
+ * @param {object|null} opts options for the function, like whether to halt errors, instead return public.
 * @returns {Promise<Role|object|null>} The role object, which may contain an "inherits" property.
 */
-export async function getRole(roleId?: string): Promise<RoleDoc | undefined> {
+export async function getRole(
+  roleId?: string,
+  opts?: { defaultPublic?: boolean }
+): Promise<RoleDoc | undefined> {
  if (!roleId) {
    return undefined
  }
@ -161,6 +165,9 @@ export async function getRole(roleId?: string): Promise<RoleDoc | undefined> {
    // finalise the ID
    role._id = getExternalRoleID(role._id)
  } catch (err) {
+    if (!isBuiltin(roleId) && opts?.defaultPublic) {
+      return cloneDeep(BUILTIN_ROLES.PUBLIC)
+    }
    // only throw an error if there is no role at all
    if (Object.keys(role).length === 0) {
      throw err
--- a/packages/bbui/src/FancyForm/FancyCheckbox.svelte
+++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte
@ -8,6 +8,8 @@
  export let disabled = false
  export let error = null
  export let validate = null
+  export let indeterminate = false
+  export let compact = false

  const dispatch = createEventDispatcher()

@ -21,11 +23,19 @@
  }
 </script>

-<FancyField {error} {value} {validate} {disabled} clickable on:click={onChange}>
+<FancyField
+  {error}
+  {value}
+  {validate}
+  {disabled}
+  {compact}
+  clickable
+  on:click={onChange}
+>
  <span>
-    <Checkbox {disabled} {value} />
+    <Checkbox {disabled} {value} {indeterminate} />
  </span>
-  <div class="text">
+  <div class="text" class:compact>
    {#if text}
      {text}
    {/if}
@ -47,6 +57,10 @@
    line-clamp: 2;
    -webkit-box-orient: vertical;
  }
+  .text.compact {
+    font-size: 13px;
+    line-height: 15px;
+  }
  .text > :global(*) {
    font-size: inherit !important;
  }
--- a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte
+++ b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte
@ -0,0 +1,68 @@
+<script>
+  import FancyCheckbox from "./FancyCheckbox.svelte"
+  import FancyForm from "./FancyForm.svelte"
+  import { createEventDispatcher } from "svelte"
+
+  export let options = []
+  export let selected = []
+  export let showSelectAll = true
+  export let selectAllText = "Select all"
+
+  let selectedBooleans = reset()
+  const dispatch = createEventDispatcher()
+
+  $: updateSelected(selectedBooleans)
+  $: dispatch("change", selected)
+  $: allSelected = selected?.length === options.length
+  $: noneSelected = !selected?.length
+
+  function reset() {
+    return Array(options.length).fill(true)
+  }
+
+  function updateSelected(selectedArr) {
+    const array = []
+    for (let [i, isSelected] of Object.entries(selectedArr)) {
+      if (isSelected) {
+        array.push(options[i])
+      }
+    }
+    selected = array
+  }
+
+  function toggleSelectAll() {
+    if (allSelected === true) {
+      selectedBooleans = []
+    } else {
+      selectedBooleans = reset()
+    }
+  }
+</script>
+
+{#if options && Array.isArray(options)}
+  <div class="checkbox-group" class:has-select-all={showSelectAll}>
+    <FancyForm on:change>
+      {#if showSelectAll}
+        <FancyCheckbox
+          bind:value={allSelected}
+          on:change={toggleSelectAll}
+          text={selectAllText}
+          indeterminate={!allSelected && !noneSelected}
+          compact
+        />
+      {/if}
+      {#each options as option, i}
+        <FancyCheckbox bind:value={selectedBooleans[i]} text={option} compact />
+      {/each}
+    </FancyForm>
+  </div>
+{/if}
+
+<style>
+  .checkbox-group.has-select-all :global(.fancy-field:first-of-type) {
+    background: var(--spectrum-global-color-gray-100);
+  }
+  .checkbox-group.has-select-all :global(.fancy-field:first-of-type:hover) {
+    background: var(--spectrum-global-color-gray-200);
+  }
+</style>
--- a/packages/bbui/src/FancyForm/FancyField.svelte
+++ b/packages/bbui/src/FancyForm/FancyField.svelte
@ -11,6 +11,7 @@
  export let value
  export let ref
  export let autoHeight
+  export let compact = false

  const formContext = getContext("fancy-form")
  const id = Math.random()
@ -42,6 +43,7 @@
  class:disabled
  class:focused
  class:clickable
+  class:compact
  class:auto-height={autoHeight}
 >
  <div class="content" on:click>
@ -61,7 +63,6 @@

 <style>
  .fancy-field {
-    max-width: 400px;
    background: var(--spectrum-global-color-gray-75);
    border: 1px solid var(--spectrum-global-color-gray-300);
    border-radius: 4px;
@ -69,6 +70,12 @@
    transition: border-color 130ms ease-out, background 130ms ease-out,
      background 130ms ease-out;
    color: var(--spectrum-global-color-gray-800);
+    --padding: 16px;
+    --height: 64px;
+  }
+  .fancy-field.compact {
+    --padding: 8px;
+    --height: 36px;
  }
  .fancy-field:hover {
    border-color: var(--spectrum-global-color-gray-400);
@ -91,8 +98,8 @@
  }
  .content {
    position: relative;
-    height: 64px;
-    padding: 0 16px;
+    height: var(--height);
+    padding: 0 var(--padding);
  }
  .fancy-field.auto-height .content {
    height: auto;
@ -103,7 +110,7 @@
    flex-direction: row;
    justify-content: flex-start;
    align-items: center;
-    gap: 16px;
+    gap: var(--padding);
  }
  .field {
    flex: 1 1 auto;
--- a/packages/bbui/src/FancyForm/index.js
+++ b/packages/bbui/src/FancyForm/index.js
@ -4,4 +4,5 @@ export { default as FancySelect } from "./FancySelect.svelte"
 export { default as FancyButton } from "./FancyButton.svelte"
 export { default as FancyForm } from "./FancyForm.svelte"
 export { default as FancyButtonRadio } from "./FancyButtonRadio.svelte"
+export { default as FancyCheckboxGroup } from "./FancyCheckboxGroup.svelte"
 export { default as ErrorMessage } from "./ErrorMessage.svelte"
--- a/packages/bbui/src/Form/Core/Checkbox.svelte
+++ b/packages/bbui/src/Form/Core/Checkbox.svelte
@ -9,6 +9,7 @@
  export let text = null
  export let disabled = false
  export let size
+  export let indeterminate = false

  const dispatch = createEventDispatcher()
  const onChange = event => {
@ -22,6 +23,7 @@
  class="spectrum-Checkbox spectrum-Checkbox--emphasized {sizeClass}"
  class:is-invalid={!!error}
  class:checked={value}
+  class:is-indeterminate={indeterminate}
 >
  <input
    checked={value}
--- a/packages/bbui/src/Modal/Modal.svelte
+++ b/packages/bbui/src/Modal/Modal.svelte
@ -8,6 +8,7 @@

  export let fixed = false
  export let inline = false
+  export let disableCancel = false

  const dispatch = createEventDispatcher()
  let visible = fixed || inline
@ -38,7 +39,7 @@
  }

  export function cancel() {
-    if (!visible) {
+    if (!visible || disableCancel) {
      return
    }
    dispatch("cancel")
--- a/packages/builder/src/builderStore/datasource.js
+++ b/packages/builder/src/builderStore/datasource.js
@ -23,10 +23,11 @@ function prepareData(config) {
  return datasource
 }

-export async function saveDatasource(config, skipFetch = false) {
+export async function saveDatasource(config, { skipFetch, tablesFilter } = {}) {
  const datasource = prepareData(config)
  // Create datasource
-  const resp = await datasources.save(datasource, !skipFetch && datasource.plus)
+  const fetchSchema = !skipFetch && datasource.plus
+  const resp = await datasources.save(datasource, { fetchSchema, tablesFilter })

  // update the tables incase datasource plus
  await tables.fetch()
@ -41,6 +42,13 @@ export async function createRestDatasource(integration) {

 export async function validateDatasourceConfig(config) {
  const datasource = prepareData(config)
-  const resp = await API.validateDatasource(datasource)
-  return resp
+  return await API.validateDatasource(datasource)
+}
+
+export async function getDatasourceInfo(config) {
+  let datasource = config
+  if (!config._id) {
+    datasource = prepareData(config)
+  }
+  return await API.fetchInfoForDatasource(datasource)
 }
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@ -74,6 +74,7 @@ const INITIAL_FRONTEND_STATE = {
  propertyFocus: null,
  builderSidePanel: false,
  hasLock: true,
+  showPreview: false,

  // URL params
  selectedScreenId: null,
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -13,6 +13,8 @@
    Modal,
    notifications,
    Icon,
+    Checkbox,
+    DatePicker,
  } from "@budibase/bbui"
  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
  import { automationStore, selectedAutomation } from "builderStore"
@ -306,6 +308,11 @@
    drawer.hide()
  }

+  function canShowField(key, value) {
+    const dependsOn = value.dependsOn
+    return !dependsOn || !!inputData[dependsOn]
+  }
+
  onMount(async () => {
    try {
      await environment.loadVariables()
@ -317,15 +324,16 @@

 <div class="fields">
  {#each deprecatedSchemaProperties as [key, value]}
+    {#if canShowField(key, value)}
      <div class="block-field">
-      {#if key !== "fields"}
+        {#if key !== "fields" && value.type !== "boolean"}
          <Label
            tooltip={value.title === "Binding / Value"
              ? "If using the String input type, please use a comma or newline separated string"
              : null}>{value.title || (key === "row" ? "Table" : key)}</Label
          >
        {/if}
-      {#if value.type === "string" && value.enum}
+        {#if value.type === "string" && value.enum && canShowField(key)}
          <Select
            on:change={e => onChange(e, key)}
            value={inputData[key]}
@ -355,6 +363,19 @@
              onChange(e, key)
            }}
          />
+        {:else if value.type === "boolean"}
+          <div style="margin-top: 10px">
+            <Checkbox
+              text={value.title}
+              value={inputData[key]}
+              on:change={e => onChange(e, key)}
+            />
+          </div>
+        {:else if value.type === "date"}
+          <DatePicker
+            value={inputData[key]}
+            on:change={e => onChange(e, key)}
+          />
        {:else if value.customType === "column"}
          <Select
            on:change={e => onChange(e, key)}
@ -416,7 +437,10 @@
            value={inputData[key]}
          />
        {:else if value.customType === "cron"}
-        <CronBuilder on:change={e => onChange(e, key)} value={inputData[key]} />
+          <CronBuilder
+            on:change={e => onChange(e, key)}
+            value={inputData[key]}
+          />
        {:else if value.customType === "queryParams"}
          <QueryParamSelector
            on:change={e => onChange(e, key)}
@ -459,7 +483,10 @@
            {isTestModal}
          />
        {:else if value.customType === "triggerSchema"}
-        <SchemaSetup on:change={e => onChange(e, key)} value={inputData[key]} />
+          <SchemaSetup
+            on:change={e => onChange(e, key)}
+            value={inputData[key]}
+          />
        {:else if value.customType === "code"}
          <CodeEditorModal>
            <CodeEditor
@ -514,13 +541,16 @@
                on:change={e => onChange(e, key)}
                {bindings}
                updateOnChange={false}
-              placeholder={value.customType === "queryLimit" ? queryLimit : ""}
+                placeholder={value.customType === "queryLimit"
+                  ? queryLimit
+                  : ""}
                drawerLeft="260px"
              />
            </div>
          {/if}
        {/if}
      </div>
+    {/if}
  {/each}
 </div>
 <Modal bind:this={webhookModal} width="30%">
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/PlusConfigForm.svelte
@ -8,7 +8,7 @@
    notifications,
    Modal,
    Table,
-    Toggle,
+    FancyCheckboxGroup,
  } from "@budibase/bbui"
  import { datasources, integrations, tables } from "stores/backend"
  import CreateEditRelationship from "components/backend/Datasources/CreateEditRelationship.svelte"
@ -16,7 +16,7 @@
  import ArrayRenderer from "components/common/renderers/ArrayRenderer.svelte"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import { goto } from "@roxi/routify"
-  import ValuesList from "components/common/ValuesList.svelte"
+  import { getDatasourceInfo } from "builderStore/datasource"

  export let datasource
  export let save
@ -34,7 +34,7 @@
  let selectedFromRelationship, selectedToRelationship
  let confirmDialog
  let specificTables = null
-  let requireSpecificTables = false
+  let tableList

  $: integration = datasource && $integrations[datasource.source]
  $: plusTables = datasource?.plus
@ -153,30 +153,28 @@
  warning={false}
  title="Confirm table fetch"
 >
-  <Toggle
-    bind:value={requireSpecificTables}
-    on:change={e => {
-      requireSpecificTables = e.detail
-      specificTables = null
-    }}
-    thin
-    text="Fetch listed tables only (one per line)"
-  />
-  {#if requireSpecificTables}
-    <ValuesList label="" bind:values={specificTables} />
-  {/if}
-  <br />
  <Body>
    If you have fetched tables from this database before, this action may
    overwrite any changes you made after your initial fetch.
  </Body>
+  <br />
+  <div class="table-checkboxes">
+    <FancyCheckboxGroup options={tableList} bind:selected={specificTables} />
+  </div>
 </ConfirmDialog>

 <Divider />
 <div class="query-header">
  <Heading size="S">Tables</Heading>
  <div class="table-buttons">
-    <Button secondary on:click={() => confirmDialog.show()}>
+    <Button
+      secondary
+      on:click={async () => {
+        const info = await getDatasourceInfo(datasource)
+        tableList = info.tableNames
+        confirmDialog.show()
+      }}
+    >
      Fetch tables
    </Button>
    <Button cta icon="Add" on:click={createNewTable}>New table</Button>
@ -246,4 +244,8 @@
    display: flex;
    gap: var(--spacing-m);
  }
+
+  .table-checkboxes {
+    width: 100%;
+  }
 </style>
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@ -3,8 +3,6 @@
  import { store } from "builderStore"
  import { auth } from "stores/portal"

-  export let preAuthStep
-  export let datasource
  export let disabled
  export let samePage

@ -15,18 +13,8 @@
  class:disabled
  {disabled}
  on:click={async () => {
-    let ds = datasource
    let appId = $store.appId
-    if (!ds) {
-      const resp = await preAuthStep()
-      if (resp.datasource && resp.appId) {
-        ds = resp.datasource
-        appId = resp.appId
-      } else {
-        ds = resp
-      }
-    }
-    const url = `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`
+    const url = `/api/global/auth/${tenantId}/datasource/google?appId=${appId}`
    if (samePage) {
      window.location = url
    } else {
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
@ -44,6 +44,9 @@ export default ICONS

 export function getIcon(integrationType, schema) {
  const integrationList = get(integrations)
+  if (!integrationList) {
+    return
+  }
  if (integrationList[integrationType]?.iconUrl) {
    return { url: integrationList[integrationType].iconUrl }
  } else if (schema?.custom || !ICONS[integrationType]) {
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte
@ -1,12 +1,19 @@
 <script>
  import { goto } from "@roxi/routify"
-  import { ModalContent, notifications, Body, Layout } from "@budibase/bbui"
+  import {
+    ModalContent,
+    notifications,
+    Body,
+    Layout,
+    FancyCheckboxGroup,
+  } from "@budibase/bbui"
  import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte"
  import { IntegrationNames } from "constants/backend"
  import cloneDeep from "lodash/cloneDeepWith"
  import {
    saveDatasource as save,
    validateDatasourceConfig,
+    getDatasourceInfo,
  } from "builderStore/datasource"
  import { DatasourceFeature } from "@budibase/types"

@ -15,11 +22,24 @@
  // kill the reference so the input isn't saved
  let datasource = cloneDeep(integration)
  let isValid = false
+  let fetchTableStep = false
+  let selectedTables = []
+  let tableList = []

  $: name =
-    IntegrationNames[datasource.type] || datasource.name || datasource.type
+    IntegrationNames[datasource?.type] || datasource?.name || datasource?.type
+  $: datasourcePlus = datasource?.plus
+  $: title = fetchTableStep ? "Fetch your tables" : `Connect to ${name}`
+  $: confirmText = fetchTableStep
+    ? "Continue"
+    : datasourcePlus
+    ? "Connect"
+    : "Save and continue to query"

  async function validateConfig() {
+    if (!integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
+      return true
+    }
    const displayError = message =>
      notifications.error(message ?? "Error validating datasource")

@ -47,35 +67,75 @@
      if (!datasource.name) {
        datasource.name = name
      }
-      const resp = await save(datasource)
+      const opts = {}
+      if (datasourcePlus && selectedTables) {
+        opts.tablesFilter = selectedTables
+      }
+      const resp = await save(datasource, opts)
      $goto(`./datasource/${resp._id}`)
-      notifications.success(`Datasource created successfully.`)
+      notifications.success("Datasource created successfully.")
    } catch (err) {
      notifications.error(err?.message ?? "Error saving datasource")
      // prevent the modal from closing
      return false
    }
  }
+
+  async function nextStep() {
+    let connected = true
+    if (datasourcePlus) {
+      connected = await validateConfig()
+    }
+    if (!connected) {
+      return false
+    }
+    if (datasourcePlus && !fetchTableStep) {
+      notifications.success("Connected to datasource successfully.")
+      const info = await getDatasourceInfo(datasource)
+      tableList = info.tableNames
+      fetchTableStep = true
+      return false
+    } else {
+      await saveDatasource()
+      return true
+    }
+  }
 </script>

 <ModalContent
-  title={`Connect to ${name}`}
-  onConfirm={() => saveDatasource()}
-  confirmText={datasource.plus ? "Connect" : "Save and continue to query"}
-  cancelText="Back"
-  showSecondaryButton={datasource.plus}
+  {title}
+  onConfirm={() => nextStep()}
+  {confirmText}
+  cancelText={fetchTableStep ? "Cancel" : "Back"}
+  showSecondaryButton={datasourcePlus}
  size="L"
  disabled={!isValid}
 >
  <Layout noPadding>
-    <Body size="XS"
-      >Connect your database to Budibase using the config below.
+    <Body size="XS">
+      {#if !fetchTableStep}
+        Connect your database to Budibase using the config below
+      {:else}
+        Choose what tables you want to sync with Budibase
+      {/if}
    </Body>
  </Layout>
+  {#if !fetchTableStep}
    <IntegrationConfigForm
-    schema={datasource.schema}
+      schema={datasource?.schema}
      bind:datasource
      creating={true}
      on:valid={e => (isValid = e.detail)}
    />
+  {:else}
+    <div class="table-checkboxes">
+      <FancyCheckboxGroup options={tableList} bind:selected={selectedTables} />
+    </div>
+  {/if}
 </ModalContent>
+
+<style>
+  .table-checkboxes {
+    width: 100%;
+  }
+</style>
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
@ -1,38 +1,170 @@
 <script>
-  import { ModalContent, Body, Layout, Link } from "@budibase/bbui"
-  import { IntegrationNames } from "constants/backend"
-  import cloneDeep from "lodash/cloneDeepWith"
+  import {
+    Body,
+    FancyCheckboxGroup,
+    InlineAlert,
+    Layout,
+    Link,
+    ModalContent,
+    notifications,
+  } from "@budibase/bbui"
+  import { IntegrationNames, IntegrationTypes } from "constants/backend"
  import GoogleButton from "../_components/GoogleButton.svelte"
-  import { saveDatasource as save } from "builderStore/datasource"
  import { organisation } from "stores/portal"
-  import { onMount } from "svelte"
+  import { onDestroy, onMount } from "svelte"
+  import {
+    getDatasourceInfo,
+    saveDatasource,
+    validateDatasourceConfig,
+  } from "builderStore/datasource"
+  import cloneDeep from "lodash/cloneDeepWith"
+  import IntegrationConfigForm from "../TableIntegrationMenu/IntegrationConfigForm.svelte"
+  import { goto } from "@roxi/routify"
+  import { DatasourceFeature } from "@budibase/types"
+  import { API } from "api"

  export let integration
+  export let continueSetupId = false

-  // kill the reference so the input isn't saved
  let datasource = cloneDeep(integration)
+  datasource.config.continueSetupId = continueSetupId
+
+  let { schema } = datasource
+
  $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured

  onMount(async () => {
    await organisation.init()
  })
+
+  const integrationName = IntegrationNames[IntegrationTypes.GOOGLE_SHEETS]
+
+  export const GoogleDatasouceConfigStep = {
+    AUTH: "auth",
+    SET_URL: "set_url",
+    SET_SHEETS: "set_sheets",
+  }
+
+  let step = continueSetupId
+    ? GoogleDatasouceConfigStep.SET_URL
+    : GoogleDatasouceConfigStep.AUTH
+
+  let isValid = false
+
+  let allSheets
+  let selectedSheets
+  let setSheetsErrorTitle, setSheetsErrorMessage
+
+  $: modalConfig = {
+    [GoogleDatasouceConfigStep.AUTH]: {
+      title: `Connect to ${integrationName}`,
+    },
+    [GoogleDatasouceConfigStep.SET_URL]: {
+      title: `Connect your spreadsheet`,
+      confirmButtonText: "Connect",
+      onConfirm: async () => {
+        const checkConnection =
+          integration.features[DatasourceFeature.CONNECTION_CHECKING]
+        if (checkConnection) {
+          const resp = await validateDatasourceConfig(datasource)
+          if (!resp.connected) {
+            notifications.error(`Unable to connect - ${resp.error}`)
+            return false
+          }
+        }
+
+        try {
+          datasource = await saveDatasource(datasource, {
+            tablesFilter: selectedSheets,
+            skipFetch: true,
+          })
+        } catch (err) {
+          notifications.error(err?.message ?? "Error saving datasource")
+          // prevent the modal from closing
+          return false
+        }
+
+        if (!integration.features[DatasourceFeature.FETCH_TABLE_NAMES]) {
+          notifications.success(`Datasource created successfully.`)
+          return
+        }
+
+        const info = await getDatasourceInfo(datasource)
+        allSheets = info.tableNames
+
+        step = GoogleDatasouceConfigStep.SET_SHEETS
+        notifications.success(
+          checkConnection
+            ? "Connection Successful"
+            : `Datasource created successfully.`
+        )
+
+        // prevent the modal from closing
+        return false
+      },
+    },
+    [GoogleDatasouceConfigStep.SET_SHEETS]: {
+      title: `Choose your sheets`,
+      confirmButtonText: selectedSheets?.length
+        ? "Fetch sheets"
+        : "Continue without fetching",
+      onConfirm: async () => {
+        try {
+          if (selectedSheets.length) {
+            await API.buildDatasourceSchema({
+              datasourceId: datasource._id,
+              tablesFilter: selectedSheets,
+            })
+          }
+
+          return
+        } catch (err) {
+          const message = err?.message ?? "Error fetching the sheets"
+          // Handling message with format: Error title - error description
+          const indexSeparator = message.indexOf(" - ")
+          if (indexSeparator >= 0) {
+            setSheetsErrorTitle = message.substr(0, indexSeparator)
+            setSheetsErrorMessage =
+              message[indexSeparator + 3].toUpperCase() +
+              message.substr(indexSeparator + 4)
+          } else {
+            setSheetsErrorTitle = null
+            setSheetsErrorMessage = message
+          }
+
+          // prevent the modal from closing
+          return false
+        }
+      },
+    },
+  }
+
+  // This will handle the user closing the modal pressing outside the modal
+  onDestroy(() => {
+    if (step === GoogleDatasouceConfigStep.SET_SHEETS) {
+      $goto(`./datasource/${datasource._id}`)
+    }
+  })
 </script>

 <ModalContent
-  title={`Connect to ${IntegrationNames[datasource.type]}`}
-  cancelText="Back"
+  title={modalConfig[step].title}
+  cancelText="Cancel"
  size="L"
+  confirmText={modalConfig[step].confirmButtonText}
+  showConfirmButton={!!modalConfig[step].onConfirm}
+  onConfirm={modalConfig[step].onConfirm}
+  disabled={!isValid}
 >
+  {#if step === GoogleDatasouceConfigStep.AUTH}
    <!-- check true and false directly, don't render until flag is set -->
    {#if isGoogleConfigured === true}
      <Layout noPadding>
        <Body size="S"
-        >Authenticate with your google account to use the {IntegrationNames[
-          datasource.type
-        ]} integration.</Body
+          >Authenticate with your google account to use the {integrationName} integration.</Body
        >
      </Layout>
-    <GoogleButton preAuthStep={() => save(datasource, true)} />
+      <GoogleButton samePage />
    {:else if isGoogleConfigured === false}
      <Body size="S"
        >Google authentication is not enabled, please complete Google SSO
@ -40,4 +172,36 @@
      >
      <Link href="/builder/portal/settings/auth">Configure Google SSO</Link>
    {/if}
+  {/if}
+  {#if step === GoogleDatasouceConfigStep.SET_URL}
+    <Layout noPadding no>
+      <Body size="S">Add the URL of the sheet you want to connect.</Body>
+
+      <IntegrationConfigForm
+        {schema}
+        bind:datasource
+        creating={true}
+        on:valid={e => (isValid = e.detail)}
+      />
+    </Layout>
+  {/if}
+  {#if step === GoogleDatasouceConfigStep.SET_SHEETS}
+    <Layout noPadding no>
+      <Body size="S">Select which spreadsheets you want to connect.</Body>
+
+      <FancyCheckboxGroup
+        options={allSheets}
+        bind:selected={selectedSheets}
+        selectAllText="Select all sheets"
+      />
+
+      {#if setSheetsErrorTitle || setSheetsErrorMessage}
+        <InlineAlert
+          type="error"
+          header={setSheetsErrorTitle}
+          message={setSheetsErrorMessage}
+        />
+      {/if}
+    </Layout>
+  {/if}
 </ModalContent>
--- a/packages/builder/src/components/commandPalette/CommandPalette.svelte
+++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte
@ -69,7 +69,7 @@
      name: "App",
      description: "",
      icon: "Play",
-      action: () => window.open(`/${$store.appId}`),
+      action: () => store.update(state => ({ ...state, showPreview: true })),
    },
    {
      type: "Preview",
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@ -62,7 +62,10 @@
  }

  const previewApp = () => {
-    window.open(`/${application}`)
+    store.update(state => ({
+      ...state,
+      showPreview: true,
+    }))
  }

  const viewApp = () => {
--- a/packages/builder/src/components/start/ExportAppModal.svelte
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@ -1,27 +1,128 @@
 <script>
-  import { ModalContent, Toggle, Body, InlineAlert } from "@budibase/bbui"
+  import {
+    ModalContent,
+    Toggle,
+    Body,
+    InlineAlert,
+    Input,
+    notifications,
+  } from "@budibase/bbui"
+  import { createValidationStore } from "helpers/validation/yup"

  export let app
  export let published
-  let excludeRows = false
+  let includeInternalTablesRows = true
+  let encypt = true

-  $: title = published ? "Export published app" : "Export latest app"
-  $: confirmText = published ? "Export published" : "Export latest"
+  let password = null
+  const validation = createValidationStore()
+  validation.addValidatorType("password", "password", true)
+  $: validation.observe("password", password)

-  const exportApp = () => {
+  const Step = { CONFIG: "config", SET_PASSWORD: "set_password" }
+  let currentStep = Step.CONFIG
+
+  $: exportButtonText = published ? "Export published" : "Export latest"
+  $: stepConfig = {
+    [Step.CONFIG]: {
+      title: published ? "Export published app" : "Export latest app",
+      confirmText: encypt ? "Continue" : exportButtonText,
+      onConfirm: () => {
+        if (!encypt) {
+          exportApp()
+        } else {
+          currentStep = Step.SET_PASSWORD
+          return false
+        }
+      },
+      isValid: true,
+    },
+    [Step.SET_PASSWORD]: {
+      title: "Add password to encrypt your export",
+      confirmText: exportButtonText,
+      onConfirm: async () => {
+        await validation.check({ password })
+        if (!$validation.valid) {
+          return false
+        }
+        exportApp(password)
+      },
+      isValid: $validation.valid,
+    },
+  }
+
+  const exportApp = async () => {
    const id = published ? app.prodId : app.devId
-    const appName = encodeURIComponent(app.name)
-    window.location = `/api/backups/export?appId=${id}&appname=${appName}&excludeRows=${excludeRows}`
+    const url = `/api/backups/export?appId=${id}`
+    await downloadFile(url, {
+      excludeRows: !includeInternalTablesRows,
+      encryptPassword: password,
+    })
+  }
+
+  async function downloadFile(url, body) {
+    try {
+      const response = await fetch(url, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(body),
+      })
+
+      if (response.ok) {
+        const contentDisposition = response.headers.get("Content-Disposition")
+
+        const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(
+          contentDisposition
+        )
+
+        const filename = matches[1].replace(/['"]/g, "")
+
+        const url = URL.createObjectURL(await response.blob())
+
+        const link = document.createElement("a")
+        link.href = url
+        link.download = filename
+        link.click()
+
+        URL.revokeObjectURL(url)
+      } else {
+        notifications.error("Error exporting the app.")
+      }
+    } catch (error) {
+      notifications.error(error.message || "Error downloading the exported app")
+    }
  }
 </script>

-<ModalContent {title} {confirmText} onConfirm={exportApp}>
+<ModalContent
+  title={stepConfig[currentStep].title}
+  confirmText={stepConfig[currentStep].confirmText}
+  onConfirm={stepConfig[currentStep].onConfirm}
+  disabled={!stepConfig[currentStep].isValid}
+>
+  {#if currentStep === Step.CONFIG}
+    <Body>
+      <Toggle
+        text="Export rows from internal tables"
+        bind:value={includeInternalTablesRows}
+      />
+      <Toggle text="Encrypt my export" bind:value={encypt} />
+    </Body>
+    {#if !encypt}
      <InlineAlert
        header="Do not share your budibase application exports publicly as they may contain sensitive information such as database credentials or secret keys."
      />
-  <Body
-    >Apps can be exported with or without data that is within internal tables -
-    select this below.</Body
-  >
-  <Toggle text="Exclude Rows" bind:value={excludeRows} />
+    {/if}
+  {/if}
+  {#if currentStep === Step.SET_PASSWORD}
+    <Input
+      type="password"
+      label="Password"
+      placeholder="Type here..."
+      bind:value={password}
+      error={$validation.errors.password}
+    />
+  {/if}
 </ModalContent>
--- a/packages/builder/src/helpers/validation/validation.js
+++ b/packages/builder/src/helpers/validation/validation.js
@ -6,7 +6,6 @@ export function createValidationStore(initialValue, ...validators) {
  let touched = false

  const value = writable(initialValue || "")
-  const error = derived(value, $v => validate($v, validators))
  const touchedStore = derived(value, () => {
    if (!touched) {
      touched = true
@ -14,6 +13,10 @@ export function createValidationStore(initialValue, ...validators) {
    }
    return touched
  })
+  const error = derived(
+    [value, touchedStore],
+    ([$v, $t]) => $t && validate($v, validators)
+  )

  return [value, error, touchedStore]
 }
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@ -5,6 +5,7 @@ import { notifications } from "@budibase/bbui"

 export const createValidationStore = () => {
  const DEFAULT = {
+    values: {},
    errors: {},
    touched: {},
    valid: false,
@ -33,6 +34,9 @@ export const createValidationStore = () => {
      case "email":
        propertyValidator = string().email().nullable()
        break
+      case "password":
+        propertyValidator = string().nullable()
+        break
      default:
        propertyValidator = string().nullable()
    }
@ -41,9 +45,68 @@ export const createValidationStore = () => {
      propertyValidator = propertyValidator.required()
    }

+    // We want to do this after the possible required validation, to prioritise the required error
+    switch (type) {
+      case "password":
+        propertyValidator = propertyValidator.min(8)
+        break
+    }
+
    validator[propertyName] = propertyValidator
  }

+  const observe = async (propertyName, value) => {
+    const values = get(validation).values
+    let fieldIsValid
+    if (!values.hasOwnProperty(propertyName)) {
+      // Initial setup
+      values[propertyName] = value
+      return
+    }
+
+    if (value === values[propertyName]) {
+      return
+    }
+
+    const obj = object().shape(validator)
+    try {
+      validation.update(store => {
+        store.errors[propertyName] = null
+        return store
+      })
+      await obj.validateAt(propertyName, { [propertyName]: value })
+      fieldIsValid = true
+    } catch (error) {
+      const [fieldError] = error.errors
+      if (fieldError) {
+        validation.update(store => {
+          store.errors[propertyName] = capitalise(fieldError)
+          store.valid = false
+          return store
+        })
+      }
+    }
+
+    if (fieldIsValid) {
+      // Validate the rest of the fields
+      try {
+        await obj.validate(
+          { ...values, [propertyName]: value },
+          { abortEarly: false }
+        )
+        validation.update(store => {
+          store.valid = true
+          return store
+        })
+      } catch {
+        validation.update(store => {
+          store.valid = false
+          return store
+        })
+      }
+    }
+  }
+
  const check = async values => {
    const obj = object().shape(validator)
    // clear the previous errors
@ -87,5 +150,6 @@ export const createValidationStore = () => {
    check,
    addValidator,
    addValidatorType,
+    observe,
  }
 }
--- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
@ -0,0 +1,91 @@
+<script>
+  import { onMount } from "svelte"
+  import { fade, fly } from "svelte/transition"
+  import { store, selectedScreen } from "builderStore"
+  import { ProgressCircle } from "@budibase/bbui"
+
+  $: route = $selectedScreen?.routing.route || "/"
+  $: src = `/${$store.appId}#${route}`
+
+  const close = () => {
+    store.update(state => ({
+      ...state,
+      showPreview: false,
+    }))
+  }
+
+  onMount(() => {
+    window.closePreview = () => {
+      store.update(state => ({
+        ...state,
+        showPreview: false,
+      }))
+    }
+  })
+</script>
+
+<div
+  class="preview-overlay"
+  transition:fade={{ duration: 260 }}
+  on:click|self={close}
+>
+  <div
+    class="container spectrum {$store.theme}"
+    transition:fly={{ duration: 260, y: 130 }}
+  >
+    <div class="header placeholder" />
+    <div class="loading placeholder">
+      <ProgressCircle />
+    </div>
+    <iframe title="Budibase App Preview" {src} />
+  </div>
+</div>
+
+<style>
+  .preview-overlay {
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    z-index: 999;
+    position: absolute;
+    background: rgba(255, 255, 255, 0.1);
+    display: flex;
+    align-items: stretch;
+    padding: 48px;
+  }
+  .container {
+    flex: 1 1 auto;
+    background: var(--spectrum-global-color-gray-75);
+    border-radius: 4px;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    position: relative;
+    box-shadow: 0 0 80px 0 rgba(0, 0, 0, 0.5);
+  }
+  iframe {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    border: none;
+    outline: none;
+    z-index: 1;
+  }
+  .header {
+    height: 60px;
+    width: 100%;
+    background: black;
+    top: 0;
+    position: absolute;
+  }
+  .loading {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translateY(-50%) translateX(-50%);
+  }
+  .placeholder {
+    z-index: 0;
+  }
+</style>
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@ -24,6 +24,7 @@
  import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
  import UserAvatars from "./_components/UserAvatars.svelte"
  import { TOUR_KEYS, TOURS } from "components/portal/onboarding/tours.js"
+  import PreviewOverlay from "./_components/PreviewOverlay.svelte"

  export let application

@ -140,7 +141,7 @@
  <BuilderSidePanel />
 {/if}

-<div class="root">
+<div class="root" class:blur={$store.showPreview}>
  <div class="top-nav">
    {#if $store.initialised}
      <div class="topleftnav">
@ -230,6 +231,10 @@
  {/await}
 </div>

+{#if $store.showPreview}
+  <PreviewOverlay />
+{/if}
+
 <svelte:window on:keydown={handleKeyDown} />
 <Modal bind:this={commandPaletteModal}>
  <CommandPalette />
@ -248,6 +253,10 @@
    width: 100%;
    display: flex;
    flex-direction: column;
+    transition: filter 260ms ease-out;
+  }
+  .root.blur {
+    filter: blur(8px);
  }

  .top-nav {
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@ -22,6 +22,7 @@
  import ImportRestQueriesModal from "components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte"
  import { API } from "api"
  import { DatasourceFeature } from "@budibase/types"
+  import Spinner from "components/common/Spinner.svelte"

  const querySchema = {
    name: {},
@ -33,6 +34,7 @@
  let isValid = true
  let integration, baseDatasource, datasource
  let queryList
+  let loading = false

  $: baseDatasource = $datasources.selected
  $: queryList = $queries.list.filter(
@ -65,9 +67,11 @@
  }

  const saveDatasource = async () => {
+    loading = true
    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
      const valid = await validateConfig()
      if (!valid) {
+        loading = false
        return false
      }
    }
@ -82,6 +86,8 @@
      baseDatasource = cloneDeep(datasource)
    } catch (err) {
      notifications.error(`Error saving datasource: ${err}`)
+    } finally {
+      loading = false
    }
  }

@ -119,8 +125,17 @@
      <Divider />
      <div class="config-header">
        <Heading size="S">Configuration</Heading>
-        <Button disabled={!changed || !isValid} cta on:click={saveDatasource}>
+        <Button
+          disabled={!changed || !isValid || loading}
+          cta
+          on:click={saveDatasource}
+        >
+          <div class="save-button-content">
+            {#if loading}
+              <Spinner size="10">Save</Spinner>
+            {/if}
            Save
+          </div>
        </Button>
      </div>
      <IntegrationConfigForm
@ -216,4 +231,10 @@
    flex-direction: column;
    gap: var(--spacing-m);
  }
+
+  .save-button-content {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-s);
+  }
 </style>
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@ -17,6 +17,7 @@
  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
  import ICONS from "components/backend/DatasourceNavigator/icons/index.js"
  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
+  import { onMount } from "svelte"

  let internalTableModal
  let externalDatasourceModal
@ -129,9 +130,19 @@
    return integrationsArray
  }

+  let continueGoogleSetup
+  onMount(() => {
+    const urlParams = new URLSearchParams(window.location.search)
+    continueGoogleSetup = urlParams.get("continue_google_setup")
+  })
+
  const fetchIntegrations = async () => {
    const unsortedIntegrations = await API.getIntegrations()
    integrations = sortIntegrations(unsortedIntegrations)
+
+    if (continueGoogleSetup) {
+      handleIntegrationSelect(IntegrationTypes.GOOGLE_SHEETS)
+    }
  }

  $: fetchIntegrations()
@ -141,9 +152,17 @@
  <CreateTableModal {promptUpload} afterSave={handleInternalTableSave} />
 </Modal>

-<Modal bind:this={externalDatasourceModal}>
+<Modal
+  bind:this={externalDatasourceModal}
+  on:hide={() => {
+    continueGoogleSetup = null
+  }}
+>
  {#if integration?.auth?.type === "google"}
-    <GoogleDatasourceConfigModal {integration} />
+    <GoogleDatasourceConfigModal
+      continueSetupId={continueGoogleSetup}
+      {integration}
+    />
  {:else}
    <DatasourceConfigModal {integration} />
  {/if}
--- a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
@ -0,0 +1,235 @@
+<script>
+  import GoogleLogo from "./_logos/Google.svelte"
+  import { isEqual, cloneDeep } from "lodash/fp"
+  import {
+    Button,
+    Heading,
+    Divider,
+    Label,
+    notifications,
+    Layout,
+    Input,
+    Body,
+    Toggle,
+    Icon,
+    Helpers,
+    Link,
+  } from "@budibase/bbui"
+  import { onMount } from "svelte"
+  import { API } from "api"
+  import { organisation, admin } from "stores/portal"
+
+  const ConfigTypes = {
+    Google: "google",
+  }
+
+  // Some older google configs contain a manually specified value - retain the functionality to edit the field
+  // When there is no value or we are in the cloud - prohibit editing the field, must use platform url to change
+  $: googleCallbackUrl = undefined
+  $: googleCallbackReadonly = $admin.cloud || !googleCallbackUrl
+
+  // Indicate to user that callback is based on platform url
+  // If there is an existing value, indicate that it may be removed to return to default behaviour
+  $: googleCallbackTooltip = $admin.cloud
+    ? null
+    : googleCallbackReadonly
+    ? "Visit the organisation page to update the platform URL"
+    : "Leave blank to use the default callback URL"
+  $: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback`
+
+  $: GoogleConfigFields = {
+    Google: [
+      { name: "clientID", label: "Client ID" },
+      { name: "clientSecret", label: "Client secret" },
+      {
+        name: "callbackURL",
+        label: "Callback URL",
+        readonly: googleCallbackReadonly,
+        tooltip: googleCallbackTooltip,
+        placeholder: $organisation.googleCallbackUrl,
+        copyButton: true,
+      },
+      {
+        name: "sheetsURL",
+        label: "Sheets URL",
+        readonly: googleCallbackReadonly,
+        tooltip: googleCallbackTooltip,
+        placeholder: googleSheetsCallbackUrl,
+        copyButton: true,
+      },
+    ],
+  }
+
+  let google
+
+  const providers = { google }
+
+  // control the state of the save button depending on whether form has changed
+  let originalGoogleDoc
+  let googleSaveButtonDisabled
+  $: {
+    isEqual(providers.google?.config, originalGoogleDoc?.config)
+      ? (googleSaveButtonDisabled = true)
+      : (googleSaveButtonDisabled = false)
+  }
+
+  $: googleComplete = !!(
+    providers.google?.config?.clientID && providers.google?.config?.clientSecret
+  )
+
+  async function saveConfig(config) {
+    // Delete unsupported fields
+    delete config.createdAt
+    delete config.updatedAt
+    return API.saveConfig(config)
+  }
+
+  async function saveGoogle() {
+    if (!googleComplete) {
+      notifications.error(
+        `Please fill in all required ${ConfigTypes.Google} fields`
+      )
+      return
+    }
+
+    const google = providers.google
+
+    try {
+      const res = await saveConfig(google)
+      providers[res.type]._rev = res._rev
+      providers[res.type]._id = res._id
+      notifications.success(`Settings saved`)
+    } catch (e) {
+      notifications.error(e.message)
+      return
+    }
+
+    googleSaveButtonDisabled = true
+    originalGoogleDoc = cloneDeep(providers.google)
+  }
+
+  const copyToClipboard = async value => {
+    await Helpers.copyToClipboard(value)
+    notifications.success("Copied")
+  }
+
+  onMount(async () => {
+    try {
+      await organisation.init()
+    } catch (error) {
+      notifications.error("Error getting org config")
+    }
+
+    // Fetch Google config
+    let googleDoc
+    try {
+      googleDoc = await API.getConfig(ConfigTypes.Google)
+    } catch (error) {
+      notifications.error("Error fetching Google OAuth config")
+    }
+    if (!googleDoc?._id) {
+      providers.google = {
+        type: ConfigTypes.Google,
+        config: { activated: false },
+      }
+      originalGoogleDoc = cloneDeep(googleDoc)
+    } else {
+      // Default activated to true for older configs
+      if (googleDoc.config.activated === undefined) {
+        googleDoc.config.activated = true
+      }
+      originalGoogleDoc = cloneDeep(googleDoc)
+      providers.google = googleDoc
+    }
+    googleCallbackUrl = providers?.google?.config?.callbackURL
+  })
+</script>
+
+{#if providers.google}
+  <Divider />
+  <Layout gap="XS" noPadding>
+    <Heading size="S">
+      <div class="provider-title">
+        <GoogleLogo />
+        <span>Google</span>
+      </div>
+    </Heading>
+    <Body size="S">
+      To allow users to authenticate using their Google accounts, fill out the
+      fields below. Read the <Link
+        size="M"
+        href={"https://docs.budibase.com/docs/sso-with-google"}
+        >documentation</Link
+      > for more information.
+    </Body>
+  </Layout>
+  <Layout gap="XS" noPadding>
+    {#each GoogleConfigFields.Google as field}
+      <div class="form-row">
+        <Label size="L" tooltip={field.tooltip}>{field.label}</Label>
+        <div class="inputContainer">
+          <div class="input">
+            <Input
+              bind:value={providers.google.config[field.name]}
+              readonly={field.readonly}
+              placeholder={field.placeholder}
+            />
+          </div>
+          {#if field.copyButton}
+            <div
+              class="copy"
+              on:click={() => copyToClipboard(field.placeholder)}
+            >
+              <Icon size="S" name="Copy" />
+            </div>
+          {/if}
+        </div>
+      </div>
+    {/each}
+    <div class="form-row">
+      <Label size="L">Activated</Label>
+      <Toggle text="" bind:value={providers.google.config.activated} />
+    </div>
+  </Layout>
+  <div>
+    <Button
+      disabled={googleSaveButtonDisabled}
+      cta
+      on:click={() => saveGoogle()}
+    >
+      Save
+    </Button>
+  </div>
+{/if}
+
+<style>
+  .form-row {
+    display: grid;
+    grid-template-columns: 120px 1fr;
+    grid-gap: var(--spacing-l);
+    align-items: center;
+  }
+
+  .provider-title {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    gap: var(--spacing-m);
+  }
+  .provider-title span {
+    flex: 1 1 auto;
+  }
+  .inputContainer {
+    display: flex;
+    flex-direction: row;
+  }
+  .input {
+    flex: 1;
+  }
+  .copy {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+  }
+</style>
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@ -1,5 +1,4 @@
 <script>
-  import GoogleLogo from "./_logos/Google.svelte"
  import OidcLogo from "./_logos/OIDC.svelte"
  import MicrosoftLogo from "assets/microsoft-logo.png"
  import Auth0Logo from "assets/auth0-logo.png"
@ -28,9 +27,9 @@
  import { API } from "api"
  import { organisation, admin, licensing } from "stores/portal"
  import Scim from "./scim.svelte"
+  import Google from "./google.svelte"

  const ConfigTypes = {
-    Google: "google",
    OIDC: "oidc",
  }

@ -38,43 +37,6 @@

  $: enforcedSSO = $organisation.isSSOEnforced

-  // Some older google configs contain a manually specified value - retain the functionality to edit the field
-  // When there is no value or we are in the cloud - prohibit editing the field, must use platform url to change
-  $: googleCallbackUrl = undefined
-  $: googleCallbackReadonly = $admin.cloud || !googleCallbackUrl
-
-  // Indicate to user that callback is based on platform url
-  // If there is an existing value, indicate that it may be removed to return to default behaviour
-  $: googleCallbackTooltip = $admin.cloud
-    ? null
-    : googleCallbackReadonly
-    ? "Visit the organisation page to update the platform URL"
-    : "Leave blank to use the default callback URL"
-  $: googleSheetsCallbackUrl = `${$organisation.platformUrl}/api/global/auth/datasource/google/callback`
-
-  $: GoogleConfigFields = {
-    Google: [
-      { name: "clientID", label: "Client ID" },
-      { name: "clientSecret", label: "Client secret" },
-      {
-        name: "callbackURL",
-        label: "Callback URL",
-        readonly: googleCallbackReadonly,
-        tooltip: googleCallbackTooltip,
-        placeholder: $organisation.googleCallbackUrl,
-        copyButton: true,
-      },
-      {
-        name: "sheetsURL",
-        label: "Sheets URL",
-        readonly: googleCallbackReadonly,
-        tooltip: googleCallbackTooltip,
-        placeholder: googleSheetsCallbackUrl,
-        copyButton: true,
-      },
-    ],
-  }
-
  $: OIDCConfigFields = {
    Oidc: [
      { name: "configUrl", label: "Config URL" },
@ -133,15 +95,9 @@
  const providers = { google, oidc }

  // control the state of the save button depending on whether form has changed
-  let originalGoogleDoc
  let originalOidcDoc
-  let googleSaveButtonDisabled
  let oidcSaveButtonDisabled
  $: {
-    isEqual(providers.google?.config, originalGoogleDoc?.config)
-      ? (googleSaveButtonDisabled = true)
-      : (googleSaveButtonDisabled = false)
-
    // delete the callback url which is never saved to the oidc
    // config doc, to ensure an accurate comparison
    delete providers.oidc?.config.configs[0].callbackURL
@ -151,10 +107,6 @@
      : (oidcSaveButtonDisabled = false)
  }

-  $: googleComplete = !!(
-    providers.google?.config?.clientID && providers.google?.config?.clientSecret
-  )
-
  $: oidcComplete = !!(
    providers.oidc?.config?.configs[0].configUrl &&
    providers.oidc?.config?.configs[0].clientID &&
@ -230,30 +182,6 @@
    originalOidcDoc = cloneDeep(providers.oidc)
  }

-  async function saveGoogle() {
-    if (!googleComplete) {
-      notifications.error(
-        `Please fill in all required ${ConfigTypes.Google} fields`
-      )
-      return
-    }
-
-    const google = providers.google
-
-    try {
-      const res = await saveConfig(google)
-      providers[res.type]._rev = res._rev
-      providers[res.type]._id = res._id
-      notifications.success(`Settings saved`)
-    } catch (e) {
-      notifications.error(e.message)
-      return
-    }
-
-    googleSaveButtonDisabled = true
-    originalGoogleDoc = cloneDeep(providers.google)
-  }
-
  let defaultScopes = ["profile", "email", "offline_access"]

  const refreshScopes = idx => {
@ -281,29 +209,6 @@
      notifications.error("Error getting org config")
    }

-    // Fetch Google config
-    let googleDoc
-    try {
-      googleDoc = await API.getConfig(ConfigTypes.Google)
-    } catch (error) {
-      notifications.error("Error fetching Google OAuth config")
-    }
-    if (!googleDoc?._id) {
-      providers.google = {
-        type: ConfigTypes.Google,
-        config: { activated: false },
-      }
-      originalGoogleDoc = cloneDeep(googleDoc)
-    } else {
-      // Default activated to true for older configs
-      if (googleDoc.config.activated === undefined) {
-        googleDoc.config.activated = true
-      }
-      originalGoogleDoc = cloneDeep(googleDoc)
-      providers.google = googleDoc
-    }
-    googleCallbackUrl = providers?.google?.config?.callbackURL
-
    // Get the list of user uploaded logos and push it to the dropdown options.
    // This needs to be done before the config call so they're available when
    // the dropdown renders.
@ -395,62 +300,7 @@
      > before enabling this feature.
    </Body>
  </Layout>
-  {#if providers.google}
-    <Divider />
-    <Layout gap="XS" noPadding>
-      <Heading size="S">
-        <div class="provider-title">
-          <GoogleLogo />
-          <span>Google</span>
-        </div>
-      </Heading>
-      <Body size="S">
-        To allow users to authenticate using their Google accounts, fill out the
-        fields below. Read the <Link
-          size="M"
-          href={"https://docs.budibase.com/docs/sso-with-google"}
-          >documentation</Link
-        > for more information.
-      </Body>
-    </Layout>
-    <Layout gap="XS" noPadding>
-      {#each GoogleConfigFields.Google as field}
-        <div class="form-row">
-          <Label size="L" tooltip={field.tooltip}>{field.label}</Label>
-          <div class="inputContainer">
-            <div class="input">
-              <Input
-                bind:value={providers.google.config[field.name]}
-                readonly={field.readonly}
-                placeholder={field.placeholder}
-              />
-            </div>
-            {#if field.copyButton}
-              <div
-                class="copy"
-                on:click={() => copyToClipboard(field.placeholder)}
-              >
-                <Icon size="S" name="Copy" />
-              </div>
-            {/if}
-          </div>
-        </div>
-      {/each}
-      <div class="form-row">
-        <Label size="L">Activated</Label>
-        <Toggle text="" bind:value={providers.google.config.activated} />
-      </div>
-    </Layout>
-    <div>
-      <Button
-        disabled={googleSaveButtonDisabled}
-        cta
-        on:click={() => saveGoogle()}
-      >
-        Save
-      </Button>
-    </div>
-  {/if}
+  <Google />
  {#if providers.oidc}
    <Divider />
    <Layout gap="XS" noPadding>
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@ -373,7 +373,7 @@
  <OnboardingTypeModal {chooseCreationType} />
 </Modal>

-<Modal bind:this={passwordModal}>
+<Modal bind:this={passwordModal} disableCancel={true}>
  <PasswordModal
    createUsersResponse={bulkSaveResponse}
    userData={userData.users}
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@ -57,7 +57,10 @@ export function createDatasourcesStore() {
    return updateDatasource(response)
  }

-  const save = async (body, fetchSchema = false) => {
+  const save = async (body, { fetchSchema, tablesFilter } = {}) => {
+    if (fetchSchema == null) {
+      fetchSchema = false
+    }
    let response
    if (body._id) {
      response = await API.updateDatasource(body)
@ -65,6 +68,7 @@ export function createDatasourcesStore() {
      response = await API.createDatasource({
        datasource: body,
        fetchSchema,
+        tablesFilter,
      })
    }
    return updateDatasource(response)
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -49,7 +49,7 @@
    "pouchdb": "7.3.0",
    "pouchdb-replication-stream": "1.2.9",
    "randomstring": "1.1.5",
-    "tar": "6.1.11",
+    "tar": "6.1.15",
    "yaml": "^2.1.1"
  },
  "devDependencies": {
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.js
@ -1,7 +1,6 @@
 import { createAPIClient } from "@budibase/frontend-core"
-import { notificationStore } from "../stores/notification.js"
 import { authStore } from "../stores/auth.js"
-import { devToolsStore } from "../stores/devTools.js"
+import { notificationStore, devToolsEnabled, devToolsStore } from "../stores/"
 import { get } from "svelte/store"

 export const API = createAPIClient({
@ -25,9 +24,10 @@ export const API = createAPIClient({
    }

    // Add role header
-    const devToolsState = get(devToolsStore)
-    if (devToolsState.enabled && devToolsState.role) {
-      headers["x-budibase-role"] = devToolsState.role
+    const $devToolsStore = get(devToolsStore)
+    const $devToolsEnabled = get(devToolsEnabled)
+    if ($devToolsEnabled && $devToolsStore.role) {
+      headers["x-budibase-role"] = $devToolsStore.role
    }
  },

--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@ -17,6 +17,7 @@
    appStore,
    devToolsStore,
    environmentStore,
+    devToolsEnabled,
  } from "stores"
  import NotificationDisplay from "components/overlay/NotificationDisplay.svelte"
  import ConfirmationDisplay from "components/overlay/ConfirmationDisplay.svelte"
@ -47,10 +48,7 @@
  let permissionError = false

  // Determine if we should show devtools or not
-  $: showDevTools =
-    !$builderStore.inBuilder &&
-    $devToolsStore.enabled &&
-    !$routeStore.queryParams?.peek
+  $: showDevTools = $devToolsEnabled && !$routeStore.queryParams?.peek

  // Handle no matching route
  $: {
@ -107,6 +105,7 @@
    lang="en"
    dir="ltr"
    class="spectrum spectrum--medium {$themeStore.baseTheme} {$themeStore.theme}"
+    class:builder={$builderStore.inBuilder}
  >
    <DeviceBindingsProvider>
      <UserBindingsProvider>
@ -223,12 +222,14 @@
    overflow: hidden;
    height: 100%;
    width: 100%;
-    background: transparent;
    display: flex;
    flex-direction: row;
    justify-content: center;
    align-items: center;
  }
+  #spectrum-root.builder {
+    background: transparent;
+  }

  #clip-root {
    max-width: 100%;
--- a/packages/client/src/components/devtools/DevToolsHeader.svelte
+++ b/packages/client/src/components/devtools/DevToolsHeader.svelte
@ -1,5 +1,5 @@
 <script>
-  import { Heading, Button, Select } from "@budibase/bbui"
+  import { Heading, Select, ActionButton } from "@budibase/bbui"
  import { devToolsStore } from "../../stores"
  import { getContext } from "svelte"

@ -30,7 +30,7 @@
 </script>

 <div class="dev-preview-header" class:mobile={$context.device.mobile}>
-  <Heading size="XS">Budibase App Preview</Heading>
+  <Heading size="XS">Preview</Heading>
  <Select
    quiet
    options={previewOptions}
@ -40,36 +40,57 @@
    on:change={e => devToolsStore.actions.changeRole(e.detail)}
  />
  {#if !$context.device.mobile}
-    <Button
+    <ActionButton
      quiet
-      overBackground
      icon="Code"
      on:click={() => devToolsStore.actions.setVisible(!$devToolsStore.visible)}
    >
      {$devToolsStore.visible ? "Close" : "Open"} DevTools
-    </Button>
+    </ActionButton>
  {/if}
+  <ActionButton
+    quiet
+    icon="Close"
+    on:click={() => window.parent.closePreview?.()}
+  >
+    Close preview
+  </ActionButton>
 </div>

 <style>
  .dev-preview-header {
-    flex: 0 0 50px;
-    height: 50px;
+    flex: 0 0 60px;
    display: grid;
    align-items: center;
-    background-color: var(--spectrum-global-color-blue-400);
+    background-color: black;
    padding: 0 var(--spacing-xl);
-    grid-template-columns: 1fr auto auto;
+    grid-template-columns: 1fr auto auto auto;
    grid-gap: var(--spacing-xl);
  }
  .dev-preview-header.mobile {
-    flex: 0 0 50px;
-    grid-template-columns: 1fr auto;
+    grid-template-columns: 1fr auto auto;
  }
  .dev-preview-header :global(.spectrum-Heading),
  .dev-preview-header :global(.spectrum-Picker-menuIcon),
-  .dev-preview-header :global(.spectrum-Picker-label) {
-    color: white !important;
+  .dev-preview-header :global(.spectrum-Icon),
+  .dev-preview-header :global(.spectrum-Picker-label),
+  .dev-preview-header :global(.spectrum-ActionButton) {
+    font-weight: 600;
+    color: white;
+  }
+  .dev-preview-header :global(.spectrum-Picker) {
+    padding-left: 8px;
+    padding-right: 8px;
+    transition: background 130ms ease-out;
+    border-radius: 4px;
+  }
+  .dev-preview-header :global(.spectrum-ActionButton:hover),
+  .dev-preview-header :global(.spectrum-Picker:hover),
+  .dev-preview-header :global(.spectrum-Picker.is-open) {
+    background: rgba(255, 255, 255, 0.1);
+  }
+  .dev-preview-header :global(.spectrum-ActionButton:active) {
+    background: rgba(255, 255, 255, 0.2);
  }
  @media print {
    .dev-preview-header {
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@ -2,7 +2,6 @@ import ClientApp from "./components/ClientApp.svelte"
 import {
  builderStore,
  appStore,
-  devToolsStore,
  blockStore,
  componentStore,
  environmentStore,
@ -51,11 +50,6 @@ const loadBudibase = async () => {
    await environmentStore.actions.fetchEnvironment()
  }

-  // Enable dev tools or not. We need to be using a dev app and not inside
-  // the builder preview to enable them.
-  const enableDevTools = !get(builderStore).inBuilder && get(appStore).isDevApp
-  devToolsStore.actions.setEnabled(enableDevTools)
-
  // Register handler for runtime events from the builder
  window.handleBuilderRuntimeEvent = (type, data) => {
    if (!window["##BUDIBASE_IN_BUILDER##"]) {
--- a/packages/client/src/stores/derived/currentRole.js
+++ b/packages/client/src/stores/derived/currentRole.js
@ -2,13 +2,14 @@ import { derived } from "svelte/store"
 import { Constants } from "@budibase/frontend-core"
 import { devToolsStore } from "../devTools.js"
 import { authStore } from "../auth.js"
+import { devToolsEnabled } from "./devToolsEnabled.js"

 // Derive the current role of the logged-in user
 export const currentRole = derived(
-  [devToolsStore, authStore],
-  ([$devToolsStore, $authStore]) => {
+  [devToolsEnabled, devToolsStore, authStore],
+  ([$devToolsEnabled, $devToolsStore, $authStore]) => {
    return (
-      ($devToolsStore.enabled && $devToolsStore.role) ||
+      ($devToolsEnabled && $devToolsStore.role) ||
      $authStore?.roleId ||
      Constants.Roles.PUBLIC
    )
--- a/packages/client/src/stores/derived/devToolsEnabled.js
+++ b/packages/client/src/stores/derived/devToolsEnabled.js
@ -0,0 +1,10 @@
+import { derived } from "svelte/store"
+import { appStore } from "../app.js"
+import { builderStore } from "../builder.js"
+
+export const devToolsEnabled = derived(
+  [appStore, builderStore],
+  ([$appStore, $builderStore]) => {
+    return !$builderStore.inBuilder && $appStore.isDevApp
+  }
+)
--- a/packages/client/src/stores/derived/index.js
+++ b/packages/client/src/stores/derived/index.js
@ -3,3 +3,4 @@
 // separately we can keep our actual stores lean and performant.
 export { currentRole } from "./currentRole.js"
 export { dndComponentPath } from "./dndComponentPath.js"
+export { devToolsEnabled } from "./devToolsEnabled.js"
--- a/packages/client/src/stores/devTools.js
+++ b/packages/client/src/stores/devTools.js
@ -4,7 +4,6 @@ import { authStore } from "./auth"
 import { API } from "../api"

 const initialState = {
-  enabled: false,
  visible: false,
  allowSelection: false,
  role: null,
@ -13,13 +12,6 @@ const initialState = {
 const createDevToolStore = () => {
  const store = createLocalStorageStore("bb-devtools", initialState)

-  const setEnabled = enabled => {
-    store.update(state => ({
-      ...state,
-      enabled,
-    }))
-  }
-
  const setVisible = visible => {
    store.update(state => ({
      ...state,
@ -46,7 +38,7 @@ const createDevToolStore = () => {

  return {
    subscribe: store.subscribe,
-    actions: { setEnabled, setVisible, setAllowSelection, changeRole },
+    actions: { setVisible, setAllowSelection, changeRole },
  }
 }

--- a/packages/frontend-core/src/api/datasources.js
+++ b/packages/frontend-core/src/api/datasources.js
@ -26,13 +26,16 @@ export const buildDatasourceEndpoints = API => ({
   * Creates a datasource
   * @param datasource the datasource to create
   * @param fetchSchema whether to fetch the schema or not
+   * @param tablesFilter a list of tables to actually fetch rather than simply
+   * all that are accessible.
   */
-  createDatasource: async ({ datasource, fetchSchema }) => {
+  createDatasource: async ({ datasource, fetchSchema, tablesFilter }) => {
    return await API.post({
      url: "/api/datasources",
      body: {
        datasource,
        fetchSchema,
+        tablesFilter,
      },
    })
  },
@ -69,4 +72,15 @@ export const buildDatasourceEndpoints = API => ({
      body: { datasource },
    })
  },
+
+  /**
+   * Fetch table names available within the datasource, for filtering out undesired tables
+   * @param datasource the datasource configuration to use for fetching tables
+   */
+  fetchInfoForDatasource: async datasource => {
+    return await API.post({
+      url: `/api/datasources/info`,
+      body: { datasource },
+    })
+  },
 })
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -97,7 +97,7 @@
    "koa2-ratelimit": "1.1.1",
    "lodash": "4.17.21",
    "memorystream": "0.3.1",
-    "mongodb": "4.9",
+    "mongodb": "5.6",
    "mssql": "6.2.3",
    "mysql2": "2.3.3",
    "node-fetch": "2.6.7",
@ -117,7 +117,7 @@
    "socket.io": "4.6.1",
    "svelte": "3.49.0",
    "swagger-parser": "10.0.3",
-    "tar": "6.1.11",
+    "tar": "6.1.15",
    "to-json-schema": "0.2.5",
    "uuid": "3.3.2",
    "validate.js": "0.13.1",
@ -150,7 +150,7 @@
    "@types/redis": "4.0.11",
    "@types/server-destroy": "1.0.1",
    "@types/supertest": "2.0.12",
-    "@types/tar": "6.1.3",
+    "@types/tar": "6.1.5",
    "@typescript-eslint/parser": "5.45.0",
    "apidoc": "0.50.4",
    "babel-jest": "29.5.0",
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@ -1,17 +1,31 @@
 import sdk from "../../sdk"
-import { events, context } from "@budibase/backend-core"
+import { events, context, db } from "@budibase/backend-core"
 import { DocumentType } from "../../db/utils"
-import { isQsTrue } from "../../utilities"
+import { Ctx } from "@budibase/types"
+
+interface ExportAppDumpRequest {
+  excludeRows: boolean
+  encryptPassword?: string
+}
+
+export async function exportAppDump(ctx: Ctx<ExportAppDumpRequest>) {
+  const { appId } = ctx.query as any
+  const { excludeRows, encryptPassword } = ctx.request.body
+
+  const [app] = await db.getAppsByIDs([appId])
+  const appName = app.name

-export async function exportAppDump(ctx: any) {
-  let { appId, excludeRows } = ctx.query
  // remove the 120 second limit for the request
  ctx.req.setTimeout(0)
-  const appName = decodeURI(ctx.query.appname)
-  excludeRows = isQsTrue(excludeRows)
-  const backupIdentifier = `${appName}-export-${new Date().getTime()}.tar.gz`
+
+  const extension = encryptPassword ? "enc.tar.gz" : "tar.gz"
+  const backupIdentifier = `${appName}-export-${new Date().getTime()}.${extension}`
  ctx.attachment(backupIdentifier)
-  ctx.body = await sdk.backups.streamExportApp(appId, excludeRows)
+  ctx.body = await sdk.backups.streamExportApp({
+    appId,
+    excludeRows,
+    encryptPassword,
+  })

  await context.doInAppContext(appId, async () => {
    const appDb = context.getAppDB()
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@ -11,7 +11,7 @@ import { BuildSchemaErrors, InvalidColumns } from "../../constants"
 import { getIntegration } from "../../integrations"
 import { getDatasourceAndQuery } from "./row/utils"
 import { invalidateDynamicVariables } from "../../threads/utils"
-import { db as dbCore, context, events } from "@budibase/backend-core"
+import { db as dbCore, context, events, cache } from "@budibase/backend-core"
 import {
  UserCtx,
  Datasource,
@ -25,9 +25,11 @@ import {
  FetchDatasourceInfoResponse,
  IntegrationBase,
  DatasourcePlus,
+  SourceName,
 } from "@budibase/types"
 import sdk from "../../sdk"
 import { builderSocket } from "../../websockets"
+import { setupCreationAuth as googleSetupCreationAuth } from "../../integrations/googlesheets"

 function getErrorTables(errors: any, errorType: string) {
  return Object.entries(errors)
@ -101,6 +103,22 @@ async function buildSchemaHelper(datasource: Datasource) {
  return { tables: connector.tables, error }
 }

+async function buildFilteredSchema(datasource: Datasource, filter?: string[]) {
+  let { tables, error } = await buildSchemaHelper(datasource)
+  let finalTables = tables
+  if (filter) {
+    finalTables = {}
+    for (let key in tables) {
+      if (
+        filter.some((filter: any) => filter.toLowerCase() === key.toLowerCase())
+      ) {
+        finalTables[key] = tables[key]
+      }
+    }
+  }
+  return { tables: finalTables, error }
+}
+
 export async function fetch(ctx: UserCtx) {
  // Get internal tables
  const db = context.getAppDB()
@ -172,43 +190,28 @@ export async function information(
  }
  const tableNames = await connector.getTableNames()
  ctx.body = {
-    tableNames,
+    tableNames: tableNames.sort(),
  }
 }

 export async function buildSchemaFromDb(ctx: UserCtx) {
  const db = context.getAppDB()
-  const datasource = await sdk.datasources.get(ctx.params.datasourceId)
  const tablesFilter = ctx.request.body.tablesFilter
+  const datasource = await sdk.datasources.get(ctx.params.datasourceId)

-  let { tables, error } = await buildSchemaHelper(datasource)
-  if (tablesFilter) {
-    if (!datasource.entities) {
-      datasource.entities = {}
-    }
-    for (let key in tables) {
-      if (
-        tablesFilter.some(
-          (filter: any) => filter.toLowerCase() === key.toLowerCase()
-        )
-      ) {
-        datasource.entities[key] = tables[key]
-      }
-    }
-  } else {
+  const { tables, error } = await buildFilteredSchema(datasource, tablesFilter)
  datasource.entities = tables
-  }

  setDefaultDisplayColumns(datasource)
  const dbResp = await db.put(datasource)
  datasource._rev = dbResp.rev
  const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource)

-  const response: any = { datasource: cleanedDatasource }
+  const res: any = { datasource: cleanedDatasource }
  if (error) {
-    response.error = error
+    res.error = error
  }
-  ctx.body = response
+  ctx.body = res
 }

 /**
@ -306,12 +309,19 @@ export async function update(ctx: UserCtx<any, UpdateDatasourceResponse>) {
  builderSocket?.emitDatasourceUpdate(ctx, datasource)
 }

+const preSaveAction: Partial<Record<SourceName, any>> = {
+  [SourceName.GOOGLE_SHEETS]: async (datasource: Datasource) => {
+    await googleSetupCreationAuth(datasource.config as any)
+  },
+}
+
 export async function save(
  ctx: UserCtx<CreateDatasourceRequest, CreateDatasourceResponse>
 ) {
  const db = context.getAppDB()
  const plus = ctx.request.body.datasource.plus
  const fetchSchema = ctx.request.body.fetchSchema
+  const tablesFilter = ctx.request.body.tablesFilter

  const datasource = {
    _id: generateDatasourceID({ plus }),
@ -321,12 +331,19 @@ export async function save(

  let schemaError = null
  if (fetchSchema) {
-    const { tables, error } = await buildSchemaHelper(datasource)
+    const { tables, error } = await buildFilteredSchema(
+      datasource,
+      tablesFilter
+    )
    schemaError = error
    datasource.entities = tables
    setDefaultDisplayColumns(datasource)
  }

+  if (preSaveAction[datasource.source]) {
+    await preSaveAction[datasource.source](datasource)
+  }
+
  const dbResp = await db.put(datasource)
  await events.datasource.created(datasource)
  datasource._rev = dbResp.rev
--- a/packages/server/src/api/controllers/role.ts
+++ b/packages/server/src/api/controllers/role.ts
@ -4,7 +4,7 @@ import {
  getUserMetadataParams,
  InternalTables,
 } from "../../db/utils"
-import { BBContext, Database } from "@budibase/types"
+import { UserCtx, Database } from "@budibase/types"

 const UpdateRolesOptions = {
  CREATED: "created",
@ -38,15 +38,15 @@ async function updateRolesOnUserTable(
  }
 }

-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx) {
  ctx.body = await roles.getAllRoles()
 }

-export async function find(ctx: BBContext) {
+export async function find(ctx: UserCtx) {
  ctx.body = await roles.getRole(ctx.params.roleId)
 }

-export async function save(ctx: BBContext) {
+export async function save(ctx: UserCtx) {
  const db = context.getAppDB()
  let { _id, name, inherits, permissionId } = ctx.request.body
  let isCreate = false
@ -72,7 +72,7 @@ export async function save(ctx: BBContext) {
  ctx.message = `Role '${role.name}' created successfully.`
 }

-export async function destroy(ctx: BBContext) {
+export async function destroy(ctx: UserCtx) {
  const db = context.getAppDB()
  const roleId = ctx.params.roleId
  const role = await db.get(roleId)
--- a/packages/server/src/api/controllers/routing.ts
+++ b/packages/server/src/api/controllers/routing.ts
@ -1,6 +1,6 @@
 import { getRoutingInfo } from "../../utilities/routing"
 import { roles } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import { UserCtx } from "@budibase/types"

 const URL_SEPARATOR = "/"

@ -56,11 +56,11 @@ async function getRoutingStructure() {
  return { routes: routing.json }
 }

-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx) {
  ctx.body = await getRoutingStructure()
 }

-export async function clientFetch(ctx: BBContext) {
+export async function clientFetch(ctx: UserCtx) {
  const routing = await getRoutingStructure()
  let roleId = ctx.user?.role?._id
  const roleIds = (await roles.getUserRoleHierarchy(roleId, {
--- a/packages/server/src/api/routes/backup.ts
+++ b/packages/server/src/api/routes/backup.ts
@ -5,7 +5,7 @@ import { permissions } from "@budibase/backend-core"

 const router: Router = new Router()

-router.get(
+router.post(
  "/api/backups/export",
  authorized(permissions.BUILDER),
  controller.exportAppDump
--- a/packages/server/src/api/routes/tests/backup.spec.ts
+++ b/packages/server/src/api/routes/tests/backup.spec.ts
@ -1,7 +1,9 @@
+import tk from "timekeeper"
 import * as setup from "./utilities"
 import { events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 import { checkBuilderEndpoint } from "./utilities/TestFunctions"
+import { mocks } from "@budibase/backend-core/tests"

 describe("/backups", () => {
  let request = setup.getRequest()
@ -16,7 +18,7 @@ describe("/backups", () => {
  describe("exportAppDump", () => {
    it("should be able to export app", async () => {
      const res = await request
-        .get(`/api/backups/export?appId=${config.getAppId()}&appname=test`)
+        .post(`/api/backups/export?appId=${config.getAppId()}`)
        .set(config.defaultHeaders())
        .expect(200)
      expect(res.headers["content-type"]).toEqual("application/gzip")
@ -26,10 +28,24 @@ describe("/backups", () => {
    it("should apply authorization to endpoint", async () => {
      await checkBuilderEndpoint({
        config,
-        method: "GET",
+        method: "POST",
        url: `/api/backups/export?appId=${config.getAppId()}`,
      })
    })
+
+    it("should infer the app name from the app", async () => {
+      tk.freeze(mocks.date.MOCK_DATE)
+
+      const res = await request
+        .post(`/api/backups/export?appId=${config.getAppId()}`)
+        .set(config.defaultHeaders())
+
+      expect(res.headers["content-disposition"]).toEqual(
+        `attachment; filename="${
+          config.getApp()!.name
+        }-export-${mocks.date.MOCK_DATE.getTime()}.tar.gz"`
+      )
+    })
  })

  describe("calculateBackupStats", () => {
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@ -48,6 +48,35 @@ export const definition: AutomationStepSchema = {
          type: AutomationIOType.STRING,
          title: "HTML Contents",
        },
+        addInvite: {
+          type: AutomationIOType.BOOLEAN,
+          title: "Add calendar invite",
+        },
+        startTime: {
+          type: AutomationIOType.DATE,
+          title: "Start Time",
+          dependsOn: "addInvite",
+        },
+        endTime: {
+          type: AutomationIOType.DATE,
+          title: "End Time",
+          dependsOn: "addInvite",
+        },
+        summary: {
+          type: AutomationIOType.STRING,
+          title: "Meeting Summary",
+          dependsOn: "addInvite",
+        },
+        location: {
+          type: AutomationIOType.STRING,
+          title: "Location",
+          dependsOn: "addInvite",
+        },
+        url: {
+          type: AutomationIOType.STRING,
+          title: "URL",
+          dependsOn: "addInvite",
+        },
      },
      required: ["to", "from", "subject", "contents"],
    },
@ -68,21 +97,43 @@ export const definition: AutomationStepSchema = {
 }

 export async function run({ inputs }: AutomationStepInput) {
-  let { to, from, subject, contents, cc, bcc } = inputs
-  if (!contents) {
-    contents = "<h1>No content</h1>"
-  }
-  to = to || undefined
-  try {
-    let response = await sendSmtpEmail(
+  let {
    to,
    from,
    subject,
    contents,
    cc,
    bcc,
-      true
-    )
+    addInvite,
+    startTime,
+    endTime,
+    summary,
+    location,
+    url,
+  } = inputs
+  if (!contents) {
+    contents = "<h1>No content</h1>"
+  }
+  to = to || undefined
+  try {
+    let response = await sendSmtpEmail({
+      to,
+      from,
+      subject,
+      contents,
+      cc,
+      bcc,
+      automation: true,
+      invite: addInvite
+        ? {
+            startTime,
+            endTime,
+            summary,
+            location,
+            url,
+          }
+        : undefined,
+    })
    return {
      success: true,
      response,
--- a/packages/server/src/automations/tests/sendSmtpEmail.spec.js
+++ b/packages/server/src/automations/tests/sendSmtpEmail.spec.js
@ -1,71 +0,0 @@
-
-function generateResponse(to, from) {
-    return {
-        "success": true,
-        "response": {
-            "accepted": [
-                to
-            ],
-            "envelope": {
-                "from": from,
-                "to": [
-                    to
-                ]
-            },
-            "message": `Email sent to ${to}.`
-        }
-
-    }
-}
-
-const mockFetch = jest.fn(() => ({
-    headers: {
-        raw: () => {
-            return { "content-type": ["application/json"] }
-        },
-        get: () => ["application/json"],
-    },
-    json: jest.fn(() => response),
-    status: 200,
-    text: jest.fn(),
-}))
-jest.mock("node-fetch", () => mockFetch)
-const setup = require("./utilities")
-
-
-describe("test the outgoing webhook action", () => {
-    let inputs
-    let config = setup.getConfig()
-    beforeAll(async () => {
-        await config.init()
-    })
-
-    afterAll(setup.afterAll)
-
-    it("should be able to run the action", async () => {
-        inputs = {
-            to: "user1@test.com",
-            from: "admin@test.com",
-            subject: "hello",
-            contents: "testing",
-        }
-        let resp = generateResponse(inputs.to, inputs.from)
-        mockFetch.mockImplementationOnce(() => ({
-            headers: {
-                raw: () => {
-                    return { "content-type": ["application/json"] }
-                },
-                get: () => ["application/json"],
-            },
-            json: jest.fn(() => resp),
-            status: 200,
-            text: jest.fn(),
-        }))
-        const res = await setup.runStep(setup.actions.SEND_EMAIL_SMTP.stepId, inputs)
-        expect(res.response).toEqual(resp)
-        expect(res.success).toEqual(true)
-
-    })
-
-
-})
--- a/packages/server/src/automations/tests/sendSmtpEmail.spec.ts
+++ b/packages/server/src/automations/tests/sendSmtpEmail.spec.ts
@ -0,0 +1,74 @@
+import * as workerRequests from "../../utilities/workerRequests"
+
+jest.mock("../../utilities/workerRequests", () => ({
+  sendSmtpEmail: jest.fn(),
+}))
+
+function generateResponse(to: string, from: string) {
+  return {
+    success: true,
+    response: {
+      accepted: [to],
+      envelope: {
+        from: from,
+        to: [to],
+      },
+      message: `Email sent to ${to}.`,
+    },
+  }
+}
+
+const setup = require("./utilities")
+
+describe("test the outgoing webhook action", () => {
+  let inputs
+  let config = setup.getConfig()
+  beforeAll(async () => {
+    await config.init()
+  })
+
+  afterAll(setup.afterAll)
+
+  it("should be able to run the action", async () => {
+    jest
+      .spyOn(workerRequests, "sendSmtpEmail")
+      .mockImplementationOnce(async () =>
+        generateResponse("user1@test.com", "admin@test.com")
+      )
+    const invite = {
+      startTime: new Date(),
+      endTime: new Date(),
+      summary: "summary",
+      location: "location",
+      url: "url",
+    }
+    inputs = {
+      to: "user1@test.com",
+      from: "admin@test.com",
+      subject: "hello",
+      contents: "testing",
+      cc: "cc",
+      bcc: "bcc",
+      addInvite: true,
+      ...invite,
+    }
+    let resp = generateResponse(inputs.to, inputs.from)
+    const res = await setup.runStep(
+      setup.actions.SEND_EMAIL_SMTP.stepId,
+      inputs
+    )
+    expect(res.response).toEqual(resp)
+    expect(res.success).toEqual(true)
+    expect(workerRequests.sendSmtpEmail).toHaveBeenCalledTimes(1)
+    expect(workerRequests.sendSmtpEmail).toHaveBeenCalledWith({
+      to: "user1@test.com",
+      from: "admin@test.com",
+      subject: "hello",
+      contents: "testing",
+      cc: "cc",
+      bcc: "bcc",
+      invite,
+      automation: true,
+    })
+  })
+})
--- a/packages/server/src/events/docUpdates/syncUsers.ts
+++ b/packages/server/src/events/docUpdates/syncUsers.ts
@ -26,6 +26,10 @@ export default function process(updateCb?: UpdateCallback) {
      // if something not found - no changes to perform
      if (err?.status === 404) {
        return
+      }
+      // The user has already been sync in another process
+      else if (err?.status === 409) {
+        return
      } else {
        logging.logAlert("Failed to perform user/group app sync", err)
      }
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@ -1,5 +1,6 @@
 import {
  ConnectionInfo,
+  Datasource,
  DatasourceFeature,
  DatasourceFieldType,
  DatasourcePlus,
@ -19,13 +20,15 @@ import { OAuth2Client } from "google-auth-library"
 import { buildExternalTableId, finaliseExternalTables } from "./utils"
 import { GoogleSpreadsheet, GoogleSpreadsheetRow } from "google-spreadsheet"
 import fetch from "node-fetch"
-import { configs, HTTPError } from "@budibase/backend-core"
-import { dataFilters } from "@budibase/shared-core"
+import { cache, configs, context, HTTPError } from "@budibase/backend-core"
+import { dataFilters, utils } from "@budibase/shared-core"
 import { GOOGLE_SHEETS_PRIMARY_KEY } from "../constants"
+import sdk from "../sdk"

 interface GoogleSheetsConfig {
  spreadsheetId: string
  auth: OAuthClientConfig
+  continueSetupId?: string
 }

 interface OAuthClientConfig {
@ -72,7 +75,7 @@ const SCHEMA: Integration = {
  },
  datasource: {
    spreadsheetId: {
-      display: "Google Sheet URL",
+      display: "Spreadsheet URL",
      type: DatasourceFieldType.STRING,
      required: true,
    },
@ -207,6 +210,8 @@ class GoogleSheetsIntegration implements DatasourcePlus {

  async connect() {
    try {
+      await setupCreationAuth(this.config)
+
      // Initialise oAuth client
      let googleConfig = await configs.getGoogleDatasourceConfig()
      if (!googleConfig) {
@ -269,16 +274,14 @@ class GoogleSheetsIntegration implements DatasourcePlus {
  }

  async buildSchema(datasourceId: string, entities: Record<string, Table>) {
-    // not fully configured yet
-    if (!this.config.auth) {
-      return
-    }
    await this.connect()
    const sheets = this.client.sheetsByIndex
    const tables: Record<string, Table> = {}
-    for (let sheet of sheets) {
+    await utils.parallelForeach(
+      sheets,
+      async sheet => {
        // must fetch rows to determine schema
-      await sheet.getRows()
+        await sheet.getRows({ limit: 0, offset: 0 })

        const id = buildExternalTableId(datasourceId, sheet.title)
        tables[sheet.title] = this.getTableSchema(
@ -286,7 +289,9 @@ class GoogleSheetsIntegration implements DatasourcePlus {
          sheet.headerValues,
          id
        )
-    }
+      },
+      10
+    )
    const final = finaliseExternalTables(tables, entities)
    this.tables = final.tables
    this.schemaErrors = final.errors
@ -566,6 +571,18 @@ class GoogleSheetsIntegration implements DatasourcePlus {
  }
 }

+export async function setupCreationAuth(datasouce: GoogleSheetsConfig) {
+  if (datasouce.continueSetupId) {
+    const appId = context.getAppId()
+    const tokens = await cache.get(
+      `datasource:creation:${appId}:google:${datasouce.continueSetupId}`
+    )
+
+    datasouce.auth = tokens.tokens
+    delete datasouce.continueSetupId
+  }
+}
+
 export default {
  schema: SCHEMA,
  integration: GoogleSheetsIntegration,
--- a/packages/server/src/integrations/mongodb.ts
+++ b/packages/server/src/integrations/mongodb.ts
@ -351,7 +351,7 @@ const SCHEMA: Integration = getSchema()

 class MongoIntegration implements IntegrationBase {
  private config: MongoDBConfig
-  private client: any
+  private client: MongoClient

  constructor(config: MongoDBConfig) {
    this.config = config
@ -372,6 +372,8 @@ class MongoIntegration implements IntegrationBase {
      response.connected = true
    } catch (e: any) {
      response.error = e.message as string
+    } finally {
+      await this.client.close()
    }
    return response
  }
@ -380,7 +382,7 @@ class MongoIntegration implements IntegrationBase {
    return this.client.connect()
  }

-  createObjectIds(json: any): object {
+  createObjectIds(json: any) {
    const self = this
    function interpolateObjectIds(json: any) {
      for (let field of Object.keys(json)) {
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@ -20,7 +20,7 @@ import Sql from "./base/sql"
 import { PostgresColumn } from "./base/types"
 import { escapeDangerousCharacters } from "../utilities"

-import { Client, types } from "pg"
+import { Client, ClientConfig, types } from "pg"

 // Return "date" and "timestamp" types as plain strings.
 // This lets us reference the original stored timezone.
@ -42,6 +42,8 @@ interface PostgresConfig {
  schema: string
  ssl?: boolean
  ca?: string
+  clientKey?: string
+  clientCert?: string
  rejectUnauthorized?: boolean
 }

@ -98,6 +100,19 @@ const SCHEMA: Integration = {
      required: false,
    },
    ca: {
+      display: "Server CA",
+      type: DatasourceFieldType.LONGFORM,
+      default: false,
+      required: false,
+    },
+    clientKey: {
+      display: "Client key",
+      type: DatasourceFieldType.LONGFORM,
+      default: false,
+      required: false,
+    },
+    clientCert: {
+      display: "Client cert",
      type: DatasourceFieldType.LONGFORM,
      default: false,
      required: false,
@ -144,12 +159,14 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
    super(SqlClient.POSTGRES)
    this.config = config

-    let newConfig = {
+    let newConfig: ClientConfig = {
      ...this.config,
      ssl: this.config.ssl
        ? {
            rejectUnauthorized: this.config.rejectUnauthorized,
            ca: this.config.ca,
+            key: this.config.clientKey,
+            cert: this.config.clientCert,
          }
        : undefined,
    }
@ -322,7 +339,8 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
      await this.openConnection()
      const columnsResponse: { rows: PostgresColumn[] } =
        await this.client.query(this.COLUMNS_SQL)
-      return columnsResponse.rows.map(row => row.table_name)
+      const names = columnsResponse.rows.map(row => row.table_name)
+      return [...new Set(names)]
    } finally {
      await this.closeConnection()
    }
--- a/packages/server/src/middleware/currentapp.ts
+++ b/packages/server/src/middleware/currentapp.ts
@ -103,7 +103,7 @@ export default async (ctx: UserCtx, next: any) => {
        userId,
        globalId,
        roleId,
-        role: await roles.getRole(roleId),
+        role: await roles.getRole(roleId, { defaultPublic: true }),
      }
    }

--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@ -1,4 +1,4 @@
-import { db as dbCore, objectStore } from "@budibase/backend-core"
+import { db as dbCore, encryption, objectStore } from "@budibase/backend-core"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { streamFile, createTempFolder } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
@ -18,7 +18,8 @@ import { join } from "path"
 import env from "../../../environment"

 const uuid = require("uuid/v4")
-const tar = require("tar")
+import tar from "tar"
+
 const MemoryStream = require("memorystream")

 interface DBDumpOpts {
@ -30,16 +31,18 @@ interface ExportOpts extends DBDumpOpts {
  tar?: boolean
  excludeRows?: boolean
  excludeLogs?: boolean
+  encryptPassword?: string
 }

 function tarFilesToTmp(tmpDir: string, files: string[]) {
-  const exportFile = join(budibaseTempDir(), `${uuid()}.tar.gz`)
+  const fileName = `${uuid()}.tar.gz`
+  const exportFile = join(budibaseTempDir(), fileName)
  tar.create(
    {
      sync: true,
      gzip: true,
      file: exportFile,
-      recursive: true,
+      noDirRecurse: false,
      cwd: tmpDir,
    },
    files
@ -124,6 +127,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
      )
    }
  }
+
  const downloadedPath = join(tmpPath, appPath)
  if (fs.existsSync(downloadedPath)) {
    const allFiles = fs.readdirSync(downloadedPath)
@ -141,12 +145,27 @@ export async function exportApp(appId: string, config?: ExportOpts) {
    filter: defineFilter(config?.excludeRows, config?.excludeLogs),
    exportPath: dbPath,
  })
+
+  if (config?.encryptPassword) {
+    for (let file of fs.readdirSync(tmpPath)) {
+      const path = join(tmpPath, file)
+
+      await encryption.encryptFile(
+        { dir: tmpPath, filename: file },
+        config.encryptPassword
+      )
+
+      fs.rmSync(path)
+    }
+  }
+
  // if tar requested, return where the tarball is
  if (config?.tar) {
    // now the tmpPath contains both the DB export and attachments, tar this
    const tarPath = tarFilesToTmp(tmpPath, fs.readdirSync(tmpPath))
    // cleanup the tmp export files as tarball returned
    fs.rmSync(tmpPath, { recursive: true, force: true })
+
    return tarPath
  }
  // tar not requested, turn the directory where export is
@ -161,11 +180,20 @@ export async function exportApp(appId: string, config?: ExportOpts) {
 * @param {boolean} excludeRows Flag to state whether the export should include data.
 * @returns {*} a readable stream of the backup which is written in real time
 */
-export async function streamExportApp(appId: string, excludeRows: boolean) {
+export async function streamExportApp({
+  appId,
+  excludeRows,
+  encryptPassword,
+}: {
+  appId: string
+  excludeRows: boolean
+  encryptPassword?: string
+}) {
  const tmpPath = await exportApp(appId, {
    excludeRows,
    excludeLogs: true,
    tar: true,
+    encryptPassword,
  })
  return streamFile(tmpPath)
 }
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@ -1,4 +1,4 @@
-import { db as dbCore, objectStore } from "@budibase/backend-core"
+import { db as dbCore, encryption, objectStore } from "@budibase/backend-core"
 import { Database, Row } from "@budibase/types"
 import { getAutomationParams, TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
@ -20,6 +20,7 @@ type TemplateType = {
  file?: {
    type: string
    path: string
+    password?: string
  }
  key?: string
 }
@ -123,6 +124,22 @@ export function untarFile(file: { path: string }) {
  return tmpPath
 }

+async function decryptFiles(path: string, password: string) {
+  try {
+    for (let file of fs.readdirSync(path)) {
+      const inputPath = join(path, file)
+      const outputPath = inputPath.replace(/\.enc$/, "")
+      await encryption.decryptFile(inputPath, outputPath, password)
+      fs.rmSync(inputPath)
+    }
+  } catch (err: any) {
+    if (err.message === "incorrect header check") {
+      throw new Error("File cannot be imported")
+    }
+    throw err
+  }
+}
+
 export function getGlobalDBFile(tmpPath: string) {
  return fs.readFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), "utf8")
 }
@ -143,6 +160,9 @@ export async function importApp(
    template.file && fs.lstatSync(template.file.path).isDirectory()
  if (template.file && (isTar || isDirectory)) {
    const tmpPath = isTar ? untarFile(template.file) : template.file.path
+    if (isTar && template.file.password) {
+      await decryptFiles(tmpPath, template.file.password)
+    }
    const contents = fs.readdirSync(tmpPath)
    // have to handle object import
    if (contents.length) {
--- a/packages/server/src/sdk/app/datasources/datasources.ts
+++ b/packages/server/src/sdk/app/datasources/datasources.ts
@ -164,5 +164,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
      delete update.config[key]
    }
  }
+
  return update
 }
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@ -9,7 +9,7 @@ import {
  env as coreEnv,
 } from "@budibase/backend-core"
 import { updateAppRole } from "./global"
-import { BBContext, User } from "@budibase/types"
+import { BBContext, User, EmailInvite } from "@budibase/types"

 export function request(ctx?: BBContext, request?: any) {
  if (!request.headers) {
@ -65,15 +65,25 @@ async function checkResponse(
 }

 // have to pass in the tenant ID as this could be coming from an automation
-export async function sendSmtpEmail(
-  to: string,
-  from: string,
-  subject: string,
-  contents: string,
-  cc: string,
-  bcc: string,
+export async function sendSmtpEmail({
+  to,
+  from,
+  subject,
+  contents,
+  cc,
+  bcc,
+  automation,
+  invite,
+}: {
+  to: string
+  from: string
+  subject: string
+  contents: string
+  cc: string
+  bcc: string
  automation: boolean
-) {
+  invite?: EmailInvite
+}) {
  // tenant ID will be set in header
  const response = await fetch(
    checkSlashesInUrl(env.WORKER_URL + `/api/global/email/send`),
@ -88,6 +98,7 @@ export async function sendSmtpEmail(
        bcc,
        purpose: "custom",
        automation,
+        invite,
      },
    })
  )
--- a/packages/shared-core/src/utils.ts
+++ b/packages/shared-core/src/utils.ts
@ -4,3 +4,42 @@ export function unreachable(
 ) {
  throw new Error(message)
 }
+
+export async function parallelForeach<T>(
+  items: T[],
+  task: (item: T) => Promise<void>,
+  maxConcurrency: number
+): Promise<void> {
+  const promises: Promise<void>[] = []
+  let index = 0
+
+  const processItem = async (item: T) => {
+    try {
+      await task(item)
+    } finally {
+      processNext()
+    }
+  }
+
+  const processNext = () => {
+    if (index >= items.length) {
+      // No more items to process
+      return
+    }
+
+    const item = items[index]
+    index++
+
+    const promise = processItem(item)
+    promises.push(promise)
+
+    if (promises.length >= maxConcurrency) {
+      Promise.race(promises).then(processNext)
+    } else {
+      processNext()
+    }
+  }
+  processNext()
+
+  await Promise.all(promises)
+}
--- a/packages/types/src/api/web/app/datasource.ts
+++ b/packages/types/src/api/web/app/datasource.ts
@ -12,6 +12,7 @@ export interface UpdateDatasourceResponse {
 export interface CreateDatasourceRequest {
  datasource: Datasource
  fetchSchema?: boolean
+  tablesFilter: string[]
 }

 export interface VerifyDatasourceRequest {
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@ -1,5 +1,6 @@
 import { Document } from "../document"
 import { EventEmitter } from "events"
+import { User } from "../global"

 export enum AutomationIOType {
  OBJECT = "object",
@ -8,6 +9,7 @@ export enum AutomationIOType {
  NUMBER = "number",
  ARRAY = "array",
  JSON = "json",
+  DATE = "date",
 }

 export enum AutomationCustomIOType {
@ -66,6 +68,33 @@ export enum AutomationActionStepId {
  integromat = "integromat",
 }

+export interface EmailInvite {
+  startTime: Date
+  endTime: Date
+  summary: string
+  location?: string
+  url?: string
+}
+
+export interface SendEmailOpts {
+  // workspaceId If finer grain controls being used then this will lookup config for workspace.
+  workspaceId?: string
+  // user If sending to an existing user the object can be provided, this is used in the context.
+  user: User
+  // from If sending from an address that is not what is configured in the SMTP config.
+  from?: string
+  // contents If sending a custom email then can supply contents which will be added to it.
+  contents?: string
+  // subject A custom subject can be specified if the config one is not desired.
+  subject?: string
+  // info Pass in a structure of information to be stored alongside the invitation.
+  info?: any
+  cc?: boolean
+  bcc?: boolean
+  automation?: boolean
+  invite?: EmailInvite
+}
+
 export const AutomationStepIdArray = [
  ...Object.values(AutomationActionStepId),
  ...Object.values(AutomationTriggerStepId),
@ -90,6 +119,7 @@ interface BaseIOStructure {
  customType?: AutomationCustomIOType
  title?: string
  description?: string
+  dependsOn?: string
  enum?: string[]
  pretty?: string[]
  properties?: {
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -53,6 +53,7 @@
    "elastic-apm-node": "3.38.0",
    "global-agent": "3.0.0",
    "got": "11.8.3",
+    "ical-generator": "4.1.0",
    "joi": "17.6.0",
    "koa": "2.13.4",
    "koa-body": "4.2.0",
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@ -140,7 +140,6 @@ export const datasourcePreAuth = async (ctx: any, next: any) => {
    {
      provider,
      appId: ctx.query.appId,
-      datasourceId: ctx.query.datasourceId,
    },
    Cookie.DatasourceAuth
  )
--- a/packages/worker/src/api/controllers/global/email.ts
+++ b/packages/worker/src/api/controllers/global/email.ts
@ -14,6 +14,7 @@ export async function sendEmail(ctx: BBContext) {
    cc,
    bcc,
    automation,
+    invite,
  } = ctx.request.body
  let user
  if (userId) {
@ -29,6 +30,7 @@ export async function sendEmail(ctx: BBContext) {
    cc,
    bcc,
    automation,
+    invite,
  })
  ctx.body = {
    ...response,
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@ -4,28 +4,11 @@ import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
 import { getResetPasswordCode, getInviteCode } from "./redis"
-import { User, SMTPInnerConfig } from "@budibase/types"
+import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
 import { configs } from "@budibase/backend-core"
+import ical from "ical-generator"
 const nodemailer = require("nodemailer")

-type SendEmailOpts = {
-  // workspaceId If finer grain controls being used then this will lookup config for workspace.
-  workspaceId?: string
-  // user If sending to an existing user the object can be provided, this is used in the context.
-  user: User
-  // from If sending from an address that is not what is configured in the SMTP config.
-  from?: string
-  // contents If sending a custom email then can supply contents which will be added to it.
-  contents?: string
-  // subject A custom subject can be specified if the config one is not desired.
-  subject?: string
-  // info Pass in a structure of information to be stored alongside the invitation.
-  info?: any
-  cc?: boolean
-  bcc?: boolean
-  automation?: boolean
-}
-
 const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
 const TYPE = TemplateType.EMAIL

@ -200,6 +183,26 @@ export async function sendEmail(
      context
    )
  }
+  if (opts?.invite) {
+    const calendar = ical({
+      name: "Invite",
+    })
+    calendar.createEvent({
+      start: opts.invite.startTime,
+      end: opts.invite.endTime,
+      summary: opts.invite.summary,
+      location: opts.invite.location,
+      url: opts.invite.url,
+    })
+    message = {
+      ...message,
+      icalEvent: {
+        method: "request",
+        content: calendar.toString(),
+      },
+    }
+  }
+
  const response = await transport.sendMail(message)
  if (TEST_MODE) {
    console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))
--- a/qa-core/package.json
+++ b/qa-core/package.json
@ -10,7 +10,7 @@
  },
  "scripts": {
    "setup": "yarn && node scripts/createEnv.js",
-    "test": "jest --runInBand --json --outputFile=testResults.json",
+    "test": "jest --runInBand --json --outputFile=testResults.json --forceExit",
    "test:watch": "yarn run test --watch",
    "test:debug": "DEBUG=1 yarn run test",
    "test:notify": "node scripts/testResultsWebhook",
--- a/qa-core/scripts/testResultsWebhook.js
+++ b/qa-core/scripts/testResultsWebhook.js
@ -15,6 +15,12 @@ async function generateReport() {
  return JSON.parse(report)
 }

+const env = process.argv.slice(2)[0]
+
+if (!env) {
+  throw new Error("environment argument is required")
+}
+
 async function discordResultsNotification(report) {
  const {
    numTotalTestSuites,
@ -39,8 +45,8 @@ async function discordResultsNotification(report) {
      content: `**Nightly Tests Status**: ${OUTCOME}`,
      embeds: [
        {
-          title: "Budi QA Bot",
-          description: `Nightly Tests`,
+          title: `Budi QA Bot - ${env}`,
+          description: `API Integration Tests`,
          url: GITHUB_ACTIONS_RUN_URL,
          color: OUTCOME === "success" ? 3066993 : 15548997,
          timestamp: new Date(),
--- a/qa-core/src/account-api/api/apis/AccountAPI.ts
+++ b/qa-core/src/account-api/api/apis/AccountAPI.ts
@ -60,8 +60,16 @@ export default class AccountAPI {
  }

  async delete(accountID: string) {
-    const [response, json] = await this.client.del(`/api/accounts/${accountID}`)
-    expect(response).toHaveStatusCode(200)
+    const [response, json] = await this.client.del(
+      `/api/accounts/${accountID}`,
+      {
+        internal: true,
+      }
+    )
+    // can't use expect here due to use in global teardown
+    if (response.status !== 204) {
+      throw new Error(`Could not delete accountId=${accountID}`)
+    }
    return response
  }
 }
--- a/qa-core/src/integrations/validators/mongo.integration.spec.ts
+++ b/qa-core/src/integrations/validators/mongo.integration.spec.ts
@ -93,7 +93,7 @@ describe("datasource validators", () => {
      const result = await integration.testConnection()
      expect(result).toEqual({
        connected: false,
-        error: "Error: getaddrinfo ENOTFOUND http",
+        error: "getaddrinfo ENOTFOUND http",
      })
    })
  })
--- a/qa-core/src/integrations/validators/postgres.integration.spec.ts
+++ b/qa-core/src/integrations/validators/postgres.integration.spec.ts
@ -1,4 +1,5 @@
 import { GenericContainer } from "testcontainers"
+import postgres from "../../../../packages/server/src/integrations/postgres"

 jest.unmock("pg")

--- a/qa-core/src/jest/globalTeardown.ts
+++ b/qa-core/src/jest/globalTeardown.ts
@ -10,6 +10,7 @@ const API_OPTS: APIRequestOpts = { doExpect: false }
 async function deleteAccount() {
  // @ts-ignore
  const accountID = global.qa.accountId
+  // can't run 'expect' blocks in teardown
  await accountsApi.accounts.delete(accountID)
 }

--- a/yarn.lock
+++ b/yarn.lock