feat: resolved merge conflicts

backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts

@@ -1972,6 +1972,16 @@ export const secretV2BridgeServiceFactory = ({
       type: SecretType.Shared
     });
 
+    ForbiddenError.from(permission).throwUnlessCan(
+      ProjectPermissionActions.Read,
+      subject(ProjectPermissionSub.Secrets, {
+        environment,
+        secretPath,
+        secretName,
+        secretTags: (secret?.tags || []).map((el) => el.slug)
+      })
+    );
+
     const secretValue = secret.encryptedValue
       ? secretManagerDecryptor({ cipherTextBlob: secret.encryptedValue }).toString()
       : "";
@@ -1981,10 +1991,15 @@ export const secretV2BridgeServiceFactory = ({
       folderDAL,
       secretDAL,
       decryptSecretValue: (value) => (value ? secretManagerDecryptor({ cipherTextBlob: value }).toString() : undefined),
-      canExpandValue: (expandEnvironment, expandSecretPath) =>
+      canExpandValue: (expandEnvironment, expandSecretPath, expandSecretName, expandSecretTags) =>
         permission.can(
           ProjectPermissionActions.Read,
-          subject(ProjectPermissionSub.Secrets, { environment: expandEnvironment, secretPath: expandSecretPath })
+          subject(ProjectPermissionSub.Secrets, {
+            environment: expandEnvironment,
+            secretPath: expandSecretPath,
+            secretName: expandSecretName,
+            secretTags: expandSecretTags
+          })
         )
     });
 

frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx

@@ -308,7 +308,12 @@ export const SecretItem = memo(
                 </Tooltip>
                 <ProjectPermissionCan
                   I={ProjectPermissionActions.Edit}
-                  a={subject(ProjectPermissionSub.Secrets, { environment, secretPath, secretName, secretTags: selectedTagSlugs})}
+                  a={subject(ProjectPermissionSub.Secrets, {
+                    environment,
+                    secretPath,
+                    secretName,
+                    secretTags: selectedTagSlugs
+                  })}
                 >
                   {(isAllowed) => (
                     <Modal>
@@ -335,7 +340,7 @@ export const SecretItem = memo(
                         </IconButton>
                       </ModalTrigger>
                       <ModalContent
-                        title="Secret Reference Tree"
+                        title="Secret Reference Details"
                         subTitle="Visual breakdown of secrets referenced by this secret."
                       >
                         <SecretReferenceTree

frontend/src/views/SecretMainPage/components/SecretReferenceDetails/SecretReferenceDetails.tsx

@@ -106,8 +106,8 @@ export const SecretReferenceTree = ({ secretPath, environment, secretKey }: Prop
           </ul>
         )}
       </div>
-      <div className="mt-2 text-sm text-gray-400">
+      <div className="mt-2 text-sm text-mineshaft-400">
-        Click on a secret key to view its corresponding sub references.
+        Click a secret key to view its sub-references.
       </div>
     </div>
   );

frontend/src/views/SecretOverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx

@@ -248,7 +248,7 @@ export const SecretEditRow = ({
                       </div>
                     </ModalTrigger>
                     <ModalContent
-                      title="Secret Reference Tree"
+                      title="Secret Reference Details"
                       subTitle="Visual breakdown of secrets referenced by this secret."
                     >
                       <SecretReferenceTree