Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
feat(secret-approvals): bulk review change requests (#8657)
Andrew Huang716c1b8ea001
diff --git a/backend/src/ee/routes/v1/secret-approval-request-router.ts b/backend/src/ee/routes/v1/secret-approval-request-router.tsindex 056fdce109..97b4cbbfb0 100644--- a/backend/src/ee/routes/v1/secret-approval-request-router.ts+++ b/backend/src/ee/routes/v1/secret-approval-request-router.ts@@ -150,7 +150,13 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProvid: z.string().uuid()}),body: z.object({- bypassReason: z.string().max(1000).optional()+ bypassReason: z.string().max(1000).optional(),+ requireApprovals: z+ .boolean()+ .optional()+ .describe(+ "When true, the merge fails instead of bypassing a soft-enforced policy whose required approvals are not met."+ )}),response: {200: z.object({@@ -167,7 +173,8 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProvactorAuthMethod: req.permission.authMethod,actorOrgId: req.permission.orgId,approvalId: req.params.id,- bypassReason: req.body.bypassReason+ bypassReason: req.body.bypassReason,+ requireApprovals: req.body.requireApprovals});await server.services.auditLog.createAuditLog({diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.tsindex 3c3a79f1c3..6eca61c465 100644--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts@@ -741,7 +741,7 @@ export const secretApprovalRequestServiceFactory = ({return secretChangeGlobalRequestBridgeService.mergeSecretChangeRequest(dto);}- const { approvalId, actor, actorId, actorOrgId, actorAuthMethod, bypassReason } = dto;+ const { approvalId, actor, actorId, actorOrgId, actorAuthMethod, bypassReason, requireApprovals } = dto;const secretApprovalRequest = await secretApprovalRequestDAL.findById(approvalId);if (!secretApprovalRequest)throw new NotFoundError({ message: `Secret approval request with ID '${approvalId}' not found` });@@ -793,6 +793,10 @@ export const secretApprovalRequestServiceFactory = ({const isSoftEnforcement = secretApprovalRequest.policy.enforcementLevel === EnforcementLevel.Soft;const canBypass = !bypassers.length || bypassers.some((bypasser) => bypasser.userId === actorId);+ if (!hasMinApproval && requireApprovals)+ throw new BadRequestError({+ message: `Secret approval request '${secretApprovalRequest.slug}' needs ${policy.approvals} approval(s) before it can be merged without a policy bypass.`+ });if (!hasMinApproval && !(isSoftEnforcement && canBypass))throw new BadRequestError({ message: "Doesn't have minimum approvals needed" });diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-types.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-types.tsindex cea86636be..1fa67c9864 100644--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-types.ts+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-types.ts@@ -127,6 +127,7 @@ export type TCreateSecretApprovalSideEffectsDTO = {export type TMergeSecretApprovalRequestDTO = {approvalId: string;bypassReason?: string;+ requireApprovals?: boolean;} & Omit<TProjectPermission, "projectId">;export type TStatusChangeDTO = {diff --git a/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-service.ts b/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-service.tsindex 0e4eff22bf..36d4d3f36a 100644--- a/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-service.ts+++ b/backend/src/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-service.ts@@ -607,7 +607,8 @@ export const secretChangeGlobalRequestBridgeServiceFactory = ({actorId,actorAuthMethod,actorOrgId,- bypassReason+ bypassReason,+ requireApprovals}) => {const { approvalRequest, secretChangeRequest } = await $findSecretChangeRequestOrThrow(approvalId);if (actor !== ActorType.USER) throw new BadRequestError({ message: "Must be a user" });@@ -647,7 +648,7 @@ export const secretChangeGlobalRequestBridgeServiceFactory = ({$resolveMergeBypass({unmetStep: $findUnmetStep(requestSteps, eligibleByStepId),slug: secretChangeRequest.slug,- isSoftEnforcement,+ isSoftEnforcement: isSoftEnforcement && !requireApprovals,canBypass,bypassReason});diff --git a/frontend/src/hooks/api/secretApprovalRequest/index.tsx b/frontend/src/hooks/api/secretApprovalRequest/index.tsxindex a72399901b..79e5e44bcf 100644--- a/frontend/src/hooks/api/secretApprovalRequest/index.tsx+++ b/frontend/src/hooks/api/secretApprovalRequest/index.tsx@@ -1,4 +1,5 @@export {+ useBulkActOnSecretApprovalRequests,usePerformSecretApprovalRequestMerge,useUpdateSecretApprovalRequestStatus,useUpdateSecretApprovalReviewStatus@@ -6,5 +7,6 @@ export {export {useGetSecretApprovalRequestCount,useGetSecretApprovalRequestDetails,+ useGetSecretApprovalRequestDetailsList,useGetSecretApprovalRequests} from "./queries";diff --git a/frontend/src/hooks/api/secretApprovalRequest/mutation.tsx b/frontend/src/hooks/api/secretApprovalRequest/mutation.tsxindex 3f4e1996a6..6a4bf9d28c 100644--- a/frontend/src/hooks/api/secretApprovalRequest/mutation.tsx+++ b/frontend/src/hooks/api/secretApprovalRequest/mutation.tsx@@ -1,4 +1,5 @@import { useMutation, useQueryClient } from "@tanstack/react-query";+import axios from "axios";import { apiRequest } from "@app/config/request";@@ -7,6 +8,10 @@ import { commitKeys } from "../folderCommits/queries";import { secretKeys } from "../secrets/queries";import { secretApprovalRequestKeys } from "./queries";import {+ ApprovalStatus,+ BulkChangeRequestAction,+ TBulkActOnSecretApprovalRequestsDTO,+ TBulkChangeRequestResult,TPerformSecretApprovalRequestMerge,TUpdateSecretApprovalRequestStatusDTO,TUpdateSecretApprovalReviewStatusDTO@@ -90,3 +95,72 @@ export const usePerformSecretApprovalRequestMerge = () => {}});};++export const useBulkActOnSecretApprovalRequests = () => {+ const queryClient = useQueryClient();++ return useMutation<TBulkChangeRequestResult[], object, TBulkActOnSecretApprovalRequestsDTO>({+ mutationFn: async ({ action, comment, requestIds }) => {+ const results: TBulkChangeRequestResult[] = [];++ // eslint-disable-next-line no-restricted-syntax+ for (const id of requestIds) {+ try {+ if (action === BulkChangeRequestAction.Merge) {+ // eslint-disable-next-line no-await-in-loop+ await apiRequest.post(`/api/v1/secret-approval-requests/${id}/merge`, {+ requireApprovals: true+ });+ } else {+ // eslint-disable-next-line no-await-in-loop+ await apiRequest.post(`/api/v1/secret-approval-requests/${id}/review`, {+ status:+ action === BulkChangeRequestAction.Approve+ ? ApprovalStatus.APPROVED+ : ApprovalStatus.REJECTED,+ comment+ });+ }+ results.push({ id, isSuccess: true });+ } catch (error) {+ const message = axios.isAxiosError(error) ? error.response?.data?.message : undefined;+ results.push({+ id,+ isSuccess: false,+ errorMessage:+ typeof message === "string"+ ? message+ : "Could not update this change request. Try again or open it for details."+ });+ }+ }++ return results;+ },+ onSuccess: (results, { projectId, action }) => {+ queryClient.invalidateQueries({+ queryKey: secretApprovalRequestKeys.listAllForProject({ projectId })+ });+ queryClient.invalidateQueries({ queryKey: secretApprovalRequestKeys.count({ projectId }) });+ results.forEach(({ id }) =>+ queryClient.invalidateQueries({ queryKey: secretApprovalRequestKeys.detail({ id }) })+ );++ if (action !== BulkChangeRequestAction.Merge || !results.some(({ isSuccess }) => isSuccess))+ return;++ queryClient.invalidateQueries({ queryKey: dashboardKeys.all() });+ queryClient.invalidateQueries({+ predicate: (query) =>+ (query.queryKey[0] as { projectId?: string })?.projectId === projectId &&+ [+ "secrets",+ "folder-commits",+ "folder-commits-count",+ "secrets-import-sec",+ "imported-folders-all-envs"+ ].includes(query.queryKey[1] as string)+ });+ }+ });+};diff --git a/frontend/src/hooks/api/secretApprovalRequest/queries.tsx b/frontend/src/hooks/api/secretApprovalRequest/queries.tsxindex eaf8465534..d96998f573 100644--- a/frontend/src/hooks/api/secretApprovalRequest/queries.tsx+++ b/frontend/src/hooks/api/secretApprovalRequest/queries.tsx@@ -1,5 +1,5 @@/* eslint-disable no-param-reassign */-import { useQuery, UseQueryOptions } from "@tanstack/react-query";+import { useQueries, useQuery, UseQueryOptions } from "@tanstack/react-query";import { apiRequest } from "@app/config/request";import { TReactQueryOptions } from "@app/types/reactQuery";@@ -151,6 +151,21 @@ export const useGetSecretApprovalRequestDetails = ({enabled: Boolean(id) && (options?.enabled ?? true)});+export const useGetSecretApprovalRequestDetailsList = ({+ ids,+ enabled = true+}: {+ ids: string[];+ enabled?: boolean;+}) =>+ useQueries({+ queries: ids.map((id) => ({+ queryKey: secretApprovalRequestKeys.detail({ id }),+ queryFn: () => fetchSecretApprovalRequestDetails({ id }),+ enabled+ }))+ });+const fetchSecretApprovalRequestCount = async ({projectId,policyIddiff --git a/frontend/src/hooks/api/secretApprovalRequest/types.ts b/frontend/src/hooks/api/secretApprovalRequest/types.tsindex e88f17f2e5..54efdf9fa6 100644--- a/frontend/src/hooks/api/secretApprovalRequest/types.ts+++ b/frontend/src/hooks/api/secretApprovalRequest/types.ts@@ -170,3 +170,22 @@ export type TPerformSecretApprovalRequestMerge = {secretPath: string;bypassReason?: string;};++export enum BulkChangeRequestAction {+ Approve = "approve",+ Reject = "reject",+ Merge = "merge"+}++export type TBulkActOnSecretApprovalRequestsDTO = {+ projectId: string;+ action: BulkChangeRequestAction;+ comment?: string;+ requestIds: string[];+};++export type TBulkChangeRequestResult = {+ id: string;+ isSuccess: boolean;+ errorMessage?: string;+};diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsxindex a5e25f7a73..ba00955d34 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx@@ -6,7 +6,7 @@ import {BanIcon,CheckIcon,ChevronDownIcon,- ClipboardCheckIcon,+ CircleAlertIcon,EllipsisIcon,EyeIcon,GitMergeIcon,@@ -14,9 +14,11 @@ import {HourglassIcon,LucideIcon,PlusIcon,- SearchIcon+ SearchIcon,+ TriangleAlertIcon} from "lucide-react";+import { createNotification } from "@app/components/notifications";import {Badge,Button,@@ -25,6 +27,7 @@ import {CardDescription,CardHeader,CardTitle,+ Checkbox,Combobox,DocumentationLinkBadge,DropdownMenu,@@ -41,6 +44,7 @@ import {InputGroupAddon,InputGroupInput,Pagination,+ SelectedActionBar,Skeleton,Table,TableBody,@@ -80,10 +84,15 @@ import {} from "@app/hooks/api";import { OrderByDirection } from "@app/hooks/api/generic/types";import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";-import { SecretApprovalRequestOrderBy } from "@app/hooks/api/secretApprovalRequest/types";+import {+ SecretApprovalRequestOrderBy,+ TBulkChangeRequestResult,+ TSecretApprovalRequest+} from "@app/hooks/api/secretApprovalRequest/types";import { ApprovalStatus } from "@app/hooks/api/types";import { formatReservedPaths, parsePathFromReplicatedPath } from "@app/lib/fn/string";+import { BulkReviewChangeRequestsSheet } from "./components/BulkReviewChangeRequestsSheet";import {generateCommitText,SecretApprovalRequestChanges@@ -95,6 +104,8 @@ enum ChangeRequestOrderBy {OpenedAt = SecretApprovalRequestOrderBy.CreatedAt}+const MAX_BULK_SELECTION = 25;+type Props = {onConfigurePolicies: () => void;};@@ -115,6 +126,11 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {column: ChangeRequestOrderBy;direction: Exclude<TableSortDirection, "none">;} | null>(null);+ const [selectedRequests, setSelectedRequests] = useState<Record<string, TSecretApprovalRequest>>(+ {}+ );+ const [failedRequestErrors, setFailedRequestErrors] = useState<Record<string, string>>({});+ const [isBulkReviewOpen, setIsBulkReviewOpen] = useState(false);const {debouncedSearch: debouncedSearchFilter,@@ -194,6 +210,74 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {refetch();};+ const isOpenTab = statusFilter === "open";+ const selectedRequestList = Object.values(selectedRequests).map(+ (request) => secretApprovalRequests.find(({ id }) => id === request.id) ?? request+ );+ const selectedCount = selectedRequestList.length;+ const isPageSelected =+ secretApprovalRequests.length > 0 &&+ secretApprovalRequests.every(({ id }) => selectedRequests[id]);+ const isPageIndeterminate =+ !isPageSelected && secretApprovalRequests.some(({ id }) => selectedRequests[id]);++ const clearSelection = () => {+ setSelectedRequests({});+ setFailedRequestErrors({});+ };++ const toggleRequestSelection = (request: TSecretApprovalRequest) => {+ if (selectedRequests[request.id]) {+ setSelectedRequests(({ [request.id]: _, ...rest }) => rest);+ setFailedRequestErrors(({ [request.id]: _, ...rest }) => rest);+ return;+ }+ if (selectedCount >= MAX_BULK_SELECTION) {+ createNotification({+ type: "error",+ text: `You can select up to ${MAX_BULK_SELECTION} change requests at once`+ });+ return;+ }+ setSelectedRequests((prev) => ({ ...prev, [request.id]: request }));+ };++ const togglePageSelection = () => {+ if (isPageSelected || isPageIndeterminate) {+ const pageIds = new Set(secretApprovalRequests.map(({ id }) => id));+ setSelectedRequests((prev) =>+ Object.fromEntries(Object.entries(prev).filter(([id]) => !pageIds.has(id)))+ );+ return;+ }+ const unselected = secretApprovalRequests.filter(({ id }) => !selectedRequests[id]);+ const available = MAX_BULK_SELECTION - selectedCount;+ if (unselected.length > available) {+ createNotification({+ type: "error",+ text: `You can select up to ${MAX_BULK_SELECTION} change requests at once`+ });+ }+ setSelectedRequests((prev) => ({+ ...prev,+ ...Object.fromEntries(unselected.slice(0, available).map((request) => [request.id, request]))+ }));+ };++ const handleBulkComplete = (results: TBulkChangeRequestResult[]) => {+ const succeededIds = new Set(results.filter(({ isSuccess }) => isSuccess).map(({ id }) => id));+ setSelectedRequests((prev) =>+ Object.fromEntries(Object.entries(prev).filter(([id]) => !succeededIds.has(id)))+ );+ setFailedRequestErrors(+ Object.fromEntries(+ results+ .filter(({ isSuccess }) => !isSuccess)+ .map(({ id, errorMessage }) => [id, errorMessage ?? "This request could not be updated"])+ )+ );+ };+const isRequestListEmpty = !isApprovalRequestLoading && secretApprovalRequests?.length === 0;const isFiltered = Boolean(searchFilter || envFilter || committerFilter);@@ -279,6 +363,7 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {value={statusFilter}onValueChange={(value) => {setStatusFilter(value as "open" | "close");+ clearSelection();// Refetch both the lists and the open/closed counts on toggle so// the table rows and the tab-label counts reflect changes made// elsewhere. The target list is inactive here and the count query@@ -375,6 +460,19 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {<Table><TableHeader><TableRow>+ {isOpenTab && (+ <TableHead className="w-5">+ <Checkbox+ id="change-requests-page-select"+ aria-label="Select all change requests on this page"+ isChecked={isPageSelected || isPageIndeterminate}+ isIndeterminate={isPageIndeterminate}+ isDisabled={!secretApprovalRequests.length}+ variant="project"+ onCheckedChange={togglePageSelection}+ />+ </TableHead>+ )}<TableHead>Change</TableHead><TableHeadsortDirection={getSortDirection(ChangeRequestOrderBy.Environment)}@@ -417,6 +515,11 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {Array.from({ length: 3 }).map((_, idx) => (// eslint-disable-next-line react/no-array-index-key<TableRow key={`change-request-skeleton-${idx}`}>+ {isOpenTab && (+ <TableCell>+ <Skeleton className="size-4" />+ </TableCell>+ )}<TableCell><Skeleton className="h-5 w-full" /></TableCell>@@ -502,9 +605,9 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {};} else if (requiresUserReview) {statusDisplay = {- label: "Review Required",+ label: "Needs Review",type: "warning",- icon: ClipboardCheckIcon+ icon: TriangleAlertIcon};} else if (isMergable) {statusDisplay = { label: "Pending Merge", type: "info", icon: GitMergeIcon };@@ -517,11 +620,14 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {}const StatusIcon = statusDisplay.icon;+ const isSelected = Boolean(selectedRequests[reqId]);+ const failedRequestError = failedRequestErrors[reqId];return (<TableRowkey={reqId}tabIndex={0}+ data-state={isSelected ? "selected" : undefined}onClick={() =>navigate({ search: (prev) => ({ ...prev, requestId: reqId }) })}@@ -530,9 +636,25 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {navigate({ search: (prev) => ({ ...prev, requestId: reqId }) });}}>+ {isOpenTab && (+ <TableCell+ onClick={(e) => e.stopPropagation()}+ onKeyDown={(e) => e.stopPropagation()}+ >+ <Checkbox+ id={`select-change-request-${reqId}`}+ aria-label="Select change request"+ isChecked={isSelected}+ variant="project"+ onCheckedChange={() => toggleRequestSelection(secretApproval)}+ />+ </TableCell>+ )}<TableCell>{generateCommitText(commits, isReplicated, true)}</TableCell><TableCell title={environmentDisplayName}>{environmentDisplayName}</TableCell>- <TableCell title={secretPathDisplay}>{secretPathDisplay}</TableCell>+ <TableCell title={secretPathDisplay}>+ <span className="text-muted">{secretPathDisplay}</span>+ </TableCell><TableCell>{committerUser || committerIdentity ? (<div className="flex items-center gap-2">@@ -549,7 +671,9 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {<TableCell><Tooltip><TooltipTrigger asChild>- <span>{formatDistance(new Date(createdAt), new Date())} ago</span>+ <span className="text-muted">+ {formatDistance(new Date(createdAt), new Date())} ago+ </span></TooltipTrigger><TooltipContent>{format(new Date(createdAt), "M/d/yyyy h:mm aa")}@@ -557,22 +681,40 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {</Tooltip></TableCell><TableCell>- {statusDisplay.tooltipContent ? (- <Tooltip>- <TooltipTrigger asChild>- <Badge variant={statusDisplay.type}>- <StatusIcon />- <span className="whitespace-nowrap">{statusDisplay.label}</span>- </Badge>- </TooltipTrigger>- <TooltipContent>{statusDisplay.tooltipContent}</TooltipContent>- </Tooltip>- ) : (- <Badge variant={statusDisplay.type}>- <StatusIcon />- <span className="whitespace-nowrap">{statusDisplay.label}</span>- </Badge>- )}+ <div className="flex items-center gap-2">+ {statusDisplay.tooltipContent ? (+ <Tooltip>+ <TooltipTrigger asChild>+ <Badge variant={statusDisplay.type}>+ <StatusIcon />+ <span className="whitespace-nowrap">{statusDisplay.label}</span>+ </Badge>+ </TooltipTrigger>+ <TooltipContent>{statusDisplay.tooltipContent}</TooltipContent>+ </Tooltip>+ ) : (+ <Badge variant={statusDisplay.type}>+ <StatusIcon />+ <span className="whitespace-nowrap">{statusDisplay.label}</span>+ </Badge>+ )}+ {failedRequestError && (+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ role="img"+ aria-label="Bulk action failed"+ className="inline-flex shrink-0 text-danger"+ >+ <CircleAlertIcon className="size-4" />+ </span>+ </TooltipTrigger>+ <TooltipContent className="max-w-xs">+ {failedRequestError}+ </TooltipContent>+ </Tooltip>+ )}+ </div></TableCell><TableCellvariant="action"@@ -614,6 +756,20 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {)}</CardContent></Card>+ <SelectedActionBar selectedCount={selectedCount} onClearSelection={clearSelection}>+ <Button variant="project" size="xs" onClick={() => setIsBulkReviewOpen(true)}>+ <GitMergeIcon />+ Review & Merge+ </Button>+ </SelectedActionBar>+ <BulkReviewChangeRequestsSheet+ isOpen={isBulkReviewOpen}+ onOpenChange={setIsBulkReviewOpen}+ projectId={projectId}+ requests={selectedRequestList}+ environmentNamesBySlug={environmentNamesBySlug}+ onComplete={handleBulkComplete}+ /><SecretApprovalRequestChangesapprovalRequestId={requestId || ""}isOpen={Boolean(requestId)}diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/BulkReviewChangeRequestsSheet.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/BulkReviewChangeRequestsSheet.tsxnew file mode 100644index 0000000000..d7ff443922--- /dev/null+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/BulkReviewChangeRequestsSheet.tsx@@ -0,0 +1,584 @@+import { useMemo, useState } from "react";+import {+ BanIcon,+ CheckIcon,+ ChevronDownIcon,+ ChevronRightIcon,+ CircleXIcon,+ GitMergeIcon,+ TriangleAlertIcon,+ XIcon+} from "lucide-react";++import { createNotification } from "@app/components/notifications";+import {+ Button,+ ButtonGroup,+ Field,+ FieldLabel,+ IconButton,+ Sheet,+ SheetContent,+ SheetDescription,+ SheetFooter,+ SheetHeader,+ SheetTitle,+ Skeleton,+ Spinner,+ TextArea,+ Tooltip,+ TooltipContent,+ TooltipTrigger+} from "@app/components/v3";+import { cn } from "@app/components/v3/utils";+import {+ useBulkActOnSecretApprovalRequests,+ useGetSecretApprovalRequestDetailsList+} from "@app/hooks/api";+import {+ BulkChangeRequestAction,+ TBulkChangeRequestResult,+ TSecretApprovalRequest+} from "@app/hooks/api/secretApprovalRequest/types";+import { ApprovalStatus } from "@app/hooks/api/types";+import { formatReservedPaths } from "@app/lib/fn/string";++import { SecretApprovalRequestChangeItem } from "./SecretApprovalRequestChangeItem";+import { generateCommitText } from "./SecretApprovalRequestChanges";++type Decision = "approve" | "reject";++type Outcome =+ | { status: "merged"; reviewError?: string }+ | { status: "rejected" }+ | { status: "awaiting" }+ | { status: "approved"; message: string }+ | { status: "failed"; message: string };++const PENDING_APPROVALS_PATTERN = /needs \d+ approval\(s\)/;++type Conflict = { secretKey: string; slug: string; mergesFirst: boolean };++const getApprovedCount = ({ policy, reviewers }: TSecretApprovalRequest) =>+ policy.approvers.filter(({ userId }) =>+ reviewers.some(+ (reviewer) => reviewer.userId === userId && reviewer.status === ApprovalStatus.APPROVED+ )+ ).length;++const getAuthorName = ({ committerUser, committerIdentity }: TSecretApprovalRequest) =>+ committerUser?.username ?? committerIdentity?.name ?? "Deleted User";++type Props = {+ isOpen: boolean;+ onOpenChange: (isOpen: boolean) => void;+ projectId: string;+ requests: TSecretApprovalRequest[];+ environmentNamesBySlug: Record<string, string>;+ onComplete: (results: TBulkChangeRequestResult[]) => void;+};++type ContentProps = Omit<Props, "isOpen" | "onOpenChange"> & {+ onClose: () => void;+ isSubmitting: boolean;+ setIsSubmitting: (isSubmitting: boolean) => void;+};++const BulkReviewChangeRequestsSheetContent = ({+ projectId,+ requests: selectedRequests,+ environmentNamesBySlug,+ onComplete,+ onClose,+ isSubmitting,+ setIsSubmitting+}: ContentProps) => {+ const [requests] = useState(() =>+ [...selectedRequests].sort(+ (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()+ )+ );+ const [decisions, setDecisions] = useState<Record<string, Decision>>({});+ const [collapsed, setCollapsed] = useState<Record<string, boolean>>({});+ const [comment, setComment] = useState("");+ const [outcomes, setOutcomes] = useState<Record<string, Outcome> | null>(null);++ const { mutateAsync: bulkAct } = useBulkActOnSecretApprovalRequests();+ const detailQueries = useGetSecretApprovalRequestDetailsList({+ ids: requests.map(({ id }) => id)+ });+ const detailsById = Object.fromEntries(+ requests.map(({ id }, index) => [id, detailQueries[index]?.data])+ );+ const isLoadingDetails = detailQueries.some(({ isPending }) => isPending);+ const hasAllDetails = detailQueries.every(({ data }) => Boolean(data));++ const groups = useMemo(() => {+ const byLocation = new Map<string, TSecretApprovalRequest[]>();+ requests.forEach((request) => {+ const key = `${request.environment}|${request.folderId}`;+ byLocation.set(key, [...(byLocation.get(key) ?? []), request]);+ });+ return [...byLocation.values()];+ }, [requests]);++ const conflictsById = useMemo(() => {+ const touchedBy = new Map<string, { secretKey: string; requests: TSecretApprovalRequest[] }>();+ requests.forEach((request) => {+ const secretKeys = new Set(+ (detailsById[request.id]?.commits ?? []).flatMap((commit) => [+ commit.secretKey,+ commit.secretVersion?.secretKey+ ])+ );+ secretKeys.forEach((secretKey) => {+ if (!secretKey) return;+ const locationKey = `${request.environment}|${request.folderId}|${secretKey}`;+ const entry = touchedBy.get(locationKey) ?? { secretKey, requests: [] };+ touchedBy.set(locationKey, { secretKey, requests: [...entry.requests, request] });+ });+ });++ const result: Record<string, Conflict[]> = {};+ touchedBy.forEach(({ secretKey, requests: touching }) => {+ if (touching.length < 2) return;+ touching.forEach((request, index) => {+ touching.forEach((other, otherIndex) => {+ if (other.id === request.id) return;+ result[request.id] = [+ ...(result[request.id] ?? []),+ { secretKey, slug: other.slug, mergesFirst: otherIndex < index }+ ];+ });+ });+ });+ return result;+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [requests, isLoadingDetails]);++ const decidedCount = requests.filter(({ id }) => decisions[id]).length;+ const approveCount = requests.filter(({ id }) => decisions[id] === "approve").length;+ const isReadyToSubmit = hasAllDetails && decidedCount === requests.length;++ const decide = (requestId: string, decision: Decision) => {+ setDecisions((prev) => ({ ...prev, [requestId]: decision }));+ setCollapsed((prev) => ({ ...prev, [requestId]: true }));+ };++ const handleSubmit = async () => {+ setIsSubmitting(true);+ try {+ const reviewComment = comment.trim() || undefined;+ const idsFor = (decision: Decision) =>+ requests.filter(({ id }) => decisions[id] === decision).map(({ id }) => id);+ const approveIds = idsFor("approve");+ const rejectIds = idsFor("reject");++ const approveResults = approveIds.length+ ? await bulkAct({+ projectId,+ action: BulkChangeRequestAction.Approve,+ comment: reviewComment,+ requestIds: approveIds+ })+ : [];+ const rejectResults = rejectIds.length+ ? await bulkAct({+ projectId,+ action: BulkChangeRequestAction.Reject,+ comment: reviewComment,+ requestIds: rejectIds+ })+ : [];+ const mergeResults = approveIds.length+ ? await bulkAct({+ projectId,+ action: BulkChangeRequestAction.Merge,+ requestIds: approveIds+ })+ : [];++ const nextOutcomes: Record<string, Outcome> = {};+ rejectResults.forEach(({ id, isSuccess, errorMessage }) => {+ nextOutcomes[id] = isSuccess+ ? { status: "rejected" }+ : { status: "failed", message: errorMessage ?? "Review failed" };+ });+ mergeResults.forEach(({ id, isSuccess, errorMessage }) => {+ const review = approveResults.find((result) => result.id === id);+ if (isSuccess) {+ nextOutcomes[id] = {+ status: "merged",+ reviewError: review?.isSuccess ? undefined : review?.errorMessage+ };+ return;+ }+ if (review?.isSuccess && PENDING_APPROVALS_PATTERN.test(errorMessage ?? "")) {+ nextOutcomes[id] = { status: "awaiting" };+ return;+ }+ nextOutcomes[id] = review?.isSuccess+ ? { status: "approved", message: errorMessage ?? "Could not be merged" }+ : { status: "failed", message: review?.errorMessage ?? errorMessage ?? "Review failed" };+ });+ setOutcomes(nextOutcomes);++ const listResults: TBulkChangeRequestResult[] = requests.map(({ id }) => {+ const outcome = nextOutcomes[id];+ if (outcome.status === "approved" || outcome.status === "failed")+ return {+ id,+ isSuccess: false,+ errorMessage:+ outcome.status === "approved"+ ? `Approved, but not merged: ${outcome.message}`+ : outcome.message+ };+ return { id, isSuccess: true };+ });+ onComplete(listResults);++ const pendingCount = listResults.filter(({ isSuccess }) => !isSuccess).length;+ createNotification({+ type: pendingCount ? "warning" : "success",+ text: pendingCount+ ? `${requests.length - pendingCount} of ${requests.length} change requests completed. The rest stay selected.`+ : `${requests.length} change request${requests.length === 1 ? "" : "s"} reviewed`+ });+ } finally {+ setIsSubmitting(false);+ }+ };++ const renderOutcome = (requestId: string) => {+ const outcome = outcomes?.[requestId];+ if (!outcome) return <Spinner size="xs" />;++ if (outcome.status === "awaiting")+ return (+ <span className="inline-flex items-center gap-1.5 text-sm text-success">+ <CheckIcon className="size-4" />+ Approved+ <span className="text-muted">Awaiting other reviewers</span>+ </span>+ );++ if (outcome.status === "merged" || outcome.status === "rejected")+ return (+ <span+ className={cn(+ "inline-flex items-center gap-1.5 text-sm",+ outcome.status === "merged" ? "text-success" : "text-danger"+ )}+ >+ {outcome.status === "merged" ? (+ <GitMergeIcon className="size-4" />+ ) : (+ <BanIcon className="size-4" />+ )}+ {outcome.status === "merged" ? "Merged" : "Rejected"}+ {outcome.status === "merged" && outcome.reviewError && (+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ role="img"+ // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- focusable so keyboard users can reveal the reason+ tabIndex={0}+ aria-label={`Your review wasn't saved: ${outcome.reviewError}`}+ className="inline-flex rounded-sm text-warning outline-0 focus-visible:ring-2 focus-visible:ring-ring"+ >+ <TriangleAlertIcon className="size-4" />+ </span>+ </TooltipTrigger>+ <TooltipContent className="max-w-sm">+ Merged, but your review wasn't saved: {outcome.reviewError}+ </TooltipContent>+ </Tooltip>+ )}+ </span>+ );++ return (+ <span+ className={cn(+ "inline-flex items-center gap-1.5 text-sm",+ outcome.status === "approved" ? "text-warning" : "text-danger"+ )}+ >+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ role="img"+ // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- focusable so keyboard users can reveal the reason+ tabIndex={0}+ aria-label={outcome.message}+ className="inline-flex rounded-sm outline-0 focus-visible:ring-2 focus-visible:ring-ring"+ >+ {outcome.status === "approved" ? (+ <TriangleAlertIcon className="size-4" />+ ) : (+ <CircleXIcon className="size-4" />+ )}+ </span>+ </TooltipTrigger>+ <TooltipContent className="max-w-sm">{outcome.message}</TooltipContent>+ </Tooltip>+ {outcome.status === "approved" ? "Approved, Not Merged" : "Failed"}+ </span>+ );+ };++ const renderConflicts = (requestId: string) => {+ const conflicts = conflictsById[requestId];+ if (!conflicts?.length) return null;+ const secretKeys = [...new Set(conflicts.map(({ secretKey }) => secretKey))];+ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ role="img"+ // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex -- focusable so keyboard users can reveal the conflict details+ tabIndex={0}+ aria-label={`Overlaps another selected request on ${secretKeys.join(", ")}`}+ className="inline-flex items-center gap-1 rounded-sm text-xs text-warning outline-0 focus-visible:ring-2 focus-visible:ring-ring"+ >+ <TriangleAlertIcon className="size-3.5" />+ Overlaps on {secretKeys.length === 1 ? secretKeys[0] : `${secretKeys.length} secrets`}+ </span>+ </TooltipTrigger>+ <TooltipContent className="max-w-sm">+ <div className="flex flex-col gap-1">+ {conflicts.map(({ secretKey, slug, mergesFirst }) => (+ <span key={`${secretKey}-${slug}`}>+ {secretKey} is also changed in #{slug}, which merges{" "}+ {mergesFirst ? "before" : "after"} this request.+ </span>+ ))}+ </div>+ </TooltipContent>+ </Tooltip>+ );+ };++ const outcomeValues = Object.values(outcomes ?? {});+ const summary = (+ [+ ["merged", "merged"],+ ["awaiting", "approved and awaiting other reviewers"],+ ["approved", "approved but not merged"],+ ["rejected", "rejected"],+ ["failed", "failed"]+ ] as const+ )+ .map(([status, label]) => ({+ label,+ count: outcomeValues.filter((outcome) => outcome.status === status).length+ }))+ .filter(({ count }) => count)+ .map(({ count, label }) => `${count} ${label}`)+ .join(", ");+ const hasUnfinished = outcomeValues.some(+ ({ status }) => status === "approved" || status === "failed"+ );++ return (+ <>+ <SheetHeader className="border-b">+ <SheetTitle>+ Review {requests.length} Change Request{requests.length === 1 ? "" : "s"}+ </SheetTitle>+ <SheetDescription>+ Approve or reject each request. Approved requests merge once they meet their policy.+ </SheetDescription>+ </SheetHeader>++ <div className="flex min-h-0 thin-scrollbar flex-1 flex-col gap-6 overflow-y-auto p-4">+ {groups.map((group) => {+ const [{ id, environment, folderId, policy }] = group;+ const folderPath = detailsById[id]?.secretPath ?? policy.secretPath ?? "/";+ return (+ <section key={`${environment}-${folderId}`} className="flex flex-col gap-2">+ <div className="flex items-center gap-2 text-sm">+ <span className="font-medium text-foreground">+ {environmentNamesBySlug[environment] ?? environment}+ </span>+ <span className="text-muted">{formatReservedPaths(folderPath)}</span>+ </div>+ {group.map((request) => {+ const details = detailsById[request.id];+ const detailQuery = detailQueries[requests.indexOf(request)];+ const decision = decisions[request.id];+ const isCollapsed = Boolean(collapsed[request.id]);+ return (+ <div+ key={request.id}+ className="overflow-clip rounded-md border border-border bg-container"+ >+ <div className="flex flex-wrap items-center gap-3 px-3 py-2">+ <IconButton+ variant="ghost"+ size="xs"+ aria-label={isCollapsed ? "Expand changes" : "Collapse changes"}+ onClick={() =>+ setCollapsed((prev) => ({ ...prev, [request.id]: !isCollapsed }))+ }+ >+ {isCollapsed ? <ChevronRightIcon /> : <ChevronDownIcon />}+ </IconButton>+ {generateCommitText(+ details?.commits ?? request.commits,+ request.isReplicated+ )}+ <span className="text-sm text-muted">#{request.slug}</span>+ <span className="text-sm text-foreground">{getAuthorName(request)}</span>+ <span className="text-sm text-muted">+ {getApprovedCount(details ?? request)}/+ {(details ?? request).policy.approvals} approvals+ </span>+ {renderConflicts(request.id)}+ <div className="ml-auto flex items-center gap-2">+ {outcomes || isSubmitting ? (+ renderOutcome(request.id)+ ) : (+ <ButtonGroup>+ <Button+ size="xs"+ variant={decision === "approve" ? "success" : "outline"}+ aria-pressed={decision === "approve"}+ onClick={() => decide(request.id, "approve")}+ >+ <CheckIcon />+ Approve+ </Button>+ <Button+ size="xs"+ variant={decision === "reject" ? "danger" : "outline"}+ aria-pressed={decision === "reject"}+ onClick={() => decide(request.id, "reject")}+ >+ <XIcon />+ Reject+ </Button>+ </ButtonGroup>+ )}+ </div>+ </div>+ {!isCollapsed && (+ <div className="flex flex-col gap-2 border-t border-border p-3">+ {details &&+ details.commits.map(+ ({ op, secretVersion, secret, ...newVersion }, index) => (+ <SecretApprovalRequestChangeItem+ key={`${op}-${index + 1}-${secretVersion?.id}`}+ op={op}+ conflicts={details.conflicts}+ hasMerged={details.hasMerged}+ secretVersion={secretVersion}+ presentSecretVersionNumber={secret?.version || 0}+ newVersion={newVersion}+ />+ )+ )}+ {!details && detailQuery?.isError && (+ <div className="flex items-center gap-3 text-sm text-danger">+ <CircleXIcon className="size-4" />+ <span className="flex-1">+ Could not load this request's changes.+ </span>+ <Button+ variant="outline"+ size="xs"+ onClick={() => detailQuery.refetch()}+ >+ Retry+ </Button>+ </div>+ )}+ {!details && !detailQuery?.isError && <Skeleton className="h-16 w-full" />}+ </div>+ )}+ </div>+ );+ })}+ </section>+ );+ })}+ </div>++ <SheetFooter className="border-t">+ <div className="flex w-full flex-col gap-2">+ {outcomes ? (+ <div className="flex items-center gap-2">+ <p className="flex-1 text-sm text-muted">+ {summary}.+ {hasUnfinished &&+ " Unfinished requests stay selected so you can open them individually."}+ </p>+ <Button variant="project" size="sm" onClick={onClose}>+ Done+ </Button>+ </div>+ ) : (+ <>+ <Field>+ <FieldLabel htmlFor="bulk-review-comment">Comment (optional)</FieldLabel>+ <TextArea+ id="bulk-review-comment"+ value={comment}+ onChange={(e) => setComment(e.target.value)}+ placeholder="Added to each review..."+ maxLength={1000}+ rows={2}+ disabled={isSubmitting}+ />+ </Field>+ <div className="flex items-center gap-3">+ <p className="flex-1 text-sm text-muted">+ {decidedCount} of {requests.length} reviewed+ </p>+ <Button variant="ghost" size="sm" isDisabled={isSubmitting} onClick={onClose}>+ Cancel+ </Button>+ <Button+ variant="project"+ size="sm"+ isDisabled={!isReadyToSubmit}+ isPending={isSubmitting}+ onClick={handleSubmit}+ >+ <GitMergeIcon />+ {approveCount ? `Submit & Merge ${approveCount}` : "Submit Reviews"}+ </Button>+ </div>+ </>+ )}+ </div>+ </SheetFooter>+ </>+ );+};++export const BulkReviewChangeRequestsSheet = ({ isOpen, onOpenChange, ...contentProps }: Props) => {+ const [isSubmitting, setIsSubmitting] = useState(false);++ return (+ <Sheet+ open={isOpen}+ onOpenChange={(open) => {+ if (!open && isSubmitting) return;+ onOpenChange(open);+ }}+ >+ <SheetContent size="wide" className="flex h-full flex-col gap-0 overflow-hidden">+ {isOpen && (+ <BulkReviewChangeRequestsSheetContent+ {...contentProps}+ onClose={() => onOpenChange(false)}+ isSubmitting={isSubmitting}+ setIsSubmitting={setIsSubmitting}+ />+ )}+ </SheetContent>+ </Sheet>+ );+};