From 6a1d5149da8c574d8f57df5110104897dacb414a Mon Sep 17 00:00:00 2001 From: Sonika Date: Mon, 1 Jan 2024 11:49:36 +0530 Subject: [PATCH] filter data integration issue fixed --- src/APIs/ProjectScreenAPIs/getProject.tsx | 2 +- src/components/projects/Projects.tsx | 47 +++++++++++++++-------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/APIs/ProjectScreenAPIs/getProject.tsx b/src/APIs/ProjectScreenAPIs/getProject.tsx index 732495c..41ad77d 100644 --- a/src/APIs/ProjectScreenAPIs/getProject.tsx +++ b/src/APIs/ProjectScreenAPIs/getProject.tsx @@ -1,7 +1,7 @@ import {useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; export const getProjectList = async(searchBy:any)=>{ - const response = await fetch(`${process.env.REACT_APP_API_URL}/project-list?searchBy=`); + const response = await fetch(`${process.env.REACT_APP_API_URL}/project-list?searchBy=${searchBy}`); const projectListData = await response.json() return projectListData; } diff --git a/src/components/projects/Projects.tsx b/src/components/projects/Projects.tsx index 04c81e9..8f39c39 100644 --- a/src/components/projects/Projects.tsx +++ b/src/components/projects/Projects.tsx @@ -16,26 +16,39 @@ export default function Projects(){ const [searchByFilter, setSearchByFilter] = useState(''); const [searchByFilterOnBlur, setSearchByFilterOnBlur] = useState(''); const { data: getProjectDataList, isLoading, isError } = useGetProjectDataRQ(searchByFilter); - - useEffect(()=>{ - if(selectedContractFilter=='All'){ - setContractFilterResponseData(getProjectList(searchByFilter)) - } - else if (selectedContractFilter=='linked'){ - setContractFilterResponseData(getLinkedProjectList(searchByFilter)) - } - else if (selectedContractFilter=='unlinked'){ - setContractFilterResponseData(getUnlinkedProjects(searchByFilter)) - } - else if (selectedContractFilter=='published'){ - setContractFilterResponseData(getPublishedProjects(searchByFilter)) - } - },[selectedContractFilter,searchByFilter]) + + useEffect(() => { + const fetchData = async () => { + try { + if (selectedContractFilter === 'All') { + const data = await getProjectList(searchByFilter); + setContractFilterResponseData(data); + } else if (selectedContractFilter === 'linked') { + const data = await getLinkedProjectList(searchByFilter); + setContractFilterResponseData(data); + } else if (selectedContractFilter === 'unlinked') { + const data = await getUnlinkedProjects(searchByFilter); + setContractFilterResponseData(data); + } else if (selectedContractFilter === 'published') { + const data = await getPublishedProjects(searchByFilter); + setContractFilterResponseData(data); + } + } catch (error) { + console.error('Error fetching data:', error); + } + }; + + fetchData(); + }, [selectedContractFilter, searchByFilter]); + if (isLoading) { return
Loading...
; } - console.log(ContractFilterResponseData,getProjectDataList,"sdkhhskdjgh",selectedContractFilter) + + // const { foo, bar } = await ContractFilterResponseData.then((result:any) => result.data); + + console.log(ContractFilterResponseData,"hsdfgjdgf") return( <> @@ -107,7 +120,7 @@ export default function Projects(){ - + ) } \ No newline at end of file