awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2135 from Infisical/fix-identity-projects

Browse Source 
Fix Identity-Project Provisioning Modal — Filter Current Org Projects
This commit is contained in:
BlackMagiq
2024-07-16 14:59:41 +07:00
committed by GitHub
parent df3a87fabf 82bca03162
commit db7c0c45f6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/views/Org/IdentityPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
View File

@@ -5,7 +5,7 @@ import { z } from "zod";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2"; import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
import { useWorkspace } from "@app/context"; import { useOrganization,useWorkspace } from "@app/context";
import { import {
useAddIdentityToWorkspace, useAddIdentityToWorkspace,
useGetIdentityProjectMemberships, useGetIdentityProjectMemberships,
@@ -33,6 +33,7 @@ type Props = {
}; };
export const IdentityAddToProjectModal = ({ identityId, popUp, handlePopUpToggle }: Props) => { export const IdentityAddToProjectModal = ({ identityId, popUp, handlePopUpToggle }: Props) => {
const { currentOrg } = useOrganization();
const { workspaces } = useWorkspace(); const { workspaces } = useWorkspace();
const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace(); const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace();
@@ -58,7 +59,9 @@ export const IdentityAddToProjectModal = ({ identityId, popUp, handlePopUpToggle
wsWorkspaceIds.set(projectMembership.project.id, true); wsWorkspaceIds.set(projectMembership.project.id, true);
}); });
return (workspaces || []).filter(({ id }) => !wsWorkspaceIds.has(id)); return (workspaces || []).filter(
({ id, orgId }) => !wsWorkspaceIds.has(id) && orgId === currentOrg?.id
);
}, [workspaces, projectMemberships]); }, [workspaces, projectMemberships]);
const onFormSubmit = async ({ projectId: workspaceId, role }: FormData) => { const onFormSubmit = async ({ projectId: workspaceId, role }: FormData) => {