From 58019592c8808133f641ac0fdb88008d9c9f34b4 Mon Sep 17 00:00:00 2001
From: Joe <49767913+joebudi@users.noreply.github.com>
Date: Tue, 26 Jan 2021 22:42:31 +0000
Subject: [PATCH 1/7] Minor ui updates

Padding and spacing improved
---
 packages/builder/package.json                 |  2 +-
 .../PropertiesPanel/BindingPanel.svelte       | 21 +++++++-------
 .../EventsEditor/EventEditor.svelte           | 28 ++++++++-----------
 .../EventsEditor/EventEditorModal.svelte      |  2 +-
 packages/builder/yarn.lock                    |  8 +++---
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/packages/builder/package.json b/packages/builder/package.json
index 41b98750e9..52fa846db3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.54.1",
+    "@budibase/bbui": "^1.55.2",
     "@budibase/client": "^0.5.3",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/string-templates": "^0.5.3",
diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index 612dc9caa5..7e91759764 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -26,10 +26,8 @@
 <div class="drawer-contents">
   <div class="container" data-cy="binding-dropdown-modal">
     <div class="list">
-      <Heading extraSmall>Objects</Heading>
-      <Spacer medium />
       {#if context}
-        <Heading extraSmall>Tables</Heading>
+        <Heading extraSmall>Columns</Heading>
         <ul>
           {#each context as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
@@ -53,8 +51,8 @@
       <TextArea
         thin
         bind:value
-        placeholder="Add text, or click the objects on the left to add them to the
-        textbox." />
+        placeholder="Add text, or click the objects on the left to add them to
+        the textbox." />
     </div>
   </div>
 </div>
@@ -63,15 +61,14 @@
   .container {
     height: 100%;
     display: grid;
-    grid-template-columns: auto 1fr;
+    grid-template-columns: 260px 1fr;
   }
   .list {
-    width: 150px;
-    border-right: 1.5px solid var(--grey-4);
-    padding: var(--spacing-s);
+    border-right: var(--border-light);
+    padding: var(--spacing-l);
   }
   .text {
-    padding: var(--spacing-s);
+    padding: var(--spacing-xl);
     font-family: var(--font-sans);
   }
   .text :global(p) {
@@ -89,10 +86,12 @@
     font-family: var(--font-sans);
     font-size: var(--font-size-xs);
     color: var(--grey-7);
-    padding: var(--spacing-s) 0;
+    padding: var(--spacing-m) 0;
     margin: auto 0px;
     align-items: center;
     cursor: pointer;
+    border: var(--border-light);
+    border-width: 1px 0 1px 0;
   }
 
   li:hover {
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 f15b87d867..701e416c2f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
@@ -1,10 +1,10 @@
 <script>
   import {
     Button,
-    TextButton,
     Body,
     DropdownMenu,
     ModalContent,
+    Spacer,
   } from "@budibase/bbui"
   import { AddIcon, ArrowDownIcon } from "components/common/Icons/"
   import actionTypes from "./actions"
@@ -48,12 +48,11 @@
   <div class="actions-list">
     <div>
       <div bind:this={addActionButton}>
-        <TextButton text small blue on:click={addActionDropdown.show}>
-          <div style="height: 20px; width: 20px;">
-            <AddIcon />
-          </div>
+        <Spacer small />
+        <Button wide secondary on:click={addActionDropdown.show}>
           Add Action
-        </TextButton>
+        </Button>
+        <Spacer medium />
       </div>
       <DropdownMenu
         bind:this={addActionDropdown}
@@ -74,13 +73,12 @@
         <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
             class="ri-close-fill"
-            style="margin-left: var(--spacing-m);"
+            style="margin-left: auto;"
             on:click={() => deleteAction(index)} />
         </div>
       {/each}
@@ -107,7 +105,7 @@
 
   .action-header > span {
     margin-bottom: var(--spacing-m);
-    font-size: var(--font-size-s);
+    font-size: var(--font-size-xs);
   }
 
   .action-header > span:hover,
@@ -123,7 +121,7 @@
 
   .available-action {
     padding: var(--spacing-s);
-    font-size: var(--font-size-m);
+    font-size: var(--font-size-xs);
     cursor: pointer;
   }
 
@@ -135,7 +133,7 @@
     height: 40vh;
     display: grid;
     grid-gap: var(--spacing-m);
-    grid-template-columns: 15% 1fr;
+    grid-template-columns: 260px 1fr;
     grid-auto-flow: column;
     min-height: 0;
     padding-top: 0;
@@ -143,15 +141,13 @@
   }
 
   .action-container {
-    border: var(--border-light);
-    border-width: 1px 0 0 0;
+    border-top: var(--border-light);
     display: flex;
     align-items: center;
   }
 
   .selected-action-container {
-    padding-bottom: var(--spacing-s);
-    padding-top: var(--spacing-s);
+    padding: var(--spacing-xl);
   }
 
   a {
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte
index ac976317ec..97c6a310fc 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte
@@ -156,7 +156,7 @@
   }
 
   .available-action {
-    padding: var(--spacing-s);
+    padding: var(--spacing-m);
     font-size: var(--font-size-m);
     cursor: pointer;
   }
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 85bbdab526..fb269dda5e 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -842,10 +842,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.54.1":
-  version "1.54.1"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.54.1.tgz#ad0439c0be6a4dc818cd9dacda00f053b0daa9d5"
-  integrity sha512-ZY2OP/tF+ReMSyzZIGZV6wpQ4eIEzYGxZV3n+C+oNjzK5u3rwWPCDEVDlZgJSqJ61z+sEf2zuIyAh88lq9RTaA==
+"@budibase/bbui@^1.55.2":
+  version "1.55.2"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.2.tgz#be636e8b86b7e516a08eb626bb50c4b1f9774bf8"
+  integrity sha512-CevH/olxDFIko9uwYUpUTevPmpShrLwJSR7+wn/JetZERwhTwbLhOXzpsyXaK226qQ8vWhm0U31HRSKI1HwDDg==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"

From 032cce7bcd0f45ea9cbfb57aad6f1cde09cd1568 Mon Sep 17 00:00:00 2001
From: Joe <49767913+joebudi@users.noreply.github.com>
Date: Wed, 27 Jan 2021 09:44:58 +0000
Subject: [PATCH 2/7] Further spacing improvements

Spacing improvements
Red color applied to X hover
List of bindable objects is now scrollable without a visual of the scrollbar
---
 .../components/design/PropertiesPanel/BindingPanel.svelte  | 7 +++++++
 .../PropertyControls/EventsEditor/EventEditor.svelte       | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
index 7e91759764..8bfae51337 100644
--- a/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte
@@ -28,6 +28,7 @@
     <div class="list">
       {#if context}
         <Heading extraSmall>Columns</Heading>
+        <Spacer small />
         <ul>
           {#each context as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
@@ -66,7 +67,13 @@
   .list {
     border-right: var(--border-light);
     padding: var(--spacing-l);
+    overflow: auto;
   }
+
+  .list::-webkit-scrollbar {
+    display: none;
+  }
+
   .text {
     padding: var(--spacing-xl);
     font-family: var(--font-sans);
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 701e416c2f..86e5174473 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
@@ -115,7 +115,7 @@
   }
 
   .actions-list {
-    border: var(--border-light);
+    border-right: var(--border-light);
     padding: var(--spacing-s);
   }
 
@@ -160,4 +160,9 @@
   a:hover {
     color: var(--blue);
   }
+
+  i:hover {
+    color: var(--red);
+    cursor: pointer;
+  }
 </style>

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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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": {