From 320b443ca4d4563cb9377bbdf0cf3b4e49987a29 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 5 Mar 2024 16:23:39 +0000 Subject: [PATCH] Feedback changes. Permission change for app delete from GLOBAL_BUILDER to BUILDER. Minor updates to quota behaviour for apps. --- .../src/components/deploy/DeleteModal.svelte | 7 +- .../portal/licensing/AppLimitModal.svelte | 10 +- .../src/components/start/AppRowContext.svelte | 23 +++- .../components/start/DuplicateAppModal.svelte | 2 + .../app/[application]/settings/_layout.svelte | 1 + .../apps/_components/PortalSideBar.svelte | 25 ++-- .../server/src/api/controllers/application.ts | 46 ++++--- packages/server/src/api/routes/application.ts | 4 +- .../src/api/routes/tests/application.spec.ts | 124 ++++++------------ .../src/tests/utilities/TestConfiguration.ts | 10 -- .../src/tests/utilities/api/application.ts | 17 +++ packages/types/src/api/web/application.ts | 13 +- 12 files changed, 144 insertions(+), 138 deletions(-) diff --git a/packages/builder/src/components/deploy/DeleteModal.svelte b/packages/builder/src/components/deploy/DeleteModal.svelte index 26a13623b5..676fed60f8 100644 --- a/packages/builder/src/components/deploy/DeleteModal.svelte +++ b/packages/builder/src/components/deploy/DeleteModal.svelte @@ -56,9 +56,10 @@ disabled={deletionConfirmationAppName !== appName || deleting} > Are you sure you want to delete - + {appName} - ? + ? +
Please enter the app name below to confirm.

@@ -68,5 +69,7 @@ diff --git a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte index 39f553517e..bdecbcab3d 100644 --- a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte +++ b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte @@ -31,17 +31,11 @@ : null} > - You are currently on our Free plan. Upgrade - to our Pro plan to get unlimited apps and additional features. + You have exceeded the app limit for your current plan. Upgrade to get + unlimited apps and additional features! {#if !$auth.user.accountPortalAccess} Please contact the account holder to upgrade. {/if} - - diff --git a/packages/builder/src/components/start/AppRowContext.svelte b/packages/builder/src/components/start/AppRowContext.svelte index 3d24aeb542..f7986bcfa5 100644 --- a/packages/builder/src/components/start/AppRowContext.svelte +++ b/packages/builder/src/components/start/AppRowContext.svelte @@ -1,8 +1,10 @@ {}} + onDeleteSuccess={async () => { + await licensing.init() + }} /> + + - + { + await licensing.init() + }} + /> @@ -35,7 +48,11 @@ { - duplicateModal.show() + if ($licensing?.usageMetrics?.apps < 100) { + duplicateModal.show() + } else { + appLimitModal.show() + } }} > Duplicate diff --git a/packages/builder/src/components/start/DuplicateAppModal.svelte b/packages/builder/src/components/start/DuplicateAppModal.svelte index 9a83f57215..d7b600cfeb 100644 --- a/packages/builder/src/components/start/DuplicateAppModal.svelte +++ b/packages/builder/src/components/start/DuplicateAppModal.svelte @@ -15,6 +15,7 @@ export let appId export let appName + export let onDuplicateSuccess = () => {} const validation = createValidationStore() const values = writable({ name: appName + " copy", url: null }) @@ -68,6 +69,7 @@ try { await API.duplicateApp(data, appId) apps.load() + onDuplicateSuccess() notifications.success("App duplicated successfully") } catch (err) { notifications.error("Error duplicating app") diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte index 67befddcb9..2e90faf3a9 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -4,6 +4,7 @@ import { url, isActive } from "@roxi/routify" import DeleteModal from "components/deploy/DeleteModal.svelte" import { isOnlyUser, appStore } from "stores/builder" + import { auth } from "stores/portal" let deleteModal diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte index b6f66ff8e7..e487713257 100644 --- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte +++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte @@ -1,10 +1,11 @@