fix(view-secret-value): requested changes

frontend/src/lib/fn/permission.ts

@@ -7,7 +7,7 @@ import {
   SecretSubjectFields
 } from "@app/context/ProjectPermissionContext/types";
 
-export function secretsPermissionCan(
+export function hasSecretReadValueOrDescribePermission(
   permission: MongoAbility<ProjectPermissionSet>,
   action: Extract<
     ProjectPermissionSecretActions,

frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx

@@ -29,11 +29,11 @@ const GeneralPolicyActionSchema = z.object({
 
 const SecretPolicyActionSchema = z.object({
   [ProjectPermissionSecretActions.DescribeAndReadValue]: z.boolean().optional(), // existing read, gives both describe and read value
-  [ProjectPermissionSecretActions.DescribeSecret]: z.boolean().optional(), // describe secret, cannot read value
-  [ProjectPermissionSecretActions.ReadValue]: z.boolean().optional(), // read value
-  [ProjectPermissionSecretActions.Edit]: z.boolean().optional(), // edit secret
-  [ProjectPermissionSecretActions.Delete]: z.boolean().optional(), // delete secret
-  [ProjectPermissionSecretActions.Create]: z.boolean().optional() // create secret
+  [ProjectPermissionSecretActions.DescribeSecret]: z.boolean().optional(),
+  [ProjectPermissionSecretActions.ReadValue]: z.boolean().optional(),
+  [ProjectPermissionSecretActions.Edit]: z.boolean().optional(),
+  [ProjectPermissionSecretActions.Delete]: z.boolean().optional(),
+  [ProjectPermissionSecretActions.Create]: z.boolean().optional()
 });
 
 const CmekPolicyActionSchema = z.object({

frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretRenameRow.tsx

@@ -15,7 +15,7 @@ import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionCo
 import { useToggle } from "@app/hooks";
 import { useUpdateSecretV3 } from "@app/hooks/api";
 import { SecretType, SecretV3RawSanitized } from "@app/hooks/api/types";
-import { secretsPermissionCan } from "@app/lib/fn/permission";
+import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
 
 enum SecretActionType {
   Created = "created",
@@ -52,7 +52,7 @@ function SecretRenameRow({ environments, getSecretByKey, secretKey, secretPath }
       secretTags: (secretDetails?.tags || []).map((i) => i.slug)
     });
     const isSecretInEnvReadOnly =
-      secretsPermissionCan(
+      hasSecretReadValueOrDescribePermission(
         permission,
         ProjectPermissionSecretActions.DescribeSecret,
         secretPermissionSubject

frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx

@@ -38,7 +38,7 @@ import { useGetProjectSecretsDetails } from "@app/hooks/api/dashboard";
 import { DashboardSecretsOrderBy } from "@app/hooks/api/dashboard/types";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { ProjectType } from "@app/hooks/api/workspace/types";
-import { secretsPermissionCan } from "@app/lib/fn/permission";
+import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
 
 import { SecretTableResourceCount } from "../OverviewPage/components/SecretTableResourceCount";
 import { SecretV2MigrationSection } from "../OverviewPage/components/SecretV2MigrationSection";
@@ -105,7 +105,7 @@ const Page = () => {
   const projectSlug = currentWorkspace?.slug || "";
   const secretPath = (routerQueryParams.secretPath as string) || "/";
 
-  const canReadSecret = secretsPermissionCan(
+  const canReadSecret = hasSecretReadValueOrDescribePermission(
     permission,
     ProjectPermissionSecretActions.DescribeSecret,
     {
@@ -116,7 +116,7 @@ const Page = () => {
     }
   );
 
-  const canReadSecretValue = secretsPermissionCan(
+  const canReadSecretValue = hasSecretReadValueOrDescribePermission(
     permission,
     ProjectPermissionSecretActions.ReadValue,
     {

frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx

@@ -57,7 +57,7 @@ import { ActorType } from "@app/hooks/api/auditLogs/enums";
 import { useGetSecretAccessList } from "@app/hooks/api/secrets/queries";
 import { SecretV3RawSanitized, WsTag } from "@app/hooks/api/types";
 import { ProjectType } from "@app/hooks/api/workspace/types";
-import { secretsPermissionCan } from "@app/lib/fn/permission";
+import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
 
 import { CreateReminderForm } from "./CreateReminderForm";
 import { formSchema, SecretActionType, TFormSchema } from "./SecretListView.utils";
@@ -141,7 +141,7 @@ export const SecretDetailSidebar = ({
     })
   );
 
-  const cannotReadSecretValue = !secretsPermissionCan(
+  const cannotReadSecretValue = !hasSecretReadValueOrDescribePermission(
     permission,
     ProjectPermissionSecretActions.ReadValue,
     {
@@ -153,12 +153,16 @@ export const SecretDetailSidebar = ({
   );
 
   const isReadOnly =
-    secretsPermissionCan(permission, ProjectPermissionSecretActions.DescribeSecret, {
-      environment,
-      secretPath,
-      secretName: secretKey,
-      secretTags: selectTagSlugs
-    }) &&
+    hasSecretReadValueOrDescribePermission(
+      permission,
+      ProjectPermissionSecretActions.DescribeSecret,
+      {
+        environment,
+        secretPath,
+        secretName: secretKey,
+        secretTags: selectTagSlugs
+      }
+    ) &&
     cannotEditSecret &&
     cannotReadSecretValue;
 
@@ -361,11 +365,11 @@ export const SecretDetailSidebar = ({
                             >
                               <div className="flex items-center gap-2">
                                 <InfisicalSecretInput
-                                  isReadOnly={isReadOnly}
+                                  isReadOnly={isReadOnly || !isAllowed}
                                   environment={environment}
                                   secretPath={secretPath}
                                   key="secret-value"
-                                  isDisabled={isOverridden || !isAllowed}
+                                  isDisabled={isOverridden}
                                   containerClassName="text-bunker-300 w-full hover:border-primary-400/50 border border-mineshaft-600 bg-bunker-800 px-2 py-1.5"
                                   {...field}
                                   autoFocus={false}

frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx

@@ -47,7 +47,7 @@ import {
 
 import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionContext/types";
 import { Blur } from "@app/components/v2/Blur";
-import { secretsPermissionCan } from "@app/lib/fn/permission";
+import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
 import {
   FontAwesomeSpriteName,
   formSchema,
@@ -132,12 +132,16 @@ export const SecretItem = memo(
     });
 
     const isReadOnly =
-      secretsPermissionCan(permission, ProjectPermissionSecretActions.DescribeSecret, {
-        environment,
-        secretPath,
-        secretName,
-        secretTags: selectedTagSlugs
-      }) &&
+      hasSecretReadValueOrDescribePermission(
+        permission,
+        ProjectPermissionSecretActions.DescribeSecret,
+        {
+          environment,
+          secretPath,
+          secretName,
+          secretTags: selectedTagSlugs
+        }
+      ) &&
       permission.cannot(
         ProjectPermissionSecretActions.Edit,
         subject(ProjectPermissionSub.Secrets, {