From ebffeeb9984e8d5489e9bc035e8cb728bb8fb0a1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 16 Oct 2020 13:48:59 +0100
Subject: [PATCH] Fixing some issues found with deleting tables and
 relationships not getting cleaned up fully + builder not updating - also
 making sure builder store initial state of screens is accurate.

---
 packages/builder/src/builderStore/store/index.js    |  5 ++++-
 .../TableNavigator/popovers/EditTablePopover.svelte |  1 +
 packages/server/src/db/linkedRows/LinkController.js | 13 +++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index 277f57584e..e6a42ee91c 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -129,7 +129,10 @@ const setPackage = (store, initial) => async pkg => {
   initial.appId = pkg.application._id
   initial.pages = pkg.pages
   initial.hasAppPackage = true
-  initial.screens = values(pkg.screens)
+  initial.screens = [
+    ...Object.values(main_screens),
+    ...Object.values(unauth_screens),
+  ]
   initial.builtins = [getBuiltin("##builtin/screenslot")]
   initial.appInstances = pkg.application.instances
   initial.appId = pkg.application._id
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index 2b74e9c288..25f74671fd 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -42,6 +42,7 @@
   async function deleteTable() {
     await backendUiStore.actions.tables.delete(table)
     store.deleteScreens(templateScreens)
+    await backendUiStore.actions.tables.fetch()
     notifier.success("Table deleted")
     hideEditor()
   }
diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.js
index 06e4aab1f2..5eed0bb4a8 100644
--- a/packages/server/src/db/linkedRows/LinkController.js
+++ b/packages/server/src/db/linkedRows/LinkController.js
@@ -1,6 +1,7 @@
 const CouchDB = require("../index")
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils")
 const { generateLinkID } = require("../utils")
+const Sentry = require("@sentry/node")
 
 /**
  * Creates a new link document structure which can be put to the database. It is important to
@@ -289,10 +290,14 @@ class LinkController {
     const schema = table.schema
     for (let fieldName of Object.keys(schema)) {
       const field = schema[fieldName]
-      if (field.type === "link") {
-        const linkedTable = await this._db.get(field.tableId)
-        delete linkedTable.schema[table.name]
-        await this._db.put(linkedTable)
+      try {
+        if (field.type === "link") {
+          const linkedTable = await this._db.get(field.tableId)
+          delete linkedTable.schema[field.fieldName]
+          await this._db.put(linkedTable)
+        }
+      } catch (err) {
+        Sentry.captureException(err)
       }
     }
     // need to get the full link docs to delete them