From 3cc4f0b416075d2e3be2c36bab5ccce0501a4a99 Mon Sep 17 00:00:00 2001 From: "pramod.mahajan" Date: Fri, 10 Oct 2025 14:15:30 +0530 Subject: [PATCH] mismatch service api fixed --- src/components/Project/AssignTask.jsx | 3 ++- src/components/Project/Team/TeamEmployeeList.jsx | 5 +++-- src/hooks/useOrganization.js | 2 +- src/hooks/useProjects.js | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/Project/AssignTask.jsx b/src/components/Project/AssignTask.jsx index 8c8aab22..8b5dee80 100644 --- a/src/components/Project/AssignTask.jsx +++ b/src/components/Project/AssignTask.jsx @@ -12,6 +12,7 @@ import showToast from "../../services/toastService"; import { useEmployeeForTaskAssign, useProjectAssignedOrganizations, + useProjectAssignedServices, useProjectDetails, } from "../../hooks/useProjects"; import eventBus from "../../services/eventBus"; @@ -95,7 +96,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { }, []); const selectedProject = useSelectedProject(); - const { data: serviceList, isLoading: isServiceLoading } = useServices(); + const { data: serviceList, isLoading: isServiceLoading } = useProjectAssignedServices(selectedProject); const { data: organizationList, isLoading: isOrgLoading } = useProjectAssignedOrganizations(selectedProject); const { data: employees, isLoading: isEmployeeLoading } = diff --git a/src/components/Project/Team/TeamEmployeeList.jsx b/src/components/Project/Team/TeamEmployeeList.jsx index a800df3f..4ce995c9 100644 --- a/src/components/Project/Team/TeamEmployeeList.jsx +++ b/src/components/Project/Team/TeamEmployeeList.jsx @@ -6,6 +6,7 @@ import { useOrganizationEmployees } from "../../../hooks/useOrganization"; import { useEmployeesByProjectAllocated, useManageProjectAllocation, + useProjectAssignedServices, } from "../../../hooks/useProjects"; import useMaster, { useServices } from "../../../hooks/masterHook/useMaster"; import showToast from "../../../services/toastService"; @@ -29,7 +30,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => { useEmployeesByProjectAllocated(selectedProject, null); const { data: jobRoles } = useMaster(); - const { data: services } = useServices(); + const { data: services } = useProjectAssignedServices(selectedProject); const [employees, setEmployees] = useState([]); @@ -187,7 +188,7 @@ if (employees.length === 0) { }`} > - {services?.data?.map((s) => ( + {services?.map((s) => ( diff --git a/src/hooks/useOrganization.js b/src/hooks/useOrganization.js index e99d8ccb..ca356936 100644 --- a/src/hooks/useOrganization.js +++ b/src/hooks/useOrganization.js @@ -139,7 +139,7 @@ export const useAssignOrgToProject = (onSuccessCallback) => { queryKey: ["projectAssignedOrganiztions"], }); useClient.invalidateQueries({ - queryKey: ["projectAssignedOrganization", projectId], + queryKey: ["projectAssignedServices", projectId], }); showToast("Organization successfully", "success"); if (onSuccessCallback) onSuccessCallback(); diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index 9f5c48b9..803f17b7 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -296,7 +296,7 @@ export const useProjectAssignedOrganizations = (projectId) => { }; export const useProjectAssignedServices = (projectId) => { return useQuery({ - queryKey: ["projectAssignedOrganization", projectId], + queryKey: ["projectAssignedServices", projectId], queryFn: async () => { const resp = await ProjectRepository.getProjectAssignedServices( projectId