synced/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2025-04-17 19:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2474 from meetcshah19/meet/fix-group-fetch

Browse Source 
fix: group fetch using project id
This commit is contained in:
Daniel Hougaard
2024-09-24 01:01:58 +04:00
committed by GitHub
parent dafb89d1dd 2469c8d0c6
commit 677a87150b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx
View File

@ -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) => {
</Table>
</TableContainer>
<AccessPolicyForm
projectId={currentWorkspace?.id!}
projectSlug={currentWorkspace?.slug!}
isOpen={popUp.policyForm.isOpen}
onToggle={(isOpen) => handlePopUpToggle("policyForm", isOpen)}

8
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
View File

@ -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 {