From c91439ac4328d546f2b978763747f2eda8e814ba Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Jan 2022 13:19:41 +0000
Subject: [PATCH 01/21] Derive safe array-like value as the default value for
 multi-select fields

---
 .../components/app/forms/MultiFieldSelect.svelte    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/MultiFieldSelect.svelte b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
index cecc569b6f..d09a8730ae 100644
--- a/packages/client/src/components/app/forms/MultiFieldSelect.svelte
+++ b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
@@ -19,6 +19,7 @@
   let fieldApi
   let fieldSchema
 
+  $: safeDefaultValue = getSafeDefaultValue(defaultValue)
   $: flatOptions = optionsSource == null || optionsSource === "schema"
   $: options = getOptions(
     optionsSource,
@@ -28,6 +29,16 @@
     valueColumn,
     customOptions
   )
+
+  const getSafeDefaultValue = value => {
+    if (value == null || value === "") {
+      return []
+    }
+    if (!Array.isArray(value)) {
+      return [value]
+    }
+    return value
+  }
 </script>
 
 <Field
@@ -35,7 +46,7 @@
   {label}
   {disabled}
   {validation}
-  {defaultValue}
+  defaultValue={safeDefaultValue}
   type="array"
   bind:fieldState
   bind:fieldApi

From c8121ed0e362f960ab903be8e30f4bfeb38955d2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Jan 2022 13:20:06 +0000
Subject: [PATCH 02/21] Transform the output of JS expressions to be actual
 types rather than strings

---
 .../src/helpers/javascript.js                 |  6 ++-
 .../src/processors/postprocessor.js           |  5 ++
 .../string-templates/test/javascript.spec.js  | 48 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/packages/string-templates/src/helpers/javascript.js b/packages/string-templates/src/helpers/javascript.js
index 9231283e89..0173be0b54 100644
--- a/packages/string-templates/src/helpers/javascript.js
+++ b/packages/string-templates/src/helpers/javascript.js
@@ -1,5 +1,6 @@
 const { atob } = require("../utilities")
 const { cloneDeep } = require("lodash/fp")
+const { LITERAL_MARKER } = require("../helpers/constants")
 
 // The method of executing JS scripts depends on the bundle being built.
 // This setter is used in the entrypoint (either index.cjs or index.mjs).
@@ -46,8 +47,9 @@ module.exports.processJS = (handlebars, context) => {
       $: path => getContextValue(path, cloneDeep(context)),
     }
 
-    // Create a sandbox with out context and run the JS
-    return runJS(js, sandboxContext)
+    // Create a sandbox with our context and run the JS
+    const res = { data: runJS(js, sandboxContext) }
+    return `{{${LITERAL_MARKER} js_result-${JSON.stringify(res)}}}`
   } catch (error) {
     return "Error while executing JS"
   }
diff --git a/packages/string-templates/src/processors/postprocessor.js b/packages/string-templates/src/processors/postprocessor.js
index 4d1c84013a..7fc3f663fe 100644
--- a/packages/string-templates/src/processors/postprocessor.js
+++ b/packages/string-templates/src/processors/postprocessor.js
@@ -36,6 +36,11 @@ module.exports.processors = [
         return value === "true"
       case "object":
         return JSON.parse(value)
+      case "js_result":
+        // We use the literal helper to process the result of JS expressions
+        // as we want to be able to return any types.
+        // We wrap the value in an abject to be able to use undefined properly.
+        return JSON.parse(value).data
     }
     return value
   }),
diff --git a/packages/string-templates/test/javascript.spec.js b/packages/string-templates/test/javascript.spec.js
index 05cc80331a..5363f37e02 100644
--- a/packages/string-templates/test/javascript.spec.js
+++ b/packages/string-templates/test/javascript.spec.js
@@ -7,7 +7,7 @@ const processJS = (js, context) => {
 describe("Test the JavaScript helper", () => {
   it("should execute a simple expression", () => {
     const output = processJS(`return 1 + 2`)
-    expect(output).toBe("3")
+    expect(output).toBe(3)
   })
 
   it("should be able to use primitive bindings", () => {
@@ -50,6 +50,52 @@ describe("Test the JavaScript helper", () => {
     expect(output).toBe("shazbat")
   })
 
+  it("should be able to return an object", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: {
+        bar: {
+          baz: "shazbat",
+        },
+      },
+    })
+    expect(output.bar.baz).toBe("shazbat")
+  })
+
+  it("should be able to return an array", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: ["a", "b", "c"],
+    })
+    expect(output[2]).toBe("c")
+  })
+
+  it("should be able to return null", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: null,
+    })
+    expect(output).toBe(null)
+  })
+
+  it("should be able to return undefined", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: undefined,
+    })
+    expect(output).toBe(undefined)
+  })
+
+  it("should be able to return 0", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: 0,
+    })
+    expect(output).toBe(0)
+  })
+
+  it("should be able to return an empty string", () => {
+    const output = processJS(`return $("foo")`, {
+      foo: "",
+    })
+    expect(output).toBe("")
+  })
+
   it("should be able to use a deep array binding", () => {
     const output = processJS(`return $("foo.0.bar")`, {
       foo: [

From c3450a3e1e4fa31d1c35a83ebdc7620dd225d895 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Jan 2022 13:20:28 +0000
Subject: [PATCH 03/21] Fix issue with array field validation

---
 .../server/src/api/controllers/row/utils.js   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/server/src/api/controllers/row/utils.js b/packages/server/src/api/controllers/row/utils.js
index 71b22375f7..e18aee582f 100644
--- a/packages/server/src/api/controllers/row/utils.js
+++ b/packages/server/src/api/controllers/row/utils.js
@@ -52,21 +52,29 @@ exports.validate = async ({ appId, tableId, row, table }) => {
     const constraints = cloneDeep(table.schema[fieldName].constraints)
     const type = table.schema[fieldName].type
     // special case for options, need to always allow unselected (null)
-    if (
-      (type === FieldTypes.OPTIONS || type === FieldTypes.ARRAY) &&
-      constraints.inclusion
-    ) {
+    if (type === FieldTypes.OPTIONS && constraints.inclusion) {
       constraints.inclusion.push(null)
     }
     let res
 
     // Validate.js doesn't seem to handle array
-    if (type === FieldTypes.ARRAY && row[fieldName] && row[fieldName].length) {
-      row[fieldName].map(val => {
-        if (!constraints.inclusion.includes(val)) {
-          errors[fieldName] = "Field not in list"
-        }
-      })
+    if (type === FieldTypes.ARRAY) {
+      const hasValues =
+        Array.isArray(row[fieldName]) && row[fieldName].length > 0
+
+      // Check values are valid if values are specified
+      if (hasValues) {
+        row[fieldName].map(val => {
+          if (!constraints.inclusion.includes(val)) {
+            errors[fieldName] = "Value not in list"
+          }
+        })
+      }
+
+      // Check for required constraint
+      if (constraints.presence === true && !hasValues) {
+        errors[fieldName] = "Required field"
+      }
     } else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {
       // this should only happen if there is an error
       try {

From 6870c3067a4736f084c1aa526ea47dac0a01c2a3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Jan 2022 15:25:43 +0000
Subject: [PATCH 04/21] Revert changes to MultiFieldSelect

---
 .../components/app/forms/MultiFieldSelect.svelte    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/client/src/components/app/forms/MultiFieldSelect.svelte b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
index d09a8730ae..cecc569b6f 100644
--- a/packages/client/src/components/app/forms/MultiFieldSelect.svelte
+++ b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
@@ -19,7 +19,6 @@
   let fieldApi
   let fieldSchema
 
-  $: safeDefaultValue = getSafeDefaultValue(defaultValue)
   $: flatOptions = optionsSource == null || optionsSource === "schema"
   $: options = getOptions(
     optionsSource,
@@ -29,16 +28,6 @@
     valueColumn,
     customOptions
   )
-
-  const getSafeDefaultValue = value => {
-    if (value == null || value === "") {
-      return []
-    }
-    if (!Array.isArray(value)) {
-      return [value]
-    }
-    return value
-  }
 </script>
 
 <Field
@@ -46,7 +35,7 @@
   {label}
   {disabled}
   {validation}
-  defaultValue={safeDefaultValue}
+  {defaultValue}
   type="array"
   bind:fieldState
   bind:fieldApi

From 37a8d213e62b2d96a868ced4eb9ea52d24d0ec60 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 18 Jan 2022 15:34:10 +0000
Subject: [PATCH 05/21] Fix data fetch for nested providers, JSON arrays or
 array fields not working

---
 packages/client/src/utils/fetch/DataFetch.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/client/src/utils/fetch/DataFetch.js b/packages/client/src/utils/fetch/DataFetch.js
index 884e12feb1..7fe53bb8af 100644
--- a/packages/client/src/utils/fetch/DataFetch.js
+++ b/packages/client/src/utils/fetch/DataFetch.js
@@ -110,12 +110,6 @@ export default class DataFetch {
    */
   async getInitialData() {
     const { datasource, filter, sortColumn, paginate } = this.options
-    const tableId = datasource?.tableId
-
-    // Ensure table ID exists
-    if (!tableId) {
-      return
-    }
 
     // Fetch datasource definition and determine feature flags
     const definition = await this.constructor.getDefinition(datasource)

From 9d5d8284cbfdd4d021c1c0fca928663677da9655 Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Tue, 18 Jan 2022 20:54:19 +0000
Subject: [PATCH 06/21] Quick fix for #4093 - make sure the App ID/App URL
 returned for deployed apps is always lowercase, as URLs are not case
 sensitive and should not be compared as such.

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

diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index 92dffc8d3f..421b8c426e 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -71,7 +71,7 @@ exports.getDeployedApps = async () => {
     for (let [key, value] of Object.entries(json)) {
       if (value.url) {
         value.url = value.url.toLowerCase()
-        apps[key] = value
+        apps[key.toLowerCase()] = value
       }
     }
     return apps

From fafe6f5d405f74d5644a7fc27f6d3e7eacb80701 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Wed, 19 Jan 2022 10:13:22 +0000
Subject: [PATCH 07/21] v1.0.44

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

diff --git a/lerna.json b/lerna.json
index 42925e163b..ad778bd2cf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.43",
+  "version": "1.0.44",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index ac5288687d..be37988678 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "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 af9e518b7b..6d71fd3fbc 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.43",
+  "version": "1.0.44",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 189497dd73..c392fe39b8 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.43",
-    "@budibase/client": "^1.0.43",
+    "@budibase/bbui": "^1.0.44",
+    "@budibase/client": "^1.0.44",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.43",
+    "@budibase/string-templates": "^1.0.44",
     "@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 5f3f2786bd..0af381d319 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "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 aeafd8d1c3..f0639d8bb4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "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.43",
+    "@budibase/bbui": "^1.0.44",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.43",
+    "@budibase/string-templates": "^1.0.44",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 70904e148f..6f721f84d8 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.43",
+  "version": "1.0.44",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.43",
-    "@budibase/client": "^1.0.43",
-    "@budibase/string-templates": "^1.0.43",
+    "@budibase/backend-core": "^1.0.44",
+    "@budibase/client": "^1.0.44",
+    "@budibase/string-templates": "^1.0.44",
     "@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 e0bcd641c8..2a7d9d95bf 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "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 9c2238501d..78f9b1544b 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.43",
+  "version": "1.0.44",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.43",
-    "@budibase/string-templates": "^1.0.43",
+    "@budibase/backend-core": "^1.0.44",
+    "@budibase/string-templates": "^1.0.44",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From a9d7a19cb5763d3655fdef090e0742f8c3bd2ba7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Jan 2022 15:22:55 +0000
Subject: [PATCH 08/21] fix issue with templates showing over more than two
 rows

---
 packages/builder/src/pages/builder/portal/apps/index.svelte | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ac10b5317f..4df434ecdd 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -474,9 +474,12 @@
   }
 
   .grid {
+    height: 200px;
     display: grid;
+    overflow: hidden;
     grid-gap: var(--spacing-xl);
     grid-template-columns: repeat(auto-fill, minmax(270px, 1fr));
+    grid-template-rows: minmax(100px, 1fr) minmax(100px, 1fr) minmax(0px, 0);
   }
   .template-card {
     height: 80px;

From b0b8e568ced9a0b6d1b50ff95c821c776b8cda72 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Jan 2022 18:29:09 +0000
Subject: [PATCH 09/21] remove uneeded app creation modal

---
 .../components/start/CreateAppModal.svelte    | 83 +++++++------------
 .../src/components/start/TemplateList.svelte  | 69 ---------------
 .../pages/builder/portal/apps/index.svelte    | 11 ++-
 3 files changed, 38 insertions(+), 125 deletions(-)
 delete mode 100644 packages/builder/src/components/start/TemplateList.svelte

diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 178588f608..60065b6eef 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -11,7 +11,6 @@
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"
   import { APP_NAME_REGEX } from "constants"
-  import TemplateList from "./TemplateList.svelte"
 
   export let template
   export let inline
@@ -147,58 +146,34 @@
   }
 </script>
 
-{#if showTemplateSelection}
-  <ModalContent
-    title={"Get started quickly"}
-    showConfirmButton={false}
-    size="L"
-    onConfirm={() => {
-      template = {}
-      return false
-    }}
-    showCancelButton={!inline}
-    showCloseIcon={!inline}
-  >
-    <TemplateList
-      onSelect={(selected, { useImport } = {}) => {
-        if (!selected) {
-          template = useImport ? { fromFile: true } : {}
-          return
-        }
-        template = selected
+<ModalContent
+  title={"Name your app"}
+  confirmText={template?.fromFile ? "Import app" : "Create app"}
+  onConfirm={createNewApp}
+  onCancel={inline ? onCancel : null}
+  cancelText={inline ? "Back" : undefined}
+  showCloseIcon={!inline}
+  disabled={!valid}
+>
+  {#if template?.fromFile}
+    <Dropzone
+      error={$touched.file && $errors.file}
+      gallery={false}
+      label="File to import"
+      value={[$values.file]}
+      on:change={e => {
+        $values.file = e.detail?.[0]
+        $touched.file = true
       }}
     />
-  </ModalContent>
-{:else}
-  <ModalContent
-    title={"Name your app"}
-    confirmText={template?.fromFile ? "Import app" : "Create app"}
-    onConfirm={createNewApp}
-    onCancel={inline ? onCancel : null}
-    cancelText={inline ? "Back" : undefined}
-    showCloseIcon={!inline}
-    disabled={!valid}
-  >
-    {#if template?.fromFile}
-      <Dropzone
-        error={$touched.file && $errors.file}
-        gallery={false}
-        label="File to import"
-        value={[$values.file]}
-        on:change={e => {
-          $values.file = e.detail?.[0]
-          $touched.file = true
-        }}
-      />
-    {/if}
-    <Input
-      bind:value={$values.name}
-      error={$touched.name && $errors.name}
-      on:blur={() => ($touched.name = true)}
-      label="Name"
-      placeholder={$auth.user.firstName
-        ? `${$auth.user.firstName}'s app`
-        : "My app"}
-    />
-  </ModalContent>
-{/if}
+  {/if}
+  <Input
+    bind:value={$values.name}
+    error={$touched.name && $errors.name}
+    on:blur={() => ($touched.name = true)}
+    label="Name"
+    placeholder={$auth.user.firstName
+      ? `${$auth.user.firstName}'s app`
+      : "My app"}
+  />
+</ModalContent>
diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte
deleted file mode 100644
index 90573bddff..0000000000
--- a/packages/builder/src/components/start/TemplateList.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<script>
-  import { Heading, Layout, Icon } from "@budibase/bbui"
-
-  export let onSelect
-</script>
-
-<Layout gap="XS" noPadding>
-  <div class="template start-from-scratch" on:click={() => onSelect(null)}>
-    <div
-      class="background-icon"
-      style={`background: rgb(50, 50, 50); color: white;`}
-    >
-      <Icon name="Add" />
-    </div>
-    <Heading size="XS">Start from scratch</Heading>
-    <p class="detail">BLANK</p>
-  </div>
-  <div
-    class="template import"
-    on:click={() => onSelect(null, { useImport: true })}
-  >
-    <div
-      class="background-icon"
-      style={`background: rgb(50, 50, 50); color: white;`}
-    >
-      <Icon name="Add" />
-    </div>
-    <Heading size="XS">Import an app</Heading>
-    <p class="detail">BLANK</p>
-  </div>
-</Layout>
-
-<style>
-  .background-icon {
-    padding: 10px;
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 18px;
-    color: white;
-  }
-
-  .template {
-    min-height: 60px;
-    display: grid;
-    grid-gap: var(--layout-s);
-    grid-template-columns: auto 1fr auto;
-    border: 1px solid #494949;
-    align-items: center;
-    cursor: pointer;
-    border-radius: 4px;
-    background: var(--background-alt);
-    padding: 8px 16px;
-  }
-
-  .detail {
-    text-align: right;
-  }
-
-  .start-from-scratch {
-    background: var(--spectrum-global-color-gray-50);
-    margin-top: 20px;
-  }
-
-  .import {
-    background: var(--spectrum-global-color-gray-50);
-  }
-</style>
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 4df434ecdd..31530c5ef9 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -78,6 +78,7 @@
   }
 
   const initiateAppCreation = () => {
+    template = {}
     creationModal.show()
     creatingApp = true
   }
@@ -304,10 +305,16 @@
             Export apps
           </Button>
         {/if}
-        <Button icon="Import" quiet secondary on:click={initiateAppImport}>
+        <Button
+          icon="Import"
+          size="L"
+          quiet
+          secondary
+          on:click={initiateAppImport}
+        >
           Import app
         </Button>
-        <Button icon="Add" cta on:click={initiateAppCreation}>
+        <Button size="L" icon="Add" cta on:click={initiateAppCreation}>
           Create app
         </Button>
       </div>

From d4463fc0f3186eef331307528f3fe1f47b2f340e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Jan 2022 19:40:28 +0000
Subject: [PATCH 10/21] add splash screen for apps page

---
 .../pages/builder/portal/apps/index.svelte    | 67 +++++++++++++++++--
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 31530c5ef9..e7b2724de0 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -11,6 +11,7 @@
     notifications,
     Body,
     Search,
+    Icon,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
@@ -27,6 +28,7 @@
   import AppRow from "components/start/AppRow.svelte"
   import { AppStatus } from "constants"
   import analytics, { Events } from "analytics"
+  import Logo from "assets/bb-space-man.svg"
 
   let sortBy = "name"
   let template
@@ -394,11 +396,26 @@
       </Layout>
     {/if}
 
-    {#if !enrichedApps.length && !creatingApp && loaded}
+    {#if !enrichedApps.length}
       <div class="empty-wrapper">
-        <Modal inline>
-          <CreateAppModal {template} inline={true} />
-        </Modal>
+        <div class="centered">
+          <div class="main">
+            <Layout gap="S" justifyItems="center">
+              <img class="img-size" alt="logo" src={Logo} />
+              <div class="new-screen-text">
+                <Detail size="M">LET’S GET STARTED!</Detail>
+              </div>
+              <Button on:click={() => initiateAppCreation()} size="M" cta>
+                <div class="new-screen-button">
+                  <div class="background-icon" style="color: white;">
+                    <Icon name="Add" />
+                  </div>
+                  Create App
+                </div></Button
+              >
+            </Layout>
+          </div>
+        </div>
       </div>
     {/if}
 
@@ -486,10 +503,10 @@
     overflow: hidden;
     grid-gap: var(--spacing-xl);
     grid-template-columns: repeat(auto-fill, minmax(270px, 1fr));
-    grid-template-rows: minmax(100px, 1fr) minmax(100px, 1fr) minmax(0px, 0);
+    grid-template-rows: minmax(70px, 1fr) minmax(100px, 1fr) minmax(0px, 0);
   }
   .template-card {
-    height: 80px;
+    height: 70px;
     border-radius: var(--border-radius-s);
     border: 1px solid var(--spectrum-global-color-gray-300);
     cursor: pointer;
@@ -543,4 +560,42 @@
     justify-content: center;
     align-items: center;
   }
+
+  .centered {
+    width: calc(100% - 350px);
+    height: calc(100% - 100px);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .main {
+    width: 300px;
+  }
+
+  .new-screen-text {
+    width: 160px;
+    text-align: center;
+    color: #2c2c2c;
+    font-weight: 600;
+  }
+
+  .new-screen-button {
+    margin-left: 5px;
+    height: 20px;
+    width: 100px;
+    display: flex;
+    align-items: center;
+  }
+
+  .img-size {
+    width: 160px;
+    height: 160px;
+  }
+
+  .background-icon {
+    margin-top: 4px;
+    margin-right: 4px;
+  }
 </style>

From 094df5922dd592c94f79a5d290217f8504e23eb5 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 19 Jan 2022 19:45:19 +0000
Subject: [PATCH 11/21] fix export button size

---
 .../builder/src/pages/builder/portal/apps/index.svelte | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index e7b2724de0..4be0842ec3 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -303,7 +303,13 @@
 
       <div class="buttons">
         {#if cloud}
-          <Button icon="Export" quiet secondary on:click={initiateAppsExport}>
+          <Button
+            size="L"
+            icon="Export"
+            quiet
+            secondary
+            on:click={initiateAppsExport}
+          >
             Export apps
           </Button>
         {/if}
@@ -403,7 +409,7 @@
             <Layout gap="S" justifyItems="center">
               <img class="img-size" alt="logo" src={Logo} />
               <div class="new-screen-text">
-                <Detail size="M">LET’S GET STARTED!</Detail>
+                <Detail size="M">Create a business app in minutes!</Detail>
               </div>
               <Button on:click={() => initiateAppCreation()} size="M" cta>
                 <div class="new-screen-button">

From 539bce8aed6da80545700dd5ab00dc3430e37989 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Thu, 20 Jan 2022 07:23:13 +0000
Subject: [PATCH 12/21] Add creatingApp && loaded checks

---
 packages/builder/src/pages/builder/portal/apps/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index e7b2724de0..170feb1cbc 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -396,7 +396,7 @@
       </Layout>
     {/if}
 
-    {#if !enrichedApps.length}
+    {#if !enrichedApps.length && !creatingApp && loaded}
       <div class="empty-wrapper">
         <div class="centered">
           <div class="main">

From 27a8fefaa49ffcc7737aebd18e76a042f047384b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Jan 2022 09:44:40 +0000
Subject: [PATCH 13/21] fix cypress

---
 packages/builder/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 5952f4699c..f4d0f9af46 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -42,7 +42,7 @@ Cypress.Commands.add("createApp", name => {
         cy.get(".spectrum-Button").contains("Create app").click({ force: true })
       }
     })
-  cy.contains(/Start from scratch/).dblclick()
+  cy.contains(/Create App/).click()
   cy.get(".spectrum-Modal").within(() => {
     cy.get("input").eq(0).type(name).should("have.value", name).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create app").click()

From bc521af082aef64d9a142a9d4900b815098f537a Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 20 Jan 2022 11:51:41 +0000
Subject: [PATCH 14/21] fix cypress createApp command

---
 packages/builder/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index a165f7e13b..d99e2b271f 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -35,7 +35,7 @@ Cypress.Commands.add("login", () => {
 Cypress.Commands.add("createApp", name => {
   cy.visit(`localhost:${Cypress.env("PORT")}/builder`)
   cy.wait(500)
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+  cy.request(`${Cypress.config().baseUrl}api/applications?status=all`)
     .its("body")
     .then(body => {
       if (body.length > 0) {

From 5638e92ab50edb48fa08fda0cda6be7fec5a3ff2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Jan 2022 12:26:59 +0000
Subject: [PATCH 15/21] Fixing cypress tests, removing change which was added
 to try and fix reverted test cases.

---
 packages/worker/src/api/controllers/system/environment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/worker/src/api/controllers/system/environment.js b/packages/worker/src/api/controllers/system/environment.js
index 4edf1ff8d3..609c3e83c5 100644
--- a/packages/worker/src/api/controllers/system/environment.js
+++ b/packages/worker/src/api/controllers/system/environment.js
@@ -7,6 +7,6 @@ exports.fetch = async ctx => {
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
     // in test need to pretend its in production for the UI (Cypress)
-    isDev: env.isDev() && !env.isTest(),
+    isDev: env.isDev(),
   }
 }

From 62873fbb8d990ee314ee61545f65cfaf9cd52a7d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jan 2022 12:33:48 +0000
Subject: [PATCH 16/21] v1.0.44-alpha.8

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

diff --git a/lerna.json b/lerna.json
index 63ba4de90a..05e8990262 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 581a264919..53985abaa4 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "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 31dc88c7a5..b2caa7f832 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.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 59e21a15cc..42f86ca2c9 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.44-alpha.7",
-    "@budibase/client": "^1.0.44-alpha.7",
+    "@budibase/bbui": "^1.0.44-alpha.8",
+    "@budibase/client": "^1.0.44-alpha.8",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.44-alpha.7",
+    "@budibase/string-templates": "^1.0.44-alpha.8",
     "@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 79e2b4e433..e77d4bca67 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "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 326b537c2a..4096c869db 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "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.44-alpha.7",
+    "@budibase/bbui": "^1.0.44-alpha.8",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.44-alpha.7",
+    "@budibase/string-templates": "^1.0.44-alpha.8",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index afe19c5763..a42eb3760b 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.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.44-alpha.7",
-    "@budibase/client": "^1.0.44-alpha.7",
-    "@budibase/string-templates": "^1.0.44-alpha.7",
+    "@budibase/backend-core": "^1.0.44-alpha.8",
+    "@budibase/client": "^1.0.44-alpha.8",
+    "@budibase/string-templates": "^1.0.44-alpha.8",
     "@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 b56da074e3..ddf4f6af2f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "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 0631938233..058b895112 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.44-alpha.7",
+  "version": "1.0.44-alpha.8",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.44-alpha.7",
-    "@budibase/string-templates": "^1.0.44-alpha.7",
+    "@budibase/backend-core": "^1.0.44-alpha.8",
+    "@budibase/string-templates": "^1.0.44-alpha.8",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 96d8e6d68e792379059dd34623438bbca4b1cbce Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jan 2022 14:01:03 +0000
Subject: [PATCH 17/21] v1.0.44-alpha.9

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

diff --git a/lerna.json b/lerna.json
index 05e8990262..78af255b1f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 53985abaa4..6069396490 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "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 b2caa7f832..c1d3f4957f 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.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 42f86ca2c9..960a320c53 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.44-alpha.8",
-    "@budibase/client": "^1.0.44-alpha.8",
+    "@budibase/bbui": "^1.0.44-alpha.9",
+    "@budibase/client": "^1.0.44-alpha.9",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.44-alpha.8",
+    "@budibase/string-templates": "^1.0.44-alpha.9",
     "@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 e77d4bca67..9a1f80e3a7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "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 4096c869db..e08f78dff8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "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.44-alpha.8",
+    "@budibase/bbui": "^1.0.44-alpha.9",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.44-alpha.8",
+    "@budibase/string-templates": "^1.0.44-alpha.9",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index a42eb3760b..a444c5d092 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.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.44-alpha.8",
-    "@budibase/client": "^1.0.44-alpha.8",
-    "@budibase/string-templates": "^1.0.44-alpha.8",
+    "@budibase/backend-core": "^1.0.44-alpha.9",
+    "@budibase/client": "^1.0.44-alpha.9",
+    "@budibase/string-templates": "^1.0.44-alpha.9",
     "@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 ddf4f6af2f..278d60cabe 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "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 058b895112..cbecd5d15d 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.44-alpha.8",
+  "version": "1.0.44-alpha.9",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.44-alpha.8",
-    "@budibase/string-templates": "^1.0.44-alpha.8",
+    "@budibase/backend-core": "^1.0.44-alpha.9",
+    "@budibase/string-templates": "^1.0.44-alpha.9",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From 06a6001f95b135d70c866b7dcafaabaa6d93d580 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Jan 2022 15:44:39 +0000
Subject: [PATCH 18/21] Fix for #4126 - wrong bindings were being passed to the
 drawer, making sure correct ones are available.

---
 .../src/components/integration/QueryBindingBuilder.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index dd688dceb6..3161e2ae48 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -72,7 +72,7 @@
             bindableOptions,
             customParams?.[binding.name]
           )}
-          {bindableOptions}
+          bind:bindings={bindableOptions}
         />
       {:else}
         <Icon hoverable name="Close" on:click={() => deleteQueryBinding(idx)} />

From c66b9fb0b4e0a5e2318c4025324279aff5ca46d3 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 Jan 2022 16:12:32 +0000
Subject: [PATCH 19/21] Renaming bindableOptions to bindings and replacing the
 query bindings variable with queryBindings.

---
 .../actions/ExecuteQuery.svelte               |  4 ++--
 .../PropertyControls/DataSourceSelect.svelte  |  4 ++--
 .../integration/QueryBindingBuilder.svelte    | 21 +++++++++----------
 .../components/integration/QueryViewer.svelte |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 88c7e87054..8c438e4b22 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -55,8 +55,8 @@
         <div>
           <BindingBuilder
             bind:customParams={parameters.queryParams}
-            bindings={query.parameters}
-            bind:bindableOptions={bindings}
+            queryBindings={query.parameters}
+            bind:bindings
           />
           <IntegrationQueryEditor
             height={200}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
index 3b6f122d33..73554b45db 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
@@ -169,8 +169,8 @@
           {#if getQueryParams(value).length > 0}
             <BindingBuilder
               bind:customParams={tmpQueryParams}
-              bindings={getQueryParams(value)}
-              bind:bindableOptions={bindings}
+              queryBindings={getQueryParams(value)}
+              bind:bindings
             />
           {/if}
           <IntegrationQueryEditor
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index 3161e2ae48..34d4d4219b 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -7,27 +7,26 @@
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let bindable = true
+  export let queryBindings = []
   export let bindings = []
-  export let bindableOptions = []
   export let customParams = {}
 
   function newQueryBinding() {
-    bindings = [...bindings, {}]
+    queryBindings = [...queryBindings, {}]
   }
 
+  $: console.log(bindings)
+
   function deleteQueryBinding(idx) {
-    bindings.splice(idx, 1)
-    bindings = bindings
+    queryBindings.splice(idx, 1)
+    queryBindings = queryBindings
   }
 
   // This is necessary due to the way readable and writable bindings are stored.
   // The readable binding in the UI gets converted to a UUID value that the client understands
   // for parsing, then converted back so we can display it the readable form in the UI
   function onBindingChange(param, valueToParse) {
-    customParams[param] = readableToRuntimeBinding(
-      bindableOptions,
-      valueToParse
-    )
+    customParams[param] = readableToRuntimeBinding(bindings, valueToParse)
   }
 </script>
 
@@ -49,7 +48,7 @@
     {/if}
   </Body>
   <div class="bindings" class:bindable>
-    {#each bindings as binding, idx}
+    {#each queryBindings as binding, idx}
       <Input
         placeholder="Binding Name"
         thin
@@ -69,10 +68,10 @@
           thin
           on:change={evt => onBindingChange(binding.name, evt.detail)}
           value={runtimeToReadableBinding(
-            bindableOptions,
+            bindings,
             customParams?.[binding.name]
           )}
-          bind:bindings={bindableOptions}
+          {bindings}
         />
       {:else}
         <Icon hoverable name="Close" on:click={() => deleteQueryBinding(idx)} />
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index f14d1d2b88..c6ae7c4ce8 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -120,7 +120,7 @@
           config={integrationInfo.extra}
         />
       {/if}
-      <BindingBuilder bind:bindings={query.parameters} bindable={false} />
+      <BindingBuilder bind:queryBindings={query.parameters} bindable={false} />
     {/if}
   </div>
   {#if shouldShowQueryConfig}

From 6c22ccb1495725fa819f99ae81a004bf094060e4 Mon Sep 17 00:00:00 2001
From: Budibase Release Bot <>
Date: Thu, 20 Jan 2022 16:33:40 +0000
Subject: [PATCH 20/21] v1.0.45

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

diff --git a/lerna.json b/lerna.json
index ad778bd2cf..bb128cb560 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.44",
+  "version": "1.0.45",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index be37988678..34fca88b3d 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "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 6d71fd3fbc..ae19abe44d 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.44",
+  "version": "1.0.45",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c392fe39b8..e4b4b50740 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.44",
-    "@budibase/client": "^1.0.44",
+    "@budibase/bbui": "^1.0.45",
+    "@budibase/client": "^1.0.45",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.44",
+    "@budibase/string-templates": "^1.0.45",
     "@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 0af381d319..32f7f01265 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "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 f0639d8bb4..5ef6bd181d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "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.44",
+    "@budibase/bbui": "^1.0.45",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.44",
+    "@budibase/string-templates": "^1.0.45",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 6f721f84d8..73d243abb2 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.44",
+  "version": "1.0.45",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.44",
-    "@budibase/client": "^1.0.44",
-    "@budibase/string-templates": "^1.0.44",
+    "@budibase/backend-core": "^1.0.45",
+    "@budibase/client": "^1.0.45",
+    "@budibase/string-templates": "^1.0.45",
     "@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 2a7d9d95bf..2f36a4a685 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "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 78f9b1544b..76bdec3873 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.44",
+  "version": "1.0.45",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.44",
-    "@budibase/string-templates": "^1.0.44",
+    "@budibase/backend-core": "^1.0.45",
+    "@budibase/string-templates": "^1.0.45",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",

From f927117582d7dfda2a852cde6f4f8f92711560be Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 20 Jan 2022 17:10:09 +0000
Subject: [PATCH 21/21] v1.0.46-alpha.0

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

diff --git a/lerna.json b/lerna.json
index bb128cb560..a5f6f6d96a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 34fca88b3d..d7d8fa342f 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index ae19abe44d..5a15ef5ed5 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.45",
+  "version": "1.0.46-alpha.0",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e4b4b50740..41bfbadf87 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.45",
-    "@budibase/client": "^1.0.45",
+    "@budibase/bbui": "^1.0.46-alpha.0",
+    "@budibase/client": "^1.0.46-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.45",
+    "@budibase/string-templates": "^1.0.46-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 32f7f01265..512798df86 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 5ef6bd181d..e64c12bb80 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.45",
+    "@budibase/bbui": "^1.0.46-alpha.0",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.45",
+    "@budibase/string-templates": "^1.0.46-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/server/package.json b/packages/server/package.json
index 73d243abb2..ad85c14302 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.45",
+  "version": "1.0.46-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.45",
-    "@budibase/client": "^1.0.45",
-    "@budibase/string-templates": "^1.0.45",
+    "@budibase/backend-core": "^1.0.46-alpha.0",
+    "@budibase/client": "^1.0.46-alpha.0",
+    "@budibase/string-templates": "^1.0.46-alpha.0",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 30f24a60eb..d79c8b2503 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.45",
+  "version": "1.0.46-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 76bdec3873..1464b3154b 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.45",
+  "version": "1.0.46-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.45",
-    "@budibase/string-templates": "^1.0.45",
+    "@budibase/backend-core": "^1.0.46-alpha.0",
+    "@budibase/string-templates": "^1.0.46-alpha.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",