Merge branch 'master' of github.com:Budibase/budibase into autoscreen-templates

packages/builder/src/builderStore/store/index.js

@@ -1,4 +1,4 @@
-import { values, cloneDeep } from "lodash/fp"
+import { cloneDeep } from "lodash/fp"
 import getNewComponentName from "../getNewComponentName"
 import { backendUiStore } from "builderStore"
 import { writable, get } from "svelte/store"
@@ -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

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()
   }

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,11 +290,15 @@ class LinkController {
     const schema = table.schema
     for (let fieldName of Object.keys(schema)) {
       const field = schema[fieldName]
+      try {
         if (field.type === "link") {
           const linkedTable = await this._db.get(field.tableId)
-        delete linkedTable.schema[table.name]
+          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
     const linkDocs = await this.getTableLinkDocs()