From a878d7eb40edeeb442482507266002f8cdf948c7 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Fri, 8 Jan 2021 17:25:06 +0000
Subject: [PATCH 01/12] Trigger Automation from frontend actions

---
 .../SetupPanel/AutomationBlockSetup.svelte    |   3 +
 .../automation/SetupPanel/SchemaSetup.svelte  | 113 ++++++++++++++++++
 .../actions/TriggerAutomation.svelte          |  84 +++++++++++++
 .../EventsEditor/actions/index.js             |   5 +
 packages/client/src/api/automations.js        |  10 ++
 packages/client/src/api/index.js              |   1 +
 packages/client/src/utils/buttonActions.js    |  14 ++-
 packages/server/src/automations/triggers.js   |  51 +++++++-
 packages/server/src/utilities/index.js        |  24 +++-
 9 files changed, 292 insertions(+), 13 deletions(-)
 create mode 100644 packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
 create mode 100644 packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
 create mode 100644 packages/client/src/api/automations.js

diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 7e26b2155e..5d3371ee7d 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -1,6 +1,7 @@
 <script>
   import TableSelector from "./TableSelector.svelte"
   import RowSelector from "./RowSelector.svelte"
+  import SchemaSetup from "./SchemaSetup.svelte"
   import { Button, Input, Select, Label } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
@@ -70,6 +71,8 @@
       <RowSelector bind:value={block.inputs[key]} {bindings} />
     {:else if value.customType === 'webhookUrl'}
       <WebhookDisplay value={block.inputs[key]} />
+    {:else if value.customType === 'triggerSchema'}
+      <SchemaSetup bind:value={block.inputs[key]} />
     {:else if value.type === 'string' || value.type === 'number'}
       <BindableInput
         type="string"
diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
new file mode 100644
index 0000000000..f9c12fac23
--- /dev/null
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -0,0 +1,113 @@
+<script>
+  import { Input } from "@budibase/bbui"
+
+  export let value = {}
+  $: fieldsArray = Object.entries(value).map(([name, type]) => ({
+    name,
+    type,
+  }))
+
+  let addNewName = ""
+  let addNewType = "string"
+
+  function addField() {
+    if (!addNewName) return
+    if (value[addNewName.trim()]) {
+      addNewName = ""
+      return
+    }
+    const newValue = { ...value }
+    newValue[addNewName.trim()] = "string"
+    value = newValue
+    addNewName = ""
+  }
+
+  function onInputEnter(e) {
+    if (e.key === "Enter") {
+      addField()
+    }
+  }
+
+  function removeField(name) {
+    const newValues = { ...value }
+    delete newValues[name]
+    value = newValues
+  }
+
+  const fieldNameChanged = originalName => e => {
+    // reconstruct using fieldsArray, so field order is preserved
+    let entries = [...fieldsArray]
+    const newName = e.target.value
+    if (newName) {
+      entries.find(f => f.name === originalName).name = newName
+    } else {
+      entries = entries.filter(f => f.name !== originalName)
+    }
+    value = entries.reduce((newVals, current) => {
+      newVals[current.name] = current.type
+      return newVals
+    }, {})
+  }
+</script>
+
+<div class="root">
+  {#each fieldsArray as field}
+    <i
+      class="remove-field ri-delete-bin-line"
+      on:click={() => removeField(field.name)} />
+    <input
+      value={field.name}
+      on:change={fieldNameChanged(field.name)}
+      class="grid-field" />
+    <select
+      value={field.type}
+      on:blur={e => (value[field.name] = e.target.value)}
+      class="grid-field">
+      <option>string</option>
+      <option>number</option>
+      <option>boolean</option>
+      <option>datetime</option>
+    </select>
+  {/each}
+  <div class="new-field" on:keyup={onInputEnter}>
+    <Input
+      outline
+      small
+      bind:value={addNewName}
+      placeholder="Enter field name" />
+  </div>
+  <!--button on:click={addField}>Add</button-->
+</div>
+
+<style>
+  .root {
+    display: grid;
+    grid-template-columns: auto 1fr auto;
+  }
+
+  .remove-field {
+    cursor: pointer;
+    color: var(--grey-6);
+    margin: auto 4px auto 0;
+  }
+
+  .remove-field:hover {
+    color: var(--black);
+  }
+
+  .new-field {
+    grid-column: 1 / span 3;
+    max-width: 100%;
+  }
+
+  .grid-field {
+    min-width: 50px;
+    font-family: inherit;
+    font-size: inherit;
+    padding: 0.4em;
+    margin: 0 0 0.5em 0;
+    box-sizing: border-box;
+    border: 1px solid var(--grey-4);
+    border-radius: 0px;
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
new file mode 100644
index 0000000000..4c58175401
--- /dev/null
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
@@ -0,0 +1,84 @@
+<script>
+  import { Select, Label } from "@budibase/bbui"
+  import { automationStore } from "builderStore"
+  import SaveFields from "./SaveFields.svelte"
+
+  // parameters.contextPath used in the client handler to determine which row to save
+  // this could be "data" or "data.parent", "data.parent.parent" etc
+  export let parameters
+
+  let idFields
+  let schemaFields
+
+  const automationSchema = automation => {
+    const schema = Object.entries(
+      automation.definition.trigger.inputs.fields
+    ).map(([name, type]) => ({ name, type }))
+
+    return {
+      name: automation.name,
+      _id: automation._id,
+      schema,
+    }
+  }
+
+  $: automations = $automationStore.automations
+    .filter(a => a.definition.trigger && a.definition.trigger.stepId === "APP")
+    .map(automationSchema)
+
+  $: selectedAutomation =
+    parameters &&
+    parameters.automationId &&
+    automations.find(a => a._id === parameters.automationId)
+
+  const onFieldsChanged = e => {
+    parameters.fields = e.detail
+  }
+</script>
+
+<div class="root">
+
+  {#if !automations || automations.length === 0}
+    <div class="cannot-use">
+      You must have an automation that has an "App Action" trigger.
+    </div>
+  {:else}
+    <Label size="m" color="dark">Automation</Label>
+    <Select secondary bind:value={parameters.automationId}>
+      <option value="" />
+      {#each automations as automation}
+        <option value={automation._id}>{automation.name}</option>
+      {/each}
+    </Select>
+
+    {#if selectedAutomation}
+      <SaveFields
+        parameterFields={parameters.fields}
+        schemaFields={selectedAutomation.schema}
+        on:fieldschanged={onFieldsChanged} />
+    {/if}
+  {/if}
+</div>
+
+<style>
+  .root {
+    display: grid;
+    column-gap: var(--spacing-s);
+    row-gap: var(--spacing-s);
+    grid-template-columns: auto 1fr auto 1fr auto;
+    align-items: baseline;
+  }
+
+  .root :global(> div:nth-child(2)) {
+    grid-column-start: 2;
+    grid-column-end: 6;
+  }
+
+  .cannot-use {
+    color: var(--red);
+    font-size: var(--font-size-s);
+    text-align: center;
+    width: 70%;
+    margin: auto;
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/index.js b/packages/builder/src/components/userInterface/EventsEditor/actions/index.js
index 1c07356ee9..1bb0ab4d00 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/index.js
@@ -1,6 +1,7 @@
 import NavigateTo from "./NavigateTo.svelte"
 import SaveRow from "./SaveRow.svelte"
 import DeleteRow from "./DeleteRow.svelte"
+import TriggerAutomation from "./TriggerAutomation.svelte"
 
 // defines what actions are available, when adding a new one
 // the component is the setup panel for the action
@@ -20,4 +21,8 @@ export default [
     name: "Navigate To",
     component: NavigateTo,
   },
+  {
+    name: "Trigger Automation",
+    component: TriggerAutomation,
+  },
 ]
diff --git a/packages/client/src/api/automations.js b/packages/client/src/api/automations.js
new file mode 100644
index 0000000000..c163ffee82
--- /dev/null
+++ b/packages/client/src/api/automations.js
@@ -0,0 +1,10 @@
+import API from "./api"
+/**
+ * Executes an automation. Must have "App Action" trigger.
+ */
+export const triggerAutomation = async (automationId, fields) => {
+  return await API.post({
+    url: `/api/automations/${automationId}/trigger`,
+    body: { fields },
+  })
+}
diff --git a/packages/client/src/api/index.js b/packages/client/src/api/index.js
index 878964107b..a8de677367 100644
--- a/packages/client/src/api/index.js
+++ b/packages/client/src/api/index.js
@@ -7,3 +7,4 @@ export * from "./views"
 export * from "./relationships"
 export * from "./routes"
 export * from "./app"
+export * from "./automations"
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 2968525188..b2caf83d1c 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -1,6 +1,6 @@
 import { enrichDataBinding } from "./enrichDataBinding"
 import { routeStore } from "../store"
-import { saveRow, deleteRow } from "../api"
+import { saveRow, deleteRow, triggerAutomation } from "../api"
 
 const saveRowHandler = async (action, context) => {
   let draft = context[`${action.parameters.contextPath}_draft`]
@@ -21,6 +21,17 @@ const deleteRowHandler = async (action, context) => {
   })
 }
 
+const triggerAutomationHandler = async (action, context) => {
+  const params = {}
+  for (let field in action.parameters.fields) {
+    params[field] = enrichDataBinding(
+      action.parameters.fields[field].value,
+      context
+    )
+  }
+  await triggerAutomation(action.parameters.automationId, params)
+}
+
 const navigationHandler = action => {
   routeStore.actions.navigate(action.parameters.url)
 }
@@ -29,6 +40,7 @@ const handlerMap = {
   ["Save Row"]: saveRowHandler,
   ["Delete Row"]: deleteRowHandler,
   ["Navigate To"]: navigationHandler,
+  ["Trigger Automation"]: triggerAutomationHandler,
 }
 
 /**
diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index 6fbd8e4c25..6634016e3f 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -2,6 +2,7 @@ const CouchDB = require("../db")
 const emitter = require("../events/index")
 const InMemoryQueue = require("../utilities/queue/inMemoryQueue")
 const { getAutomationParams } = require("../db/utils")
+const { coerceValue } = require("../utilities")
 
 let automationQueue = new InMemoryQueue("automationQueue")
 
@@ -119,6 +120,37 @@ const BUILTIN_DEFINITIONS = {
     },
     type: "TRIGGER",
   },
+  APP: {
+    name: "App Action",
+    event: "app:trigger",
+    icon: "ri-window-fill",
+    tagline: "Automation fired from the frontend",
+    description: "Trigger an automation from an action inside your app",
+    stepId: "APP",
+    inputs: {},
+    schema: {
+      inputs: {
+        properties: {
+          fields: {
+            type: "object",
+            customType: "triggerSchema",
+            title: "Fields",
+          },
+        },
+        required: [],
+      },
+      outputs: {
+        properties: {
+          fields: {
+            type: "object",
+            description: "Fields submitted from the app frontend",
+          },
+        },
+        required: ["fields"],
+      },
+    },
+    type: "TRIGGER",
+  },
 }
 
 async function queueRelevantRowAutomations(event, eventType) {
@@ -200,12 +232,19 @@ async function fillRowOutput(automation, params) {
 
 module.exports.externalTrigger = async function(automation, params) {
   // TODO: replace this with allowing user in builder to input values in future
-  if (
-    automation.definition != null &&
-    automation.definition.trigger != null &&
-    automation.definition.trigger.inputs.tableId != null
-  ) {
-    params = await fillRowOutput(automation, params)
+  if (automation.definition != null && automation.definition.trigger != null) {
+    if (automation.definition.trigger.inputs.tableId != null) {
+      params = await fillRowOutput(automation, params)
+    }
+    if (automation.definition.trigger.stepId === "APP") {
+      // values are likely to be submitted as strings, so we shall convert to correct type
+      const coercedFields = {}
+      const fields = automation.definition.trigger.inputs.fields
+      for (let key in fields) {
+        coercedFields[key] = coerceValue(params.fields[key], fields[key])
+      }
+      params.fields = coercedFields
+    }
   }
 
   automationQueue.add({ automation, event: params })
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index 8a43e9d27a..190a66838e 100644
--- a/packages/server/src/utilities/index.js
+++ b/packages/server/src/utilities/index.js
@@ -144,6 +144,23 @@ exports.walkDir = (dirPath, callback) => {
   }
 }
 
+/**
+ * This will coerce a value to the correct types based on the type transform map
+ * @param {object} row The value to coerce
+ * @param {object} type The type fo coerce to
+ * @returns {object} The coerced value
+ */
+exports.coerceValue = (value, type) => {
+  // eslint-disable-next-line no-prototype-builtins
+  if (TYPE_TRANSFORM_MAP[type].hasOwnProperty(value)) {
+    return TYPE_TRANSFORM_MAP[type][value]
+  } else if (TYPE_TRANSFORM_MAP[type].parse) {
+    return TYPE_TRANSFORM_MAP[type].parse(value)
+  }
+
+  return value
+}
+
 /**
  * This will coerce the values in a row to the correct types based on the type transform map and the
  * table schema.
@@ -159,12 +176,7 @@ exports.coerceRowValues = (row, table) => {
     const field = table.schema[key]
     if (!field) continue
 
-    // eslint-disable-next-line no-prototype-builtins
-    if (TYPE_TRANSFORM_MAP[field.type].hasOwnProperty(value)) {
-      clonedRow[key] = TYPE_TRANSFORM_MAP[field.type][value]
-    } else if (TYPE_TRANSFORM_MAP[field.type].parse) {
-      clonedRow[key] = TYPE_TRANSFORM_MAP[field.type].parse(value)
-    }
+    clonedRow[key] = exports.coerceValue(value, field.type)
   }
   return clonedRow
 }

From 9c5501fbd7d99eb698bfbae66e9c696d0c032056 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 11 Jan 2021 09:56:39 +0000
Subject: [PATCH 02/12] tidy up

---
 .../EventsEditor/actions/TriggerAutomation.svelte            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
index 4c58175401..01f54598e0 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
@@ -3,13 +3,8 @@
   import { automationStore } from "builderStore"
   import SaveFields from "./SaveFields.svelte"
 
-  // parameters.contextPath used in the client handler to determine which row to save
-  // this could be "data" or "data.parent", "data.parent.parent" etc
   export let parameters
 
-  let idFields
-  let schemaFields
-
   const automationSchema = automation => {
     const schema = Object.entries(
       automation.definition.trigger.inputs.fields

From 76023217a117427aa50048c829318bac66498f34 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Mon, 11 Jan 2021 10:11:31 +0000
Subject: [PATCH 03/12] changed input style for automation schema setup

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

diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index f9c12fac23..281ec9f0d4 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -71,7 +71,7 @@
   {/each}
   <div class="new-field" on:keyup={onInputEnter}>
     <Input
-      outline
+      primary
       small
       bind:value={addNewName}
       placeholder="Enter field name" />

From 210897b9094219a957d8179c4831f52ac654f3c8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 11 Jan 2021 18:09:43 +0000
Subject: [PATCH 04/12] This simply removes the self hosting logo URL feature
 as it doesn't really make sense, screen/layout templates are held in the
 builder codebase and therefore controlling the logo from the server isn't
 really possible.

---
 hosting/docker-compose.yaml            |  1 -
 hosting/hosting.properties             |  3 ---
 packages/server/src/environment.js     |  2 --
 packages/server/src/utilities/index.js | 11 +----------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 32659ec53c..e2538774ef 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -9,7 +9,6 @@ services:
       SELF_HOSTED: 1 
       COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984
       BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT}
-      LOGO_URL: ${LOGO_URL}
       PORT: 4002
       JWT_SECRET: ${JWT_SECRET}
     depends_on:
diff --git a/hosting/hosting.properties b/hosting/hosting.properties
index 5776f108e3..2ef83543a4 100644
--- a/hosting/hosting.properties
+++ b/hosting/hosting.properties
@@ -5,9 +5,6 @@ MAIN_PORT=10000
 # This should be updated
 HOSTING_KEY=budibase
 
-# This section contains customisation options
-LOGO_URL=https://logoipsum.com/logo/logo-15.svg
-
 # This section contains all secrets pertaining to the system
 # These should be updated
 JWT_SECRET=testsecret
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 8e129913fd..5fbf57448a 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -36,8 +36,6 @@ module.exports = {
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL,
   LOCAL_TEMPLATES: process.env.LOCAL_TEMPLATES,
-  // self hosting features
-  LOGO_URL: process.env.LOGO_URL,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value
diff --git a/packages/server/src/utilities/index.js b/packages/server/src/utilities/index.js
index c8e2e57bff..a8d8400f23 100644
--- a/packages/server/src/utilities/index.js
+++ b/packages/server/src/utilities/index.js
@@ -169,15 +169,6 @@ exports.coerceRowValues = (row, table) => {
   return clonedRow
 }
 
-/**
- * Gets the correct link to the logo URL depending on if running in Cloud or if running in self hosting.
- * @returns {string} A URL which links to the correct default logo for new apps.
- */
 exports.getLogoUrl = () => {
-  const BB_LOGO_URL =
-    "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg"
-  if (env.SELF_HOSTED) {
-    return env.LOGO_URL || BB_LOGO_URL
-  }
-  return BB_LOGO_URL
+  return "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg"
 }

From f5f66f9a5898e7c5ae957228347668dd0fe3da6f Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Tue, 12 Jan 2021 15:21:27 +0000
Subject: [PATCH 05/12] allow new automation from button action setup

---
 .../store/automation/Automation.js            |   9 ++
 .../builderStore/store/automation/index.js    |   4 +
 .../AutomationBuilder/BlockList.svelte        |  11 +-
 .../automation/SetupPanel/SchemaSetup.svelte  |   6 +-
 .../EventsEditor/EventEditorModal.svelte      |  46 +++++--
 .../EventsEditor/actions/SaveFields.svelte    |  25 ++--
 .../actions/TriggerAutomation.svelte          | 128 ++++++++++++------
 7 files changed, 162 insertions(+), 67 deletions(-)

diff --git a/packages/builder/src/builderStore/store/automation/Automation.js b/packages/builder/src/builderStore/store/automation/Automation.js
index cbdcabeccc..a9dce88258 100644
--- a/packages/builder/src/builderStore/store/automation/Automation.js
+++ b/packages/builder/src/builderStore/store/automation/Automation.js
@@ -56,4 +56,13 @@ export default class Automation {
     steps.splice(stepIdx, 1)
     this.automation.definition.steps = steps
   }
+
+  constructBlock(type, stepId, blockDefinition) {
+    return {
+      ...blockDefinition,
+      inputs: blockDefinition.inputs || {},
+      stepId,
+      type,
+    }
+  }
 }
diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js
index 3f0743aa1e..7a01bccfab 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@@ -2,6 +2,7 @@ import { writable } from "svelte/store"
 import api from "../../api"
 import Automation from "./Automation"
 import { cloneDeep } from "lodash/fp"
+import analytics from "analytics"
 
 const automationActions = store => ({
   fetch: async () => {
@@ -93,6 +94,9 @@ const automationActions = store => ({
       state.selectedBlock = newBlock
       return state
     })
+    analytics.captureEvent("Added Automation Block", {
+      name: block.name,
+    })
   },
   deleteAutomationBlock: block => {
     store.update(state => {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
index de3e9660ad..5ea1d64e51 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
@@ -49,16 +49,9 @@
   }
 
   function addBlockToAutomation(stepId, blockDefinition) {
-    const newBlock = {
-      ...blockDefinition,
-      inputs: blockDefinition.inputs || {},
-      stepId,
-      type: selectedTab,
-    }
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      selectedTab, stepId, blockDefinition)
     automationStore.actions.addBlockToAutomation(newBlock)
-    analytics.captureEvent("Added Automation Block", {
-      name: blockDefinition.name,
-    })
     closePopover()
     if (stepId === "WEBHOOK") {
       webhookModal.show()
diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index 281ec9f0d4..6a68f08980 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -8,7 +8,6 @@
   }))
 
   let addNewName = ""
-  let addNewType = "string"
 
   function addField() {
     if (!addNewName) return
@@ -76,7 +75,6 @@
       bind:value={addNewName}
       placeholder="Enter field name" />
   </div>
-  <!--button on:click={addField}>Add</button-->
 </div>
 
 <style>
@@ -110,4 +108,8 @@
     border: 1px solid var(--grey-4);
     border-radius: 0px;
   }
+
+  select.grid-field {
+    border-left: none;
+  }
 </style>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
index 27e91cd29e..d92ebed33e 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/EventEditorModal.svelte
@@ -3,6 +3,7 @@
   import { AddIcon, ArrowDownIcon } from "components/common/Icons/"
   import actionTypes from "./actions"
   import { createEventDispatcher } from "svelte"
+  import { automationStore } from "builderStore"
 
   const dispatch = createEventDispatcher()
   const eventTypeKey = "##eventHandlerType"
@@ -13,17 +14,11 @@
   let addActionDropdown
   let selectedAction
 
-  let draftEventHandler = { parameters: [] }
-
   $: actions = event || []
   $: selectedActionComponent =
     selectedAction &&
     actionTypes.find(t => t.name === selectedAction[eventTypeKey]).component
 
-  const updateEventHandler = (updatedHandler, index) => {
-    actions[index] = updatedHandler
-  }
-
   const deleteAction = index => {
     actions.splice(index, 1)
     actions = actions
@@ -44,8 +39,43 @@
     selectedAction = action
   }
 
-  const saveEventData = () => {
-    dispatch("change", actions)
+  const saveEventData = async () => {
+    // e.g. The Trigger Automation action exposes beforeSave, so it can
+    // create any automations it needs to
+    for (let action of actions) {
+      if (action[eventTypeKey] === "Trigger Automation") {
+        await createAutomation(action.parameters)
+      }
+    }
+    dispatch("change", actions)    
+  }
+
+    // called by the parent modal when actions are saved
+  const createAutomation = async parameters => {
+    if (parameters.automationId || !parameters.newAutomationName) return
+
+    await automationStore.actions.create({name: parameters.newAutomationName})
+
+    const appActionDefinition = $automationStore.blockDefinitions.TRIGGER.APP
+
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      "TRIGGER", "APP", appActionDefinition)
+
+
+    newBlock.inputs = {
+      fields: Object.entries(parameters.fields).reduce((fields, [key, value]) => {
+        fields[key] = value.type
+        return fields
+      }, {})
+    }
+
+    automationStore.actions.addBlockToAutomation(newBlock)
+
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation)
+
+    parameters.automationId = $automationStore.selectedAutomation.automation._id
+    delete parameters.newAutomationName
   }
 </script>
 
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
index 3fe85cbfda..71d0ddf17f 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
@@ -1,6 +1,6 @@
 <script>
   // accepts an array of field names, and outputs an object of { FieldName: value }
-  import { DataList, Label, TextButton, Spacer, Select } from "@budibase/bbui"
+  import { DataList, Label, TextButton, Spacer, Select, Input } from "@budibase/bbui"
   import { store, backendUiStore, currentAsset } from "builderStore"
   import fetchBindableProperties from "builderStore/fetchBindableProperties"
   import { CloseCircleIcon, AddIcon } from "components/common/Icons"
@@ -14,6 +14,7 @@
 
   export let parameterFields
   export let schemaFields
+  export let fieldLabel="Column"
 
   const emptyField = () => ({ name: "", value: "" })
 
@@ -59,7 +60,7 @@
         // value and type is needed by the client, so it can parse
         // a string into a correct type
         newParameterFields[field.name] = {
-          type: schemaFields.find(f => f.name === field.name).type,
+          type: schemaFields ? schemaFields.find(f => f.name === field.name).type : "string",
           value: readableToRuntimeBinding(bindableProperties, field.value),
         }
       }
@@ -73,13 +74,17 @@
 
 {#if fields}
   {#each fields as field}
-    <Label size="m" color="dark">Column</Label>
-    <Select secondary bind:value={field.name} on:blur={rebuildParameters}>
-      <option value="" />
-      {#each schemaFields as schemaField}
-        <option value={schemaField.name}>{schemaField.name}</option>
-      {/each}
-    </Select>
+    <Label size="m" color="dark">{fieldLabel}</Label>
+    {#if schemaFields}
+      <Select secondary bind:value={field.name} on:blur={rebuildParameters}>
+        <option value="" />
+        {#each schemaFields as schemaField}
+          <option value={schemaField.name}>{schemaField.name}</option>
+        {/each}
+      </Select>
+    {:else}
+      <Input secondary bind:value={field.name} on:blur={rebuildParameters}/> 
+    {/if}
     <Label size="m" color="dark">Value</Label>
     <DataList secondary bind:value={field.value} on:blur={rebuildParameters}>
       <option value="" />
@@ -100,7 +105,7 @@
     <Spacer small />
 
     <TextButton text small blue on:click={addField}>
-      Add Field
+      Add {fieldLabel}
       <div style="height: 20px; width: 20px;">
         <AddIcon />
       </div>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
index 01f54598e0..3e46f813fd 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
@@ -1,25 +1,27 @@
 <script>
-  import { Select, Label } from "@budibase/bbui"
+  import { Select, Label, Input } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import SaveFields from "./SaveFields.svelte"
 
-  export let parameters
+  export let parameters = {}
 
-  const automationSchema = automation => {
-    const schema = Object.entries(
-      automation.definition.trigger.inputs.fields
-    ).map(([name, type]) => ({ name, type }))
-
-    return {
-      name: automation.name,
-      _id: automation._id,
-      schema,
-    }
-  }
+  let newOrExisting = parameters.automationId ? "existing" : "new"
 
   $: automations = $automationStore.automations
-    .filter(a => a.definition.trigger && a.definition.trigger.stepId === "APP")
-    .map(automationSchema)
+    .filter(a => a.definition.trigger?.stepId === "APP")
+    .map(automation => {
+      const schema = Object.entries(
+        automation.definition.trigger.inputs.fields
+      ).map(([name, type]) => ({ name, type }))
+
+      return {
+        name: automation.name,
+        _id: automation._id,
+        schema,
+      }
+    })
+
+  $: hasAutomations = automations && automations.length > 0
 
   $: selectedAutomation =
     parameters &&
@@ -29,30 +31,63 @@
   const onFieldsChanged = e => {
     parameters.fields = e.detail
   }
+
+  const setNew = () => {
+    newOrExisting = "new"
+    parameters.automationId = undefined
+  }
+
+  const setExisting = () => {
+    newOrExisting = "existing"
+    parameters.newAutomationName = ""
+  }
+
 </script>
 
 <div class="root">
 
-  {#if !automations || automations.length === 0}
-    <div class="cannot-use">
-      You must have an automation that has an "App Action" trigger.
-    </div>
-  {:else}
-    <Label size="m" color="dark">Automation</Label>
-    <Select secondary bind:value={parameters.automationId}>
+  <div class="radio-container" on:click={setNew}>
+    <input 
+      type="radio" 
+      value="new" 
+      bind:group={newOrExisting}
+      disabled={!hasAutomations}> 
+      
+    <Label disabled={!hasAutomations}>Create a new automation </Label>
+
+  </div>
+
+  <div class="radio-container" on:click={setExisting}>
+
+    <input 
+      type="radio" 
+      value="existing" 
+      bind:group={newOrExisting}
+      disabled={!hasAutomations}> 
+      
+    <Label disabled={!hasAutomations}>Use an existing automation </Label>
+
+  </div>
+
+  <Label size="m" color="dark">Automation</Label>
+
+  {#if newOrExisting=== "existing"}
+    <Select secondary bind:value={parameters.automationId} placeholder="Choose automation">
       <option value="" />
       {#each automations as automation}
         <option value={automation._id}>{automation.name}</option>
       {/each}
     </Select>
-
-    {#if selectedAutomation}
-      <SaveFields
-        parameterFields={parameters.fields}
-        schemaFields={selectedAutomation.schema}
-        on:fieldschanged={onFieldsChanged} />
-    {/if}
+  {:else}
+    <Input secondary bind:value={parameters.newAutomationName} placeholder="Enter automation name" />
   {/if}
+
+  <SaveFields
+    parameterFields={parameters.fields}
+    schemaFields={newOrExisting === "existing" && selectedAutomation && selectedAutomation.schema}
+    fieldLabel="Field"
+    on:fieldschanged={onFieldsChanged} />
+
 </div>
 
 <style>
@@ -64,16 +99,33 @@
     align-items: baseline;
   }
 
-  .root :global(> div:nth-child(2)) {
-    grid-column-start: 2;
-    grid-column-end: 6;
+  .root :global(> div:nth-child(4)) {
+    grid-column: 2 / span 4;
   }
 
-  .cannot-use {
-    color: var(--red);
-    font-size: var(--font-size-s);
-    text-align: center;
-    width: 70%;
-    margin: auto;
+  .radio-container {
+    display: grid;
+    grid-template-columns: auto 1fr;
   }
+
+  .radio-container:nth-child(1) {
+    grid-column: 1 / span 2;
+  }
+
+  .radio-container:nth-child(2) {
+    grid-column: 3 / span 3;
+  }
+
+  .radio-container :global(> label) {
+    margin-left: var(--spacing-m);
+  }
+
+  .radio-container > input {
+    margin-bottom: var(--spacing-s);
+  }
+
+  .radio-container > input:focus {
+    outline: none;
+  }
+
 </style>

From 420094aaa92637467d968267d4c9882f702fe614 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 13 Jan 2021 10:20:07 +0000
Subject: [PATCH 06/12] Schema setup - styling changes

---
 .../automation/SetupPanel/SchemaSetup.svelte  | 132 ++++++++++--------
 1 file changed, 75 insertions(+), 57 deletions(-)

diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index 6a68f08980..51c105e9f4 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Input } from "@budibase/bbui"
+  import { Input, Select } from "@budibase/bbui"
 
   export let value = {}
   $: fieldsArray = Object.entries(value).map(([name, type]) => ({
@@ -7,24 +7,10 @@
     type,
   }))
 
-  let addNewName = ""
-
   function addField() {
-    if (!addNewName) return
-    if (value[addNewName.trim()]) {
-      addNewName = ""
-      return
-    }
     const newValue = { ...value }
-    newValue[addNewName.trim()] = "string"
+    newValue[""] = "string"
     value = newValue
-    addNewName = ""
-  }
-
-  function onInputEnter(e) {
-    if (e.key === "Enter") {
-      addField()
-    }
   }
 
   function removeField(name) {
@@ -50,66 +36,98 @@
 </script>
 
 <div class="root">
-  {#each fieldsArray as field}
-    <i
-      class="remove-field ri-delete-bin-line"
-      on:click={() => removeField(field.name)} />
-    <input
-      value={field.name}
-      on:change={fieldNameChanged(field.name)}
-      class="grid-field" />
-    <select
-      value={field.type}
-      on:blur={e => (value[field.name] = e.target.value)}
-      class="grid-field">
-      <option>string</option>
-      <option>number</option>
-      <option>boolean</option>
-      <option>datetime</option>
-    </select>
-  {/each}
-  <div class="new-field" on:keyup={onInputEnter}>
-    <Input
-      primary
-      small
-      bind:value={addNewName}
-      placeholder="Enter field name" />
+  <div class="add-field">
+    <i class="ri-add-line" on:click={addField} />
   </div>
+  <div class="spacer" />
+  {#each fieldsArray as field}
+    <div class="field">
+      <Input
+        value={field.name}
+        secondary
+        on:change={fieldNameChanged(field.name)} />
+      <Select
+        secondary
+        extraThin
+        value={field.type}
+        on:blur={e => (value[field.name] = e.target.value)}>
+        <option>string</option>
+        <option>number</option>
+        <option>boolean</option>
+        <option>datetime</option>
+      </Select>
+
+      <i class="remove-field ri-delete-bin-line"
+        on:click={() => removeField(field.name)} />
+
+      
+    </div>
+  {/each}
+
 </div>
 
 <style>
   .root {
+    position: relative;
+    max-width: 100%;
+    overflow-x: auto;
+    /* so we can show the "+" button beside the "fields" label*/
+    top: -26px;
+  }
+
+  .spacer {
+    height: var(--spacing-s);
+  }
+
+  .field {
+    max-width: 100%;
+    background-color: var(--grey-2);
+    margin-bottom: var(--spacing-m);
+    border-style: solid;
+    border-width: 1px;
+    border-color: var(--grey-4);
     display: grid;
-    grid-template-columns: auto 1fr auto;
+    /*grid-template-rows: auto auto;
+    grid-template-columns: auto;*/
+    position: relative;
+    overflow: hidden;
+  }
+
+  .field :global(select) {
+    padding: var(--spacing-xs) 2rem var(--spacing-m) var(--spacing-s) !important;
+    font-size: var(--font-size-xs);
+    color: var(--grey-7);
+  }
+
+  .field :global(.pointer) {
+    padding-bottom: var(--spacing-m) !important;
+    color: var(--grey-2);
+  }
+
+  .field :global(input) {
+    padding: var(--spacing-m) var(--spacing-xl) var(--spacing-xs) var(--spacing-m);
+    font-size: var(--font-size-s);
+    font-weight: bold;
   }
 
   .remove-field {
     cursor: pointer;
     color: var(--grey-6);
-    margin: auto 4px auto 0;
+    position: absolute;
+    top: var(--spacing-m);
+    right: 3px;
   }
 
   .remove-field:hover {
     color: var(--black);
   }
 
-  .new-field {
-    grid-column: 1 / span 3;
-    max-width: 100%;
+  .add-field {
+    text-align: right;
   }
 
-  .grid-field {
-    min-width: 50px;
-    font-family: inherit;
-    font-size: inherit;
-    padding: 0.4em;
-    margin: 0 0 0.5em 0;
-    box-sizing: border-box;
-    border: 1px solid var(--grey-4);
-    border-radius: 0px;
+  .add-field > i {
+    cursor: pointer;
   }
 
-  select.grid-field {
-    border-left: none;
-  }
 </style>

From 652097992503d7d9610ee0d834b121d5d78412cb Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 13 Jan 2021 12:55:45 +0000
Subject: [PATCH 07/12] Quick change, disabling MINIO browser as its a security
 risk and isn't useful.

---
 hosting/docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index e2538774ef..c4a6c669b3 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -42,6 +42,7 @@ services:
     environment:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
+      MINIO_BROWSER: "off"
     command: server /data
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]

From 3ea31ba3838f5120032d903aefcc936149252fd3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 14 Jan 2021 14:37:53 +0000
Subject: [PATCH 08/12] v0.5.0

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 4 ++--
 packages/client/package.json              | 4 ++--
 packages/server/package.json              | 4 ++--
 packages/standard-components/package.json | 2 +-
 packages/worker/package.json              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lerna.json b/lerna.json
index 1585b03a18..b010e5f61e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.4.3",
+  "version": "0.5.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index df660229fa..bfaae430fe 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
-    "@budibase/client": "^0.4.3",
+    "@budibase/client": "^0.5.0",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 55ad2531ff..9ab13816ae 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -15,7 +15,7 @@
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.4.3",
+    "@budibase/standard-components": "^0.5.0",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 39725c438c..7e29f3d83f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,7 +49,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.4.3",
+    "@budibase/client": "^0.5.0",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 006fe9da5c..023baf707f 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,7 +29,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.4.3",
+  "version": "0.5.0",
   "license": "MIT",
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
diff --git a/packages/worker/package.json b/packages/worker/package.json
index d3def44844..7c94323a8e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.3.8",
+  "version": "0.5.0",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From 951808e535ec6314d3dbfa8bfc1589914545965e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 14 Jan 2021 14:46:40 +0000
Subject: [PATCH 09/12] v0.5.1

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 4 ++--
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 6 +++---
 packages/standard-components/package.json | 4 ++--
 packages/worker/package.json              | 5 +++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lerna.json b/lerna.json
index b010e5f61e..6e808258e9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.5.0",
+  "version": "0.5.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index bfaae430fe..3738aa988a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
-    "@budibase/client": "^0.5.0",
+    "@budibase/client": "^0.5.1",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 9ab13816ae..d58591765d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -15,7 +15,7 @@
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.5.0",
+    "@budibase/standard-components": "^0.5.1",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -29,5 +29,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "e4e053cb6ff9a0ddc7115b44ccaa24b8ec41fb9a"
+  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7e29f3d83f..7f0852b337 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,7 +49,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.5.0",
+    "@budibase/client": "^0.5.1",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
@@ -113,5 +113,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691"
+  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
 }
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 023baf707f..7b1d143b36 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,9 +29,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.5.0",
+  "version": "0.5.1",
   "license": "MIT",
-  "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
+  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11",
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
     "@budibase/svelte-ag-grid": "^0.0.16",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 7c94323a8e..be4f5fdf02 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -30,5 +30,6 @@
     "koa-static": "^5.0.0",
     "pino-pretty": "^4.0.0",
     "server-destroy": "^1.0.1"
-  }
+  },
+  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
 }

From 836092ec82a65947389d5804ad8a7b0881d07ffd Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 14 Jan 2021 15:03:58 +0000
Subject: [PATCH 10/12] v0.5.2

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 4 ++--
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 6 +++---
 packages/standard-components/package.json | 4 ++--
 packages/worker/package.json              | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lerna.json b/lerna.json
index 6e808258e9..717b7be951 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.5.1",
+  "version": "0.5.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 3738aa988a..2a60029c48 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
-    "@budibase/client": "^0.5.1",
+    "@budibase/client": "^0.5.2",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index d58591765d..12049b4474 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -15,7 +15,7 @@
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.5.1",
+    "@budibase/standard-components": "^0.5.2",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -29,5 +29,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
+  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 7f0852b337..faa5511e95 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,7 +49,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.5.1",
+    "@budibase/client": "^0.5.2",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
@@ -113,5 +113,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
+  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
 }
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 7b1d143b36..1ab60c39e0 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,9 +29,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "MIT",
-  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11",
+  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5",
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
     "@budibase/svelte-ag-grid": "^0.0.16",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index be4f5fdf02..68833c07e4 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -31,5 +31,5 @@
     "pino-pretty": "^4.0.0",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "bbc62586126c5cbfdafd239e8b1deac0a5a2bf11"
+  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
 }

From ab9fc458ae4210018fd1830f2f94c6cab1785e0b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 14 Jan 2021 15:13:22 +0000
Subject: [PATCH 11/12] Update release.yml

---
 .github/workflows/release.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68e71f4cf7..792191af7a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,5 +68,6 @@ jobs:
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker
+        run: |
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build:docker

From b96518458e015faf1e977129197a2191e69693f7 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 14 Jan 2021 15:24:01 +0000
Subject: [PATCH 12/12] v0.5.3

---
 lerna.json                                | 2 +-
 packages/builder/package.json             | 4 ++--
 packages/client/package.json              | 6 +++---
 packages/server/package.json              | 6 +++---
 packages/standard-components/package.json | 4 ++--
 packages/worker/package.json              | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lerna.json b/lerna.json
index 717b7be951..22963e707b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.5.2",
+  "version": "0.5.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 2a60029c48..32601d97dd 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
-    "@budibase/client": "^0.5.2",
+    "@budibase/client": "^0.5.3",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 12049b4474..9a40bea639 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -15,7 +15,7 @@
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.5.2",
+    "@budibase/standard-components": "^0.5.3",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -29,5 +29,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
+  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index faa5511e95..9014c8ad62 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,7 +49,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.5.2",
+    "@budibase/client": "^0.5.3",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
@@ -113,5 +113,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
+  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
 }
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 1ab60c39e0..0b018d251c 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,9 +29,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "MIT",
-  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5",
+  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
   "dependencies": {
     "@budibase/bbui": "^1.52.4",
     "@budibase/svelte-ag-grid": "^0.0.16",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 68833c07e4..16275084c5 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -31,5 +31,5 @@
     "pino-pretty": "^4.0.0",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "c33a59f087d6558f100d17a001abe706a64555f5"
+  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
 }