From fa36701f0fdf2f7c1b3290ca847e041d9d567386 Mon Sep 17 00:00:00 2001
From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:54:47 +0000
Subject: [PATCH] Added function to get correct plan display name (#12810)

* Changed minPlan BUSINESS to PREMIUM_PLUS

* Added new helper to display the correct string plan

* Changed ManageAccessModal to use the new helper

* Refactored to use plan title helper, removed title function

* Removed capitalised function from svelte template

* Fixed linting issues

* Ran yarn lint. Fixed linting issues.
---
 .../DataTable/modals/ManageAccessModal.svelte |  5 ++++-
 packages/builder/src/helpers/planTitle.js     | 11 ++++++++++
 .../pages/builder/portal/account/usage.svelte | 21 ++-----------------
 .../server/src/sdk/app/permissions/index.ts   |  2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 packages/builder/src/helpers/planTitle.js

diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index 161757c570..09553c1bcd 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -13,6 +13,7 @@
     Icon,
   } from "@budibase/bbui"
   import { capitalise } from "helpers"
+  import { getFormattedPlanName } from "helpers/planTitle"
   import { get } from "svelte/store"
 
   export let resourceId
@@ -99,7 +100,9 @@
     {#if requiresPlanToModify}
       <span class="lock-tag">
         <Tags>
-          <Tag icon="LockClosed">{capitalise(requiresPlanToModify)}</Tag>
+          <Tag icon="LockClosed"
+            >{getFormattedPlanName(requiresPlanToModify)}</Tag
+          >
         </Tags>
       </span>
     {/if}
diff --git a/packages/builder/src/helpers/planTitle.js b/packages/builder/src/helpers/planTitle.js
new file mode 100644
index 0000000000..dc07e8be2f
--- /dev/null
+++ b/packages/builder/src/helpers/planTitle.js
@@ -0,0 +1,11 @@
+import { PlanType } from "@budibase/types"
+
+export function getFormattedPlanName(userPlanType) {
+  let planName = "Free"
+  if (userPlanType === PlanType.PREMIUM_PLUS) {
+    planName = "Premium"
+  } else if (userPlanType === PlanType.ENTERPRISE_BASIC) {
+    planName = "Enterprise"
+  }
+  return `${planName} Plan`
+}
diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte
index 9e7c402e91..8eb26c20d6 100644
--- a/packages/builder/src/pages/builder/portal/account/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/account/usage.svelte
@@ -15,7 +15,7 @@
   import { DashCard, Usage } from "components/usage"
   import { PlanModel } from "constants"
   import { sdk } from "@budibase/shared-core"
-  import { PlanType } from "@budibase/types"
+  import { getFormattedPlanName } from "helpers/planTitle"
 
   let staticUsage = []
   let monthlyUsage = []
@@ -100,23 +100,6 @@
     cancelAt = license?.billing?.subscription?.cancelAt
   }
 
-  const capitalise = string => {
-    if (string) {
-      return string.charAt(0).toUpperCase() + string.slice(1)
-    }
-  }
-
-  const planTitle = () => {
-    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 => {
     if (!timestamp) {
       return
@@ -227,7 +210,7 @@
 
     <DashCard
       description="YOUR CURRENT PLAN"
-      title={planTitle()}
+      title={getFormattedPlanName(license?.plan.type)}
       {primaryActionText}
       primaryAction={showButton ? goToAccountPortal : undefined}
       {textRows}
diff --git a/packages/server/src/sdk/app/permissions/index.ts b/packages/server/src/sdk/app/permissions/index.ts
index b62a7fb459..a6d8f338a1 100644
--- a/packages/server/src/sdk/app/permissions/index.ts
+++ b/packages/server/src/sdk/app/permissions/index.ts
@@ -61,7 +61,7 @@ export async function getInheritablePermissions(
 export async function allowsExplicitPermissions(resourceId: string) {
   if (isViewID(resourceId)) {
     const allowed = await features.isViewPermissionEnabled()
-    const minPlan = !allowed ? PlanType.BUSINESS : undefined
+    const minPlan = !allowed ? PlanType.PREMIUM_PLUS : undefined
 
     return {
       allowed,