From 67bb685d4b575ca257ec4929e8735888120a19f2 Mon Sep 17 00:00:00 2001 From: "pramod.mahajan" Date: Sat, 11 Oct 2025 16:55:22 +0530 Subject: [PATCH] added new api for orgaization dropdown --- src/components/Project/AssignTask.jsx | 4 ++-- src/components/Project/Infrastructure/TaskModel.jsx | 4 ++-- src/components/Project/Team/TeamEmployeeList.jsx | 4 ++-- src/hooks/useProjects.js | 12 ++++++++++++ src/pages/Activities/AttendancePage.jsx | 4 ++-- src/repositories/ProjectRepository.jsx | 2 ++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/components/Project/AssignTask.jsx b/src/components/Project/AssignTask.jsx index 187b1cc0..4f06624d 100644 --- a/src/components/Project/AssignTask.jsx +++ b/src/components/Project/AssignTask.jsx @@ -11,7 +11,7 @@ import { TasksRepository } from "../../repositories/ProjectRepository"; import showToast from "../../services/toastService"; import { useEmployeeForTaskAssign, - useProjectAssignedOrganizations, + useProjectAssignedOrganizationsName, useProjectAssignedServices, useProjectDetails, } from "../../hooks/useProjects"; @@ -98,7 +98,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { const selectedProject = useSelectedProject(); const { data: serviceList, isLoading: isServiceLoading } = useProjectAssignedServices(selectedProject); const { data: organizationList, isLoading: isOrgLoading } = - useProjectAssignedOrganizations(selectedProject); + useProjectAssignedOrganizationsName(selectedProject); const { data: employees, isLoading: isEmployeeLoading } = useEmployeeForTaskAssign( selectedProject, diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx index fbf84110..dfc73267 100644 --- a/src/components/Project/Infrastructure/TaskModel.jsx +++ b/src/components/Project/Infrastructure/TaskModel.jsx @@ -8,7 +8,7 @@ import { useGroups, useWorkCategoriesMaster, } from "../../../hooks/masterHook/useMaster"; -import { useManageTask, useProjectAssignedOrganizations, useProjectAssignedServices } from "../../../hooks/useProjects"; +import { useManageTask, useProjectAssignedOrganizationsName, useProjectAssignedServices } from "../../../hooks/useProjects"; import showToast from "../../../services/toastService"; import Label from "../../common/Label"; import { useSelectedProject } from "../../../slices/apiDataManager"; @@ -47,7 +47,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => { const projectId = useSelectedProject(); const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId); - const { data: assignedOrganizations, isLoading: orgLoading } = useProjectAssignedOrganizations(projectId); + const { data: assignedOrganizations, isLoading: orgLoading } = useProjectAssignedOrganizationsName(projectId); diff --git a/src/components/Project/Team/TeamEmployeeList.jsx b/src/components/Project/Team/TeamEmployeeList.jsx index 4ce995c9..910ea4f8 100644 --- a/src/components/Project/Team/TeamEmployeeList.jsx +++ b/src/components/Project/Team/TeamEmployeeList.jsx @@ -2,10 +2,10 @@ import React, { useState, useEffect } from "react"; import Avatar from "../../common/Avatar"; import { useDebounce } from "../../../utils/appUtils"; import { useSelectedProject } from "../../../slices/apiDataManager"; -import { useOrganizationEmployees } from "../../../hooks/useOrganization"; import { useEmployeesByProjectAllocated, useManageProjectAllocation, + useProjectAssignedOrganizationsName, useProjectAssignedServices, } from "../../../hooks/useProjects"; import useMaster, { useServices } from "../../../hooks/masterHook/useMaster"; @@ -20,7 +20,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => { isLoading, isError, error, - } = useOrganizationEmployees( + } = useProjectAssignedOrganizationsName( selectedProject, organizationId, debounceSearchTerm diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index 803f17b7..d540a3ce 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -294,6 +294,18 @@ export const useProjectAssignedOrganizations = (projectId) => { enabled: !!projectId, }); }; +export const useProjectAssignedOrganizationsName = (projectId) => { + return useQuery({ + queryKey: ["projectAssignedOrganiztionsName", projectId], + queryFn: async () => { + const resp = await ProjectRepository.getProjectAssignedOrganizationsName( + projectId + ); + return resp.data; + }, + enabled: !!projectId, + }); +}; export const useProjectAssignedServices = (projectId) => { return useQuery({ queryKey: ["projectAssignedServices", projectId], diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index e07be1f5..6ea212b7 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -17,7 +17,7 @@ import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { REGULARIZE_ATTENDANCE } from "../../utils/constants"; import eventBus from "../../services/eventBus"; import { - useProjectAssignedOrganizations, + useProjectAssignedOrganizationsName, useProjectName, } from "../../hooks/useProjects"; import GlobalModel from "../../components/common/GlobalModel"; @@ -47,7 +47,7 @@ const AttendancePage = () => { }); const { data: organizations = [], isLoading: orgLoading } = - useProjectAssignedOrganizations(selectedProject); + useProjectAssignedOrganizationsName(selectedProject); const [formData, setFormData] = useState({ markTime: "", diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx index 2daf73fd..8f21acb4 100644 --- a/src/repositories/ProjectRepository.jsx +++ b/src/repositories/ProjectRepository.jsx @@ -85,6 +85,8 @@ const ProjectRepository = { api.get(`/api/Project/get/assigned/services/${projectId}`), getProjectAssignedOrganizations: (projectId) => api.get(`/api/Project/get/assigned/organization/${projectId}`), + getProjectAssignedOrganizationsName: (projectId) => + api.get(`/api/Project/get/assigned/organization/dropdown/${projectId}`), getEmployeeForTaskAssign: (projectId, serviceId, organizationId) => { let url = `/api/Project/get/task/team/${projectId}`;