Filteration using status in Services and Infra.
This commit is contained in:
parent
31d340c645
commit
1c2674d435
@ -68,7 +68,6 @@ const ServiceProjectCard = ({ project, isCore = true }) => {
|
|||||||
DeleteProject(projectId, false);
|
DeleteProject(projectId, false);
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log("Kartik", project)
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ConfirmModal
|
<ConfirmModal
|
||||||
|
|||||||
@ -12,7 +12,7 @@ import ManageServiceProject from "../../components/ServiceProject/ManageServiceP
|
|||||||
import { SpinnerLoader } from "../../components/common/Loader";
|
import { SpinnerLoader } from "../../components/common/Loader";
|
||||||
import ServiceProjectCard from "../../components/ServiceProject/ServiceProjectTeam/ServiceProjectCard";
|
import ServiceProjectCard from "../../components/ServiceProject/ServiceProjectTeam/ServiceProjectCard";
|
||||||
|
|
||||||
const ServiceProjectDisplay = ({ listView }) => {
|
const ServiceProjectDisplay = ({ listView ,selectedStatuses }) => {
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
const [currentPage, setCurrentPage] = useState(1);
|
||||||
|
|
||||||
const { manageServiceProject, setManageServiceProject } = useProjectContext();
|
const { manageServiceProject, setManageServiceProject } = useProjectContext();
|
||||||
@ -26,6 +26,9 @@ const ServiceProjectDisplay = ({ listView }) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const filteredProjects = data?.data?.filter(project =>
|
||||||
|
selectedStatuses.includes(project?.status?.id)
|
||||||
|
);
|
||||||
|
|
||||||
if (isLoading)
|
if (isLoading)
|
||||||
return (
|
return (
|
||||||
@ -48,9 +51,10 @@ const ServiceProjectDisplay = ({ listView }) => {
|
|||||||
{listView ? (
|
{listView ? (
|
||||||
<p>List</p>
|
<p>List</p>
|
||||||
) : (
|
) : (
|
||||||
data?.data?.map((project) => (
|
filteredProjects?.map((project) => (
|
||||||
<ServiceProjectCard project={project} isCore={false} />
|
<ServiceProjectCard project={project} isCore={false} />
|
||||||
))
|
))
|
||||||
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="col-12 d-flex justify-content-start mt-3">
|
<div className="col-12 d-flex justify-content-start mt-3">
|
||||||
|
|||||||
@ -190,19 +190,16 @@ const ProjectPage = () => {
|
|||||||
New Project
|
New Project
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{coreProjects ? <ProjectsDisplay listView={listView}
|
{coreProjects ? <ProjectsDisplay listView={listView}
|
||||||
searchTerm={searchTerm}
|
searchTerm={searchTerm}
|
||||||
selectedStatuses={selectedStatuses}
|
selectedStatuses={selectedStatuses}
|
||||||
handleStatusChange={handleStatusChange} /> : <ServiceProjectDisplay />}
|
handleStatusChange={handleStatusChange} /> : <ServiceProjectDisplay listView={listView}
|
||||||
|
selectedStatuses={selectedStatuses} />}
|
||||||
</div>
|
</div>
|
||||||
</ProjectContext.Provider>
|
</ProjectContext.Provider>
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user