diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte index 7eaac42bbd..c35fbd36c2 100644 --- a/packages/builder/src/components/deploy/RevertModal.svelte +++ b/packages/builder/src/components/deploy/RevertModal.svelte @@ -15,6 +15,15 @@ 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`) + const pkg = await applicationPkg.json() + if (applicationPkg.ok) { + await store.actions.initialise(pkg) + } else { + throw new Error(pkg) + } + notifications.info("Changes reverted.") } catch (err) { notifications.error(`Error reverting changes: ${err}`) diff --git a/packages/builder/src/pages/builder/app/deploy_old/_layout.svelte b/packages/builder/src/pages/builder/app/deploy_old/_layout.svelte deleted file mode 100644 index ef86cab68c..0000000000 --- a/packages/builder/src/pages/builder/app/deploy_old/_layout.svelte +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/builder/src/pages/builder/app/deploy_old/index.svelte b/packages/builder/src/pages/builder/app/deploy_old/index.svelte deleted file mode 100644 index 77b6d51520..0000000000 --- a/packages/builder/src/pages/builder/app/deploy_old/index.svelte +++ /dev/null @@ -1,79 +0,0 @@ - - -
- Rocket flying through sky -
- It's time to shine! - -
-
- - feedbackModal.hide()} /> - - - - diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index c7c8d10062..0136c9cab2 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -18,6 +18,7 @@ import analytics from "analytics" import { onMount } from "svelte" import { apps } from "stores/portal" + import { auth } from "stores/backend" import download from "downloadjs" import { goto } from "@roxi/routify" import ConfirmDialog from "components/common/ConfirmDialog.svelte" @@ -61,6 +62,11 @@ } 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.`) + return + } + if (appStatus === AppStatus.DEV) { $goto(`../../app/${app.appId}`) } else { diff --git a/packages/server/src/api/index.js b/packages/server/src/api/index.js index 31559d2e2f..332b917a76 100644 --- a/packages/server/src/api/index.js +++ b/packages/server/src/api/index.js @@ -37,7 +37,6 @@ router }) ) .use(currentApp) -// .use(development) // error handling middleware router.use(async (ctx, next) => {