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
fix(approvals): show request folder path in change requests list (#8678)
Andrew Huangd7751cd60649
diff --git a/backend/src/ee/routes/v1/secret-approval-request-router.ts b/backend/src/ee/routes/v1/secret-approval-request-router.tsindex 30a879e0cf..056fdce109 100644--- a/backend/src/ee/routes/v1/secret-approval-request-router.ts+++ b/backend/src/ee/routes/v1/secret-approval-request-router.ts@@ -48,7 +48,7 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProvresponse: {200: z.object({approvals: SecretApprovalRequestsSchema.extend({- // secretPath: z.string(),+ secretPath: z.string(),policyId: z.string().uuid().nullable(),policy: z.object({id: z.string(),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 62e37d6103..610b5c27b5 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@@ -14,7 +14,7 @@ import { AUDIT_LOG_SENSITIVE_VALUE } from "@app/lib/config/const";import { getConfig } from "@app/lib/config/env";import { crypto, SymmetricKeySize } from "@app/lib/crypto/cryptography";import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";-import { groupBy, pick, unique } from "@app/lib/fn";+import { groupBy, groupByUnique, pick, unique } from "@app/lib/fn";import { logger } from "@app/lib/logger";import { alphaNumericNanoId } from "@app/lib/nanoid";import { requestMemoKeys } from "@app/lib/request-context/memo-keys";@@ -318,6 +318,7 @@ export const secretApprovalRequestServiceFactory = ({const { shouldUseSecretV2Bridge } = await projectBotService.getBotKey(projectId);+ let page;if (shouldUseSecretV2Bridge) {// Policies on the global approval system only exist on upgraded projects, so only this branch has// requests on both systems. Each is asked for the head of the list up to the requested page.@@ -338,27 +339,42 @@ export const secretApprovalRequestServiceFactory = ({secretChangeGlobalRequestBridgeService.listSecretChangeRequests(headOfList)]);type TListedRequest = (typeof legacyRequests)["approvals"][number] | TSecretChangeRequestListItem;- return mergeSecretApprovalRequestPages<TListedRequest>({+ page = mergeSecretApprovalRequestPages<TListedRequest>({pages: [legacyRequests, secretChangeRequests],offset,limit,orderBy,orderDirection});+ } else {+ page = await secretApprovalRequestDAL.findByProjectId({+ projectId,+ committer,+ environment,+ status,+ userId: userIdFilter,+ limit,+ offset,+ search,+ orderBy,+ orderDirection+ });}- return secretApprovalRequestDAL.findByProjectId({- projectId,- committer,- environment,- status,- userId: userIdFilter,- limit,- offset,- search,- orderBy,- orderDirection- });+ const folderIds = unique(page.approvals.map((el) => el.folderId));+ const folders = folderIds.length ? await folderDAL.findSecretPathByFolderIds(projectId, folderIds) : [];+ const folderById = groupByUnique(+ folders.filter((el) => el !== undefined),+ (el) => el.id+ );++ return {+ ...page,+ approvals: page.approvals.map((el) => ({+ ...el,+ secretPath: folderById[el.folderId]?.path ?? "/"+ }))+ };};const getSecretApprovalDetails = async (dto: TSecretApprovalDetailsDTO) => {diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsxindex fc0a5eeb25..a5e25f7a73 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx@@ -82,6 +82,7 @@ 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 { ApprovalStatus } from "@app/hooks/api/types";+import { formatReservedPaths, parsePathFromReplicatedPath } from "@app/lib/fn/string";import {generateCommitText,@@ -90,7 +91,6 @@ import {enum ChangeRequestOrderBy {Environment = SecretApprovalRequestOrderBy.Environment,- SecretPath = SecretApprovalRequestOrderBy.SecretPath,Author = SecretApprovalRequestOrderBy.Author,OpenedAt = SecretApprovalRequestOrderBy.CreatedAt}@@ -387,17 +387,7 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {className={getSortIconClassName(ChangeRequestOrderBy.Environment)}/></TableHead>- <TableHead- sortDirection={getSortDirection(ChangeRequestOrderBy.SecretPath)}- onSortChange={(direction) =>- handleSort(ChangeRequestOrderBy.SecretPath, direction)- }- >- Secret Path- <ChevronDownIcon- className={getSortIconClassName(ChangeRequestOrderBy.SecretPath)}- />- </TableHead>+ <TableHead>Secret Path</TableHead><TableHeadsortDirection={getSortDirection(ChangeRequestOrderBy.Author)}onSortChange={(direction) => handleSort(ChangeRequestOrderBy.Author, direction)}@@ -464,6 +454,7 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {updatedAt,policy,environment,+ secretPath,isReplicated} = secretApproval;@@ -477,6 +468,9 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {!reviewers.find(({ userId }) => userId === userSession.id);const environmentDisplayName = environmentNamesBySlug[environment] ?? environment;+ const secretPathDisplay = isReplicated+ ? parsePathFromReplicatedPath(secretPath)+ : formatReservedPaths(secretPath);const committerName = committerUser? [committerUser.firstName, committerUser.lastName].filter(Boolean).join(" ") ||committerUser.email@@ -538,7 +532,7 @@ export const SecretApprovalRequest = ({ onConfigurePolicies }: Props) => {><TableCell>{generateCommitText(commits, isReplicated, true)}</TableCell><TableCell title={environmentDisplayName}>{environmentDisplayName}</TableCell>- <TableCell title={policy.secretPath}>{policy.secretPath}</TableCell>+ <TableCell title={secretPathDisplay}>{secretPathDisplay}</TableCell><TableCell>{committerUser || committerIdentity ? (<div className="flex items-center gap-2">