From b1a76ad74d49385fc59c83f94c25296f3688dcd8 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 27 Jan 2021 15:04:13 +0000
Subject: [PATCH 01/21] v0.6.0

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

diff --git a/lerna.json b/lerna.json
index 22963e707b..4ef7575771 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.5.3",
+  "version": "0.6.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 52fa846db3..0fe3f38d9b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.55.2",
-    "@budibase/client": "^0.5.3",
+    "@budibase/client": "^0.6.0",
     "@budibase/colorpicker": "^1.0.1",
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/string-templates": "^0.6.0",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "^0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 18c5e9a78d..2b8d4ce52b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/string-templates": "^0.6.0",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.5.3",
+    "@budibase/standard-components": "^0.6.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 feefffb827..c775d3bea1 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.3",
+  "version": "0.6.0",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,8 +49,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.5.3",
-    "@budibase/string-templates": "^0.5.3",
+    "@budibase/client": "^0.6.0",
+    "@budibase/string-templates": "^0.6.0",
     "@elastic/elasticsearch": "^7.10.0",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index b5b3a64888..d2a60c4912 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,7 +29,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.5.3",
+  "version": "0.6.0",
   "license": "MIT",
   "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 77e8f7ded5..ba052ee66d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "dist/bundle.js",
   "module": "dist/bundle.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index c53d4e9429..45a642fcae 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.3",
+  "version": "0.6.0",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From baf2f8bec5d9501161e84da09a34847f28844c11 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 27 Jan 2021 16:40:47 +0000
Subject: [PATCH 02/21] replace npmignore with package JSON files field

---
 packages/standard-components/.npmignore   | 3 ---
 packages/standard-components/package.json | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 packages/standard-components/.npmignore

diff --git a/packages/standard-components/.npmignore b/packages/standard-components/.npmignore
deleted file mode 100644
index 81c5644598..0000000000
--- a/packages/standard-components/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!dist/*
-!components.json
\ No newline at end of file
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index d2a60c4912..202dd9452e 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -10,6 +10,11 @@
     "start:dev": "sirv public --single --dev",
     "dev:builder": "rollup -cw"
   },
+  "files": [
+    "manifest.json",
+    "package.json",
+    "dist"
+  ],
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.1",
     "@rollup/plugin-commonjs": "^16.0.0",

From 23899840d37c65a59f5cc38a832c373166300f03 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 27 Jan 2021 16:47:44 +0000
Subject: [PATCH 03/21] v0.6.1

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

diff --git a/lerna.json b/lerna.json
index 4ef7575771..5a71180145 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.6.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 0fe3f38d9b..e56f01ae49 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.55.2",
-    "@budibase/client": "^0.6.0",
+    "@budibase/client": "^0.6.1",
     "@budibase/colorpicker": "^1.0.1",
-    "@budibase/string-templates": "^0.6.0",
+    "@budibase/string-templates": "^0.6.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "^0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 2b8d4ce52b..eea47390e5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.6.0",
+    "@budibase/string-templates": "^0.6.1",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.6.0",
+    "@budibase/standard-components": "^0.6.1",
     "@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 c775d3bea1..2984aff7cd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,8 +49,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.6.0",
-    "@budibase/string-templates": "^0.6.0",
+    "@budibase/client": "^0.6.1",
+    "@budibase/string-templates": "^0.6.1",
     "@elastic/elasticsearch": "^7.10.0",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 202dd9452e..decd725967 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -34,7 +34,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index ba052ee66d..0fee9f3df7 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "dist/bundle.js",
   "module": "dist/bundle.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 45a642fcae..3f6c7584ec 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From 0f18ee70ef0f9299c8f3e07e3171f055bcae21d4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 27 Jan 2021 17:29:30 +0000
Subject: [PATCH 04/21] actions fix

---
 .../popovers/EditQueryParamsPopover.svelte    |  11 +-
 .../Notification/NotificationDisplay.svelte   |   2 +-
 .../EventsEditor/EventEditor.svelte           |   6 +-
 .../PropertyControls/TableViewSelect.svelte   |  20 +--
 .../integration/QueryFieldsBuilder.svelte     |   8 +-
 .../components/integration/QueryViewer.svelte |  36 +++---
 .../src/components/integration/index.svelte   |   1 -
 .../[selectedDatasource]/index.svelte         |   1 -
 .../client/src/components/ClientApp.svelte    |  11 +-
 .../src/components/NotificationDisplay.svelte | 117 +++++++++---------
 10 files changed, 113 insertions(+), 100 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte
index bc34d4d80c..c657bd682f 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryParamsPopover.svelte
@@ -20,12 +20,9 @@
 </script>
 
 <div on:click|stopPropagation bind:this={anchor}>
-  <TextButton
-    text
-    on:click={dropdown.show}
-    active={false}>
-      <Icon name="add" />
-      Add Parameters
+  <TextButton text on:click={dropdown.show} active={false}>
+    <Icon name="add" />
+    Add Parameters
   </TextButton>
   <DropdownMenu align="right" {anchor} bind:this={dropdown}>
     <div class="wrapper">
@@ -39,4 +36,4 @@
     padding: var(--spacing-xl);
     min-width: 600px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
index 3a7c03a716..2a89426ca8 100644
--- a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
+++ b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notificationStore } from "builderStore/store/notifications"
-  import { flip } from 'svelte/animate';
+  import { flip } from "svelte/animate"
   import { fly } from "svelte/transition"
 
   export let themes = {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
index 86e5174473..0e52aa8f76 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
@@ -33,6 +33,9 @@
       parameters: {},
       [EVENT_TYPE_KEY]: actionType.name,
     }
+    if (!actions) {
+      actions = []
+    }
     actions.push(newAction)
     selectedAction = newAction
     actions = actions
@@ -73,7 +76,8 @@
         <div class="action-container">
           <div class="action-header" on:click={selectAction(action)}>
             <span class:selected={action === selectedAction}>
-              {index + 1}. {action[EVENT_TYPE_KEY]}
+              {index + 1}.
+              {action[EVENT_TYPE_KEY]}
             </span>
           </div>
           <i
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
index 6b3873a08c..5031b37323 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
@@ -34,15 +34,17 @@
     }))
     return [...acc, ...viewsArr]
   }, [])
-  $: queries = $backendUiStore.queries.filter(query => query.queryVerb === "read").map(query => ({
-    label: query.name,
-    name: query.name,
-    tableId: query._id,
-    ...query,
-    schema: query.schema,
-    parameters: query.parameters,
-    type: "query",
-  }))
+  $: queries = $backendUiStore.queries
+    .filter(query => query.queryVerb === "read")
+    .map(query => ({
+      label: query.name,
+      name: query.name,
+      tableId: query._id,
+      ...query,
+      schema: query.schema,
+      parameters: query.parameters,
+      type: "query",
+    }))
   $: bindableProperties = getBindableProperties(
     $currentAsset.props,
     $store.selectedComponentId
diff --git a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
index d5f4b3bd8b..79728f12fd 100644
--- a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
@@ -24,8 +24,8 @@
 </script>
 
 <form on:submit|preventDefault>
-<div class="field">
-  {#each schemaKeys as field}
+  <div class="field">
+    {#each schemaKeys as field}
       <Input
         placeholder="Enter {field} name"
         outline
@@ -33,8 +33,8 @@
         type={schema.fields[field]?.type}
         required={schema.fields[field]?.required}
         bind:value={fields[field]} />
-  {/each}
-</div>
+    {/each}
+  </div>
 </form>
 {#if schema.customisable}
   <Editor
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 485dbf7411..77f6d51476 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -135,17 +135,22 @@
     <Input placeholder="✎ Edit Query Name" bind:value={query.name} />
   </div>
   {#if config}
-  <div class="props">
-    <div class="query-type">Query type: <span class="query-type-span">{config[query.queryVerb].type}</span></div>
-    <div class="select">
-      <Select primary thin bind:value={query.queryVerb}>
-        {#each Object.keys(config) as queryVerb}
-          <option value={queryVerb}>{queryVerb}</option>
-        {/each}
-      </Select>
-  </div>
+    <div class="props">
+      <div class="query-type">
+        Query type:
+        <span class="query-type-span">{config[query.queryVerb].type}</span>
+      </div>
+      <div class="select">
+        <Select primary thin bind:value={query.queryVerb}>
+          {#each Object.keys(config) as queryVerb}
+            <option value={queryVerb}>{queryVerb}</option>
+          {/each}
+        </Select>
+      </div>
     </div>
-    <EditQueryParamsPopover bind:parameters={query.parameters} bindable={false} />
+    <EditQueryParamsPopover
+      bind:parameters={query.parameters}
+      bindable={false} />
   {/if}
 </header>
 <Spacer extraLarge />
@@ -182,7 +187,11 @@
               {#each fields as field, idx}
                 <Spacer small />
                 <div class="field">
-                  <Input outline placeholder="Field Name" type={'text'} bind:value={field.name} />
+                  <Input
+                    outline
+                    placeholder="Field Name"
+                    type={'text'}
+                    bind:value={field.name} />
                   <Select thin border bind:value={field.type}>
                     <option value={''}>Select a field type</option>
                     <option value={'STRING'}>Text</option>
@@ -195,8 +204,8 @@
                     on:click={() => deleteField(idx)} />
                 </div>
               {/each}
-                <Spacer small />
-                <Button thin secondary on:click={newField}>Add Field</Button>
+              <Spacer small />
+              <Button thin secondary on:click={newField}>Add Field</Button>
             {/if}
           </Switcher>
         {/if}
@@ -206,7 +215,6 @@
 {/if}
 
 <style>
-
   .input {
     width: 300px;
   }
diff --git a/packages/builder/src/components/integration/index.svelte b/packages/builder/src/components/integration/index.svelte
index a4f59459c0..5d863bb5e7 100644
--- a/packages/builder/src/components/integration/index.svelte
+++ b/packages/builder/src/components/integration/index.svelte
@@ -20,7 +20,6 @@
   }
 </script>
 
-
 {#if schema}
   {#key query._id}
     {#if schema.type === QueryTypes.SQL}
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
index 0482d5458e..fc40923eca 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -58,7 +58,6 @@
       </div>
     </div>
   </section>
-
 {/if}
 
 <style>
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 4af1f198d5..659f34568b 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -2,9 +2,14 @@
   import { writable } from "svelte/store"
   import { setContext, onMount } from "svelte"
   import Component from "./Component.svelte"
-  import NotificationDisplay from './NotificationDisplay.svelte'
+  import NotificationDisplay from "./NotificationDisplay.svelte"
   import SDK from "../sdk"
-  import { createDataStore, initialise, screenStore, notificationStore } from "../store"
+  import {
+    createDataStore,
+    initialise,
+    screenStore,
+    notificationStore,
+  } from "../store"
 
   // Provide contexts
   setContext("sdk", SDK)
@@ -24,4 +29,4 @@
 {#if loaded && $screenStore.activeLayout}
   <Component definition={$screenStore.activeLayout.props} />
 {/if}
-<NotificationDisplay />
\ No newline at end of file
+<NotificationDisplay />
diff --git a/packages/client/src/components/NotificationDisplay.svelte b/packages/client/src/components/NotificationDisplay.svelte
index f398b7f3bc..9f7f4083c2 100644
--- a/packages/client/src/components/NotificationDisplay.svelte
+++ b/packages/client/src/components/NotificationDisplay.svelte
@@ -1,60 +1,59 @@
 <script>
-    import { flip } from 'svelte/animate';
-    import { fly } from "svelte/transition"
-    import { getContext } from "svelte"
-    const { notifications } = getContext("sdk")
-  
-    export let themes = {
-      danger: "#E26D69",
-      success: "#84C991",
-      warning: "#f0ad4e",
-      info: "#5bc0de",
-      default: "#aaaaaa",
-    }
-  </script>
-  
-  <div class="notifications">
-    {#each $notifications as notification (notification.id)}
-      <div
-        animate:flip
-        class="toast"
-        style="background: {themes[notification.type]};"
-        transition:fly={{ y: -30 }}>
-        <div class="content">{notification.message}</div>
-        {#if notification.icon}<i class={notification.icon} />{/if}
-      </div>
-    {/each}
-  </div>
-  
-  <style>
-    .notifications {
-      position: fixed;
-      top: 10px;
-      left: 0;
-      right: 0;
-      margin: 0 auto;
-      padding: 0;
-      z-index: 9999;
-      display: flex;
-      flex-direction: column;
-      justify-content: flex-start;
-      align-items: center;
-      pointer-events: none;
-    }
-  
-    .toast {
-      flex: 0 0 auto;
-      margin-bottom: 10px;
-      border-radius: var(--border-radius-s);
-      /* The toasts now support being auto sized, so this static width could be removed */
-      width: 40vw;
-    }
-  
-    .content {
-      padding: 10px;
-      display: block;
-      color: white;
-      font-weight: 500;
-    }
-  </style>
-  
\ No newline at end of file
+  import { flip } from "svelte/animate"
+  import { fly } from "svelte/transition"
+  import { getContext } from "svelte"
+  const { notifications } = getContext("sdk")
+
+  export let themes = {
+    danger: "#E26D69",
+    success: "#84C991",
+    warning: "#f0ad4e",
+    info: "#5bc0de",
+    default: "#aaaaaa",
+  }
+</script>
+
+<div class="notifications">
+  {#each $notifications as notification (notification.id)}
+    <div
+      animate:flip
+      class="toast"
+      style="background: {themes[notification.type]};"
+      transition:fly={{ y: -30 }}>
+      <div class="content">{notification.message}</div>
+      {#if notification.icon}<i class={notification.icon} />{/if}
+    </div>
+  {/each}
+</div>
+
+<style>
+  .notifications {
+    position: fixed;
+    top: 10px;
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+    padding: 0;
+    z-index: 9999;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+    pointer-events: none;
+  }
+
+  .toast {
+    flex: 0 0 auto;
+    margin-bottom: 10px;
+    border-radius: var(--border-radius-s);
+    /* The toasts now support being auto sized, so this static width could be removed */
+    width: 40vw;
+  }
+
+  .content {
+    padding: 10px;
+    display: block;
+    color: white;
+    font-weight: 500;
+  }
+</style>

From 79277f0ee0dfc95b02e3bec98c24fe04d2c06884 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 27 Jan 2021 17:43:38 +0000
Subject: [PATCH 05/21] v0.6.2

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

diff --git a/lerna.json b/lerna.json
index 5a71180145..640c262a36 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.6.1",
+  "version": "0.6.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e56f01ae49..440215d65c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.55.2",
-    "@budibase/client": "^0.6.1",
+    "@budibase/client": "^0.6.2",
     "@budibase/colorpicker": "^1.0.1",
-    "@budibase/string-templates": "^0.6.1",
+    "@budibase/string-templates": "^0.6.2",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "^0.7.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index eea47390e5..f524b6c0e0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.6.1",
+    "@budibase/string-templates": "^0.6.2",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.6.1",
+    "@budibase/standard-components": "^0.6.2",
     "@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 2984aff7cd..fd8d5196a0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -49,8 +49,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.6.1",
-    "@budibase/string-templates": "^0.6.1",
+    "@budibase/client": "^0.6.2",
+    "@budibase/string-templates": "^0.6.2",
     "@elastic/elasticsearch": "^7.10.0",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index decd725967..51eda7815e 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -34,7 +34,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MIT",
   "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
   "dependencies": {
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 0fee9f3df7..1ebebaaeec 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "dist/bundle.js",
   "module": "dist/bundle.js",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3f6c7584ec..63d026e56b 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {

From d1ba3f97f63a55f670bc99ec4ed94252291971d4 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 21:42:40 +0800
Subject: [PATCH 06/21] add arangodb integration

---
 .../DatasourceNavigator/icons/ArangoDB.svelte | 22 +++++
 .../DatasourceNavigator/icons/index.js        |  2 +
 packages/server/package.json                  |  1 +
 packages/server/src/integrations/arangodb.js  | 87 +++++++++++++++++++
 packages/server/src/integrations/index.js     |  3 +
 5 files changed, 115 insertions(+)
 create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
 create mode 100644 packages/server/src/integrations/arangodb.js

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
new file mode 100644
index 0000000000..0be4ca2663
--- /dev/null
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
@@ -0,0 +1,22 @@
+<script>
+  export let width = "100"
+  export let height = "100"
+</script>
+
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" {width} {height} viewBox="0 0 2900 2000" >
+<g id="layer101">
+ <path fill="#5b350f" d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z"/>
+ </g>
+<g id="layer102">
+ <path fill="#406f23" d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z m460 -643 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -51 -100 -126 -173 -238 -230 l-89 -45 -131 0 c-151 0 -222 18 -323 84 -138 89 -243 264 -243 406 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z"/>
+ </g>
+<g id="layer103">
+ <path fill="#c6d821" d="M2215 1789 c-27 -4 -68 -15 -90 -23 -42 -15 -264 -116 -397 -180 l-77 -38 78 -102 c102 -134 144 -208 175 -305 37 -116 49 -200 44 -309 -7 -157 -46 -218 -175 -278 -94 -44 -178 -56 -313 -43 -108 10 -401 53 -479 70 -24 5 -45 8 -47 6 -2 -2 20 -44 49 -92 67 -115 176 -225 281 -284 87 -49 235 -103 335 -121 91 -16 253 -14 346 5 175 37 269 95 419 264 307 347 422 563 457 859 18 148 9 247 -29 325 -88 179 -340 286 -577 246z"/>
+ <path fill="#c6d821" d="M549 1680 c-272 -34 -426 -142 -495 -346 -22 -68 -26 -91 -22 -164 6 -115 32 -173 112 -248 70 -65 236 -153 370 -196 241 -79 722 -172 985 -192 180 -14 343 55 404 170 34 64 30 168 -11 271 -88 223 -245 373 -568 542 -222 116 -379 161 -584 168 -69 2 -155 0 -191 -5z m646 -340 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -50 -100 -126 -173 -235 -229 -84 -42 -90 -44 -200 -48 -190 -8 -312 37 -434 161 -98 99 -155 221 -155 331 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z"/>
+ </g>
+<g id="layer104">
+ <path fill="#f6f654" d="M2190 1721 c-57 -19 -469 -184 -494 -198 -12 -7 -5 -21 34 -72 28 -35 71 -96 97 -137 l46 -74 69 0 c38 0 83 -6 102 -14 52 -22 105 -75 139 -140 28 -55 32 -70 32 -147 0 -84 -2 -90 -48 -183 -96 -187 -234 -296 -376 -296 -44 0 -80 7 -110 20 -28 13 -65 20 -105 20 -72 0 -264 22 -426 49 -63 10 -117 17 -118 15 -10 -8 59 -113 110 -169 106 -115 238 -183 448 -231 155 -35 313 -29 447 17 78 27 210 117 279 191 82 89 277 353 336 456 92 159 137 344 125 513 -9 117 -37 189 -101 258 -109 116 -332 172 -486 122z"/>
+ <path fill="#f6f654" d="M490 1624 c-153 -33 -275 -125 -339 -257 -54 -109 -59 -201 -17 -301 32 -76 164 -189 288 -245 51 -23 260 -91 281 -91 3 0 -21 25 -54 56 -94 91 -150 193 -170 313 -14 90 1 111 123 172 161 81 195 91 343 96 111 5 143 2 215 -16 221 -55 380 -192 380 -327 0 -52 -46 -143 -106 -212 -75 -85 -233 -170 -323 -173 -25 -1 -25 -1 4 -10 140 -43 411 -62 527 -38 142 30 238 125 238 234 0 88 -58 230 -139 337 -105 139 -431 343 -676 423 -161 52 -429 71 -575 39z"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
index 4f8d79dbf4..ff38782288 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
@@ -7,6 +7,7 @@ import S3 from "./S3.svelte"
 import Airtable from "./Airtable.svelte"
 import SqlServer from "./SQLServer.svelte"
 import MySQL from "./MySQL.svelte"
+import ArangoDB from "./ArangoDB.svelte"
 
 export default {
   POSTGRES: Postgres,
@@ -18,4 +19,5 @@ export default {
   S3: S3,
   AIRTABLE: Airtable,
   MYSQL: MySQL,
+  ARANGODB: ArangoDB,
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index fd8d5196a0..2ee2c79e22 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -56,6 +56,7 @@
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
     "airtable": "^0.10.1",
+    "arangojs": "^7.2.0",
     "aws-sdk": "^2.767.0",
     "bcryptjs": "^2.4.3",
     "chmodr": "^1.2.0",
diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
new file mode 100644
index 0000000000..eefd656cbc
--- /dev/null
+++ b/packages/server/src/integrations/arangodb.js
@@ -0,0 +1,87 @@
+const arangojs = require("arangojs")
+const { FIELD_TYPES, QUERY_TYPES } = require("./Integration")
+// const arangodb = arangojs.Database
+const aql = arangojs.aql
+
+const SCHEMA = {
+    docs: "https://github.com/arangodb/arangojs",
+    datasource: {
+        url: {
+            type: FIELD_TYPES.STRING,
+            default: "http://localhost:8529",
+            required: true,
+        },
+        username: {
+            type: FIELD_TYPES.STRING,
+            default: "root",
+            required: true,
+        },
+        password: {
+            type: FIELD_TYPES.PASSWORD,
+            required: true,
+        },
+        databaseName: {
+            type: FIELD_TYPES.STRING,
+            default: "_system",
+            required: true,
+        },
+        collection: {
+            type: FIELD_TYPES.STRING,
+            required: true,
+        },
+    },
+    query: {
+        read: {
+            type: QUERY_TYPES.SQL,
+        },
+        create: {
+            type: QUERY_TYPES.JSON,
+        },
+    },
+}
+
+class ArangoDBIntegration {
+    constructor(config) {
+        config.auth = {
+            username: config.username,
+            password: config.password,
+        }
+        
+        this.config = config
+        this.client = arangojs.arangojs(config)
+    }
+
+    async read(query) {
+        try {
+            const result = await this.client.query(query.sql)
+            let rl = []
+            await result.forEach((r)=> rl.push(r))
+            return rl
+        } catch (err) {
+            console.error("Error querying arangodb",err.message)
+            throw err
+        } finally {
+            this.client.close()
+        }
+    }
+
+    async create(query) {
+        const clc = this.client.collection(this.config.collection)
+        try {
+            const result = await this.client.query(aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`)
+            let rl = []
+            await result.forEach((r)=> rl.push(r))
+            return rl
+        } catch (err) {
+            console.error("Error querying arangodb",err.message)
+            throw err
+        } finally {
+            this.client.close()
+        }
+    }
+}
+
+module.exports = {
+  schema: SCHEMA,
+  integration: ArangoDBIntegration,
+}
\ No newline at end of file
diff --git a/packages/server/src/integrations/index.js b/packages/server/src/integrations/index.js
index acb81992a9..8ff89f4900 100644
--- a/packages/server/src/integrations/index.js
+++ b/packages/server/src/integrations/index.js
@@ -7,6 +7,7 @@ const sqlServer = require("./microsoftSqlServer")
 const s3 = require("./s3")
 const airtable = require("./airtable")
 const mysql = require("./mysql")
+const arangodb = require("./arangodb")
 
 const DEFINITIONS = {
   POSTGRES: postgres.schema,
@@ -18,6 +19,7 @@ const DEFINITIONS = {
   S3: s3.schema,
   AIRTABLE: airtable.schema,
   MYSQL: mysql.schema,
+  ARANGODB: arangodb.schema,
 }
 
 const INTEGRATIONS = {
@@ -30,6 +32,7 @@ const INTEGRATIONS = {
   SQL_SERVER: sqlServer.integration,
   AIRTABLE: airtable.integration,
   MYSQL: mysql.integration,
+  ARANGODB:　arangodb.integration,
 }
 
 module.exports = {

From 13aab3b809cdd2b4a421c9054e2c2fb351594e1f Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 21:48:29 +0800
Subject: [PATCH 07/21] add arangodb integration

---
 packages/server/src/integrations/arangodb.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index eefd656cbc..f2aa54667e 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -1,7 +1,5 @@
-const arangojs = require("arangojs")
+const { Database, aql } = require("arangojs")
 const { FIELD_TYPES, QUERY_TYPES } = require("./Integration")
-// const arangodb = arangojs.Database
-const aql = arangojs.aql
 
 const SCHEMA = {
     docs: "https://github.com/arangodb/arangojs",
@@ -48,7 +46,7 @@ class ArangoDBIntegration {
         }
         
         this.config = config
-        this.client = arangojs.arangojs(config)
+        this.client = new Database(config)
     }
 
     async read(query) {

From 561ce349f9f56e7470867b533ecce34fa607122c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 28 Jan 2021 14:03:19 +0000
Subject: [PATCH 08/21] Fixing an issue that aptkingston found with
 relationships were links on the way out would be multiplied (due to the
 bi-directional nature).

---
 packages/server/src/db/linkedRows/linkUtils.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/db/linkedRows/linkUtils.js b/packages/server/src/db/linkedRows/linkUtils.js
index 3a9aff6c33..5f9dca4088 100644
--- a/packages/server/src/db/linkedRows/linkUtils.js
+++ b/packages/server/src/db/linkedRows/linkUtils.js
@@ -77,11 +77,21 @@ exports.getLinkDocuments = async function({
   }
   params.include_docs = !!includeDocs
   try {
-    const response = await db.query(getQueryIndex(ViewNames.LINK), params)
+    let linkRows = (await db.query(getQueryIndex(ViewNames.LINK), params)).rows
+    // filter to get unique entries
+    const foundIds = []
+    linkRows = linkRows.filter(link => {
+      const unique = foundIds.indexOf(link.id) === -1
+      if (unique) {
+        foundIds.push(link.id)
+      }
+      return unique
+    })
+
     if (includeDocs) {
-      return response.rows.map(row => row.doc)
+      return linkRows.map(row => row.doc)
     } else {
-      return response.rows.map(row => row.value)
+      return linkRows.map(row => row.value)
     }
   } catch (err) {
     // check if the view doesn't exist, it should for all new instances

From 0e7e5920c61ec8b805d97c2af9e794da4f76ee58 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 22:17:39 +0800
Subject: [PATCH 09/21] add arangodb integration

---
 packages/server/src/integrations/arangodb.js | 136 ++++++++++---------
 1 file changed, 69 insertions(+), 67 deletions(-)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index f2aa54667e..2b3ee1b11b 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -2,84 +2,86 @@ const { Database, aql } = require("arangojs")
 const { FIELD_TYPES, QUERY_TYPES } = require("./Integration")
 
 const SCHEMA = {
-    docs: "https://github.com/arangodb/arangojs",
-    datasource: {
-        url: {
-            type: FIELD_TYPES.STRING,
-            default: "http://localhost:8529",
-            required: true,
-        },
-        username: {
-            type: FIELD_TYPES.STRING,
-            default: "root",
-            required: true,
-        },
-        password: {
-            type: FIELD_TYPES.PASSWORD,
-            required: true,
-        },
-        databaseName: {
-            type: FIELD_TYPES.STRING,
-            default: "_system",
-            required: true,
-        },
-        collection: {
-            type: FIELD_TYPES.STRING,
-            required: true,
-        },
+  docs: "https://github.com/arangodb/arangojs",
+  datasource: {
+    url: {
+      type: FIELD_TYPES.STRING,
+      default: "http://localhost:8529",
+      required: true,
     },
-    query: {
-        read: {
-            type: QUERY_TYPES.SQL,
-        },
-        create: {
-            type: QUERY_TYPES.JSON,
-        },
+    username: {
+      type: FIELD_TYPES.STRING,
+      default: "root",
+      required: true,
     },
+    password: {
+      type: FIELD_TYPES.PASSWORD,
+      required: true,
+    },
+    databaseName: {
+      type: FIELD_TYPES.STRING,
+      default: "_system",
+      required: true,
+    },
+    collection: {
+      type: FIELD_TYPES.STRING,
+      required: true,
+    },
+  },
+  query: {
+    read: {
+      type: QUERY_TYPES.SQL,
+    },
+    create: {
+      type: QUERY_TYPES.JSON,
+    },
+  },
 }
 
 class ArangoDBIntegration {
-    constructor(config) {
-        config.auth = {
-            username: config.username,
-            password: config.password,
-        }
-        
-        this.config = config
-        this.client = new Database(config)
+  constructor(config) {
+    config.auth = {
+      username: config.username,
+      password: config.password,
     }
 
-    async read(query) {
-        try {
-            const result = await this.client.query(query.sql)
-            let rl = []
-            await result.forEach((r)=> rl.push(r))
-            return rl
-        } catch (err) {
-            console.error("Error querying arangodb",err.message)
-            throw err
-        } finally {
-            this.client.close()
-        }
-    }
+    this.config = config
+    this.client = new Database(config)
+  }
 
-    async create(query) {
-        const clc = this.client.collection(this.config.collection)
-        try {
-            const result = await this.client.query(aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`)
-            let rl = []
-            await result.forEach((r)=> rl.push(r))
-            return rl
-        } catch (err) {
-            console.error("Error querying arangodb",err.message)
-            throw err
-        } finally {
-            this.client.close()
-        }
+  async read(query) {
+    try {
+      const result = await this.client.query(query.sql)
+      let rl = []
+      await result.forEach(r => rl.push(r))
+      return rl
+    } catch (err) {
+      console.error("Error querying arangodb", err.message)
+      throw err
+    } finally {
+      this.client.close()
     }
+  }
+
+  async create(query) {
+    const clc = this.client.collection(this.config.collection)
+    try {
+      const result = await this.client.query(
+        aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`
+      )
+      let rl = []
+      await result.forEach(r => rl.push(r))
+      return rl
+    } catch (err) {
+      console.error("Error querying arangodb", err.message)
+      throw err
+    } finally {
+      this.client.close()
+    }
+  }
 }
 
 module.exports = {
   schema: SCHEMA,
   integration: ArangoDBIntegration,
-}
\ No newline at end of file
+}

From 2f167d8245172f738819a9b44cab924e6155263a Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 22:20:15 +0800
Subject: [PATCH 10/21] add arangodb integration

---
 packages/server/src/integrations/arangodb.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index 2b3ee1b11b..c886b6b918 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -52,9 +52,7 @@ class ArangoDBIntegration {
   async read(query) {
     try {
       const result = await this.client.query(query.sql)
-      let rl = []
-      await result.forEach(r => rl.push(r))
-      return rl
+      return result.forEach(r => rl.push(r))
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err
@@ -69,9 +67,7 @@ class ArangoDBIntegration {
       const result = await this.client.query(
         aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`
       )
-      let rl = []
-      await result.forEach(r => rl.push(r))
-      return rl
+      return result.forEach(r => rl.push(r))
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err

From 136faa243b2681dd5d6a559f4482bbfc40d6bef6 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 22:23:17 +0800
Subject: [PATCH 11/21] fix a little space

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

diff --git a/packages/server/src/integrations/index.js b/packages/server/src/integrations/index.js
index 8ff89f4900..9f9d5a1530 100644
--- a/packages/server/src/integrations/index.js
+++ b/packages/server/src/integrations/index.js
@@ -32,7 +32,7 @@ const INTEGRATIONS = {
   SQL_SERVER: sqlServer.integration,
   AIRTABLE: airtable.integration,
   MYSQL: mysql.integration,
-  ARANGODB:　arangodb.integration,
+  ARANGODB: arangodb.integration,
 }
 
 module.exports = {

From faaf4c6a270040a09ae9ce255f2931e16778e1a1 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 22:26:53 +0800
Subject: [PATCH 12/21] this commit is ok

---
 packages/server/src/integrations/arangodb.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index c886b6b918..f4feed8246 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -52,6 +52,7 @@ class ArangoDBIntegration {
   async read(query) {
     try {
       const result = await this.client.query(query.sql)
+      let rl = []
       return result.forEach(r => rl.push(r))
     } catch (err) {
       console.error("Error querying arangodb", err.message)
@@ -67,6 +68,7 @@ class ArangoDBIntegration {
       const result = await this.client.query(
         aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`
       )
+      let rl = []
       return result.forEach(r => rl.push(r))
     } catch (err) {
       console.error("Error querying arangodb", err.message)

From 3f1797acd673177eac3fe9bda1b3b55fdbdfc992 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 22:35:41 +0800
Subject: [PATCH 13/21] cannot return result directly fix it

---
 packages/server/src/integrations/arangodb.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index f4feed8246..2b3ee1b11b 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -53,7 +53,8 @@ class ArangoDBIntegration {
     try {
       const result = await this.client.query(query.sql)
       let rl = []
-      return result.forEach(r => rl.push(r))
+      await result.forEach(r => rl.push(r))
+      return rl
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err
@@ -69,7 +70,8 @@ class ArangoDBIntegration {
         aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`
       )
       let rl = []
-      return result.forEach(r => rl.push(r))
+      await result.forEach(r => rl.push(r))
+      return rl
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err

From a2bafdc814bd6003aa6892f6ebf27e1c0cb778d2 Mon Sep 17 00:00:00 2001
From: sovlookup <805408477@qq.com>
Date: Thu, 28 Jan 2021 23:08:53 +0800
Subject: [PATCH 14/21] prettify code

---
 packages/server/src/integrations/arangodb.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/integrations/arangodb.js b/packages/server/src/integrations/arangodb.js
index 2b3ee1b11b..10449fc967 100644
--- a/packages/server/src/integrations/arangodb.js
+++ b/packages/server/src/integrations/arangodb.js
@@ -52,9 +52,7 @@ class ArangoDBIntegration {
   async read(query) {
     try {
       const result = await this.client.query(query.sql)
-      let rl = []
-      await result.forEach(r => rl.push(r))
-      return rl
+      return result.all()
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err
@@ -67,11 +65,9 @@ class ArangoDBIntegration {
     const clc = this.client.collection(this.config.collection)
     try {
       const result = await this.client.query(
-        aql`INSERT ${query.json} INTO ${clc} LET n = NEW RETURN NEW`
+        aql`INSERT ${query.json} INTO ${clc} RETURN NEW`
       )
-      let rl = []
-      await result.forEach(r => rl.push(r))
-      return rl
+      return result.all()
     } catch (err) {
       console.error("Error querying arangodb", err.message)
       throw err

From f745975a0c06b44b4796045b7b8864fc4243933c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 28 Jan 2021 19:32:13 +0000
Subject: [PATCH 15/21] privacy features + allow builder usage without cloud
 API key

---
 packages/builder/src/analytics.js             | 13 +++
 .../DatasourceNavigator/icons/ArangoDB.svelte | 53 ++++++++----
 .../components/settings/tabs/APIKeys.svelte   | 10 ++-
 .../start/BuilderSettingsModal.svelte         | 21 +++++
 .../components/start/CreateAppModal.svelte    | 42 +---------
 .../pages/[application]/deploy/index.svelte   | 12 +++
 packages/builder/src/pages/index.svelte       |  5 +-
 packages/server/yarn.lock                     | 81 ++++++++++++++++++-
 8 files changed, 172 insertions(+), 65 deletions(-)

diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index f59d71ac30..c68f228c12 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -106,6 +106,16 @@ function highlightFeedbackIcon() {
   return isFeedbackTimeElapsed(firstRunStr)
 }
 
+// Opt In/Out
+const ifAnalyticsEnabled = func => () => {
+  if (analyticsEnabled && process.env.POSTHOG_TOKEN) {
+    return func()
+  }
+}
+const disabled = () => posthog.has_opted_out_capturing()
+const optIn = () => posthog.opt_in_capturing()
+const optOut = () => posthog.opt_out_capturing()
+
 export default {
   activate,
   identify,
@@ -115,4 +125,7 @@ export default {
   requestFeedbackOnDeploy,
   submitFeedback,
   highlightFeedbackIcon,
+  disabled: ifAnalyticsEnabled(disabled),
+  optIn: ifAnalyticsEnabled(optIn),
+  optOut: ifAnalyticsEnabled(optOut),
 }
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
index 0be4ca2663..d305c08af0 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/ArangoDB.svelte
@@ -3,20 +3,39 @@
   export let height = "100"
 </script>
 
-
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" {width} {height} viewBox="0 0 2900 2000" >
-<g id="layer101">
- <path fill="#5b350f" d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z"/>
- </g>
-<g id="layer102">
- <path fill="#406f23" d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z m460 -643 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -51 -100 -126 -173 -238 -230 l-89 -45 -131 0 c-151 0 -222 18 -323 84 -138 89 -243 264 -243 406 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z"/>
- </g>
-<g id="layer103">
- <path fill="#c6d821" d="M2215 1789 c-27 -4 -68 -15 -90 -23 -42 -15 -264 -116 -397 -180 l-77 -38 78 -102 c102 -134 144 -208 175 -305 37 -116 49 -200 44 -309 -7 -157 -46 -218 -175 -278 -94 -44 -178 -56 -313 -43 -108 10 -401 53 -479 70 -24 5 -45 8 -47 6 -2 -2 20 -44 49 -92 67 -115 176 -225 281 -284 87 -49 235 -103 335 -121 91 -16 253 -14 346 5 175 37 269 95 419 264 307 347 422 563 457 859 18 148 9 247 -29 325 -88 179 -340 286 -577 246z"/>
- <path fill="#c6d821" d="M549 1680 c-272 -34 -426 -142 -495 -346 -22 -68 -26 -91 -22 -164 6 -115 32 -173 112 -248 70 -65 236 -153 370 -196 241 -79 722 -172 985 -192 180 -14 343 55 404 170 34 64 30 168 -11 271 -88 223 -245 373 -568 542 -222 116 -379 161 -584 168 -69 2 -155 0 -191 -5z m646 -340 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -50 -100 -126 -173 -235 -229 -84 -42 -90 -44 -200 -48 -190 -8 -312 37 -434 161 -98 99 -155 221 -155 331 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z"/>
- </g>
-<g id="layer104">
- <path fill="#f6f654" d="M2190 1721 c-57 -19 -469 -184 -494 -198 -12 -7 -5 -21 34 -72 28 -35 71 -96 97 -137 l46 -74 69 0 c38 0 83 -6 102 -14 52 -22 105 -75 139 -140 28 -55 32 -70 32 -147 0 -84 -2 -90 -48 -183 -96 -187 -234 -296 -376 -296 -44 0 -80 7 -110 20 -28 13 -65 20 -105 20 -72 0 -264 22 -426 49 -63 10 -117 17 -118 15 -10 -8 59 -113 110 -169 106 -115 238 -183 448 -231 155 -35 313 -29 447 17 78 27 210 117 279 191 82 89 277 353 336 456 92 159 137 344 125 513 -9 117 -37 189 -101 258 -109 116 -332 172 -486 122z"/>
- <path fill="#f6f654" d="M490 1624 c-153 -33 -275 -125 -339 -257 -54 -109 -59 -201 -17 -301 32 -76 164 -189 288 -245 51 -23 260 -91 281 -91 3 0 -21 25 -54 56 -94 91 -150 193 -170 313 -14 90 1 111 123 172 161 81 195 91 343 96 111 5 143 2 215 -16 221 -55 380 -192 380 -327 0 -52 -46 -143 -106 -212 -75 -85 -233 -170 -323 -173 -25 -1 -25 -1 4 -10 140 -43 411 -62 527 -38 142 30 238 125 238 234 0 88 -58 230 -139 337 -105 139 -431 343 -676 423 -161 52 -429 71 -575 39z"/>
- </g>
-</svg>
\ No newline at end of file
+<svg
+  version="1.1"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  x="0px"
+  y="0px"
+  {width}
+  {height}
+  viewBox="0 0 2900 2000">
+  <g id="layer101">
+    <path
+      fill="#5b350f"
+      d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z" />
+  </g>
+  <g id="layer102">
+    <path
+      fill="#406f23"
+      d="M735 1983 c-137 -19 -322 -95 -431 -175 -138 -103 -250 -315 -284 -542 -24 -161 22 -298 129 -382 123 -97 318 -180 577 -243 l130 -32 29 -67 c41 -94 135 -231 199 -289 292 -267 732 -319 1094 -128 148 79 224 151 418 400 137 176 173 242 228 414 41 130 70 301 70 416 0 236 -146 421 -382 484 -206 56 -392 19 -733 -144 -96 -47 -181 -85 -189 -85 -7 0 -61 46 -119 103 -163 159 -283 231 -433 261 -71 15 -229 19 -303 9z m460 -643 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -51 -100 -126 -173 -238 -230 l-89 -45 -131 0 c-151 0 -222 18 -323 84 -138 89 -243 264 -243 406 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z" />
+  </g>
+  <g id="layer103">
+    <path
+      fill="#c6d821"
+      d="M2215 1789 c-27 -4 -68 -15 -90 -23 -42 -15 -264 -116 -397 -180 l-77 -38 78 -102 c102 -134 144 -208 175 -305 37 -116 49 -200 44 -309 -7 -157 -46 -218 -175 -278 -94 -44 -178 -56 -313 -43 -108 10 -401 53 -479 70 -24 5 -45 8 -47 6 -2 -2 20 -44 49 -92 67 -115 176 -225 281 -284 87 -49 235 -103 335 -121 91 -16 253 -14 346 5 175 37 269 95 419 264 307 347 422 563 457 859 18 148 9 247 -29 325 -88 179 -340 286 -577 246z" />
+    <path
+      fill="#c6d821"
+      d="M549 1680 c-272 -34 -426 -142 -495 -346 -22 -68 -26 -91 -22 -164 6 -115 32 -173 112 -248 70 -65 236 -153 370 -196 241 -79 722 -172 985 -192 180 -14 343 55 404 170 34 64 30 168 -11 271 -88 223 -245 373 -568 542 -222 116 -379 161 -584 168 -69 2 -155 0 -191 -5z m646 -340 c163 -51 296 -150 329 -246 23 -69 20 -93 -20 -174 -50 -100 -126 -173 -235 -229 -84 -42 -90 -44 -200 -48 -190 -8 -312 37 -434 161 -98 99 -155 221 -155 331 0 62 12 76 120 134 160 85 229 102 405 96 87 -2 139 -9 190 -25z" />
+  </g>
+  <g id="layer104">
+    <path
+      fill="#f6f654"
+      d="M2190 1721 c-57 -19 -469 -184 -494 -198 -12 -7 -5 -21 34 -72 28 -35 71 -96 97 -137 l46 -74 69 0 c38 0 83 -6 102 -14 52 -22 105 -75 139 -140 28 -55 32 -70 32 -147 0 -84 -2 -90 -48 -183 -96 -187 -234 -296 -376 -296 -44 0 -80 7 -110 20 -28 13 -65 20 -105 20 -72 0 -264 22 -426 49 -63 10 -117 17 -118 15 -10 -8 59 -113 110 -169 106 -115 238 -183 448 -231 155 -35 313 -29 447 17 78 27 210 117 279 191 82 89 277 353 336 456 92 159 137 344 125 513 -9 117 -37 189 -101 258 -109 116 -332 172 -486 122z" />
+    <path
+      fill="#f6f654"
+      d="M490 1624 c-153 -33 -275 -125 -339 -257 -54 -109 -59 -201 -17 -301 32 -76 164 -189 288 -245 51 -23 260 -91 281 -91 3 0 -21 25 -54 56 -94 91 -150 193 -170 313 -14 90 1 111 123 172 161 81 195 91 343 96 111 5 143 2 215 -16 221 -55 380 -192 380 -327 0 -52 -46 -143 -106 -212 -75 -85 -233 -170 -323 -173 -25 -1 -25 -1 4 -10 140 -43 411 -62 527 -38 142 30 238 125 238 234 0 88 -58 230 -139 337 -105 139 -431 343 -676 423 -161 52 -429 71 -575 39z" />
+  </g>
+</svg>
diff --git a/packages/builder/src/components/settings/tabs/APIKeys.svelte b/packages/builder/src/components/settings/tabs/APIKeys.svelte
index 8e569596a4..82e66a12fd 100644
--- a/packages/builder/src/components/settings/tabs/APIKeys.svelte
+++ b/packages/builder/src/components/settings/tabs/APIKeys.svelte
@@ -1,6 +1,7 @@
 <script>
-  import { Input, Label } from "@budibase/bbui"
+  import { Input, Label, TextButton } from "@budibase/bbui"
   import api from "builderStore/api"
+  import { notifier } from "builderStore/store/notifications"
   import { backendUiStore } from "builderStore"
   import analytics from "analytics"
 
@@ -10,7 +11,7 @@
     if (key === "budibase") {
       const isValid = await analytics.identifyByApiKey(value)
       if (!isValid) {
-        // TODO: add validation message
+        notifier.danger("Your API Key is invalid.")
         keys = { ...keys }
         return
       }
@@ -38,7 +39,10 @@
     thin
     edit
     value={keys.budibase}
-    label="Budibase API Key" />
+    label="Budibase Cloud API Key" />
+  <TextButton text medium blue href="https://portal.budi.live">
+    Log in to the Budibase Hosting Portal to get your API Key. →
+  </TextButton>
   <div>
     <Label extraSmall grey>Instance ID (Webhooks)</Label>
     <span>{$backendUiStore.selectedDatabase._id}</span>
diff --git a/packages/builder/src/components/start/BuilderSettingsModal.svelte b/packages/builder/src/components/start/BuilderSettingsModal.svelte
index 6be420b5f9..ec3f3c7827 100644
--- a/packages/builder/src/components/start/BuilderSettingsModal.svelte
+++ b/packages/builder/src/components/start/BuilderSettingsModal.svelte
@@ -10,6 +10,8 @@
   let hostingInfo
   let selfhosted = false
 
+  $: analyticsDisabled = analytics.disabled()
+
   async function save() {
     hostingInfo.type = selfhosted ? HostingTypes.SELF : HostingTypes.CLOUD
     if (!selfhosted && hostingInfo._rev) {
@@ -35,6 +37,15 @@
     }
   }
 
+  function toggleAnalytics() {
+    console.log(analyticsDisabled)
+    if (analyticsDisabled) {
+      analytics.optIn()
+    } else {
+      analytics.optOut()
+    }
+  }
+
   onMount(async () => {
     hostingInfo = await hostingStore.actions.fetch()
     selfhosted = hostingInfo.type === "self"
@@ -59,6 +70,16 @@
     <Input bind:value={hostingInfo.selfHostKey} label="Hosting Key" />
     <Toggle thin text="HTTPS" bind:checked={hostingInfo.useHttps} />
   {/if}
+  <h5>Analytics</h5>
+  <p>
+    If you would like to send analytics that help us make budibase better,
+    please let us know below.
+  </p>
+  <Toggle
+    thin
+    text="Send Analytics To Budibase"
+    checked={!analyticsDisabled}
+    on:change={toggleAnalytics} />
 </ModalContent>
 
 <style>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 1e93892f86..836fbf2dd9 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -22,36 +22,11 @@
   //Move this to context="module" once svelte-forms is updated so that it can bind to stores correctly
   const createAppStore = writable({ currentStep: 0, values: {} })
 
-  export let hasKey
   export let template
 
-  let isApiKeyValid
   let lastApiKey
   let fetchApiKeyPromise
 
-  const validateApiKey = async apiKey => {
-    if (isApiKeyValid) return true
-    if (!apiKey) return false
-
-    // make sure we only fetch once, unless API Key is changed
-    if (isApiKeyValid === undefined || apiKey !== lastApiKey) {
-      lastApiKey = apiKey
-      // svelte reactivity was causing a requst to get fired mutiple times
-      // so, we make everything await the same promise, if one exists
-      if (!fetchApiKeyPromise) {
-        fetchApiKeyPromise = analytics.identifyByApiKey(apiKey)
-      }
-      isApiKeyValid = await fetchApiKeyPromise
-      fetchApiKeyPromise = undefined
-    }
-    return isApiKeyValid
-  }
-
-  const apiValidation = {
-    apiKey: string()
-      .required("Please enter your API key.")
-      .test("valid-apikey", "This API key is invalid", validateApiKey),
-  }
   const infoValidation = {
     applicationName: string().required("Your application must have a name."),
   }
@@ -66,9 +41,9 @@
   let submitting = false
   let errors = {}
   let validationErrors = {}
-  let validationSchemas = [apiValidation, infoValidation, userValidation]
+  let validationSchemas = [infoValidation, userValidation]
 
-  function buildStep(component) {
+  function buildStep(component, skippable) {
     return {
       component,
       errors,
@@ -76,7 +51,7 @@
   }
 
   // steps need to be initialized for cypress from the get go
-  let steps = [buildStep(API), buildStep(Info), buildStep(User)]
+  let steps = [buildStep(Info), buildStep(User)]
 
   onMount(async () => {
     let hostingInfo = await hostingStore.actions.fetch()
@@ -87,17 +62,11 @@
       infoValidation.applicationName = string()
         .required("Your application must have a name.")
         .notOneOf(existingAppNames)
-      isApiKeyValid = true
       steps = [buildStep(Info), buildStep(User)]
       validationSchemas = [infoValidation, userValidation]
     }
   })
 
-  if (hasKey) {
-    validationSchemas.shift()
-    steps.shift()
-  }
-
   // Handles form navigation
   const back = () => {
     if ($createAppStore.currentStep > 0) {
@@ -145,11 +114,6 @@
   async function createNewApp() {
     submitting = true
     try {
-      // Add API key if there is none.
-      if (!hasKey) {
-        await updateKey(["budibase", $createAppStore.values.apiKey])
-      }
-
       // Create App
       const appResp = await post("/api/applications", {
         name: $createAppStore.values.applicationName,
diff --git a/packages/builder/src/pages/[application]/deploy/index.svelte b/packages/builder/src/pages/[application]/deploy/index.svelte
index c1f081f571..d7e75e9a8e 100644
--- a/packages/builder/src/pages/[application]/deploy/index.svelte
+++ b/packages/builder/src/pages/[application]/deploy/index.svelte
@@ -17,6 +17,18 @@
   $: appId = $store.appId
 
   async function deployApp() {
+    // Must have cloud or self host API key to deploy
+    if (!$hostingStore.hostingInfo?.selfHostKey) {
+      const response = await api.get(`/api/keys/`)
+      const userKeys = await response.json()
+      if (!userKeys.budibase) {
+        notifier.danger(
+          "No budibase API Keys configured. You must set either a self hosted or cloud API key to deploy your budibase app."
+        )
+      }
+      return
+    }
+
     const DEPLOY_URL = `/api/deploy`
 
     try {
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index fcf0f5af52..7de3a2bb35 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { store } from "builderStore"
   import api from "builderStore/api"
   import AppList from "components/start/AppList.svelte"
   import { get } from "builderStore/api"
@@ -35,10 +36,6 @@
       hasKey = true
       analytics.identify(keys.userId)
     }
-
-    if (!keys.budibase) {
-      modal.show()
-    }
   }
 
   function selectTemplate(newTemplate) {
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 55450d3e0c..36efad1747 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -947,6 +947,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.8.tgz#fe2012f2355e4ce08bca44aeb3abbb21cf88d33f"
   integrity sha512-KPcKqKm5UKDkaYPTuXSx8wEP7vE9GnuaXIZKijwRYcePpZFDVuy2a57LarFKiORbHOuTOOwYzxVxcUzsh2P2Pw==
 
+"@types/node@>=13.13.4":
+  version "14.14.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
+  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
+
 "@types/node@>=8.0.0 <15":
   version "14.14.20"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340"
@@ -1278,6 +1283,17 @@ app-builder-lib@22.9.1:
     semver "^7.3.2"
     temp-file "^3.3.7"
 
+arangojs@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/arangojs/-/arangojs-7.2.0.tgz#e576926b4b3469c5a130cceba45fada8b5f015d1"
+  integrity sha512-9mQRCcttaG0lckapNF9TA71ZU7H2ATXK2a1w+0fj+Y4TlTP1bNDMIz3ZN+EnaSgEtwVu0rb6N6Ac97Yd56GmkQ==
+  dependencies:
+    "@types/node" ">=13.13.4"
+    es6-error "^4.0.1"
+    multi-part "^3.0.0"
+    x3-linkedlist "1.2.0"
+    xhr "^2.4.1"
+
 archive-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70"
@@ -2759,7 +2775,7 @@ es3ify@^0.2.2:
     jstransform "~11.0.0"
     through "~2.3.4"
 
-es6-error@^4.1.1:
+es6-error@^4.0.1, es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
@@ -3173,6 +3189,11 @@ file-type@^11.1.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-11.1.0.tgz#93780f3fed98b599755d846b99a1617a2ad063b8"
   integrity sha512-rM0UO7Qm9K7TWTtA6AShI/t7H5BPjDeGVDaNyg9BjHAj3PysKy7+8C8D137R88jnR3rFJZQB/tFgydl5sN5m7g==
 
+file-type@^12.1.0:
+  version "12.4.2"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9"
+  integrity sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==
+
 file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
@@ -3524,6 +3545,14 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
+global@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5441,11 +5470,19 @@ mime-db@1.44.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
-"mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
+mime-db@1.45.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
   version "1.45.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
   integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
+mime-kind@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime-kind/-/mime-kind-3.0.0.tgz#23bb3aba03ed6a1ea8c4f6093a9c7ab7121a9cb2"
+  integrity sha512-sx9lClVP7GXY2mO3aVDWTQLhfvAdDvNhGi3o3g7+ae3aKaoybeGbEIlnreoRKjrbDpvlPltlkIryxOtatojeXQ==
+  dependencies:
+    file-type "^12.1.0"
+    mime-types "^2.1.24"
+
 mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
@@ -5453,6 +5490,13 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.19, mime-types@~2.1.24:
   dependencies:
     mime-db "1.44.0"
 
+mime-types@^2.1.24:
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  dependencies:
+    mime-db "1.45.0"
+
 mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -5549,6 +5593,19 @@ mssql@^6.2.3:
     tarn "^1.1.5"
     tedious "^6.6.2"
 
+multi-part-lite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/multi-part-lite/-/multi-part-lite-1.0.0.tgz#7b86baf8ff83ef20ca13f1269a0f35aec42b9000"
+  integrity sha512-KxIRbBZZ45hoKX1ROD/19wJr0ql1bef1rE8Y1PCwD3PuNXV42pp7Wo8lEHYuAajoT4vfAFcd3rPjlkyEEyt1nw==
+
+multi-part@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/multi-part/-/multi-part-3.0.0.tgz#2bde386e8c1dcc9f15a2277267a7f5ed13aa0cc0"
+  integrity sha512-pDbdYQ6DLDxAsD83w9R7r7rlW56cETL7hIB5bCWX7FJYw0K+kL5JwHr0I8tRk9lGeFcAzf+2OEzXWlG/4wCnFw==
+  dependencies:
+    mime-kind "^3.0.0"
+    multi-part-lite "^1.0.0"
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -6452,6 +6509,11 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
 process@~0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
@@ -8264,6 +8326,11 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
+x3-linkedlist@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/x3-linkedlist/-/x3-linkedlist-1.2.0.tgz#c70467559b7c748595f0f79222af1d709402699e"
+  integrity sha512-mH/YwxpYSKNa8bDNF1yOuZCMuV+K80LtDN8vcLDUAwNazCxptDNsYt+zA/EJeYiGbdtKposhKLZjErGVOR8mag==
+
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
@@ -8279,6 +8346,16 @@ xhr@^2.0.1:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
+xhr@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d"
+  integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==
+  dependencies:
+    global "~4.4.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From 1f84372cccffce0de137b772e5c8b8890c0a8d23 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 28 Jan 2021 19:34:24 +0000
Subject: [PATCH 16/21] remove log

---
 .../builder/src/components/start/BuilderSettingsModal.svelte     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/start/BuilderSettingsModal.svelte b/packages/builder/src/components/start/BuilderSettingsModal.svelte
index ec3f3c7827..9409820662 100644
--- a/packages/builder/src/components/start/BuilderSettingsModal.svelte
+++ b/packages/builder/src/components/start/BuilderSettingsModal.svelte
@@ -38,7 +38,6 @@
   }
 
   function toggleAnalytics() {
-    console.log(analyticsDisabled)
     if (analyticsDisabled) {
       analytics.optIn()
     } else {

From d3e398984c9a9494f13f4c06b8173275b89bf946 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 28 Jan 2021 19:35:04 +0000
Subject: [PATCH 17/21] remove superfluous param

---
 packages/builder/src/components/start/CreateAppModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 836fbf2dd9..945295ec51 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -43,7 +43,7 @@
   let validationErrors = {}
   let validationSchemas = [infoValidation, userValidation]
 
-  function buildStep(component, skippable) {
+  function buildStep(component) {
     return {
       component,
       errors,

From f7aa34be1323fefa64ced534fd6bed34cd3020b4 Mon Sep 17 00:00:00 2001
From: yashank09 <yashank@hey.com>
Date: Thu, 28 Jan 2021 23:23:44 -0800
Subject: [PATCH 18/21] adds placeholder on automation trigger

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

diff --git a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
index 8855fb6895..50e7346876 100644
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@@ -43,6 +43,7 @@
       <Input
         value={field.name}
         secondary
+        placeholder="Enter field name"
         on:change={fieldNameChanged(field.name)} />
       <Select
         secondary

From c8b8ddb67fd9fd83ca0af8ef0ca4f32713f1a058 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 29 Jan 2021 10:41:08 +0000
Subject: [PATCH 19/21] add support for staging image that gets built on master
 push

---
 .github/workflows/budibase_ci.yml              |  9 +++++++++
 hosting/scripts/linux/release-to-docker-hub.sh | 10 ++++++++--
 package.json                                   |  3 ++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index e03768a420..ccbfa3ae24 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -34,3 +34,12 @@ jobs:
         CI: true
         name: Budibase CI
     - run: yarn test:e2e:ci
+
+    - name: Build and Push Staging Docker Image
+      # Only run on push
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      run: yarn build:staging:docker
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
+
diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index b1921916e4..1661fed9f0 100755
--- a/hosting/scripts/linux/release-to-docker-hub.sh
+++ b/hosting/scripts/linux/release-to-docker-hub.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
+
+tag=$1
+tag=${tag:-latest}
+
 pushd ../../build
 docker-compose build --force app-service
 docker-compose build --force worker-service
-docker tag build_app-service budibase/budibase-apps:latest
+
+docker tag build_app-service budibase/budibase-apps:$tag
+docker tag build_worker-service budibase/budibase-worker:$tag
+
 docker push budibase/budibase-apps
-docker tag build_worker-service budibase/budibase-worker:latest
 docker push budibase/budibase-worker
 popd
diff --git a/package.json b/package.json
index 37efca51ba..037e9c4b1c 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "format": "prettier --write \"{,!(node_modules)/**/}*.{js,jsx,svelte}\"",
     "test:e2e": "lerna run cy:test",
     "test:e2e:ci": "lerna run cy:ci",
-    "build:docker": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -"
+    "build:docker": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
+    "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
   }
 }

From 1aa86f4bffcbf712b68118924c35fb67f6f1140a Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Fri, 29 Jan 2021 10:45:11 +0000
Subject: [PATCH 20/21] adding docker login command

---
 .github/workflows/budibase_ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index ccbfa3ae24..171780a058 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -38,7 +38,9 @@ jobs:
     - name: Build and Push Staging Docker Image
       # Only run on push
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-      run: yarn build:staging:docker
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+        yarn build:staging:docker
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}

From 5f727d6913448e3cb8c2b37fd9ea5a47b6e85829 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Fri, 29 Jan 2021 12:11:40 +0000
Subject: [PATCH 21/21] Update budibase_ci.yml

---
 .github/workflows/budibase_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 171780a058..bd10833f91 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -40,7 +40,7 @@ jobs:
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       run: |
         docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        yarn build:staging:docker
+        yarn build:docker:staging
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}