From ce8653e908a0e30c732b9caa4d9528fc0b00a7ea Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Mon, 11 Aug 2025 15:15:48 -0700
Subject: [PATCH] Address reviews

---
 backend/src/ee/routes/v1/access-approval-policy-router.ts   | 3 ++-
 .../access-approval-policy/access-approval-policy-types.ts  | 4 ++--
 frontend/src/hooks/api/accessApproval/types.ts              | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/src/ee/routes/v1/access-approval-policy-router.ts b/backend/src/ee/routes/v1/access-approval-policy-router.ts
index a232ae603..d8d3bf9ed 100644
--- a/backend/src/ee/routes/v1/access-approval-policy-router.ts
+++ b/backend/src/ee/routes/v1/access-approval-policy-router.ts
@@ -13,9 +13,10 @@ import { AuthMode } from "@app/services/auth/auth-type";
 const maxTimePeriodSchema = z
   .string()
   .trim()
-  .optional()
+  .nullish()
   .transform((val, ctx) => {
     if (val === undefined) return undefined;
+    if (!val || val === "permanent") return null;
     const parsedMs = ms(val);
 
     if (typeof parsedMs !== "number" || parsedMs <= 0) {
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts
index 0ed8b0582..997849800 100644
--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts
+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts
@@ -41,7 +41,7 @@ export type TCreateAccessApprovalPolicy = {
   enforcementLevel: EnforcementLevel;
   allowedSelfApprovals: boolean;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
-  maxTimePeriod?: string;
+  maxTimePeriod?: string | null;
 } & Omit<TProjectPermission, "projectId">;
 
 export type TUpdateAccessApprovalPolicy = {
@@ -61,7 +61,7 @@ export type TUpdateAccessApprovalPolicy = {
   allowedSelfApprovals: boolean;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
   environments?: string[];
-  maxTimePeriod?: string;
+  maxTimePeriod?: string | null;
 } & Omit<TProjectPermission, "projectId">;
 
 export type TDeleteAccessApprovalPolicy = {
diff --git a/frontend/src/hooks/api/accessApproval/types.ts b/frontend/src/hooks/api/accessApproval/types.ts
index 85c565caa..fc14352f8 100644
--- a/frontend/src/hooks/api/accessApproval/types.ts
+++ b/frontend/src/hooks/api/accessApproval/types.ts
@@ -18,7 +18,7 @@ export type TAccessApprovalPolicy = {
   approvers?: Approver[];
   bypassers?: Bypasser[];
   allowedSelfApprovals: boolean;
-  maxTimePeriod?: string;
+  maxTimePeriod?: string | null;
 };
 
 export enum ApproverType {
@@ -175,7 +175,7 @@ export type TCreateAccessPolicyDTO = {
   enforcementLevel?: EnforcementLevel;
   allowedSelfApprovals: boolean;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
-  maxTimePeriod?: string;
+  maxTimePeriod?: string | null;
 };
 
 export type TUpdateAccessPolicyDTO = {
@@ -191,7 +191,7 @@ export type TUpdateAccessPolicyDTO = {
   // for invalidating list
   projectSlug: string;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
-  maxTimePeriod?: string;
+  maxTimePeriod?: string | null;
 };
 
 export type TDeleteSecretPolicyDTO = {