diff --git a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx index 0653a92e8..936e6b981 100644 --- a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx +++ b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx @@ -103,7 +103,7 @@ export const ApprovalPolicyList = ({ workspaceId }: IProps) => { const { currentWorkspace } = useWorkspace(); const { data: members } = useGetWorkspaceUsers(workspaceId, true); - const { data: groups } = useListWorkspaceGroups(currentWorkspace?.slug || ""); + const { data: groups } = useListWorkspaceGroups(currentWorkspace?.id || ""); const { policies, isLoading: isPoliciesLoading } = useApprovalPolicies( permission, @@ -270,6 +270,7 @@ export const ApprovalPolicyList = ({ workspaceId }: IProps) => { handlePopUpToggle("policyForm", isOpen)} diff --git a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx index b0ec53acc..37ba6abf2 100644 --- a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx +++ b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx @@ -35,6 +35,7 @@ type Props = { isOpen?: boolean; onToggle: (isOpen: boolean) => void; members?: TWorkspaceUser[]; + projectId: string; projectSlug: string; editValues?: TAccessApprovalPolicy; }; @@ -60,6 +61,7 @@ export const AccessPolicyForm = ({ isOpen, onToggle, members = [], + projectId, projectSlug, editValues }: Props) => { @@ -81,7 +83,7 @@ export const AccessPolicyForm = ({ : undefined }); const { currentWorkspace } = useWorkspace(); - const { data: groups } = useListWorkspaceGroups(projectSlug); + const { data: groups } = useListWorkspaceGroups(projectId); const environments = currentWorkspace?.environments || []; const isEditMode = Boolean(editValues); @@ -99,7 +101,7 @@ export const AccessPolicyForm = ({ const policyName = policyDetails[watch("policyType")]?.name || "Policy"; const handleCreatePolicy = async (data: TFormSchema) => { - if (!projectSlug) return; + if (!projectId) return; try { if (data.policyType === PolicyType.ChangePolicy) { @@ -128,7 +130,7 @@ export const AccessPolicyForm = ({ }; const handleUpdatePolicy = async (data: TFormSchema) => { - if (!projectSlug) return; + if (!projectId || !projectSlug) return; if (!editValues?.id) return; try {