diff --git a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectCard.jsx b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectCard.jsx index 15533622..c59b4b4d 100644 --- a/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectCard.jsx +++ b/src/components/ServiceProject/ServiceProjectTeam/ServiceProjectCard.jsx @@ -68,7 +68,6 @@ const ServiceProjectCard = ({ project, isCore = true }) => { DeleteProject(projectId, false); }; - console.log("Kartik", project) return ( <> { +const ServiceProjectDisplay = ({ listView ,selectedStatuses }) => { const [currentPage, setCurrentPage] = useState(1); const { manageServiceProject, setManageServiceProject } = useProjectContext(); @@ -26,6 +26,9 @@ const ServiceProjectDisplay = ({ listView }) => { } }; + const filteredProjects = data?.data?.filter(project => + selectedStatuses.includes(project?.status?.id) + ); if (isLoading) return ( @@ -48,9 +51,10 @@ const ServiceProjectDisplay = ({ listView }) => { {listView ? (

List

) : ( - data?.data?.map((project) => ( + filteredProjects?.map((project) => ( )) + )}
diff --git a/src/pages/project/ProjectPage.jsx b/src/pages/project/ProjectPage.jsx index 7109ae07..ad2c3d80 100644 --- a/src/pages/project/ProjectPage.jsx +++ b/src/pages/project/ProjectPage.jsx @@ -190,19 +190,16 @@ const ProjectPage = () => { New Project )} - -
- - {coreProjects ? : } + handleStatusChange={handleStatusChange} /> : } );