feat: more review changes

This commit is contained in:
=
2025-07-23 14:31:54 +05:30
parent 9f35b573d1
commit af48e7ce99
9 changed files with 14 additions and 14 deletions
@@ -217,7 +217,7 @@ export const accessApprovalRequestServiceFactory = ({
); );
const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`; const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`;
const approvalUrl = `${cfg.SITE_URL}/projects/${project.id}/secret-manager/approval`; const approvalUrl = `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval`;
await triggerWorkflowIntegrationNotification({ await triggerWorkflowIntegrationNotification({
input: { input: {
@@ -554,7 +554,7 @@ export const accessApprovalRequestServiceFactory = ({
bypassReason: bypassReason || "No reason provided", bypassReason: bypassReason || "No reason provided",
secretPath: policy.secretPath || "/", secretPath: policy.secretPath || "/",
environment, environment,
approvalUrl: `${cfg.SITE_URL}/projects/${project.id}/secret-manager/approval`, approvalUrl: `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval`,
requestType: "access" requestType: "access"
}, },
template: SmtpTemplates.AccessSecretRequestBypassed template: SmtpTemplates.AccessSecretRequestBypassed
@@ -36,7 +36,7 @@ export const sendApprovalEmailsFn = async ({
firstName: reviewerUser.firstName, firstName: reviewerUser.firstName,
projectName: project.name, projectName: project.name,
organizationName: project.organization.name, organizationName: project.organization.name,
approvalUrl: `${cfg.SITE_URL}/projects/${project.id}/secret-manager/approval?requestId=${secretApprovalRequest.id}` approvalUrl: `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval?requestId=${secretApprovalRequest.id}`
}, },
template: SmtpTemplates.SecretApprovalRequestNeedsReview template: SmtpTemplates.SecretApprovalRequestNeedsReview
}); });
@@ -962,7 +962,7 @@ export const secretApprovalRequestServiceFactory = ({
bypassReason, bypassReason,
secretPath: policy.secretPath, secretPath: policy.secretPath,
environment: env.name, environment: env.name,
approvalUrl: `${cfg.SITE_URL}/projects/${project.id}/secret-manager/approval` approvalUrl: `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval`
}, },
template: SmtpTemplates.AccessSecretRequestBypassed template: SmtpTemplates.AccessSecretRequestBypassed
}); });
+1 -1
View File
@@ -50,7 +50,7 @@ const buildSlackPayload = (notification: TNotification) => {
*Secret path*: ${payload.secretPath || "/"} *Secret path*: ${payload.secretPath || "/"}
*Secret Key${payload.secretKeys.length > 1 ? "s" : ""}*: ${payload.secretKeys.join(", ")} *Secret Key${payload.secretKeys.length > 1 ? "s" : ""}*: ${payload.secretKeys.join(", ")}
View the complete details <${appCfg.SITE_URL}/projects/${payload.projectId}/secret-manager/approval?requestId=${ View the complete details <${appCfg.SITE_URL}/projects/secret-manager/${payload.projectId}/approval?requestId=${
payload.requestId payload.requestId
}|here>.`; }|here>.`;
@@ -126,7 +126,7 @@ export const ProjectTemplateEditRoleForm = ({
> >
Save Save
</Button> </Button>
<AddPoliciesButton isDisabled={isDisabled} /> <AddPoliciesButton isDisabled={isDisabled} projectType={projectTemplate.type} />
</div> </div>
</div> </div>
)} )}
@@ -225,7 +225,7 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({
> >
Save Save
</Button> </Button>
<AddPoliciesButton isDisabled={isDisabled} /> <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
</div> </div>
</div> </div>
</div> </div>
@@ -221,7 +221,7 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
> >
Save Save
</Button> </Button>
<AddPoliciesButton isDisabled={isDisabled} /> <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
</div> </div>
</div> </div>
</div> </div>
@@ -8,17 +8,17 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
IconButton IconButton
} from "@app/components/v2"; } from "@app/components/v2";
import { useWorkspace } from "@app/context";
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { ProjectType } from "@app/hooks/api/workspace/types";
import { PolicySelectionModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal"; import { PolicySelectionModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal";
import { PolicyTemplateModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal"; import { PolicyTemplateModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal";
type Props = { type Props = {
isDisabled?: boolean; isDisabled?: boolean;
projectType: ProjectType;
}; };
export const AddPoliciesButton = ({ isDisabled }: Props) => { export const AddPoliciesButton = ({ isDisabled, projectType }: Props) => {
const { currentWorkspace } = useWorkspace();
const { popUp, handlePopUpToggle, handlePopUpOpen, handlePopUpClose } = usePopUp([ const { popUp, handlePopUpToggle, handlePopUpOpen, handlePopUpClose } = usePopUp([
"addPolicy", "addPolicy",
"addPolicyOptions", "addPolicyOptions",
@@ -68,12 +68,12 @@ export const AddPoliciesButton = ({ isDisabled }: Props) => {
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
<PolicySelectionModal <PolicySelectionModal
type={currentWorkspace.type} type={projectType}
isOpen={popUp.addPolicy.isOpen} isOpen={popUp.addPolicy.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("addPolicy", isOpen)} onOpenChange={(isOpen) => handlePopUpToggle("addPolicy", isOpen)}
/> />
<PolicyTemplateModal <PolicyTemplateModal
type={currentWorkspace.type} type={projectType}
isOpen={popUp.applyTemplate.isOpen} isOpen={popUp.applyTemplate.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("applyTemplate", isOpen)} onOpenChange={(isOpen) => handlePopUpToggle("applyTemplate", isOpen)}
/> />
@@ -174,7 +174,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
Save Save
</Button> </Button>
<div className="ml-2 border-l border-mineshaft-500 pl-4"> <div className="ml-2 border-l border-mineshaft-500 pl-4">
<AddPoliciesButton isDisabled={isDisabled} /> <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
</div> </div>
</div> </div>
)} )}