Merge pull request #3777 from akhilmhdh/feat/seq-access-request

feat: Sequentail access approval request

frontend/src/hooks/api/accessApproval/mutation.tsx

@@ -25,7 +25,8 @@ export const useCreateAccessApprovalPolicy = () => {
       name,
       secretPath,
       enforcementLevel,
-      allowedSelfApprovals
+      allowedSelfApprovals,
+      approvalsRequired
     }) => {
       const { data } = await apiRequest.post("/api/v1/access-approvals/policies", {
         environment,
@@ -36,7 +37,8 @@ export const useCreateAccessApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        allowedSelfApprovals
+        allowedSelfApprovals,
+        approvalsRequired
       });
       return data;
     },
@@ -60,7 +62,8 @@ export const useUpdateAccessApprovalPolicy = () => {
       name,
       secretPath,
       enforcementLevel,
-      allowedSelfApprovals
+      allowedSelfApprovals,
+      approvalsRequired
     }) => {
       const { data } = await apiRequest.patch(`/api/v1/access-approvals/policies/${id}`, {
         approvals,
@@ -69,7 +72,8 @@ export const useUpdateAccessApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        allowedSelfApprovals
+        allowedSelfApprovals,
+        approvalsRequired
       });
       return data;
     },

frontend/src/hooks/api/accessApproval/types.ts

@@ -1,5 +1,6 @@
 import { EnforcementLevel, PolicyType } from "../policies/enums";
 import { TProjectPermission } from "../roles/types";
+import { ApprovalStatus } from "../secretApprovalRequest/types";
 import { WorkspaceEnv } from "../workspace/types";
 
 export type TAccessApprovalPolicy = {
@@ -33,6 +34,8 @@ export enum BypasserType {
 export type Approver = {
   id: string;
   type: ApproverType;
+  sequence?: number;
+  approvals?: number;
 };
 
 export type Bypasser = {
@@ -73,12 +76,18 @@ export type TAccessApprovalRequest = {
     permissions: TProjectPermission[];
     isApproved: boolean;
   } | null;
-
+  status: ApprovalStatus;
   policy: {
     id: string;
     name: string;
     approvals: number;
-    approvers: string[];
+    approvers: {
+      userId: string;
+      sequence?: number;
+      approvalsRequired?: number;
+      username: string;
+      email: string;
+    }[];
     bypassers: string[];
     secretPath?: string | null;
     envId: string;
@@ -88,7 +97,7 @@ export type TAccessApprovalRequest = {
   };
 
   reviewers: {
-    member: string;
+    userId: string;
     status: string;
   }[];
 
@@ -163,6 +172,7 @@ export type TCreateAccessPolicyDTO = {
   secretPath?: string;
   enforcementLevel?: EnforcementLevel;
   allowedSelfApprovals: boolean;
+  approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
 };
 
 export type TUpdateAccessPolicyDTO = {
@@ -177,6 +187,7 @@ export type TUpdateAccessPolicyDTO = {
   allowedSelfApprovals: boolean;
   // for invalidating list
   projectSlug: string;
+  approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
 };
 
 export type TDeleteSecretPolicyDTO = {

frontend/src/hooks/api/secretApprovalRequest/queries.tsx

@@ -225,7 +225,7 @@ export const useGetSecretApprovalRequestCount = ({
 }) =>
   useQuery({
     queryKey: secretApprovalRequestKeys.count({ workspaceId }),
-    refetchInterval: 5000,
+    refetchInterval: 15000,
     queryFn: () => fetchSecretApprovalRequestCount({ workspaceId }),
     enabled: Boolean(workspaceId) && (options?.enabled ?? true)
   });