From 64330999f0f82de9971f60837bb992b713f54cd1 Mon Sep 17 00:00:00 2001
From: Conor_Mack <cmckeown101@gmail.com>
Date: Tue, 31 Mar 2020 10:22:23 +0100
Subject: [PATCH 1/9] Bugfix: datepicker needed to pass _bb down to the
 textfiel

---
 .../materialdesign-components/src/DatePicker/DatePicker.svelte  | 1 +
 .../materialdesign-components/src/Textfield/Textfield.svelte    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
index bfc250ede6..f9db97a107 100644
--- a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
+++ b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
@@ -98,6 +98,7 @@
 
 <div class="mdc-menu-surface--anchor">
   <Textfield
+    {_bb}
     {label}
     onChange={dateFieldChange}
     value={selectedDate}
diff --git a/packages/materialdesign-components/src/Textfield/Textfield.svelte b/packages/materialdesign-components/src/Textfield/Textfield.svelte
index ace20dbf3f..046c3ebc6e 100644
--- a/packages/materialdesign-components/src/Textfield/Textfield.svelte
+++ b/packages/materialdesign-components/src/Textfield/Textfield.svelte
@@ -129,6 +129,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderLeadingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--leading"
             onClick={iconButtonClick} />
@@ -152,6 +153,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderTrailingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--trailing"
             onClick={iconButtonClick} />

From 178758484788c65ea89337656f8540328cea650f Mon Sep 17 00:00:00 2001
From: Conor_Mack <cmckeown101@gmail.com>
Date: Tue, 31 Mar 2020 10:27:29 +0100
Subject: [PATCH 2/9] removing debuggers

---
 packages/materialdesign-components/src/Checkbox/Checkbox.svelte  | 1 -
 .../materialdesign-components/src/Checkbox/CheckboxGroup.svelte  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/materialdesign-components/src/Checkbox/Checkbox.svelte b/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
index 9a6c6119fb..205efd400a 100644
--- a/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
+++ b/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
@@ -68,7 +68,6 @@
 
   function handleOnClick() {
     let item = { _id, checked, label, value }
-    debugger
     if (context === "checkboxgroup") {
       let idx = selectedItems.getItemIdx($selectedItems, _id)
       if (idx > -1) {
diff --git a/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte b/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
index 2070e903b8..89449185f2 100644
--- a/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
+++ b/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
@@ -24,7 +24,6 @@
       if (_bb.isBound(_bb.props.value)) {
         _bb.setStateFromBinding(_bb.props.value, value)
       }
-      debugger
       _bb.call(onChange, value)
     }, value)
     _bb.setContext("BBMD:checkbox:selectedItemsStore", selectedItemsStore)

From ad496a7c3e0c5bf23d049dfd586796e351f11724 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Tue, 31 Mar 2020 14:44:04 +0100
Subject: [PATCH 3/9] v0.0.28

---
 lerna.json                                      | 2 +-
 packages/bootstrap-components/package.json      | 4 ++--
 packages/builder/package.json                   | 4 ++--
 packages/cli/package.json                       | 6 +++---
 packages/client/package.json                    | 2 +-
 packages/core/package.json                      | 2 +-
 packages/datastores/package.json                | 4 ++--
 packages/materialdesign-components/package.json | 6 +++---
 packages/server/package.json                    | 6 +++---
 packages/standard-components/package.json       | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lerna.json b/lerna.json
index c1db9b0eba..7bf0848466 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.27",
+  "version": "0.0.28",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/bootstrap-components/package.json b/packages/bootstrap-components/package.json
index 31983def43..6fe3fbaddb 100644
--- a/packages/bootstrap-components/package.json
+++ b/packages/bootstrap-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.28",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
     "npm-run-all": "^4.1.5",
@@ -30,7 +30,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.28",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }
diff --git a/packages/builder/package.json b/packages/builder/package.json
index fa92be46a2..f1da7cb1dc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -35,7 +35,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.28",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
     "date-fns": "^1.29.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8870733b15..1faa7f7df2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://budibase.com",
@@ -20,8 +20,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/datastores": "^0.0.27",
-    "@budibase/server": "^0.0.27",
+    "@budibase/datastores": "^0.0.28",
+    "@budibase/server": "^0.0.28",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "fs-extra": "^8.1.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 6af3018f49..ba1c54d4eb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5313825ef6..5a219b97df 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/core",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "core javascript library for budibase",
   "main": "dist/budibase-core.umd.js",
   "module": "dist/budibase-core.esm.js",
diff --git a/packages/datastores/package.json b/packages/datastores/package.json
index bc92da3570..3ddf4e2683 100644
--- a/packages/datastores/package.json
+++ b/packages/datastores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/datastores",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "implementations of all the datastores... azureblob, local etc",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@babel/core": "^7.1.2",
     "@babel/node": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
-    "@budibase/core": "^0.0.27",
+    "@budibase/core": "^0.0.28",
     "es6-promisify": "^6.0.1",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.13",
diff --git a/packages/materialdesign-components/package.json b/packages/materialdesign-components/package.json
index 7328dcfa0b..3db45af436 100644
--- a/packages/materialdesign-components/package.json
+++ b/packages/materialdesign-components/package.json
@@ -12,8 +12,8 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
-    "@budibase/standard-components": "^0.0.27",
+    "@budibase/client": "^0.0.28",
+    "@budibase/standard-components": "^0.0.28",
     "@material/button": "^4.0.0",
     "@material/checkbox": "^4.0.0",
     "@material/data-table": "4.0.0",
@@ -50,7 +50,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.28",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e",
   "dependencies": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 5a5b34d25f..ce8df33d0c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Budibase Web Server",
   "main": "index.js",
   "scripts": {
@@ -16,8 +16,8 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.0.27",
-    "@budibase/core": "^0.0.27",
+    "@budibase/client": "^0.0.28",
+    "@budibase/core": "^0.0.28",
     "@koa/router": "^8.0.0",
     "fs-extra": "^8.1.0",
     "koa": "^2.7.0",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index a4055224ff..0d6385f1e3 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.28",
     "@nx-js/compiler-util": "^2.0.0",
     "bcryptjs": "2.4.3",
     "fs-extra": "^8.1.0",
@@ -32,7 +32,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.28",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }

From 8d10915dc38abc71cec23515cb10a2e4f69e62a1 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Tue, 31 Mar 2020 16:33:23 +0100
Subject: [PATCH 4/9] temporary bugfix, links on homepage broken for 4001

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

diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte
index d8cc119108..f3cfe6a857 100644
--- a/packages/builder/src/NoPackage.svelte
+++ b/packages/builder/src/NoPackage.svelte
@@ -16,7 +16,7 @@
       <div>
         <h4 style="margin-bottom: 20px">Choose an Application</h4>
         {#each $store.apps as app}
-          <a href={`#/${app}`} class="app-link">{app}</a>
+          <a href={`#${app}`} class="app-link">{app}</a>
         {/each}
       </div>
     </div>

From dcf4f4963c0cc06d60434ccca5566bcff7f411b2 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Tue, 31 Mar 2020 16:33:40 +0100
Subject: [PATCH 5/9] v0.0.29

---
 lerna.json                                      | 2 +-
 packages/bootstrap-components/package.json      | 4 ++--
 packages/builder/package.json                   | 4 ++--
 packages/cli/package.json                       | 6 +++---
 packages/client/package.json                    | 2 +-
 packages/core/package.json                      | 2 +-
 packages/datastores/package.json                | 4 ++--
 packages/materialdesign-components/package.json | 6 +++---
 packages/server/package.json                    | 6 +++---
 packages/standard-components/package.json       | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7bf0848466..3470e54f0f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.28",
+  "version": "0.0.29",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/bootstrap-components/package.json b/packages/bootstrap-components/package.json
index 6fe3fbaddb..23e805c479 100644
--- a/packages/bootstrap-components/package.json
+++ b/packages/bootstrap-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.28",
+    "@budibase/client": "^0.0.29",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
     "npm-run-all": "^4.1.5",
@@ -30,7 +30,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.28",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f1da7cb1dc..9f4003cb8c 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -35,7 +35,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/client": "^0.0.28",
+    "@budibase/client": "^0.0.29",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
     "date-fns": "^1.29.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1faa7f7df2..c7dfcb3121 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://budibase.com",
@@ -20,8 +20,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/datastores": "^0.0.28",
-    "@budibase/server": "^0.0.28",
+    "@budibase/datastores": "^0.0.29",
+    "@budibase/server": "^0.0.29",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "fs-extra": "^8.1.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index ba1c54d4eb..634883b247 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5a219b97df..90f7b2022b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/core",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "core javascript library for budibase",
   "main": "dist/budibase-core.umd.js",
   "module": "dist/budibase-core.esm.js",
diff --git a/packages/datastores/package.json b/packages/datastores/package.json
index 3ddf4e2683..46454d5425 100644
--- a/packages/datastores/package.json
+++ b/packages/datastores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/datastores",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "implementations of all the datastores... azureblob, local etc",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@babel/core": "^7.1.2",
     "@babel/node": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
-    "@budibase/core": "^0.0.28",
+    "@budibase/core": "^0.0.29",
     "es6-promisify": "^6.0.1",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.13",
diff --git a/packages/materialdesign-components/package.json b/packages/materialdesign-components/package.json
index 3db45af436..299dd7bdda 100644
--- a/packages/materialdesign-components/package.json
+++ b/packages/materialdesign-components/package.json
@@ -12,8 +12,8 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.28",
-    "@budibase/standard-components": "^0.0.28",
+    "@budibase/client": "^0.0.29",
+    "@budibase/standard-components": "^0.0.29",
     "@material/button": "^4.0.0",
     "@material/checkbox": "^4.0.0",
     "@material/data-table": "4.0.0",
@@ -50,7 +50,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.28",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e",
   "dependencies": {
diff --git a/packages/server/package.json b/packages/server/package.json
index ce8df33d0c..4edfe6e1bc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "Budibase Web Server",
   "main": "index.js",
   "scripts": {
@@ -16,8 +16,8 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.0.28",
-    "@budibase/core": "^0.0.28",
+    "@budibase/client": "^0.0.29",
+    "@budibase/core": "^0.0.29",
     "@koa/router": "^8.0.0",
     "fs-extra": "^8.1.0",
     "koa": "^2.7.0",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 0d6385f1e3..6d76b20f01 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.28",
+    "@budibase/client": "^0.0.29",
     "@nx-js/compiler-util": "^2.0.0",
     "bcryptjs": "2.4.3",
     "fs-extra": "^8.1.0",
@@ -32,7 +32,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.28",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }

From 33a2dbd275d6b3c213bfbf0b1f7959ed06c6c271 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 31 Mar 2020 17:53:34 +0100
Subject: [PATCH 6/9] ability to delete databases

---
 .../modals/DeleteDatabase.svelte              | 35 +++++++++++++++++++
 .../database/ModelDataTable/modals/index.js   |  1 +
 packages/builder/src/nav/DatabasesList.svelte | 17 +++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte

diff --git a/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte b/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte
new file mode 100644
index 0000000000..10fe09fa55
--- /dev/null
+++ b/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte
@@ -0,0 +1,35 @@
+<script>
+  import Modal from "../../../common/Modal.svelte"
+  import { store } from "../../../builderStore"
+  import ActionButton from "../../../common/ActionButton.svelte"
+  import * as api from "../api"
+
+  export let onClosed
+
+  let databaseName
+
+  // async function deleteDatabase() {
+  //   const response = await api.deleteDatabase($)
+  //   store.createDatabaseForApp(response)
+  //   onClosed()
+  // }
+</script>
+
+<section>
+  Are you sure you want to delete {database}?
+  <footer>
+    <ActionButton disabled={!databaseName} on:click={deleteDatabase}>
+      Delete
+    </ActionButton>
+</section>
+
+<style>
+  footer {
+    position: absolute;
+    padding: 20px;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background: #fafafa;
+  }
+</style>
diff --git a/packages/builder/src/database/ModelDataTable/modals/index.js b/packages/builder/src/database/ModelDataTable/modals/index.js
index c986160961..7ddb1efd43 100644
--- a/packages/builder/src/database/ModelDataTable/modals/index.js
+++ b/packages/builder/src/database/ModelDataTable/modals/index.js
@@ -4,3 +4,4 @@ export { default as CreateEditModelModal } from "./CreateEditModel.svelte"
 export { default as CreateEditViewModal } from "./CreateEditView.svelte"
 export { default as CreateDatabaseModal } from "./CreateDatabase.svelte"
 export { default as CreateUserModal } from "./CreateUser.svelte"
+export { default as DeleteDatabaseModal } from "./DeleteDatabase.svelte"
diff --git a/packages/builder/src/nav/DatabasesList.svelte b/packages/builder/src/nav/DatabasesList.svelte
index b531d34351..441a28484c 100644
--- a/packages/builder/src/nav/DatabasesList.svelte
+++ b/packages/builder/src/nav/DatabasesList.svelte
@@ -1,6 +1,7 @@
 <script>
   import { tick } from "svelte"
   import { store, backendUiStore } from "../builderStore"
+  import api from "../builderStore/api"
   import getIcon from "../common/icon"
   import { CheckIcon } from "../common/Icons"
 
@@ -13,6 +14,17 @@
     backendUiStore.actions.views.select(views[0])
     backendUiStore.actions.database.select(database)
   }
+
+  async function deleteDatabase(database) {
+    const DELETE_DATABASE_URL = `/_builder/instance/_master/0/api/record/applications/${$store.appId}/instances/${database.id}`
+    const response = await api.delete(DELETE_DATABASE_URL)
+    store.update(state => {
+      state.appInstances = state.appInstances.filter(
+        db => db.id !== database.id
+      )
+      return state
+    })
+  }
 </script>
 
 <div class="root">
@@ -30,6 +42,9 @@
           on:click={() => selectDatabase(database)}>
           {database.name}
         </button>
+        <i
+          class="ri-close-line hoverable uk-margin-small-left"
+          on:click={() => deleteDatabase(database)} />
       </li>
     {/each}
   </ul>
@@ -53,6 +68,8 @@
 
   li {
     margin: 0.5rem 0;
+    display: flex;
+    align-items: center;
   }
 
   button {

From 125af724e524614396d0d3eda6b824627b247d72 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 31 Mar 2020 17:58:47 +0100
Subject: [PATCH 7/9] tidy up

---
 .../modals/DeleteDatabase.svelte              | 35 -------------------
 .../database/ModelDataTable/modals/index.js   |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte

diff --git a/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte b/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte
deleted file mode 100644
index 10fe09fa55..0000000000
--- a/packages/builder/src/database/ModelDataTable/modals/DeleteDatabase.svelte
+++ /dev/null
@@ -1,35 +0,0 @@
-<script>
-  import Modal from "../../../common/Modal.svelte"
-  import { store } from "../../../builderStore"
-  import ActionButton from "../../../common/ActionButton.svelte"
-  import * as api from "../api"
-
-  export let onClosed
-
-  let databaseName
-
-  // async function deleteDatabase() {
-  //   const response = await api.deleteDatabase($)
-  //   store.createDatabaseForApp(response)
-  //   onClosed()
-  // }
-</script>
-
-<section>
-  Are you sure you want to delete {database}?
-  <footer>
-    <ActionButton disabled={!databaseName} on:click={deleteDatabase}>
-      Delete
-    </ActionButton>
-</section>
-
-<style>
-  footer {
-    position: absolute;
-    padding: 20px;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    background: #fafafa;
-  }
-</style>
diff --git a/packages/builder/src/database/ModelDataTable/modals/index.js b/packages/builder/src/database/ModelDataTable/modals/index.js
index 7ddb1efd43..c986160961 100644
--- a/packages/builder/src/database/ModelDataTable/modals/index.js
+++ b/packages/builder/src/database/ModelDataTable/modals/index.js
@@ -4,4 +4,3 @@ export { default as CreateEditModelModal } from "./CreateEditModel.svelte"
 export { default as CreateEditViewModal } from "./CreateEditView.svelte"
 export { default as CreateDatabaseModal } from "./CreateDatabase.svelte"
 export { default as CreateUserModal } from "./CreateUser.svelte"
-export { default as DeleteDatabaseModal } from "./DeleteDatabase.svelte"

From 8dce9789b1249d081091872c772719fffc128ef8 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 31 Mar 2020 18:11:12 +0100
Subject: [PATCH 8/9] change icon

---
 packages/builder/src/nav/DatabasesList.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/nav/DatabasesList.svelte b/packages/builder/src/nav/DatabasesList.svelte
index 441a28484c..ba40b8c1b4 100644
--- a/packages/builder/src/nav/DatabasesList.svelte
+++ b/packages/builder/src/nav/DatabasesList.svelte
@@ -36,15 +36,15 @@
             <CheckIcon />
           {/if}
         </span>
-
+        <i
+          class="ri-delete-bin-7-line hoverable uk-margin-small-left"
+          on:click={() => deleteDatabase(database)} />
         <button
           class:active={database.id === $backendUiStore.selectedDatabase.id}
           on:click={() => selectDatabase(database)}>
           {database.name}
         </button>
-        <i
-          class="ri-close-line hoverable uk-margin-small-left"
-          on:click={() => deleteDatabase(database)} />
+
       </li>
     {/each}
   </ul>

From fe89a4fcd190fc8f0cb30fd2d25099996a5e9e6d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 1 Apr 2020 10:17:03 +0100
Subject: [PATCH 9/9] choose first db if none selected

---
 packages/builder/src/nav/DatabasesList.svelte | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/nav/DatabasesList.svelte b/packages/builder/src/nav/DatabasesList.svelte
index ba40b8c1b4..c6607d2844 100644
--- a/packages/builder/src/nav/DatabasesList.svelte
+++ b/packages/builder/src/nav/DatabasesList.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tick } from "svelte"
+  import { tick, onMount } from "svelte"
   import { store, backendUiStore } from "../builderStore"
   import api from "../builderStore/api"
   import getIcon from "../common/icon"
@@ -25,6 +25,12 @@
       return state
     })
   }
+
+  onMount(() => {
+    if ($store.appInstances.length > 0) {
+      selectDatabase($store.appInstances[0]);
+    }
+  })
 </script>
 
 <div class="root">