added new api for orgaization dropdown

This commit is contained in:
pramod.mahajan 2025-10-11 16:55:22 +05:30
parent 8fd4e7f3f1
commit 67bb685d4b
6 changed files with 22 additions and 8 deletions

View File

@ -11,7 +11,7 @@ import { TasksRepository } from "../../repositories/ProjectRepository";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
import { import {
useEmployeeForTaskAssign, useEmployeeForTaskAssign,
useProjectAssignedOrganizations, useProjectAssignedOrganizationsName,
useProjectAssignedServices, useProjectAssignedServices,
useProjectDetails, useProjectDetails,
} from "../../hooks/useProjects"; } from "../../hooks/useProjects";
@ -98,7 +98,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
const selectedProject = useSelectedProject(); const selectedProject = useSelectedProject();
const { data: serviceList, isLoading: isServiceLoading } = useProjectAssignedServices(selectedProject); const { data: serviceList, isLoading: isServiceLoading } = useProjectAssignedServices(selectedProject);
const { data: organizationList, isLoading: isOrgLoading } = const { data: organizationList, isLoading: isOrgLoading } =
useProjectAssignedOrganizations(selectedProject); useProjectAssignedOrganizationsName(selectedProject);
const { data: employees, isLoading: isEmployeeLoading } = const { data: employees, isLoading: isEmployeeLoading } =
useEmployeeForTaskAssign( useEmployeeForTaskAssign(
selectedProject, selectedProject,

View File

@ -8,7 +8,7 @@ import {
useGroups, useGroups,
useWorkCategoriesMaster, useWorkCategoriesMaster,
} from "../../../hooks/masterHook/useMaster"; } from "../../../hooks/masterHook/useMaster";
import { useManageTask, useProjectAssignedOrganizations, useProjectAssignedServices } from "../../../hooks/useProjects"; import { useManageTask, useProjectAssignedOrganizationsName, useProjectAssignedServices } from "../../../hooks/useProjects";
import showToast from "../../../services/toastService"; import showToast from "../../../services/toastService";
import Label from "../../common/Label"; import Label from "../../common/Label";
import { useSelectedProject } from "../../../slices/apiDataManager"; import { useSelectedProject } from "../../../slices/apiDataManager";
@ -47,7 +47,7 @@ const TaskModel = ({ project, onSubmit, onClose }) => {
const projectId = useSelectedProject(); const projectId = useSelectedProject();
const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId); const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId);
const { data: assignedOrganizations, isLoading: orgLoading } = useProjectAssignedOrganizations(projectId); const { data: assignedOrganizations, isLoading: orgLoading } = useProjectAssignedOrganizationsName(projectId);

View File

@ -2,10 +2,10 @@ import React, { useState, useEffect } from "react";
import Avatar from "../../common/Avatar"; import Avatar from "../../common/Avatar";
import { useDebounce } from "../../../utils/appUtils"; import { useDebounce } from "../../../utils/appUtils";
import { useSelectedProject } from "../../../slices/apiDataManager"; import { useSelectedProject } from "../../../slices/apiDataManager";
import { useOrganizationEmployees } from "../../../hooks/useOrganization";
import { import {
useEmployeesByProjectAllocated, useEmployeesByProjectAllocated,
useManageProjectAllocation, useManageProjectAllocation,
useProjectAssignedOrganizationsName,
useProjectAssignedServices, useProjectAssignedServices,
} from "../../../hooks/useProjects"; } from "../../../hooks/useProjects";
import useMaster, { useServices } from "../../../hooks/masterHook/useMaster"; import useMaster, { useServices } from "../../../hooks/masterHook/useMaster";
@ -20,7 +20,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
isLoading, isLoading,
isError, isError,
error, error,
} = useOrganizationEmployees( } = useProjectAssignedOrganizationsName(
selectedProject, selectedProject,
organizationId, organizationId,
debounceSearchTerm debounceSearchTerm

View File

@ -294,6 +294,18 @@ export const useProjectAssignedOrganizations = (projectId) => {
enabled: !!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) => { export const useProjectAssignedServices = (projectId) => {
return useQuery({ return useQuery({
queryKey: ["projectAssignedServices", projectId], queryKey: ["projectAssignedServices", projectId],

View File

@ -17,7 +17,7 @@ import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { REGULARIZE_ATTENDANCE } from "../../utils/constants"; import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
import { import {
useProjectAssignedOrganizations, useProjectAssignedOrganizationsName,
useProjectName, useProjectName,
} from "../../hooks/useProjects"; } from "../../hooks/useProjects";
import GlobalModel from "../../components/common/GlobalModel"; import GlobalModel from "../../components/common/GlobalModel";
@ -47,7 +47,7 @@ const AttendancePage = () => {
}); });
const { data: organizations = [], isLoading: orgLoading } = const { data: organizations = [], isLoading: orgLoading } =
useProjectAssignedOrganizations(selectedProject); useProjectAssignedOrganizationsName(selectedProject);
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
markTime: "", markTime: "",

View File

@ -85,6 +85,8 @@ const ProjectRepository = {
api.get(`/api/Project/get/assigned/services/${projectId}`), api.get(`/api/Project/get/assigned/services/${projectId}`),
getProjectAssignedOrganizations: (projectId) => getProjectAssignedOrganizations: (projectId) =>
api.get(`/api/Project/get/assigned/organization/${projectId}`), api.get(`/api/Project/get/assigned/organization/${projectId}`),
getProjectAssignedOrganizationsName: (projectId) =>
api.get(`/api/Project/get/assigned/organization/dropdown/${projectId}`),
getEmployeeForTaskAssign: (projectId, serviceId, organizationId) => { getEmployeeForTaskAssign: (projectId, serviceId, organizationId) => {
let url = `/api/Project/get/task/team/${projectId}`; let url = `/api/Project/get/task/team/${projectId}`;