diff --git a/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx b/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx index bf7c32e..419a2e6 100644 --- a/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx +++ b/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx @@ -1,7 +1,14 @@ import {useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; export const getLinkedProjectListCopy = async(searchBy:any)=>{ + try { const response = await fetch(`http://localhost:8080/SonyMusicRights/linked-project?searchBy=${searchBy}`); + if (!response.ok) { + throw new Error(`HTTP error! Status: ${response.status}`); + } const projectListData = await response.json() return projectListData; + }catch(error){ + console.error('Error fetching data:', error); + } } diff --git a/src/APIs/getProject.tsx b/src/APIs/getProject.tsx deleted file mode 100644 index a9858b1..0000000 --- a/src/APIs/getProject.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import {useQuery} from '@tanstack/react-query' - - -export const getProjectList = async()=>{ - const response = await fetch('http://localhost:8080/SonyMusicRights/project-list?searchBy='); - if (!response.ok) { - throw new Error('Failed to get project list data'); - } - const projectListData = await response.json() - return projectListData; -} - -export const useGetProjectData = () => { - return useQuery( - { - queryKey: ['Project-list'], - queryFn: getProjectList, - } - ); -} \ No newline at end of file diff --git a/src/APIs/getProjectRQ.tsx b/src/APIs/getProjectRQ.tsx new file mode 100644 index 0000000..1521842 --- /dev/null +++ b/src/APIs/getProjectRQ.tsx @@ -0,0 +1,40 @@ +/* import {useQuery} from '@tanstack/react-query' + + +export const getProjectList = async()=>{ + const response = await fetch('http://localhost:8080/SonyMusicRights/project-list?searchBy='); + if (!response.ok) { + throw new Error('Failed to get project list data'); + } + const projectListData = await response.json() + return projectListData; +} + +export const useGetProjectData = () => { + return useQuery( + { + queryKey: ['Project-list'], + queryFn: getProjectList, + } + ); +} */ + +import {useQuery} from '@tanstack/react-query' + +export const getProjectListRQ = async(searchBy: any)=>{ + const response = await fetch(`http://localhost:8080/SonyMusicRights/project-list?searchBy=${searchBy}`); + if (!response.ok) { + throw new Error('Failed to get project list data'); + } + const projectListData = await response.json() + return projectListData; +} + +export const useGetProjectDataRQ = (searchBy:any) => { + return useQuery( + { + queryKey: ['Project-list', searchBy], + queryFn: () => getProjectListRQ(searchBy), + } + ); +} diff --git a/src/components/projects/Projects.tsx b/src/components/projects/Projects.tsx index 6a8c933..3397aad 100644 --- a/src/components/projects/Projects.tsx +++ b/src/components/projects/Projects.tsx @@ -1,6 +1,6 @@ import React from "react"; import ProjectList from "./ProjectsList"; -import { useGetProjectData } from "../../APIs/getProject"; +import { useGetProjectDataRQ } from "../../APIs/getProjectRQ"; import { getProjectListCopy } from "../../APIs/ProjectScreenAPIs/getProject"; import { useState } from "react"; import { useEffect } from "react"; @@ -10,10 +10,10 @@ import { getPublishedProjects } from "../../APIs/ProjectScreenAPIs/getPublishedP import { getUnlinkedProjects } from "../../APIs/ProjectScreenAPIs/getUnlinkedProject"; export default function Projects(){ - const { data: getProjectDataList, isLoading, isError } = useGetProjectData(); const [selectedContractFilter, setSelectedContractFilter] = useState('All'); const [ContractFilterResponseData, setContractFilterResponseData] = useState(); const [searchByFilter, setSearchByFilter] = useState(''); + const { data: getProjectDataList, isLoading, isError } = useGetProjectDataRQ(searchByFilter); useEffect(()=>{ if(selectedContractFilter=='All'){ @@ -30,11 +30,10 @@ export default function Projects(){ } },[selectedContractFilter,searchByFilter]) - // console.log(ContractFilterResponseData,"sdkhhskdjgh",selectedContractFilter) - - if (isLoading){ - return

Loading...

+ if (isLoading) { + return
Loading...
; } + console.log(ContractFilterResponseData,getProjectDataList,"sdkhhskdjgh",selectedContractFilter) return( <>