From 29c5e6c243c31b86c682ef1af57ac40bd9ba57fc Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Fri, 26 Nov 2021 13:25:02 +0000
Subject: [PATCH 01/48] Add devtools to app preview and add ability to preview
 apps as different roles

---
 packages/auth/src/constants.js                |  1 +
 packages/bbui/src/Layout/Layout.svelte        |  8 ++
 packages/bbui/src/Tabs/Tabs.svelte            |  2 +-
 packages/client/src/api/api.js                |  5 +-
 .../client/src/components/ClientApp.svelte    | 75 +++++++++++-----
 .../client/src/components/Component.svelte    | 30 +++++--
 .../client/src/components/app/Layout.svelte   |  1 +
 .../src/components/app/forms/FormStep.svelte  |  4 +-
 .../src/components/devtools/DevTools.svelte   | 57 ++++++++++++
 .../devtools/DevToolsComponentTab.svelte      | 87 +++++++++++++++++++
 .../components/devtools/DevToolsHeader.svelte | 72 +++++++++++++++
 .../components/devtools/DevToolsStat.svelte   | 23 +++++
 .../devtools/DevToolsStatsTab.svelte          | 24 +++++
 .../src/components/preview/SettingsBar.svelte |  8 +-
 .../components/preview/SettingsButton.svelte  |  4 +-
 .../preview/SettingsColorPicker.svelte        |  4 +-
 .../components/preview/SettingsPicker.svelte  |  4 +-
 packages/client/src/stores/app.js             | 10 ++-
 packages/client/src/stores/auth.js            | 12 ++-
 packages/client/src/stores/builder.js         | 55 ++++--------
 packages/client/src/stores/components.js      | 65 ++++++++++++++
 packages/client/src/stores/devTools.js        | 47 ++++++++++
 packages/client/src/stores/index.js           |  2 +
 packages/client/src/stores/screens.js         |  1 -
 .../static/templates/BudibaseApp.svelte       |  3 +
 packages/server/src/middleware/currentapp.js  | 15 ++++
 26 files changed, 530 insertions(+), 89 deletions(-)
 create mode 100644 packages/client/src/components/devtools/DevTools.svelte
 create mode 100644 packages/client/src/components/devtools/DevToolsComponentTab.svelte
 create mode 100644 packages/client/src/components/devtools/DevToolsHeader.svelte
 create mode 100644 packages/client/src/components/devtools/DevToolsStat.svelte
 create mode 100644 packages/client/src/components/devtools/DevToolsStatsTab.svelte
 create mode 100644 packages/client/src/stores/components.js
 create mode 100644 packages/client/src/stores/devTools.js

diff --git a/packages/auth/src/constants.js b/packages/auth/src/constants.js
index 9892275bec..c7a0c20a41 100644
--- a/packages/auth/src/constants.js
+++ b/packages/auth/src/constants.js
@@ -15,6 +15,7 @@ exports.Headers = {
   API_VER: "x-budibase-api-version",
   APP_ID: "x-budibase-app-id",
   TYPE: "x-budibase-type",
+  PREVIEW_ROLE: "x-budibase-role",
   TENANT_ID: "x-budibase-tenant-id",
 }
 
diff --git a/packages/bbui/src/Layout/Layout.svelte b/packages/bbui/src/Layout/Layout.svelte
index af60675582..bd564ff40e 100644
--- a/packages/bbui/src/Layout/Layout.svelte
+++ b/packages/bbui/src/Layout/Layout.svelte
@@ -36,6 +36,10 @@
     padding-left: var(--spacing-l);
     padding-right: var(--spacing-l);
   }
+  .paddingX-XL {
+    padding-left: var(--spacing-xl);
+    padding-right: var(--spacing-xl);
+  }
   .paddingY-S {
     padding-top: var(--spacing-s);
     padding-bottom: var(--spacing-s);
@@ -48,6 +52,10 @@
     padding-top: var(--spacing-l);
     padding-bottom: var(--spacing-l);
   }
+  .paddingY-XL {
+    padding-top: var(--spacing-xl);
+    padding-bottom: var(--spacing-xl);
+  }
   .gap-XXS {
     grid-gap: var(--spacing-xs);
   }
diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte
index 2a4017e605..5fdaf0e434 100644
--- a/packages/bbui/src/Tabs/Tabs.svelte
+++ b/packages/bbui/src/Tabs/Tabs.svelte
@@ -88,7 +88,7 @@
     padding-left: var(--spacing-xl);
     padding-right: var(--spacing-xl);
     position: relative;
-    border-bottom: var(--border-light);
+    border-bottom: 1px solid var(--spectrum-global-color-gray-300);
   }
   .spectrum-Tabs-content {
     margin-top: var(--spectrum-global-dimension-static-size-150);
diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js
index 2476030eb0..45af9e302b 100644
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.js
@@ -1,5 +1,6 @@
-import { notificationStore } from "stores"
+import { notificationStore, devToolsStore } from "stores"
 import { ApiVersion } from "constants"
+import { get } from "svelte/store"
 
 /**
  * API cache for cached request responses.
@@ -21,12 +22,14 @@ const makeApiCall = async ({ method, url, body, json = true }) => {
   try {
     const requestBody = json ? JSON.stringify(body) : body
     const inBuilder = window["##BUDIBASE_IN_BUILDER##"]
+    const role = get(devToolsStore).role
     const headers = {
       Accept: "application/json",
       "x-budibase-app-id": window["##BUDIBASE_APP_ID##"],
       "x-budibase-api-version": ApiVersion,
       ...(json && { "Content-Type": "application/json" }),
       ...(!inBuilder && { "x-budibase-type": "client" }),
+      ...(role && { "x-budibase-role": role }),
     }
     const response = await fetch(url, {
       method,
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 98dec9667b..ee15cfa9c7 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -12,6 +12,8 @@
     routeStore,
     builderStore,
     themeStore,
+    appStore,
+    devToolsStore,
   } from "stores"
   import NotificationDisplay from "components/overlay/NotificationDisplay.svelte"
   import ConfirmationDisplay from "components/overlay/ConfirmationDisplay.svelte"
@@ -26,6 +28,8 @@
   import DNDHandler from "components/preview/DNDHandler.svelte"
   import ErrorSVG from "builder/assets/error.svg"
   import KeyboardManager from "components/preview/KeyboardManager.svelte"
+  import DevToolsHeader from "components/devtools/DevToolsHeader.svelte"
+  import DevTools from "components/devtools/DevTools.svelte"
 
   // Provide contexts
   setContext("sdk", SDK)
@@ -64,10 +68,12 @@
         // The user is not logged in, redirect them to login
         const returnUrl = `${window.location.pathname}${window.location.hash}`
         const encodedUrl = encodeURIComponent(returnUrl)
-        window.location = `/builder/auth/login?returnUrl=${encodedUrl}`
+        // window.location = `/builder/auth/login?returnUrl=${encodedUrl}`
       }
     }
   }
+
+  $: isDevPreview = $appStore.isDevApp && !$builderStore.inBuilder
 </script>
 
 {#if dataLoaded}
@@ -106,29 +112,39 @@
             >
               <!-- Actual app -->
               <div id="app-root">
-                <CustomThemeWrapper>
-                  {#key $screenStore.activeLayout._id}
-                    <Component
-                      isLayout
-                      instance={$screenStore.activeLayout.props}
-                    />
-                  {/key}
+                {#if isDevPreview}
+                  <DevToolsHeader />
+                {/if}
 
-                  <!--
-                    Flatpickr needs to be inside the theme wrapper.
-                    It also needs its own container because otherwise it hijacks
-                    key events on the whole page. It is painful to work with.
-                  -->
-                  <div id="flatpickr-root" />
+                <div id="app-body">
+                  <CustomThemeWrapper>
+                    {#key $screenStore.activeLayout._id}
+                      <Component
+                        isLayout
+                        instance={$screenStore.activeLayout.props}
+                      />
+                    {/key}
 
-                  <!-- Modal container to ensure they sit on top -->
-                  <div class="modal-container" />
+                    <!--
+                      Flatpickr needs to be inside the theme wrapper.
+                      It also needs its own container because otherwise it hijacks
+                      key events on the whole page. It is painful to work with.
+                    -->
+                    <div id="flatpickr-root" />
 
-                  <!-- Layers on top of app -->
-                  <NotificationDisplay />
-                  <ConfirmationDisplay />
-                  <PeekScreenDisplay />
-                </CustomThemeWrapper>
+                    <!-- Modal container to ensure they sit on top -->
+                    <div class="modal-container" />
+
+                    <!-- Layers on top of app -->
+                    <NotificationDisplay />
+                    <ConfirmationDisplay />
+                    <PeekScreenDisplay />
+                  </CustomThemeWrapper>
+
+                  {#if $devToolsStore.visible}
+                    <DevTools />
+                  {/if}
+                </div>
               </div>
 
               <!-- Selection indicators should be bounded by device -->
@@ -136,9 +152,11 @@
                 We don't want to key these by componentID as they control their own
                 re-mounting to avoid flashes.
               -->
-              {#if $builderStore.inBuilder}
-                <SelectionIndicator />
+              <SelectionIndicator />
+              {#if $builderStore.inBuilder || $devToolsStore.allowSelection}
                 <HoverIndicator />
+              {/if}
+              {#if $builderStore.inBuilder}
                 <DNDHandler />
               {/if}
             </div>
@@ -176,6 +194,17 @@
     overflow: hidden;
     height: 100%;
     width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+  }
+  #app-body {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: stretch;
   }
 
   .error {
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index d8cdbd3f53..e8ea08cf85 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -3,12 +3,12 @@
 </script>
 
 <script>
-  import { getContext, setContext } from "svelte"
-  import { writable } from "svelte/store"
+  import { getContext, setContext, onMount, onDestroy } from "svelte"
+  import { get, writable } from "svelte/store"
   import * as AppComponents from "components/app"
   import Router from "./Router.svelte"
   import { enrichProps, propsAreSame } from "utils/componentProps"
-  import { builderStore } from "stores"
+  import { builderStore, devToolsStore, componentStore } from "stores"
   import { hashString } from "utils/helpers"
   import Manifest from "manifest.json"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
@@ -54,8 +54,8 @@
   const insideScreenslot = !!getContext("screenslot")
 
   // Create component context
-  const componentStore = writable({})
-  setContext("component", componentStore)
+  const store = writable({})
+  setContext("component", store)
 
   // Extract component instance info
   $: constructor = getComponentConstructor(instance._component)
@@ -69,7 +69,7 @@
   // leading to the selected component
   $: selected =
     $builderStore.inBuilder && $builderStore.selectedComponentId === id
-  $: inSelectedPath = $builderStore.selectedComponentPath?.includes(id)
+  $: inSelectedPath = $componentStore.selectedComponentPath?.includes(id)
   $: inDragPath = inSelectedPath && $builderStore.editMode
 
   // Derive definition properties which can all be optional, so need to be
@@ -80,10 +80,12 @@
 
   // Interactive components can be selected, dragged and highlighted inside
   // the builder preview
-  $: interactive =
+  $: builderInteractive =
     $builderStore.inBuilder &&
     ($builderStore.previewType === "layout" || insideScreenslot) &&
     !isBlock
+  $: devToolsInteractive = $devToolsStore.allowSelection && !isBlock
+  $: interactive = builderInteractive || devToolsInteractive
   $: editing = editable && selected && $builderStore.editMode
   $: draggable = !inDragPath && interactive && !isLayout && !isScreen
   $: droppable = interactive && !isLayout && !isScreen
@@ -112,7 +114,7 @@
   $: renderKey = getRenderKey(id, editing)
 
   // Update component context
-  $: componentStore.set({
+  $: store.set({
     id,
     children: children.length,
     styles: {
@@ -282,6 +284,18 @@
   const getRenderKey = (id, editing) => {
     return hashString(`${id}-${editing}`)
   }
+
+  onMount(() => {
+    componentStore.actions.registerInstance(id, {
+      getSettings: () => cachedSettings,
+      getRawSettings: () => rawSettings,
+      getDataContext: () => get(context),
+    })
+  })
+
+  onDestroy(() => {
+    componentStore.actions.unregisterInstance(id)
+  })
 </script>
 
 {#key renderKey}
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index 87e5ac3b5b..44beb6d1c2 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -154,6 +154,7 @@
     justify-content: flex-start;
     align-items: stretch;
     height: 100%;
+    flex: 1 1 auto;
     overflow: auto;
     overflow-x: hidden;
     position: relative;
diff --git a/packages/client/src/components/app/forms/FormStep.svelte b/packages/client/src/components/app/forms/FormStep.svelte
index 58300287a8..4441f515ee 100644
--- a/packages/client/src/components/app/forms/FormStep.svelte
+++ b/packages/client/src/components/app/forms/FormStep.svelte
@@ -5,7 +5,7 @@
 
   export let step = 1
 
-  const { styleable, builderStore } = getContext("sdk")
+  const { styleable, builderStore, componentStore } = getContext("sdk")
   const component = getContext("component")
   const formContext = getContext("form")
 
@@ -22,7 +22,7 @@
     if (
       formContext &&
       $builderStore.inBuilder &&
-      $builderStore.selectedComponentPath?.includes($component.id)
+      $componentStore.selectedComponentPath?.includes($component.id)
     ) {
       formContext.formApi.setStep(step)
     }
diff --git a/packages/client/src/components/devtools/DevTools.svelte b/packages/client/src/components/devtools/DevTools.svelte
new file mode 100644
index 0000000000..e8d9c1cb44
--- /dev/null
+++ b/packages/client/src/components/devtools/DevTools.svelte
@@ -0,0 +1,57 @@
+<script>
+  import { getContext } from "svelte"
+  import { Layout, Heading, Tabs, Tab, Icon } from "@budibase/bbui"
+  import DevToolsStatsTab from "./DevToolsStatsTab.svelte"
+  import DevToolsComponentTab from "./DevToolsComponentTab.svelte"
+  import { devToolsStore } from "../../stores"
+
+  const context = getContext("context")
+</script>
+
+<div class="devtools" class:mobile={$context.device.mobile}>
+  <Layout noPadding gap="XS">
+    <div class="header">
+      <Heading size="XS">Budibase DevTools</Heading>
+      <Icon
+        hoverable
+        name="Close"
+        on:click={() => devToolsStore.actions.setVisible(false)}
+      />
+    </div>
+    <Tabs selected="Application">
+      <Tab title="Application">
+        <div class="tab-content">
+          <DevToolsStatsTab />
+        </div>
+      </Tab>
+      <Tab title="Components">
+        <div class="tab-content">
+          <DevToolsComponentTab />
+        </div>
+      </Tab>
+    </Tabs>
+  </Layout>
+</div>
+
+<style>
+  .devtools {
+    background: var(--spectrum-alias-background-color-secondary);
+    flex: 0 0 320px;
+    border-left: 1px solid var(--spectrum-global-color-gray-300);
+  }
+  .devtools.mobile {
+    display: none;
+  }
+
+  .header {
+    padding: var(--spacing-xl) var(--spacing-xl) 0 var(--spacing-xl);
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .tab-content {
+    padding: 0 var(--spacing-xl);
+  }
+</style>
diff --git a/packages/client/src/components/devtools/DevToolsComponentTab.svelte b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
new file mode 100644
index 0000000000..f90af754aa
--- /dev/null
+++ b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
@@ -0,0 +1,87 @@
+<script>
+  import {
+    Body,
+    Layout,
+    Heading,
+    Button,
+    TextArea,
+    Divider,
+  } from "@budibase/bbui"
+  import { builderStore, devToolsStore, componentStore } from "stores"
+  import DevToolsStat from "./DevToolsStat.svelte"
+
+  $: selectedInstance = $componentStore.selectedComponentInstance
+
+  $: {
+    if (!selectedInstance) {
+      builderStore.actions.selectComponent(null)
+    }
+  }
+</script>
+
+{#if !$builderStore.selectedComponentId}
+  <Layout noPadding gap="S">
+    <Heading size="XS">Please choose a component</Heading>
+    <Body size="S">
+      Press the button below to enable component selection, then click a
+      component in your app to view what context values are available.
+    </Body>
+    <div>
+      <Button
+        cta
+        on:click={() => devToolsStore.actions.setAllowSelection(true)}
+      >
+        Choose component
+      </Button>
+    </div>
+  </Layout>
+{:else}
+  <Layout noPadding>
+    <Layout noPadding gap="XS">
+      <DevToolsStat
+        label="Component"
+        value={$componentStore.selectedComponent?._instanceName}
+      />
+      <DevToolsStat
+        label="Type"
+        value={$componentStore.selectedComponentDefinition?.name}
+      />
+      <DevToolsStat label="ID" value={$componentStore.selectedComponent?._id} />
+    </Layout>
+    <div>
+      <Button
+        cta
+        on:click={() => devToolsStore.actions.setAllowSelection(true)}
+      >
+        Change component
+      </Button>
+    </div>
+    <div class="data">
+      <Layout noPadding gap="XS">
+        <TextArea
+          readonly
+          label="Data context"
+          value={JSON.stringify(selectedInstance?.getDataContext(), null, 2)}
+        />
+        <TextArea
+          readonly
+          label="Raw settings"
+          value={JSON.stringify(selectedInstance?.getRawSettings(), null, 2)}
+        />
+        <TextArea
+          readonly
+          label="Enriched settings"
+          value={JSON.stringify(selectedInstance?.getSettings(), null, 2)}
+        />
+      </Layout>
+    </div>
+  </Layout>
+{/if}
+
+<style>
+  .data :global(.spectrum-Textfield-input) {
+    min-height: 200px !important;
+    white-space: pre;
+    font-size: var(--font-size-s);
+  }
+</style>
diff --git a/packages/client/src/components/devtools/DevToolsHeader.svelte b/packages/client/src/components/devtools/DevToolsHeader.svelte
new file mode 100644
index 0000000000..2fc9800029
--- /dev/null
+++ b/packages/client/src/components/devtools/DevToolsHeader.svelte
@@ -0,0 +1,72 @@
+<script>
+  import { Heading, Button, Select } from "@budibase/bbui"
+  import { devToolsStore } from "../../stores"
+  import { getContext } from "svelte"
+
+  const context = getContext("context")
+
+  $: previewOptions = [
+    {
+      label: "View as yourself",
+      value: "self",
+    },
+    {
+      label: "View as public user",
+      value: "PUBLIC",
+    },
+    {
+      label: "View as basic user",
+      value: "BASIC",
+    },
+    {
+      label: "View as power user",
+      value: "POWER",
+    },
+    {
+      label: "View as admin user",
+      value: "ADMIN",
+    },
+  ]
+</script>
+
+<div class="dev-preview-header" class:mobile={$context.device.mobile}>
+  <Heading size="XS">Application Preview</Heading>
+  <Select
+    quiet
+    options={previewOptions}
+    value={$devToolsStore.role || "self"}
+    placeholder={null}
+    autoWidth
+    on:change={e => devToolsStore.actions.changeRole(e.detail)}
+  />
+  {#if !$context.device.mobile}
+    <Button
+      quiet
+      overBackground
+      icon="Code"
+      on:click={() => devToolsStore.actions.setVisible(true)}
+    >
+      Open DevTools
+    </Button>
+  {/if}
+</div>
+
+<style>
+  .dev-preview-header {
+    height: 50px;
+    display: grid;
+    align-items: center;
+    background-color: var(--spectrum-global-color-blue-400);
+    padding: 0 var(--spacing-xl);
+    grid-template-columns: 1fr auto auto;
+    grid-gap: var(--spacing-xl);
+  }
+  .dev-preview-header.mobile {
+    flex: 0 0 50px;
+    grid-template-columns: 1fr auto;
+  }
+  .dev-preview-header
+    :global(.spectrum-Heading, .spectrum-Picker-menuIcon, .spectrum-Picker-label) {
+    color: white !important;
+  }
+</style>
diff --git a/packages/client/src/components/devtools/DevToolsStat.svelte b/packages/client/src/components/devtools/DevToolsStat.svelte
new file mode 100644
index 0000000000..8b16225808
--- /dev/null
+++ b/packages/client/src/components/devtools/DevToolsStat.svelte
@@ -0,0 +1,23 @@
+<script>
+  export let label
+  export let value
+</script>
+
+<div class="stat">
+  <div class="stat-label">{label}</div>
+  <div class="stat-value">{value}</div>
+</div>
+
+<style>
+  .stat {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .stat-label {
+    font-size: var(--font-size-xs);
+    color: var(--spectrum-global-color-gray-600);
+    text-transform: uppercase;
+  }
+</style>
diff --git a/packages/client/src/components/devtools/DevToolsStatsTab.svelte b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
new file mode 100644
index 0000000000..468cc35322
--- /dev/null
+++ b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
@@ -0,0 +1,24 @@
+<script>
+  import { Layout } from "@budibase/bbui"
+  import { authStore, appStore, screenStore } from "stores"
+  import DevToolsStat from "./DevToolsStat.svelte"
+</script>
+
+<Layout noPadding gap="XS">
+  <DevToolsStat label="App" value={$appStore.application?.name} />
+  <DevToolsStat label="Tenant" value={$appStore.application?.tenantId} />
+  <DevToolsStat label="Version" value={$appStore.application?.version} />
+  <DevToolsStat
+    label="Client load time"
+    value={`${$appStore.clientLoadTime} ms`}
+  />
+  <DevToolsStat label="App layouts" value={$screenStore.layouts?.length || 0} />
+  <DevToolsStat label="Active layout" value={$screenStore.activeLayout?.name} />
+  <DevToolsStat label="App screens" value={$screenStore.screens?.length || 0} />
+  <DevToolsStat
+    label="Active screen"
+    value={$screenStore.activeScreen?.routing.route}
+  />
+  <DevToolsStat label="User" value={$authStore.email} />
+  <DevToolsStat label="Role" value={$authStore.roleId} />
+</Layout>
diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index a4e3ca4d72..0c95195d47 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -3,7 +3,7 @@
   import SettingsButton from "./SettingsButton.svelte"
   import SettingsColorPicker from "./SettingsColorPicker.svelte"
   import SettingsPicker from "./SettingsPicker.svelte"
-  import { builderStore } from "stores"
+  import { builderStore, componentStore } from "stores"
   import { domDebounce } from "utils/domDebounce"
 
   const verticalOffset = 28
@@ -15,7 +15,7 @@
   let self
   let measured = false
 
-  $: definition = $builderStore.selectedComponentDefinition
+  $: definition = $componentStore.selectedComponentDefinition
   $: showBar = definition?.showSettingsBar && !$builderStore.isDragging
   $: settings = getBarSettings(definition)
 
@@ -149,9 +149,7 @@
     <SettingsButton
       icon="Delete"
       on:click={() => {
-        builderStore.actions.deleteComponent(
-          $builderStore.selectedComponent._id
-        )
+        builderStore.actions.deleteComponent($builderStore.selectedComponentId)
       }}
     />
   </div>
diff --git a/packages/client/src/components/preview/SettingsButton.svelte b/packages/client/src/components/preview/SettingsButton.svelte
index 1490b2c9b7..6f7d95f5ae 100644
--- a/packages/client/src/components/preview/SettingsButton.svelte
+++ b/packages/client/src/components/preview/SettingsButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
-  import { builderStore } from "stores"
+  import { builderStore, componentStore } from "stores"
   import { createEventDispatcher } from "svelte"
 
   export let prop
@@ -11,7 +11,7 @@
   export let bool = false
 
   const dispatch = createEventDispatcher()
-  $: currentValue = $builderStore.selectedComponent?.[prop]
+  $: currentValue = $componentStore.selectedComponent?.[prop]
   $: active = prop && (bool ? !!currentValue : currentValue === value)
 </script>
 
diff --git a/packages/client/src/components/preview/SettingsColorPicker.svelte b/packages/client/src/components/preview/SettingsColorPicker.svelte
index 68061e0163..b078d048d2 100644
--- a/packages/client/src/components/preview/SettingsColorPicker.svelte
+++ b/packages/client/src/components/preview/SettingsColorPicker.svelte
@@ -1,10 +1,10 @@
 <script>
   import { ColorPicker } from "@budibase/bbui"
-  import { builderStore } from "stores"
+  import { builderStore, componentStore } from "stores"
 
   export let prop
 
-  $: currentValue = $builderStore.selectedComponent?.[prop]
+  $: currentValue = $componentStore.selectedComponent?.[prop]
 </script>
 
 <div>
diff --git a/packages/client/src/components/preview/SettingsPicker.svelte b/packages/client/src/components/preview/SettingsPicker.svelte
index 8d7129b812..8b83729fde 100644
--- a/packages/client/src/components/preview/SettingsPicker.svelte
+++ b/packages/client/src/components/preview/SettingsPicker.svelte
@@ -1,12 +1,12 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { builderStore } from "stores"
+  import { builderStore, componentStore } from "stores"
 
   export let prop
   export let options
   export let label
 
-  $: currentValue = $builderStore.selectedComponent?.[prop]
+  $: currentValue = $componentStore.selectedComponent?.[prop]
 </script>
 
 <div>
diff --git a/packages/client/src/stores/app.js b/packages/client/src/stores/app.js
index 0cabaec4ab..b2dcfca26d 100644
--- a/packages/client/src/stores/app.js
+++ b/packages/client/src/stores/app.js
@@ -1,8 +1,14 @@
 import * as API from "../api"
 import { get, writable } from "svelte/store"
 
+const initialState = {
+  appId: null,
+  isDevApp: false,
+  clientLoadTime: Date.now() - window.INIT_TIME,
+}
+
 const createAppStore = () => {
-  const store = writable({})
+  const store = writable(initialState)
 
   // Fetches the app definition including screens, layouts and theme
   const fetchAppDefinition = async () => {
@@ -12,8 +18,10 @@ const createAppStore = () => {
     }
     const appDefinition = await API.fetchAppPackage(appId)
     store.set({
+      ...initialState,
       ...appDefinition,
       appId: appDefinition?.application?.appId,
+      isDevApp: appId.startsWith("app_dev"),
     })
   }
 
diff --git a/packages/client/src/stores/auth.js b/packages/client/src/stores/auth.js
index 1fa4ae17b0..2395b51534 100644
--- a/packages/client/src/stores/auth.js
+++ b/packages/client/src/stores/auth.js
@@ -1,5 +1,7 @@
 import * as API from "../api"
 import { writable } from "svelte/store"
+import { devToolsStore } from "./devTools"
+import { get } from "svelte/store"
 
 const createAuthStore = () => {
   const store = writable(null)
@@ -7,12 +9,16 @@ const createAuthStore = () => {
   // Fetches the user object if someone is logged in and has reloaded the page
   const fetchUser = async () => {
     const user = await API.fetchSelf()
-    store.set(user)
+    store.set({
+      ...user,
+      roleId: get(devToolsStore).role || user.roleId,
+    })
   }
 
   const logOut = async () => {
-    window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
-    window.location = "/builder/auth/login"
+    console.log("LOG OUT")
+    // window.document.cookie = `budibase:auth=; budibase:currentapp=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
+    // window.location = "/builder/auth/login"
   }
 
   return {
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 35fb3edae2..a02888b5b7 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -1,7 +1,6 @@
-import { writable, derived, get } from "svelte/store"
-import Manifest from "manifest.json"
-import { findComponentById, findComponentPathById } from "../utils/components"
+import { writable, get } from "svelte/store"
 import { pingEndUser } from "../api"
+import { devToolsStore } from "./devTools"
 
 const dispatchEvent = (type, data = {}) => {
   window.parent.postMessage({ type, data })
@@ -22,38 +21,19 @@ const createBuilderStore = () => {
     previewDevice: "desktop",
     isDragging: false,
   }
-  const writableStore = writable(initialState)
-  const derivedStore = derived(writableStore, $state => {
-    // Avoid any of this logic if we aren't in the builder preview
-    if (!$state.inBuilder) {
-      return $state
-    }
-
-    // Derive the selected component instance and definition
-    const { layout, screen, previewType, selectedComponentId } = $state
-    const asset = previewType === "layout" ? layout : screen
-    const component = findComponentById(asset?.props, selectedComponentId)
-    const prefix = "@budibase/standard-components/"
-    const type = component?._component?.replace(prefix, "")
-    const definition = type ? Manifest[type] : null
-
-    // Derive the selected component path
-    const path = findComponentPathById(asset.props, selectedComponentId) || []
-
-    return {
-      ...$state,
-      selectedComponent: component,
-      selectedComponentDefinition: definition,
-      selectedComponentPath: path?.map(component => component._id),
-    }
-  })
+  const store = writable(initialState)
 
   const actions = {
     selectComponent: id => {
-      if (id === get(writableStore).selectedComponentId) {
+      if (id === get(store).selectedComponentId) {
         return
       }
-      writableStore.update(state => ({ ...state, editMode: false }))
+      store.update(state => ({
+        ...state,
+        editMode: false,
+        selectedComponentId: id,
+      }))
+      devToolsStore.actions.setAllowSelection(false)
       dispatchEvent("select-component", { id })
     },
     updateProp: (prop, value) => {
@@ -69,7 +49,7 @@ const createBuilderStore = () => {
       pingEndUser()
     },
     setSelectedPath: path => {
-      writableStore.update(state => ({ ...state, selectedPath: path }))
+      store.update(state => ({ ...state, selectedPath: path }))
     },
     moveComponent: (componentId, destinationComponentId, mode) => {
       dispatchEvent("move-component", {
@@ -79,22 +59,21 @@ const createBuilderStore = () => {
       })
     },
     setDragging: dragging => {
-      if (dragging === get(writableStore).isDragging) {
+      if (dragging === get(store).isDragging) {
         return
       }
-      writableStore.update(state => ({ ...state, isDragging: dragging }))
+      store.update(state => ({ ...state, isDragging: dragging }))
     },
     setEditMode: enabled => {
-      if (enabled === get(writableStore).editMode) {
+      if (enabled === get(store).editMode) {
         return
       }
-      writableStore.update(state => ({ ...state, editMode: enabled }))
+      store.update(state => ({ ...state, editMode: enabled }))
     },
   }
   return {
-    ...writableStore,
-    set: state => writableStore.set({ ...initialState, ...state }),
-    subscribe: derivedStore.subscribe,
+    ...store,
+    set: state => store.set({ ...initialState, ...state }),
     actions,
   }
 }
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
new file mode 100644
index 0000000000..af7aa5f0cb
--- /dev/null
+++ b/packages/client/src/stores/components.js
@@ -0,0 +1,65 @@
+import { get, writable, derived } from "svelte/store"
+import Manifest from "manifest.json"
+import { findComponentById, findComponentPathById } from "../utils/components"
+import { devToolsStore } from "./devTools"
+import { screenStore } from "./screens"
+import { builderStore } from "./builder"
+
+const createComponentStore = () => {
+  const store = writable({})
+
+  const derivedStore = derived(
+    [builderStore, devToolsStore, screenStore],
+    ([$builderState, $devToolsState, $screenState]) => {
+      // Avoid any of this logic if we aren't in the builder preview
+      if (!$builderState.inBuilder && !$devToolsState.visible) {
+        return {}
+      }
+
+      // Derive the selected component instance and definition
+      let asset
+      const { layout, screen, previewType, selectedComponentId } = $builderState
+      if ($builderState.inBuilder) {
+        asset = previewType === "layout" ? layout : screen
+      } else {
+        asset = $screenState.activeScreen
+      }
+      const component = findComponentById(asset?.props, selectedComponentId)
+      const prefix = "@budibase/standard-components/"
+      const type = component?._component?.replace(prefix, "")
+      const definition = type ? Manifest[type] : null
+
+      // Derive the selected component path
+      const path =
+        findComponentPathById(asset?.props, selectedComponentId) || []
+
+      return {
+        selectedComponentInstance: get(store)[selectedComponentId],
+        selectedComponent: component,
+        selectedComponentDefinition: definition,
+        selectedComponentPath: path?.map(component => component._id),
+      }
+    }
+  )
+
+  const registerInstance = (id, instance) => {
+    store.update(state => ({
+      ...state,
+      [id]: instance,
+    }))
+  }
+
+  const unregisterInstance = id => {
+    store.update(state => {
+      delete state[id]
+      return state
+    })
+  }
+
+  return {
+    ...derivedStore,
+    actions: { registerInstance, unregisterInstance },
+  }
+}
+
+export const componentStore = createComponentStore()
diff --git a/packages/client/src/stores/devTools.js b/packages/client/src/stores/devTools.js
new file mode 100644
index 0000000000..74d8c406da
--- /dev/null
+++ b/packages/client/src/stores/devTools.js
@@ -0,0 +1,47 @@
+import { get } from "svelte/store"
+import { localStorageStore } from "builder/src/builderStore/store/localStorage"
+import { appStore } from "./app"
+import { initialise } from "./initialise"
+import { authStore } from "./auth"
+
+const initialState = {
+  visible: false,
+  allowSelection: false,
+  role: null,
+}
+
+const createDevToolStore = () => {
+  const localStorageKey = `${get(appStore).appId}.devTools`
+  const store = localStorageStore(localStorageKey, initialState)
+
+  const setVisible = visible => {
+    store.update(state => ({
+      ...state,
+      visible: visible,
+    }))
+  }
+
+  const setAllowSelection = allowSelection => {
+    store.update(state => ({
+      ...state,
+      allowSelection,
+    }))
+  }
+
+  const changeRole = async role => {
+    store.update(state => ({
+      ...state,
+      role: role === "self" ? null : role,
+    }))
+    // location.reload()
+    await authStore.actions.fetchUser()
+    await initialise()
+  }
+
+  return {
+    subscribe: store.subscribe,
+    actions: { setVisible, setAllowSelection, changeRole },
+  }
+}
+
+export const devToolsStore = createDevToolStore()
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index 02c848120c..487d25ffbf 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -9,6 +9,8 @@ export { confirmationStore } from "./confirmation"
 export { peekStore } from "./peek"
 export { stateStore } from "./state"
 export { themeStore } from "./theme"
+export { devToolsStore } from "./devTools"
+export { componentStore } from "./components"
 
 // Context stores are layered and duplicated, so it is not a singleton
 export { createContextStore } from "./context"
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index 702f662f8a..9635f2b5a0 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -66,7 +66,6 @@ const createScreenStore = () => {
       }
       let children = []
       findChildrenByType(component, type, children)
-      console.log(children)
       return children
     },
   }
diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
index 761e953ff7..35379ba6d8 100644
--- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
+++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
@@ -78,6 +78,9 @@
       app.
     </h2>
   </div>
+  <script type="application/javascript">
+    window.INIT_TIME = Date.now()
+  </script>
   <script type="application/javascript" src={clientLibPath}>
   </script>
   <script type="application/javascript">
diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index 5682a860b9..264c897280 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -10,6 +10,7 @@ const { getCachedSelf } = require("../utilities/global")
 const CouchDB = require("../db")
 const env = require("../environment")
 const { isWebhookEndpoint } = require("./utils")
+const { Headers } = require("@budibase/auth/constants")
 
 module.exports = async (ctx, next) => {
   // try to get the appID from the request
@@ -64,6 +65,20 @@ module.exports = async (ctx, next) => {
     return next()
   }
 
+  // Allow builders to specify their role via a header
+  const isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global
+  const isDevApp = appId && isDevAppID(appId)
+  const roleHeader = ctx.request.headers[Headers.PREVIEW_ROLE]
+  if (isBuilder && isDevApp && roleHeader) {
+    // Ensure the role is valid ensuring a definition exists
+    try {
+      await getRole(appId, roleHeader)
+      roleId = roleHeader
+    } catch (error) {
+      // Swallow error and do nothing
+    }
+  }
+
   let noCookieSet = false
   // if the user not in the right tenant then make sure they have no permissions
   // need to judge this only based on the request app ID,

From e35fc7cb7b1e880ea04ed7f230e78fe61a7a6e3b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 14:14:39 +0000
Subject: [PATCH 02/48] Fix bad import of headers constants

---
 packages/server/src/middleware/currentapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index 3dc3e35255..6fedd8924e 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -4,7 +4,7 @@ const {
   getCookie,
   clearCookie,
 } = require("@budibase/backend-core/utils")
-const { Cookies } = require("@budibase/backend-core/constants")
+const { Cookies, Headers } = require("@budibase/backend-core/constants")
 const { getRole } = require("@budibase/backend-core/roles")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
 const { generateUserMetadataID, isDevAppID } = require("../db/utils")

From 96150094b73e5ae74fccd1fee072869fbd03b391 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 14:14:55 +0000
Subject: [PATCH 03/48] Fix className autocorrect and make client load time
 optional

---
 packages/client/src/components/ClientApp.svelte        |  4 ++--
 packages/client/src/components/Component.svelte        |  2 +-
 .../src/components/devtools/DevToolsHeader.svelte      |  5 +++--
 .../src/components/devtools/DevToolsStatsTab.svelte    | 10 ++++++----
 packages/client/src/stores/app.js                      |  3 ++-
 packages/client/src/stores/devTools.js                 |  4 ++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 9283ee76b0..a0484ace37 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -82,10 +82,10 @@
     id="spectrum-root"
     lang="en"
     dir="ltr"
-    className="spectrum spectrum--medium {$themeStore.theme}"
+    class="spectrum spectrum--medium {$themeStore.theme}"
   >
     {#if permissionError}
-      <div className="error">
+      <div class="error">
         <Layout justifyItems="center" gap="S">
           {@html ErrorSVG}
           <Heading size="L">You don't have permission to use this app</Heading>
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 25ed3a9ac9..7feb92fb86 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -377,7 +377,7 @@
   <!-- The ID is used as a class because getElementsByClassName is O(1) -->
   <!-- and the performance matters for the selection indicators -->
   <div
-    className={`component ${id}`}
+    class={`component ${id}`}
     class:draggable
     class:droppable
     class:empty
diff --git a/packages/client/src/components/devtools/DevToolsHeader.svelte b/packages/client/src/components/devtools/DevToolsHeader.svelte
index 2fc9800029..40120119b9 100644
--- a/packages/client/src/components/devtools/DevToolsHeader.svelte
+++ b/packages/client/src/components/devtools/DevToolsHeader.svelte
@@ -65,8 +65,9 @@
     flex: 0 0 50px;
     grid-template-columns: 1fr auto;
   }
-  .dev-preview-header
-    :global(.spectrum-Heading, .spectrum-Picker-menuIcon, .spectrum-Picker-label) {
+  .dev-preview-header :global(.spectrum-Heading),
+  .dev-preview-header :global(.spectrum-Picker-menuIcon),
+  .dev-preview-header :global(.spectrum-Picker-label) {
     color: white !important;
   }
 </style>
diff --git a/packages/client/src/components/devtools/DevToolsStatsTab.svelte b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
index 468cc35322..dffca9d145 100644
--- a/packages/client/src/components/devtools/DevToolsStatsTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
@@ -8,10 +8,12 @@
   <DevToolsStat label="App" value={$appStore.application?.name} />
   <DevToolsStat label="Tenant" value={$appStore.application?.tenantId} />
   <DevToolsStat label="Version" value={$appStore.application?.version} />
-  <DevToolsStat
-    label="Client load time"
-    value={`${$appStore.clientLoadTime} ms`}
-  />
+  {#if $appStore.clientLoadTime}
+    <DevToolsStat
+      label="Client load time"
+      value={`${$appStore.clientLoadTime} ms`}
+    />
+  {/if}
   <DevToolsStat label="App layouts" value={$screenStore.layouts?.length || 0} />
   <DevToolsStat label="Active layout" value={$screenStore.activeLayout?.name} />
   <DevToolsStat label="App screens" value={$screenStore.screens?.length || 0} />
diff --git a/packages/client/src/stores/app.js b/packages/client/src/stores/app.js
index 1f99a92e7e..2c2ead66c4 100644
--- a/packages/client/src/stores/app.js
+++ b/packages/client/src/stores/app.js
@@ -4,7 +4,7 @@ import { get, writable } from "svelte/store"
 const initialState = {
   appId: null,
   isDevApp: false,
-  clientLoadTime: Date.now() - (window.INIT_TIME || Date.now()),
+  clientLoadTime: window.INIT_TIME ? Date.now() - window.INIT_TIME : null,
 }
 
 const createAppStore = () => {
@@ -19,6 +19,7 @@ const createAppStore = () => {
     try {
       const appDefinition = await API.fetchAppPackage(appId)
       store.set({
+        ...initialState,
         ...appDefinition,
         appId: appDefinition?.application?.appId,
         isDevApp: appId.startsWith("app_dev"),
diff --git a/packages/client/src/stores/devTools.js b/packages/client/src/stores/devTools.js
index 74d8c406da..6d631080ab 100644
--- a/packages/client/src/stores/devTools.js
+++ b/packages/client/src/stores/devTools.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { localStorageStore } from "builder/src/builderStore/store/localStorage"
+import { createLocalStorageStore } from "@budibase/frontend-core"
 import { appStore } from "./app"
 import { initialise } from "./initialise"
 import { authStore } from "./auth"
@@ -12,7 +12,7 @@ const initialState = {
 
 const createDevToolStore = () => {
   const localStorageKey = `${get(appStore).appId}.devTools`
-  const store = localStorageStore(localStorageKey, initialState)
+  const store = createLocalStorageStore(localStorageKey, initialState)
 
   const setVisible = visible => {
     store.update(state => ({

From 947cd07c480d13fdc25905ae64b7d04ea84e757a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 14:15:36 +0000
Subject: [PATCH 04/48] Ensure dev tools never shows in builder preview

---
 packages/bbui/yarn.lock                         | 8 ++++----
 packages/client/src/components/ClientApp.svelte | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index 28c009b331..33c3c391be 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -53,10 +53,10 @@
     to-gfm-code-block "^0.1.1"
     year "^0.2.1"
 
-"@budibase/string-templates@^1.0.66-alpha.0":
-  version "1.0.72"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.72.tgz#acc154e402cce98ea30eedde9c6124183ee9b37c"
-  integrity sha512-w715TjgO6NUHkZNqoOEo8lAKJ/PQ4b00ATWSX5VB523SAu7y/uOiqKqV1E3fgwxq1o8L+Ff7rn9FTkiYtjkV/g==
+"@budibase/string-templates@^1.0.72-alpha.0":
+  version "1.0.75"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.75.tgz#5b4061f1a626160ec092f32f036541376298100c"
+  integrity sha512-hPgr6n5cpSCGFEha5DS/P+rtRXOLc72M6y4J/scl59JvUi/ZUJkjRgJdpQPdBLu04CNKp89V59+rAqAuDjOC0g==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.7"
     dayjs "^1.10.4"
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index a0484ace37..29258a1a31 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -142,7 +142,7 @@
                     <PeekScreenDisplay />
                   </CustomThemeWrapper>
 
-                  {#if $devToolsStore.visible}
+                  {#if $devToolsStore.visible && !$builderStore.inBuilder}
                     <DevTools />
                   {/if}
                 </div>

From 0137867f1acc90c5fb3c24f94ca1973346c0dfd0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 15:36:21 +0000
Subject: [PATCH 05/48] Update devtools with new features

---
 .../client/src/components/ClientApp.svelte    |  1 +
 .../client/src/components/Component.svelte    | 22 ++---
 .../src/components/devtools/DevTools.svelte   |  1 +
 .../devtools/DevToolsComponentSetting.svelte  | 13 +++
 .../devtools/DevToolsComponentTab.svelte      | 87 +++++++++++++++----
 .../components/devtools/DevToolsHeader.svelte |  3 +-
 .../components/devtools/DevToolsStat.svelte   | 18 +++-
 packages/client/src/stores/builder.js         |  2 +
 packages/client/src/utils/componentProps.js   | 18 ++++
 packages/server/src/middleware/currentapp.js  |  2 +-
 10 files changed, 130 insertions(+), 37 deletions(-)
 create mode 100644 packages/client/src/components/devtools/DevToolsComponentSetting.svelte

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 29258a1a31..d55b00ef9c 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -208,6 +208,7 @@
     flex-direction: row;
     justify-content: flex-start;
     align-items: stretch;
+    overflow: hidden;
   }
 
   .error {
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 7feb92fb86..f9e3027ecf 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -12,7 +12,11 @@
   import { writable, get } from "svelte/store"
   import * as AppComponents from "components/app"
   import Router from "./Router.svelte"
-  import { enrichProps, propsAreSame } from "utils/componentProps"
+  import {
+    enrichProps,
+    propsAreSame,
+    getSettingsDefinition,
+  } from "utils/componentProps"
   import { builderStore, devToolsStore, componentStore } from "stores"
   import { Helpers } from "@budibase/bbui"
   import Manifest from "manifest.json"
@@ -207,22 +211,6 @@
     return type ? Manifest[type] : null
   }
 
-  // Gets the definition of this component's settings from the manifest
-  const getSettingsDefinition = definition => {
-    if (!definition) {
-      return []
-    }
-    let settings = []
-    definition.settings?.forEach(setting => {
-      if (setting.section) {
-        settings = settings.concat(setting.settings || [])
-      } else {
-        settings.push(setting)
-      }
-    })
-    return settings
-  }
-
   const getInstanceSettings = (instance, settingsDefinition) => {
     // Get raw settings
     let settings = {}
diff --git a/packages/client/src/components/devtools/DevTools.svelte b/packages/client/src/components/devtools/DevTools.svelte
index e8d9c1cb44..731695e29c 100644
--- a/packages/client/src/components/devtools/DevTools.svelte
+++ b/packages/client/src/components/devtools/DevTools.svelte
@@ -38,6 +38,7 @@
     background: var(--spectrum-alias-background-color-secondary);
     flex: 0 0 320px;
     border-left: 1px solid var(--spectrum-global-color-gray-300);
+    overflow: auto;
   }
   .devtools.mobile {
     display: none;
diff --git a/packages/client/src/components/devtools/DevToolsComponentSetting.svelte b/packages/client/src/components/devtools/DevToolsComponentSetting.svelte
new file mode 100644
index 0000000000..9bbbf2615c
--- /dev/null
+++ b/packages/client/src/components/devtools/DevToolsComponentSetting.svelte
@@ -0,0 +1,13 @@
+<script>
+  import DevToolsStat from "./DevToolsStat.svelte"
+
+  export let name
+  export let value
+  export let settingsMap
+
+  $: prettyName = settingsMap?.[name]?.label
+</script>
+
+{#if prettyName}
+  <DevToolsStat label={prettyName} value={JSON.stringify(value)} />
+{/if}
diff --git a/packages/client/src/components/devtools/DevToolsComponentTab.svelte b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
index f90af754aa..cf99159f1d 100644
--- a/packages/client/src/components/devtools/DevToolsComponentTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
@@ -5,12 +5,22 @@
     Heading,
     Button,
     TextArea,
-    Divider,
+    Tabs,
+    Tab,
+    Toggle,
   } from "@budibase/bbui"
   import { builderStore, devToolsStore, componentStore } from "stores"
   import DevToolsStat from "./DevToolsStat.svelte"
+  import { getSettingsDefinition } from "utils/componentProps.js"
+
+  let showEnrichedSettings = true
 
   $: selectedInstance = $componentStore.selectedComponentInstance
+  $: settingsDefinition = getSettingsDefinition(
+    $componentStore.selectedComponentDefinition
+  )
+  $: rawSettings = selectedInstance?.getRawSettings()
+  $: settings = selectedInstance?.getSettings()
 
   $: {
     if (!selectedInstance) {
@@ -48,40 +58,83 @@
       />
       <DevToolsStat label="ID" value={$componentStore.selectedComponent?._id} />
     </Layout>
-    <div>
+    <div class="buttons">
       <Button
         cta
         on:click={() => devToolsStore.actions.setAllowSelection(true)}
       >
         Change component
       </Button>
+      <Button
+        quiet
+        secondary
+        on:click={() => builderStore.actions.selectComponent(null)}
+      >
+        Reset
+      </Button>
     </div>
+
     <div class="data">
       <Layout noPadding gap="XS">
-        <TextArea
-          readonly
-          label="Data context"
-          value={JSON.stringify(selectedInstance?.getDataContext(), null, 2)}
-        />
-        <TextArea
-          readonly
-          label="Raw settings"
-          value={JSON.stringify(selectedInstance?.getRawSettings(), null, 2)}
-        />
-        <TextArea
-          readonly
-          label="Enriched settings"
-          value={JSON.stringify(selectedInstance?.getSettings(), null, 2)}
-        />
+        <Tabs selected="Settings">
+          <Tab title="Settings">
+            <div class="tab-content">
+              <Layout noPadding gap="S">
+                <Toggle
+                  text="Show enriched settings"
+                  bind:value={showEnrichedSettings}
+                />
+                <Layout noPadding gap="XS">
+                  {#each settingsDefinition as setting}
+                    <DevToolsStat
+                      label={setting.label}
+                      value={JSON.stringify(
+                        (showEnrichedSettings ? settings : rawSettings)?.[
+                          setting.key
+                        ]
+                      )}
+                    />
+                  {/each}
+                </Layout>
+              </Layout>
+            </div>
+          </Tab>
+          <Tab title="Context">
+            <div class="tab-content">
+              <TextArea
+                readonly
+                label="Data context"
+                value={JSON.stringify(
+                  selectedInstance?.getDataContext(),
+                  null,
+                  2
+                )}
+              />
+            </div>
+          </Tab>
+        </Tabs>
       </Layout>
     </div>
   </Layout>
 {/if}
 
 <style>
+  .buttons {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    gap: var(--spacing-xs);
+  }
+  .data {
+    margin: 0 calc(-1 * var(--spacing-xl));
+  }
   .data :global(.spectrum-Textfield-input) {
     min-height: 200px !important;
     white-space: pre;
     font-size: var(--font-size-s);
   }
+  .tab-content {
+    padding: 0 var(--spacing-xl);
+  }
 </style>
diff --git a/packages/client/src/components/devtools/DevToolsHeader.svelte b/packages/client/src/components/devtools/DevToolsHeader.svelte
index 40120119b9..36c6689f47 100644
--- a/packages/client/src/components/devtools/DevToolsHeader.svelte
+++ b/packages/client/src/components/devtools/DevToolsHeader.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <div class="dev-preview-header" class:mobile={$context.device.mobile}>
-  <Heading size="XS">Application Preview</Heading>
+  <Heading size="XS">Budibase App Preview</Heading>
   <Select
     quiet
     options={previewOptions}
@@ -53,6 +53,7 @@
 
 <style>
   .dev-preview-header {
+    flex: 0 0 50px;
     height: 50px;
     display: grid;
     align-items: center;
diff --git a/packages/client/src/components/devtools/DevToolsStat.svelte b/packages/client/src/components/devtools/DevToolsStat.svelte
index 8b16225808..9e0220af01 100644
--- a/packages/client/src/components/devtools/DevToolsStat.svelte
+++ b/packages/client/src/components/devtools/DevToolsStat.svelte
@@ -5,7 +5,9 @@
 
 <div class="stat">
   <div class="stat-label">{label}</div>
-  <div class="stat-value">{value}</div>
+  <div class="stat-value" title={value} on:click={() => console.log(value)}>
+    {value == null ? " " : value}
+  </div>
 </div>
 
 <style>
@@ -14,10 +16,24 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
+    gap: var(--spacing-xl);
   }
   .stat-label {
     font-size: var(--font-size-xs);
     color: var(--spectrum-global-color-gray-600);
     text-transform: uppercase;
+    flex: 0 0 auto;
+    max-width: 140px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .stat-value {
+    flex: 1 1 auto;
+    width: 0;
+    text-align: right;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 </style>
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index d11b5da5ba..31586b6599 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -1,5 +1,6 @@
 import { writable, get } from "svelte/store"
 import { API } from "api"
+import { devToolsStore } from "./devTools.js"
 
 const dispatchEvent = (type, data = {}) => {
   window.parent.postMessage({ type, data })
@@ -31,6 +32,7 @@ const createBuilderStore = () => {
         editMode: false,
         selectedComponentId: id,
       }))
+      devToolsStore.actions.setAllowSelection(false)
       dispatchEvent("select-component", { id })
     },
     updateProp: (prop, value) => {
diff --git a/packages/client/src/utils/componentProps.js b/packages/client/src/utils/componentProps.js
index 0727b5943f..949f6e8f02 100644
--- a/packages/client/src/utils/componentProps.js
+++ b/packages/client/src/utils/componentProps.js
@@ -107,3 +107,21 @@ export const propsUseBinding = (props, bindingKey) => {
   }
   return false
 }
+
+/**
+ * Gets the definition of this component's settings from the manifest
+ */
+export const getSettingsDefinition = definition => {
+  if (!definition) {
+    return []
+  }
+  let settings = []
+  definition.settings?.forEach(setting => {
+    if (setting.section) {
+      settings = settings.concat(setting.settings || [])
+    } else {
+      settings.push(setting)
+    }
+  })
+  return settings
+}
diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index 6fedd8924e..88e4eafeab 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -72,7 +72,7 @@ module.exports = async (ctx, next) => {
     if (isBuilder && isDevApp && roleHeader) {
       // Ensure the role is valid ensuring a definition exists
       try {
-        await getRole(appId, roleHeader)
+        await getRole(roleHeader)
         roleId = roleHeader
       } catch (error) {
         // Swallow error and do nothing

From 10be25630220032136a54dbb6e0d8912c25b0e62 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 21:48:23 +0000
Subject: [PATCH 06/48] Make copy to clipboard an exported utility

---
 .../bbui/src/Table/InternalRenderer.svelte    | 45 +++++--------------
 packages/bbui/src/helpers.js                  | 28 ++++++++++++
 .../DevToolsComponentContextTab.svelte        |  0
 .../DevToolsComponentSettingsTab.svelte       |  0
 4 files changed, 40 insertions(+), 33 deletions(-)
 create mode 100644 packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
 create mode 100644 packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte

diff --git a/packages/bbui/src/Table/InternalRenderer.svelte b/packages/bbui/src/Table/InternalRenderer.svelte
index 7e2dd0b2aa..d38fb9f691 100644
--- a/packages/bbui/src/Table/InternalRenderer.svelte
+++ b/packages/bbui/src/Table/InternalRenderer.svelte
@@ -1,42 +1,21 @@
 <script>
   import Icon from "../Icon/Icon.svelte"
+  import { copyToClipboard } from "../helpers"
   import { notifications } from "../Stores/notifications"
+
   export let value
 
-  const onClick = e => {
+  const onClick = async e => {
     e.stopPropagation()
-    copyToClipboard(value)
-  }
-
-  const copyToClipboard = value => {
-    return new Promise(res => {
-      if (navigator.clipboard && window.isSecureContext) {
-        // Try using the clipboard API first
-        navigator.clipboard.writeText(value).then(res)
-      } else {
-        // Fall back to the textarea hack
-        let textArea = document.createElement("textarea")
-        textArea.value = value
-        textArea.style.position = "fixed"
-        textArea.style.left = "-9999px"
-        textArea.style.top = "-9999px"
-        document.body.appendChild(textArea)
-        textArea.focus()
-        textArea.select()
-        document.execCommand("copy")
-        textArea.remove()
-        res()
-      }
-    })
-      .then(() => {
-        notifications.success("Copied to clipboard")
-      })
-      .catch(() => {
-        notifications.error(
-          "Failed to copy to clipboard. Check the dev console for the value."
-        )
-        console.warn("Failed to copy the value", value)
-      })
+    try {
+      await copyToClipboard(value)
+      notifications.success("Copied to clipboard")
+    } catch (error) {
+      notifications.error(
+        "Failed to copy to clipboard. Check the dev console for the value."
+      )
+      console.warn("Failed to copy the value", value)
+    }
   }
 </script>
 
diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js
index cf40e12d74..8ffbf8d6e1 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@@ -1,3 +1,5 @@
+import { notifications } from "./Stores/notifications"
+
 /**
  * Generates a DOM safe UUID.
  * Starting with a letter is important to make it DOM safe.
@@ -106,3 +108,29 @@ export const deepSet = (obj, key, value) => {
 export const cloneDeep = obj => {
   return JSON.parse(JSON.stringify(obj))
 }
+
+/**
+ * Copies a value to the clipboard
+ * @param value the value to copy
+ */
+export const copyToClipboard = value => {
+  return new Promise(res => {
+    if (navigator.clipboard && window.isSecureContext) {
+      // Try using the clipboard API first
+      navigator.clipboard.writeText(value).then(res)
+    } else {
+      // Fall back to the textarea hack
+      let textArea = document.createElement("textarea")
+      textArea.value = value
+      textArea.style.position = "fixed"
+      textArea.style.left = "-9999px"
+      textArea.style.top = "-9999px"
+      document.body.appendChild(textArea)
+      textArea.focus()
+      textArea.select()
+      document.execCommand("copy")
+      textArea.remove()
+      res()
+    }
+  })
+}
diff --git a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
new file mode 100644
index 0000000000..e69de29bb2

From 908c0a3efc6aad1c75c3152d4d7e64c98ffd9a07 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 24 Feb 2022 21:48:54 +0000
Subject: [PATCH 07/48] Add full featured component settings and bindings
 devtools tabs

---
 packages/client/manifest.json                 |   2 +-
 .../client/src/components/ClientApp.svelte    |   2 +-
 .../client/src/components/Component.svelte    |  24 ++--
 .../src/components/devtools/DevTools.svelte   |  59 +++++----
 .../DevToolsComponentContextTab.svelte        | 112 ++++++++++++++++++
 .../DevToolsComponentSettingsTab.svelte       |  30 +++++
 .../devtools/DevToolsComponentTab.svelte      |  71 +++--------
 .../components/devtools/DevToolsHeader.svelte |   4 +-
 .../components/devtools/DevToolsStat.svelte   |  44 ++++++-
 .../devtools/DevToolsStatsTab.svelte          |   3 +-
 packages/client/src/stores/components.js      |  24 +++-
 11 files changed, 276 insertions(+), 99 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 639efe5b79..b6bb6edc58 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3373,7 +3373,7 @@
             "label": "Rows",
             "key": "rows"
           },
-	  {
+	      {
             "label": "Extra Info",
             "key": "info"
           },
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index d55b00ef9c..5d9225420f 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -142,7 +142,7 @@
                     <PeekScreenDisplay />
                   </CustomThemeWrapper>
 
-                  {#if $devToolsStore.visible && !$builderStore.inBuilder}
+                  {#if $appStore.isDevApp && !$builderStore.inBuilder}
                     <DevTools />
                   {/if}
                 </div>
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index f9e3027ecf..8cba634f2c 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -17,7 +17,7 @@
     propsAreSame,
     getSettingsDefinition,
   } from "utils/componentProps"
-  import { builderStore, devToolsStore, componentStore } from "stores"
+  import { builderStore, devToolsStore, componentStore, appStore } from "stores"
   import { Helpers } from "@budibase/bbui"
   import Manifest from "manifest.json"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
@@ -349,15 +349,25 @@
   }
 
   onMount(() => {
-    componentStore.actions.registerInstance(id, {
-      getSettings: () => cachedSettings,
-      getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
-      getDataContext: () => get(context),
-    })
+    if (
+      $appStore.isDevApp &&
+      !componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.registerInstance(id, {
+        getSettings: () => cachedSettings,
+        getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
+        getDataContext: () => get(context),
+      })
+    }
   })
 
   onDestroy(() => {
-    componentStore.actions.unregisterInstance(id)
+    if (
+      $appStore.isDevApp &&
+      componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.unregisterInstance(id)
+    }
   })
 </script>
 
diff --git a/packages/client/src/components/devtools/DevTools.svelte b/packages/client/src/components/devtools/DevTools.svelte
index 731695e29c..cf21f16503 100644
--- a/packages/client/src/components/devtools/DevTools.svelte
+++ b/packages/client/src/components/devtools/DevTools.svelte
@@ -3,34 +3,40 @@
   import { Layout, Heading, Tabs, Tab, Icon } from "@budibase/bbui"
   import DevToolsStatsTab from "./DevToolsStatsTab.svelte"
   import DevToolsComponentTab from "./DevToolsComponentTab.svelte"
-  import { devToolsStore } from "../../stores"
+  import { devToolsStore } from "stores"
 
   const context = getContext("context")
 </script>
 
-<div class="devtools" class:mobile={$context.device.mobile}>
-  <Layout noPadding gap="XS">
-    <div class="header">
-      <Heading size="XS">Budibase DevTools</Heading>
-      <Icon
-        hoverable
-        name="Close"
-        on:click={() => devToolsStore.actions.setVisible(false)}
-      />
-    </div>
-    <Tabs selected="Application">
-      <Tab title="Application">
-        <div class="tab-content">
-          <DevToolsStatsTab />
-        </div>
-      </Tab>
-      <Tab title="Components">
-        <div class="tab-content">
-          <DevToolsComponentTab />
-        </div>
-      </Tab>
-    </Tabs>
-  </Layout>
+<div
+  class="devtools"
+  class:hidden={!$devToolsStore.visible}
+  class:mobile={$context.device.mobile}
+>
+  {#if $devToolsStore.visible}
+    <Layout noPadding gap="XS">
+      <div class="header">
+        <Heading size="XS">Budibase DevTools</Heading>
+        <Icon
+          hoverable
+          name="Close"
+          on:click={() => devToolsStore.actions.setVisible(false)}
+        />
+      </div>
+      <Tabs selected="Application">
+        <Tab title="Application">
+          <div class="tab-content">
+            <DevToolsStatsTab />
+          </div>
+        </Tab>
+        <Tab title="Components">
+          <div class="tab-content">
+            <DevToolsComponentTab />
+          </div>
+        </Tab>
+      </Tabs>
+    </Layout>
+  {/if}
 </div>
 
 <style>
@@ -39,6 +45,11 @@
     flex: 0 0 320px;
     border-left: 1px solid var(--spectrum-global-color-gray-300);
     overflow: auto;
+    transition: margin-right 300ms ease;
+    margin-right: 0;
+  }
+  .devtools.hidden {
+    margin-right: -320px;
   }
   .devtools.mobile {
     display: none;
diff --git a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
index e69de29bb2..5bf2327332 100644
--- a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
@@ -0,0 +1,112 @@
+<script>
+  import { Layout, Select, Body } from "@budibase/bbui"
+  import { componentStore } from "stores/index.js"
+  import DevToolsStat from "./DevToolsStat.svelte"
+
+  const ReadableBindingMap = {
+    user: "Current user",
+    state: "State",
+    url: "URL",
+    device: "Device",
+  }
+
+  let category
+
+  $: selectedInstance = $componentStore.selectedComponentInstance
+  $: context = selectedInstance?.getDataContext()
+  $: bindingCategories = getContextProviders(context)
+  $: bindings = Object.entries(context?.[category] || {})
+
+  const getContextProviders = context => {
+    const filteredContext = { ...context }
+
+    // Remove some keys from context
+    delete filteredContext.key
+    delete filteredContext.closestComponentId
+    delete filteredContext.user_RefreshDataSource
+
+    // Keep track of encountered IDs so we can find actions
+    let actions = []
+    let encounteredCategories = []
+
+    // Create readable bindings
+    let categories = []
+    Object.keys(filteredContext)
+      .sort()
+      .forEach(category => {
+        let isAction = false
+        for (let cat of encounteredCategories) {
+          if (category.startsWith(`${cat}_`)) {
+            isAction = true
+            break
+          }
+        }
+        if (isAction) {
+          actions.push(category)
+          return
+        }
+
+        // Mark category as encountered so we can find any matching actions
+        encounteredCategories.push(category)
+
+        // Map any static categories to pretty names
+        if (ReadableBindingMap[category]) {
+          categories.push({
+            label: ReadableBindingMap[category],
+            value: category,
+          })
+        } else {
+          const component = componentStore.actions.getComponentById(category)
+          if (component) {
+            categories.push({
+              label: component._instanceName,
+              value: category,
+            })
+          } else {
+            // Check if its a block
+            if (category.includes("-")) {
+              const split = category.split("-")
+              const potentialId = split[0]
+              const component =
+                componentStore.actions.getComponentById(potentialId)
+              if (component) {
+                categories.push({
+                  label: `${component._instanceName} (${split[1]})`,
+                  value: category,
+                })
+                return
+              }
+            }
+
+            // Otherwise we don't know
+            categories.push({
+              label: "Unknown - " + category,
+              value: category,
+            })
+          }
+        }
+      })
+
+    return categories
+  }
+</script>
+
+<Layout noPadding gap="S">
+  <Body size="S">
+    Choose a category to see the value of all its available bindings.
+  </Body>
+  <Select bind:value={category} label="Category" options={bindingCategories} />
+  {#if bindings?.length}
+    <Layout noPadding gap="XS">
+      {#each bindings as binding}
+        <DevToolsStat
+          copyable
+          label={binding[0]}
+          value={JSON.stringify(binding[1])}
+        />
+      {/each}
+    </Layout>
+  {:else if category}
+    <Body size="XS">There aren't any bindings available in this category.</Body>
+  {/if}
+</Layout>
diff --git a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
index e69de29bb2..63cecab7ef 100644
--- a/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentSettingsTab.svelte
@@ -0,0 +1,30 @@
+<script>
+  import { Layout, Toggle } from "@budibase/bbui"
+  import DevToolsStat from "./DevToolsStat.svelte"
+  import { componentStore } from "stores/index.js"
+  import { getSettingsDefinition } from "utils/componentProps.js"
+
+  let showEnrichedSettings = true
+
+  $: selectedInstance = $componentStore.selectedComponentInstance
+  $: settingsDefinition = getSettingsDefinition(
+    $componentStore.selectedComponentDefinition
+  )
+  $: rawSettings = selectedInstance?.getRawSettings()
+  $: settings = selectedInstance?.getSettings()
+</script>
+
+<Layout noPadding gap="S">
+  <Toggle text="Show enriched settings" bind:value={showEnrichedSettings} />
+  <Layout noPadding gap="XS">
+    {#each settingsDefinition as setting}
+      <DevToolsStat
+        copyable
+        label={setting.label}
+        value={JSON.stringify(
+          (showEnrichedSettings ? settings : rawSettings)?.[setting.key]
+        )}
+      />
+    {/each}
+  </Layout>
+</Layout>
diff --git a/packages/client/src/components/devtools/DevToolsComponentTab.svelte b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
index cf99159f1d..94628b6516 100644
--- a/packages/client/src/components/devtools/DevToolsComponentTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
@@ -1,29 +1,13 @@
 <script>
-  import {
-    Body,
-    Layout,
-    Heading,
-    Button,
-    TextArea,
-    Tabs,
-    Tab,
-    Toggle,
-  } from "@budibase/bbui"
+  import { Body, Layout, Heading, Button, Tabs, Tab } from "@budibase/bbui"
   import { builderStore, devToolsStore, componentStore } from "stores"
   import DevToolsStat from "./DevToolsStat.svelte"
-  import { getSettingsDefinition } from "utils/componentProps.js"
-
-  let showEnrichedSettings = true
-
-  $: selectedInstance = $componentStore.selectedComponentInstance
-  $: settingsDefinition = getSettingsDefinition(
-    $componentStore.selectedComponentDefinition
-  )
-  $: rawSettings = selectedInstance?.getRawSettings()
-  $: settings = selectedInstance?.getSettings()
+  import DevToolsComponentSettingsTab from "./DevToolsComponentSettingsTab.svelte"
+  import DevToolsComponentContextTab from "./DevToolsComponentContextTab.svelte"
 
   $: {
-    if (!selectedInstance) {
+    // Reset selection store if we can't find a matching instance
+    if (!$componentStore.selectedComponentInstance) {
       builderStore.actions.selectComponent(null)
     }
   }
@@ -46,17 +30,19 @@
     </div>
   </Layout>
 {:else}
-  <Layout noPadding>
+  <Layout noPadding gap="S">
+    <Heading size="XS">
+      {$componentStore.selectedComponent?._instanceName}
+    </Heading>
     <Layout noPadding gap="XS">
-      <DevToolsStat
-        label="Component"
-        value={$componentStore.selectedComponent?._instanceName}
-      />
       <DevToolsStat
         label="Type"
         value={$componentStore.selectedComponentDefinition?.name}
       />
-      <DevToolsStat label="ID" value={$componentStore.selectedComponent?._id} />
+      <DevToolsStat
+        label="Component ID"
+        value={$componentStore.selectedComponent?._id}
+      />
     </Layout>
     <div class="buttons">
       <Button
@@ -79,37 +65,12 @@
         <Tabs selected="Settings">
           <Tab title="Settings">
             <div class="tab-content">
-              <Layout noPadding gap="S">
-                <Toggle
-                  text="Show enriched settings"
-                  bind:value={showEnrichedSettings}
-                />
-                <Layout noPadding gap="XS">
-                  {#each settingsDefinition as setting}
-                    <DevToolsStat
-                      label={setting.label}
-                      value={JSON.stringify(
-                        (showEnrichedSettings ? settings : rawSettings)?.[
-                          setting.key
-                        ]
-                      )}
-                    />
-                  {/each}
-                </Layout>
-              </Layout>
+              <DevToolsComponentSettingsTab />
             </div>
           </Tab>
-          <Tab title="Context">
+          <Tab title="Bindings">
             <div class="tab-content">
-              <TextArea
-                readonly
-                label="Data context"
-                value={JSON.stringify(
-                  selectedInstance?.getDataContext(),
-                  null,
-                  2
-                )}
-              />
+              <DevToolsComponentContextTab />
             </div>
           </Tab>
         </Tabs>
diff --git a/packages/client/src/components/devtools/DevToolsHeader.svelte b/packages/client/src/components/devtools/DevToolsHeader.svelte
index 36c6689f47..3ea528be5b 100644
--- a/packages/client/src/components/devtools/DevToolsHeader.svelte
+++ b/packages/client/src/components/devtools/DevToolsHeader.svelte
@@ -44,9 +44,9 @@
       quiet
       overBackground
       icon="Code"
-      on:click={() => devToolsStore.actions.setVisible(true)}
+      on:click={() => devToolsStore.actions.setVisible(!$devToolsStore.visible)}
     >
-      Open DevTools
+      {$devToolsStore.visible ? "Close" : "Open"} DevTools
     </Button>
   {/if}
 </div>
diff --git a/packages/client/src/components/devtools/DevToolsStat.svelte b/packages/client/src/components/devtools/DevToolsStat.svelte
index 9e0220af01..30600737d2 100644
--- a/packages/client/src/components/devtools/DevToolsStat.svelte
+++ b/packages/client/src/components/devtools/DevToolsStat.svelte
@@ -1,12 +1,39 @@
 <script>
+  import { Helpers } from "@budibase/bbui"
+  import { notificationStore } from "stores"
+
   export let label
   export let value
+  export let copyable = false
+
+  $: prettyLabel = label == null ? "-" : label
+  $: prettyValue = value == null ? "-" : value
+  $: empty = value == null
+  $: canCopy = copyable && !empty
+
+  const copyValue = async () => {
+    try {
+      await Helpers.copyToClipboard(value)
+      notificationStore.actions.success("Copied to clipboard")
+    } catch (error) {
+      notificationStore.actions.error(
+        "Failed to copy to clipboard. Check the dev console for the value."
+      )
+      console.warn("Failed to copy the value", value)
+    }
+  }
 </script>
 
 <div class="stat">
-  <div class="stat-label">{label}</div>
-  <div class="stat-value" title={value} on:click={() => console.log(value)}>
-    {value == null ? " " : value}
+  <div class="stat-label" title={prettyLabel}>{prettyLabel}</div>
+  <div
+    class="stat-value"
+    class:copyable={canCopy}
+    class:empty
+    title={prettyValue}
+    on:click={canCopy ? copyValue : null}
+  >
+    {prettyValue}
   </div>
 </div>
 
@@ -23,7 +50,7 @@
     color: var(--spectrum-global-color-gray-600);
     text-transform: uppercase;
     flex: 0 0 auto;
-    max-width: 140px;
+    width: 120px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -35,5 +62,14 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    transition: color var(--spectrum-global-animation-duration-100, 130ms)
+      ease-in-out;
+  }
+  .stat-value.empty {
+    color: var(--spectrum-global-color-gray-500);
+  }
+  .stat-value.copyable:hover {
+    color: var(--spectrum-global-color-blue-600);
+    cursor: pointer;
   }
 </style>
diff --git a/packages/client/src/components/devtools/DevToolsStatsTab.svelte b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
index dffca9d145..ab029db815 100644
--- a/packages/client/src/components/devtools/DevToolsStatsTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsStatsTab.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { authStore, appStore, screenStore } from "stores"
+  import { authStore, appStore, screenStore, componentStore } from "stores"
   import DevToolsStat from "./DevToolsStat.svelte"
 </script>
 
@@ -21,6 +21,7 @@
     label="Active screen"
     value={$screenStore.activeScreen?.routing.route}
   />
+  <DevToolsStat label="Components" value={$componentStore.mountedComponents} />
   <DevToolsStat label="User" value={$authStore.email} />
   <DevToolsStat label="Role" value={$authStore.roleId} />
 </Layout>
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index af7aa5f0cb..4f972b23c7 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -9,8 +9,8 @@ const createComponentStore = () => {
   const store = writable({})
 
   const derivedStore = derived(
-    [builderStore, devToolsStore, screenStore],
-    ([$builderState, $devToolsState, $screenState]) => {
+    [store, builderStore, devToolsStore, screenStore],
+    ([$store, $builderState, $devToolsState, $screenState]) => {
       // Avoid any of this logic if we aren't in the builder preview
       if (!$builderState.inBuilder && !$devToolsState.visible) {
         return {}
@@ -34,10 +34,12 @@ const createComponentStore = () => {
         findComponentPathById(asset?.props, selectedComponentId) || []
 
       return {
-        selectedComponentInstance: get(store)[selectedComponentId],
+        selectedComponentInstance: $store[selectedComponentId],
         selectedComponent: component,
         selectedComponentDefinition: definition,
         selectedComponentPath: path?.map(component => component._id),
+        mountedComponents: Object.keys($store).length,
+        currentAsset: asset,
       }
     }
   )
@@ -56,9 +58,23 @@ const createComponentStore = () => {
     })
   }
 
+  const isComponentRegistered = id => {
+    return get(store)[id] != null
+  }
+
+  const getComponentById = id => {
+    const asset = get(derivedStore).currentAsset
+    return findComponentById(asset?.props, id)
+  }
+
   return {
     ...derivedStore,
-    actions: { registerInstance, unregisterInstance },
+    actions: {
+      registerInstance,
+      unregisterInstance,
+      isComponentRegistered,
+      getComponentById,
+    },
   }
 }
 

From b7af3e75fafd8ca788ac9e1272fc5840a207f14d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Fri, 25 Feb 2022 13:26:11 +0000
Subject: [PATCH 08/48] Fix route choice when using devtools role preview and
 fix devtools role ID not being passed down in context

---
 packages/client/src/components/ClientApp.svelte  | 16 +++++++++++++++-
 .../context/UserBindingsProvider.svelte          |  8 ++++++--
 .../src/components/devtools/DevTools.svelte      |  2 +-
 .../devtools/DevToolsComponentTab.svelte         |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 5d9225420f..4a77795d3b 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -58,8 +58,22 @@
       if ($authStore) {
         // There is a logged in user, so handle them
         if ($screenStore.screens.length) {
+          let firstRoute
+
+          // If using devtools, find the first screen matching our role
+          if ($devToolsStore.role) {
+            firstRoute =
+              $screenStore.screens.filter(
+                screen => screen.routing?.roleId === $devToolsStore.role
+              )[0]?.routing?.route || "/"
+          }
+
+          // Otherwise just use the fist route
+          else {
+            firstRoute = $screenStore.screens[0]?.routing?.route ?? "/"
+          }
+
           // Screens exist so navigate back to the home screen
-          const firstRoute = $screenStore.screens[0].routing?.route ?? "/"
           routeStore.actions.navigate(firstRoute)
         } else {
           // No screens likely means the user has no permissions to view this app
diff --git a/packages/client/src/components/context/UserBindingsProvider.svelte b/packages/client/src/components/context/UserBindingsProvider.svelte
index e788d80dc4..f7605122ae 100644
--- a/packages/client/src/components/context/UserBindingsProvider.svelte
+++ b/packages/client/src/components/context/UserBindingsProvider.svelte
@@ -1,6 +1,6 @@
 <script>
   import Provider from "./Provider.svelte"
-  import { authStore } from "stores"
+  import { authStore, devToolsStore } from "stores"
   import { ActionTypes } from "constants"
   import { Constants } from "@budibase/frontend-core"
 
@@ -17,6 +17,10 @@
   ]
 </script>
 
-<Provider key="user" data={$authStore} {actions}>
+<Provider
+  key="user"
+  data={{ ...$authStore, roleId: $devToolsStore.role || $authStore?.roleId }}
+  {actions}
+>
   <slot />
 </Provider>
diff --git a/packages/client/src/components/devtools/DevTools.svelte b/packages/client/src/components/devtools/DevTools.svelte
index cf21f16503..4bb332da2f 100644
--- a/packages/client/src/components/devtools/DevTools.svelte
+++ b/packages/client/src/components/devtools/DevTools.svelte
@@ -41,7 +41,7 @@
 
 <style>
   .devtools {
-    background: var(--spectrum-alias-background-color-secondary);
+    background: var(--spectrum-alias-background-color-primary);
     flex: 0 0 320px;
     border-left: 1px solid var(--spectrum-global-color-gray-300);
     overflow: auto;
diff --git a/packages/client/src/components/devtools/DevToolsComponentTab.svelte b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
index 94628b6516..4bd68ecf98 100644
--- a/packages/client/src/components/devtools/DevToolsComponentTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
@@ -40,6 +40,7 @@
         value={$componentStore.selectedComponentDefinition?.name}
       />
       <DevToolsStat
+        copyable
         label="Component ID"
         value={$componentStore.selectedComponent?._id}
       />

From c8e87cf24ff731bffa49102f38cdfd2529b73a7e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Apr 2022 13:30:38 +0100
Subject: [PATCH 09/48] Add label for global selected rows bindings in devtools

---
 .../src/components/devtools/DevToolsComponentContextTab.svelte  | 1 +
 .../client/src/components/devtools/DevToolsComponentTab.svelte  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
index 5bf2327332..3b4c426851 100644
--- a/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentContextTab.svelte
@@ -8,6 +8,7 @@
     state: "State",
     url: "URL",
     device: "Device",
+    rowSelection: "Selected rows",
   }
 
   let category
diff --git a/packages/client/src/components/devtools/DevToolsComponentTab.svelte b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
index 4bd68ecf98..a553a78720 100644
--- a/packages/client/src/components/devtools/DevToolsComponentTab.svelte
+++ b/packages/client/src/components/devtools/DevToolsComponentTab.svelte
@@ -18,7 +18,7 @@
     <Heading size="XS">Please choose a component</Heading>
     <Body size="S">
       Press the button below to enable component selection, then click a
-      component in your app to view what context values are available.
+      component in your app to view its settings and available data bindings.
     </Body>
     <div>
       <Button

From c25ca0cafd907aae50e7d4163f01cd28cdd87e50 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Apr 2022 13:40:07 +0100
Subject: [PATCH 10/48] Tidy up

---
 .../client/src/components/ClientApp.svelte    | 27 +++++++++----------
 packages/server/src/middleware/currentapp.js  |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 9fe4506b3e..6525401c9c 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -63,10 +63,10 @@
 
           // If using devtools, find the first screen matching our role
           if ($devToolsStore.role) {
-            firstRoute =
-              $screenStore.screens.filter(
-                screen => screen.routing?.roleId === $devToolsStore.role
-              )[0]?.routing?.route || "/"
+            const roleRoutes = $screenStore.screens.filter(
+              screen => screen.routing?.roleId === $devToolsStore.role
+            )
+            firstRoute = roleRoutes[0]?.routing?.route || "/"
           }
 
           // Otherwise just use the fist route
@@ -143,10 +143,10 @@
                       {/key}
 
                       <!--
-                      Flatpickr needs to be inside the theme wrapper.
-                      It also needs its own container because otherwise it hijacks
-                      key events on the whole page. It is painful to work with.
-                    -->
+                        Flatpickr needs to be inside the theme wrapper.
+                        It also needs its own container because otherwise it hijacks
+                        key events on the whole page. It is painful to work with.
+                      -->
                       <div id="flatpickr-root" />
 
                       <!-- Modal container to ensure they sit on top -->
@@ -164,12 +164,10 @@
                   </div>
                 </div>
 
-                <!-- Selection indicators should be bounded by device -->
-                <!--
-                  We don't want to key these by componentID as they control their own
-                  re-mounting to avoid flashes.
-                -->
-                <SelectionIndicator />
+                <!-- Preview and dev tools utilities  -->
+                {#if $appStore.isDevApp}
+                  <SelectionIndicator />
+                {/if}
                 {#if $builderStore.inBuilder || $devToolsStore.allowSelection}
                   <HoverIndicator />
                 {/if}
@@ -219,6 +217,7 @@
     justify-content: flex-start;
     align-items: stretch;
   }
+
   #app-body {
     flex: 1 1 auto;
     display: flex;
diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index 2446b5030b..ad59186ebb 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -70,7 +70,7 @@ module.exports = async (ctx, next) => {
     const isDevApp = appId && isDevAppID(appId)
     const roleHeader = ctx.request.headers[Headers.PREVIEW_ROLE]
     if (isBuilder && isDevApp && roleHeader) {
-      // Ensure the role is valid ensuring a definition exists
+      // Ensure the role is valid by ensuring a definition exists
       try {
         await getRole(roleHeader)
         roleId = roleHeader

From 4f212397b0cea2a76c4c1febf7e81114cdeab547 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Apr 2022 13:41:07 +0100
Subject: [PATCH 11/48] Lint

---
 packages/bbui/src/helpers.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js
index 8ffbf8d6e1..b02783e0bd 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@@ -1,5 +1,3 @@
-import { notifications } from "./Stores/notifications"
-
 /**
  * Generates a DOM safe UUID.
  * Starting with a letter is important to make it DOM safe.

From caff2d7508efc453f86e0071698dc03b500070fb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Apr 2022 14:11:05 +0100
Subject: [PATCH 12/48] Fix for tests when headers are undefined

---
 packages/server/src/middleware/currentapp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index ad59186ebb..8ddf608572 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -68,7 +68,7 @@ module.exports = async (ctx, next) => {
     const isBuilder =
       globalUser && globalUser.builder && globalUser.builder.global
     const isDevApp = appId && isDevAppID(appId)
-    const roleHeader = ctx.request.headers[Headers.PREVIEW_ROLE]
+    const roleHeader = ctx.request && ctx.request.headers[Headers.PREVIEW_ROLE]
     if (isBuilder && isDevApp && roleHeader) {
       // Ensure the role is valid by ensuring a definition exists
       try {

From b528c9fa082e9248984e0a045ec569d976be5e57 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 6 Apr 2022 14:32:25 +0100
Subject: [PATCH 13/48] Account for builder preview 2px offset when rendering
 indicator sets so that indicators are accurate for devtools

---
 packages/client/src/components/preview/IndicatorSet.svelte | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index 012aa7e470..6fcf552d21 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -2,6 +2,7 @@
   import { onMount, onDestroy } from "svelte"
   import Indicator from "./Indicator.svelte"
   import { domDebounce } from "utils/domDebounce"
+  import { builderStore } from "stores"
 
   export let componentId
   export let color
@@ -13,6 +14,7 @@
   let interval
   let text
   $: visibleIndicators = indicators.filter(x => x.visible)
+  $: offset = $builderStore.inBuilder ? 0 : 2
 
   let updating = false
   let observers = []
@@ -88,8 +90,8 @@
 
       const elBounds = child.getBoundingClientRect()
       nextIndicators.push({
-        top: elBounds.top + scrollY - deviceBounds.top,
-        left: elBounds.left + scrollX - deviceBounds.left,
+        top: elBounds.top + scrollY - deviceBounds.top - offset,
+        left: elBounds.left + scrollX - deviceBounds.left - offset,
         width: elBounds.width + 4,
         height: elBounds.height + 4,
         visible: false,

From bab75ade1e9af5e9d087066e8f2e49860f901e49 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 7 Apr 2022 15:09:53 +0100
Subject: [PATCH 14/48] Display correct selector label for JS Scripting

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 3d857ec9fb..a31e30487e 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -104,7 +104,10 @@
       )
       bindings = bindings.concat(
         outputs.map(([name, value]) => {
-          const runtime = idx === 0 ? `trigger.${name}` : `steps.${idx}.${name}`
+          const stepsLabel = block.name.toLowerCase().includes("bash")
+            ? `steps.${idx}.${name}`
+            : `steps[${idx - 1}].${name}`
+          const runtime = idx === 0 ? `trigger.${name}` : stepsLabel
           return {
             label: runtime,
             type: value.type,

From ee1d7fbbd5027bfa218a19a6c753b05f6ec535d9 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 7 Apr 2022 17:13:08 +0100
Subject: [PATCH 15/48] passing non-null required for doesContainStrings

---
 packages/server/src/api/controllers/table/bulkFormula.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/table/bulkFormula.js b/packages/server/src/api/controllers/table/bulkFormula.js
index 27f62415c9..d736c126f2 100644
--- a/packages/server/src/api/controllers/table/bulkFormula.js
+++ b/packages/server/src/api/controllers/table/bulkFormula.js
@@ -25,7 +25,7 @@ function getFormulaThatUseColumn(table, columnNames) {
     if (!isStaticFormula(column)) {
       continue
     }
-    if (!doesContainStrings(column.formula, columnNames)) {
+    if (!doesContainStrings(column?.formula ?? "", columnNames)) {
       continue
     }
     formula.push(column.name)

From aaf491245be7208d9e23102d4a66aafb4259a275 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 8 Apr 2022 23:15:47 +0100
Subject: [PATCH 16/48] Error messaging for invalid options in editor

---
 packages/bbui/src/Drawer/Drawer.svelte        |  3 +-
 .../OptionsEditor/OptionsEditor.svelte        | 47 ++++++++++++++++---
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index e5eacb1a44..51408c793e 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -6,8 +6,7 @@
 
   export let title
   export let fillWidth
-
-  let visible = false
+  export let visible = false
 
   export function show() {
     if (visible) {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
index 4d74ea9940..4447240c01 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
@@ -7,22 +7,57 @@
 
   export let value
 
+  let drawerVisible = false
   let drawer
+  let valid = true
   let tempValue = value || []
 
   const saveFilter = async () => {
-    // Filter out incomplete options
-    tempValue = tempValue.filter(option => option.value && option.label)
-    dispatch("change", tempValue)
-    drawer.hide()
+    // Filter out incomplete options, but if all are incomplete then show error
+    let filteredOptions = tempValue.filter(
+      option => option.value && option.label
+    )
+    if (filteredOptions.length > 0 || tempValue.length === 0) {
+      tempValue = filteredOptions
+      valid = true
+      dispatch("change", tempValue)
+      drawer.hide()
+    } else {
+      valid = false
+    }
+  }
+
+  //If the drawer is hidden or error corrected, reset the validation
+  $: {
+    if (
+      !drawerVisible ||
+      tempValue.some(
+        option => option.label?.length > 0 && option.value?.length > 0
+      )
+    ) {
+      valid = true
+    }
   }
 </script>
 
 <ActionButton on:click={drawer.show}>Define Options</ActionButton>
-<Drawer bind:this={drawer} title="Options">
+<Drawer bind:this={drawer} bind:visible={drawerVisible} title="Options">
   <svelte:fragment slot="description">
-    Define the options for this picker.
+    {#if !valid}
+      <span class="syntax-error"
+        >You must provide option labels and values.</span
+      >
+    {:else}
+      Define the options for this picker.
+    {/if}
   </svelte:fragment>
   <Button cta slot="buttons" on:click={saveFilter}>Save</Button>
   <OptionsDrawer bind:options={tempValue} slot="body" />
 </Drawer>
+
+<style>
+  .syntax-error {
+    padding-top: var(--spacing-m);
+    color: var(--red);
+  }
+</style>

From e71166561a22aaae0e345d3a9451e202265d7377 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 8 Apr 2022 23:24:46 +0100
Subject: [PATCH 17/48] Simplify condition

---
 .../PropertyControls/OptionsEditor/OptionsEditor.svelte       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
index 4447240c01..7ee4c32239 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
@@ -31,9 +31,7 @@
   $: {
     if (
       !drawerVisible ||
-      tempValue.some(
-        option => option.label?.length > 0 && option.value?.length > 0
-      )
+      tempValue.some(option => option.label && option.value)
     ) {
       valid = true
     }

From 9990037949169634d8c2686a0d7fee829476cbad Mon Sep 17 00:00:00 2001
From: Theone Eclarin <Theone_Eclarin@outlook.com>
Date: Mon, 11 Apr 2022 10:02:40 +0800
Subject: [PATCH 18/48] initial commit

---
 .github/CONTRIBUTING.md      | 2 ++
 packages/server/package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2a57d6f388..bd21123709 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -93,6 +93,8 @@ then `cd ` into your local copy.
 
 #### 3.  Install and Build
 
+| **NOTE**: On Windows, all yarn commands must be executed on a bash shell (e.g. git bash)
+
 To develop the Budibase platform you'll need [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) installed.
 
 ##### Quick method
diff --git a/packages/server/package.json b/packages/server/package.json
index 7a8402d132..8405b9aa92 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/Budibase/budibase.git"
   },
   "scripts": {
-    "build": "rimraf dist/ && tsc && mv dist/src/* dist/ && rmdir dist/src/ && yarn postbuild",
+    "build": "rimraf dist/ && tsc && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
     "test": "jest --coverage --maxWorkers=2",
     "test:watch": "jest --watch",

From 8e194695097ada9b34574a2462d757ba4495da44 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Mon, 11 Apr 2022 16:08:25 +0100
Subject: [PATCH 19/48] Added error messages to inputs instead

---
 packages/bbui/src/Drawer/Drawer.svelte        |  3 +-
 .../OptionsEditor/OptionsDrawer.svelte        |  2 +
 .../OptionsEditor/OptionsEditor.svelte        | 73 ++++++++++---------
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index 51408c793e..e5eacb1a44 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -6,7 +6,8 @@
 
   export let title
   export let fillWidth
-  export let visible = false
+
+  let visible = false
 
   export function show() {
     if (visible) {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
index 340c1eb107..5fab1eaef4 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
@@ -41,12 +41,14 @@
               bind:value={option.label}
               label="Label"
               labelPosition="left"
+              error={option.error?.label}
             />
             <Input
               placeholder="Value"
               bind:value={option.value}
               label="Value"
               labelPosition="left"
+              error={option.error?.value}
             />
             <Icon
               name="Close"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
index 7ee4c32239..83cb3adcd5 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
@@ -7,55 +7,60 @@
 
   export let value
 
-  let drawerVisible = false
   let drawer
-  let valid = true
   let tempValue = value || []
 
   const saveFilter = async () => {
-    // Filter out incomplete options, but if all are incomplete then show error
-    let filteredOptions = tempValue.filter(
-      option => option.value && option.label
-    )
-    if (filteredOptions.length > 0 || tempValue.length === 0) {
-      tempValue = filteredOptions
-      valid = true
-      dispatch("change", tempValue)
+    let hasError = false
+    for (let i = 0; i < tempValue.length; i++) {
+      let option = tempValue[i]
+      if (!(option.label && option.value)) {
+        option.error = {
+          label: option.label ? undefined : "You must provide a label.",
+          value: option.value ? undefined : "You must provide a value.",
+        }
+        tempValue[i] = option
+        hasError = true
+      }
+    }
+    if (!hasError) {
       drawer.hide()
-    } else {
-      valid = false
+    }
+    dispatch("change", tempValue)
+  }
+
+  const clearOptionErrors = () => {
+    for (let i = 0; i < tempValue.length; i++) {
+      let option = tempValue[i]
+      option.error = undefined
+      tempValue[i] = option
     }
   }
 
-  //If the drawer is hidden or error corrected, reset the validation
   $: {
-    if (
-      !drawerVisible ||
-      tempValue.some(option => option.label && option.value)
-    ) {
-      valid = true
+    for (let i = 0; i < tempValue.length; i++) {
+      let option = tempValue[i]
+      if (option.error?.label && option.label) {
+        option.error.label = undefined
+      }
+      if (option.error?.value && option.value) {
+        option.error.value = undefined
+      }
+      tempValue[i] = option
     }
   }
 </script>
 
-<ActionButton on:click={drawer.show}>Define Options</ActionButton>
-<Drawer bind:this={drawer} bind:visible={drawerVisible} title="Options">
+<ActionButton
+  on:click={() => {
+    clearOptionErrors()
+    drawer.show()
+  }}>Define Options</ActionButton
+>
+<Drawer bind:this={drawer} title="Options">
   <svelte:fragment slot="description">
-    {#if !valid}
-      <span class="syntax-error"
-        >You must provide option labels and values.</span
-      >
-    {:else}
-      Define the options for this picker.
-    {/if}
+    Define the options for this picker.
   </svelte:fragment>
   <Button cta slot="buttons" on:click={saveFilter}>Save</Button>
   <OptionsDrawer bind:options={tempValue} slot="body" />
 </Drawer>
-
-<style>
-  .syntax-error {
-    padding-top: var(--spacing-m);
-    color: var(--red);
-  }
-</style>

From 88b801ac082250fac35ba9b55e444af9d21ebdf2 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Tue, 12 Apr 2022 14:54:15 +0100
Subject: [PATCH 20/48] Default option labels and values

---
 .../OptionsEditor/OptionsDrawer.svelte        |  2 -
 .../OptionsEditor/OptionsEditor.svelte        | 50 ++++---------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
index 5fab1eaef4..340c1eb107 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
@@ -41,14 +41,12 @@
               bind:value={option.label}
               label="Label"
               labelPosition="left"
-              error={option.error?.label}
             />
             <Input
               placeholder="Value"
               bind:value={option.value}
               label="Value"
               labelPosition="left"
-              error={option.error?.value}
             />
             <Icon
               name="Close"
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
index 83cb3adcd5..1201edd31e 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
@@ -10,57 +10,25 @@
   let drawer
   let tempValue = value || []
 
-  const saveFilter = async () => {
-    let hasError = false
+  const saveOptions = async () => {
+    // Filter out incomplete options, default if needed
+    tempValue = tempValue.filter(option => option.value || option.label)
     for (let i = 0; i < tempValue.length; i++) {
       let option = tempValue[i]
-      if (!(option.label && option.value)) {
-        option.error = {
-          label: option.label ? undefined : "You must provide a label.",
-          value: option.value ? undefined : "You must provide a value.",
-        }
-        tempValue[i] = option
-        hasError = true
-      }
-    }
-    if (!hasError) {
-      drawer.hide()
+      option.label = option.label ? option.label : option.value
+      option.value = option.value ? option.value : option.label
+      tempValue[i] = option
     }
     dispatch("change", tempValue)
-  }
-
-  const clearOptionErrors = () => {
-    for (let i = 0; i < tempValue.length; i++) {
-      let option = tempValue[i]
-      option.error = undefined
-      tempValue[i] = option
-    }
-  }
-
-  $: {
-    for (let i = 0; i < tempValue.length; i++) {
-      let option = tempValue[i]
-      if (option.error?.label && option.label) {
-        option.error.label = undefined
-      }
-      if (option.error?.value && option.value) {
-        option.error.value = undefined
-      }
-      tempValue[i] = option
-    }
+    drawer.hide()
   }
 </script>
 
-<ActionButton
-  on:click={() => {
-    clearOptionErrors()
-    drawer.show()
-  }}>Define Options</ActionButton
->
+<ActionButton on:click={drawer.show}>Define Options</ActionButton>
 <Drawer bind:this={drawer} title="Options">
   <svelte:fragment slot="description">
     Define the options for this picker.
   </svelte:fragment>
-  <Button cta slot="buttons" on:click={saveFilter}>Save</Button>
+  <Button cta slot="buttons" on:click={saveOptions}>Save</Button>
   <OptionsDrawer bind:options={tempValue} slot="body" />
 </Drawer>

From 85b1a594eaf217009758ddad529b3df8a5e82a2d Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 12 Apr 2022 15:59:12 +0100
Subject: [PATCH 21/48] Updated deleteApp function

Added a check for app name, function returns if app does not exist, rather than trying to delete
---
 packages/builder/cypress/support/commands.js | 76 +++++++++++---------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index f4ccdcca24..2783d11ce6 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -60,44 +60,50 @@ Cypress.Commands.add("deleteApp", name => {
   cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
     .its("body")
     .then(val => {
-      if (val.length > 0) {
-        if (Cypress.env("TEST_ENV")) {
-          cy.searchForApplication(name)
-          cy.get(".appTable").within(() => {
-            cy.get(".spectrum-Icon").eq(1).click()
+      const findAppName = val.some(val => val.name == name)
+      if (findAppName) {
+        if (val.length > 0) {
+          if (Cypress.env("TEST_ENV")) {
+            cy.searchForApplication(name)
+            cy.get(".appTable").within(() => {
+              cy.get(".spectrum-Icon").eq(1).click()
+            })
+          } else {
+            const appId = val.reduce((acc, app) => {
+              if (name === app.name) {
+                acc = app.appId
+              }
+              return acc
+            }, "")
+  
+            if (appId == "") {
+              return
+            }
+  
+            const appIdParsed = appId.split("_").pop()
+            const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
+            cy.get(actionEleId).within(() => {
+              cy.get(".spectrum-Icon").eq(0).click()
+            })
+          }
+  
+          cy.get(".spectrum-Menu").then($menu => {
+            if ($menu.text().includes("Unpublish")) {
+              cy.get(".spectrum-Menu").contains("Unpublish").click()
+              cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+            } else {
+              cy.get(".spectrum-Menu").contains("Delete").click()
+              cy.get(".spectrum-Dialog-grid").within(() => {
+                cy.get("input").type(name)
+              })
+              cy.get(".spectrum-Button--warning").click()
+            }
           })
         } else {
-          const appId = val.reduce((acc, app) => {
-            if (name === app.name) {
-              acc = app.appId
-            }
-            return acc
-          }, "")
-
-          if (appId == "") {
-            return
-          }
-
-          const appIdParsed = appId.split("_").pop()
-          const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
-          cy.get(actionEleId).within(() => {
-            cy.get(".spectrum-Icon").eq(0).click()
-          })
+          return
         }
-
-        cy.get(".spectrum-Menu").then($menu => {
-          if ($menu.text().includes("Unpublish")) {
-            cy.get(".spectrum-Menu").contains("Unpublish").click()
-            cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
-          } else {
-            cy.get(".spectrum-Menu").contains("Delete").click()
-            cy.get(".spectrum-Dialog-grid").within(() => {
-              cy.get("input").type(name)
-            })
-            cy.get(".spectrum-Button--warning").click()
-          }
-        })
-      } else {
+      }
+      else {
         return
       }
     })

From d775fd7d5f561c28c16886af8c7d7e1745fba1db Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 12 Apr 2022 16:20:15 +0100
Subject: [PATCH 22/48] Fixed Table Pagination Tests

Previous issues with the second page loading - reloading the page solves it
---
 .../builder/cypress/integration/createTable.spec.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index 81b7c2f045..9f2bc3653f 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -61,7 +61,8 @@ filterTests(["smoke", "all"], () => {
         for (let i = 1; i < totalRows; i++) {
           cy.addRow([i])
         }
-        cy.wait(1000)
+        cy.reload()
+        cy.wait(2000)
         cy.get(".spectrum-Pagination").within(() => {
           cy.get(".spectrum-ActionButton").eq(1).click()
         })
@@ -71,12 +72,12 @@ filterTests(["smoke", "all"], () => {
       })
 
       it("Deletes rows and checks pagination", () => {
-        // Delete rows, removing second page of rows from table
-        const deleteRows = 5
+        // Delete rows, removing second page from table
         cy.get(".spectrum-Checkbox-input").check({ force: true })
-        cy.get(".spectrum-Table")
-        cy.contains("Delete 5 row(s)").click()
-        cy.get(".spectrum-Modal").contains("Delete").click()
+        cy.get(".popovers").within(() => {
+          cy.get(".spectrum-Button").click({ force: true })
+        })
+        cy.get(".spectrum-Dialog-grid").contains("Delete").click({ force: true })
         cy.wait(1000)
 
         // Confirm table only has one page

From d73105dbeea750a155fe686a837246d8b41ad413 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 12 Apr 2022 16:27:14 +0100
Subject: [PATCH 23/48] Use the readable schema when generating search field
 options

---
 .../PropertiesPanel/PropertyControls/SearchFieldSelect.svelte | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
index b3387fdd05..e609426b1e 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
@@ -15,9 +15,7 @@
 
   const dispatch = createEventDispatcher()
   $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource, {
-    searchableSchema: true,
-  }).schema
+  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
   $: options = getOptions(datasource, schema || {})
   $: boundValue = getSelectedOption(value, options)
 

From 69ec82856cec6c870dc91072edaed533b9de83ad Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 12 Apr 2022 16:58:26 +0100
Subject: [PATCH 24/48] Remove table ID from custom queries to fix 500 errors
 when trying to fetch a table definition and passing up a query ID, and fix
 issue with search fields when no table ID exists

---
 .../PropertiesPanel/PropertyControls/DataSourceSelect.svelte    | 1 -
 .../PropertiesPanel/PropertyControls/SearchFieldSelect.svelte   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index 73554b45db..1e19508744 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -52,7 +52,6 @@
     .map(query => ({
       label: query.name,
       name: query.name,
-      tableId: query._id,
       ...query,
       type: "query",
     }))
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
index e609426b1e..41906d3ba1 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
@@ -22,7 +22,7 @@
   function getOptions(ds, dsSchema) {
     let base = Object.values(dsSchema)
     if (!ds?.tableId) {
-      return base
+      return base.map(field => field.name)
     }
     const currentTable = $tables.list.find(table => table._id === ds.tableId)
     return getFields(base, { allowLinks: currentTable?.sql }).map(

From eba7df7255fe8dde00b852249cfce2605c35b591 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 12 Apr 2022 17:24:15 +0100
Subject: [PATCH 25/48] Updated createApp.spec.js

The test 'should provide filterable templates' was failing on the smoke build.

Updated to check existence of apps and act accordingly
---
 packages/builder/cypress/integration/createApp.spec.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js
index 4867534241..13c5979df9 100644
--- a/packages/builder/cypress/integration/createApp.spec.js
+++ b/packages/builder/cypress/integration/createApp.spec.js
@@ -25,9 +25,13 @@ filterTests(['smoke', 'all'], () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
 
-      if (Cypress.env("TEST_ENV")) {
-        cy.get(".spectrum-Button").contains("Templates").click({force: true})
-      }
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+        .its("body")
+        .then(val => {
+          if (val.length > 0) {
+            cy.get(".spectrum-Button").contains("Templates").click({force: true})
+          }
+        })
 
       cy.get(".template-category-filters").should("exist")
       cy.get(".template-categories").should("exist")

From 761ac69783f17e1ffccd4d2e4292811ef0cc36ee Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 12 Apr 2022 17:33:17 +0100
Subject: [PATCH 26/48] lint

---
 packages/builder/cypress/support/commands.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 2783d11ce6..f79e96d6d5 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -75,18 +75,18 @@ Cypress.Commands.add("deleteApp", name => {
               }
               return acc
             }, "")
-  
+
             if (appId == "") {
               return
             }
-  
+
             const appIdParsed = appId.split("_").pop()
             const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
             cy.get(actionEleId).within(() => {
               cy.get(".spectrum-Icon").eq(0).click()
             })
           }
-  
+
           cy.get(".spectrum-Menu").then($menu => {
             if ($menu.text().includes("Unpublish")) {
               cy.get(".spectrum-Menu").contains("Unpublish").click()
@@ -102,8 +102,7 @@ Cypress.Commands.add("deleteApp", name => {
         } else {
           return
         }
-      }
-      else {
+      } else {
         return
       }
     })

From 42c561194678d4674a366dd55035ede4b3178e0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Apr 2022 00:14:16 +0000
Subject: [PATCH 27/48] Bump urijs from 1.19.8 to 1.19.11 in /packages/server

Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.8 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.8...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/server/yarn.lock | 160 +++++++++++++++++++++++++++++++-------
 1 file changed, 132 insertions(+), 28 deletions(-)

diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 0ad1593a13..72f2e79a40 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -995,10 +995,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.97.tgz#32bd09324437256bcfedda11d34fc4c4cb1a5b9b"
-  integrity sha512-NLH6fbWpU0Ej0dTL37PoEAMRMI8zYVwnJI1b74VqWFmyR/moOmyPcptfLnysY1aD5hizHgz+P8sFYsSGKiMozg==
+"@budibase/backend-core@^1.0.105-alpha.10":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.112.tgz#38d5f8faadc08d863b13eeadefce067fd572ae27"
+  integrity sha512-/MS1+QZjEpwcy1Lj4tkvXE3V8Q1Kd41/30y8Y2yaDosnDoKZmUs5muZjXZJnmYADajPwA3u7uop2psEdg5diLg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1068,13 +1068,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/bbui@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.0.97.tgz#6d36cdbeeaaf3a7b299a8a677f0739b682b49bf3"
-  integrity sha512-AMwDCz0qm4rZp50TY83JJTjqOAlZPdirzsLM4Iydn2dWlaqpcwnB3VZOzgb+mC72uH5eKeqI74Nu7hh3CvtXBw==
+"@budibase/bbui@^1.0.112":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.0.112.tgz#93fa44b5051caee6bb6883be678700fca1f91682"
+  integrity sha512-ooc3yZnKCpXTZulq55dqvJrdUPgAaC+kHL5eo5S62qBSoHx3RHUxPEAG+aOpVuj2I8UJ05/2iVCxlgTQCcYp3A==
   dependencies:
     "@adobe/spectrum-css-workflow-icons" "^1.2.1"
-    "@budibase/string-templates" "^1.0.97"
+    "@budibase/string-templates" "^1.0.112"
     "@spectrum-css/actionbutton" "^1.0.1"
     "@spectrum-css/actiongroup" "^1.0.1"
     "@spectrum-css/avatar" "^3.0.2"
@@ -1120,14 +1120,14 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/client@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-1.0.97.tgz#e110737c98fb0f7145cf1f5ec41912ff46fc0c3f"
-  integrity sha512-bdXVVZe6m+P4azdGvU2AoVMDC+bQ2MUkot5hTcRTfyCAwqCQABlkL/t+iA4Zv8feFc5ZUtfrsCIm+jOKGEUUow==
+"@budibase/client@^1.0.105-alpha.10":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-1.0.112.tgz#babd4e75de9f4161aa40c15138afb810d0a91993"
+  integrity sha512-pl8kZHvJN0EMcDUscH4RHXKXQhcHa5wDDIe6C4FMZ18TCp6hDM47Cv/xeejOqajllixASV8oD0ZymNZi3sLGvQ==
   dependencies:
-    "@budibase/bbui" "^1.0.97"
-    "@budibase/frontend-core" "^1.0.97"
-    "@budibase/string-templates" "^1.0.97"
+    "@budibase/bbui" "^1.0.112"
+    "@budibase/frontend-core" "^1.0.112"
+    "@budibase/string-templates" "^1.0.112"
     "@spectrum-css/button" "^3.0.3"
     "@spectrum-css/card" "^3.0.3"
     "@spectrum-css/divider" "^1.0.3"
@@ -1139,20 +1139,23 @@
     apexcharts "^3.22.1"
     dayjs "^1.10.5"
     downloadjs "1.4.7"
+    leaflet "^1.7.1"
     regexparam "^1.3.0"
     rollup-plugin-polyfill-node "^0.8.0"
+    sanitize-html "^2.7.0"
+    screenfull "^6.0.1"
     shortid "^2.2.15"
     svelte "^3.38.2"
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
     svelte-spa-router "^3.0.5"
 
-"@budibase/frontend-core@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-1.0.97.tgz#530a0c716fbc93dd38d7abcc22b3131030f9cd16"
-  integrity sha512-B2LG9UIEKSLE0NBhPlVLYXAypjBZgiPdqGwoNm7xcWZHG12YzYWqflV3NLwaDx9Qt3UTIaRzXqBGoNNQCGdUdQ==
+"@budibase/frontend-core@^1.0.112":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-1.0.112.tgz#b1615e6cf6690fa6672fa579f6ccd74e94f702d9"
+  integrity sha512-NcElXZk9wSld2kl3YbCwrGlQaqM+fqiGU0czurFieGLKanKuIRquLtyfxGGRqxC8zxKacxhWKpaVRoUt87dTnw==
   dependencies:
-    "@budibase/bbui" "^1.0.97"
+    "@budibase/bbui" "^1.0.112"
     lodash "^4.17.21"
     svelte "^3.46.2"
 
@@ -1199,10 +1202,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/string-templates@^1.0.97":
-  version "1.0.97"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.97.tgz#b7485cb8774d6dff8280fbf411c6383b82add72d"
-  integrity sha512-8NfpYzDJgSkic3E0ARfNsPsFEMmOcH+kEeTioLkNnkKrviIRhSQ9Oa3S87QIYo5WGYxpEFEfhYutXsbp3GTLbg==
+"@budibase/string-templates@^1.0.105-alpha.10", "@budibase/string-templates@^1.0.112":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.112.tgz#754f8f725262e58dfeac946de5f87d8d333077b7"
+  integrity sha512-UOVpMT87eR8ZfoZo5D3UsxR0Qsfj0FmE6bxcJLYd5ey/RIeMErnl8fKu/0Chj6JOxGc3q/U7dIYsqzdVsJFhyQ==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.8"
     dayjs "^1.10.4"
@@ -4985,11 +4988,25 @@ doctrine@3.0.0, doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-serializer@^1.0.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -5004,6 +5021,22 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@^2.5.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -5190,6 +5223,11 @@ ent@^2.2.0:
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -5433,6 +5471,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.9.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -6764,6 +6807,16 @@ html-tag@^2.0.0:
     is-self-closing "^1.0.1"
     kind-of "^6.0.0"
 
+htmlparser2@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 http-assert@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f"
@@ -7312,6 +7365,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -8904,6 +8962,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
+  integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -9688,6 +9751,11 @@ nanoid@^2.1.0:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
   integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
 
+nanoid@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
+  integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -10245,6 +10313,11 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-srcset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+  integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -10598,6 +10671,15 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+postcss@^8.3.11:
+  version "8.4.12"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
+  integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==
+  dependencies:
+    nanoid "^3.3.1"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
@@ -11636,6 +11718,18 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+sanitize-html@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.0.tgz#e106205b468aca932e2f9baf241f24660d34e279"
+  integrity sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==
+  dependencies:
+    deepmerge "^4.2.2"
+    escape-string-regexp "^4.0.0"
+    htmlparser2 "^6.0.0"
+    is-plain-object "^5.0.0"
+    parse-srcset "^1.0.2"
+    postcss "^8.3.11"
+
 sanitize-s3-objectkey@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
@@ -11674,6 +11768,11 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+screenfull@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.1.tgz#3b71e6f06b72d817a8d3be73c45ebe71fa8da1ce"
+  integrity sha512-yzQW+j4zMUBQC51xxWaoDYjxOtl8Kn+xvue3p6v/fv2pIi1jH4AldgVLU8TBfFVgH2x3VXlf3+YiA/AYIPlaew==
+
 search-params@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8"
@@ -11940,6 +12039,11 @@ source-list-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -13187,9 +13291,9 @@ uri-js@^4.2.2:
     punycode "^2.1.0"
 
 urijs@^1.19.0:
-  version "1.19.8"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.8.tgz#ee0407a18528934d3c383e691912f47043a58feb"
-  integrity sha512-iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==
+  version "1.19.11"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
+  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
 
 urix@^0.1.0:
   version "0.1.0"

From 4c8119fcf34db708d641419277f1a90da75dd932 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Apr 2022 00:14:21 +0000
Subject: [PATCH 28/48] Bump urijs from 1.19.8 to 1.19.11 in /packages/worker

Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.8 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.8...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/worker/yarn.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 8bc6157ac9..cda8055c17 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -286,10 +286,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@^1.0.104":
-  version "1.0.104"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.104.tgz#eb435c27327a1f2ea5e83b3cf242b9f85b7a5f8a"
-  integrity sha512-YXI8R/bdWDO5RhcMdqu88DQ7Dn26v3SUTs5FuHvXG4b2mKDTHduecqTuhIhrbqQ5KjnTYuhAEz2iG0sP2rj5rg==
+"@budibase/backend-core@^1.0.105-alpha.10":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.112.tgz#38d5f8faadc08d863b13eeadefce067fd572ae27"
+  integrity sha512-/MS1+QZjEpwcy1Lj4tkvXE3V8Q1Kd41/30y8Y2yaDosnDoKZmUs5muZjXZJnmYADajPwA3u7uop2psEdg5diLg==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -335,10 +335,10 @@
     to-gfm-code-block "^0.1.1"
     year "^0.2.1"
 
-"@budibase/string-templates@^1.0.104":
-  version "1.0.104"
-  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.104.tgz#f812700f2b21f638fd1e48dde065ae693fae2897"
-  integrity sha512-3caq3qwpIieyb9m8eSl8OhcE0ppzuyJ/0ubDlWmtpbmwmG2v3ynI+DwxpbG4CcVQFuebD2yxU0CZfioU76vKCQ==
+"@budibase/string-templates@^1.0.105-alpha.10":
+  version "1.0.112"
+  resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-1.0.112.tgz#754f8f725262e58dfeac946de5f87d8d333077b7"
+  integrity sha512-UOVpMT87eR8ZfoZo5D3UsxR0Qsfj0FmE6bxcJLYd5ey/RIeMErnl8fKu/0Chj6JOxGc3q/U7dIYsqzdVsJFhyQ==
   dependencies:
     "@budibase/handlebars-helpers" "^0.11.8"
     dayjs "^1.10.4"
@@ -6805,9 +6805,9 @@ uri-js@^4.2.2:
     punycode "^2.1.0"
 
 urijs@^1.19.2:
-  version "1.19.8"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.8.tgz#ee0407a18528934d3c383e691912f47043a58feb"
-  integrity sha512-iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw==
+  version "1.19.11"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
+  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
 
 urix@^0.1.0:
   version "0.1.0"

From 8a0a048fd4ab8cf8219136f35f980cc49010a37e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Apr 2022 09:19:50 +0000
Subject: [PATCH 29/48] v1.0.105-alpha.11

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

diff --git a/lerna.json b/lerna.json
index 157d6fe849..ca4316f8f6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 9cd8c6bdb3..47695c63c3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d037ca9a86..f44afd0365 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.10",
+    "@budibase/string-templates": "^1.0.105-alpha.11",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6dde63596e..0a99b9bdb3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.10",
-    "@budibase/client": "^1.0.105-alpha.10",
-    "@budibase/frontend-core": "^1.0.105-alpha.10",
-    "@budibase/string-templates": "^1.0.105-alpha.10",
+    "@budibase/bbui": "^1.0.105-alpha.11",
+    "@budibase/client": "^1.0.105-alpha.11",
+    "@budibase/frontend-core": "^1.0.105-alpha.11",
+    "@budibase/string-templates": "^1.0.105-alpha.11",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ccfe05f86e..0ea1223803 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 264aa57fe5..1a5648d4c5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.10",
-    "@budibase/frontend-core": "^1.0.105-alpha.10",
-    "@budibase/string-templates": "^1.0.105-alpha.10",
+    "@budibase/bbui": "^1.0.105-alpha.11",
+    "@budibase/frontend-core": "^1.0.105-alpha.11",
+    "@budibase/string-templates": "^1.0.105-alpha.11",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index b37208d97d..e48c82e253 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.10",
+    "@budibase/bbui": "^1.0.105-alpha.11",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 4a97ec6cc8..2d619e9f17 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.10",
-    "@budibase/client": "^1.0.105-alpha.10",
-    "@budibase/string-templates": "^1.0.105-alpha.10",
+    "@budibase/backend-core": "^1.0.105-alpha.11",
+    "@budibase/client": "^1.0.105-alpha.11",
+    "@budibase/string-templates": "^1.0.105-alpha.11",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a0904ac6f5..0269b3908f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 8be2037f72..4d3cf7e657 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.10",
+  "version": "1.0.105-alpha.11",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.10",
-    "@budibase/string-templates": "^1.0.105-alpha.10",
+    "@budibase/backend-core": "^1.0.105-alpha.11",
+    "@budibase/string-templates": "^1.0.105-alpha.11",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From f05844192c1325b4bc7ed90b0f6c02bacf546e7b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 13 Apr 2022 10:27:32 +0100
Subject: [PATCH 30/48] Ensure existing invalid datasource definitions are also
 fixed by checking data source type before fetching table definitions

---
 packages/client/src/components/app/forms/Form.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index 740c5fd9f1..a274fb24f0 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -80,7 +80,7 @@
   }
 
   const fetchTable = async dataSource => {
-    if (dataSource?.tableId) {
+    if (dataSource?.tableId && dataSource?.type !== "query") {
       try {
         table = await API.fetchTableDefinition(dataSource.tableId)
       } catch (error) {

From ad69fa4ba0201b74d3b7a80549b21bd7e7712b22 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Apr 2022 10:40:51 +0000
Subject: [PATCH 31/48] v1.0.105-alpha.12

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

diff --git a/lerna.json b/lerna.json
index ca4316f8f6..af36961f13 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 47695c63c3..e13ca5b6f3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index f44afd0365..d609b81dc1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.11",
+    "@budibase/string-templates": "^1.0.105-alpha.12",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 0a99b9bdb3..b5d58c10c4 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.11",
-    "@budibase/client": "^1.0.105-alpha.11",
-    "@budibase/frontend-core": "^1.0.105-alpha.11",
-    "@budibase/string-templates": "^1.0.105-alpha.11",
+    "@budibase/bbui": "^1.0.105-alpha.12",
+    "@budibase/client": "^1.0.105-alpha.12",
+    "@budibase/frontend-core": "^1.0.105-alpha.12",
+    "@budibase/string-templates": "^1.0.105-alpha.12",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0ea1223803..c5021c0c9a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 1a5648d4c5..94b34f4feb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.11",
-    "@budibase/frontend-core": "^1.0.105-alpha.11",
-    "@budibase/string-templates": "^1.0.105-alpha.11",
+    "@budibase/bbui": "^1.0.105-alpha.12",
+    "@budibase/frontend-core": "^1.0.105-alpha.12",
+    "@budibase/string-templates": "^1.0.105-alpha.12",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index e48c82e253..53d549f7a7 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.11",
+    "@budibase/bbui": "^1.0.105-alpha.12",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 2d619e9f17..18ef182fb0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.11",
-    "@budibase/client": "^1.0.105-alpha.11",
-    "@budibase/string-templates": "^1.0.105-alpha.11",
+    "@budibase/backend-core": "^1.0.105-alpha.12",
+    "@budibase/client": "^1.0.105-alpha.12",
+    "@budibase/string-templates": "^1.0.105-alpha.12",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 0269b3908f..a13d1f80ab 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 4d3cf7e657..a44be23304 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.11",
+  "version": "1.0.105-alpha.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.11",
-    "@budibase/string-templates": "^1.0.105-alpha.11",
+    "@budibase/backend-core": "^1.0.105-alpha.12",
+    "@budibase/string-templates": "^1.0.105-alpha.12",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From dd3f5135fe8029ea5f31b206eca0a0fa96acbaf7 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Apr 2022 11:22:17 +0000
Subject: [PATCH 32/48] v1.0.105-alpha.13

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

diff --git a/lerna.json b/lerna.json
index af36961f13..a075366955 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e13ca5b6f3..3514f8fc87 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index d609b81dc1..181fd769b1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.12",
+    "@budibase/string-templates": "^1.0.105-alpha.13",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index b5d58c10c4..6b0816468d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.12",
-    "@budibase/client": "^1.0.105-alpha.12",
-    "@budibase/frontend-core": "^1.0.105-alpha.12",
-    "@budibase/string-templates": "^1.0.105-alpha.12",
+    "@budibase/bbui": "^1.0.105-alpha.13",
+    "@budibase/client": "^1.0.105-alpha.13",
+    "@budibase/frontend-core": "^1.0.105-alpha.13",
+    "@budibase/string-templates": "^1.0.105-alpha.13",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c5021c0c9a..ec78aa11ca 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 94b34f4feb..c716518c00 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.12",
-    "@budibase/frontend-core": "^1.0.105-alpha.12",
-    "@budibase/string-templates": "^1.0.105-alpha.12",
+    "@budibase/bbui": "^1.0.105-alpha.13",
+    "@budibase/frontend-core": "^1.0.105-alpha.13",
+    "@budibase/string-templates": "^1.0.105-alpha.13",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 53d549f7a7..f490efeda3 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.12",
+    "@budibase/bbui": "^1.0.105-alpha.13",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 2a2328cebe..80585d3048 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.12",
-    "@budibase/client": "^1.0.105-alpha.12",
-    "@budibase/string-templates": "^1.0.105-alpha.12",
+    "@budibase/backend-core": "^1.0.105-alpha.13",
+    "@budibase/client": "^1.0.105-alpha.13",
+    "@budibase/string-templates": "^1.0.105-alpha.13",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index a13d1f80ab..356ca1b25b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a44be23304..80b8173943 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.12",
+  "version": "1.0.105-alpha.13",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.12",
-    "@budibase/string-templates": "^1.0.105-alpha.12",
+    "@budibase/backend-core": "^1.0.105-alpha.13",
+    "@budibase/string-templates": "^1.0.105-alpha.13",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 2694b32ac5afdd3131cf6c01a828f15402f10dd9 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 13 Apr 2022 13:27:17 +0100
Subject: [PATCH 33/48] Change to startsWith JS. Remove index decrement.

---
 .../automation/SetupPanel/AutomationBlockSetup.svelte       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index a31e30487e..53acb59cd9 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -104,9 +104,9 @@
       )
       bindings = bindings.concat(
         outputs.map(([name, value]) => {
-          const stepsLabel = block.name.toLowerCase().includes("bash")
-            ? `steps.${idx}.${name}`
-            : `steps[${idx - 1}].${name}`
+          const stepsLabel = block.name.startsWith("JS")
+            ? `steps[${idx}].${name}`
+            : `steps.${idx}.${name}`
           const runtime = idx === 0 ? `trigger.${name}` : stepsLabel
           return {
             label: runtime,

From b5d528ef0101c36c0a3f2aa963122e590792686f Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 13 Apr 2022 13:20:56 +0000
Subject: [PATCH 34/48] v1.0.105-alpha.14

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

diff --git a/lerna.json b/lerna.json
index a075366955..fa774cac64 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 3514f8fc87..e7f876a432 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 181fd769b1..6b16d30d9f 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.13",
+    "@budibase/string-templates": "^1.0.105-alpha.14",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6b0816468d..f5baa9693c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.13",
-    "@budibase/client": "^1.0.105-alpha.13",
-    "@budibase/frontend-core": "^1.0.105-alpha.13",
-    "@budibase/string-templates": "^1.0.105-alpha.13",
+    "@budibase/bbui": "^1.0.105-alpha.14",
+    "@budibase/client": "^1.0.105-alpha.14",
+    "@budibase/frontend-core": "^1.0.105-alpha.14",
+    "@budibase/string-templates": "^1.0.105-alpha.14",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ec78aa11ca..d21e553f95 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index c716518c00..26646765be 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.13",
-    "@budibase/frontend-core": "^1.0.105-alpha.13",
-    "@budibase/string-templates": "^1.0.105-alpha.13",
+    "@budibase/bbui": "^1.0.105-alpha.14",
+    "@budibase/frontend-core": "^1.0.105-alpha.14",
+    "@budibase/string-templates": "^1.0.105-alpha.14",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index f490efeda3..a13ad00bf2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.13",
+    "@budibase/bbui": "^1.0.105-alpha.14",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 80585d3048..6899d7e8b8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.13",
-    "@budibase/client": "^1.0.105-alpha.13",
-    "@budibase/string-templates": "^1.0.105-alpha.13",
+    "@budibase/backend-core": "^1.0.105-alpha.14",
+    "@budibase/client": "^1.0.105-alpha.14",
+    "@budibase/string-templates": "^1.0.105-alpha.14",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 356ca1b25b..ffacb50ba6 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 80b8173943..18cfe06cd5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.13",
+  "version": "1.0.105-alpha.14",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.13",
-    "@budibase/string-templates": "^1.0.105-alpha.13",
+    "@budibase/backend-core": "^1.0.105-alpha.14",
+    "@budibase/string-templates": "^1.0.105-alpha.14",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 9b12a9deea698a71248907d68fbe68305677645d Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 13 Apr 2022 14:33:37 +0100
Subject: [PATCH 35/48] Updated MySQL Tests

It may still fail as part of the smoke build due to connection issues - for now, direct test issues are resolved
---
 .../builder/cypress/integration/datasources/mySql.spec.js     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js
index 03f59a6004..01c39c742a 100644
--- a/packages/builder/cypress/integration/datasources/mySql.spec.js
+++ b/packages/builder/cypress/integration/datasources/mySql.spec.js
@@ -19,6 +19,7 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Button")
           .contains("Save and fetch tables")
           .click({ force: true })
+          cy.wait(500)
         // Intercept Request after button click & apply assertions
         cy.wait("@datasource")
         cy.get("@datasource")
@@ -31,6 +32,7 @@ filterTests(["all"], () => {
         cy.get("@datasource")
           .its("response.body")
           .should("have.property", "status", 500)
+        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
       })
 
       it("should add MySQL data source and fetch tables", () => {
@@ -131,7 +133,7 @@ filterTests(["all"], () => {
               cy.get(".spectrum-Table")
                 .eq(1)
                 .within(() => {
-                  cy.get(".spectrum-Table-row").eq(0).click()
+                  cy.get(".spectrum-Table-row").eq(0).click({ force: true })
                   cy.wait(500)
                 })
               cy.get(".spectrum-Dialog-grid").within(() => {

From adfb8d7c56d27d26e219a8e6e46575464af0a95a Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 13 Apr 2022 15:53:26 +0100
Subject: [PATCH 36/48] Only apply to small components (button, headline)

---
 packages/client/src/components/preview/SettingsBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 05df1ef898..06ff159fcf 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -67,7 +67,7 @@
       }
 
       //If element is at the very top of the screen, put the bar below the element
-      if (elBounds.top < elBounds.height) {
+      if (elBounds.top < elBounds.height && elBounds.height < 80) {
         newTop = elBounds.bottom + verticalOffset
       }
 

From eb31242b206311622b81c0cef0a34c8842480e95 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 13 Apr 2022 15:54:40 +0100
Subject: [PATCH 37/48] Updated PostgreSQL & Oracle Tests

PostgreSQL
- Test fixes (May still fail due to connection issues on smoke build)

Oracle
- Test fixes
- Skipping most tests (Oracle host needs configured)

commands.spec.js
- minor change to addDatasourceConfig function
---
 .../integration/datasources/oracle.spec.js      | 17 +++++++++--------
 .../integration/datasources/postgreSql.spec.js  | 14 ++++++++------
 packages/builder/cypress/support/commands.js    |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/builder/cypress/integration/datasources/oracle.spec.js b/packages/builder/cypress/integration/datasources/oracle.spec.js
index 73c25001c9..4c4d33d654 100644
--- a/packages/builder/cypress/integration/datasources/oracle.spec.js
+++ b/packages/builder/cypress/integration/datasources/oracle.spec.js
@@ -46,9 +46,10 @@ filterTests(["all"], () => {
         cy.get("@datasource")
           .its("response.body")
           .should("have.property", "status", 500)
+        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
       })
 
-      it("should add Oracle data source and fetch tables", () => {
+      xit("should add Oracle data source and fetch tables", () => {
         // Add & configure Oracle data source
         cy.selectExternalDatasource(datasource)
         cy.intercept("**/datasources").as("datasource")
@@ -64,7 +65,7 @@ filterTests(["all"], () => {
           .should("be.gt", 0)
       })
 
-      it("should define a One relationship type", () => {
+      xit("should define a One relationship type", () => {
         // Select relationship type & configure
         cy.get(".spectrum-Button")
           .contains("Define relationship")
@@ -93,7 +94,7 @@ filterTests(["all"], () => {
         cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS")
       })
 
-      it("should define a Many relationship type", () => {
+      xit("should define a Many relationship type", () => {
         // Select relationship type & configure
         cy.get(".spectrum-Button")
           .contains("Define relationship")
@@ -127,7 +128,7 @@ filterTests(["all"], () => {
         )
       })
 
-      it("should delete relationships", () => {
+      xit("should delete relationships", () => {
         // Delete both relationships
         cy.get(".spectrum-Table")
           .eq(1)
@@ -156,7 +157,7 @@ filterTests(["all"], () => {
           })
       })
 
-      it("should add a query", () => {
+      xit("should add a query", () => {
         // Add query
         cy.get(".spectrum-Button").contains("Add query").click({ force: true })
         cy.get(".spectrum-Form-item")
@@ -181,7 +182,7 @@ filterTests(["all"], () => {
         cy.get(".nav-item").should("contain", queryName)
       })
 
-      it("should duplicate a query", () => {
+      xit("should duplicate a query", () => {
         // Get query nav item
         cy.get(".nav-item")
           .contains(queryName)
@@ -194,7 +195,7 @@ filterTests(["all"], () => {
         cy.get(".nav-item").should("contain", queryName + " (1)")
       })
 
-      it("should edit a query name", () => {
+      xit("should edit a query name", () => {
         // Rename query
         cy.get(".spectrum-Form-item")
           .eq(0)
@@ -206,7 +207,7 @@ filterTests(["all"], () => {
         cy.get(".nav-item").should("contain", queryRename)
       })
 
-      it("should delete a query", () => {
+      xit("should delete a query", () => {
         // Get query nav item - QueryName
         cy.get(".nav-item")
           .contains(queryName)
diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
index 3f55636623..d6ea2ff4c8 100644
--- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js
+++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
@@ -31,6 +31,7 @@ filterTests(["all"], () => {
         cy.get("@datasource")
           .its("response.body")
           .should("have.property", "status", 500)
+        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
       })
 
       it("should add PostgreSQL data source and fetch tables", () => {
@@ -113,13 +114,13 @@ filterTests(["all"], () => {
       })
 
       it("should delete a relationship", () => {
-        cy.get(".hierarchy-items-container").contains(datasource).click()
+        cy.get(".hierarchy-items-container").contains("PostgreSQL-2").click()
         cy.reload()
         // Delete one relationship
         cy.get(".spectrum-Table")
           .eq(1)
           .within(() => {
-            cy.get(".spectrum-Table-row").eq(0).click()
+            cy.get(".spectrum-Table-row").eq(0).click({ force: true })
             cy.wait(500)
           })
         cy.get(".spectrum-Dialog-grid").within(() => {
@@ -161,7 +162,7 @@ filterTests(["all"], () => {
 
       it("should switch to schema with no tables", () => {
         // Switch Schema - To one without any tables
-        cy.get(".hierarchy-items-container").contains(datasource).click()
+        cy.get(".hierarchy-items-container").contains("PostgreSQL-2").click()
         switchSchema("randomText")
 
         // No tables displayed
@@ -208,11 +209,12 @@ filterTests(["all"], () => {
       })
 
       it("should duplicate a query", () => {
-        // Get last nav item - The query
+        // Locate previously created query
         cy.get(".nav-item")
-          .last()
+          .contains(queryName)
+          .siblings(".actions")
           .within(() => {
-            cy.get(".icon").eq(1).click({ force: true })
+            cy.get(".icon").click({ force: true })
           })
         // Select and confirm duplication
         cy.get(".spectrum-Menu").contains("Duplicate").click()
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index f79e96d6d5..641b47cf9c 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -415,7 +415,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
           if (datasource == "Oracle") {
             cy.get("input").clear().type(Cypress.env("oracle").HOST)
           } else {
-            cy.get("input").clear().type(Cypress.env("HOST_IP"))
+            cy.get("input").clear({ force: true }).type(Cypress.env("HOST_IP"), { force: true })
           }
         })
       })

From 9ba48660d21e985bbde123d74f861676f95587f2 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Wed, 13 Apr 2022 16:02:57 +0100
Subject: [PATCH 38/48] lint

---
 packages/builder/cypress/support/commands.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 641b47cf9c..c400384186 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -415,7 +415,9 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
           if (datasource == "Oracle") {
             cy.get("input").clear().type(Cypress.env("oracle").HOST)
           } else {
-            cy.get("input").clear({ force: true }).type(Cypress.env("HOST_IP"), { force: true })
+            cy.get("input")
+              .clear({ force: true })
+              .type(Cypress.env("HOST_IP"), { force: true })
           }
         })
       })

From b05e1a14095e1e709a2d73209bc2856b50f22b93 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 14 Apr 2022 07:49:18 +0000
Subject: [PATCH 39/48] v1.0.105-alpha.15

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

diff --git a/lerna.json b/lerna.json
index fa774cac64..0bea545278 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index e7f876a432..a9d5229366 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 6b16d30d9f..052baec867 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.14",
+    "@budibase/string-templates": "^1.0.105-alpha.15",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f5baa9693c..076a39e751 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.14",
-    "@budibase/client": "^1.0.105-alpha.14",
-    "@budibase/frontend-core": "^1.0.105-alpha.14",
-    "@budibase/string-templates": "^1.0.105-alpha.14",
+    "@budibase/bbui": "^1.0.105-alpha.15",
+    "@budibase/client": "^1.0.105-alpha.15",
+    "@budibase/frontend-core": "^1.0.105-alpha.15",
+    "@budibase/string-templates": "^1.0.105-alpha.15",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d21e553f95..de412923f4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 26646765be..40d116abd6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.14",
-    "@budibase/frontend-core": "^1.0.105-alpha.14",
-    "@budibase/string-templates": "^1.0.105-alpha.14",
+    "@budibase/bbui": "^1.0.105-alpha.15",
+    "@budibase/frontend-core": "^1.0.105-alpha.15",
+    "@budibase/string-templates": "^1.0.105-alpha.15",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index a13ad00bf2..d6ef2879d2 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.14",
+    "@budibase/bbui": "^1.0.105-alpha.15",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 6899d7e8b8..c3b7a36ddb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.14",
-    "@budibase/client": "^1.0.105-alpha.14",
-    "@budibase/string-templates": "^1.0.105-alpha.14",
+    "@budibase/backend-core": "^1.0.105-alpha.15",
+    "@budibase/client": "^1.0.105-alpha.15",
+    "@budibase/string-templates": "^1.0.105-alpha.15",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index ffacb50ba6..115ebe65eb 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 18cfe06cd5..b982d777f3 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.14",
+  "version": "1.0.105-alpha.15",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.14",
-    "@budibase/string-templates": "^1.0.105-alpha.14",
+    "@budibase/backend-core": "^1.0.105-alpha.15",
+    "@budibase/string-templates": "^1.0.105-alpha.15",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 17aba96dfa6e5a7a5cc5eb0fd0af4c2d71ecf1d5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 14 Apr 2022 10:12:49 +0100
Subject: [PATCH 40/48] Fix typo

---
 packages/client/src/components/ClientApp.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 6525401c9c..6bd0313c75 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -69,7 +69,7 @@
             firstRoute = roleRoutes[0]?.routing?.route || "/"
           }
 
-          // Otherwise just use the fist route
+          // Otherwise just use the first route
           else {
             firstRoute = $screenStore.screens[0]?.routing?.route ?? "/"
           }

From 65fd6f587c42526046acf87bf8ce39a75bdacfa0 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 14 Apr 2022 09:14:11 +0000
Subject: [PATCH 41/48] v1.0.105-alpha.16

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

diff --git a/lerna.json b/lerna.json
index 0bea545278..29895bc78b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index a9d5229366..1ecc66172b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 052baec867..07647d7824 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.15",
+    "@budibase/string-templates": "^1.0.105-alpha.16",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 076a39e751..81611905d0 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.15",
-    "@budibase/client": "^1.0.105-alpha.15",
-    "@budibase/frontend-core": "^1.0.105-alpha.15",
-    "@budibase/string-templates": "^1.0.105-alpha.15",
+    "@budibase/bbui": "^1.0.105-alpha.16",
+    "@budibase/client": "^1.0.105-alpha.16",
+    "@budibase/frontend-core": "^1.0.105-alpha.16",
+    "@budibase/string-templates": "^1.0.105-alpha.16",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index de412923f4..015b21d567 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 40d116abd6..a8928733bd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.15",
-    "@budibase/frontend-core": "^1.0.105-alpha.15",
-    "@budibase/string-templates": "^1.0.105-alpha.15",
+    "@budibase/bbui": "^1.0.105-alpha.16",
+    "@budibase/frontend-core": "^1.0.105-alpha.16",
+    "@budibase/string-templates": "^1.0.105-alpha.16",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index d6ef2879d2..09bbc193db 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.15",
+    "@budibase/bbui": "^1.0.105-alpha.16",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index c3b7a36ddb..def84e53ec 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.15",
-    "@budibase/client": "^1.0.105-alpha.15",
-    "@budibase/string-templates": "^1.0.105-alpha.15",
+    "@budibase/backend-core": "^1.0.105-alpha.16",
+    "@budibase/client": "^1.0.105-alpha.16",
+    "@budibase/string-templates": "^1.0.105-alpha.16",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 115ebe65eb..c10d73faac 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b982d777f3..055f9e7ebd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.15",
+  "version": "1.0.105-alpha.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.15",
-    "@budibase/string-templates": "^1.0.105-alpha.15",
+    "@budibase/backend-core": "^1.0.105-alpha.16",
+    "@budibase/string-templates": "^1.0.105-alpha.16",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 7facd16e92e7899c657e8defb3a2857cbf322a16 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 14 Apr 2022 12:05:50 +0000
Subject: [PATCH 42/48] v1.0.105-alpha.17

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

diff --git a/lerna.json b/lerna.json
index 29895bc78b..611c76fbb5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 1ecc66172b..acd895961f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 07647d7824..db7f451aec 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.16",
+    "@budibase/string-templates": "^1.0.105-alpha.17",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 81611905d0..e08b20a4ef 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.16",
-    "@budibase/client": "^1.0.105-alpha.16",
-    "@budibase/frontend-core": "^1.0.105-alpha.16",
-    "@budibase/string-templates": "^1.0.105-alpha.16",
+    "@budibase/bbui": "^1.0.105-alpha.17",
+    "@budibase/client": "^1.0.105-alpha.17",
+    "@budibase/frontend-core": "^1.0.105-alpha.17",
+    "@budibase/string-templates": "^1.0.105-alpha.17",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 015b21d567..1b8b598e85 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index a8928733bd..b5fdcc9c51 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.16",
-    "@budibase/frontend-core": "^1.0.105-alpha.16",
-    "@budibase/string-templates": "^1.0.105-alpha.16",
+    "@budibase/bbui": "^1.0.105-alpha.17",
+    "@budibase/frontend-core": "^1.0.105-alpha.17",
+    "@budibase/string-templates": "^1.0.105-alpha.17",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 09bbc193db..f858da7473 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.16",
+    "@budibase/bbui": "^1.0.105-alpha.17",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index def84e53ec..7c1ee5fe5f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.16",
-    "@budibase/client": "^1.0.105-alpha.16",
-    "@budibase/string-templates": "^1.0.105-alpha.16",
+    "@budibase/backend-core": "^1.0.105-alpha.17",
+    "@budibase/client": "^1.0.105-alpha.17",
+    "@budibase/string-templates": "^1.0.105-alpha.17",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index c10d73faac..67ee127549 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 055f9e7ebd..b0acff58bf 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.16",
+  "version": "1.0.105-alpha.17",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.16",
-    "@budibase/string-templates": "^1.0.105-alpha.16",
+    "@budibase/backend-core": "^1.0.105-alpha.17",
+    "@budibase/string-templates": "^1.0.105-alpha.17",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 51686761652519977d4db080ac757b96e9ed65ea Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 14 Apr 2022 17:15:34 +0100
Subject: [PATCH 43/48] Smoke Build Changes

Datasource (MySQL, PostgreSQL)
- Test should now pass for smoke build

Table Tests
- Removed pagination tests - no pagination in the smoke build test run
---
 .../cypress/integration/createTable.spec.js   |  4 +-
 .../integration/datasources/mySql.spec.js     | 37 ++++++++++---------
 .../datasources/postgreSql.spec.js            | 35 +++++++-----------
 packages/builder/cypress/support/commands.js  |  2 +-
 4 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index 9f2bc3653f..4600807cbc 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -55,7 +55,7 @@ filterTests(["smoke", "all"], () => {
 
     if (Cypress.env("TEST_ENV")) {
       // No Pagination in CI - Test env only for the next two tests
-      it("Adds 15 rows and checks pagination", () => {
+      xit("Adds 15 rows and checks pagination", () => {
         // 10 rows per page, 15 rows should create 2 pages within table
         const totalRows = 16
         for (let i = 1; i < totalRows; i++) {
@@ -71,7 +71,7 @@ filterTests(["smoke", "all"], () => {
         })
       })
 
-      it("Deletes rows and checks pagination", () => {
+      xit("Deletes rows and checks pagination", () => {
         // Delete rows, removing second page from table
         cy.get(".spectrum-Checkbox-input").check({ force: true })
         cy.get(".popovers").within(() => {
diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js
index 01c39c742a..ddb9ecb939 100644
--- a/packages/builder/cypress/integration/datasources/mySql.spec.js
+++ b/packages/builder/cypress/integration/datasources/mySql.spec.js
@@ -74,10 +74,13 @@ filterTests(["all"], () => {
           cy.get(".spectrum-Popover").contains("COUNTRIES").click()
           cy.get(".spectrum-Picker").eq(4).click()
           cy.get(".spectrum-Popover").contains("REGION_ID").click()
-          // Save relationship & reload page
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.reload()
         })
+        // Save relationship & reload page
+        cy.get(".spectrum-ButtonGroup").within(() => {
+          cy.get(".spectrum-Button").contains("Save").click({ force: true })
+        })
+        cy.reload()
+
         // Confirm table length & column name
         cy.get(".spectrum-Table")
           .eq(1)
@@ -201,23 +204,21 @@ filterTests(["all"], () => {
       })
 
       it("should delete a query", () => {
-        // Get last nav item - The query
-        for (let i = 0; i < 2; i++) {
-          cy.get(".nav-item")
-            .last()
-            .within(() => {
-              cy.get(".icon").eq(1).click({ force: true })
-            })
-          // Select Delete
-          cy.get(".spectrum-Menu").contains("Delete").click()
-          cy.get(".spectrum-Button")
-            .contains("Delete Query")
-            .click({ force: true })
-          cy.wait(1000)
-        }
+        // Get query nav item - QueryName
+        cy.get(".nav-item")
+          .contains(queryName)
+          .parent()
+          .within(() => {
+            cy.get(".spectrum-Icon").eq(1).click({ force: true })
+        })
+        // Select Delete
+        cy.get(".spectrum-Menu").contains("Delete").click()
+        cy.get(".spectrum-Button")
+          .contains("Delete Query")
+          .click({ force: true })
+        cy.wait(1000)
         // Confirm deletion
         cy.get(".nav-item").should("not.contain", queryName)
-        cy.get(".nav-item").should("not.contain", queryRename)
       })
     }
   })
diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
index d6ea2ff4c8..c7413bb7d1 100644
--- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js
+++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js
@@ -21,13 +21,6 @@ filterTests(["all"], () => {
           .click({ force: true })
         // Intercept Request after button click & apply assertions
         cy.wait("@datasource")
-        cy.get("@datasource")
-          .its("response.body")
-          .should(
-            "have.property",
-            "message",
-            "connect ECONNREFUSED 127.0.0.1:5432"
-          )
         cy.get("@datasource")
           .its("response.body")
           .should("have.property", "status", 500)
@@ -242,23 +235,21 @@ filterTests(["all"], () => {
       })
 
       it("should delete a query", () => {
-        // Get last nav item - The query
-        for (let i = 0; i < 2; i++) {
-          cy.get(".nav-item")
-            .last()
-            .within(() => {
-              cy.get(".icon").eq(1).click({ force: true })
-            })
-          // Select Delete
-          cy.get(".spectrum-Menu").contains("Delete").click()
-          cy.get(".spectrum-Button")
-            .contains("Delete Query")
-            .click({ force: true })
-          cy.wait(1000)
-        }
+        // Get query nav item - QueryName
+        cy.get(".nav-item")
+          .contains(queryName)
+          .parent()
+          .within(() => {
+            cy.get(".spectrum-Icon").eq(1).click({ force: true })
+        })
+        // Select Delete
+        cy.get(".spectrum-Menu").contains("Delete").click()
+        cy.get(".spectrum-Button")
+          .contains("Delete Query")
+          .click({ force: true })
+        cy.wait(1000)
         // Confirm deletion
         cy.get(".nav-item").should("not.contain", queryName)
-        cy.get(".nav-item").should("not.contain", queryRename)
       })
 
       const switchSchema = schema => {
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index c400384186..672e9dfc00 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -417,7 +417,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
           } else {
             cy.get("input")
               .clear({ force: true })
-              .type(Cypress.env("HOST_IP"), { force: true })
+              .type(Cypress.env("mysql").HOST, { force: true })
           }
         })
       })

From b25296efad796e1f1c4c0359a57c3ed6c6bb6288 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 14 Apr 2022 16:55:46 +0000
Subject: [PATCH 44/48] v1.0.105-alpha.18

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

diff --git a/lerna.json b/lerna.json
index 611c76fbb5..8eb2dd43ee 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index acd895961f..21b068dea5 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index db7f451aec..a726b84e01 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.17",
+    "@budibase/string-templates": "^1.0.105-alpha.18",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e08b20a4ef..7ecf08cfdf 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.17",
-    "@budibase/client": "^1.0.105-alpha.17",
-    "@budibase/frontend-core": "^1.0.105-alpha.17",
-    "@budibase/string-templates": "^1.0.105-alpha.17",
+    "@budibase/bbui": "^1.0.105-alpha.18",
+    "@budibase/client": "^1.0.105-alpha.18",
+    "@budibase/frontend-core": "^1.0.105-alpha.18",
+    "@budibase/string-templates": "^1.0.105-alpha.18",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1b8b598e85..87262c61d2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index b5fdcc9c51..566183d5f7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.17",
-    "@budibase/frontend-core": "^1.0.105-alpha.17",
-    "@budibase/string-templates": "^1.0.105-alpha.17",
+    "@budibase/bbui": "^1.0.105-alpha.18",
+    "@budibase/frontend-core": "^1.0.105-alpha.18",
+    "@budibase/string-templates": "^1.0.105-alpha.18",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index f858da7473..9f69d04cd5 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.17",
+    "@budibase/bbui": "^1.0.105-alpha.18",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7c1ee5fe5f..7281f29738 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.17",
-    "@budibase/client": "^1.0.105-alpha.17",
-    "@budibase/string-templates": "^1.0.105-alpha.17",
+    "@budibase/backend-core": "^1.0.105-alpha.18",
+    "@budibase/client": "^1.0.105-alpha.18",
+    "@budibase/string-templates": "^1.0.105-alpha.18",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 67ee127549..77cd65d254 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index b0acff58bf..30c176b055 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.17",
+  "version": "1.0.105-alpha.18",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.17",
-    "@budibase/string-templates": "^1.0.105-alpha.17",
+    "@budibase/backend-core": "^1.0.105-alpha.18",
+    "@budibase/string-templates": "^1.0.105-alpha.18",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From e4707a2e536471c3e871ede1b638010e09f770aa Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Thu, 14 Apr 2022 20:20:09 +0100
Subject: [PATCH 45/48] Updated MySQL Duplicate Query test

Fixing the navigation used when selecting queries
---
 .../builder/cypress/integration/datasources/mySql.spec.js  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js
index ddb9ecb939..98bb2f2acf 100644
--- a/packages/builder/cypress/integration/datasources/mySql.spec.js
+++ b/packages/builder/cypress/integration/datasources/mySql.spec.js
@@ -180,11 +180,12 @@ filterTests(["all"], () => {
       })
 
       it("should duplicate a query", () => {
-        // Get last nav item - The query
+        /// Get query nav item - QueryName
         cy.get(".nav-item")
-          .last()
+          .contains(queryName)
+          .parent()
           .within(() => {
-            cy.get(".icon").eq(1).click({ force: true })
+            cy.get(".spectrum-Icon").eq(1).click({ force: true })
           })
         // Select and confirm duplication
         cy.get(".spectrum-Menu").contains("Duplicate").click()

From 31d2ae8c6b4628b020dc01f01acfc0b09a401456 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 14 Apr 2022 19:50:11 +0000
Subject: [PATCH 46/48] v1.0.105-alpha.19

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

diff --git a/lerna.json b/lerna.json
index 8eb2dd43ee..98344fdf45 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 21b068dea5..bd0c649372 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index a726b84e01..b986f17f0b 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.18",
+    "@budibase/string-templates": "^1.0.105-alpha.19",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7ecf08cfdf..948b0150d3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.18",
-    "@budibase/client": "^1.0.105-alpha.18",
-    "@budibase/frontend-core": "^1.0.105-alpha.18",
-    "@budibase/string-templates": "^1.0.105-alpha.18",
+    "@budibase/bbui": "^1.0.105-alpha.19",
+    "@budibase/client": "^1.0.105-alpha.19",
+    "@budibase/frontend-core": "^1.0.105-alpha.19",
+    "@budibase/string-templates": "^1.0.105-alpha.19",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 87262c61d2..1e7748d5de 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 566183d5f7..6ab63ca483 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.18",
-    "@budibase/frontend-core": "^1.0.105-alpha.18",
-    "@budibase/string-templates": "^1.0.105-alpha.18",
+    "@budibase/bbui": "^1.0.105-alpha.19",
+    "@budibase/frontend-core": "^1.0.105-alpha.19",
+    "@budibase/string-templates": "^1.0.105-alpha.19",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 9f69d04cd5..c43681a1a5 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.18",
+    "@budibase/bbui": "^1.0.105-alpha.19",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7281f29738..b16c0e6650 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.18",
-    "@budibase/client": "^1.0.105-alpha.18",
-    "@budibase/string-templates": "^1.0.105-alpha.18",
+    "@budibase/backend-core": "^1.0.105-alpha.19",
+    "@budibase/client": "^1.0.105-alpha.19",
+    "@budibase/string-templates": "^1.0.105-alpha.19",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 77cd65d254..f2b8a35794 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 30c176b055..1812dcf0ad 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.18",
+  "version": "1.0.105-alpha.19",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.18",
-    "@budibase/string-templates": "^1.0.105-alpha.18",
+    "@budibase/backend-core": "^1.0.105-alpha.19",
+    "@budibase/string-templates": "^1.0.105-alpha.19",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 01fb3b78053374f38feb4483feddedb248cfaccd Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 19 Apr 2022 08:48:31 +0100
Subject: [PATCH 47/48] Collect hosting information in bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d1ba2bc046..b4f7739293 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,15 @@ assignees: ''
 
 ---
 
+**Hosting**
+<!-- Delete as appropriate -->
+- Self
+  - Method: <method> <!-- One of: k8s, docker single image, docker compose, digital ocean: -->
+  - Budibase Version: <version> <!-- e.g. 1.0.105 -->
+  - App Version: <version> <!-- Indicate app version if bug is related to an application -->
+- Cloud
+  - Tenant ID: <tenantId> <!-- shown in URL as <tenantID>.budibase.app -->
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 

From 1056081980fa4dee4ba2f52d3dbb1761bbd35134 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Tue, 19 Apr 2022 08:48:18 +0000
Subject: [PATCH 48/48] v1.0.105-alpha.20

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

diff --git a/lerna.json b/lerna.json
index 98344fdf45..c2e996729b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index bd0c649372..15b5a9c6ad 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index b986f17f0b..e13d88212d 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.105-alpha.19",
+    "@budibase/string-templates": "^1.0.105-alpha.20",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 948b0150d3..bc1c02994d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.19",
-    "@budibase/client": "^1.0.105-alpha.19",
-    "@budibase/frontend-core": "^1.0.105-alpha.19",
-    "@budibase/string-templates": "^1.0.105-alpha.19",
+    "@budibase/bbui": "^1.0.105-alpha.20",
+    "@budibase/client": "^1.0.105-alpha.20",
+    "@budibase/frontend-core": "^1.0.105-alpha.20",
+    "@budibase/string-templates": "^1.0.105-alpha.20",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1e7748d5de..57cf5bcaf5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 6ab63ca483..f4e2a78164 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.19",
-    "@budibase/frontend-core": "^1.0.105-alpha.19",
-    "@budibase/string-templates": "^1.0.105-alpha.19",
+    "@budibase/bbui": "^1.0.105-alpha.20",
+    "@budibase/frontend-core": "^1.0.105-alpha.20",
+    "@budibase/string-templates": "^1.0.105-alpha.20",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index c43681a1a5..f6fcf1696f 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.19",
+    "@budibase/bbui": "^1.0.105-alpha.20",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/server/package.json b/packages/server/package.json
index b16c0e6650..86168a32a6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.19",
-    "@budibase/client": "^1.0.105-alpha.19",
-    "@budibase/string-templates": "^1.0.105-alpha.19",
+    "@budibase/backend-core": "^1.0.105-alpha.20",
+    "@budibase/client": "^1.0.105-alpha.20",
+    "@budibase/string-templates": "^1.0.105-alpha.20",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index f2b8a35794..6b36dc72c4 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 1812dcf0ad..b82f0d626c 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.19",
+  "version": "1.0.105-alpha.20",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.19",
-    "@budibase/string-templates": "^1.0.105-alpha.19",
+    "@budibase/backend-core": "^1.0.105-alpha.20",
+    "@budibase/string-templates": "^1.0.105-alpha.20",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",