From dc9552dbadf10d330140d509c2a4a0f8ba100ed4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 9 Oct 2020 19:30:50 +0100
Subject: [PATCH] Updating tests and re-formatting.

---
 .../components/backend/DataTable/popovers/RowPopover.svelte | 2 +-
 .../components/backend/TableNavigator/TableNavigator.svelte | 2 +-
 .../userInterface/EventsEditor/actions/UpdateRow.svelte     | 4 ++--
 packages/server/src/api/controllers/row.js                  | 3 +--
 packages/server/src/api/controllers/table.js                | 4 +---
 .../view/tests/__snapshots__/viewBuilder.spec.js.snap       | 6 +++---
 packages/server/src/db/utils.js                             | 4 +---
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
index 786c062245..ec1e2bb783 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
@@ -52,7 +52,7 @@
   onOk={deleteRow}
   title="Confirm Delete" />
 <Modal bind:this={modal}>
-  <CreateEditRowModal row={row} />
+  <CreateEditRowModal {row} />
 </Modal>
 
 <style>
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 03b59a8681..b8683d3dba 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -36,7 +36,7 @@
               title={table.name}
               icon="ri-table-fill"
               on:click={() => selectTable(table)}>
-              <EditTablePopover table={table} />
+              <EditTablePopover {table} />
             </ListItem>
             {#each Object.keys(table.views || {}) as viewName}
               <ListItem
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
index f5b82a31c6..e06293cce9 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
@@ -86,8 +86,8 @@
 <div class="root">
   {#if idFields.length === 0}
     <div class="cannot-use">
-      Update row can only be used within a component that provides data, such
-      as a List
+      Update row can only be used within a component that provides data, such as
+      a List
     </div>
   {:else}
     <Label size="m" color="dark">Row Id</Label>
diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js
index effd611ccb..e057ac0040 100644
--- a/packages/server/src/api/controllers/row.js
+++ b/packages/server/src/api/controllers/row.js
@@ -218,8 +218,7 @@ exports.destroy = async function(ctx) {
 
   // for automations include the row that was deleted
   ctx.row = row
-  ctx.eventEmitter &&
-    ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
+  ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, instanceId, row)
 }
 
 exports.validate = async function(ctx) {
diff --git a/packages/server/src/api/controllers/table.js b/packages/server/src/api/controllers/table.js
index 5d98117f39..08854b3bba 100644
--- a/packages/server/src/api/controllers/table.js
+++ b/packages/server/src/api/controllers/table.js
@@ -116,9 +116,7 @@ exports.destroy = async function(ctx) {
       include_docs: true,
     })
   )
-  await db.bulkDocs(
-    rows.rows.map(row => ({ _id: row.id, _deleted: true }))
-  )
+  await db.bulkDocs(rows.rows.map(row => ({ _id: row.id, _deleted: true })))
 
   // update linked rows
   await linkRows.updateLinks({
diff --git a/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap b/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
index a5a0aba028..cd66d040f3 100644
--- a/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
+++ b/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
@@ -12,7 +12,6 @@ Object {
     "field": "myField",
     "filters": Array [],
     "groupBy": undefined,
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
     "schema": Object {
       "avg": Object {
         "type": "number",
@@ -36,6 +35,7 @@ Object {
         "type": "number",
       },
     },
+    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
   },
   "reduce": "_stats",
 }
@@ -65,8 +65,8 @@ Object {
       },
     ],
     "groupBy": undefined,
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
     "schema": null,
+    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
   },
 }
 `;
@@ -83,8 +83,8 @@ Object {
     "field": "score",
     "filters": Array [],
     "groupBy": "age",
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
     "schema": null,
+    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
   },
   "reduce": "_stats",
 }
diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js
index 46f4dc1872..a73fc58757 100644
--- a/packages/server/src/db/utils.js
+++ b/packages/server/src/db/utils.js
@@ -67,9 +67,7 @@ exports.getRowParams = (tableId, rowId = null, otherProps = {}) => {
     throw "Cannot build params for rows without a table ID"
   }
   const endOfKey =
-    rowId == null
-      ? `${tableId}${SEPARATOR}`
-      : `${tableId}${SEPARATOR}${rowId}`
+    rowId == null ? `${tableId}${SEPARATOR}` : `${tableId}${SEPARATOR}${rowId}`
   return getDocParams(DocumentTypes.ROW, endOfKey, otherProps)
 }