feat(secret-approval): added auto naming policy and minor ux enhancements

backend/src/controllers/v1/secretApprovalPolicyController.ts

@@ -1,5 +1,6 @@
 import { ForbiddenError, subject } from "@casl/ability";
 import { Request, Response } from "express";
+import { nanoid } from "nanoid";
 import {
   ProjectPermissionActions,
   ProjectPermissionSub,
@@ -15,7 +16,7 @@ const ERR_SECRET_APPROVAL_NOT_FOUND = BadRequestError({ message: "secret approva
 
 export const createSecretApprovalPolicy = async (req: Request, res: Response) => {
   const {
-    body: { approvals, secretPath, approvers, environment, workspaceId }
+    body: { approvals, secretPath, approvers, environment, workspaceId, name }
   } = await validateRequest(reqValidator.CreateSecretApprovalRule, req);
 
   const { permission } = await getUserProjectPermissions(req.user._id, workspaceId);
@@ -26,6 +27,7 @@ export const createSecretApprovalPolicy = async (req: Request, res: Response) =>
 
   const secretApproval = new SecretApprovalPolicy({
     workspace: workspaceId,
+    name: name ?? `${environment}-${nanoid(3)}`,
     secretPath,
     environment,
     approvals,
@@ -40,7 +42,7 @@ export const createSecretApprovalPolicy = async (req: Request, res: Response) =>
 
 export const updateSecretApprovalPolicy = async (req: Request, res: Response) => {
   const {
-    body: { approvals, approvers, secretPath },
+    body: { approvals, approvers, secretPath, name },
     params: { id }
   } = await validateRequest(reqValidator.UpdateSecretApprovalRule, req);
 
@@ -59,6 +61,7 @@ export const updateSecretApprovalPolicy = async (req: Request, res: Response) =>
   const updatedDoc = await SecretApprovalPolicy.findByIdAndUpdate(id, {
     approvals,
     approvers,
+    name: (name || secretApproval?.name) ?? `${secretApproval.environment}-${nanoid(3)}`,
     ...(secretPath === null ? { $unset: { secretPath: 1 } } : { secretPath })
   });
 

backend/src/models/secretApprovalPolicy.ts

@@ -3,6 +3,7 @@ import { Schema, Types, model } from "mongoose";
 export interface ISecretApprovalPolicy {
   _id: Types.ObjectId;
   workspace: Types.ObjectId;
+  name: string;
   environment: string;
   secretPath?: string;
   approvers: Types.ObjectId[];
@@ -23,6 +24,9 @@ const secretApprovalPolicySchema = new Schema<ISecretApprovalPolicy>(
         ref: "Membership"
       }
     ],
+    name: {
+      type: String
+    },
     environment: {
       type: String,
       required: true

backend/src/validation/secretApproval.ts

@@ -15,24 +15,36 @@ export const GetSecretApprovalPolicyOfABoard = z.object({
 });
 
 export const CreateSecretApprovalRule = z.object({
-  body: z.object({
-    workspaceId: z.string(),
-    environment: z.string(),
-    secretPath: z.string().optional().nullable(),
-    approvers: z.string().array().optional(),
-    approvals: z.number().min(1).default(1)
-  })
+  body: z
+    .object({
+      workspaceId: z.string(),
+      name: z.string().optional(),
+      environment: z.string(),
+      secretPath: z.string().optional().nullable(),
+      approvers: z.string().array().min(1),
+      approvals: z.number().min(1).default(1)
+    })
+    .refine((data) => data.approvals <= data.approvers.length, {
+      path: ["approvals"],
+      message: "Approvals should be lower than approvals"
+    })
 });
 
 export const UpdateSecretApprovalRule = z.object({
   params: z.object({
     id: z.string()
   }),
-  body: z.object({
-    approvers: z.string().array().optional(),
-    approvals: z.number().min(1).optional(),
-    secretPath: z.string().optional().nullable()
-  })
+  body: z
+    .object({
+      name: z.string().optional(),
+      approvers: z.string().array().min(1),
+      approvals: z.number().min(1).default(1),
+      secretPath: z.string().optional().nullable()
+    })
+    .refine((data) => data.approvals <= data.approvers.length, {
+      path: ["approvals"],
+      message: "Approvals should be lower than approvals"
+    })
 });
 
 export const DeleteSecretApprovalRule = z.object({