From c32b52430e12c9b9d3113ce73e66ce4c7cf6703e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 17 May 2021 16:33:33 +0100
Subject: [PATCH 1/2] flip bool

---
 packages/builder/src/components/deploy/DeployModal.svelte   | 1 +
 packages/builder/src/pages/builder/portal/apps/index.svelte | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index 5fffa4cd55..b64a9a0b0d 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -62,6 +62,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 || incomingDeployment.status === DeploymentStatus.SUCCESS) {
         const currentDeployment = current.find(
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 0136c9cab2..b9b56424cc 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/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.`)
       return
     }

From ee9a097979fa0e23d3d533143ef74b0f70104a4c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 17 May 2021 21:43:50 +0100
Subject: [PATCH 2/2] lint :sparkles:

---
 packages/auth/src/db/utils.js                 |  4 +-
 packages/auth/src/redis/index.js              |  1 -
 .../src/components/deploy/DeployModal.svelte  | 40 ++++++++++---------
 .../src/components/deploy/RevertModal.svelte  | 28 ++++++++-----
 .../builder/app/[application]/_layout.svelte  | 15 ++++++-
 .../pages/builder/portal/apps/index.svelte    |  6 ++-
 packages/builder/src/stores/portal/index.js   |  2 +-
 .../server/src/api/controllers/application.js |  2 +-
 packages/server/src/api/controllers/role.js   |  3 --
 .../worker/src/api/controllers/admin/roles.js |  6 ++-
 packages/worker/src/api/controllers/app.js    |  2 +-
 11 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index b5e5242cb5..91a682d859 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -166,7 +166,9 @@ exports.getAllApps = async (devApps = false) => {
   const appDbNames = allDbs.filter(dbName =>
     dbName.startsWith(exports.APP_PREFIX)
   )
-  const appPromises = appDbNames.map(db => new CouchDB(db).get(DocumentTypes.APP_METADATA))
+  const appPromises = appDbNames.map(db =>
+    new CouchDB(db).get(DocumentTypes.APP_METADATA)
+  )
   if (appPromises.length === 0) {
     return []
   } else {
diff --git a/packages/auth/src/redis/index.js b/packages/auth/src/redis/index.js
index 544f2b729b..5db80a216b 100644
--- a/packages/auth/src/redis/index.js
+++ b/packages/auth/src/redis/index.js
@@ -143,7 +143,6 @@ class RedisWrapper {
   }
 
   async clear() {
-    const db = this._db
     let items = await this.scan()
     await Promise.all(items.map(obj => this.delete(obj.key)))
   }
diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index b64a9a0b0d..869f4d02ce 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -14,7 +14,6 @@
 
   const POLL_INTERVAL = 1000
 
-
   let loading = false
   let feedbackModal
   let deployments = []
@@ -64,7 +63,10 @@
   function checkIncomingDeploymentStatus(current, incoming) {
     console.log(current, incoming)
     for (let incomingDeployment of incoming) {
-      if (incomingDeployment.status === DeploymentStatus.FAILURE || incomingDeployment.status === DeploymentStatus.SUCCESS) {
+      if (
+        incomingDeployment.status === DeploymentStatus.FAILURE ||
+        incomingDeployment.status === DeploymentStatus.SUCCESS
+      ) {
         const currentDeployment = current.find(
           deployment => deployment._id === incomingDeployment._id
         )
@@ -77,14 +79,17 @@
           if (incomingDeployment.status === DeploymentStatus.FAILURE) {
             notifications.error(incomingDeployment.err)
           } else {
-            notifications.send("Published to Production.", "success", "CheckmarkCircle")
+            notifications.send(
+              "Published to Production.",
+              "success",
+              "CheckmarkCircle"
+            )
           }
         }
-      } 
+      }
     }
   }
 
-
   onMount(() => {
     fetchDeployments()
     poll = setInterval(fetchDeployments, POLL_INTERVAL)
@@ -93,19 +98,16 @@
   onDestroy(() => clearInterval(poll))
 </script>
 
-
-<Button
-secondary
-on:click={publishModal.show}
->
-Publish
-</Button>
+<Button secondary on:click={publishModal.show}>Publish</Button>
 <Modal bind:this={publishModal}>
-<ModalContent
-  title="Publish to Production"
-  confirmText="Publish"
-  onConfirm={deployApp}
->
-  <span>The changes you have made will be published to the production version of the application.</span>
-</ModalContent>
+  <ModalContent
+    title="Publish to Production"
+    confirmText="Publish"
+    onConfirm={deployApp}
+  >
+    <span
+      >The changes you have made will be published to the production version of
+      the application.</span
+    >
+  </ModalContent>
 </Modal>
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index c35fbd36c2..d10aa95acf 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,6 +1,12 @@
 <script>
   import { onMount, onDestroy } from "svelte"
-  import { Button, Icon, Modal, notifications, ModalContent } from "@budibase/bbui"
+  import {
+    Button,
+    Icon,
+    Modal,
+    notifications,
+    ModalContent,
+  } from "@budibase/bbui"
   import { store } from "builderStore"
   import { apps } from "stores/portal"
   import api from "builderStore/api"
@@ -15,8 +21,10 @@
       const json = await response.json()
       if (response.status !== 200) throw json.message
 
-      // Reset frontend state after revert  
-      const applicationPkg = await api.get(`/api/applications/${appId}/appPackage`)
+      // Reset frontend state after revert
+      const applicationPkg = await api.get(
+        `/api/applications/${appId}/appPackage`
+      )
       const pkg = await applicationPkg.json()
       if (applicationPkg.ok) {
         await store.actions.initialise(pkg)
@@ -31,14 +39,12 @@
   }
 </script>
 
-
 <Icon name="Revert" hoverable on:click={revertModal.show} />
 <Modal bind:this={revertModal}>
-<ModalContent
-  title="Revert Changes"
-  confirmText="Revert"
-  onConfirm={revert}
->
-  <span>The changes you have made will be deleted and the application reverted back to its production state.</span>
-</ModalContent>
+  <ModalContent title="Revert Changes" confirmText="Revert" onConfirm={revert}>
+    <span
+      >The changes you have made will be deleted and the application reverted
+      back to its production state.</span
+    >
+  </ModalContent>
 </Modal>
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index ba4181c6cc..53d6e17130 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,7 +1,16 @@
 <script>
   import { store, automationStore } from "builderStore"
   import { roles } from "stores/backend"
-  import { Button, Icon, Modal, ModalContent, ActionGroup, ActionButton, Tabs, Tab } from "@budibase/bbui"
+  import {
+    Button,
+    Icon,
+    Modal,
+    ModalContent,
+    ActionGroup,
+    ActionButton,
+    Tabs,
+    Tab,
+  } from "@budibase/bbui"
   import SettingsLink from "components/settings/Link.svelte"
   import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
   import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte"
@@ -84,7 +93,9 @@
       </div>
       <div class="toprightnav">
         <RevertModal />
-        <Icon name="Play" hoverable
+        <Icon
+          name="Play"
+          hoverable
           on:click={() => {
             window.open(`/${application}`)
           }}
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index b9b56424cc..e1004c9ef2 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -63,14 +63,16 @@
 
   const openApp = app => {
     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.`)
+      notifications.error(
+        `App locked by ${app.lockedBy.email}. Please allow lock to expire or have them unlock this app.`
+      )
       return
     }
 
     if (appStatus === AppStatus.DEV) {
       $goto(`../../app/${app.appId}`)
     } else {
-      window.open(`/${app.appId}`, '_blank');
+      window.open(`/${app.appId}`, "_blank")
     }
   }
 
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index 0c56286e90..c3ff18eb3f 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -1,4 +1,4 @@
 export { organisation } from "./organisation"
 export { admin } from "./admin"
 export { apps } from "./apps"
-export { email } from "./email"
\ No newline at end of file
+export { email } from "./email"
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index b14660b7d7..b9f9dd8c5a 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/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) {
diff --git a/packages/server/src/api/controllers/role.js b/packages/server/src/api/controllers/role.js
index 1ab368e5c5..7b127fb2d0 100644
--- a/packages/server/src/api/controllers/role.js
+++ b/packages/server/src/api/controllers/role.js
@@ -1,15 +1,12 @@
 const CouchDB = require("../../db")
 const {
-  getBuiltinRoles,
   Role,
   getRole,
   isBuiltin,
-  getExternalRoleID,
   getAllRoles,
 } = require("@budibase/auth/roles")
 const {
   generateRoleID,
-  getRoleParams,
   getUserMetadataParams,
   InternalTables,
 } = require("../../db/utils")
diff --git a/packages/worker/src/api/controllers/admin/roles.js b/packages/worker/src/api/controllers/admin/roles.js
index 8ef45d3765..84f5ab2b71 100644
--- a/packages/worker/src/api/controllers/admin/roles.js
+++ b/packages/worker/src/api/controllers/admin/roles.js
@@ -1,5 +1,9 @@
 const { getAllRoles } = require("@budibase/auth/roles")
-const { getAllApps, getDeployedAppID, DocumentTypes } = require("@budibase/auth/db")
+const {
+  getAllApps,
+  getDeployedAppID,
+  DocumentTypes,
+} = require("@budibase/auth/db")
 const CouchDB = require("../../../db")
 
 exports.fetch = async ctx => {
diff --git a/packages/worker/src/api/controllers/app.js b/packages/worker/src/api/controllers/app.js
index 8b556fbb1e..75366c2365 100644
--- a/packages/worker/src/api/controllers/app.js
+++ b/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,
     }