feat(secret-approval): conflict ui, request count and secret path in request detail

backend/src/controllers/v1/secretApprovalRequestsController.ts

@@ -12,6 +12,54 @@ import { Types } from "mongoose";
 import { EEAuditLogService } from "../../ee/services";
 import { EventType } from "../../ee/models";
 
+export const getSecretApprovalRequestCount = async (req: Request, res: Response) => {
+  const {
+    query: { workspaceId }
+  } = await validateRequest(reqValidator.getSecretApprovalRequestCount, req);
+
+  const { membership } = await getUserProjectPermissions(req.user._id, workspaceId);
+  const approvalRequestCount = await SecretApprovalRequest.aggregate([
+    {
+      $match: {
+        workspace: new Types.ObjectId(workspaceId)
+      }
+    },
+    {
+      $lookup: {
+        from: SecretApprovalPolicy.collection.name,
+        localField: "policy",
+        foreignField: "_id",
+        as: "policy"
+      }
+    },
+    { $unwind: "$policy" },
+    ...(membership.role !== "admin"
+      ? [
+          {
+            $match: {
+              $or: [
+                { committer: new Types.ObjectId(membership.id) },
+                { "policy.approvers": new Types.ObjectId(membership.id) }
+              ]
+            }
+          }
+        ]
+      : []),
+    {
+      $group: {
+        _id: "$status",
+        count: { $sum: 1 }
+      }
+    }
+  ]);
+  const openRequests = approvalRequestCount.find(({ _id }) => _id === "open");
+  const closedRequests = approvalRequestCount.find(({ _id }) => _id === "close");
+
+  return res.send({
+    approvals: { open: openRequests?.count || 0, closed: closedRequests?.count || 0 }
+  });
+};
+
 export const getSecretApprovalRequests = async (req: Request, res: Response) => {
   const {
     query: { status, committer, workspaceId, environment, limit, offset }
@@ -95,7 +143,8 @@ export const getSecretApprovalRequestDetails = async (req: Request, res: Respons
       }
     })
     .populate("commits.secret", "version")
-    .populate("commits.newVersion.tags");
+    .populate("commits.newVersion.tags")
+    .lean();
   if (!secretApprovalRequest)
     throw BadRequestError({ message: "Secret approval request not found" });
 
@@ -114,8 +163,19 @@ export const getSecretApprovalRequestDetails = async (req: Request, res: Respons
     throw UnauthorizedRequestError({ message: "User has no access" });
   }
 
+  let secretPath = "/";
+  const approvalRootFolders = await Folder.findOne({
+    workspace: secretApprovalRequest.workspace,
+    environment: secretApprovalRequest.environment
+  }).lean();
+  if (approvalRootFolders) {
+    secretPath =
+      getFolderWithPathFromId(approvalRootFolders?.nodes, secretApprovalRequest.folderId)
+        ?.folderPath || "/";
+  }
+
   return res.send({
-    approval: secretApprovalRequest
+    approval: { ...secretApprovalRequest, secretPath }
   });
 };
 

backend/src/routes/v1/secretApprovalRequest.ts

@@ -12,6 +12,14 @@ router.get(
   secretApprovalRequestController.getSecretApprovalRequests
 );
 
+router.get(
+  "/count",
+  requireAuth({
+    acceptedAuthModes: [AuthMode.JWT]
+  }),
+  secretApprovalRequestController.getSecretApprovalRequestCount
+);
+
 router.get(
   "/:id",
   requireAuth({

backend/src/services/SecretApprovalService.ts

@@ -355,7 +355,7 @@ export const performSecretApprovalRequestMerge = async (
   const environment = secretApprovalRequest.environment;
   const folderId = secretApprovalRequest.folderId;
   const postHogClient = await TelemetryService.getPostHogClient();
-  const conflicts: Array<{ id: string; op: CommitType }> = [];
+  const conflicts: Array<{ secretId: string; op: CommitType }> = [];
 
   const secretCreationCommits = secretApprovalRequest.commits.filter(
     ({ op }) => op === CommitType.CREATE
@@ -382,7 +382,7 @@ export const performSecretApprovalRequestMerge = async (
     secretCreationCommits
       .filter(({ newVersion }) => conflictGroupByBlindIndex[newVersion.secretBlindIndex || ""])
       .forEach((el) => {
-        conflicts.push({ op: CommitType.CREATE, id: el.newVersion._id.toString() });
+        conflicts.push({ op: CommitType.CREATE, secretId: el.newVersion._id.toString() });
       });
 
     // create secret
@@ -482,15 +482,20 @@ export const performSecretApprovalRequestMerge = async (
     );
     secretUpdationCommits
       .filter(
-        ({ newVersion }) =>
-          newVersion.secretBlindIndex && conflictGroupByBlindIndex[newVersion.secretBlindIndex]
+        ({ newVersion, secret }) =>
+          (newVersion.secretBlindIndex && conflictGroupByBlindIndex[newVersion.secretBlindIndex]) ||
+          !secret
       )
       .forEach((el) => {
-        conflicts.push({ op: CommitType.UPDATE, id: el.newVersion._id.toString() });
+        conflicts.push({ op: CommitType.UPDATE, secretId: el.newVersion._id.toString() });
       });
 
-    const nonConflictSecrets = secretUpdationCommits.filter(({ newVersion }) =>
-      newVersion?.secretBlindIndex ? !conflictGroupByBlindIndex[newVersion.secretBlindIndex] : true
+    const nonConflictSecrets = secretUpdationCommits.filter(
+      ({ newVersion, secret }) =>
+        Boolean(secret) &&
+        (newVersion?.secretBlindIndex
+          ? !conflictGroupByBlindIndex[newVersion.secretBlindIndex]
+          : true)
     );
     await Secret.bulkWrite(
       // id and version are stripped off

backend/src/validation/secretApprovalRequest.ts

@@ -12,6 +12,12 @@ export const getSecretApprovalRequests = z.object({
   })
 });
 
+export const getSecretApprovalRequestCount = z.object({
+  query: z.object({
+    workspaceId: z.string().trim()
+  })
+});
+
 export const getSecretApprovalRequestDetails = z.object({
   params: z.object({
     id: z.string().trim()