Merge branch 'next' into admin/user-management-ui

packages/builder/src/components/deploy/DeployModal.svelte

@@ -61,6 +61,7 @@
 
   // Required to check any updated deployment statuses between polls
   function checkIncomingDeploymentStatus(current, incoming) {
+    console.log(current, incoming)
     for (let incomingDeployment of incoming) {
       if (
         incomingDeployment.status === DeploymentStatus.FAILURE ||

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -62,7 +62,7 @@
   }
 
   const openApp = app => {
-    if (app.lockedBy && app.lockedBy?.email === $auth.user?.email) {
+    if (app.lockedBy && app.lockedBy?.email !== $auth.user?.email) {
       notifications.error(
         `App locked by ${app.lockedBy.email}. Please allow lock to expire or have them unlock this app.`
       )

packages/server/src/api/controllers/application.js

@@ -244,7 +244,7 @@ exports.delete = async function (ctx) {
 }
 
 const createEmptyAppPackage = async (ctx, app) => {
-  const db = new CouchDB(app.instance._id)
+  const db = new CouchDB(app.appId)
 
   let screensAndLayouts = []
   for (let layout of BASE_LAYOUTS) {

packages/worker/src/api/controllers/app.js

@@ -29,7 +29,7 @@ exports.getApps = async ctx => {
     let url = app.url || encodeURI(`${app.name}`)
     url = `/${url.replace(URL_REGEX_SLASH, "")}`
     body[url] = {
-      appId: app.instance._id,
+      appId: app.appId,
       name: app.name,
       url,
     }