From 78aae99e39bb7bbe0dced24da853e847f77f7b5f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 10:59:24 +0100
Subject: [PATCH 01/18] prevent duplicate table names

---
 .../popovers/CreateEditColumnPopover.svelte   | 22 ++++++++++---------
 .../modals/CreateTableModal.svelte            | 17 ++++++++++++--
 .../popovers/EditTablePopover.svelte          | 19 ++++++++++++++--
 .../standard-components/src/Navigation.svelte | 12 ++++++----
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
index 2e2ad6f158..bc076266e5 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
@@ -65,16 +65,18 @@
 <div class="actions">
   <Input label="Name" thin bind:value={field.name} />
 
-  <Select
-    secondary
-    thin
-    label="Type"
-    on:change={handleFieldConstraints}
-    bind:value={field.type}>
-    {#each Object.values(fieldDefinitions) as field}
-      <option value={field.type}>{field.name}</option>
-    {/each}
-  </Select>
+  {#if !originalName}
+    <Select
+      secondary
+      thin
+      label="Type"
+      on:change={handleFieldConstraints}
+      bind:value={field.type}>
+      {#each Object.values(fieldDefinitions) as field}
+        <option value={field.type}>{field.name}</option>
+      {/each}
+    </Select>
+  {/if}
 
   {#if field.type !== 'link'}
     <Toggle
diff --git a/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
index ed369f45d3..cbb7a8fba1 100644
--- a/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
@@ -20,10 +20,21 @@
   let modal
   let name
   let dataImport
+  let error = ""
 
   function resetState() {
     name = ""
     dataImport = undefined
+    error = ""
+  }
+
+  function checkValid(evt) {
+    const tableName = evt.target.value
+    if ($backendUiStore.models.some(model => model.name === tableName)) {
+      error = `Table with name ${tableName} already exists. Please choose another name.`
+      return
+    }
+    error = ""
   }
 
   async function saveTable() {
@@ -61,12 +72,14 @@
     title="Create Table"
     confirmText="Create"
     onConfirm={saveTable}
-    disabled={!name || (dataImport && !dataImport.valid)}>
+    disabled={error || !name || (dataImport && !dataImport.valid)}>
     <Input
       data-cy="table-name-input"
       thin
       label="Table Name"
-      bind:value={name} />
+      on:input={checkValid}
+      bind:value={name}
+      {error} />
     <div>
       <Label grey extraSmall>Create Table from CSV (Optional)</Label>
       <TableDataImport bind:dataImport />
diff --git a/packages/builder/src/components/backend/ModelNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/ModelNavigator/popovers/EditTablePopover.svelte
index 028b78a1e8..36ccbb4800 100644
--- a/packages/builder/src/components/backend/ModelNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/popovers/EditTablePopover.svelte
@@ -11,6 +11,8 @@
   let dropdown
   let editing
   let confirmDeleteDialog
+  let error = ""
+  let originalName = table.name
 
   $: fields = Object.keys(table.schema)
 
@@ -39,6 +41,15 @@
     notifier.success("Table renamed successfully")
     hideEditor()
   }
+
+  function checkValid(evt) {
+    const tableName = evt.target.value
+    if (originalName !== tableName && $backendUiStore.models.some(model => model.name === tableName)) {
+      error = `Table with name ${tableName} already exists. Please choose another name.`
+      return
+    }
+    error = ""
+  }
 </script>
 
 <div bind:this={anchor} class="icon" on:click={dropdown.show}>
@@ -48,7 +59,11 @@
   {#if editing}
     <div class="actions">
       <h5>Edit Table</h5>
-      <Input label="Table Name" thin bind:value={table.name} />
+      <Input 
+        label="Table Name" thin bind:value={table.name} 
+        on:input={checkValid}
+        {error}
+      />
       <Select
         label="Primary Display Column"
         thin
@@ -61,7 +76,7 @@
       </Select>
       <footer>
         <Button secondary on:click={hideEditor}>Cancel</Button>
-        <Button primary on:click={save}>Save</Button>
+        <Button primary disabled={error} on:click={save}>Save</Button>
       </footer>
     </div>
   {:else}
diff --git a/packages/standard-components/src/Navigation.svelte b/packages/standard-components/src/Navigation.svelte
index 8fafffc0cd..fc05e97538 100644
--- a/packages/standard-components/src/Navigation.svelte
+++ b/packages/standard-components/src/Navigation.svelte
@@ -36,10 +36,14 @@
 </script>
 
 <nav use:cssVars={cssVariables}>
-  <a href="/">
-    <img class="logo" alt="logo" src={logoUrl} height="48" />
-    <span>{title}</span>
-  </a>
+  {#if logoUrl}
+    <a href="/">
+      <img class="logo" alt="logo" src={logoUrl} height="48" />
+      <span>{title}</span>
+    </a>
+  {:else}
+    <div />
+  {/if}
   <div class="menu-items" bind:this={itemContainer} />
 </nav>
 

From 9775797951c59e3afb0d002c84121407434cec4d Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 11:18:34 +0100
Subject: [PATCH 02/18] removing z-index from checkbox

---
 packages/builder/src/components/common/Checkbox.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/components/common/Checkbox.svelte b/packages/builder/src/components/common/Checkbox.svelte
index 3c5888d7c8..11614adab1 100644
--- a/packages/builder/src/components/common/Checkbox.svelte
+++ b/packages/builder/src/components/common/Checkbox.svelte
@@ -34,7 +34,6 @@
     transition: 0.2s ease transform, 0.2s ease background-color,
       0.2s ease box-shadow;
     overflow: hidden;
-    z-index: 1;
     border-radius: 4px;
   }
 

From 04f5e9e9ea7f70b0ecc7b21e4837d55f2e058628 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 15:40:59 +0100
Subject: [PATCH 03/18] optional chaining for backend ui models

---
 .../backend/TableNavigator/modals/CreateTableModal.svelte       | 2 +-
 .../backend/TableNavigator/popovers/EditTablePopover.svelte     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 8bd3e56dae..29c24a2926 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -30,7 +30,7 @@
 
   function checkValid(evt) {
     const tableName = evt.target.value
-    if ($backendUiStore.models.some(model => model.name === tableName)) {
+    if ($backendUiStore.models?.some(model => model.name === tableName)) {
       error = `Table with name ${tableName} already exists. Please choose another name.`
       return
     }
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index eae0a66b5f..f69a5942a0 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -44,7 +44,7 @@
 
   function checkValid(evt) {
     const tableName = evt.target.value
-    if (originalName !== tableName && $backendUiStore.models.some(model => model.name === tableName)) {
+    if (originalName !== tableName && $backendUiStore.models?.some(model => model.name === tableName)) {
       error = `Table with name ${tableName} already exists. Please choose another name.`
       return
     }

From 34bfef5661f302605b513768f141cad322de1445 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 16:17:07 +0100
Subject: [PATCH 04/18] bulk deletes on grid

---
 .../popovers/EditTablePopover.svelte          | 14 +++++----
 .../src/components/settings/tabs/Users.svelte |  4 +--
 .../src/components/start/AppList.svelte       |  4 +--
 .../src/components/start/TemplateList.svelte  |  4 +--
 .../src/pages/[application]/_reset.svelte     |  4 +--
 packages/server/src/api/controllers/row.js    | 30 ++++++++++++++++++-
 .../src/Test/TestApp.svelte                   |  2 +-
 7 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index f69a5942a0..91aa9f07d8 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -44,7 +44,10 @@
 
   function checkValid(evt) {
     const tableName = evt.target.value
-    if (originalName !== tableName && $backendUiStore.models?.some(model => model.name === tableName)) {
+    if (
+      originalName !== tableName &&
+      $backendUiStore.models?.some(model => model.name === tableName)
+    ) {
       error = `Table with name ${tableName} already exists. Please choose another name.`
       return
     }
@@ -59,11 +62,12 @@
   {#if editing}
     <div class="actions">
       <h5>Edit Table</h5>
-      <Input 
-        label="Table Name" thin bind:value={table.name} 
+      <Input
+        label="Table Name"
+        thin
+        bind:value={table.name}
         on:input={checkValid}
-        {error}
-      />
+        {error} />
       <Select
         label="Primary Display Column"
         thin
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index d24dcc7a6b..c55b9e5f1d 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -73,7 +73,7 @@
     <Label extraSmall grey>Current Users</Label>
     {#await fetchUsersPromise}
       Loading...
-    {:then users}
+    {:then [object Object]}
       <ul>
         {#each users as user}
           <li>
@@ -83,7 +83,7 @@
           <li>No Users found</li>
         {/each}
       </ul>
-    {:catch error}
+    {:catch [object Object]}
       Something went wrong when trying to fetch users. Please refresh (CMD + R /
       CTRL + R) the page and try again.
     {/await}
diff --git a/packages/builder/src/components/start/AppList.svelte b/packages/builder/src/components/start/AppList.svelte
index aeed85655e..b172d9a2f3 100644
--- a/packages/builder/src/components/start/AppList.svelte
+++ b/packages/builder/src/components/start/AppList.svelte
@@ -24,7 +24,7 @@
     <div class="spinner-container">
       <Spinner size="30" />
     </div>
-  {:then apps}
+  {:then [object Object]}
     <div class="inner">
       <div>
         <div>
@@ -36,7 +36,7 @@
         </div>
       </div>
     </div>
-  {:catch err}
+  {:catch [object Object]}
     <h1 style="color:red">{err}</h1>
   {/await}
 </div>
diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte
index 64e0671c83..8be25c1981 100644
--- a/packages/builder/src/components/start/TemplateList.svelte
+++ b/packages/builder/src/components/start/TemplateList.svelte
@@ -20,7 +20,7 @@
     <div class="spinner-container">
       <Spinner size="30" />
     </div>
-  {:then templates}
+  {:then [object Object]}
     <div class="templates">
       {#each templates as template}
         <div class="templates-card">
@@ -39,7 +39,7 @@
         </div>
       {/each}
     </div>
-  {:catch err}
+  {:catch [object Object]}
     <h1 style="color:red">{err}</h1>
   {/await}
 </div>
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index e33a46ad2c..bf34184dfa 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -77,9 +77,9 @@
   {#await promise}
     <!-- This should probably be some kind of loading state? -->
     <div />
-  {:then _}
+  {:then [object Object]}
     <slot />
-  {:catch error}
+  {:catch [object Object]}
     <p>Something went wrong: {error.message}</p>
   {/await}
 </div>
diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index e057ac0040..9c39149bae 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -73,6 +73,12 @@ exports.save = async function(ctx) {
   let row = ctx.request.body
   row.tableId = ctx.params.tableId
 
+  if (ctx.request.body.type === "delete") {
+    await bulkDelete(ctx)
+    ctx.body = ctx.request.body.rows
+    return
+  }
+
   if (!row._rev && !row._id) {
     row._id = generateRowID(row.tableId)
   }
@@ -101,7 +107,7 @@ exports.save = async function(ctx) {
   // make sure link rows are up to date
   row = await linkRows.updateLinks({
     instanceId,
-    eventType: linkRows.EventType.ROW_SAVE,
+    eventType: linkRows.EventType.RECORD_SAVE,
     row,
     tableId: row.tableId,
     table,
@@ -348,3 +354,25 @@ const TYPE_TRANSFORM_MAP = {
     false: false,
   },
 }
+
+async function bulkDelete(ctx) {
+  const instanceId = ctx.user.instanceId
+  const { rows } = ctx.request.body
+  const db = new CouchDB(instanceId)
+
+  const linkUpdates = rows.map(row =>
+    linkRows.updateLinks({
+      instanceId,
+      eventType: linkRows.EventType.ROW_DELETE,
+      row,
+      tableId: row.tableId,
+    })
+  )
+
+  await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true })))
+  await Promise.all(linkUpdates)
+
+  rows.forEach(row => {
+    ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
+  })
+}
diff --git a/packages/standard-components/src/Test/TestApp.svelte b/packages/standard-components/src/Test/TestApp.svelte
index 13504e1e15..1ad2cc484e 100644
--- a/packages/standard-components/src/Test/TestApp.svelte
+++ b/packages/standard-components/src/Test/TestApp.svelte
@@ -35,7 +35,7 @@
 
 {#await _appPromise}
   loading
-{:then _bb}
+{:then [object Object]}
   <div id="current_component" bind:this={currentComponent} />
 {/await}
 

From 407d7606e9271bc07023d74871bc1418a60cae1e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 13 Oct 2020 16:31:14 +0100
Subject: [PATCH 05/18] Destroying instance DBs for an app before it is
 deleted.

---
 packages/server/src/api/controllers/application.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 53b8792f49..28e389b1d2 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -116,6 +116,12 @@ exports.delete = async function(ctx) {
   const db = new CouchDB(ClientDb.name(getClientId(ctx)))
   const app = await db.get(ctx.params.applicationId)
   const result = await db.remove(app)
+  for (let instance of app.instances) {
+    const instanceDb = new CouchDB(instance._id)
+    await instanceDb.destroy()
+  }
+
+  // remove top level directory
   await fs.rmdir(join(budibaseAppsDir(), ctx.params.applicationId), {
     recursive: true,
   })

From f921f4c09042609c9fa66bef99b2d60dd90e5fa4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 16:33:45 +0100
Subject: [PATCH 06/18] fix issues from eslint plugin prettier

---
 packages/builder/src/components/settings/tabs/Users.svelte | 4 ++--
 packages/builder/src/components/start/AppList.svelte       | 4 ++--
 packages/builder/src/components/start/TemplateList.svelte  | 4 ++--
 packages/builder/src/pages/[application]/_reset.svelte     | 4 ++--
 packages/standard-components/src/Test/TestApp.svelte       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index c55b9e5f1d..d24dcc7a6b 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -73,7 +73,7 @@
     <Label extraSmall grey>Current Users</Label>
     {#await fetchUsersPromise}
       Loading...
-    {:then [object Object]}
+    {:then users}
       <ul>
         {#each users as user}
           <li>
@@ -83,7 +83,7 @@
           <li>No Users found</li>
         {/each}
       </ul>
-    {:catch [object Object]}
+    {:catch error}
       Something went wrong when trying to fetch users. Please refresh (CMD + R /
       CTRL + R) the page and try again.
     {/await}
diff --git a/packages/builder/src/components/start/AppList.svelte b/packages/builder/src/components/start/AppList.svelte
index b172d9a2f3..aeed85655e 100644
--- a/packages/builder/src/components/start/AppList.svelte
+++ b/packages/builder/src/components/start/AppList.svelte
@@ -24,7 +24,7 @@
     <div class="spinner-container">
       <Spinner size="30" />
     </div>
-  {:then [object Object]}
+  {:then apps}
     <div class="inner">
       <div>
         <div>
@@ -36,7 +36,7 @@
         </div>
       </div>
     </div>
-  {:catch [object Object]}
+  {:catch err}
     <h1 style="color:red">{err}</h1>
   {/await}
 </div>
diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte
index 8be25c1981..64e0671c83 100644
--- a/packages/builder/src/components/start/TemplateList.svelte
+++ b/packages/builder/src/components/start/TemplateList.svelte
@@ -20,7 +20,7 @@
     <div class="spinner-container">
       <Spinner size="30" />
     </div>
-  {:then [object Object]}
+  {:then templates}
     <div class="templates">
       {#each templates as template}
         <div class="templates-card">
@@ -39,7 +39,7 @@
         </div>
       {/each}
     </div>
-  {:catch [object Object]}
+  {:catch err}
     <h1 style="color:red">{err}</h1>
   {/await}
 </div>
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index bf34184dfa..7174bd14d7 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -77,9 +77,9 @@
   {#await promise}
     <!-- This should probably be some kind of loading state? -->
     <div />
-  {:then [object Object]}
+  {:then result}
     <slot />
-  {:catch [object Object]}
+  {:catch error}
     <p>Something went wrong: {error.message}</p>
   {/await}
 </div>
diff --git a/packages/standard-components/src/Test/TestApp.svelte b/packages/standard-components/src/Test/TestApp.svelte
index 1ad2cc484e..13504e1e15 100644
--- a/packages/standard-components/src/Test/TestApp.svelte
+++ b/packages/standard-components/src/Test/TestApp.svelte
@@ -35,7 +35,7 @@
 
 {#await _appPromise}
   loading
-{:then [object Object]}
+{:then _bb}
   <div id="current_component" bind:this={currentComponent} />
 {/await}
 

From 3fd5e7e57894fd5a155d1104bf853b813e5e679d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 13 Oct 2020 17:02:59 +0100
Subject: [PATCH 07/18] Removing deprecated function - exists.

---
 packages/server/src/api/controllers/application.js  | 4 ++--
 packages/server/src/utilities/initialiseBudibase.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 28e389b1d2..0d8fe021be 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -3,7 +3,7 @@ const ClientDb = require("../../db/clientDb")
 const { getPackageForBuilder, buildPage } = require("../../utilities/builder")
 const env = require("../../environment")
 const instanceController = require("./instance")
-const { copy, exists, readFile, writeFile } = require("fs-extra")
+const { copy, existsSync, readFile, writeFile } = require("fs-extra")
 const { budibaseAppsDir } = require("../../utilities/budibaseDir")
 const sqrl = require("squirrelly")
 const setBuilderToken = require("../../utilities/builder/setBuilderToken")
@@ -143,7 +143,7 @@ const createEmptyAppPackage = async (ctx, app) => {
   const appsFolder = budibaseAppsDir()
   const newAppFolder = resolve(appsFolder, app._id)
 
-  if (await exists(newAppFolder)) {
+  if (existsSync(newAppFolder)) {
     ctx.throw(400, "App folder already exists for this application")
   }
 
diff --git a/packages/server/src/utilities/initialiseBudibase.js b/packages/server/src/utilities/initialiseBudibase.js
index c86b6083e9..be3253117c 100644
--- a/packages/server/src/utilities/initialiseBudibase.js
+++ b/packages/server/src/utilities/initialiseBudibase.js
@@ -1,4 +1,4 @@
-const { exists, readFile, writeFile, ensureDir } = require("fs-extra")
+const { existsSync, readFile, writeFile, ensureDir } = require("fs-extra")
 const { join, resolve } = require("./centralPath")
 const Sqrl = require("squirrelly")
 const uuid = require("uuid")
@@ -28,7 +28,7 @@ const setCouchDbUrl = async opts => {
 
 const createDevEnvFile = async opts => {
   const destConfigFile = join(opts.dir, "./.env")
-  let createConfig = !(await exists(destConfigFile)) || opts.quiet
+  let createConfig = !existsSync(destConfigFile) || opts.quiet
   if (createConfig) {
     const template = await readFile(
       resolve(__dirname, "..", "..", ".env.template"),

From 686d85f07e6c7b1511c38eee0e5e915f6b42b03b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 13 Oct 2020 17:40:28 +0100
Subject: [PATCH 08/18] Adding 501 not implemented errors to screen API which
 did not have a controller previously.

---
 packages/server/src/api/controllers/page.js   |  0
 packages/server/src/api/controllers/screen.js | 17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 delete mode 100644 packages/server/src/api/controllers/page.js

diff --git a/packages/server/src/api/controllers/page.js b/packages/server/src/api/controllers/page.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/server/src/api/controllers/screen.js b/packages/server/src/api/controllers/screen.js
index e69de29bb2..91c3c83dd5 100644
--- a/packages/server/src/api/controllers/screen.js
+++ b/packages/server/src/api/controllers/screen.js
@@ -0,0 +1,17 @@
+/**
+ * This controller is not currently fully implemented. Screens are
+ * currently managed as part of the pages API, please look in api/routes/page.js
+ * for routes and controllers.
+ */
+
+exports.fetch = async ctx => {
+  ctx.throw(501)
+}
+
+exports.save = async ctx => {
+  ctx.throw(501)
+}
+
+exports.destroy = async ctx => {
+  ctx.throw(501)
+}

From 7e70eb0f2051f26d971ca26efb228429cb011bab Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 13 Oct 2020 19:37:52 +0100
Subject: [PATCH 09/18] Adding info to the table deletion about screens that
 will be deleted and deleted template screens when table deleted.

---
 .../popovers/EditTablePopover.svelte          | 49 +++++++++++++++++--
 .../components/common/ConfirmDialog.svelte    |  2 +-
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 9df5f36993..d9e7e6867b 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -1,9 +1,11 @@
 <script>
-  import { backendUiStore } from "builderStore"
+  import { backendUiStore, store } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import { DropdownMenu, Button, Icon, Input, Select } from "@budibase/bbui"
   import { FIELDS } from "constants/backend"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import screenTemplates from "builderStore/store/screenTemplates"
+  import api from "builderStore/api"
 
   export let table
 
@@ -11,6 +13,8 @@
   let dropdown
   let editing
   let confirmDeleteDialog
+  let templateScreens
+  let willBeDeleted
 
   $: fields = Object.keys(table.schema)
 
@@ -24,12 +28,31 @@
   }
 
   function showModal() {
+    const screens = $store.allScreens
+    templateScreens = screens.filter(screen => screen.props.table === table._id)
+    willBeDeleted = ["All table data"].concat(templateScreens.map(screen => `Screen ${screen.props._instanceName}`))
     hideEditor()
     confirmDeleteDialog.show()
   }
 
+  function deleteTemplateScreens() {
+    store.update(state => {
+      for (let screen of templateScreens) {
+        const mainPageName = state.pages.main.name
+        state.screens = state.screens.filter(c => c.name !== screen.name)
+        // Remove screen from current page as well
+        state.pages[state.currentPageName]._screens = state.pages[mainPageName]._screens.filter(
+          scr => scr.name !== screen.name
+        )
+        api.delete(`/_builder/api/pages/${mainPageName}/screens/${screen.name}`)
+      }
+      return state
+    })
+  }
+
   async function deleteTable() {
     await backendUiStore.actions.tables.delete(table)
+    deleteTemplateScreens()
     notifier.success("Table deleted")
     hideEditor()
   }
@@ -79,10 +102,20 @@
 </DropdownMenu>
 <ConfirmDialog
   bind:this={confirmDeleteDialog}
-  body={`Are you sure you wish to delete the table '${table.name}'? Your data will be deleted and this action cannot be undone.`}
+  body={`Are you sure you wish to delete the table '${table.name}'?`}
   okText="Delete Table"
   onOk={deleteTable}
-  title="Confirm Delete" />
+  title="Confirm Delete">
+  The following will also be deleted:
+  <b>
+  <div class="delete-items">
+    {#each willBeDeleted as item}
+      <div>{item}</div>
+    {/each}
+  </div>
+  </b>
+  This action cannot be undone.
+</ConfirmDialog>
 
 <style>
   div.icon {
@@ -96,6 +129,16 @@
     font-size: 16px;
   }
 
+  div.delete-items {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: 10px;
+  }
+
+  div.delete-items div {
+    margin-top: 4px;
+  }
+
   .actions {
     padding: var(--spacing-xl);
     display: grid;
diff --git a/packages/builder/src/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
index 2cd27573f4..7d4c3ff0e2 100644
--- a/packages/builder/src/components/common/ConfirmDialog.svelte
+++ b/packages/builder/src/components/common/ConfirmDialog.svelte
@@ -20,7 +20,7 @@
 
 <Modal bind:this={modal} on:hide={onCancel}>
   <ModalContent onConfirm={onOk} {title} confirmText={okText} {cancelText} red>
-    <div class="body">{body}</div>
+    <div class="body">{body}<slot/></div>
   </ModalContent>
 </Modal>
 

From e95af51cde8b006f57a09133c97ba074d15601c7 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 21:33:56 +0100
Subject: [PATCH 10/18] simplify user authentication, remove anon user, fix
 login cookie issues

---
 .../cypress/integration/createTable.spec.js   |  1 -
 .../src/components/settings/tabs/Users.svelte |  1 +
 .../src/pages/[application]/_reset.svelte     |  7 +++-
 packages/server/src/api/controllers/auth.js   |  2 +-
 packages/server/src/api/controllers/static.js | 30 +++----------
 packages/server/src/constants/index.js        |  7 ++++
 .../server/src/middleware/authenticated.js    | 42 +++++++------------
 packages/server/src/middleware/authorized.js  | 12 +++---
 packages/server/src/utilities/accessLevels.js |  1 -
 .../src/Test/TestApp.svelte                   |  2 +-
 10 files changed, 43 insertions(+), 62 deletions(-)
 create mode 100644 packages/server/src/constants/index.js

diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index 36aed6e058..0f57d56f3e 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -27,7 +27,6 @@ context("Create a Table", () => {
     cy.get(".actions input")
       .first()
       .type("updated")
-    cy.get("select").select("Text")
     cy.contains("Save Column").click()
     cy.contains("nameupdated").should("have.text", "nameupdated")
   })
diff --git a/packages/builder/src/components/settings/tabs/Users.svelte b/packages/builder/src/components/settings/tabs/Users.svelte
index d24dcc7a6b..a2cb34e8d0 100644
--- a/packages/builder/src/components/settings/tabs/Users.svelte
+++ b/packages/builder/src/components/settings/tabs/Users.svelte
@@ -58,6 +58,7 @@
       <Input thin bind:value={username} name="Name" placeholder="Username" />
       <Input
         thin
+        type="password"
         bind:value={password}
         name="Password"
         placeholder="Password" />
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index 7174bd14d7..b7199d27fe 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -68,7 +68,10 @@
       <span
         class:active={false}
         class="topnavitemright"
-        on:click={() => window.open(`/${application}`)}>
+        on:click={() => {
+          document.cookie = 'budibase:token=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;'
+          window.open(`/${application}`)
+        }}>
         <PreviewIcon />
       </span>
     </div>
@@ -77,7 +80,7 @@
   {#await promise}
     <!-- This should probably be some kind of loading state? -->
     <div />
-  {:then result}
+  {:then results}
     <slot />
   {:catch error}
     <p>Something went wrong: {error.message}</p>
diff --git a/packages/server/src/api/controllers/auth.js b/packages/server/src/api/controllers/auth.js
index ac436399a9..0fed3337f8 100644
--- a/packages/server/src/api/controllers/auth.js
+++ b/packages/server/src/api/controllers/auth.js
@@ -41,7 +41,7 @@ exports.authenticate = async ctx => {
     dbUser = await instanceDb.get(generateUserID(username))
   } catch (_) {
     // do not want to throw a 404 - as this could be
-    // used to dtermine valid usernames
+    // used to determine valid usernames
     ctx.throw(401, "Invalid Credentials")
   }
 
diff --git a/packages/server/src/api/controllers/static.js b/packages/server/src/api/controllers/static.js
index 5aaa9ab125..2abb0069ab 100644
--- a/packages/server/src/api/controllers/static.js
+++ b/packages/server/src/api/controllers/static.js
@@ -1,6 +1,5 @@
 const send = require("koa-send")
 const { resolve, join } = require("../../utilities/centralPath")
-const jwt = require("jsonwebtoken")
 const fetch = require("node-fetch")
 const fs = require("fs-extra")
 const uuid = require("uuid")
@@ -13,8 +12,8 @@ const {
 } = require("../../utilities/budibaseDir")
 const CouchDB = require("../../db")
 const setBuilderToken = require("../../utilities/builder/setBuilderToken")
-const { ANON_LEVEL_ID } = require("../../utilities/accessLevels")
 const fileProcessor = require("../../utilities/fileProcessor")
+const { AuthTypes } = require("../../constants")
 
 exports.serveBuilder = async function(ctx) {
   let builderPath = resolve(__dirname, "../../../builder")
@@ -136,7 +135,8 @@ exports.performLocalFileProcessing = async function(ctx) {
 }
 
 exports.serveApp = async function(ctx) {
-  const mainOrAuth = ctx.auth.authenticated ? "main" : "unauthenticated"
+  const mainOrAuth =
+    ctx.auth.authenticated === AuthTypes.APP ? "main" : "unauthenticated"
 
   // default to homedir
   const appPath = resolve(
@@ -146,26 +146,7 @@ exports.serveApp = async function(ctx) {
     mainOrAuth
   )
 
-  let appId = ctx.params.appId
-  if (process.env.CLOUD) {
-    appId = ctx.subdomains[1]
-  }
-
-  // only set the appId cookie for /appId .. we COULD check for valid appIds
-  // but would like to avoid that DB hit
-  const looksLikeAppId = /^(app_)?[0-9a-f]{32}$/.test(appId)
-  if (looksLikeAppId && !ctx.auth.authenticated) {
-    const anonUser = {
-      userId: "ANON",
-      accessLevelId: ANON_LEVEL_ID,
-      appId,
-    }
-    const anonToken = jwt.sign(anonUser, ctx.config.jwtSecret)
-    ctx.cookies.set("budibase:token", anonToken, {
-      path: "/",
-      httpOnly: false,
-    })
-  }
+  const appId = ctx.user.appId
 
   if (process.env.CLOUD) {
     const S3_URL = `https://${appId}.app.budi.live/assets/${appId}/${mainOrAuth}/${ctx.file ||
@@ -200,7 +181,8 @@ exports.serveAttachment = async function(ctx) {
 
 exports.serveAppAsset = async function(ctx) {
   // default to homedir
-  const mainOrAuth = ctx.auth.authenticated ? "main" : "unauthenticated"
+  const mainOrAuth =
+    ctx.auth.authenticated === AuthTypes.APP ? "main" : "unauthenticated"
 
   const appPath = resolve(
     budibaseAppsDir(),
diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js
new file mode 100644
index 0000000000..cae1cde3e8
--- /dev/null
+++ b/packages/server/src/constants/index.js
@@ -0,0 +1,7 @@
+const AuthTypes = {
+  APP: "app",
+  BUILDER: "builder",
+  EXTERNAL: "external",
+}
+
+exports.AuthTypes = AuthTypes
diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js
index 1203ea0033..3a2c2ec9a9 100644
--- a/packages/server/src/middleware/authenticated.js
+++ b/packages/server/src/middleware/authenticated.js
@@ -7,6 +7,8 @@ const {
   BUILDER_LEVEL_ID,
   ANON_LEVEL_ID,
 } = require("../utilities/accessLevels")
+const environment = require("../environment")
+const { AuthTypes } = require("../constants")
 
 module.exports = async (ctx, next) => {
   if (ctx.path === "/_builder") {
@@ -17,36 +19,28 @@ module.exports = async (ctx, next) => {
   const appToken = ctx.cookies.get("budibase:token")
   const builderToken = ctx.cookies.get("builder:token")
 
-  if (builderToken) {
-    try {
-      const jwtPayload = jwt.verify(builderToken, ctx.config.jwtSecret)
-      ctx.auth = {
-        apiKey: jwtPayload.apiKey,
-        authenticated: jwtPayload.accessLevelId === BUILDER_LEVEL_ID,
-      }
-      ctx.user = {
-        ...jwtPayload,
-        accessLevel: await getAccessLevel(
-          jwtPayload.instanceId,
-          jwtPayload.accessLevelId
-        ),
-      }
-    } catch (_) {
-      // empty: do nothing
-    }
-
-    await next()
-    return
+  let token
+  // if running locally in the builder itself
+  if (!environment.CLOUD && !appToken) {
+    token = builderToken
+    ctx.auth.authenticated = AuthTypes.BUILDER
+  } else {
+    token = appToken
+    ctx.auth.authenticated = AuthTypes.APP
   }
 
-  if (!appToken) {
+  if (!token) {
     ctx.auth.authenticated = false
+    ctx.user = {
+      appId: process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId,
+    }
     await next()
     return
   }
 
   try {
-    const jwtPayload = jwt.verify(appToken, ctx.config.jwtSecret)
+    const jwtPayload = jwt.verify(token, ctx.config.jwtSecret)
+    ctx.auth.apiKey = jwtPayload.apiKey
     ctx.user = {
       ...jwtPayload,
       accessLevel: await getAccessLevel(
@@ -54,10 +48,6 @@ module.exports = async (ctx, next) => {
         jwtPayload.accessLevelId
       ),
     }
-    ctx.auth = {
-      authenticated: ctx.user.accessLevelId !== ANON_LEVEL_ID,
-      apiKey: jwtPayload.apiKey,
-    }
   } catch (err) {
     ctx.throw(err.status || STATUS_CODES.FORBIDDEN, err.text)
   }
diff --git a/packages/server/src/middleware/authorized.js b/packages/server/src/middleware/authorized.js
index bd09029471..238b2cab3d 100644
--- a/packages/server/src/middleware/authorized.js
+++ b/packages/server/src/middleware/authorized.js
@@ -7,6 +7,7 @@ const {
 } = require("../utilities/accessLevels")
 const environment = require("../environment")
 const { apiKeyTable } = require("../db/dynamoClient")
+const { AuthTypes } = require("../constants")
 
 module.exports = (permName, getItemId) => async (ctx, next) => {
   if (
@@ -21,8 +22,7 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
 
     if (apiKeyInfo) {
       ctx.auth = {
-        authenticated: true,
-        external: true,
+        authenticated: AuthTypes.EXTERNAL,
         apiKey: ctx.headers["x-api-key"],
       }
       ctx.user = {
@@ -42,6 +42,10 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
     ctx.throw(403, "User not found")
   }
 
+  if (ctx.user.accessLevel._id === ADMIN_LEVEL_ID) {
+    return next()
+  }
+
   if (ctx.user.accessLevel._id === BUILDER_LEVEL_ID) {
     return next()
   }
@@ -53,10 +57,6 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
 
   const permissionId = ({ name, itemId }) => name + (itemId ? `-${itemId}` : "")
 
-  if (ctx.user.accessLevel._id === ADMIN_LEVEL_ID) {
-    return next()
-  }
-
   const thisPermissionId = permissionId({
     name: permName,
     itemId: getItemId && getItemId(ctx),
diff --git a/packages/server/src/utilities/accessLevels.js b/packages/server/src/utilities/accessLevels.js
index 201007527c..ada3f36880 100644
--- a/packages/server/src/utilities/accessLevels.js
+++ b/packages/server/src/utilities/accessLevels.js
@@ -21,7 +21,6 @@ module.exports.PRETTY_ACCESS_LEVELS = {
   [module.exports.ADMIN_LEVEL_ID]: "Admin",
   [module.exports.POWERUSER_LEVEL_ID]: "Power user",
   [module.exports.BUILDER_LEVEL_ID]: "Builder",
-  [module.exports.ANON_LEVEL_ID]: "Anonymous",
 }
 module.exports.adminPermissions = [
   {
diff --git a/packages/standard-components/src/Test/TestApp.svelte b/packages/standard-components/src/Test/TestApp.svelte
index 13504e1e15..1ad2cc484e 100644
--- a/packages/standard-components/src/Test/TestApp.svelte
+++ b/packages/standard-components/src/Test/TestApp.svelte
@@ -35,7 +35,7 @@
 
 {#await _appPromise}
   loading
-{:then _bb}
+{:then [object Object]}
   <div id="current_component" bind:this={currentComponent} />
 {/await}
 

From d9bb6aad2d6d85d0256a06a2f279857fa2952fcd Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 13 Oct 2020 21:37:55 +0100
Subject: [PATCH 11/18] fixing funky svelte prettier issue

---
 packages/standard-components/src/Test/TestApp.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/standard-components/src/Test/TestApp.svelte b/packages/standard-components/src/Test/TestApp.svelte
index 1ad2cc484e..13504e1e15 100644
--- a/packages/standard-components/src/Test/TestApp.svelte
+++ b/packages/standard-components/src/Test/TestApp.svelte
@@ -35,7 +35,7 @@
 
 {#await _appPromise}
   loading
-{:then [object Object]}
+{:then _bb}
   <div id="current_component" bind:this={currentComponent} />
 {/await}
 

From f5ad74eaf56a24aef67f7cb2009509c0761dd130 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 14 Oct 2020 11:56:02 +0100
Subject: [PATCH 12/18] Some design changes and moving around screen deletion
 to centralise it.

---
 .../builder/src/builderStore/store/index.js   | 21 +++++++++++++++++++
 .../popovers/EditTablePopover.svelte          | 20 +++---------------
 .../userInterface/ScreenDropdownMenu.svelte   | 17 ++-------------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index 4eeb2e3842..bb61712f1a 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -53,6 +53,7 @@ export const getStore = () => {
 
   store.saveScreen = saveScreen(store)
   store.setCurrentScreen = setCurrentScreen(store)
+  store.deleteScreens = deleteScreens(store)
   store.setCurrentPage = setCurrentPage(store)
   store.createScreen = createScreen(store)
   store.addStylesheet = addStylesheet(store)
@@ -185,6 +186,26 @@ const setCurrentScreen = store => screenName => {
   })
 }
 
+const deleteScreens = store => (screens, pageName = null) => {
+  if (!(screens instanceof Array)) {
+    screens = [screens]
+  }
+  store.update(state => {
+    if (pageName == null) {
+      pageName = state.pages.main.name
+    }
+    for (let screen of screens) {
+      state.screens = state.screens.filter(c => c.name !== screen.name)
+      // Remove screen from current page as well
+      state.pages[pageName]._screens = state.pages[pageName]._screens.filter(
+        scr => scr.name !== screen.name
+      )
+      api.delete(`/_builder/api/pages/${pageName}/screens/${screen.name}`)
+    }
+    return state
+  })
+}
+
 const savePage = store => async page => {
   store.update(state => {
     if (state.currentFrontEndType !== "page" || !state.currentPageName) {
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index d9e7e6867b..c4f5e2176c 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -35,24 +35,10 @@
     confirmDeleteDialog.show()
   }
 
-  function deleteTemplateScreens() {
-    store.update(state => {
-      for (let screen of templateScreens) {
-        const mainPageName = state.pages.main.name
-        state.screens = state.screens.filter(c => c.name !== screen.name)
-        // Remove screen from current page as well
-        state.pages[state.currentPageName]._screens = state.pages[mainPageName]._screens.filter(
-          scr => scr.name !== screen.name
-        )
-        api.delete(`/_builder/api/pages/${mainPageName}/screens/${screen.name}`)
-      }
-      return state
-    })
-  }
 
   async function deleteTable() {
     await backendUiStore.actions.tables.delete(table)
-    deleteTemplateScreens()
+    store.deleteScreens(templateScreens)
     notifier.success("Table deleted")
     hideEditor()
   }
@@ -102,11 +88,10 @@
 </DropdownMenu>
 <ConfirmDialog
   bind:this={confirmDeleteDialog}
-  body={`Are you sure you wish to delete the table '${table.name}'?`}
   okText="Delete Table"
   onOk={deleteTable}
   title="Confirm Delete">
-  The following will also be deleted:
+  Are you sure you wish to delete the table <i>{table.name}?</i> The following will also be deleted:
   <b>
   <div class="delete-items">
     {#each willBeDeleted as item}
@@ -137,6 +122,7 @@
 
   div.delete-items div {
     margin-top: 4px;
+    font-weight: 500
   }
 
   .actions {
diff --git a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
index 69e9ea498a..7ae8bbf432 100644
--- a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
@@ -17,26 +17,13 @@
   }
 
   const deleteScreen = () => {
+    store.deleteScreens(screen, $store.currentPageName)
+    // update the page if required
     store.update(state => {
-      // Remove screen from screens
-      const screens = state.screens.filter(c => c.name !== screen.name)
-      state.screens = screens
-
-      // Remove screen from current page as well
-      const pageScreens = state.pages[state.currentPageName]._screens.filter(
-        scr => scr.name !== screen.name
-      )
-      state.pages[state.currentPageName]._screens = pageScreens
-
       if (state.currentPreviewItem.name === screen.name) {
         store.setCurrentPage($store.currentPageName)
         $goto(`./:page/page-layout`)
       }
-
-      api.delete(
-        `/_builder/api/pages/${state.currentPageName}/screens/${screen.name}`
-      )
-
       return state
     })
   }

From b9f69e34f1d55095bbb4d9d71f11279ad610677f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 14 Oct 2020 12:22:43 +0100
Subject: [PATCH 13/18] Upgrading prettier svelte plugin until found a version
 that works for our formatting without breaking on some syntax.

---
 package.json                                  |  2 +-
 .../popovers/EditTablePopover.svelte          | 21 +++++++++++--------
 .../components/common/ConfirmDialog.svelte    |  5 ++++-
 yarn.lock                                     | 11 +++++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5a7d40fe1c..15d9088466 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "eslint-plugin-svelte3": "^2.7.3",
     "lerna": "3.14.1",
     "prettier": "^1.19.1",
-    "prettier-plugin-svelte": "^0.7.0",
+    "prettier-plugin-svelte": "^1.1.0",
     "rimraf": "^3.0.2",
     "rollup-plugin-replace": "^2.2.0",
     "svelte": "^3.28.0"
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index c4f5e2176c..4e74ea163a 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -30,12 +30,13 @@
   function showModal() {
     const screens = $store.allScreens
     templateScreens = screens.filter(screen => screen.props.table === table._id)
-    willBeDeleted = ["All table data"].concat(templateScreens.map(screen => `Screen ${screen.props._instanceName}`))
+    willBeDeleted = ["All table data"].concat(
+      templateScreens.map(screen => `Screen ${screen.props._instanceName}`)
+    )
     hideEditor()
     confirmDeleteDialog.show()
   }
 
-
   async function deleteTable() {
     await backendUiStore.actions.tables.delete(table)
     store.deleteScreens(templateScreens)
@@ -91,13 +92,15 @@
   okText="Delete Table"
   onOk={deleteTable}
   title="Confirm Delete">
-  Are you sure you wish to delete the table <i>{table.name}?</i> The following will also be deleted:
+  Are you sure you wish to delete the table
+  <i>{table.name}?</i>
+  The following will also be deleted:
   <b>
-  <div class="delete-items">
-    {#each willBeDeleted as item}
-      <div>{item}</div>
-    {/each}
-  </div>
+    <div class="delete-items">
+      {#each willBeDeleted as item}
+        <div>{item}</div>
+      {/each}
+    </div>
   </b>
   This action cannot be undone.
 </ConfirmDialog>
@@ -122,7 +125,7 @@
 
   div.delete-items div {
     margin-top: 4px;
-    font-weight: 500
+    font-weight: 500;
   }
 
   .actions {
diff --git a/packages/builder/src/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
index 7d4c3ff0e2..27a7517fce 100644
--- a/packages/builder/src/components/common/ConfirmDialog.svelte
+++ b/packages/builder/src/components/common/ConfirmDialog.svelte
@@ -20,7 +20,10 @@
 
 <Modal bind:this={modal} on:hide={onCancel}>
   <ModalContent onConfirm={onOk} {title} confirmText={okText} {cancelText} red>
-    <div class="body">{body}<slot/></div>
+    <div class="body">
+      {body}
+      <slot />
+    </div>
   </ModalContent>
 </Modal>
 
diff --git a/yarn.lock b/yarn.lock
index 9b84e373af..076a4a90dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3690,11 +3690,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier-plugin-svelte@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-0.7.0.tgz#5ac0b9f194e0450c88ff1e167cbf3b32d2642df2"
-  dependencies:
-    tslib "^1.9.3"
+prettier-plugin-svelte@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.1.0.tgz#e6ec282d8457598b0c02164083b11ad8cb8ab304"
+  integrity sha512-wmIggG/ryV0wcmE9D5p+k5TwKDpS2SGKJpF6IV1aYHK7dkBJD+di1w47Ci00DRsI4RrXZRC2Ef37DSyrTb6Zqg==
 
 prettier@^1.19.1:
   version "1.19.1"
@@ -4529,7 +4528,7 @@ trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
-tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
 

From 2ba10662d38a9cec6f80a52eef75bbef207ee23f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 14 Oct 2020 13:09:03 +0100
Subject: [PATCH 14/18] fix csv import

---
 packages/server/src/utilities/csvParser.js     |  3 ++-
 packages/server/src/utilities/fileProcessor.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/utilities/csvParser.js b/packages/server/src/utilities/csvParser.js
index 872ee5f8a4..aacb599676 100644
--- a/packages/server/src/utilities/csvParser.js
+++ b/packages/server/src/utilities/csvParser.js
@@ -7,6 +7,7 @@ const VALIDATORS = {
 }
 
 const PARSERS = {
+  number: attribute => Number(attribute),
   datetime: attribute => new Date(attribute).toISOString(),
 }
 
@@ -24,7 +25,7 @@ function parse(path, parsers) {
         }
       }
     })
-    result.fromFile(path).subscribe(row => {
+    result.subscribe((row, lineNumber) => {
       // For each CSV row parse all the columns that need parsed
       for (let key in parsers) {
         if (!schema[key] || schema[key].success) {
diff --git a/packages/server/src/utilities/fileProcessor.js b/packages/server/src/utilities/fileProcessor.js
index 3e580e9e37..4c219b758f 100644
--- a/packages/server/src/utilities/fileProcessor.js
+++ b/packages/server/src/utilities/fileProcessor.js
@@ -1,5 +1,5 @@
 const fs = require("fs")
-const sharp = require("sharp")
+// const sharp = require("sharp")
 const fsPromises = fs.promises
 
 const FORMATS = {
@@ -7,14 +7,14 @@ const FORMATS = {
 }
 
 async function processImage(file) {
-  const imgMeta = await sharp(file.path)
-    .resize(300)
-    .toFile(file.outputPath)
+  // const imgMeta = await sharp(file.path)
+  //   .resize(300)
+  //   .toFile(file.outputPath)
 
-  return {
-    ...file,
-    ...imgMeta,
-  }
+  // return {
+  //   ...file,
+  //   ...imgMeta,
+  // }
 }
 
 async function process(file) {

From d2a7bf55a763bdaf9eded54fd94bcb69038f8de6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 14 Oct 2020 13:21:43 +0100
Subject: [PATCH 15/18] lint

---
 package.json                                    |  2 +-
 .../BlockList/AutomationBlock.svelte            |  4 +---
 .../automation/SetupPanel/SetupPanel.svelte     |  5 +----
 .../components/backend/DataTable/Table.svelte   |  3 ++-
 .../backend/DataTable/TablePagination.svelte    | 17 +++++++++--------
 .../Notification/NotificationDisplay.svelte     |  4 +---
 .../src/components/common/Switcher.svelte       |  4 ----
 .../src/components/settings/Integration.svelte  |  4 +---
 .../builder/src/components/start/AppCard.svelte |  4 +++-
 .../src/components/start/TemplateList.svelte    |  7 +++----
 .../components/userInterface/CategoryTab.svelte |  1 -
 .../userInterface/ComponentDropdownMenu.svelte  |  4 +---
 .../ComponentPropertiesPanel.svelte             |  3 ---
 .../userInterface/ComponentSelectionList.svelte |  1 -
 .../userInterface/ComponentsHierarchy.svelte    |  3 ---
 .../ComponentsHierarchyChildren.svelte          |  1 -
 .../userInterface/ComponentsPaneSwitcher.svelte |  4 ----
 .../components/userInterface/DesignView.svelte  |  1 -
 .../EventsEditor/StateBindingCascader.svelte    |  4 +---
 .../EventsEditor/actions/CreateRow.svelte       |  1 -
 .../EventsEditor/actions/SaveRow.svelte         |  1 -
 .../EventsEditor/actions/UpdateRow.svelte       |  1 -
 .../userInterface/IconSelect/IconSelect.svelte  |  4 +---
 .../userInterface/ItemTab/Item.svelte           |  4 +---
 .../userInterface/NewScreenModal.svelte         |  2 --
 .../backend/table/[selectedTable]/index.svelte  |  4 +---
 .../[application]/backend/table/index.svelte    |  4 +---
 .../backend/view/[selectedView]/index.svelte    |  4 +---
 packages/server/src/utilities/csvParser.js      |  2 +-
 packages/server/src/utilities/fileProcessor.js  | 17 ++++++++---------
 packages/standard-components/src/Card.svelte    |  4 +---
 .../src/CardHorizontal.svelte                   |  4 +---
 .../src/DataGrid/AttachmentCell/Button.svelte   | 13 +------------
 .../src/DataGrid/Component.svelte               |  4 +++-
 packages/standard-components/src/Login.svelte   |  4 +---
 packages/standard-components/src/Text.svelte    |  4 +---
 .../src/attachments/AttachmentList.svelte       |  4 +---
 yarn.lock                                       | 11 +++++------
 38 files changed, 52 insertions(+), 116 deletions(-)

diff --git a/package.json b/package.json
index 5a7d40fe1c..1ca7218bd4 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "eslint-plugin-svelte3": "^2.7.3",
     "lerna": "3.14.1",
     "prettier": "^1.19.1",
-    "prettier-plugin-svelte": "^0.7.0",
+    "prettier-plugin-svelte": "^1.4.0",
     "rimraf": "^3.0.2",
     "rollup-plugin-replace": "^2.2.0",
     "svelte": "^3.28.0"
diff --git a/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte b/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte
index b8ac6638ae..2419999475 100644
--- a/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/BlockList/AutomationBlock.svelte
@@ -23,9 +23,7 @@
   class="automation-block hoverable"
   on:click={addBlockToAutomation}
   data-cy={stepId}>
-  <div>
-    <i class={blockDefinition.icon} />
-  </div>
+  <div><i class={blockDefinition.icon} /></div>
   <div class="automation-text">
     <h4>{blockDefinition.name}</h4>
     <p>{blockDefinition.description}</p>
diff --git a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
index f2b7a8b711..37ca1f2252 100644
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@@ -62,10 +62,7 @@
     {#if $automationStore.selectedBlock}
       <AutomationBlockSetup bind:block={$automationStore.selectedBlock} />
     {:else if $automationStore.selectedAutomation}
-      <div class="block-label">
-        Automation
-        <b>{automation.name}</b>
-      </div>
+      <div class="block-label">Automation <b>{automation.name}</b></div>
       <Button secondary wide on:click={testAutomation}>Test Automation</Button>
     {/if}
   </div>
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index dde114a76c..4c0dc06d39 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -108,7 +108,8 @@
                 <div
                   class:link={row[header] && row[header].length}
                   on:click={() => selectRelationship(row, header)}>
-                  {row[header] ? row[header].length : 0} related row(s)
+                  {row[header] ? row[header].length : 0}
+                  related row(s)
                 </div>
               {:else if schema[header].type === 'attachment'}
                 <AttachmentList files={row[header] || []} />
diff --git a/packages/builder/src/components/backend/DataTable/TablePagination.svelte b/packages/builder/src/components/backend/DataTable/TablePagination.svelte
index ccb7d0fc4c..ca5a58700d 100644
--- a/packages/builder/src/components/backend/DataTable/TablePagination.svelte
+++ b/packages/builder/src/components/backend/DataTable/TablePagination.svelte
@@ -49,9 +49,7 @@
       <button class:selected={currentPage === 0} on:click={() => selectPage(0)}>
         1
       </button>
-      {#if currentPage > 3}
-        <button disabled>...</button>
-      {/if}
+      {#if currentPage > 3}<button disabled>...</button>{/if}
       {#each pagesAroundCurrent as idx}
         <button
           class:selected={idx === currentPage}
@@ -59,9 +57,7 @@
           {idx + 1}
         </button>
       {/each}
-      {#if currentPage < numPages - 4}
-        <button disabled>...</button>
-      {/if}
+      {#if currentPage < numPages - 4}<button disabled>...</button>{/if}
       <button
         class:selected={currentPage === numPages - 1}
         on:click={() => selectPage(numPages - 1)}>
@@ -77,8 +73,13 @@
 
   <p>
     {#if numPages > 1}
-      Showing {ITEMS_PER_PAGE * currentPage + 1} - {ITEMS_PER_PAGE * currentPage + pageItemCount}
-      of {data.length} rows
+      Showing
+      {ITEMS_PER_PAGE * currentPage + 1}
+      -
+      {ITEMS_PER_PAGE * currentPage + pageItemCount}
+      of
+      {data.length}
+      rows
     {:else if numPages === 1}Showing all {data.length} row(s){/if}
   </p>
 </div>
diff --git a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
index ad32f228cb..55adef2fbf 100644
--- a/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
+++ b/packages/builder/src/components/common/Notification/NotificationDisplay.svelte
@@ -31,9 +31,7 @@
       style="background: {themes[notification.type]};"
       transition:fly={{ y: -30 }}>
       <div class="content">{notification.message}</div>
-      {#if notification.icon}
-        <i class={notification.icon} />
-      {/if}
+      {#if notification.icon}<i class={notification.icon} />{/if}
     </div>
   {/each}
 </div>
diff --git a/packages/builder/src/components/common/Switcher.svelte b/packages/builder/src/components/common/Switcher.svelte
index 9119aada4b..707bbfcc64 100644
--- a/packages/builder/src/components/common/Switcher.svelte
+++ b/packages/builder/src/components/common/Switcher.svelte
@@ -12,15 +12,12 @@
 </script>
 
 <div class="root">
-
   <div class="switcher">
-
     {#each tabs as tab}
       <button class:selected={selected === tab} on:click={() => selectTab(tab)}>
         {tab}
       </button>
     {/each}
-
   </div>
 
   <div class="panel">
@@ -34,7 +31,6 @@
       <slot name="3" />
     {/if}
   </div>
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/settings/Integration.svelte b/packages/builder/src/components/settings/Integration.svelte
index 69cfe6241f..f588649c9d 100644
--- a/packages/builder/src/components/settings/Integration.svelte
+++ b/packages/builder/src/components/settings/Integration.svelte
@@ -5,9 +5,7 @@
 
 <div class="container">
   <div class="content">
-    <div class="img">
-      <img src="https://picsum.photos/60/60" alt="zoom" />
-    </div>
+    <div class="img"><img src="https://picsum.photos/60/60" alt="zoom" /></div>
     <div class="body">
       <div class="title">Zoom</div>
       <div class="description">
diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index 34a3faa966..d6ee4b9591 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -10,7 +10,9 @@
   <Spacer medium />
   <div class="card-footer">
     <TextButton text medium blue href="/_builder/{_id}">
-      Open {name} →
+      Open
+      {name}
+      →
     </TextButton>
   </div>
 </div>
diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte
index 64e0671c83..14551adf1d 100644
--- a/packages/builder/src/components/start/TemplateList.svelte
+++ b/packages/builder/src/components/start/TemplateList.svelte
@@ -28,12 +28,11 @@
           <Spacer small />
           <Body medium grey>{template.category}</Body>
           <Body lh small black>{template.description}</Body>
-          <div>
-            <img src={template.image} width="100%" />
-          </div>
+          <div><img src={template.image} width="100%" /></div>
           <div class="card-footer">
             <Button secondary on:click={() => onSelect(template)}>
-              Create {template.name}
+              Create
+              {template.name}
             </Button>
           </div>
         </div>
diff --git a/packages/builder/src/components/userInterface/CategoryTab.svelte b/packages/builder/src/components/userInterface/CategoryTab.svelte
index fe9509bec9..15335cbb87 100644
--- a/packages/builder/src/components/userInterface/CategoryTab.svelte
+++ b/packages/builder/src/components/userInterface/CategoryTab.svelte
@@ -13,7 +13,6 @@
       {category.name}
     </li>
   {/each}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
index 60f6d9175d..59a8e4e1ed 100644
--- a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
@@ -99,9 +99,7 @@
 </script>
 
 <div bind:this={anchor} on:click|stopPropagation={() => {}}>
-  <div class="icon" on:click={dropdown.show}>
-    <i class="ri-more-line" />
-  </div>
+  <div class="icon" on:click={dropdown.show}><i class="ri-more-line" /></div>
 </div>
 <DropdownMenu
   bind:this={dropdown}
diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 3187d6f9d4..800905202d 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -76,7 +76,6 @@
 </script>
 
 <div class="root">
-
   <CategoryTab
     onClick={category => (selectedCategory = category)}
     {categories}
@@ -99,9 +98,7 @@
         onScreenPropChange={store.setPageOrScreenProp}
         screenOrPageInstance={$store.currentView !== 'component' && $store.currentPreviewItem} />
     {/if}
-
   </div>
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
index 4f953acf3f..99123252ef 100644
--- a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
@@ -45,7 +45,6 @@
 </script>
 
 <div class="root">
-
   <CategoryTab
     onClick={category => (selectedCategory = category)}
     {selectedCategory}
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
index b907a2dbca..74ec5694cd 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
@@ -38,13 +38,11 @@
 </script>
 
 <div class="root">
-
   {#each screens as screen}
     <div
       class="budibase__nav-item screen-header-row"
       class:selected={$store.currentComponentInfo._id === screen.props._id}
       on:click|stopPropagation={() => changeScreen(screen)}>
-
       <span
         class="icon"
         class:rotate={$store.currentPreviewItem.name !== screen.props._instanceName}>
@@ -69,7 +67,6 @@
         {dragDropStore} />
     {/if}
   {/each}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
index bec42b7f4f..5f3a29d515 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchyChildren.svelte
@@ -129,7 +129,6 @@
 <ul>
   {#each components as component, index (component._id)}
     <li on:click|stopPropagation={() => selectComponent(component)}>
-
       {#if $dragDropStore && $dragDropStore.targetComponent === component && $dragDropStore.dropPosition === 'above'}
         <div
           on:drop={drop}
diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
index f79c8e1aa5..5904221596 100644
--- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
@@ -20,7 +20,6 @@
 <div class="root">
   {#if $store.currentFrontEndType === 'page' || $store.screens.length}
     <div class="switcher">
-
       <button
         class:selected={selected === COMPONENT_SELECTION_TAB}
         on:click={() => selectTab(COMPONENT_SELECTION_TAB)}>
@@ -32,7 +31,6 @@
         on:click={() => selectTab(PROPERTIES_TAB)}>
         Edit
       </button>
-
     </div>
 
     <div class="panel">
@@ -43,10 +41,8 @@
       {#if selected === COMPONENT_SELECTION_TAB}
         <ComponentSelectionList {toggleTab} />
       {/if}
-
     </div>
   {/if}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/DesignView.svelte b/packages/builder/src/components/userInterface/DesignView.svelte
index 8664fd1f30..b783b38481 100644
--- a/packages/builder/src/components/userInterface/DesignView.svelte
+++ b/packages/builder/src/components/userInterface/DesignView.svelte
@@ -28,7 +28,6 @@
 </script>
 
 <div class="design-view-container">
-
   <div class="design-view-state-categories">
     <FlatButtonGroup value={selectedCategory} {buttonProps} {onChange} />
   </div>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
index 1c73e49c98..d5e7422446 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
@@ -18,9 +18,7 @@
 </script>
 
 <div class="handler-option">
-  {#if parameter.name === 'automation'}
-    <span>{parameter.name}</span>
-  {/if}
+  {#if parameter.name === 'automation'}<span>{parameter.name}</span>{/if}
   {#if parameter.name === 'automation'}
     <Select on:change bind:value={parameter.value}>
       <option value="" />
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
index 6c71025d67..014c5a32df 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
@@ -48,7 +48,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
index 4917336e96..06f298c348 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
@@ -109,7 +109,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
index e06293cce9..9303bf1a4a 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
@@ -107,7 +107,6 @@
       {schemaFields}
       on:fieldschanged={onFieldsChanged} />
   {/if}
-
 </div>
 
 <style>
diff --git a/packages/builder/src/components/userInterface/IconSelect/IconSelect.svelte b/packages/builder/src/components/userInterface/IconSelect/IconSelect.svelte
index 9ad50b8c9a..6141702439 100644
--- a/packages/builder/src/components/userInterface/IconSelect/IconSelect.svelte
+++ b/packages/builder/src/components/userInterface/IconSelect/IconSelect.svelte
@@ -126,9 +126,7 @@
             on:click={() => switchLetter(letter)}>
             {letter}
           </span>
-          {#if idx !== alphabet.length - 1}
-            <span>-</span>
-          {/if}
+          {#if idx !== alphabet.length - 1}<span>-</span>{/if}
         {/each}
       </div>
       <div class="search-input">
diff --git a/packages/builder/src/components/userInterface/ItemTab/Item.svelte b/packages/builder/src/components/userInterface/ItemTab/Item.svelte
index 86044cb617..7d118afe61 100644
--- a/packages/builder/src/components/userInterface/ItemTab/Item.svelte
+++ b/packages/builder/src/components/userInterface/ItemTab/Item.svelte
@@ -3,9 +3,7 @@
 </script>
 
 <div data-cy={item.name} class="item-item" on:click>
-  <div class="item-icon">
-    <i class={item.icon} />
-  </div>
+  <div class="item-icon"><i class={item.icon} /></div>
   <div class="item-text">
     <div class="item-name">{item.name}</div>
   </div>
diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte
index 84dbcb1da0..6d02439c1b 100644
--- a/packages/builder/src/components/userInterface/NewScreenModal.svelte
+++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte
@@ -89,7 +89,6 @@
 </script>
 
 <ModalContent title="New Screen" confirmText="Create Screen" onConfirm={save}>
-
   <Select
     label="Choose a Template"
     bind:value={templateIndex}
@@ -109,5 +108,4 @@
     error={routeError}
     bind:value={route}
     on:change={routeChanged} />
-
 </ModalContent>
diff --git a/packages/builder/src/pages/[application]/backend/table/[selectedTable]/index.svelte b/packages/builder/src/pages/[application]/backend/table/[selectedTable]/index.svelte
index 555d304586..b7ee09a4f3 100644
--- a/packages/builder/src/pages/[application]/backend/table/[selectedTable]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/table/[selectedTable]/index.svelte
@@ -7,9 +7,7 @@
 
 {#if $backendUiStore.selectedDatabase._id && selectedTable.name}
   <TableDataTable />
-{:else}
-  <i>Create your first table to start building</i>
-{/if}
+{:else}<i>Create your first table to start building</i>{/if}
 
 <style>
   i {
diff --git a/packages/builder/src/pages/[application]/backend/table/index.svelte b/packages/builder/src/pages/[application]/backend/table/index.svelte
index 137a25aa48..15ed1e299b 100644
--- a/packages/builder/src/pages/[application]/backend/table/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/table/index.svelte
@@ -23,9 +23,7 @@
 
 {#if $backendUiStore.tables.length === 0}
   <i>Create your first table to start building</i>
-{:else}
-  <i>Select a table to edit</i>
-{/if}
+{:else}<i>Select a table to edit</i>{/if}
 
 <style>
   i {
diff --git a/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte b/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
index 8a0c87b98b..3f592e6148 100644
--- a/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
@@ -7,9 +7,7 @@
 
 {#if $backendUiStore.selectedDatabase._id && selectedView}
   <ViewDataTable view={selectedView} />
-{:else}
-  <i>Create your first table to start building</i>
-{/if}
+{:else}<i>Create your first table to start building</i>{/if}
 
 <style>
   i {
diff --git a/packages/server/src/utilities/csvParser.js b/packages/server/src/utilities/csvParser.js
index aacb599676..222ff6523f 100644
--- a/packages/server/src/utilities/csvParser.js
+++ b/packages/server/src/utilities/csvParser.js
@@ -25,7 +25,7 @@ function parse(path, parsers) {
         }
       }
     })
-    result.subscribe((row, lineNumber) => {
+    result.subscribe(row => {
       // For each CSV row parse all the columns that need parsed
       for (let key in parsers) {
         if (!schema[key] || schema[key].success) {
diff --git a/packages/server/src/utilities/fileProcessor.js b/packages/server/src/utilities/fileProcessor.js
index 4c219b758f..58c539ea35 100644
--- a/packages/server/src/utilities/fileProcessor.js
+++ b/packages/server/src/utilities/fileProcessor.js
@@ -1,5 +1,5 @@
 const fs = require("fs")
-// const sharp = require("sharp")
+const sharp = require("sharp")
 const fsPromises = fs.promises
 
 const FORMATS = {
@@ -7,14 +7,13 @@ const FORMATS = {
 }
 
 async function processImage(file) {
-  // const imgMeta = await sharp(file.path)
-  //   .resize(300)
-  //   .toFile(file.outputPath)
-
-  // return {
-  //   ...file,
-  //   ...imgMeta,
-  // }
+  const imgMeta = await sharp(file.path)
+    .resize(300)
+    .toFile(file.outputPath)
+  return {
+    ...file,
+    ...imgMeta,
+  }
 }
 
 async function process(file) {
diff --git a/packages/standard-components/src/Card.svelte b/packages/standard-components/src/Card.svelte
index b62ace7321..bfb0e0072f 100644
--- a/packages/standard-components/src/Card.svelte
+++ b/packages/standard-components/src/Card.svelte
@@ -23,9 +23,7 @@
 </script>
 
 <div use:cssVars={cssVariables} class="container">
-  {#if showImage}
-    <img class="image" src={imageUrl} alt="" />
-  {/if}
+  {#if showImage}<img class="image" src={imageUrl} alt="" />{/if}
   <div class="content">
     <h2 class="heading">{heading}</h2>
     <h4 class="text">{description}</h4>
diff --git a/packages/standard-components/src/CardHorizontal.svelte b/packages/standard-components/src/CardHorizontal.svelte
index 86dc6437ec..e3c010e507 100644
--- a/packages/standard-components/src/CardHorizontal.svelte
+++ b/packages/standard-components/src/CardHorizontal.svelte
@@ -26,9 +26,7 @@
 </script>
 
 <div use:cssVars={cssVariables} class="container">
-  {#if showImage}
-    <img class="image" src={imageUrl} alt="" />
-  {/if}
+  {#if showImage}<img class="image" src={imageUrl} alt="" />{/if}
   <div class="content">
     <main>
       <h2 class="heading">{heading}</h2>
diff --git a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
index 1d0b79480f..3d8e6364b7 100644
--- a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
+++ b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
@@ -27,15 +27,4 @@
         on:newRow={() => dispatch('newRow')} />
  </DropdownMenu> -->
 
-<!-- <style>
-  div {
-    display: grid;
-    grid-template-columns: auto auto;
-    place-items: start center;
-  }
-  h5 {
-    padding: var(--spacing-xl) 0 0 var(--spacing-xl);
-    margin: 0;
-    font-weight: 500;
-  }
-</style> -->
+<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂=""></style>-->
diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index b7a277435d..6a2a6ded61 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -123,7 +123,9 @@
         {#if selectedRows.length > 0}
           <DeleteButton text small on:click={deleteRows}>
             <Icon name="addrow" />
-            Delete {selectedRows.length} row(s)
+            Delete
+            {selectedRows.length}
+            row(s)
           </DeleteButton>
         {/if}
       </div>
diff --git a/packages/standard-components/src/Login.svelte b/packages/standard-components/src/Login.svelte
index b7435def58..6f2acb2d97 100644
--- a/packages/standard-components/src/Login.svelte
+++ b/packages/standard-components/src/Login.svelte
@@ -42,9 +42,7 @@
 <div class="root">
   <div class="content">
     {#if logo}
-      <div class="logo-container">
-        <img src={logo} alt="logo" />
-      </div>
+      <div class="logo-container"><img src={logo} alt="logo" /></div>
     {/if}
 
     {#if title}
diff --git a/packages/standard-components/src/Text.svelte b/packages/standard-components/src/Text.svelte
index 96fc09e025..55b8fb762b 100644
--- a/packages/standard-components/src/Text.svelte
+++ b/packages/standard-components/src/Text.svelte
@@ -33,6 +33,4 @@
   <sub class={className}>{text}</sub>
 {:else if isTag('sup')}
   <sup class={className}>{text}</sup>
-{:else}
-  <span>{text}</span>
-{/if}
+{:else}<span>{text}</span>{/if}
diff --git a/packages/standard-components/src/attachments/AttachmentList.svelte b/packages/standard-components/src/attachments/AttachmentList.svelte
index bb58d5b0a3..52f61e2d8e 100644
--- a/packages/standard-components/src/attachments/AttachmentList.svelte
+++ b/packages/standard-components/src/attachments/AttachmentList.svelte
@@ -12,9 +12,7 @@
       <div class="file">
         {#if FILE_TYPES.IMAGE.includes(file.extension.toLowerCase())}
           <img {width} {height} src={file.url} alt="preview of {file.name}" />
-        {:else}
-          <i class="far fa-file" />
-        {/if}
+        {:else}<i class="far fa-file" />{/if}
       </div>
       <span>{file.name}</span>
     </a>
diff --git a/yarn.lock b/yarn.lock
index 9b84e373af..0c0f88a3d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3690,11 +3690,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier-plugin-svelte@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-0.7.0.tgz#5ac0b9f194e0450c88ff1e167cbf3b32d2642df2"
-  dependencies:
-    tslib "^1.9.3"
+prettier-plugin-svelte@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-1.4.0.tgz#bb992759fb77ec2c3545d454a7c60f7a258cb745"
+  integrity sha512-KXO2He7Kql0Lz4DdlzVli1j2JTDUR9jPV/DqyfnJmY1pCeSV1qZkxgdsyYma35W6OLrCAr/G6yKdmzo+75u2Ng==
 
 prettier@^1.19.1:
   version "1.19.1"
@@ -4529,7 +4528,7 @@ trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
 
-tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
 

From db72b29eafc2098226e41d2637d1c6a8ee01edb5 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 14 Oct 2020 15:06:48 +0100
Subject: [PATCH 16/18] update row_save event

---
 .../userInterface/temporaryPanelStructure.js  | 74 +++++++++----------
 packages/server/src/api/controllers/row.js    | 24 +++---
 2 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index 7914e1a43a..36a6c8e073 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -1165,14 +1165,6 @@ export default {
           },
           children: [],
         },
-        // {
-        // name: "Map",
-        // _component: "@budibase/standard-components/datamap",
-        // description: "Shiny map",
-        // icon: "ri-map-pin-line",
-        // properties: { design: { ...all } },
-        // children: [],
-        // },
       ],
     },
     {
@@ -1206,39 +1198,39 @@ export default {
             ],
           },
         },
-        {
-          name: "Login",
-          _component: "@budibase/standard-components/login",
-          description:
-            "A component that automatically generates a login screen for your app.",
-          icon: "ri-login-box-line",
-          children: [],
-          properties: {
-            design: { ...all },
-            settings: [
-              {
-                label: "Name",
-                key: "name",
-                control: Input,
-              },
-              {
-                label: "Logo",
-                key: "logo",
-                control: Input,
-              },
-              {
-                label: "Title",
-                key: "title",
-                control: Input,
-              },
-              {
-                label: "Button Text",
-                key: "buttonText",
-                control: Input,
-              },
-            ],
-          },
-        },
+        // {
+        //   name: "Login",
+        //   _component: "@budibase/standard-components/login",
+        //   description:
+        //     "A component that automatically generates a login screen for your app.",
+        //   icon: "ri-login-box-line",
+        //   children: [],
+        //   properties: {
+        //     design: { ...all },
+        //     settings: [
+        //       {
+        //         label: "Name",
+        //         key: "name",
+        //         control: Input,
+        //       },
+        //       {
+        //         label: "Logo",
+        //         key: "logo",
+        //         control: Input,
+        //       },
+        //       {
+        //         label: "Title",
+        //         key: "title",
+        //         control: Input,
+        //       },
+        //       {
+        //         label: "Button Text",
+        //         key: "buttonText",
+        //         control: Input,
+        //       },
+        //     ],
+        //   },
+        // },
       ],
     },
   ],
diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index 9c39149bae..8466cfcc33 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -12,16 +12,16 @@ const { cloneDeep } = require("lodash")
 const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
 
 validateJs.extend(validateJs.validators.datetime, {
-  parse: function(value) {
+  parse: function (value) {
     return new Date(value).getTime()
   },
   // Input is a unix timestamp
-  format: function(value) {
+  format: function (value) {
     return new Date(value).toISOString()
   },
 })
 
-exports.patch = async function(ctx) {
+exports.patch = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   let row = await db.get(ctx.params.id)
@@ -67,7 +67,7 @@ exports.patch = async function(ctx) {
   ctx.message = `${table.name} updated successfully.`
 }
 
-exports.save = async function(ctx) {
+exports.save = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   let row = ctx.request.body
@@ -107,7 +107,7 @@ exports.save = async function(ctx) {
   // make sure link rows are up to date
   row = await linkRows.updateLinks({
     instanceId,
-    eventType: linkRows.EventType.RECORD_SAVE,
+    eventType: linkRows.EventType.ROW_SAVE,
     row,
     tableId: row.tableId,
     table,
@@ -134,7 +134,7 @@ exports.save = async function(ctx) {
   ctx.message = `${table.name} created successfully`
 }
 
-exports.fetchView = async function(ctx) {
+exports.fetchView = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const { stats, group, field } = ctx.query
@@ -166,7 +166,7 @@ exports.fetchView = async function(ctx) {
   ctx.body = await linkRows.attachLinkInfo(instanceId, response.rows)
 }
 
-exports.fetchTableRows = async function(ctx) {
+exports.fetchTableRows = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const response = await db.allDocs(
@@ -181,7 +181,7 @@ exports.fetchTableRows = async function(ctx) {
   )
 }
 
-exports.search = async function(ctx) {
+exports.search = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const response = await db.allDocs({
@@ -194,7 +194,7 @@ exports.search = async function(ctx) {
   )
 }
 
-exports.find = async function(ctx) {
+exports.find = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const row = await db.get(ctx.params.rowId)
@@ -205,7 +205,7 @@ exports.find = async function(ctx) {
   ctx.body = await linkRows.attachLinkInfo(instanceId, row)
 }
 
-exports.destroy = async function(ctx) {
+exports.destroy = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const row = await db.get(ctx.params.rowId)
@@ -227,7 +227,7 @@ exports.destroy = async function(ctx) {
   ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
 }
 
-exports.validate = async function(ctx) {
+exports.validate = async function (ctx) {
   const errors = await validate({
     instanceId: ctx.user.instanceId,
     tableId: ctx.params.tableId,
@@ -253,7 +253,7 @@ async function validate({ instanceId, tableId, row, table }) {
   return { valid: Object.keys(errors).length === 0, errors }
 }
 
-exports.fetchEnrichedRow = async function(ctx) {
+exports.fetchEnrichedRow = async function (ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const tableId = ctx.params.tableId

From 1601a9b2a2bf8abc2861197a84ca5f4dae0f9ca3 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 14 Oct 2020 15:13:22 +0100
Subject: [PATCH 17/18] lint

---
 packages/server/src/api/controllers/row.js    | 22 +++++++++----------
 .../src/DataGrid/AttachmentCell/Button.svelte |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index 8466cfcc33..4042336741 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -12,16 +12,16 @@ const { cloneDeep } = require("lodash")
 const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
 
 validateJs.extend(validateJs.validators.datetime, {
-  parse: function (value) {
+  parse: function(value) {
     return new Date(value).getTime()
   },
   // Input is a unix timestamp
-  format: function (value) {
+  format: function(value) {
     return new Date(value).toISOString()
   },
 })
 
-exports.patch = async function (ctx) {
+exports.patch = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   let row = await db.get(ctx.params.id)
@@ -67,7 +67,7 @@ exports.patch = async function (ctx) {
   ctx.message = `${table.name} updated successfully.`
 }
 
-exports.save = async function (ctx) {
+exports.save = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   let row = ctx.request.body
@@ -134,7 +134,7 @@ exports.save = async function (ctx) {
   ctx.message = `${table.name} created successfully`
 }
 
-exports.fetchView = async function (ctx) {
+exports.fetchView = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const { stats, group, field } = ctx.query
@@ -166,7 +166,7 @@ exports.fetchView = async function (ctx) {
   ctx.body = await linkRows.attachLinkInfo(instanceId, response.rows)
 }
 
-exports.fetchTableRows = async function (ctx) {
+exports.fetchTableRows = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const response = await db.allDocs(
@@ -181,7 +181,7 @@ exports.fetchTableRows = async function (ctx) {
   )
 }
 
-exports.search = async function (ctx) {
+exports.search = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const response = await db.allDocs({
@@ -194,7 +194,7 @@ exports.search = async function (ctx) {
   )
 }
 
-exports.find = async function (ctx) {
+exports.find = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const row = await db.get(ctx.params.rowId)
@@ -205,7 +205,7 @@ exports.find = async function (ctx) {
   ctx.body = await linkRows.attachLinkInfo(instanceId, row)
 }
 
-exports.destroy = async function (ctx) {
+exports.destroy = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const row = await db.get(ctx.params.rowId)
@@ -227,7 +227,7 @@ exports.destroy = async function (ctx) {
   ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
 }
 
-exports.validate = async function (ctx) {
+exports.validate = async function(ctx) {
   const errors = await validate({
     instanceId: ctx.user.instanceId,
     tableId: ctx.params.tableId,
@@ -253,7 +253,7 @@ async function validate({ instanceId, tableId, row, table }) {
   return { valid: Object.keys(errors).length === 0, errors }
 }
 
-exports.fetchEnrichedRow = async function (ctx) {
+exports.fetchEnrichedRow = async function(ctx) {
   const instanceId = ctx.user.instanceId
   const db = new CouchDB(instanceId)
   const tableId = ctx.params.tableId
diff --git a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
index 3d8e6364b7..f2fc24fd92 100644
--- a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
+++ b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
@@ -27,4 +27,4 @@
         on:newRow={() => dispatch('newRow')} />
  </DropdownMenu> -->
 
-<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂=""></style>-->
+<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->

From a8dfb341124e1f3100b11daa753680410d427d12 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Wed, 14 Oct 2020 16:47:53 +0100
Subject: [PATCH 18/18] don't show login component on logged in page, fix auth
 for app assets

---
 .../ComponentPropertiesPanel.svelte           | 12 ----
 .../ComponentSelectionList.svelte             | 22 +-----
 .../userInterface/ItemTab/Tab.svelte          | 10 ++-
 .../userInterface/temporaryPanelStructure.js  | 67 ++++++++++---------
 .../server/src/middleware/authenticated.js    |  6 +-
 packages/server/src/middleware/authorized.js  |  3 +
 .../src/DataGrid/AttachmentCell/Button.svelte |  2 +-
 7 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 800905202d..1331ce0bdb 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -1,21 +1,10 @@
 <script>
-  import { setContext, onMount } from "svelte"
-
   import { store } from "builderStore"
-  import {
-    LayoutIcon,
-    PaintIcon,
-    TerminalIcon,
-    CircleIndicator,
-    EventsIcon,
-  } from "components/common/Icons/"
   import panelStructure from "./temporaryPanelStructure.js"
   import CategoryTab from "./CategoryTab.svelte"
   import DesignView from "./DesignView.svelte"
   import SettingsView from "./SettingsView.svelte"
 
-  let current_view = "design"
-  let codeEditor
   let flattenedPanel = flattenComponents(panelStructure.categories)
   let categories = [
     { value: "settings", name: "Settings" },
@@ -23,7 +12,6 @@
   ]
   let selectedCategory = categories[0]
 
-  $: components = $store.components
   $: componentInstance =
     $store.currentView !== "component"
       ? { ...$store.currentPreviewItem, ...$store.currentComponentInfo }
diff --git a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
index 99123252ef..00ce42cf61 100644
--- a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
@@ -1,33 +1,13 @@
 <script>
   import { goto } from "@sveltech/routify"
-  import { splitName } from "./pagesParsing/splitRootComponentName.js"
+  import { store } from "builderStore"
   import components from "./temporaryPanelStructure.js"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CategoryTab from "./CategoryTab.svelte"
-  import {
-    find,
-    sortBy,
-    groupBy,
-    values,
-    filter,
-    map,
-    uniqBy,
-    flatten,
-  } from "lodash/fp"
-
-  import { pipe } from "components/common/core"
 
   import Tab from "./ItemTab/Tab.svelte"
-  import { store } from "builderStore"
 
   export let toggleTab
 
-  let selectTemplateDialog
-  let selectedTemplateInstance
-  let templateInstances = []
-
-  let selectedComponent = null
-
   const categories = components.categories
   let selectedCategory = categories[0]
 
diff --git a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
index 70b00f394a..090fad1dc1 100644
--- a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
+++ b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
@@ -1,8 +1,10 @@
 <script>
   import { createEventDispatcher } from "svelte"
+  import { store } from "builderStore"
+  import Item from "./Item.svelte"
+
   const dispatch = createEventDispatcher()
 
-  import Item from "./Item.svelte"
   export let list
 
   let category = list
@@ -21,10 +23,12 @@
 </script>
 
 {#if !list.isCategory}
-  <button class="back-button" on:click={() => (list = category)}>Back</button>
+  <button class="back-button" on:click={goBack}>Back</button>
 {/if}
 {#each list.children as item}
-  <Item {item} on:click={() => handleClick(item)} />
+  {#if !item.showOnPages || item.showOnPages.includes($store.currentPageName)}
+    <Item {item} on:click={() => handleClick(item)} />
+  {/if}
 {/each}
 
 <style>
diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index 36a6c8e073..287115b795 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -1198,39 +1198,40 @@ export default {
             ],
           },
         },
-        // {
-        //   name: "Login",
-        //   _component: "@budibase/standard-components/login",
-        //   description:
-        //     "A component that automatically generates a login screen for your app.",
-        //   icon: "ri-login-box-line",
-        //   children: [],
-        //   properties: {
-        //     design: { ...all },
-        //     settings: [
-        //       {
-        //         label: "Name",
-        //         key: "name",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Logo",
-        //         key: "logo",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Title",
-        //         key: "title",
-        //         control: Input,
-        //       },
-        //       {
-        //         label: "Button Text",
-        //         key: "buttonText",
-        //         control: Input,
-        //       },
-        //     ],
-        //   },
-        // },
+        {
+          name: "Login",
+          _component: "@budibase/standard-components/login",
+          description:
+            "A component that automatically generates a login screen for your app.",
+          icon: "ri-login-box-line",
+          children: [],
+          showOnPages: ["unauthenticated"],
+          properties: {
+            design: { ...all },
+            settings: [
+              {
+                label: "Name",
+                key: "name",
+                control: Input,
+              },
+              {
+                label: "Logo",
+                key: "logo",
+                control: Input,
+              },
+              {
+                label: "Title",
+                key: "title",
+                control: Input,
+              },
+              {
+                label: "Button Text",
+                key: "buttonText",
+                control: Input,
+              },
+            ],
+          },
+        },
       ],
     },
   ],
diff --git a/packages/server/src/middleware/authenticated.js b/packages/server/src/middleware/authenticated.js
index 3a2c2ec9a9..53ee65aa08 100644
--- a/packages/server/src/middleware/authenticated.js
+++ b/packages/server/src/middleware/authenticated.js
@@ -31,8 +31,12 @@ module.exports = async (ctx, next) => {
 
   if (!token) {
     ctx.auth.authenticated = false
+
+    const appId = process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId
+
     ctx.user = {
-      appId: process.env.CLOUD ? ctx.subdomains[1] : ctx.params.appId,
+      // if appId can't be determined from path param or subdomain
+      appId: appId || ctx.referer.split("/").pop(),
     }
     await next()
     return
diff --git a/packages/server/src/middleware/authorized.js b/packages/server/src/middleware/authorized.js
index 238b2cab3d..46f68c1564 100644
--- a/packages/server/src/middleware/authorized.js
+++ b/packages/server/src/middleware/authorized.js
@@ -34,6 +34,9 @@ module.exports = (permName, getItemId) => async (ctx, next) => {
     ctx.throw(403, "API key invalid")
   }
 
+  // don't expose builder endpoints in the cloud
+  if (environment.CLOUD && permName === BUILDER) return
+
   if (!ctx.auth.authenticated) {
     ctx.throw(403, "Session not authenticated")
   }
diff --git a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
index f2fc24fd92..b32e8e0294 100644
--- a/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
+++ b/packages/standard-components/src/DataGrid/AttachmentCell/Button.svelte
@@ -27,4 +27,4 @@
         on:newRow={() => dispatch('newRow')} />
  </DropdownMenu> -->
 
-<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->
+<!--<style ✂prettier:content✂="CiAgZGl2IHsKICAgIGRpc3BsYXk6IGdyaWQ7CiAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IGF1dG8gYXV0bzsKICAgIHBsYWNlLWl0ZW1zOiBzdGFydCBjZW50ZXI7CiAgfQogIGg1IHsKICAgIHBhZGRpbmc6IHZhcigtLXNwYWNpbmcteGwpIDAgMCB2YXIoLS1zcGFjaW5nLXhsKTsKICAgIG1hcmdpbjogMDsKICAgIGZvbnQtd2VpZ2h0OiA1MDA7CiAgfQo=" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂="" ✂prettier:content✂=""></style>-->