From ce11a5a85292c242bab577f3796f8edff21185eb Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 29 Aug 2023 09:46:15 +0200
Subject: [PATCH 1/3] Lock feature based on ff

---
 .../buttons/grid/GridManageAccessButton.svelte       |  6 +++++-
 packages/builder/src/stores/portal/licensing.js      |  4 ++++
 packages/frontend-core/src/constants.js              | 12 +-----------
 packages/types/src/sdk/licensing/feature.ts          |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
index 0cd008bab1..a7f18464ef 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { licensing } from "stores/portal"
   import ManageAccessButton from "../ManageAccessButton.svelte"
   import { getContext } from "svelte"
 
@@ -12,6 +13,9 @@
     }
     return datasource.type === "table" ? datasource.tableId : datasource.id
   }
+
+  $: disabled =
+    $datasource.type === "viewV2" && !$licensing.isViewPermissionsEnabled
 </script>
 
-<ManageAccessButton {resourceId} />
+<ManageAccessButton {resourceId} {disabled} />
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 4a59f29f52..eb9c9abe93 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -125,6 +125,9 @@ export const createLicensingStore = () => {
       const syncAutomationsEnabled = license.features.includes(
         Constants.Features.SYNC_AUTOMATIONS
       )
+      const isViewPermissionsEnabled = license.features.includes(
+        Constants.Features.VIEW_PERMISSIONS
+      )
       store.update(state => {
         return {
           ...state,
@@ -140,6 +143,7 @@ export const createLicensingStore = () => {
           auditLogsEnabled,
           enforceableSSO,
           syncAutomationsEnabled,
+          isViewPermissionsEnabled,
         }
       })
     },
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 0497a392f3..93a857ef9d 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -2,6 +2,7 @@
  * Operator options for lucene queries
  */
 export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/shared-core"
+export { Feature as Features } from "@budibase/types"
 
 // Cookie names
 export const Cookies = {
@@ -62,17 +63,6 @@ export const PlanType = {
  */
 export const ApiVersion = "1"
 
-export const Features = {
-  USER_GROUPS: "userGroups",
-  BACKUPS: "appBackups",
-  ENVIRONMENT_VARIABLES: "environmentVariables",
-  AUDIT_LOGS: "auditLogs",
-  ENFORCEABLE_SSO: "enforceableSSO",
-  BRANDING: "branding",
-  SCIM: "scim",
-  SYNC_AUTOMATIONS: "syncAutomations",
-}
-
 // Role IDs
 export const Roles = {
   ADMIN: "ADMIN",
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index 218c2c5429..bd3a6583bf 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -12,7 +12,7 @@ export enum Feature {
   APP_BUILDERS = "appBuilders",
   OFFLINE = "offline",
   USER_ROLE_PUBLIC_API = "userRolePublicApi",
-  VIEW_PERMISSIONS = "viewPermission",
+  VIEW_PERMISSIONS = "viewPermissions",
 }
 
 export type PlanFeatures = { [key in PlanType]: Feature[] | undefined }

From 12b869d7d14270c0ad8ab24595b824163bb788e5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 29 Aug 2023 10:57:32 +0200
Subject: [PATCH 2/3] Display required license

---
 .../buttons/ManageAccessButton.svelte         |  2 +
 .../grid/GridManageAccessButton.svelte        | 16 ++++--
 .../DataTable/modals/ManageAccessModal.svelte | 53 +++++++++++++------
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index bc8e0c5318..f6a74784fa 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -5,6 +5,7 @@
 
   export let resourceId
   export let disabled = false
+  export let requiresLicence
 
   let modal
   let resourcePermissions
@@ -21,6 +22,7 @@
 <Modal bind:this={modal}>
   <ManageAccessModal
     {resourceId}
+    {requiresLicence}
     levels={$permissions}
     permissions={resourcePermissions}
   />
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
index a7f18464ef..d6a2c5dee2 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { licensing } from "stores/portal"
+  import { licensing, admin } from "stores/portal"
   import ManageAccessButton from "../ManageAccessButton.svelte"
   import { getContext } from "svelte"
 
@@ -14,8 +14,16 @@
     return datasource.type === "table" ? datasource.tableId : datasource.id
   }
 
-  $: disabled =
-    $datasource.type === "viewV2" && !$licensing.isViewPermissionsEnabled
+  var requiresLicence
+  $: {
+    if ($datasource.type === "viewV2" && !$licensing.isViewPermissionsEnabled) {
+      const requiredLicense = $admin?.cloud ? "Premium" : "Business"
+      requiresLicence = {
+        tier: requiredLicense,
+        message: `A ${requiredLicense} subscription is required to specify access level role for this view.`,
+      }
+    }
+  }
 </script>
 
-<ManageAccessButton {resourceId} {disabled} />
+<ManageAccessButton {resourceId} {requiresLicence} />
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index aa6dbc93e0..678fb3b1c5 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -7,11 +7,14 @@
     notifications,
     Body,
     ModalContent,
+    Tags,
+    Tag,
   } from "@budibase/bbui"
   import { capitalise } from "helpers"
 
   export let resourceId
   export let permissions
+  export let requiresLicence
 
   async function changePermission(level, role) {
     try {
@@ -30,22 +33,36 @@
   }
 </script>
 
-<ModalContent title="Manage Access" showCancelButton={false} confirmText="Done">
-  <Body size="S">Specify the minimum access level role for this data.</Body>
-  <div class="row">
-    <Label extraSmall grey>Level</Label>
-    <Label extraSmall grey>Role</Label>
-    {#each Object.keys(permissions) as level}
-      <Input value={capitalise(level)} disabled />
-      <Select
-        value={permissions[level]}
-        on:change={e => changePermission(level, e.detail)}
-        options={$roles}
-        getOptionLabel={x => x.name}
-        getOptionValue={x => x._id}
-      />
-    {/each}
-  </div>
+<ModalContent showCancelButton={false} confirmText="Done">
+  <span slot="header">
+    Manage Access
+    {#if requiresLicence}
+      <span class="lock-tag">
+        <Tags>
+          <Tag icon="LockClosed">{requiresLicence.tier}</Tag>
+        </Tags>
+      </span>
+    {/if}
+  </span>
+  {#if requiresLicence}
+    <Body size="S">{requiresLicence.message}</Body>
+  {:else}
+    <Body size="S">Specify the minimum access level role for this data.</Body>
+    <div class="row">
+      <Label extraSmall grey>Level</Label>
+      <Label extraSmall grey>Role</Label>
+      {#each Object.keys(permissions) as level}
+        <Input value={capitalise(level)} disabled />
+        <Select
+          value={permissions[level]}
+          on:change={e => changePermission(level, e.detail)}
+          options={$roles}
+          getOptionLabel={x => x.name}
+          getOptionValue={x => x._id}
+        />
+      {/each}
+    </div>
+  {/if}
 </ModalContent>
 
 <style>
@@ -54,4 +71,8 @@
     grid-template-columns: 1fr 1fr;
     grid-gap: var(--spacing-s);
   }
+
+  .lock-tag {
+    padding-left: var(--spacing-s);
+  }
 </style>

From 0fe02c189c1f5761840612c7e837e0d95e51fe38 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 29 Aug 2023 15:41:31 +0200
Subject: [PATCH 3/3] Copy change

---
 .../DataTable/buttons/grid/GridManageAccessButton.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
index d6a2c5dee2..e4c48528f4 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte
@@ -20,7 +20,7 @@
       const requiredLicense = $admin?.cloud ? "Premium" : "Business"
       requiresLicence = {
         tier: requiredLicense,
-        message: `A ${requiredLicense} subscription is required to specify access level role for this view.`,
+        message: `A ${requiredLicense} subscription is required to specify access level roles for this view.`,
       }
     }
   }