From 1655ca27d1fb261bce47f967e7c90e0a72777e93 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Mon, 26 Aug 2024 20:02:58 +0400 Subject: [PATCH] Fix: Creation of secret approval policies --- frontend/src/hooks/api/secretApproval/mutation.tsx | 10 +++++++++- .../components/AccessPolicyModal.tsx | 9 ++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/frontend/src/hooks/api/secretApproval/mutation.tsx b/frontend/src/hooks/api/secretApproval/mutation.tsx index 2ad79932b..ceebd3493 100644 --- a/frontend/src/hooks/api/secretApproval/mutation.tsx +++ b/frontend/src/hooks/api/secretApproval/mutation.tsx @@ -9,7 +9,15 @@ export const useCreateSecretApprovalPolicy = () => { const queryClient = useQueryClient(); return useMutation<{}, {}, TCreateSecretPolicyDTO>({ - mutationFn: async ({ environment, workspaceId, approvals, approvers, secretPath, name, enforcementLevel }) => { + mutationFn: async ({ + environment, + workspaceId, + approvals, + approvers, + secretPath, + name, + enforcementLevel + }) => { const { data } = await apiRequest.post("/api/v1/secret-approvals", { environment, workspaceId, diff --git a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx index b9b0523ee..24a470bcc 100644 --- a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx +++ b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx @@ -45,11 +45,11 @@ const formSchema = z name: z.string().optional(), secretPath: z.string().optional(), approvals: z.number().min(1), - approverUserIds: z.string().array().min(1), + approvers: z.string().array().min(1), policyType: z.nativeEnum(PolicyType), enforcementLevel: z.nativeEnum(EnforcementLevel) }) - .refine((data) => data.approvals <= data.approverUserIds.length, { + .refine((data) => data.approvals <= data.approvers.length, { path: ["approvals"], message: "The number of approvals should be lower than the number of approvers." }); @@ -75,8 +75,7 @@ export const AccessPolicyForm = ({ ? { ...editValues, environment: editValues.environment.slug, - approverUserIds: - editValues?.userApprovers?.map((user) => user.userId) || editValues?.approvers + approvers: editValues?.userApprovers?.map((user) => user.userId) || editValues?.approvers } : undefined }); @@ -264,7 +263,7 @@ export const AccessPolicyForm = ({ /> (