Renamed column to allowedSelfApprovals

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

@@ -24,7 +24,7 @@ export const useCreateAccessApprovalPolicy = () => {
       name,
       secretPath,
       enforcementLevel,
-      selfApprovals
+      allowedSelfApprovals
     }) => {
       const { data } = await apiRequest.post("/api/v1/access-approvals/policies", {
         environment,
@@ -34,7 +34,7 @@ export const useCreateAccessApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        selfApprovals
+        allowedSelfApprovals
       });
       return data;
     },
@@ -57,7 +57,7 @@ export const useUpdateAccessApprovalPolicy = () => {
       name,
       secretPath,
       enforcementLevel,
-      selfApprovals
+      allowedSelfApprovals
     }) => {
       const { data } = await apiRequest.patch(`/api/v1/access-approvals/policies/${id}`, {
         approvals,
@@ -65,7 +65,7 @@ export const useUpdateAccessApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        selfApprovals
+        allowedSelfApprovals
       });
       return data;
     },

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

@@ -16,7 +16,7 @@ export type TAccessApprovalPolicy = {
   enforcementLevel: EnforcementLevel;
   updatedAt: Date;
   approvers?: Approver[];
-  selfApprovals: boolean;
+  allowedSelfApprovals: boolean;
 };
 
 export enum ApproverType {
@@ -72,7 +72,7 @@ export type TAccessApprovalRequest = {
     envId: string;
     enforcementLevel: EnforcementLevel;
     deletedAt: Date | null;
-    selfApprovals: boolean;
+    allowedSelfApprovals: boolean;
   };
 
   reviewers: {
@@ -146,7 +146,7 @@ export type TCreateAccessPolicyDTO = {
   approvals?: number;
   secretPath?: string;
   enforcementLevel?: EnforcementLevel;
-  selfApprovals: boolean;
+  allowedSelfApprovals: boolean;
 };
 
 export type TUpdateAccessPolicyDTO = {
@@ -157,7 +157,7 @@ export type TUpdateAccessPolicyDTO = {
   environment?: string;
   approvals?: number;
   enforcementLevel?: EnforcementLevel;
-  selfApprovals: boolean;
+  allowedSelfApprovals: boolean;
   // for invalidating list
   projectSlug: string;
 };

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

@@ -17,7 +17,7 @@ export const useCreateSecretApprovalPolicy = () => {
       secretPath,
       name,
       enforcementLevel,
-      selfApprovals
+      allowedSelfApprovals
     }) => {
       const { data } = await apiRequest.post("/api/v1/secret-approvals", {
         environment,
@@ -27,7 +27,7 @@ export const useCreateSecretApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        selfApprovals
+        allowedSelfApprovals
       });
       return data;
     },
@@ -50,7 +50,7 @@ export const useUpdateSecretApprovalPolicy = () => {
       secretPath,
       name,
       enforcementLevel,
-      selfApprovals
+      allowedSelfApprovals
     }) => {
       const { data } = await apiRequest.patch(`/api/v1/secret-approvals/${id}`, {
         approvals,
@@ -58,7 +58,7 @@ export const useUpdateSecretApprovalPolicy = () => {
         secretPath,
         name,
         enforcementLevel,
-        selfApprovals
+        allowedSelfApprovals
       });
       return data;
     },

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

@@ -12,7 +12,7 @@ export type TSecretApprovalPolicy = {
   approvers: Approver[];
   updatedAt: Date;
   enforcementLevel: EnforcementLevel;
-  selfApprovals: boolean;
+  allowedSelfApprovals: boolean;
 };
 
 export enum ApproverType {
@@ -43,7 +43,7 @@ export type TCreateSecretPolicyDTO = {
   approvers?: Approver[];
   approvals?: number;
   enforcementLevel: EnforcementLevel;
-  selfApprovals: boolean;
+  allowedSelfApprovals: boolean;
 };
 
 export type TUpdateSecretPolicyDTO = {
@@ -52,7 +52,7 @@ export type TUpdateSecretPolicyDTO = {
   approvers?: Approver[];
   secretPath?: string | null;
   approvals?: number;
-  selfApprovals?: boolean;
+  allowedSelfApprovals?: boolean;
   enforcementLevel?: EnforcementLevel;
   // for invalidating list
   workspaceId: string;

frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx

@@ -152,7 +152,7 @@ export const AccessApprovalRequest = ({
     const isAccepted = request.isApproved;
     const isSoftEnforcement = request.policy.enforcementLevel === EnforcementLevel.Soft;
     const isRequestedByCurrentUser = request.requestedByUserId === user.id;
-    const isSelfApproveAllowed = request.policy.selfApprovals;
+    const isSelfApproveAllowed = request.policy.allowedSelfApprovals;
     const userReviewStatus = request.reviewers.find(({ member }) => member === user.id)?.status;
 
     let displayData: { label: string; type: "primary" | "danger" | "success" } = {

frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx

@@ -56,7 +56,7 @@ const formSchema = z
       .default([]),
     policyType: z.nativeEnum(PolicyType),
     enforcementLevel: z.nativeEnum(EnforcementLevel),
-    selfApprovals: z.boolean().default(true)
+    allowedSelfApprovals: z.boolean().default(true)
   })
   .superRefine((data, ctx) => {
     if (!(data.groupApprovers.length || data.userApprovers.length)) {
@@ -104,7 +104,7 @@ export const AccessPolicyForm = ({
               ?.filter((approver) => approver.type === ApproverType.Group)
               .map(({ id, type }) => ({ id, type: type as ApproverType.Group })) || [],
           approvals: editValues?.approvals,
-          selfApprovals: editValues?.selfApprovals
+          allowedSelfApprovals: editValues?.allowedSelfApprovals
         }
       : undefined
   });
@@ -446,7 +446,7 @@ export const AccessPolicyForm = ({
             />
             <Controller
               control={control}
-              name="selfApprovals"
+              name="allowedSelfApprovals"
               defaultValue
               render={({ field: { value, onChange }, fieldState: { error } }) => (
                 <FormControl

frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx

@@ -128,7 +128,7 @@ export const SecretApprovalRequestChanges = ({
     resolver: zodResolver(reviewFormSchema)
   });
   const shouldBlockSelfReview =
-    secretApprovalRequestDetails?.policy?.selfApprovals === false &&
+    secretApprovalRequestDetails?.policy?.allowedSelfApprovals === false &&
     secretApprovalRequestDetails?.committerUserId === userSession.id;
   const isApproving = variables?.status === ApprovalStatus.APPROVED && isUpdatingRequestStatus;
   const isRejecting = variables?.status === ApprovalStatus.REJECTED && isUpdatingRequestStatus;