diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessModal.tsx index 2a0886441..0da633155 100644 --- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessModal.tsx +++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/RequestAccessModal.tsx @@ -1,5 +1,4 @@ import { Modal, ModalContent } from "@app/components/v2"; -import { NoticeBannerV2 } from "@app/components/v2/NoticeBannerV2/NoticeBannerV2"; import { ProjectPermissionActions } from "@app/context"; import { TAccessApprovalPolicy } from "@app/hooks/api/types"; import { SpecificPrivilegeSecretForm } from "@app/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/SpecificPrivilegeSection"; @@ -8,7 +7,6 @@ export const RequestAccessModal = ({ isOpen, onOpenChange, policies, - shouldShowBanner, ...props }: { isOpen: boolean; @@ -16,7 +14,6 @@ export const RequestAccessModal = ({ policies: TAccessApprovalPolicy[]; selectedActions?: ProjectPermissionActions[]; secretPath?: string; - shouldShowBanner?: boolean; }) => { return ( @@ -25,16 +22,6 @@ export const RequestAccessModal = ({ title="Request Access" subTitle="Request access to any secrets and resources based on the predefined policies." > - {shouldShowBanner && ( - - - Request access to perform this action in this folder. - - - )} onOpenChange(false)} policies={policies} diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx index ea4342fc9..1c95a202f 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx @@ -652,10 +652,7 @@ const Page = () => { size="xs" className="ml-auto" onClick={() => - handlePopUpOpen("requestAccess", { - actions: [ProjectPermissionActions.Read], - shouldShowBanner: false - }) + handlePopUpOpen("requestAccess", [ProjectPermissionActions.Read]) } > Request Access @@ -679,13 +676,10 @@ const Page = () => { size="xs" className="ml-auto" onClick={() => - handlePopUpOpen("requestAccess", { - actions: [ - ...(!canEditSecrets ? [ProjectPermissionActions.Edit] : []), - ...(!canDeleteSecrets ? [ProjectPermissionActions.Delete] : []) - ], - shouldShowBanner: false - }) + handlePopUpOpen("requestAccess", [ + ...(!canEditSecrets ? [ProjectPermissionActions.Edit] : []), + ...(!canDeleteSecrets ? [ProjectPermissionActions.Delete] : []) + ]) } > Request Access @@ -788,8 +782,7 @@ const Page = () => { onOpenChange={() => { handlePopUpClose("requestAccess"); }} - selectedActions={popUp.requestAccess.data?.actions} - shouldShowBanner={popUp.requestAccess.data?.shouldShowBanner} + selectedActions={popUp.requestAccess.data} secretPath={pathPolicies?.[0]?.secretPath} /> )} diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx index 4df3328de..e2680dbde 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx @@ -46,6 +46,7 @@ import { DropdownSubMenuTrigger, IconButton, Modal, + ModalClose, ModalContent, Tooltip } from "@app/components/v2"; @@ -129,10 +130,7 @@ type Props = { }[]; }[]; isPITEnabled: boolean; - onRequestAccess: (params: { - actions: ProjectPermissionActions[]; - shouldShowBanner: boolean; - }) => void; + onRequestAccess: (actions: ProjectPermissionActions[]) => void; hasPathPolicies: boolean; }; @@ -168,7 +166,8 @@ export const ActionBar = ({ "misc", "upgradePlan", "replicateFolder", - "confirmUpload" + "confirmUpload", + "requestAccess" ] as const); const isProtectedBranch = Boolean(protectedBranchPolicyName); const { subscription } = useSubscription(); @@ -832,10 +831,7 @@ export const ActionBar = ({ }) ) ? openPopUp(PopUpNames.CreateSecretForm) - : onRequestAccess({ - actions: [ProjectPermissionActions.Create], - shouldShowBanner: true - }) + : handlePopUpOpen("requestAccess", [ProjectPermissionActions.Create]) } className="h-10 rounded-r-none" > @@ -1202,6 +1198,27 @@ export const ActionBar = ({ )} + handlePopUpToggle("requestAccess", open)} + > + + You do not have permission to perform this action. + Request access to perform this action in this folder. + + + onRequestAccess(popUp?.requestAccess.data)}> + Request Access + + + + + Cancel + + + + + > ); };
- Request access to perform this action in this folder. -
You do not have permission to perform this action.
Request access to perform this action in this folder.