Merge branch 'master' into 12251-budi-7719-invite-new-user-panel-should-pass-the-search-email-address-into-the-email-field-of-the-add-user-page

2024-01-26 11:09:16 +00:00 · 2024-01-26 11:09:16 +00:00 · f7e39f8436
parent 89111a5b0d 97af9b2ec0
commit f7e39f8436
91 changed files with 1172 additions and 961 deletions
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@ -33,13 +33,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -50,14 +50,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
          fetch-depth: 0

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -80,7 +80,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

@ -92,14 +92,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
          fetch-depth: 0

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -116,14 +116,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
          fetch-depth: 0

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -140,14 +140,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
          fetch-depth: 0

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -165,14 +165,14 @@ jobs:
    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
    steps:
      - name: Checkout repo and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: true
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
          fetch-depth: 0

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -189,13 +189,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}

      - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: 20.x
          cache: yarn
@ -219,7 +219,7 @@ jobs:
    if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')
    steps:
      - name: Checkout repo and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: true
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
@ -249,7 +249,7 @@ jobs:

      - name: Check submodule merged to base branch
        if: ${{ steps.get_pro_commits.outputs.base_commit != '' }}
-        uses: actions/github-script@v4
+        uses: actions/github-script@v7
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
@ -269,7 +269,7 @@ jobs:
    if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')
    steps:
      - name: Checkout repo and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          submodules: true
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
@ -299,7 +299,7 @@ jobs:

      - name: Check submodule merged to base branch
        if: ${{ steps.get_accountportal_commits.outputs.base_commit != '' }}
-        uses: actions/github-script@v4
+        uses: actions/github-script@v7
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/.github/workflows/close-featurebranch.yml
+++ b/.github/workflows/close-featurebranch.yml
@ -17,7 +17,7 @@ jobs:
       github.event.label.name == 'feature-branch'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: passeidireto/trigger-external-workflow-action@main
        env:
          PAYLOAD_BRANCH: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.BRANCH || github.head_ref }}
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@ -17,7 +17,7 @@ jobs:
      contains(github.event.pull_request.labels.*.name, 'feature-branch')
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: passeidireto/trigger-external-workflow-action@main
        env:
          PAYLOAD_BRANCH: ${{ github.head_ref }}
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@ -28,7 +28,7 @@ jobs:
        run: |
          echo "Ref is not master, you must run this job from master."
          exit 1
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
@ -53,7 +53,7 @@ jobs:
    needs: [tag-release]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4

      - uses: peter-evans/repository-dispatch@v2
        with:
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.15.2",
+  "version": "2.15.7",
  "npmClient": "yarn",
  "packages": [
    "packages/*",
--- a/packages/account-portal
+++ b/packages/account-portal
@ -1 +1 @@
-Subproject commit 05c90ce55144e260da6688335c16783eab79bf96
+Subproject commit e9af6686ba135c367e9145a53d26c68325b9bf68
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@ -179,6 +179,7 @@ const environment = {
  ...getPackageJsonFields(),
  DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
  OFFLINE_MODE: process.env.OFFLINE_MODE,
+  SESSION_EXPIRY_SECONDS: process.env.SESSION_EXPIRY_SECONDS,
  _set(key: any, value: any) {
    process.env[key] = value
    // @ts-ignore
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@ -2,6 +2,7 @@ export * as configs from "./configs"
 export * as events from "./events"
 export * as migrations from "./migrations"
 export * as users from "./users"
+export * as userUtils from "./users/utils"
 export * as roles from "./security/roles"
 export * as permissions from "./security/permissions"
 export * as accounts from "./accounts"
--- a/packages/backend-core/src/security/sessions.ts
+++ b/packages/backend-core/src/security/sessions.ts
@ -1,8 +1,8 @@
-const redis = require("../redis/init")
-const { v4: uuidv4 } = require("uuid")
-const { logWarn } = require("../logging")
-
+import * as redis from "../redis/init"
+import { v4 as uuidv4 } from "uuid"
+import { logWarn } from "../logging"
 import env from "../environment"
+import { Duration } from "../utils"
 import {
  Session,
  ScannedSession,
@ -10,8 +10,10 @@ import {
  CreateSession,
 } from "@budibase/types"

-// a week in seconds
-const EXPIRY_SECONDS = 86400 * 7
+// a week expiry is the default
+const EXPIRY_SECONDS = env.SESSION_EXPIRY_SECONDS
+  ? parseInt(env.SESSION_EXPIRY_SECONDS)
+  : Duration.fromDays(7).toSeconds()

 function makeSessionID(userId: string, sessionId: string) {
  return `${userId}/${sessionId}`
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@ -251,7 +251,8 @@ export class UserDB {
    }

    const change = dbUser ? 0 : 1 // no change if there is existing user
-    const creatorsChange = isCreator(dbUser) !== isCreator(user) ? 1 : 0
+    const creatorsChange =
+      (await isCreator(dbUser)) !== (await isCreator(user)) ? 1 : 0
    return UserDB.quotas.addUsers(change, creatorsChange, async () => {
      await validateUniqueUser(email, tenantId)

@ -335,7 +336,7 @@ export class UserDB {
      }
      newUser.userGroups = groups || []
      newUsers.push(newUser)
-      if (isCreator(newUser)) {
+      if (await isCreator(newUser)) {
        newCreators.push(newUser)
      }
    }
@ -432,12 +433,16 @@ export class UserDB {
      _deleted: true,
    }))
    const dbResponse = await usersCore.bulkUpdateGlobalUsers(toDelete)
-    const creatorsToDelete = usersToDelete.filter(isCreator)
+
+    const creatorsEval = await Promise.all(usersToDelete.map(isCreator))
+    const creatorsToDeleteCount = creatorsEval.filter(
+      creator => !!creator
+    ).length

    for (let user of usersToDelete) {
      await bulkDeleteProcessing(user)
    }
-    await UserDB.quotas.removeUsers(toDelete.length, creatorsToDelete.length)
+    await UserDB.quotas.removeUsers(toDelete.length, creatorsToDeleteCount)

    // Build Response
    // index users by id
@ -486,7 +491,7 @@ export class UserDB {

    await db.remove(userId, dbUser._rev)

-    const creatorsToDelete = isCreator(dbUser) ? 1 : 0
+    const creatorsToDelete = (await isCreator(dbUser)) ? 1 : 0
    await UserDB.quotas.removeUsers(1, creatorsToDelete)
    await eventHelpers.handleDeleteEvents(dbUser)
    await cache.user.invalidateUser(userId)
--- a/packages/backend-core/src/users/test/utils.spec.ts
+++ b/packages/backend-core/src/users/test/utils.spec.ts
@ -0,0 +1,67 @@
+import { User, UserGroup } from "@budibase/types"
+import { generator, structures } from "../../../tests"
+import { DBTestConfiguration } from "../../../tests/extra"
+import { getGlobalDB } from "../../context"
+import { isCreator } from "../utils"
+
+const config = new DBTestConfiguration()
+
+describe("Users", () => {
+  it("User is a creator if it is configured as a global builder", async () => {
+    const user: User = structures.users.user({ builder: { global: true } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it is configured as a global admin", async () => {
+    const user: User = structures.users.user({ admin: { global: true } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it is configured with creator permission", async () => {
+    const user: User = structures.users.user({ builder: { creator: true } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it is a builder in some application", async () => {
+    const user: User = structures.users.user({ builder: { apps: ["app1"] } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it has CREATOR permission in some application", async () => {
+    const user: User = structures.users.user({ roles: { app1: "CREATOR" } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it has ADMIN permission in some application", async () => {
+    const user: User = structures.users.user({ roles: { app1: "ADMIN" } })
+    expect(await isCreator(user)).toBe(true)
+  })
+
+  it("User is a creator if it remains to a group with ADMIN permissions", async () => {
+    const usersInGroup = 10
+    const groupId = "gr_17abffe89e0b40268e755b952f101a59"
+    const group: UserGroup = {
+      ...structures.userGroups.userGroup(),
+      ...{ _id: groupId, roles: { app1: "ADMIN" } },
+    }
+    const users: User[] = []
+    for (const _ of Array.from({ length: usersInGroup })) {
+      const userId = `us_${generator.guid()}`
+      const user: User = structures.users.user({
+        _id: userId,
+        userGroups: [groupId],
+      })
+      users.push(user)
+    }
+
+    await config.doInTenant(async () => {
+      const db = getGlobalDB()
+      await db.put(group)
+      for (let user of users) {
+        await db.put(user)
+        const creator = await isCreator(user)
+        expect(creator).toBe(true)
+      }
+    })
+  })
+})
--- a/packages/backend-core/src/users/users.ts
+++ b/packages/backend-core/src/users/users.ts
@ -309,7 +309,8 @@ export async function getCreatorCount() {
  let creators = 0
  async function iterate(startPage?: string) {
    const page = await paginatedUsers({ bookmark: startPage })
-    creators += page.data.filter(isCreator).length
+    const creatorsEval = await Promise.all(page.data.map(isCreator))
+    creators += creatorsEval.filter(creator => !!creator).length
    if (page.hasNextPage) {
      await iterate(page.nextPage)
    }
--- a/packages/backend-core/src/users/utils.ts
+++ b/packages/backend-core/src/users/utils.ts
@ -1,4 +1,4 @@
-import { CloudAccount } from "@budibase/types"
+import { CloudAccount, ContextUser, User, UserGroup } from "@budibase/types"
 import * as accountSdk from "../accounts"
 import env from "../environment"
 import { getPlatformUser } from "./lookup"
@ -6,17 +6,48 @@ import { EmailUnavailableError } from "../errors"
 import { getTenantId } from "../context"
 import { sdk } from "@budibase/shared-core"
 import { getAccountByTenantId } from "../accounts"
+import { BUILTIN_ROLE_IDS } from "../security/roles"
+import * as context from "../context"

 // extract from shared-core to make easily accessible from backend-core
 export const isBuilder = sdk.users.isBuilder
 export const isAdmin = sdk.users.isAdmin
-export const isCreator = sdk.users.isCreator
 export const isGlobalBuilder = sdk.users.isGlobalBuilder
 export const isAdminOrBuilder = sdk.users.isAdminOrBuilder
 export const hasAdminPermissions = sdk.users.hasAdminPermissions
 export const hasBuilderPermissions = sdk.users.hasBuilderPermissions
 export const hasAppBuilderPermissions = sdk.users.hasAppBuilderPermissions

+export async function isCreator(user?: User | ContextUser) {
+  const isCreatorByUserDefinition = sdk.users.isCreator(user)
+  if (!isCreatorByUserDefinition && user) {
+    return await isCreatorByGroupMembership(user)
+  }
+  return isCreatorByUserDefinition
+}
+
+async function isCreatorByGroupMembership(user?: User | ContextUser) {
+  const userGroups = user?.userGroups || []
+  if (userGroups.length > 0) {
+    const db = context.getGlobalDB()
+    const groups: UserGroup[] = []
+    for (let groupId of userGroups) {
+      try {
+        const group = await db.get<UserGroup>(groupId)
+        groups.push(group)
+      } catch (e: any) {
+        if (e.error !== "not_found") {
+          throw e
+        }
+      }
+    }
+    return groups.some(group =>
+      Object.values(group.roles || {}).includes(BUILTIN_ROLE_IDS.ADMIN)
+    )
+  }
+  return false
+}
+
 export async function validateUniqueUser(email: string, tenantId: string) {
  // check budibase users in other tenants
  if (env.MULTI_TENANCY) {
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@ -18,7 +18,6 @@ export default function positionDropdown(element, opts) {
      useAnchorWidth,
      offset = 5,
      customUpdate,
-      offsetBelow,
    } = opts
    if (!anchor) {
      return
@ -48,7 +47,7 @@ export default function positionDropdown(element, opts) {
        styles.top = anchorBounds.top - elementBounds.height - offset
        styles.maxHeight = maxHeight || 240
      } else {
-        styles.top = anchorBounds.bottom + (offsetBelow || offset)
+        styles.top = anchorBounds.bottom + offset
        styles.maxHeight =
          maxHeight || window.innerHeight - anchorBounds.bottom - 20
      }
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@ -15,8 +15,6 @@
  export let autoWidth = false
  export let searchTerm = null
  export let customPopoverHeight
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
  export let open = false
  export let loading

@ -98,7 +96,5 @@
  {sort}
  {autoWidth}
  {customPopoverHeight}
-  {customPopoverOffsetBelow}
-  {customPopoverMaxHeight}
  {loading}
 />
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@ -37,8 +37,6 @@
  export let sort = false
  export let searchTerm = null
  export let customPopoverHeight
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
  export let align = "left"
  export let footer = null
  export let customAnchor = null
@ -156,9 +154,7 @@
  on:close={() => (open = false)}
  useAnchorWidth={!autoWidth}
  maxWidth={autoWidth ? 400 : null}
-  maxHeight={customPopoverMaxHeight}
  customHeight={customPopoverHeight}
-  offsetBelow={customPopoverOffsetBelow}
 >
  <div
    class="popover-content"
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@ -12,6 +12,7 @@
  export let getOptionIcon = () => null
  export let getOptionColour = () => null
  export let getOptionSubtitle = () => null
+  export let compare = null
  export let useOptionIconImage = false
  export let isOptionEnabled
  export let readonly = false
@ -23,8 +24,6 @@
  export let footer = null
  export let open = false
  export let tag = null
-  export let customPopoverOffsetBelow
-  export let customPopoverMaxHeight
  export let searchTerm = null
  export let loading

@ -34,13 +33,19 @@
  $: fieldIcon = getFieldAttribute(getOptionIcon, value, options)
  $: fieldColour = getFieldAttribute(getOptionColour, value, options)

+  function compareOptionAndValue(option, value) {
+    return typeof compare === "function"
+      ? compare(option, value)
+      : option === value
+  }
+
  const getFieldAttribute = (getAttribute, value, options) => {
    // Wait for options to load if there is a value but no options
    if (!options?.length) {
      return ""
    }
-    const index = options.findIndex(
-      (option, idx) => getOptionValue(option, idx) === value
+    const index = options.findIndex((option, idx) =>
+      compareOptionAndValue(getOptionValue(option, idx), value)
    )
    return index !== -1 ? getAttribute(options[index], index) : null
  }
@ -90,11 +95,9 @@
  {autocomplete}
  {sort}
  {tag}
-  {customPopoverOffsetBelow}
-  {customPopoverMaxHeight}
  isPlaceholder={value == null || value === ""}
  placeholderOption={placeholder === false ? null : placeholder}
-  isOptionSelected={option => option === value}
+  isOptionSelected={option => compareOptionAndValue(option, value)}
  onSelectOption={selectOption}
  {loading}
 />
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@ -28,6 +28,7 @@
  export let footer = null
  export let tag = null
  export let helpText = null
+  export let compare
  const dispatch = createEventDispatcher()
  const onChange = e => {
    value = e.detail
@ -65,6 +66,7 @@
    {autocomplete}
    {customPopoverHeight}
    {tag}
+    {compare}
    on:change={onChange}
    on:click
  />
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@ -18,7 +18,6 @@
  export let useAnchorWidth = false
  export let dismissible = true
  export let offset = 5
-  export let offsetBelow
  export let customHeight
  export let animate = true
  export let customZindex
@ -89,7 +88,6 @@
        maxWidth,
        useAnchorWidth,
        offset,
-        offsetBelow,
        customUpdate: handlePostionUpdate,
      }}
      use:clickOutside={{
--- a/packages/builder/src/builderStore/componentUtils.js
+++ b/packages/builder/src/builderStore/componentUtils.js
@ -92,14 +92,7 @@ export const findAllMatchingComponents = (rootComponent, selector) => {
 }

 /**
- * Recurses through the component tree and finds all components.
- */
-export const findAllComponents = rootComponent => {
-  return findAllMatchingComponents(rootComponent, () => true)
-}
-
-/**
- * Finds the closest parent component which matches certain criteria
+ * Finds the closes parent component which matches certain criteria
 */
 export const findClosestMatchingComponent = (
  rootComponent,
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@ -1,7 +1,6 @@
 import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
 import {
-  findAllComponents,
  findAllMatchingComponents,
  findComponent,
  findComponentPath,
@ -103,9 +102,6 @@ export const getAuthBindings = () => {
  return bindings
 }

-/**
- * Gets all bindings for environment variables
- */
 export const getEnvironmentBindings = () => {
  let envVars = get(environment).variables
  return envVars.map(variable => {
@ -134,22 +130,26 @@ export const toBindingsArray = (valueMap, prefix, category) => {
    if (!binding) {
      return acc
    }
+
    let config = {
      type: "context",
      runtimeBinding: binding,
      readableBinding: `${prefix}.${binding}`,
      icon: "Brackets",
    }
+
    if (category) {
      config.category = category
    }
+
    acc.push(config)
+
    return acc
  }, [])
 }

 /**
- * Utility to covert a map of readable bindings to runtime
+ * Utility - coverting a map of readable bindings to runtime
 */
 export const readableToRuntimeMap = (bindings, ctx) => {
  if (!bindings || !ctx) {
@ -162,7 +162,7 @@ export const readableToRuntimeMap = (bindings, ctx) => {
 }

 /**
- * Utility to covert a map of runtime bindings to readable bindings
+ * Utility - coverting a map of runtime bindings to readable
 */
 export const runtimeToReadableMap = (bindings, ctx) => {
  if (!bindings || !ctx) {
@ -188,23 +188,15 @@ export const getComponentBindableProperties = (asset, componentId) => {
  if (!def?.context) {
    return []
  }
-  const contexts = Array.isArray(def.context) ? def.context : [def.context]

  // Get the bindings for the component
-  const componentContext = {
-    component,
-    definition: def,
-    contexts,
-  }
-  return generateComponentContextBindings(asset, componentContext)
+  return getProviderContextBindings(asset, component)
 }

 /**
- * Gets all component contexts available to a certain component. This handles
- * both global and local bindings, taking into account a component's position
- * in the component tree.
+ * Gets all data provider components above a component.
 */
-export const getComponentContexts = (
+export const getContextProviderComponents = (
  asset,
  componentId,
  type,
@ -213,55 +205,30 @@ export const getComponentContexts = (
  if (!asset || !componentId) {
    return []
  }
-  let map = {}

-  // Processes all contexts exposed by a component
-  const processContexts = scope => component => {
+  // Get the component tree leading up to this component, ignoring the component
+  // itself
+  const path = findComponentPath(asset.props, componentId)
+  if (!options?.includeSelf) {
+    path.pop()
+  }
+
+  // Filter by only data provider components
+  return path.filter(component => {
    const def = store.actions.components.getDefinition(component._component)
    if (!def?.context) {
-      return
+      return false
    }
-    if (!map[component._id]) {
-      map[component._id] = {
-        component,
-        definition: def,
-        contexts: [],
-      }
+
+    // If no type specified, return anything that exposes context
+    if (!type) {
+      return true
    }
+
+    // Otherwise only match components with the specific context type
    const contexts = Array.isArray(def.context) ? def.context : [def.context]
-    contexts.forEach(context => {
-      // Ensure type matches
-      if (type && context.type !== type) {
-        return
-      }
-      // Ensure scope matches
-      let contextScope = context.scope || "global"
-      if (contextScope !== scope) {
-        return
-      }
-      // Ensure the context is compatible with the component's current settings
-      if (!isContextCompatibleWithComponent(context, component)) {
-        return
-      }
-      map[component._id].contexts.push(context)
-    })
-  }
-
-  // Process all global contexts
-  const allComponents = findAllComponents(asset.props)
-  allComponents.forEach(processContexts("global"))
-
-  // Process all local contexts
-  const localComponents = findComponentPath(asset.props, componentId)
-  localComponents.forEach(processContexts("local"))
-
-  // Exclude self if required
-  if (!options?.includeSelf) {
-    delete map[componentId]
-  }
-
-  // Only return components which provide at least 1 matching context
-  return Object.values(map).filter(x => x.contexts.length > 0)
+    return contexts.find(context => context.type === type) != null
+  })
 }

 /**
@ -273,19 +240,20 @@ export const getActionProviders = (
  actionType,
  options = { includeSelf: false }
 ) => {
-  if (!asset) {
+  if (!asset || !componentId) {
    return []
  }

-  // Get all components
-  const components = findAllComponents(asset.props)
+  // Get the component tree leading up to this component, ignoring the component
+  // itself
+  const path = findComponentPath(asset.props, componentId)
+  if (!options?.includeSelf) {
+    path.pop()
+  }

  // Find matching contexts and generate bindings
  let providers = []
-  components.forEach(component => {
-    if (!options?.includeSelf && component._id === componentId) {
-      return
-    }
+  path.forEach(component => {
    const def = store.actions.components.getDefinition(component._component)
    const actions = (def?.actions || []).map(action => {
      return typeof action === "string" ? { type: action } : action
@ -349,135 +317,142 @@ export const getDatasourceForProvider = (asset, component) => {
 * Gets all bindable data properties from component data contexts.
 */
 const getContextBindings = (asset, componentId) => {
-  // Get all available contexts for this component
-  const componentContexts = getComponentContexts(asset, componentId)
+  // Extract any components which provide data contexts
+  const dataProviders = getContextProviderComponents(asset, componentId)

-  // Generate bindings for each context
-  return componentContexts
-    .map(componentContext => {
-      return generateComponentContextBindings(asset, componentContext)
-    })
-    .flat()
+  // Generate bindings for all matching components
+  return getProviderContextBindings(asset, dataProviders)
 }

 /**
- * Generates a set of bindings for a given component context
+ * Gets the context bindings exposed by a set of data provider components.
 */
-const generateComponentContextBindings = (asset, componentContext) => {
-  const { component, definition, contexts } = componentContext
-  if (!component || !definition || !contexts?.length) {
+const getProviderContextBindings = (asset, dataProviders) => {
+  if (!asset || !dataProviders) {
    return []
  }

+  // Ensure providers is an array
+  if (!Array.isArray(dataProviders)) {
+    dataProviders = [dataProviders]
+  }
+
  // Create bindings for each data provider
  let bindings = []
-  contexts.forEach(context => {
-    if (!context?.type) {
-      return
-    }
+  dataProviders.forEach(component => {
+    const def = store.actions.components.getDefinition(component._component)
+    const contexts = Array.isArray(def.context) ? def.context : [def.context]

-    let schema
-    let table
-    let readablePrefix
-    let runtimeSuffix = context.suffix
-
-    if (context.type === "form") {
-      // Forms do not need table schemas
-      // Their schemas are built from their component field names
-      schema = buildFormSchema(component, asset)
-      readablePrefix = "Fields"
-    } else if (context.type === "static") {
-      // Static contexts are fully defined by the components
-      schema = {}
-      const values = context.values || []
-      values.forEach(value => {
-        schema[value.key] = {
-          name: value.label,
-          type: value.type || "string",
-        }
-      })
-    } else if (context.type === "schema") {
-      // Schema contexts are generated dynamically depending on their data
-      const datasource = getDatasourceForProvider(asset, component)
-      if (!datasource) {
+    // Create bindings for each context block provided by this data provider
+    contexts.forEach(context => {
+      if (!context?.type) {
        return
      }
-      const info = getSchemaForDatasource(asset, datasource)
-      schema = info.schema
-      table = info.table

-      // Determine what to prefix bindings with
-      if (datasource.type === "jsonarray") {
-        // For JSON arrays, use the array name as the readable prefix
-        const split = datasource.label.split(".")
-        readablePrefix = split[split.length - 1]
-      } else if (datasource.type === "viewV2") {
-        // For views, use the view name
-        const view = Object.values(table?.views || {}).find(
-          view => view.id === datasource.id
+      let schema
+      let table
+      let readablePrefix
+      let runtimeSuffix = context.suffix
+
+      if (context.type === "form") {
+        // Forms do not need table schemas
+        // Their schemas are built from their component field names
+        schema = buildFormSchema(component, asset)
+        readablePrefix = "Fields"
+      } else if (context.type === "static") {
+        // Static contexts are fully defined by the components
+        schema = {}
+        const values = context.values || []
+        values.forEach(value => {
+          schema[value.key] = {
+            name: value.label,
+            type: value.type || "string",
+          }
+        })
+      } else if (context.type === "schema") {
+        // Schema contexts are generated dynamically depending on their data
+        const datasource = getDatasourceForProvider(asset, component)
+        if (!datasource) {
+          return
+        }
+        const info = getSchemaForDatasource(asset, datasource)
+        schema = info.schema
+        table = info.table
+
+        // Determine what to prefix bindings with
+        if (datasource.type === "jsonarray") {
+          // For JSON arrays, use the array name as the readable prefix
+          const split = datasource.label.split(".")
+          readablePrefix = split[split.length - 1]
+        } else if (datasource.type === "viewV2") {
+          // For views, use the view name
+          const view = Object.values(table?.views || {}).find(
+            view => view.id === datasource.id
+          )
+          readablePrefix = view?.name
+        } else {
+          // Otherwise use the table name
+          readablePrefix = info.table?.name
+        }
+      }
+      if (!schema) {
+        return
+      }
+
+      const keys = Object.keys(schema).sort()
+
+      // Generate safe unique runtime prefix
+      let providerId = component._id
+      if (runtimeSuffix) {
+        providerId += `-${runtimeSuffix}`
+      }
+
+      if (!filterCategoryByContext(component, context)) {
+        return
+      }
+
+      const safeComponentId = makePropSafe(providerId)
+
+      // Create bindable properties for each schema field
+      keys.forEach(key => {
+        const fieldSchema = schema[key]
+
+        // Make safe runtime binding
+        const safeKey = key.split(".").map(makePropSafe).join(".")
+        const runtimeBinding = `${safeComponentId}.${safeKey}`
+
+        // Optionally use a prefix with readable bindings
+        let readableBinding = component._instanceName
+        if (readablePrefix) {
+          readableBinding += `.${readablePrefix}`
+        }
+        readableBinding += `.${fieldSchema.name || key}`
+
+        const bindingCategory = getComponentBindingCategory(
+          component,
+          context,
+          def
        )
-        readablePrefix = view?.name
-      } else {
-        // Otherwise use the table name
-        readablePrefix = info.table?.name
-      }
-    }
-    if (!schema) {
-      return
-    }

-    const keys = Object.keys(schema).sort()
-
-    // Generate safe unique runtime prefix
-    let providerId = component._id
-    if (runtimeSuffix) {
-      providerId += `-${runtimeSuffix}`
-    }
-    const safeComponentId = makePropSafe(providerId)
-
-    // Create bindable properties for each schema field
-    keys.forEach(key => {
-      const fieldSchema = schema[key]
-
-      // Make safe runtime binding
-      const safeKey = key.split(".").map(makePropSafe).join(".")
-      const runtimeBinding = `${safeComponentId}.${safeKey}`
-
-      // Optionally use a prefix with readable bindings
-      let readableBinding = component._instanceName
-      if (readablePrefix) {
-        readableBinding += `.${readablePrefix}`
-      }
-      readableBinding += `.${fieldSchema.name || key}`
-
-      // Determine which category this binding belongs in
-      const bindingCategory = getComponentBindingCategory(
-        component,
-        context,
-        definition
-      )
-
-      // Temporarily append scope for debugging
-      const scope = `[${(context.scope || "global").toUpperCase()}]`
-
-      // Create the binding object
-      bindings.push({
-        type: "context",
-        runtimeBinding,
-        readableBinding: `${scope} ${readableBinding}`,
-        // Field schema and provider are required to construct relationship
-        // datasource options, based on bindable properties
-        fieldSchema,
-        providerId,
-        // Table ID is used by JSON fields to know what table the field is in
-        tableId: table?._id,
-        component: component._component,
-        category: bindingCategory.category,
-        icon: bindingCategory.icon,
-        display: {
-          name: `${scope} ${fieldSchema.name || key}`,
-          type: fieldSchema.type,
-        },
+        // Create the binding object
+        bindings.push({
+          type: "context",
+          runtimeBinding,
+          readableBinding,
+          // Field schema and provider are required to construct relationship
+          // datasource options, based on bindable properties
+          fieldSchema,
+          providerId,
+          // Table ID is used by JSON fields to know what table the field is in
+          tableId: table?._id,
+          component: component._component,
+          category: bindingCategory.category,
+          icon: bindingCategory.icon,
+          display: {
+            name: fieldSchema.name || key,
+            type: fieldSchema.type,
+          },
+        })
      })
    })
  })
@ -485,38 +460,25 @@ const generateComponentContextBindings = (asset, componentContext) => {
  return bindings
 }

-/**
- * Checks if a certain data context is compatible with a certain instance of a
- * configured component.
- */
-const isContextCompatibleWithComponent = (context, component) => {
-  if (!component) {
-    return false
-  }
-  const { _component, actionType } = component
-  const { type } = context
-
-  // Certain types of form blocks only allow certain contexts
+// Exclude a data context based on the component settings
+const filterCategoryByContext = (component, context) => {
+  const { _component } = component
  if (_component.endsWith("formblock")) {
    if (
-      (actionType === "Create" && type === "schema") ||
-      (actionType === "View" && type === "form")
+      (component.actionType === "Create" && context.type === "schema") ||
+      (component.actionType === "View" && context.type === "form")
    ) {
      return false
    }
  }
-
-  // Allow the context by default
  return true
 }

 // Enrich binding category information for certain components
 const getComponentBindingCategory = (component, context, def) => {
-  // Default category to component name
  let icon = def.icon
  let category = component._instanceName

-  // Form block edge case
  if (component._component.endsWith("formblock")) {
    if (context.type === "form") {
      category = `${component._instanceName} - Fields`
@ -534,7 +496,7 @@ const getComponentBindingCategory = (component, context, def) => {
 }

 /**
- * Gets all bindable properties from the logged-in user.
+ * Gets all bindable properties from the logged in user.
 */
 export const getUserBindings = () => {
  let bindings = []
@ -604,7 +566,6 @@ const getDeviceBindings = () => {

 /**
 * Gets all selected rows bindings for tables in the current asset.
- * TODO: remove in future because we don't need a separate store for this
 */
 const getSelectedRowsBindings = asset => {
  let bindings = []
@ -647,9 +608,6 @@ const getSelectedRowsBindings = asset => {
  return bindings
 }

-/**
- * Generates a state binding for a certain key name
- */
 export const makeStateBinding = key => {
  return {
    type: "context",
@ -704,9 +662,6 @@ const getUrlBindings = asset => {
  return urlParamBindings.concat([queryParamsBinding])
 }

-/**
- * Generates all bindings for role IDs
- */
 const getRoleBindings = () => {
  return (get(rolesStore) || []).map(role => {
    return {
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@ -9,6 +9,7 @@ import { findComponent, findComponentPath } from "./componentUtils"
 import { RoleUtils } from "@budibase/frontend-core"
 import { createHistoryStore } from "builderStore/store/history"
 import { cloneDeep } from "lodash/fp"
+import { getHoverStore } from "./store/hover"

 export const store = getFrontendStore()
 export const automationStore = getAutomationStore()
@ -16,6 +17,7 @@ export const themeStore = getThemeStore()
 export const temporalStore = getTemporalStore()
 export const userStore = getUserStore()
 export const deploymentStore = getDeploymentStore()
+export const hoverStore = getHoverStore()

 // Setup history for screens
 export const screenHistoryStore = createHistoryStore({
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@ -92,9 +92,6 @@ const INITIAL_FRONTEND_STATE = {
  // Onboarding
  onboarding: false,
  tourNodes: null,
-
-  // UI state
-  hoveredComponentId: null,
 }

 export const getFrontendStore = () => {
@ -709,9 +706,10 @@ export const getFrontendStore = () => {
          else {
            if (setting.type === "dataProvider") {
              // Validate data provider exists, or else clear it
-              const providers = findAllMatchingComponents(
-                screen?.props,
-                component => component._component?.endsWith("/dataprovider")
+              const treeId = parent?._id || component._id
+              const path = findComponentPath(screen?.props, treeId)
+              const providers = path.filter(component =>
+                component._component?.endsWith("/dataprovider")
              )
              // Validate non-empty values
              const valid = providers?.some(dp => value.includes?.(dp._id))
@ -733,16 +731,6 @@ export const getFrontendStore = () => {
          return null
        }

-        // Find all existing components of this type so that we can give this
-        // component a unique name
-        const screen = get(selectedScreen).props
-        const otherComponents = findAllMatchingComponents(
-          screen,
-          x => x._component === definition.component && x._id !== screen._id
-        )
-        let name = definition.friendlyName || definition.name
-        name = `${name} ${otherComponents.length + 1}`
-
        // Generate basic component structure
        let instance = {
          _id: Helpers.uuid(),
@ -752,7 +740,7 @@ export const getFrontendStore = () => {
            hover: {},
            active: {},
          },
-          _instanceName: name,
+          _instanceName: `New ${definition.friendlyName || definition.name}`,
          ...presetProps,
        }

@ -1424,18 +1412,6 @@ export const getFrontendStore = () => {
          return state
        })
      },
-      hover: (componentId, notifyClient = true) => {
-        if (componentId === get(store).hoveredComponentId) {
-          return
-        }
-        store.update(state => {
-          state.hoveredComponentId = componentId
-          return state
-        })
-        if (notifyClient) {
-          store.actions.preview.sendEvent("hover-component", componentId)
-        }
-      },
    },
    links: {
      save: async (url, title) => {
--- a/packages/builder/src/builderStore/store/hover.js
+++ b/packages/builder/src/builderStore/store/hover.js
@ -0,0 +1,27 @@
+import { get, writable } from "svelte/store"
+import { store as builder } from "builderStore"
+
+export const getHoverStore = () => {
+  const initialValue = {
+    componentId: null,
+  }
+
+  const store = writable(initialValue)
+
+  const update = (componentId, notifyClient = true) => {
+    if (componentId === get(store).componentId) {
+      return
+    }
+    store.update(state => {
+      state.componentId = componentId
+      return state
+    })
+    if (notifyClient) {
+      builder.actions.preview.sendEvent("hover-component", componentId)
+    }
+  }
+  return {
+    subscribe: store.subscribe,
+    actions: { update },
+  }
+}
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -184,8 +184,9 @@
      }

      if (
-        (idx === 0 && automation.trigger?.event === "row:update") ||
-        automation.trigger?.event === "row:save"
+        idx === 0 &&
+        (automation.trigger?.event === "row:update" ||
+          automation.trigger?.event === "row:save")
      ) {
        if (name !== "id" && name !== "revision") return `trigger.row.${name}`
      }
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@ -88,8 +88,12 @@
      hasValidated = false
    })
  }
+
  $: valid =
-    getErrorCount(errors) === 0 && allRequiredAttributesSet(relationshipType)
+    getErrorCount(errors) === 0 &&
+    allRequiredAttributesSet(relationshipType) &&
+    fromId &&
+    toId
  $: isManyToMany = relationshipType === RelationshipType.MANY_TO_MANY
  $: isManyToOne =
    relationshipType === RelationshipType.MANY_TO_ONE ||
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@ -1,4 +1,5 @@
-import { getComponentContexts } from "builderStore/dataBinding"
+import { getContextProviderComponents } from "builderStore/dataBinding"
+import { store } from "builderStore"
 import { capitalise } from "helpers"

 // Generates bindings for all components that provider "datasource like"
@ -7,49 +8,58 @@ import { capitalise } from "helpers"
 // Some examples are saving rows or duplicating rows.
 export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
  // Get all form context providers
-  const formComponentContexts = getComponentContexts(
+  const formComponents = getContextProviderComponents(
    asset,
    componentId,
    "form",
-    {
-      includeSelf: nested,
-    }
+    { includeSelf: nested }
  )
+
  // Get all schema context providers
-  const schemaComponentContexts = getComponentContexts(
+  const schemaComponents = getContextProviderComponents(
    asset,
    componentId,
    "schema",
-    {
-      includeSelf: nested,
-    }
+    { includeSelf: nested }
  )

+  // Generate contexts for all form providers
+  const formContexts = formComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "form"),
+  }))
+
+  // Generate contexts for all schema providers
+  const schemaContexts = schemaComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "schema"),
+  }))
+
  // Check for duplicate contexts by the same component. In this case, attempt
  // to label contexts with their suffixes
-  schemaComponentContexts.forEach(schemaContext => {
+  schemaContexts.forEach(schemaContext => {
    // Check if we have a form context for this component
    const id = schemaContext.component._id
-    const existing = formComponentContexts.find(x => x.component._id === id)
+    const existing = formContexts.find(x => x.component._id === id)
    if (existing) {
-      if (existing.contexts[0].suffix) {
-        const suffix = capitalise(existing.contexts[0].suffix)
+      if (existing.context.suffix) {
+        const suffix = capitalise(existing.context.suffix)
        existing.readableSuffix = ` - ${suffix}`
      }
-      if (schemaContext.contexts[0].suffix) {
-        const suffix = capitalise(schemaContext.contexts[0].suffix)
+      if (schemaContext.context.suffix) {
+        const suffix = capitalise(schemaContext.context.suffix)
        schemaContext.readableSuffix = ` - ${suffix}`
      }
    }
  })

  // Generate bindings for all contexts
-  const allContexts = formComponentContexts.concat(schemaComponentContexts)
-  return allContexts.map(({ component, contexts, readableSuffix }) => {
+  const allContexts = formContexts.concat(schemaContexts)
+  return allContexts.map(({ component, context, readableSuffix }) => {
    let readableBinding = component._instanceName
    let runtimeBinding = component._id
-    if (contexts[0].suffix) {
-      runtimeBinding += `-${contexts[0].suffix}`
+    if (context.suffix) {
+      runtimeBinding += `-${context.suffix}`
    }
    if (readableSuffix) {
      readableBinding += readableSuffix
@ -60,3 +70,13 @@ export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
    }
  })
 }
+
+// Gets a context definition of a certain type from a component definition
+const extractComponentContext = (component, contextType) => {
+  const def = store.actions.components.getDefinition(component?._component)
+  if (!def) {
+    return null
+  }
+  const contexts = Array.isArray(def.context) ? def.context : [def.context]
+  return contexts.find(context => context?.type === contextType)
+}
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@ -5,6 +5,7 @@
  import { store } from "builderStore"
  import { Helpers } from "@budibase/bbui"
  import { getEventContextBindings } from "builderStore/dataBinding"
+  import { cloneDeep, isEqual } from "lodash/fp"

  export let componentInstance
  export let componentBindings
@ -17,8 +18,13 @@
  const dispatch = createEventDispatcher()

  let focusItem
+  let cachedValue

-  $: buttonList = sanitizeValue(value) || []
+  $: if (!isEqual(value, cachedValue)) {
+    cachedValue = cloneDeep(value)
+  }
+
+  $: buttonList = sanitizeValue(cachedValue) || []
  $: buttonCount = buttonList.length
  $: eventContextBindings = getEventContextBindings({
    componentInstance,
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@ -1,16 +1,15 @@
 <script>
  import { Select } from "@budibase/bbui"
  import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset } from "builderStore"
-  import { findAllMatchingComponents } from "builderStore/componentUtils"
+  import { currentAsset, store } from "builderStore"
+  import { findComponentPath } from "builderStore/componentUtils"

  export let value

  const getValue = component => `{{ literal ${makePropSafe(component._id)} }}`

-  $: providers = findAllMatchingComponents($currentAsset?.props, c =>
-    c._component?.endsWith("/dataprovider")
-  )
+  $: path = findComponentPath($currentAsset?.props, $store.selectedComponentId)
+  $: providers = path.filter(c => c._component?.endsWith("/dataprovider"))
 </script>

 <Select
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@ -1,5 +1,6 @@
 <script>
  import {
+    getContextProviderComponents,
    readableToRuntimeBinding,
    runtimeToReadableBinding,
  } from "builderStore/dataBinding"
@ -29,7 +30,6 @@
  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
  import IntegrationQueryEditor from "components/integration/index.svelte"
  import { makePropSafe as safe } from "@budibase/string-templates"
-  import { findAllComponents } from "builderStore/componentUtils"
  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
  import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
  import { API } from "api"
@ -75,13 +75,12 @@
      ...query,
      type: "query",
    }))
-  $: dataProviders = findAllComponents($currentAsset.props)
-    .filter(component => {
-      return (
-        component._component?.endsWith("/dataprovider") &&
-        component._id !== $store.selectedComponentId
-      )
-    })
+  $: contextProviders = getContextProviderComponents(
+    $currentAsset,
+    $store.selectedComponentId
+  )
+  $: dataProviders = contextProviders
+    .filter(component => component._component?.endsWith("/dataprovider"))
    .map(provider => ({
      label: provider._instanceName,
      name: provider._instanceName,
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@ -35,6 +35,7 @@
  export let bindingDrawerLeft
  export let allowHelpers = true
  export let customButtonText = null
+  export let compare = (option, value) => option === value

  let fields = Object.entries(object || {}).map(([name, value]) => ({
    name,
@ -112,7 +113,12 @@
        on:blur={changed}
      />
      {#if options}
-        <Select bind:value={field.value} on:change={changed} {options} />
+        <Select
+          bind:value={field.value}
+          {compare}
+          on:change={changed}
+          {options}
+        />
      {:else if bindings && bindings.length}
        <DrawerBindableInput
          {bindings}
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
@ -1,6 +1,6 @@
 <script>
  import KeyValueBuilder from "../KeyValueBuilder.svelte"
-  import { SchemaTypeOptions } from "constants/backend"
+  import { SchemaTypeOptionsExpanded } from "constants/backend"

  export let schema
  export let onSchemaChange = () => {}
@ -24,6 +24,7 @@
    object={schema}
    name="field"
    headings
-    options={SchemaTypeOptions}
+    options={SchemaTypeOptionsExpanded}
+    compare={(option, value) => option.type === value.type}
  />
 {/key}
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@ -33,7 +33,7 @@
    PaginationTypes,
    RawRestBodyTypes,
    RestBodyTypes as bodyTypes,
-    SchemaTypeOptions,
+    SchemaTypeOptionsExpanded,
  } from "constants/backend"
  import JSONPreview from "components/integration/JSONPreview.svelte"
  import AccessLevelSelect from "components/integration/AccessLevelSelect.svelte"
@ -97,9 +97,7 @@
  $: schemaReadOnly = !responseSuccess
  $: variablesReadOnly = !responseSuccess
  $: showVariablesTab = shouldShowVariables(dynamicVariables, variablesReadOnly)
-  $: hasSchema =
-    Object.keys(schema || {}).length !== 0 ||
-    Object.keys(query?.schema || {}).length !== 0
+  $: hasSchema = Object.keys(schema || {}).length !== 0

  $: runtimeUrlQueries = readableToRuntimeMap(mergedBindings, breakQs)

@ -161,7 +159,7 @@
    newQuery.fields.queryString = queryString
    newQuery.fields.authConfigId = authConfigId
    newQuery.fields.disabledHeaders = restUtils.flipHeaderState(enabledHeaders)
-    newQuery.schema = restUtils.fieldsToSchema(schema)
+    newQuery.schema = schema

    return newQuery
  }
@ -231,6 +229,14 @@
        notifications.info("Request did not return any data")
      } else {
        response.info = response.info || { code: 200 }
+        // if existing schema, copy over what it is
+        if (schema) {
+          for (let [name, field] of Object.entries(schema)) {
+            if (response.schema[name]) {
+              response.schema[name] = field
+            }
+          }
+        }
        schema = response.schema
        notifications.success("Request sent successfully")
      }
@ -386,6 +392,7 @@

  onMount(async () => {
    query = getSelectedQuery()
+    schema = query.schema

    try {
      // Clear any unsaved changes to the datasource
@ -416,7 +423,6 @@
      query.fields.path = `${datasource.config.url}/${path ? path : ""}`
    }
    url = buildUrl(query.fields.path, breakQs)
-    schema = restUtils.schemaToFields(query.schema)
    requestBindings = restUtils.queryParametersToKeyValue(query.parameters)
    authConfigId = getAuthConfigId()
    if (!query.fields.disabledHeaders) {
@ -682,10 +688,11 @@
                  bind:object={schema}
                  name="schema"
                  headings
-                  options={SchemaTypeOptions}
+                  options={SchemaTypeOptionsExpanded}
                  menuItems={schemaMenuItems}
                  showMenu={!schemaReadOnly}
                  readOnly={schemaReadOnly}
+                  compare={(option, value) => option.type === value.type}
                />
              </Tab>
            {/if}
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@ -271,6 +271,11 @@ export const SchemaTypeOptions = [
  { label: "Datetime", value: "datetime" },
 ]

+export const SchemaTypeOptionsExpanded = SchemaTypeOptions.map(el => ({
+  ...el,
+  value: { type: el.value },
+}))
+
 export const RawRestBodyTypes = {
  NONE: "none",
  FORM: "form",
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@ -1,26 +1,6 @@
 import { IntegrationTypes } from "constants/backend"
 import { findHBSBlocks } from "@budibase/string-templates"

-export function schemaToFields(schema) {
-  const response = {}
-  if (schema && typeof schema === "object") {
-    for (let [field, value] of Object.entries(schema)) {
-      response[field] = value?.type || "string"
-    }
-  }
-  return response
-}
-
-export function fieldsToSchema(fields) {
-  const response = {}
-  if (fields && typeof fields === "object") {
-    for (let [name, type] of Object.entries(fields)) {
-      response[name] = { name, type }
-    }
-  }
-  return response
-}
-
 export function breakQueryString(qs) {
  if (!qs) {
    return {}
@ -184,10 +164,8 @@ export const parseToCsv = (headers, rows) => {
 export default {
  breakQueryString,
  buildQueryString,
-  fieldsToSchema,
  flipHeaderState,
  keyValueToQueryParameters,
  parseToCsv,
  queryParametersToKeyValue,
-  schemaToFields,
 }
--- a/packages/builder/src/helpers/planTitle.js
+++ b/packages/builder/src/helpers/planTitle.js
@ -1,11 +1,27 @@
 import { PlanType } from "@budibase/types"

 export function getFormattedPlanName(userPlanType) {
-  let planName = "Free"
-  if (userPlanType === PlanType.PREMIUM_PLUS) {
-    planName = "Premium"
-  } else if (userPlanType === PlanType.ENTERPRISE_BASIC) {
-    planName = "Enterprise"
+  let planName
+  switch (userPlanType) {
+    case PlanType.PRO:
+      planName = "Pro"
+      break
+    case PlanType.TEAM:
+      planName = "Team"
+      break
+    case PlanType.PREMIUM:
+    case PlanType.PREMIUM_PLUS:
+      planName = "Premium"
+      break
+    case PlanType.BUSINESS:
+      planName = "Business"
+      break
+    case PlanType.ENTERPRISE_BASIC:
+    case PlanType.ENTERPRISE:
+      planName = "Enterprise"
+      break
+    default:
+      planName = "Free" // Default to "Free" if the type is not explicitly handled
  }
  return `${planName} Plan`
 }
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@ -1,7 +1,7 @@
 <script>
  import { get } from "svelte/store"
  import { onMount, onDestroy } from "svelte"
-  import { store, selectedScreen, currentAsset } from "builderStore"
+  import { store, selectedScreen, currentAsset, hoverStore } from "builderStore"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import {
    ProgressCircle,
@ -118,7 +118,7 @@
    } else if (type === "select-component" && data.id) {
      $store.selectedComponentId = data.id
    } else if (type === "hover-component") {
-      store.actions.components.hover(data.id, false)
+      hoverStore.actions.update(data.id, false)
    } else if (type === "update-prop") {
      await store.actions.components.updateSetting(data.prop, data.value)
    } else if (type === "update-styles") {
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
@ -5,6 +5,7 @@
    selectedComponentPath,
    selectedComponent,
    selectedScreen,
+    hoverStore,
  } from "builderStore"
  import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
  import NavItem from "components/common/NavItem.svelte"
@ -90,7 +91,7 @@
    return findComponentPath($selectedComponent, component._id)?.length > 0
  }

-  const hover = store.actions.components.hover
+  const hover = hoverStore.actions.update
 </script>

 <ul>
@ -111,7 +112,7 @@
        on:dragover={dragover(component, index)}
        on:iconClick={() => toggleNodeOpen(component._id)}
        on:drop={onDrop}
-        hovering={$store.hoveredComponentId === component._id}
+        hovering={$hoverStore.componentId === component._id}
        on:mouseenter={() => hover(component._id)}
        on:mouseleave={() => hover(null)}
        text={getComponentText(component)}
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
@ -1,7 +1,12 @@
 <script>
  import { notifications, Icon, Body } from "@budibase/bbui"
  import { isActive, goto } from "@roxi/routify"
-  import { store, selectedScreen, userSelectedResourceMap } from "builderStore"
+  import {
+    store,
+    selectedScreen,
+    userSelectedResourceMap,
+    hoverStore,
+  } from "builderStore"
  import NavItem from "components/common/NavItem.svelte"
  import ComponentTree from "./ComponentTree.svelte"
  import { dndStore, DropPosition } from "./dndStore.js"
@ -36,7 +41,7 @@
    scrolling = e.target.scrollTop !== 0
  }

-  const hover = store.actions.components.hover
+  const hover = hoverStore.actions.update
 </script>

 <div class="components">
@ -60,7 +65,7 @@
            icon="WebPage"
            on:drop={onDrop}
            on:click={() => ($store.selectedComponentId = screenComponentId)}
-            hovering={$store.hoveredComponentId === screenComponentId}
+            hovering={$hoverStore.componentId === screenComponentId}
            on:mouseenter={() => hover(screenComponentId)}
            on:mouseleave={() => hover(null)}
            id="component-screen"
@ -79,7 +84,7 @@
              : "VisibilityOff"}
            on:drop={onDrop}
            on:click={() => ($store.selectedComponentId = navComponentId)}
-            hovering={$store.hoveredComponentId === navComponentId}
+            hovering={$hoverStore.componentId === navComponentId}
            on:mouseenter={() => hover(navComponentId)}
            on:mouseleave={() => hover(null)}
            id="component-nav"
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@ -15,9 +15,9 @@
      <Content showMobileNav>
        <SideNav slot="side-nav">
          <SideNavItem
-            text="Automation History"
-            url={$url("./automation-history")}
-            active={$isActive("./automation-history")}
+            text="Automations"
+            url={$url("./automations")}
+            active={$isActive("./automations")}
          />
          <SideNavItem
            text="Backups"
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte
@ -8,6 +8,8 @@
    Body,
    Heading,
    Divider,
+    Toggle,
+    notifications,
  } from "@budibase/bbui"
  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
  import StatusRenderer from "./_components/StatusRenderer.svelte"
@ -16,7 +18,7 @@
  import { createPaginationStore } from "helpers/pagination"
  import { getContext, onDestroy, onMount } from "svelte"
  import dayjs from "dayjs"
-  import { auth, licensing, admin } from "stores/portal"
+  import { auth, licensing, admin, apps } from "stores/portal"
  import { Constants } from "@budibase/frontend-core"
  import Portal from "svelte-portal"

@ -35,9 +37,13 @@
  let timeRange = null
  let loaded = false

+  $: app = $apps.find(app => app.devId === $store.appId?.includes(app.appId))
  $: licensePlan = $auth.user?.license?.plan
  $: page = $pageInfo.page
  $: fetchLogs(automationId, status, page, timeRange)
+  $: isCloud = $admin.cloud
+
+  $: chainAutomations = app?.automations?.chainAutomations ?? !isCloud

  const timeOptions = [
    { value: "90-d", label: "Past 90 days" },
@ -124,6 +130,18 @@
    sidePanel.open()
  }

+  async function save({ detail }) {
+    try {
+      await apps.update($store.appId, {
+        automations: {
+          chainAutomations: detail,
+        },
+      })
+    } catch (error) {
+      notifications.error("Error updating automation chaining setting")
+    }
+  }
+
  onMount(async () => {
    await automationStore.actions.fetch()
    const params = new URLSearchParams(window.location.search)
@ -150,11 +168,30 @@

 <Layout noPadding>
  <Layout gap="XS" noPadding>
-    <Heading>Automation History</Heading>
-    <Body>View the automations your app has executed</Body>
+    <Heading>Automations</Heading>
+    <Body size="S">See your automation history and edit advanced settings</Body>
  </Layout>
  <Divider />

+  <Layout gap="XS" noPadding>
+    <Heading size="XS">Chain automations</Heading>
+    <Body size="S">Allow automations to trigger from other automations</Body>
+    <div class="setting-spacing">
+      <Toggle
+        text={"Enable chaining"}
+        on:change={e => {
+          save(e)
+        }}
+        value={chainAutomations}
+      />
+    </div>
+  </Layout>
+
+  <Divider />
+  <Layout gap="XS" noPadding>
+    <Heading size="XS">History</Heading>
+    <Body size="S">Free plan stores up to 1 day of automation history</Body>
+  </Layout>
  <div class="controls">
    <div class="search">
      <div class="select">
@ -237,6 +274,9 @@
 {/if}

 <style>
+  .setting-spacing {
+    padding-top: var(--spacing-s);
+  }
  .controls {
    display: flex;
    flex-direction: row;
--- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte
@ -1,5 +1,5 @@
 <script>
  import { redirect } from "@roxi/routify"

-  $redirect("../settings/automation-history")
+  $redirect("../settings/automations")
 </script>
--- a/packages/builder/src/stores/backend/queries.js
+++ b/packages/builder/src/stores/backend/queries.js
@ -89,8 +89,8 @@ export function createQueriesStore() {
    // Assume all the fields are strings and create a basic schema from the
    // unique fields returned by the server
    const schema = {}
-    for (let [field, type] of Object.entries(result.schemaFields)) {
-      schema[field] = type || "string"
+    for (let [field, metadata] of Object.entries(result.schema)) {
+      schema[field] = metadata || { type: "string" }
    }
    return { ...result, schema, rows: result.rows || [] }
  }
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@ -573,6 +573,7 @@
    "description": "A configurable data list that attaches to your backend tables.",
    "icon": "JourneyData",
    "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
    "hasChildren": true,
    "size": {
      "width": 400,
@ -710,12 +711,10 @@
    ],
    "context": [
      {
-        "type": "schema",
-        "scope": "local"
+        "type": "schema"
      },
      {
        "type": "static",
-        "scope": "local",
        "values": [
          {
            "label": "Row index",
@ -1565,6 +1564,7 @@
    "name": "Bar Chart",
    "description": "Bar chart",
    "icon": "GraphBarVertical",
+    "requiredAncestors": ["dataprovider"],
    "size": {
      "width": 600,
      "height": 400
@ -1727,6 +1727,7 @@
      "width": 600,
      "height": 400
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "text",
@ -1880,6 +1881,7 @@
      "width": 600,
      "height": 400
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "text",
@ -2045,6 +2047,7 @@
      "width": 600,
      "height": 400
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "text",
@ -2174,6 +2177,7 @@
      "width": 600,
      "height": 400
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "text",
@ -2303,6 +2307,7 @@
      "width": 600,
      "height": 400
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "text",
@ -3964,6 +3969,12 @@
        "key": "allowManualEntry",
        "defaultValue": false
      },
+      {
+        "type": "boolean",
+        "label": "Auto confirm",
+        "key": "autoConfirm",
+        "defaultValue": false
+      },
      {
        "type": "boolean",
        "label": "Play sound on scan",
@ -4076,6 +4087,7 @@
      "width": 400,
      "height": 320
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "dataProvider",
@ -4631,6 +4643,7 @@
    "name": "Table",
    "icon": "Table",
    "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
    "hasChildren": true,
    "showEmptyState": false,
    "size": {
@ -4721,6 +4734,7 @@
    "name": "Date Range",
    "icon": "Calendar",
    "styles": ["size"],
+    "requiredAncestors": ["dataprovider"],
    "hasChildren": false,
    "size": {
      "width": 200,
@ -4828,6 +4842,7 @@
      "width": 100,
      "height": 35
    },
+    "requiredAncestors": ["dataprovider"],
    "settings": [
      {
        "type": "dataProvider",
@ -5602,38 +5617,7 @@
          }
        ]
      }
-    ],
-    "context": {
-      "type": "static",
-      "suffix": "provider",
-      "values": [
-        {
-          "label": "Rows",
-          "key": "rows",
-          "type": "array"
-        },
-        {
-          "label": "Extra Info",
-          "key": "info",
-          "type": "string"
-        },
-        {
-          "label": "Rows Length",
-          "key": "rowsLength",
-          "type": "number"
-        },
-        {
-          "label": "Schema",
-          "key": "schema",
-          "type": "object"
-        },
-        {
-          "label": "Page Number",
-          "key": "pageNumber",
-          "type": "number"
-        }
-      ]
-    }
+    ]
  },
  "cardsblock": {
    "block": true,
@ -6036,8 +6020,7 @@
      },
      {
        "type": "schema",
-        "suffix": "repeater",
-        "scope": "local"
+        "suffix": "repeater"
      }
    ]
  },
@ -6183,10 +6166,6 @@
        "type": "form",
        "suffix": "form"
      },
-      {
-        "type": "schema",
-        "suffix": "repeater"
-      },
      {
        "type": "static",
        "suffix": "form",
@ -6503,23 +6482,6 @@
      "suffix": "repeater"
    }
  },
-  "grid": {
-    "name": "Grid",
-    "icon": "ViewGrid",
-    "hasChildren": true,
-    "settings": [
-      {
-        "type": "number",
-        "key": "cols",
-        "label": "Columns"
-      },
-      {
-        "type": "number",
-        "key": "rows",
-        "label": "Rows"
-      }
-    ]
-  },
  "gridblock": {
    "name": "Grid Block",
    "icon": "Table",
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@ -9,7 +9,7 @@
 </script>

 <script>
-  import { getContext, setContext, onMount } from "svelte"
+  import { getContext, setContext, onMount, onDestroy } from "svelte"
  import { writable, get } from "svelte/store"
  import {
    enrichProps,
@ -30,15 +30,6 @@
  import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte"
  import ComponentErrorState from "components/error-states/ComponentErrorState.svelte"
  import { BudibasePrefix } from "../stores/components.js"
-  import {
-    decodeJSBinding,
-    findHBSBlocks,
-    isJSBinding,
-  } from "@budibase/string-templates"
-  import {
-    getActionContextKey,
-    getActionDependentContextKeys,
-  } from "../utils/buttonActions.js"

  export let instance = {}
  export let isLayout = false
@ -90,6 +81,7 @@

  // Keep track of stringified representations of context and instance
  // to avoid enriching bindings as much as possible
+  let lastContextKey
  let lastInstanceKey

  // Visibility flag used by conditional UI
@ -106,13 +98,6 @@
  // We clear these whenever a new instance is received.
  let ephemeralStyles

-  // Single string of all HBS blocks, used to check if we use a certain binding
-  // or not
-  let bindingString = ""
-
-  // List of context keys which we use inside bindings
-  let knownContextKeyMap = {}
-
  // Set up initial state for each new component instance
  $: initialise(instance)

@ -170,6 +155,9 @@
      hasMissingRequiredSettings)
  $: emptyState = empty && showEmptyState

+  // Enrich component settings
+  $: enrichComponentSettings($context, settingsDefinitionMap)
+
  // Evaluate conditional UI settings and store any component setting changes
  // which need to be made
  $: evaluateConditions(conditions)
@ -218,7 +206,6 @@
    errorState,
    parent: id,
    ancestors: [...($component?.ancestors ?? []), instance._component],
-    path: [...($component?.path ?? []), id],
  })

  const initialise = (instance, force = false) => {
@ -227,8 +214,7 @@
    }

    // Ensure we're processing a new instance
-    const stringifiedInstance = JSON.stringify(instance)
-    const instanceKey = Helpers.hashString(stringifiedInstance)
+    const instanceKey = Helpers.hashString(JSON.stringify(instance))
    if (instanceKey === lastInstanceKey && !force) {
      return
    } else {
@ -288,54 +274,13 @@
      return missing
    })

-    // When considering bindings we can ignore children, so we remove that
-    // before storing the reference stringified version
-    const noChildren = JSON.stringify({ ...instance, _children: null })
-    const bindings = findHBSBlocks(noChildren).map(binding => {
-      let sanitizedBinding = binding.replace(/\\"/g, '"')
-      if (isJSBinding(sanitizedBinding)) {
-        return decodeJSBinding(sanitizedBinding)
-      } else {
-        return sanitizedBinding
-      }
-    })
-
-    // The known context key map is built up at runtime, as changes to keys are
-    // encountered. We manually seed this to the required action keys as these
-    // are not encountered at runtime and so need computed in advance.
-    knownContextKeyMap = generateActionKeyMap(instance, settingsDefinition)
-    bindingString = bindings.join(" ")
-
    // Run any migrations
    runMigrations(instance, settingsDefinition)

    // Force an initial enrichment of the new settings
-    enrichComponentSettings(get(context), settingsDefinitionMap)
-  }
-
-  // Extracts a map of all context keys which are required by action settings
-  // to provide the functions to evaluate at runtime. This needs done manually
-  // as the action definitions themselves do not specify bindings for action
-  // keys, meaning we cannot do this while doing the other normal bindings.
-  const generateActionKeyMap = (instance, settingsDefinition) => {
-    let map = {}
-    settingsDefinition.forEach(setting => {
-      if (setting.type === "event") {
-        instance[setting.key]?.forEach(action => {
-          // We depend on the actual action key
-          const actionKey = getActionContextKey(action)
-          if (actionKey) {
-            map[actionKey] = true
-          }
-
-          // We also depend on any manually declared context keys
-          getActionDependentContextKeys(action)?.forEach(key => {
-            map[key] = true
-          })
-        })
-      }
+    enrichComponentSettings(get(context), settingsDefinitionMap, {
+      force: true,
    })
-    return map
  }

  const runMigrations = (instance, settingsDefinition) => {
@ -436,7 +381,17 @@
  }

  // Enriches any string component props using handlebars
-  const enrichComponentSettings = (context, settingsDefinitionMap) => {
+  const enrichComponentSettings = (
+    context,
+    settingsDefinitionMap,
+    options = { force: false }
+  ) => {
+    const contextChanged = context.key !== lastContextKey
+    if (!contextChanged && !options?.force) {
+      return
+    }
+    lastContextKey = context.key
+
    // Record the timestamp so we can reference it after enrichment
    latestUpdateTime = Date.now()
    const enrichmentTime = latestUpdateTime
@ -551,46 +506,31 @@
    })
  }

-  const handleContextChange = key => {
-    // Check if we already know if this key is used
-    let used = knownContextKeyMap[key]
-
-    // If we don't know, check and cache
-    if (used == null) {
-      used = bindingString.indexOf(`[${key}]`) !== -1
-      knownContextKeyMap[key] = used
-    }
-
-    // Enrich settings if we use this key
-    if (used) {
-      enrichComponentSettings($context, settingsDefinitionMap)
-    }
-  }
-
-  // Register an unregister component instance
  onMount(() => {
-    if ($appStore.isDevApp) {
-      if (!componentStore.actions.isComponentRegistered(id)) {
-        componentStore.actions.registerInstance(id, {
-          component: instance._component,
-          getSettings: () => cachedSettings,
-          getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
-          getDataContext: () => get(context),
-          reload: () => initialise(instance, true),
-          setEphemeralStyles: styles => (ephemeralStyles = styles),
-          state: store,
-        })
-      }
-      return () => {
-        if (componentStore.actions.isComponentRegistered(id)) {
-          componentStore.actions.unregisterInstance(id)
-        }
-      }
+    if (
+      $appStore.isDevApp &&
+      !componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.registerInstance(id, {
+        component: instance._component,
+        getSettings: () => cachedSettings,
+        getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
+        getDataContext: () => get(context),
+        reload: () => initialise(instance, true),
+        setEphemeralStyles: styles => (ephemeralStyles = styles),
+        state: store,
+      })
    }
  })

-  // Observe changes to context
-  onMount(() => context.actions.observeChanges(handleContextChange))
+  onDestroy(() => {
+    if (
+      $appStore.isDevApp &&
+      componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.unregisterInstance(id)
+    }
+  })
 </script>

 {#if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@ -71,7 +71,7 @@
    datasource: dataSource || {},
    schema,
    rowsLength: $fetch.rows.length,
-    pageNumber: $fetch.pageNumber + 1,
+
    // Undocumented properties. These aren't supposed to be used in builder
    // bindings, but are used internally by other components
    id: $component?.id,
--- a/packages/client/src/components/app/EmptyPlaceholder.svelte
+++ b/packages/client/src/components/app/EmptyPlaceholder.svelte
@ -1,5 +1,6 @@
 <script>
  import { getContext } from "svelte"
+  import { Icon } from "@budibase/bbui"

  const component = getContext("component")
  const { builderStore, componentStore } = getContext("sdk")
@ -9,7 +10,15 @@

 {#if $builderStore.inBuilder}
  <div class="component-placeholder">
-    {$component.name || definition?.name || "Component"}
+    <Icon name="Help" color="var(--spectrum-global-color-blue-600)" />
+    <span
+      class="spectrum-Link"
+      on:click={() => {
+        builderStore.actions.requestAddComponent()
+      }}
+    >
+      Add components inside your {definition?.name || $component.type}
+    </span>
  </div>
 {/if}

@ -23,4 +32,14 @@
    font-size: var(--font-size-s);
    gap: var(--spacing-s);
  }
+
+  /* Common styles for all error states to use */
+  .component-placeholder :global(mark) {
+    background-color: var(--spectrum-global-color-gray-400);
+    padding: 0 4px;
+    border-radius: 2px;
+  }
+  .component-placeholder :global(.spectrum-Link) {
+    cursor: pointer;
+  }
 </style>
--- a/packages/client/src/components/app/GridBlock.svelte
+++ b/packages/client/src/components/app/GridBlock.svelte
@ -19,36 +19,7 @@
  export let onRowClick = null
  export let buttons = null

-  const context = getContext("context")
-  const component = getContext("component")
-  const {
-    styleable,
-    API,
-    builderStore,
-    notificationStore,
-    enrichButtonActions,
-    ActionTypes,
-    createContextStore,
-    Provider,
-  } = getContext("sdk")
-
-  let grid
-
-  $: columnWhitelist = parsedColumns
-    ?.filter(col => col.active)
-    ?.map(col => col.field)
-  $: schemaOverrides = getSchemaOverrides(parsedColumns)
-  $: enrichedButtons = enrichButtons(buttons)
-  $: parsedColumns = getParsedColumns(columns)
-  $: actions = [
-    {
-      type: ActionTypes.RefreshDatasource,
-      callback: () => grid?.getContext()?.rows.actions.refreshData(),
-      metadata: { dataSource: table },
-    },
-  ]
-
-  // Parses columns to fix older formats
+  // parses columns to fix older formats
  const getParsedColumns = columns => {
    // If the first element has an active key all elements should be in the new format
    if (columns?.length && columns[0]?.active !== undefined) {
@ -62,6 +33,28 @@
    }))
  }

+  $: parsedColumns = getParsedColumns(columns)
+
+  const context = getContext("context")
+  const component = getContext("component")
+  const {
+    styleable,
+    API,
+    builderStore,
+    notificationStore,
+    enrichButtonActions,
+    ActionTypes,
+    createContextStore,
+  } = getContext("sdk")
+
+  let grid
+
+  $: columnWhitelist = parsedColumns
+    ?.filter(col => col.active)
+    ?.map(col => col.field)
+  $: schemaOverrides = getSchemaOverrides(parsedColumns)
+  $: enrichedButtons = enrichButtons(buttons)
+
  const getSchemaOverrides = columns => {
    let overrides = {}
    columns?.forEach(column => {
@ -85,6 +78,11 @@
        const id = get(component).id
        const gridContext = createContextStore(context)
        gridContext.actions.provideData(id, row)
+        gridContext.actions.provideAction(
+          id,
+          ActionTypes.RefreshDatasource,
+          () => grid?.getContext()?.rows.actions.refreshData()
+        )
        const fn = enrichButtonActions(settings.onClick, get(gridContext))
        return await fn?.({ row })
      },
@ -96,31 +94,29 @@
  use:styleable={$component.styles}
  class:in-builder={$builderStore.inBuilder}
 >
-  <Provider {actions}>
-    <Grid
-      bind:this={grid}
-      datasource={table}
-      {API}
-      {stripeRows}
-      {initialFilter}
-      {initialSortColumn}
-      {initialSortOrder}
-      {fixedRowHeight}
-      {columnWhitelist}
-      {schemaOverrides}
-      canAddRows={allowAddRows}
-      canEditRows={allowEditRows}
-      canDeleteRows={allowDeleteRows}
-      canEditColumns={false}
-      canExpandRows={false}
-      canSaveSchema={false}
-      showControls={false}
-      notifySuccess={notificationStore.actions.success}
-      notifyError={notificationStore.actions.error}
-      buttons={enrichedButtons}
-      on:rowclick={e => onRowClick?.({ row: e.detail })}
-    />
-  </Provider>
+  <Grid
+    bind:this={grid}
+    datasource={table}
+    {API}
+    {stripeRows}
+    {initialFilter}
+    {initialSortColumn}
+    {initialSortOrder}
+    {fixedRowHeight}
+    {columnWhitelist}
+    {schemaOverrides}
+    canAddRows={allowAddRows}
+    canEditRows={allowEditRows}
+    canDeleteRows={allowDeleteRows}
+    canEditColumns={false}
+    canExpandRows={false}
+    canSaveSchema={false}
+    showControls={false}
+    notifySuccess={notificationStore.actions.success}
+    notifyError={notificationStore.actions.error}
+    buttons={enrichedButtons}
+    on:rowclick={e => onRowClick?.({ row: e.detail })}
+  />
 </div>

 <style>
--- a/packages/client/src/components/app/Repeater.svelte
+++ b/packages/client/src/components/app/Repeater.svelte
@ -2,7 +2,6 @@
  import { getContext } from "svelte"
  import Placeholder from "./Placeholder.svelte"
  import Container from "./Container.svelte"
-  import { ContextScopes } from "constants"

  export let dataProvider
  export let noRowsMessage
@ -10,7 +9,6 @@
  export let hAlign
  export let vAlign
  export let gap
-  export let scope = ContextScopes.Local

  const { Provider } = getContext("sdk")
  const component = getContext("component")
@ -24,7 +22,7 @@
    <Placeholder />
  {:else if rows.length > 0}
    {#each rows as row, index}
-      <Provider data={{ ...row, index }} {scope}>
+      <Provider data={{ ...row, index }}>
        <slot />
      </Provider>
    {/each}
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@ -1,6 +1,5 @@
 <script>
  import BlockComponent from "components/BlockComponent.svelte"
-  import { Helpers } from "@budibase/bbui"
  import { getContext, setContext } from "svelte"
  import { builderStore } from "stores"
  import { Utils } from "@budibase/frontend-core"
@ -42,7 +41,7 @@
  let schema

  $: fetchSchema(dataSource)
-  $: enrichedSteps = enrichSteps(steps, schema, $component.id, $currentStep)
+  $: enrichedSteps = enrichSteps(steps, schema, $component.id)
  $: updateCurrentStep(enrichedSteps, $builderStore, $component)

  const updateCurrentStep = (steps, builderStore, component) => {
@ -116,7 +115,6 @@
        dataSource,
      })
      return {
-        _stepId: Helpers.uuid(),
        fields: getDefaultFields(fields || [], schema),
        title: title ?? defaultProps.title,
        desc,
@ -144,7 +142,7 @@
      },
    }}
  >
-    {#each enrichedSteps as step, stepIdx (step._stepId)}
+    {#each enrichedSteps as step, stepIdx}
      <BlockComponent
        type="formstep"
        props={{ step: stepIdx + 1, _instanceName: `Step ${stepIdx + 1}` }}
@ -188,13 +186,12 @@
            </BlockComponent>
          </BlockComponent>
          <BlockComponent type="text" props={{ text: step.desc }} order={1} />
-
          <BlockComponent type="container" order={2}>
            <div
              class="form-block fields"
              class:mobile={$context.device.mobile}
            >
-              {#each step.fields as field, fieldIdx (`${field.field || field.name}_${fieldIdx}`)}
+              {#each step.fields as field, fieldIdx (`${field.field || field.name}_${stepIdx}_${fieldIdx}`)}
                {#if getComponentForField(field)}
                  <BlockComponent
                    type={getComponentForField(field)}
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@ -231,7 +231,6 @@
          paginate,
          limit: rowCount,
        }}
-        context="provider"
        order={1}
      >
        <BlockComponent
--- a/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
+++ b/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
@ -10,7 +10,6 @@
  export let noRowsMessage

  const component = getContext("component")
-  const { ContextScopes } = getContext("sdk")

  $: providerId = `${$component.id}-provider`
  $: dataProvider = `{{ literal ${safe(providerId)} }}`
@ -56,7 +55,6 @@
          noRowsMessage: noRowsMessage || "We couldn't find a row to display",
          direction: "column",
          hAlign: "center",
-          scope: ContextScopes.Global,
        }}
      >
        <slot />
--- a/packages/client/src/components/app/forms/CodeScanner.svelte
+++ b/packages/client/src/components/app/forms/CodeScanner.svelte
@ -14,11 +14,13 @@
  export let value
  export let disabled = false
  export let allowManualEntry = false
+  export let autoConfirm = false
  export let scanButtonText = "Scan code"
  export let beepOnScan = false
  export let beepFrequency = 2637
  export let customFrequency = 1046
  export let preferredCamera = "environment"
+  export let validator

  const dispatch = createEventDispatcher()

@ -41,6 +43,9 @@
        beep()
      }
      dispatch("change", decodedText)
+      if (autoConfirm && !validator?.(decodedText)) {
+        camModal?.hide()
+      }
    }
  }

@ -127,7 +132,11 @@
 <div class="scanner-video-wrapper">
  {#if value && !manualMode}
    <div class="scanner-value field-display">
-      <StatusLight positive />
+      {#if validator?.(value)}
+        <StatusLight negative />
+      {:else}
+        <StatusLight positive />
+      {/if}
      {value}
    </div>
  {/if}
@ -183,11 +192,16 @@
      </div>
      {#if cameraEnabled === true}
        <div class="code-wrap">
-          {#if value}
+          {#if value && !validator?.(value)}
            <div class="scanner-value">
              <StatusLight positive />
              {value}
            </div>
+          {:else if value && validator?.(value)}
+            <div class="scanner-value">
+              <StatusLight negative />
+              {value}
+            </div>
          {:else}
            <div class="scanner-value">
              <StatusLight neutral />
--- a/packages/client/src/components/app/forms/CodeScannerField.svelte
+++ b/packages/client/src/components/app/forms/CodeScannerField.svelte
@ -11,6 +11,7 @@
  export let defaultValue = ""
  export let onChange
  export let allowManualEntry
+  export let autoConfirm
  export let scanButtonText
  export let beepOnScan
  export let beepFrequency
@ -49,11 +50,13 @@
      on:change={handleUpdate}
      disabled={fieldState.disabled || fieldState.readonly}
      {allowManualEntry}
+      {autoConfirm}
      scanButtonText={scanText}
      {beepOnScan}
      {beepFrequency}
      {customFrequency}
      {preferredCamera}
+      validator={fieldState.validator}
    />
  {/if}
 </Field>
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@ -21,7 +21,6 @@
  export let editAutoColumns = false

  const context = getContext("context")
-  const component = getContext("component")
  const { API, fetchDatasourceSchema } = getContext("sdk")

  const getInitialFormStep = () => {
@ -39,47 +38,28 @@

  $: fetchSchema(dataSource)
  $: schemaKey = generateSchemaKey(schema)
-  $: initialValues = getInitialValues(
-    actionType,
-    dataSource,
-    $component.path,
-    $context
-  )
+  $: initialValues = getInitialValues(actionType, dataSource, $context)
  $: resetKey = Helpers.hashString(
    schemaKey + JSON.stringify(initialValues) + disabled + readonly
  )

  // Returns the closes data context which isn't a built in context
-  const getInitialValues = (type, dataSource, path, context) => {
+  const getInitialValues = (type, dataSource, context) => {
    // Only inherit values for update forms
    if (type !== "Update") {
      return {}
    }
    // Only inherit values for forms targeting internal tables
-    const dsType = dataSource?.type
-    if (dsType !== "table" && dsType !== "viewV2") {
+    if (!dataSource?.tableId) {
      return {}
    }
-    // Look up the component tree and find something that is provided by an
-    // ancestor that matches our datasource. This is for backwards compatibility
-    // as previously we could use the "closest" context.
-    for (let id of path.reverse().slice(1)) {
-      // Check for matching view datasource
-      if (
-        dataSource.type === "viewV2" &&
-        context[id]?._viewId === dataSource.id
-      ) {
-        return context[id]
-      }
-      // Check for matching table datasource
-      if (
-        dataSource.type === "table" &&
-        context[id]?.tableId === dataSource.tableId
-      ) {
-        return context[id]
-      }
+    // Don't inherit values representing built in contexts
+    if (["user", "url"].includes(context.closestComponentId)) {
+      return {}
    }
-    return {}
+    // Always inherit the closest datasource
+    const closestContext = context[`${context.closestComponentId}`] || {}
+    return closestContext || {}
  }

  // Fetches the form schema from this form's dataSource
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@ -108,8 +108,16 @@
    }
  }

+  $: forceFetchRows(filter)
  $: debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)

+  const forceFetchRows = async () => {
+    // if the filter has changed, then we need to reset the options, clear the selection, and re-fetch
+    optionsObj = {}
+    fieldApi?.setValue([])
+    selectedValue = []
+    debouncedFetchRows(searchTerm, primaryDisplay, defaultValue)
+  }
  const fetchRows = async (searchTerm, primaryDisplay, defaultVal) => {
    const allRowsFetched =
      $fetch.loaded &&
@ -228,7 +236,6 @@
      bind:searchTerm
      loading={$fetch.loading}
      bind:open
-      customPopoverMaxHeight={400}
    />
  {/if}
 </Field>
--- a/packages/client/src/components/context/Provider.svelte
+++ b/packages/client/src/components/context/Provider.svelte
@ -1,23 +1,20 @@
 <script>
  import { getContext, setContext, onDestroy } from "svelte"
  import { dataSourceStore, createContextStore } from "stores"
-  import { ActionTypes, ContextScopes } from "constants"
+  import { ActionTypes } from "constants"
  import { generate } from "shortid"

  export let data
  export let actions
  export let key
-  export let scope = ContextScopes.Global

-  let context = getContext("context")
+  // Clone and create new data context for this component tree
+  const context = getContext("context")
  const component = getContext("component")
-  const providerKey = key || $component.id
+  const newContext = createContextStore(context)
+  setContext("context", newContext)

-  // Create a new layer of context if we are only locally scoped
-  if (scope === ContextScopes.Local) {
-    context = createContextStore(context)
-    setContext("context", context)
-  }
+  const providerKey = key || $component.id

  // Generate a permanent unique ID for this component and use it to register
  // any datasource actions
@ -33,7 +30,7 @@
  const provideData = newData => {
    const dataKey = JSON.stringify(newData)
    if (dataKey !== lastDataKey) {
-      context.actions.provideData(providerKey, newData, scope)
+      newContext.actions.provideData(providerKey, newData)
      lastDataKey = dataKey
    }
  }
@ -43,7 +40,7 @@
    if (actionsKey !== lastActionsKey) {
      lastActionsKey = actionsKey
      newActions?.forEach(({ type, callback, metadata }) => {
-        context.actions.provideAction(providerKey, type, callback, scope)
+        newContext.actions.provideAction(providerKey, type, callback)

        // Register any "refresh datasource" actions with a singleton store
        // so we can easily refresh data at all levels for any datasource
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@ -12,10 +12,5 @@ export const ActionTypes = {
  ScrollTo: "ScrollTo",
 }

-export const ContextScopes = {
-  Local: "local",
-  Global: "global",
-}
-
 export const DNDPlaceholderID = "dnd-placeholder"
 export const ScreenslotType = "screenslot"
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@ -23,7 +23,7 @@ import { getAction } from "utils/getAction"
 import Provider from "components/context/Provider.svelte"
 import Block from "components/Block.svelte"
 import BlockComponent from "components/BlockComponent.svelte"
-import { ActionTypes, ContextScopes } from "./constants"
+import { ActionTypes } from "./constants"
 import { fetchDatasourceSchema } from "./utils/schema.js"
 import { getAPIKey } from "./utils/api.js"
 import { enrichButtonActions } from "./utils/buttonActions.js"
@ -54,7 +54,6 @@ export default {
  linkable,
  getAction,
  fetchDatasourceSchema,
-  ContextScopes,
  getAPIKey,
  enrichButtonActions,
  processStringSync,
--- a/packages/client/src/stores/context.js
+++ b/packages/client/src/stores/context.js
@ -1,98 +1,59 @@
 import { writable, derived } from "svelte/store"
-import { ContextScopes } from "constants"
+import { Helpers } from "@budibase/bbui"

-export const createContextStore = parentContext => {
-  const context = writable({})
-  let observers = []
-
-  // Derive the total context state at this point in the tree
-  const contexts = parentContext ? [parentContext, context] : [context]
+export const createContextStore = oldContext => {
+  const newContext = writable({})
+  const contexts = oldContext ? [oldContext, newContext] : [newContext]
  const totalContext = derived(contexts, $contexts => {
-    return $contexts.reduce((total, context) => ({ ...total, ...context }), {})
+    // The key is the serialized representation of context
+    let key = ""
+    for (let i = 0; i < $contexts.length - 1; i++) {
+      key += $contexts[i].key
+    }
+    key = Helpers.hashString(
+      key + JSON.stringify($contexts[$contexts.length - 1])
+    )
+
+    // Reduce global state
+    const reducer = (total, context) => ({ ...total, ...context })
+    const context = $contexts.reduce(reducer, {})
+
+    return {
+      ...context,
+      key,
+    }
  })

-  // Subscribe to updates in the parent context, so that we can proxy on any
-  // change messages to our own subscribers
-  if (parentContext) {
-    parentContext.actions.observeChanges(key => {
-      broadcastChange(key)
-    })
-  }
-
-  // Provide some data in context
-  const provideData = (providerId, data, scope = ContextScopes.Global) => {
+  // Adds a data context layer to the tree
+  const provideData = (providerId, data) => {
    if (!providerId || data === undefined) {
      return
    }
+    newContext.update(state => {
+      state[providerId] = data

-    // Proxy message up the chain if we have a parent and are providing global
-    // context
-    if (scope === ContextScopes.Global && parentContext) {
-      parentContext.actions.provideData(providerId, data, scope)
-    }
+      // Keep track of the closest component ID so we can later hydrate a "data" prop.
+      // This is only required for legacy bindings that used "data" rather than a
+      // component ID.
+      state.closestComponentId = providerId

-    // Otherwise this is either the context root, or we're providing a local
-    // context override, so we need to update the local context instead
-    else {
-      context.update(state => {
-        state[providerId] = data
-        return state
-      })
-      broadcastChange(providerId)
-    }
+      return state
+    })
  }

-  // Provides some action in context
-  const provideAction = (
-    providerId,
-    actionType,
-    callback,
-    scope = ContextScopes.Global
-  ) => {
+  // Adds an action context layer to the tree
+  const provideAction = (providerId, actionType, callback) => {
    if (!providerId || !actionType) {
      return
    }
-
-    // Proxy message up the chain if we have a parent and are providing global
-    // context
-    if (scope === ContextScopes.Global && parentContext) {
-      parentContext.actions.provideAction(
-        providerId,
-        actionType,
-        callback,
-        scope
-      )
-    }
-
-    // Otherwise this is either the context root, or we're providing a local
-    // context override, so we need to update the local context instead
-    else {
-      const key = `${providerId}_${actionType}`
-      context.update(state => {
-        state[key] = callback
-        return state
-      })
-      broadcastChange(key)
-    }
-  }
-
-  const observeChanges = callback => {
-    observers.push(callback)
-    return () => {
-      observers = observers.filter(cb => cb !== callback)
-    }
-  }
-
-  const broadcastChange = key => {
-    observers.forEach(cb => cb(key))
+    newContext.update(state => {
+      state[`${providerId}_${actionType}`] = callback
+      return state
+    })
  }

  return {
    subscribe: totalContext.subscribe,
-    actions: {
-      provideData,
-      provideAction,
-      observeChanges,
-    },
+    actions: { provideData, provideAction },
  }
 }
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@ -17,54 +17,6 @@ import { ActionTypes } from "constants"
 import { enrichDataBindings } from "./enrichDataBinding"
 import { Helpers } from "@budibase/bbui"

-// Default action handler, which extracts an action from context that was
-// provided by another component and executes it with all action parameters
-const contextActionHandler = async (action, context) => {
-  const key = getActionContextKey(action)
-  const fn = context[key]
-  if (fn) {
-    return await fn(action.parameters)
-  }
-}
-
-// Generates the context key, which is the key that this action depends on in
-// context to provide the function it will run. This is broken out as a util
-// because we reuse this inside the core Component.svelte file to determine
-// what the required action context keys are for all action settings.
-export const getActionContextKey = action => {
-  const type = action?.["##eventHandlerType"]
-  const key = (componentId, type) => `${componentId}_${type}`
-  switch (type) {
-    case "Scroll To Field":
-      return key(action.parameters.componentId, ActionTypes.ScrollTo)
-    case "Update Field Value":
-      return key(action.parameters.componentId, ActionTypes.UpdateFieldValue)
-    case "Validate Form":
-      return key(action.parameters.componentId, ActionTypes.ValidateForm)
-    case "Refresh Data Provider":
-      return key(action.parameters.componentId, ActionTypes.RefreshDatasource)
-    case "Clear Form":
-      return key(action.parameters.componentId, ActionTypes.ClearForm)
-    case "Change Form Step":
-      return key(action.parameters.componentId, ActionTypes.ChangeFormStep)
-    default:
-      return null
-  }
-}
-
-// If button actions depend on context, they must declare which keys they need
-export const getActionDependentContextKeys = action => {
-  const type = action?.["##eventHandlerType"]
-  switch (type) {
-    case "Save Row":
-    case "Duplicate Row":
-      if (action.parameters?.providerId) {
-        return [action.parameters.providerId]
-      }
-  }
-  return []
-}
-
 const saveRowHandler = async (action, context) => {
  const { fields, providerId, tableId, notificationOverride } =
    action.parameters
@ -80,21 +32,20 @@ const saveRowHandler = async (action, context) => {
    }
  }
  if (tableId) {
-    if (tableId.startsWith("view")) {
-      payload._viewId = tableId
-    } else {
-      payload.tableId = tableId
-    }
+    payload.tableId = tableId
  }
  try {
    const row = await API.saveRow(payload)
+
    if (!notificationOverride) {
      notificationStore.actions.success("Row saved")
    }
+
    // Refresh related datasources
    await dataSourceStore.actions.invalidateDataSource(tableId, {
      invalidateRelationships: true,
    })
+
    return { row }
  } catch (error) {
    // Abort next actions
@ -113,11 +64,7 @@ const duplicateRowHandler = async (action, context) => {
      }
    }
    if (tableId) {
-      if (tableId.startsWith("view")) {
-        payload._viewId = tableId
-      } else {
-        payload.tableId = tableId
-      }
+      payload.tableId = tableId
    }
    delete payload._id
    delete payload._rev
@ -126,10 +73,12 @@ const duplicateRowHandler = async (action, context) => {
      if (!notificationOverride) {
        notificationStore.actions.success("Row saved")
      }
+
      // Refresh related datasources
      await dataSourceStore.actions.invalidateDataSource(tableId, {
        invalidateRelationships: true,
      })
+
      return { row }
    } catch (error) {
      // Abort next actions
@ -241,6 +190,17 @@ const navigationHandler = action => {
  routeStore.actions.navigate(url, peek, externalNewTab)
 }

+const scrollHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ScrollTo,
+    {
+      field: action.parameters.field,
+    }
+  )
+}
+
 const queryExecutionHandler = async action => {
  const { datasourceId, queryId, queryParams, notificationOverride } =
    action.parameters
@ -276,6 +236,47 @@ const queryExecutionHandler = async action => {
  }
 }

+const executeActionHandler = async (
+  context,
+  componentId,
+  actionType,
+  params
+) => {
+  const fn = context[`${componentId}_${actionType}`]
+  if (fn) {
+    return await fn(params)
+  }
+}
+
+const updateFieldValueHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.UpdateFieldValue,
+    {
+      type: action.parameters.type,
+      field: action.parameters.field,
+      value: action.parameters.value,
+    }
+  )
+}
+
+const validateFormHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ValidateForm
+  )
+}
+
+const refreshDataProviderHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.RefreshDatasource
+  )
+}
+
 const logoutHandler = async action => {
  await authStore.actions.logOut()
  let redirectUrl = "/builder/auth/login"
@ -292,6 +293,23 @@ const logoutHandler = async action => {
  }
 }

+const clearFormHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ClearForm
+  )
+}
+
+const changeFormStepHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ChangeFormStep,
+    action.parameters
+  )
+}
+
 const closeScreenModalHandler = action => {
  let url
  if (action?.parameters) {
@ -399,10 +417,16 @@ const handlerMap = {
  ["Duplicate Row"]: duplicateRowHandler,
  ["Delete Row"]: deleteRowHandler,
  ["Navigate To"]: navigationHandler,
+  ["Scroll To Field"]: scrollHandler,
  ["Execute Query"]: queryExecutionHandler,
  ["Trigger Automation"]: triggerAutomationHandler,
+  ["Validate Form"]: validateFormHandler,
+  ["Update Field Value"]: updateFieldValueHandler,
+  ["Refresh Data Provider"]: refreshDataProviderHandler,
  ["Log Out"]: logoutHandler,
+  ["Clear Form"]: clearFormHandler,
  ["Close Screen Modal"]: closeScreenModalHandler,
+  ["Change Form Step"]: changeFormStepHandler,
  ["Update State"]: updateStateHandler,
  ["Upload File to S3"]: s3UploadHandler,
  ["Export Data"]: exportDataHandler,
@ -437,12 +461,7 @@ export const enrichButtonActions = (actions, context) => {
    return actions
  }

-  // Get handlers for each action. If no bespoke handler is configured, fall
-  // back to simply executing this action from context.
-  const handlers = actions.map(def => {
-    return handlerMap[def["##eventHandlerType"]] || contextActionHandler
-  })
-
+  const handlers = actions.map(def => handlerMap[def["##eventHandlerType"]])
  return async eventContext => {
    // Button context is built up as actions are executed.
    // Inherit any previous button context which may have come from actions
--- a/packages/client/src/utils/componentProps.js
+++ b/packages/client/src/utils/componentProps.js
@ -23,6 +23,16 @@ export const propsAreSame = (a, b) => {
 * Data bindings are enriched, and button actions are enriched.
 */
 export const enrichProps = (props, context, settingsDefinitionMap) => {
+  // Create context of all bindings and data contexts
+  // Duplicate the closest context as "data" which the builder requires
+  const totalContext = {
+    ...context,
+
+    // This is only required for legacy bindings that used "data" rather than a
+    // component ID.
+    data: context[context.closestComponentId],
+  }
+
  // We want to exclude any button actions from enrichment at this stage.
  // Extract top level button action settings.
  let normalProps = { ...props }
@ -39,13 +49,13 @@ export const enrichProps = (props, context, settingsDefinitionMap) => {
  let rawConditions = normalProps._conditions

  // Enrich all props except button actions
-  let enrichedProps = enrichDataBindings(normalProps, context)
+  let enrichedProps = enrichDataBindings(normalProps, totalContext)

  // Enrich button actions.
  // Actions are enriched into a function at this stage, but actual data
  // binding enrichment is done dynamically at runtime.
  Object.keys(actionProps).forEach(prop => {
-    enrichedProps[prop] = enrichButtonActions(actionProps[prop], context)
+    enrichedProps[prop] = enrichButtonActions(actionProps[prop], totalContext)
  })

  // Conditions
@ -56,7 +66,7 @@ export const enrichProps = (props, context, settingsDefinitionMap) => {
        // action
        condition.settingValue = enrichButtonActions(
          rawConditions[idx].settingValue,
-          context
+          totalContext
        )

        // Since we can't compare functions, we need to assume that conditions
--- a/packages/frontend-core/src/api/rows.js
+++ b/packages/frontend-core/src/api/rows.js
@ -19,12 +19,11 @@ export const buildRowEndpoints = API => ({
   * @param suppressErrors whether or not to suppress error notifications
   */
  saveRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
+    if (!row?.tableId) {
      return
    }
    return await API.post({
-      url: `/api/${resourceId}/rows`,
+      url: `/api/${row._viewId || row.tableId}/rows`,
      body: row,
      suppressErrors,
    })
@ -36,12 +35,11 @@ export const buildRowEndpoints = API => ({
   * @param suppressErrors whether or not to suppress error notifications
   */
  patchRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
+    if (!row?.tableId && !row?._viewId) {
      return
    }
    return await API.patch({
-      url: `/api/${resourceId}/rows`,
+      url: `/api/${row._viewId || row.tableId}/rows`,
      body: row,
      suppressErrors,
    })
--- a/packages/pro
+++ b/packages/pro
@ -1 +1 @@
-Subproject commit ce7722ed4474718596b465dcfd49bef36cab2e42
+Subproject commit eb9565f568cfef14b336b14eee753119acfdd43b
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@ -1,15 +1,21 @@
 import { generateQueryID } from "../../../db/utils"
-import { BaseQueryVerbs, FieldTypes } from "../../../constants"
+import { BaseQueryVerbs } from "../../../constants"
 import { Thread, ThreadType } from "../../../threads"
 import { save as saveDatasource } from "../datasource"
 import { RestImporter } from "./import"
 import { invalidateDynamicVariables } from "../../../threads/utils"
 import env from "../../../environment"
-import { quotas } from "@budibase/pro"
 import { events, context, utils, constants } from "@budibase/backend-core"
 import sdk from "../../../sdk"
-import { QueryEvent } from "../../../threads/definitions"
-import { ConfigType, Query, UserCtx, SessionCookie } from "@budibase/types"
+import { QueryEvent, QueryResponse } from "../../../threads/definitions"
+import {
+  ConfigType,
+  Query,
+  UserCtx,
+  SessionCookie,
+  QuerySchema,
+  FieldType,
+} from "@budibase/types"
 import { ValidQueryNameRegex } from "@budibase/shared-core"

 const Runner = new Thread(ThreadType.QUERY, {
@ -162,39 +168,43 @@ export async function preview(ctx: UserCtx) {
      },
    }

-    const { rows, keys, info, extra } = (await Runner.run(inputs)) as any
-    const schemaFields: any = {}
+    const { rows, keys, info, extra } = await Runner.run<QueryResponse>(inputs)
+    const previewSchema: Record<string, QuerySchema> = {}
+    const makeQuerySchema = (type: FieldType, name: string): QuerySchema => ({
+      type,
+      name,
+    })
    if (rows?.length > 0) {
      for (let key of [...new Set(keys)] as string[]) {
        const field = rows[0][key]
        let type = typeof field,
-          fieldType = FieldTypes.STRING
+          fieldMetadata = makeQuerySchema(FieldType.STRING, key)
        if (field)
          switch (type) {
            case "boolean":
-              schemaFields[key] = FieldTypes.BOOLEAN
+              fieldMetadata = makeQuerySchema(FieldType.BOOLEAN, key)
              break
            case "object":
              if (field instanceof Date) {
-                fieldType = FieldTypes.DATETIME
+                fieldMetadata = makeQuerySchema(FieldType.DATETIME, key)
              } else if (Array.isArray(field)) {
-                fieldType = FieldTypes.ARRAY
+                fieldMetadata = makeQuerySchema(FieldType.ARRAY, key)
              } else {
-                fieldType = FieldTypes.JSON
+                fieldMetadata = makeQuerySchema(FieldType.JSON, key)
              }
              break
            case "number":
-              fieldType = FieldTypes.NUMBER
+              fieldMetadata = makeQuerySchema(FieldType.NUMBER, key)
              break
          }
-        schemaFields[key] = fieldType
+        previewSchema[key] = fieldMetadata
      }
    }
    // if existing schema, update to include any previous schema keys
    if (existingSchema) {
-      for (let key of Object.keys(schemaFields)) {
-        if (existingSchema[key]?.type) {
-          schemaFields[key] = existingSchema[key].type
+      for (let key of Object.keys(previewSchema)) {
+        if (existingSchema[key]) {
+          previewSchema[key] = existingSchema[key]
        }
      }
    }
@ -203,7 +213,7 @@ export async function preview(ctx: UserCtx) {
    await events.query.previewed(datasource, query)
    ctx.body = {
      rows,
-      schemaFields,
+      schema: previewSchema,
      info,
      extra,
    }
@ -257,7 +267,9 @@ async function execute(
      schema: query.schema,
    }

-    const { rows, pagination, extra, info } = (await Runner.run(inputs)) as any
+    const { rows, pagination, extra, info } = await Runner.run<QueryResponse>(
+      inputs
+    )
    // remove the raw from execution incase transformer being used to hide data
    if (extra?.raw) {
      delete extra.raw
--- a/packages/server/src/api/routes/tests/query.seq.spec.js
+++ b/packages/server/src/api/routes/tests/query.seq.spec.js
@ -235,9 +235,9 @@ describe("/queries", () => {
        .expect("Content-Type", /json/)
        .expect(200)
      // these responses come from the mock
-      expect(res.body.schemaFields).toEqual({
-        a: "string",
-        b: "number",
+      expect(res.body.schema).toEqual({
+        a: { type: "string", name: "a" },
+        b: { type: "number", name: "b" },
      })
      expect(res.body.rows.length).toEqual(1)
      expect(events.query.previewed).toBeCalledTimes(1)
@ -300,10 +300,10 @@ describe("/queries", () => {
        queryString: "test={{ variable2 }}",
      })
      // these responses come from the mock
-      expect(res.body.schemaFields).toEqual({
-        opts: "json",
-        url: "string",
-        value: "string",
+      expect(res.body.schema).toEqual({
+        opts: { type: "json", name: "opts" },
+        url: { type: "string", name: "url" },
+        value: { type: "string", name: "value" },
      })
      expect(res.body.rows[0].url).toEqual("http://www.google.com?test=1")
    })
@ -314,10 +314,10 @@ describe("/queries", () => {
        path: "www.google.com",
        queryString: "test={{ variable3 }}",
      })
-      expect(res.body.schemaFields).toEqual({
-        opts: "json",
-        url: "string",
-        value: "string",
+      expect(res.body.schema).toEqual({
+        opts: { type: "json", name: "opts" },
+        url: { type: "string", name: "url" },
+        value: { type: "string", name: "value" },
      })
      expect(res.body.rows[0].url).toContain("doctype%20html")
    })
@ -337,10 +337,10 @@ describe("/queries", () => {
        path: "www.failonce.com",
        queryString: "test={{ variable3 }}",
      })
-      expect(res.body.schemaFields).toEqual({
-        fails: "number",
-        opts: "json",
-        url: "string",
+      expect(res.body.schema).toEqual({
+        fails: { type: "number", name: "fails" },
+        opts: { type: "json", name: "opts" },
+        url: { type: "string", name: "url" },
      })
      expect(res.body.rows[0].fails).toEqual(1)
    })
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@ -60,6 +60,7 @@ const environment = {
  PLUGINS_DIR: process.env.PLUGINS_DIR || "/plugins",
  OPENAI_API_KEY: process.env.OPENAI_API_KEY,
  MAX_IMPORT_SIZE_MB: process.env.MAX_IMPORT_SIZE_MB,
+  SESSION_EXPIRY_SECONDS: process.env.SESSION_EXPIRY_SECONDS,
  // flags
  ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
  DISABLE_THREADING: process.env.DISABLE_THREADING,
--- a/packages/server/src/events/AutomationEmitter.ts
+++ b/packages/server/src/events/AutomationEmitter.ts
@ -1,18 +1,11 @@
 import { rowEmission, tableEmission } from "./utils"
 import mainEmitter from "./index"
 import env from "../environment"
-import { Table, Row } from "@budibase/types"
+import { Table, Row, DocumentType, App } from "@budibase/types"
+import { context } from "@budibase/backend-core"

-// max number of automations that can chain on top of each other
-// TODO: in future make this configurable at the automation level
-const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0
+const MAX_AUTOMATIONS_ALLOWED = 5

-/**
- * Special emitter which takes the count of automation runs which have occurred and blocks an
- * automation from running if it has reached the maximum number of chained automations runs.
- * This essentially "fakes" the normal emitter to add some functionality in-between to stop automations
- * from getting stuck endlessly chaining.
- */
 class AutomationEmitter {
  chainCount: number
  metadata: { automationChainCount: number }
@ -24,7 +17,23 @@ class AutomationEmitter {
    }
  }

-  emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+  async getMaxAutomationChain() {
+    const db = context.getAppDB()
+    const appMetadata = await db.get<App>(DocumentType.APP_METADATA)
+    let chainAutomations = appMetadata?.automations?.chainAutomations
+
+    if (chainAutomations === true) {
+      return MAX_AUTOMATIONS_ALLOWED
+    } else if (chainAutomations === undefined && env.SELF_HOSTED) {
+      return MAX_AUTOMATIONS_ALLOWED
+    } else {
+      return 0
+    }
+  }
+
+  async emitRow(eventName: string, appId: string, row: Row, table?: Table) {
+    let MAX_AUTOMATION_CHAIN = await this.getMaxAutomationChain()
+
    // don't emit even if we've reached max automation chain
    if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
      return
@ -39,9 +48,11 @@ class AutomationEmitter {
    })
  }

-  emitTable(eventName: string, appId: string, table?: Table) {
+  async emitTable(eventName: string, appId: string, table?: Table) {
+    let MAX_AUTOMATION_CHAIN = await this.getMaxAutomationChain()
+
    // don't emit even if we've reached max automation chain
-    if (this.chainCount > MAX_AUTOMATION_CHAIN) {
+    if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
      return
    }

--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@ -376,8 +376,8 @@ export function checkExternalTables(
      errors[name] = "Table must have a primary key."
    }

-    const schemaFields = Object.keys(table.schema)
-    if (schemaFields.find(f => invalidColumns.includes(f))) {
+    const columnNames = Object.keys(table.schema)
+    if (columnNames.find(f => invalidColumns.includes(f))) {
      errors[name] = "Table contains invalid columns."
    }
  }
--- a/packages/server/src/middleware/authorized.ts
+++ b/packages/server/src/middleware/authorized.ts
@ -34,7 +34,7 @@ const checkAuthorized = async (
  const isCreatorApi = permType === PermissionType.CREATOR
  const isBuilderApi = permType === PermissionType.BUILDER
  const isGlobalBuilder = users.isGlobalBuilder(ctx.user)
-  const isCreator = users.isCreator(ctx.user)
+  const isCreator = await users.isCreator(ctx.user)
  const isBuilder = appId
    ? users.isBuilder(ctx.user, appId)
    : users.hasBuilderPermissions(ctx.user)
--- a/packages/server/src/sdk/app/queries/queries.ts
+++ b/packages/server/src/sdk/app/queries/queries.ts
@ -3,6 +3,27 @@ import { processStringSync } from "@budibase/string-templates"
 import { context } from "@budibase/backend-core"
 import { getQueryParams, isProdAppID } from "../../../db/utils"
 import { BaseQueryVerbs } from "../../../constants"
+import { Query, QuerySchema } from "@budibase/types"
+
+function updateSchema(query: Query): Query {
+  if (!query.schema) {
+    return query
+  }
+  const schema: Record<string, QuerySchema> = {}
+  for (let key of Object.keys(query.schema)) {
+    if (typeof query.schema[key] === "string") {
+      schema[key] = { type: query.schema[key] as string, name: key }
+    } else {
+      schema[key] = query.schema[key] as QuerySchema
+    }
+  }
+  query.schema = schema
+  return query
+}
+
+function updateSchemas(queries: Query[]): Query[] {
+  return queries.map(query => updateSchema(query))
+}

 // simple function to append "readable" to all read queries
 function enrichQueries(input: any) {
@ -25,7 +46,7 @@ export async function find(queryId: string) {
    delete query.fields
    delete query.parameters
  }
-  return query
+  return updateSchema(query)
 }

 export async function fetch(opts: { enrich: boolean } = { enrich: true }) {
@ -37,12 +58,11 @@ export async function fetch(opts: { enrich: boolean } = { enrich: true }) {
    })
  )

-  const queries = body.rows.map((row: any) => row.doc)
+  let queries = body.rows.map((row: any) => row.doc)
  if (opts.enrich) {
-    return enrichQueries(queries)
-  } else {
-    return queries
+    queries = await enrichQueries(queries)
  }
+  return updateSchemas(queries)
 }

 export async function enrichContext(
--- a/packages/server/src/sdk/users/tests/utils.spec.ts
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@ -84,7 +84,7 @@ describe("syncGlobalUsers", () => {
        await syncGlobalUsers()

        const metadata = await rawUserMetadata()
-        expect(metadata).toHaveLength(3)
+        expect(metadata).toHaveLength(2)
        expect(metadata).toContainEqual(
          expect.objectContaining({
            _id: db.generateUserMetadataID(user1._id!),
@ -121,7 +121,7 @@ describe("syncGlobalUsers", () => {
        await syncGlobalUsers()

        const metadata = await rawUserMetadata()
-        expect(metadata).toHaveLength(0)
+        expect(metadata).toHaveLength(1) //ADMIN user created in test bootstrap still in the application
      })
    })
  })
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@ -278,6 +278,9 @@ class TestConfiguration {
    if (params) {
      request.params = params
    }
+    request.throw = (status: number, message: string) => {
+      throw new Error(`Error ${status} - ${message}`)
+    }
    return this.doInContext(appId, async () => {
      await controlFunc(request)
      return request.body
--- a/packages/server/src/threads/definitions.ts
+++ b/packages/server/src/threads/definitions.ts
@ -1,3 +1,5 @@
+import { QuerySchema, Row } from "@budibase/types"
+
 export type WorkerCallback = (error: any, response?: any) => void

 export interface QueryEvent {
@ -11,7 +13,15 @@ export interface QueryEvent {
  queryId: string
  environmentVariables?: Record<string, string>
  ctx?: any
-  schema?: Record<string, { name?: string; type: string }>
+  schema?: Record<string, QuerySchema | string>
+}
+
+export interface QueryResponse {
+  rows: Row[]
+  keys: string[]
+  info: any
+  extra: any
+  pagination: any
 }

 export interface QueryVariable {
--- a/packages/server/src/threads/index.ts
+++ b/packages/server/src/threads/index.ts
@ -74,7 +74,7 @@ export class Thread {
    )
  }

-  run(job: AutomationJob | QueryEvent) {
+  run<T>(job: AutomationJob | QueryEvent): Promise<T> {
    const timeout = this.timeoutMs
    return new Promise((resolve, reject) => {
      function fire(worker: any) {
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@ -1,7 +1,12 @@
 import { default as threadUtils } from "./utils"

 threadUtils.threadSetup()
-import { WorkerCallback, QueryEvent, QueryVariable } from "./definitions"
+import {
+  WorkerCallback,
+  QueryEvent,
+  QueryVariable,
+  QueryResponse,
+} from "./definitions"
 import ScriptRunner from "../utilities/scriptRunner"
 import { getIntegration } from "../integrations"
 import { processStringSync } from "@budibase/string-templates"
@ -9,7 +14,7 @@ import { context, cache, auth } from "@budibase/backend-core"
 import { getGlobalIDFromUserMetadataID } from "../db/utils"
 import sdk from "../sdk"
 import { cloneDeep } from "lodash/fp"
-import { SourceName, Query } from "@budibase/types"
+import { Query } from "@budibase/types"

 import { isSQL } from "../integrations/utils"
 import { interpolateSQL } from "../integrations/queries/sql"
@ -53,7 +58,7 @@ class QueryRunner {
    this.hasDynamicVariables = false
  }

-  async execute(): Promise<any> {
+  async execute(): Promise<QueryResponse> {
    let { datasource, fields, queryVerb, transformer, schema } = this
    let datasourceClone = cloneDeep(datasource)
    let fieldsClone = cloneDeep(fields)
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@ -48,6 +48,9 @@ async function checkResponse(
    let error
    try {
      error = await response.json()
+      if (!error.message) {
+        error = JSON.stringify(error)
+      }
    } catch (err) {
      error = await response.text()
    }
--- a/packages/shared-core/src/sdk/documents/users.ts
+++ b/packages/shared-core/src/sdk/documents/users.ts
@ -70,7 +70,7 @@ export function hasAppCreatorPermissions(user?: User | ContextUser): boolean {
  return _.flow(
    _.get("roles"),
    _.values,
-    _.find(x => x === "CREATOR"),
+    _.find(x => ["CREATOR", "ADMIN"].includes(x)),
    x => !!x
  )(user)
 }
--- a/packages/string-templates/manifest.json
+++ b/packages/string-templates/manifest.json
@ -137,7 +137,7 @@
        "n"
      ],
      "numArgs": 2,
-      "example": "{{ after [1, 2, 3] 1}} -> [3]",
+      "example": "{{ after ['a', 'b', 'c', 'd'] 2}} -> ['c', 'd']",
      "description": "<p>Returns all of the items in an array after the specified index. Opposite of <a href=\"#before\">before</a>.</p>\n"
    },
    "arrayify": {
@ -154,7 +154,7 @@
        "n"
      ],
      "numArgs": 2,
-      "example": "{{ before [1, 2, 3] 2}} -> [1, 2]",
+      "example": "{{ before ['a', 'b', 'c', 'd'] 3}} -> ['a', 'b']",
      "description": "<p>Return all of the items in the collection before the specified count. Opposite of <a href=\"#after\">after</a>.</p>\n"
    },
    "eachIndex": {
@ -182,7 +182,7 @@
        "n"
      ],
      "numArgs": 2,
-      "example": "{{first [1, 2, 3, 4] 2}} -> [1, 2]",
+      "example": "{{first [1, 2, 3, 4] 2}} -> 1,2",
      "description": "<p>Returns the first item, or first <code>n</code> items of an array.</p>\n"
    },
    "forEach": {
@ -200,7 +200,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> 2 exists",
+      "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> ' 2 exists '",
      "description": "<p>Block helper that renders the block if an array has the given <code>value</code>. Optionally specify an inverse block to render when the array does not have the given value.</p>\n"
    },
    "isArray": {
@ -226,7 +226,7 @@
        "separator"
      ],
      "numArgs": 2,
-      "example": "{{join [1, 2, 3]}} -> '1, 2, 3'",
+      "example": "{{join [1, 2, 3]}} -> 1, 2, 3",
      "description": "<p>Join all elements of array into a string, optionally using a given separator.</p>\n"
    },
    "equalsLength": {
@ -236,7 +236,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{equalsLength '[1,2,3]' 3}} -> true",
+      "example": "{{equalsLength [1, 2, 3] 3}} -> true",
      "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n"
    },
    "last": {
@ -253,7 +253,7 @@
        "value"
      ],
      "numArgs": 1,
-      "example": "{{length '[1, 2, 3]'}} -> 3",
+      "example": "{{length [1, 2, 3]}} -> 3",
      "description": "<p>Returns the length of the given string or array.</p>\n"
    },
    "lengthEqual": {
@ -263,7 +263,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{equalsLength '[1,2,3]' 3}} -> true",
+      "example": "{{equalsLength [1, 2, 3] 3}} -> true",
      "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n"
    },
    "map": {
@ -299,7 +299,7 @@
        "provided"
      ],
      "numArgs": 3,
-      "example": "{{#some [1, 'b', 3] isString}} string found {{else}} No string found {{/some}} -> string found",
+      "example": "{{#some [1, \"b\", 3] isString}} string found {{else}} No string found {{/some}} -> ' string found '",
      "description": "<p>Block helper that returns the block if the callback returns true for some value in the given array.</p>\n"
    },
    "sort": {
@ -317,7 +317,7 @@
        "props"
      ],
      "numArgs": 2,
-      "example": "{{ sortBy [{a: 'zzz'}, {a: 'aaa'}] 'a' }} -> [{'a':'aaa'}, {'a':'zzz'}]",
+      "example": "{{ sortBy [{'a': 'zzz'}, {'a': 'aaa'}] 'a' }} -> [{'a':'aaa'},{'a':'zzz'}]",
      "description": "<p>Sort an <code>array</code>. If an array of objects is passed, you may optionally pass a <code>key</code> to sort on as the second argument. You may alternatively pass a sorting function as the second argument.</p>\n"
    },
    "withAfter": {
@ -347,7 +347,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{ withFirst [1, 2, 3] }} {{this}} {{/withFirst}}",
+      "example": "{{#withFirst [1, 2, 3] }}{{this}}{{/withFirst}} -> 1",
      "description": "<p>Use the first item in a collection inside a handlebars block expression. Opposite of <a href=\"#withLast\">withLast</a>.</p>\n"
    },
    "withGroup": {
@ -357,7 +357,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#withGroup [1, 2, 3, 4] 2}} {{#each this}} {{.}} {{each}} <br> {{/withGroup}} -> 1,2<br> 3,4<br>",
+      "example": "{{#withGroup [1, 2, 3, 4] 2}}{{#each this}}{{.}}{{/each}}<br>{{/withGroup}} -> 12<br>34<br>",
      "description": "<p>Block helper that groups array elements by given group <code>size</code>.</p>\n"
    },
    "withLast": {
@ -367,7 +367,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#withLast [1, 2, 3, 4]}} {{this}} {{/withLast}} -> 4",
+      "example": "{{#withLast [1, 2, 3, 4]}}{{this}}{{/withLast}} -> 4",
      "description": "<p>Use the last item or <code>n</code> items in an array as context inside a block. Opposite of <a href=\"#withFirst\">withFirst</a>.</p>\n"
    },
    "withSort": {
@ -377,7 +377,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#withSort ['b', 'a', 'c']}} {{this}} {{/withSort}} -> abc",
+      "example": "{{#withSort ['b', 'a', 'c']}}{{this}}{{/withSort}} -> abc",
      "description": "<p>Block helper that sorts a collection and exposes the sorted collection as context inside the block.</p>\n"
    },
    "unique": {
@ -386,7 +386,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }} {{.}} {{/each}} -> acbe",
+      "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }}{{.}}{{/each}} -> acbe",
      "description": "<p>Block helper that return an array with all duplicate values removed. Best used along with a <a href=\"#each\">each</a> helper.</p>\n"
    }
  },
@ -396,7 +396,7 @@
        "number"
      ],
      "numArgs": 1,
-      "example": "{{ bytes 1386 }} -> 1.4Kb",
+      "example": "{{ bytes 1386 1 }} -> 1.4 kB",
      "description": "<p>Format a number to it&#39;s equivalent in bytes. If a string is passed, it&#39;s length will be formatted and returned. <strong>Examples:</strong> - <code>&#39;foo&#39; =&gt; 3 B</code> - <code>13661855 =&gt; 13.66 MB</code> - <code>825399 =&gt; 825.39 kB</code> - <code>1396 =&gt; 1.4 kB</code></p>\n"
    },
    "addCommas": {
@ -430,7 +430,7 @@
        "fractionDigits"
      ],
      "numArgs": 2,
-      "example": "{{ toExponential 10123 2 }} -> 101e+4",
+      "example": "{{ toExponential 10123 2 }} -> 1.01e+4",
      "description": "<p>Returns a string representing the given number in exponential notation.</p>\n"
    },
    "toFixed": {
@ -472,7 +472,7 @@
        "str"
      ],
      "numArgs": 1,
-      "example": "{{ encodeURI 'https://myurl?Hello There' }} -> https://myurl?Hello%20There",
+      "example": "{{ encodeURI 'https://myurl?Hello There' }} -> https%3A%2F%2Fmyurl%3FHello%20There",
      "description": "<p>Encodes a Uniform Resource Identifier (URI) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.</p>\n"
    },
    "escape": {
@ -480,7 +480,7 @@
        "str"
      ],
      "numArgs": 1,
-      "example": "{{ escape 'https://myurl?Hello+There' }} -> https://myurl?Hello%20There",
+      "example": "{{ escape 'https://myurl?Hello+There' }} -> https%3A%2F%2Fmyurl%3FHello%2BThere",
      "description": "<p>Escape the given string by replacing characters with escape sequences. Useful for allowing the string to be used in a URL, etc.</p>\n"
    },
    "decodeURI": {
@ -488,7 +488,7 @@
        "str"
      ],
      "numArgs": 1,
-      "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?=Hello There",
+      "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?Hello There",
      "description": "<p>Decode a Uniform Resource Identifier (URI) component.</p>\n"
    },
    "urlResolve": {
@ -513,7 +513,7 @@
        "url"
      ],
      "numArgs": 1,
-      "example": "{{ stripQueryString 'https://myurl/api/test?foo=bar' }} -> 'https://myurl/api/test'",
+      "example": "{{ stripQuerystring 'https://myurl/api/test?foo=bar' }} -> 'https://myurl/api/test'",
      "description": "<p>Strip the query string from the given <code>url</code>.</p>\n"
    },
    "stripProtocol": {
@ -521,7 +521,7 @@
        "str"
      ],
      "numArgs": 1,
-      "example": "{{ stripProtocol 'https://myurl/api/test' }} -> 'myurl/api/test'",
+      "example": "{{ stripProtocol 'https://myurl/api/test' }} -> '//myurl/api/test'",
      "description": "<p>Strip protocol from a <code>url</code>. Useful for displaying media that may have an &#39;http&#39; protocol on secure connections.</p>\n"
    }
  },
@ -573,7 +573,7 @@
        "string"
      ],
      "numArgs": 1,
-      "example": "{{ chop ' ABC '}} -> 'ABC'",
+      "example": "{{ chop ' ABC '}} -> ABC",
      "description": "<p>Like trim, but removes both extraneous whitespace <strong>and non-word characters</strong> from the beginning and end of a string.</p>\n"
    },
    "dashcase": {
@ -606,7 +606,7 @@
        "length"
      ],
      "numArgs": 2,
-      "example": "{{ellipsis 'foo bar baz', 7}} -> foo bar…",
+      "example": "{{ellipsis 'foo bar baz' 7}} -> foo bar…",
      "description": "<p>Truncates a string to the specified <code>length</code>, and appends it with an elipsis, <code>…</code>.</p>\n"
    },
    "hyphenate": {
@ -675,14 +675,6 @@
      "example": "{{prepend 'bar' 'foo-'}} -> foo-bar",
      "description": "<p>Prepends the given <code>string</code> with the specified <code>prefix</code>.</p>\n"
    },
-    "raw": {
-      "args": [
-        "options"
-      ],
-      "numArgs": 1,
-      "example": "{{{{#raw}}}} {{foo}} {{{{/raw}}}} -> {{foo}}",
-      "description": "<p>Render a block without processing mustache templates inside the block.</p>\n"
-    },
    "remove": {
      "args": [
        "str",
@ -698,7 +690,7 @@
        "substring"
      ],
      "numArgs": 2,
-      "example": "{{remove 'a b a b a b' 'a'}} ->  b a b a b",
+      "example": "{{removeFirst 'a b a b a b' 'a'}} -> ' b a b a b'",
      "description": "<p>Remove the first occurrence of <code>substring</code> from the given <code>str</code>.</p>\n"
    },
    "replace": {
@ -718,7 +710,7 @@
        "b"
      ],
      "numArgs": 3,
-      "example": "{{replace 'a b a b a b' 'a' 'z'}} -> z b a b a b",
+      "example": "{{replaceFirst 'a b a b a b' 'a' 'z'}} -> z b a b a b",
      "description": "<p>Replace the first occurrence of substring <code>a</code> with substring <code>b</code>.</p>\n"
    },
    "sentence": {
@ -752,7 +744,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#startsWith 'Goodbye' 'Hello, world!'}} Yep {{else}} Nope {{/startsWith}} -> Nope",
+      "example": "{{#startsWith 'Goodbye' 'Hello, world!'}}Yep{{else}}Nope{{/startsWith}} -> Nope",
      "description": "<p>Tests whether a string begins with the given prefix.</p>\n"
    },
    "titleize": {
@ -760,7 +752,7 @@
        "str"
      ],
      "numArgs": 1,
-      "example": "{{#titleize 'this is title case' }} -> This Is Title Case",
+      "example": "{{titleize 'this is title case' }} -> This Is Title Case",
      "description": "<p>Title case the given string.</p>\n"
    },
    "trim": {
@ -784,7 +776,7 @@
        "string"
      ],
      "numArgs": 1,
-      "example": "{{trimRight '  ABC ' }} ->  '  ABC '",
+      "example": "{{trimRight '  ABC ' }} ->  '  ABC'",
      "description": "<p>Removes extraneous whitespace from the end of a string.</p>\n"
    },
    "truncate": {
@ -804,7 +796,7 @@
        "suffix"
      ],
      "numArgs": 3,
-      "example": "{{truncateWords 'foo bar baz' 1 }} -> foo",
+      "example": "{{truncateWords 'foo bar baz' 1 }} -> foo…",
      "description": "<p>Truncate a string to have the specified number of words. Also see <a href=\"#truncate\">truncate</a>.</p>\n"
    },
    "upcase": {
@ -844,7 +836,7 @@
        "options"
      ],
      "numArgs": 4,
-      "example": "{{compare 10 '<' 5 }} -> true",
+      "example": "{{compare 10 '<' 5 }} -> false",
      "description": "<p>Render a block when a comparison of the first and third arguments returns true. The second argument is the [arithemetic operator][operators] to use. You may also optionally specify an inverse block to render when falsy.</p>\n"
    },
    "contains": {
@ -874,7 +866,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#eq 3 3}} equal{{else}} not equal{{/eq}} -> equal",
+      "example": "{{#eq 3 3}}equal{{else}}not equal{{/eq}} -> equal",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
    },
    "gt": {
@ -884,7 +876,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> greater than",
+      "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> ' greater than'",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
    },
    "gte": {
@ -894,7 +886,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> greater than or equal",
+      "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> ' greater than or equal'",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
    },
    "has": {
@ -904,7 +896,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#has 'foobar' 'foo'}} has it{{else}} doesn't{{/has}} -> has it",
+      "example": "{{#has 'foobar' 'foo'}}has it{{else}}doesn't{{/has}} -> has it",
      "description": "<p>Block helper that renders a block if <code>value</code> has <code>pattern</code>. If an inverse block is specified it will be rendered when falsy.</p>\n"
    },
    "isFalsey": {
@ -931,7 +923,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> even",
+      "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> ' even '",
      "description": "<p>Return true if the given value is an even number.</p>\n"
    },
    "ifNth": {
@ -941,8 +933,8 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#ifNth 10 2}} remainder {{else}} no remainder {{/ifNth}} -> remainder",
-      "description": "<p>Conditionally renders a block if the remainder is zero when <code>a</code> operand is divided by <code>b</code>. If an inverse block is specified it will be rendered when the remainder is <strong>not zero</strong>.</p>\n"
+      "example": "{{#ifNth 2 10}}remainder{{else}}no remainder{{/ifNth}} -> remainder",
+      "description": "<p>Conditionally renders a block if the remainder is zero when <code>b</code> operand is divided by <code>a</code>. If an inverse block is specified it will be rendered when the remainder is <strong>not zero</strong>.</p>\n"
    },
    "ifOdd": {
      "args": [
@ -950,7 +942,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#ifOdd 3}} odd {{else}} even {{/ifOdd}} -> odd",
+      "example": "{{#ifOdd 3}}odd{{else}}even{{/ifOdd}} -> odd",
      "description": "<p>Block helper that renders a block if <code>value</code> is <strong>an odd number</strong>. If an inverse block is specified it will be rendered when falsy.</p>\n"
    },
    "is": {
@ -960,7 +952,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> is",
+      "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> ' is '",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#eq\">eq</a> but does not do strict equality.</p>\n"
    },
    "isnt": {
@ -970,7 +962,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> is",
+      "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> ' is '",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>not equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#unlesseq\">unlessEq</a> but does not use strict equality for comparisons.</p>\n"
    },
    "lt": {
@ -979,7 +971,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> less than",
+      "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> ' less than '",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
    },
    "lte": {
@ -989,7 +981,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> less than or equal",
+      "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> ' less than or equal '",
      "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n"
    },
    "neither": {
@ -999,7 +991,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#neither null null}} both falsey {{else}} both not falsey {{/neither}} -> both falsey",
+      "example": "{{#neither null null}}both falsey{{else}}both not falsey{{/neither}} -> both falsey",
      "description": "<p>Block helper that renders a block if <strong>neither of</strong> the given values are truthy. If an inverse block is specified it will be rendered when falsy.</p>\n"
    },
    "not": {
@ -1008,7 +1000,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#not undefined }} falsey {{else}} not falsey {{/not}} -> falsey",
+      "example": "{{#not undefined }}falsey{{else}}not falsey{{/not}} -> falsey",
      "description": "<p>Returns true if <code>val</code> is falsey. Works as a block or inline helper.</p>\n"
    },
    "or": {
@ -1017,7 +1009,7 @@
        "options"
      ],
      "numArgs": 2,
-      "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> at least one truthy",
+      "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> ' at least one truthy '",
      "description": "<p>Block helper that renders a block if <strong>any of</strong> the given values is truthy. If an inverse block is specified it will be rendered when falsy.</p>\n"
    },
    "unlessEq": {
@ -1027,7 +1019,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> not equal",
+      "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> ' not equal '",
      "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is equal to <code>b</code></strong>.</p>\n"
    },
    "unlessGt": {
@ -1037,7 +1029,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> greater than",
+      "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> ' greater than '",
      "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than <code>b</code></strong>.</p>\n"
    },
    "unlessLt": {
@ -1047,7 +1039,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#unlessLt 20 1 }} greater than or equal {{else}} less than {{/unlessLt}} -> greater than or equal",
+      "example": "{{#unlessLt 20 1 }}greater than or equal{{else}}less than{{/unlessLt}} -> greater than or equal",
      "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than <code>b</code></strong>.</p>\n"
    },
    "unlessGteq": {
@ -1057,7 +1049,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#unlessGteq 20 1 }} less than {{else}} greater than or equal to {{/unlessGteq}} -> greater than or equal to",
+      "example": "{{#unlessGteq 20 1 }} less than {{else}}greater than or equal to{{/unlessGteq}} -> greater than or equal to",
      "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than or equal to <code>b</code></strong>.</p>\n"
    },
    "unlessLteq": {
@ -1067,7 +1059,7 @@
        "options"
      ],
      "numArgs": 3,
-      "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> greater than",
+      "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> ' greater than '",
      "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than or equal to <code>b</code></strong>.</p>\n"
    }
  },
@ -1204,7 +1196,7 @@
        "durationType"
      ],
      "numArgs": 2,
-      "example": "{{duration timeLeft \"seconds\"}} -> a few seconds",
+      "example": "{{duration 8 \"seconds\"}} -> a few seconds",
      "description": "<p>Produce a humanized duration left/until given an amount of time and the type of time measurement.</p>\n"
    }
  }
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -25,7 +25,7 @@
    "manifest": "node ./scripts/gen-collection-info.js"
  },
  "dependencies": {
-    "@budibase/handlebars-helpers": "^0.12.0",
+    "@budibase/handlebars-helpers": "^0.13.0",
    "dayjs": "^1.10.8",
    "handlebars": "^4.7.6",
    "lodash.clonedeep": "^4.5.0",
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@ -36,7 +36,7 @@ const ADDED_HELPERS = {
    duration: {
      args: ["time", "durationType"],
      numArgs: 2,
-      example: '{{duration timeLeft "seconds"}} -> a few seconds',
+      example: '{{duration 8 "seconds"}} -> a few seconds',
      description:
        "Produce a humanized duration left/until given an amount of time and the type of time measurement.",
    },
@ -118,6 +118,8 @@ function getCommentInfo(file, func) {
  return docs
 }

+const excludeFunctions = { string: ["raw"] }
+
 /**
 * This script is very specific to purpose, parsing the handlebars-helpers files to attempt to get information about them.
 */
@ -136,7 +138,8 @@ function run() {
      // skip built in functions and ones seen already
      if (
        HelperFunctionBuiltin.indexOf(name) !== -1 ||
-        foundNames.indexOf(name) !== -1
+        foundNames.indexOf(name) !== -1 ||
+        excludeFunctions[collection]?.includes(name)
      ) {
        continue
      }
--- a/packages/string-templates/test/helpers.spec.js
+++ b/packages/string-templates/test/helpers.spec.js
@ -61,10 +61,10 @@ describe("test the array helpers", () => {
  })

  it("should allow use of the before helper", async () => {
-    const output = await processString("{{before array 2}}", {
+    const output = await processString("{{before array 3}}", {
      array,
    })
-    expect(output).toBe("hi,person,how")
+    expect(output).toBe("hi,person")
  })

  it("should allow use of the filter helper", async () => {
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@ -0,0 +1,96 @@
+jest.mock("@budibase/handlebars-helpers/lib/math", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/math")
+
+  return {
+    ...actual,
+    random: () => 10,
+  }
+})
+jest.mock("@budibase/handlebars-helpers/lib/uuid", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/uuid")
+
+  return {
+    ...actual,
+    uuid: () => "f34ebc66-93bd-4f7c-b79b-92b5569138bc",
+  }
+})
+
+const fs = require("fs")
+const { processString } = require("../src/index.cjs")
+
+const tk = require("timekeeper")
+tk.freeze("2021-01-21T12:00:00")
+
+const manifest = JSON.parse(
+  fs.readFileSync(require.resolve("../manifest.json"), "utf8")
+)
+
+const collections = Object.keys(manifest)
+const examples = collections.reduce((acc, collection) => {
+  const functions = Object.keys(manifest[collection]).filter(
+    fnc => manifest[collection][fnc].example
+  )
+  if (functions.length) {
+    acc[collection] = functions
+  }
+  return acc
+}, {})
+
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
+}
+
+function tryParseJson(str) {
+  if (typeof str !== "string") {
+    return
+  }
+
+  try {
+    return JSON.parse(str.replace(/\'/g, '"'))
+  } catch (e) {
+    return
+  }
+}
+
+describe("manifest", () => {
+  describe("examples are valid", () => {
+    describe.each(Object.keys(examples))("%s", collection => {
+      it.each(examples[collection])("%s", async func => {
+        const example = manifest[collection][func].example
+
+        let [hbs, js] = example.split("->").map(x => x.trim())
+
+        const context = {
+          double: i => i * 2,
+          isString: x => typeof x === "string",
+        }
+
+        const arrays = hbs.match(/\[[^/\]]+\]/)
+        arrays?.forEach((arrayString, i) => {
+          hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
+          context[`array${i}`] = JSON.parse(arrayString.replace(/\'/g, '"'))
+        })
+
+        if (js === undefined) {
+          // The function has no return value
+          return
+        }
+
+        let result = await processString(hbs, context)
+        // Trim 's
+        js = js.replace(/^\'|\'$/g, "")
+        if ((parsedExpected = tryParseJson(js))) {
+          if (Array.isArray(parsedExpected)) {
+            if (typeof parsedExpected[0] === "object") {
+              js = JSON.stringify(parsedExpected)
+            } else {
+              js = parsedExpected.join(",")
+            }
+          }
+        }
+        result = result.replace(/&nbsp;/g, " ")
+        expect(result).toEqual(js)
+      })
+    })
+  })
+})
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@ -23,6 +23,7 @@ export interface App extends Document {
  automationErrors?: AppMetadataErrors
  icon?: AppIcon
  features?: AppFeatures
+  automations?: AutomationSettings
 }

 export interface AppInstance {
@ -68,3 +69,7 @@ export interface AppFeatures {
  componentValidation?: boolean
  disableUserMetadata?: boolean
 }
+
+export interface AutomationSettings {
+  chainAutomations?: boolean
+}
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@ -1,12 +1,17 @@
 import { Document } from "../document"

+export interface QuerySchema {
+  name?: string
+  type: string
+}
+
 export interface Query extends Document {
  datasourceId: string
  name: string
  parameters: QueryParameter[]
  fields: RestQueryFields | any
  transformer: string | null
-  schema: Record<string, { name?: string; type: string }>
+  schema: Record<string, QuerySchema | string>
  readable: boolean
  queryVerb: string
 }
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@ -91,6 +91,9 @@ export async function getSelf(ctx: any) {
    id: userId,
  }

+  // Adjust creators quotas (prevents wrong creators count if user has changed the plan)
+  await groups.adjustGroupCreatorsQuotas()
+
  // get the main body of the user
  const user = await userSdk.db.getUser(userId)
  ctx.body = await groups.enrichUserRolesFromGroups(user)
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@ -55,6 +55,7 @@ const environment = {
  CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
  SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
  ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
+  SESSION_EXPIRY_SECONDS: process.env.SESSION_EXPIRY_SECONDS,
  /**
   * Mock the email service in use - links to ethereal hosted emails are logged instead.
   */
--- a/scripts/build-single-image.sh
+++ b/scripts/build-single-image.sh
@ -1,4 +1,4 @@
 #!/bin/bash
 yarn build --scope @budibase/server --scope @budibase/worker
 version=$(./scripts/getCurrentVersion.sh)
-docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version .
+docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single .
--- a/yarn.lock
+++ b/yarn.lock
@ -2031,10 +2031,10 @@
  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

-"@budibase/handlebars-helpers@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.12.0.tgz#dcc4ba8d796a611474e3495b1142c56b470ca67d"
-  integrity sha512-JjGboau7KMdrVSO8gGJzgo1ACSeD4BxN46vidIx9hvdrEXy+v1x2bfQZMaq/c7Dv+V1vyq7c006XwxR1bpfARg==
+"@budibase/handlebars-helpers@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.0.tgz#224333d14e3900b7dacf48286af1e624a9fd62ea"
+  integrity sha512-g8+sFrMNxsIDnK+MmdUICTVGr6ReUFtnPp9hJX0VZwz1pN3Ynolpk/Qbu6rEWAvoU1sEqY1mXr9uo/+kEfeGbQ==
  dependencies:
    get-object "^0.2.0"
    get-value "^3.0.1"
@ -5557,9 +5557,9 @@
  integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==

 "@types/node@>=8.1.0":
-  version "20.11.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.2.tgz#39cea3fe02fbbc2f80ed283e94e1d24f2d3856fb"
-  integrity sha512-cZShBaVa+UO1LjWWBPmWRR4+/eY/JR/UIEcDlVsw3okjWEu+rB7/mH6X3B/L+qJVHDLjk9QW/y2upp9wp1yDXA==
+  version "20.11.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.6.tgz#6adf4241460e28be53836529c033a41985f85b6e"
+  integrity sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==
  dependencies:
    undici-types "~5.26.4"

@ -9497,9 +9497,9 @@ dotenv@8.6.0, dotenv@^8.2.0:
  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==

 dotenv@^16.3.1:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.0.tgz#ac21c3fcaad2e7832a1cd0c0e4e8e52225ecda0e"
+  integrity sha512-WvImr5kpN5NGNn7KaDjJnLTh5rDVLZiDf/YLA8T1ZEZEBZNEDOE+mnkS0PVjPax8ZxBP5zC5SLMB3/9VV5de9g==

 dotenv@~10.0.0:
  version "10.0.0"
@ -17426,11 +17426,12 @@ postgres-interval@^1.1.0:
    xtend "^4.0.0"

 posthog-js@^1.13.4:
-  version "1.100.0"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.100.0.tgz#687b9a6e4ed226aa6572f4040b418ea0c8b3d353"
-  integrity sha512-r2XZEiHQ9mBK7D1G9k57I8uYZ2kZTAJ0OCX6K/OOdCWN8jKPhw3h5F9No5weilP6eVAn+hrsy7NvPV7SCX7gMg==
+  version "1.101.0"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.101.0.tgz#00e0fc6e164addd52b1738f087996bb0d6685943"
+  integrity sha512-mzwYSSWr9FdEMDeVpc+diLfc85+10r/LgELGtsW/HaYk+0du/GEql6szpqG8YXMMgb2dE4dnj0JICZFIJd7K3w==
  dependencies:
    fflate "^0.4.1"
+    preact "^10.19.3"

 posthog-js@^1.36.0:
  version "1.96.1"
@ -17676,6 +17677,11 @@ pprof-format@^2.0.7:
  resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.0.7.tgz#526e4361f8b37d16b2ec4bb0696b5292de5046a4"
  integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==

+preact@^10.19.3:
+  version "10.19.3"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.3.tgz#7a7107ed2598a60676c943709ea3efb8aaafa899"
+  integrity sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==
+
 precinct@^8.1.0:
  version "8.3.1"
  resolved "https://registry.yarnpkg.com/precinct/-/precinct-8.3.1.tgz#94b99b623df144eed1ce40e0801c86078466f0dc"