From a90aa77cf63bd486a10fff0e70011e20a644e5d6 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Fri, 9 May 2025 10:20:54 +0530 Subject: [PATCH] Provided proper parameter to employee list api for ont to include inactive employees --- src/components/Project/AssignRole.jsx | 2 +- src/components/Project/MapUsers.jsx | 2 +- src/hooks/useEmployees.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Project/AssignRole.jsx b/src/components/Project/AssignRole.jsx index dcee6784..a4f38386 100644 --- a/src/components/Project/AssignRole.jsx +++ b/src/components/Project/AssignRole.jsx @@ -40,7 +40,7 @@ const AssignRoleModel = ({ assignData, onClose }) => { const selectedProject = useSelector( (store) => store.localVariables.projectId ); - const { employees } = useEmployeesAllOrByProjectId(selectedProject); + const { employees } = useEmployeesAllOrByProjectId(selectedProject,false); const dispatch = useDispatch(); const { data, loading } = useMaster(); diff --git a/src/components/Project/MapUsers.jsx b/src/components/Project/MapUsers.jsx index 39624dfc..0a0fde44 100644 --- a/src/components/Project/MapUsers.jsx +++ b/src/components/Project/MapUsers.jsx @@ -14,7 +14,7 @@ const MapUsers = ({ assignedLoading, setAssignedLoading, }) => { - const { employeesList, loading: employeeLoading, error } = useAllEmployees(); + const { employeesList, loading: employeeLoading, error } = useAllEmployees(false); const [selectedEmployees, setSelectedEmployees] = useState([]); const [ searchText, setSearchText ] = useState( "" ); diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js index a80d8c8f..5aec3cf2 100644 --- a/src/hooks/useEmployees.js +++ b/src/hooks/useEmployees.js @@ -4,7 +4,7 @@ import { RolesRepository } from "../repositories/MastersRepository"; import EmployeeRepository from "../repositories/EmployeeRepository"; import ProjectRepository from "../repositories/ProjectRepository"; -export const useAllEmployees = () => { +export const useAllEmployees = (showInactive) => { const [employeesList, setEmployeeList] = useState([]); const [loading, setLoading] = useState(false); const [error, setError] = useState(); @@ -14,7 +14,7 @@ export const useAllEmployees = () => { let EmployeeList_cached = getCachedData("AllEmployees"); if (!EmployeeList_cached) { setLoading(true); - const response = await EmployeeRepository.getAllEmployeeList(); + const response = await EmployeeRepository.getAllEmployeeList(showInactive); cacheData("AllEmployees", response.data); setEmployeeList(response.data); setLoading(false);