From e46140cb3afa7c619c054bc2429bfddafcb8427a Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Mon, 18 Dec 2023 09:36:11 +0100 Subject: [PATCH 1/2] - Avoid BUSINESS plan usage in string literals. - Change PREMIUM_PLUS by PREMIUM - Change ENTERPRISE_BASIC by ENTERPRISE --- .../builder/portal/account/auditLogs/index.svelte | 2 +- .../src/pages/builder/portal/account/usage.svelte | 10 +++++++++- .../pages/builder/portal/settings/auth/index.svelte | 2 +- .../builder/portal/settings/environment/index.svelte | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte index a5b0b19c9b..4b68c285f8 100644 --- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte +++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte @@ -257,7 +257,7 @@ { diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index cbe84973ef..9e7c402e91 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -15,6 +15,7 @@ import { DashCard, Usage } from "components/usage" import { PlanModel } from "constants" import { sdk } from "@budibase/shared-core" + import { PlanType } from "@budibase/types" let staticUsage = [] let monthlyUsage = [] @@ -106,7 +107,14 @@ } const planTitle = () => { - return `${capitalise(license?.plan.type)} Plan` + const planType = license?.plan.type + let planName = license?.plan.type + if (planType === PlanType.PREMIUM_PLUS) { + planName = "Premium" + } else if (planType === PlanType.ENTERPRISE_BASIC) { + planName = "Enterprise" + } + return `${capitalise(planName)} Plan` } const getDaysRemaining = timestamp => { diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 36cf5c13a8..8c7cad7eeb 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -283,7 +283,7 @@ {#if !$licensing.enforceableSSO} - Enterprise + Enterprise plan {/if} diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte index cff578febd..0d4c7e1479 100644 --- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte @@ -59,7 +59,7 @@ { From 0d56cb8cff7173a66aa9172b3080992742e5f523 Mon Sep 17 00:00:00 2001 From: jvcalderon Date: Mon, 18 Dec 2023 09:37:18 +0100 Subject: [PATCH 2/2] Upgrade account portal submodule --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index b47ad3f331..a1832145f0 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit b47ad3f33177345b9a1685f5dbc10953c8c1c7cc +Subproject commit a1832145f08fca9b923cc145930d5d3a4c2f1d1f