From afcd1934f906179c87bb337dba9ffd771de816bb Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Sun, 21 Sep 2025 15:10:31 +0530 Subject: [PATCH] Integrate the API for Work Area and fetch data filtered by serviceId. --- .../Project/Infrastructure/Floor.jsx | 3 +- .../Project/Infrastructure/InfraTable.jsx | 5 +- .../Project/Infrastructure/WorkArea.jsx | 5 +- src/components/Project/ProjectInfra.jsx | 58 ++++++++----------- src/hooks/useProjects.js | 23 ++++---- src/repositories/ProjectRepository.jsx | 11 +++- 6 files changed, 50 insertions(+), 55 deletions(-) diff --git a/src/components/Project/Infrastructure/Floor.jsx b/src/components/Project/Infrastructure/Floor.jsx index 2ee5d84b..0f7f00f7 100644 --- a/src/components/Project/Infrastructure/Floor.jsx +++ b/src/components/Project/Infrastructure/Floor.jsx @@ -1,6 +1,6 @@ import React from "react"; import WorkArea from "./WorkArea"; -const Floor = ({ floor, workAreas, forBuilding }) => { +const Floor = ({ floor, workAreas, forBuilding,serviceId }) => { return ( {workAreas && workAreas.length > 0 ? ( @@ -10,6 +10,7 @@ const Floor = ({ floor, workAreas, forBuilding }) => { key={workArea.id} workArea={workArea} floor={floor} + serviceId={serviceId} /> )) ) : ( diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx index 77c6f905..3805857f 100644 --- a/src/components/Project/Infrastructure/InfraTable.jsx +++ b/src/components/Project/Infrastructure/InfraTable.jsx @@ -11,7 +11,7 @@ import { getCachedData, } from "../../../slices/apiDataManager"; -const InfraTable = ({ buildings, projectId}) => { +const InfraTable = ({ buildings, projectId, serviceId }) => { const [projectBuilding, setProjectBuilding] = useState([]); const [expandedBuildings, setExpandedBuildings] = useState([]); const [showFloorModal, setShowFloorModal] = useState(false); @@ -90,6 +90,7 @@ const InfraTable = ({ buildings, projectId}) => { forBuilding={building} floor={floor} workAreas={floor.workAreas} + serviceId={serviceId} /> )) ) : ( @@ -100,7 +101,7 @@ const InfraTable = ({ buildings, projectId}) => { No floors have been added yet. Start by adding floors to manage this building.

- + diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx index efc7c239..b6fc3e35 100644 --- a/src/components/Project/Infrastructure/WorkArea.jsx +++ b/src/components/Project/Infrastructure/WorkArea.jsx @@ -16,18 +16,17 @@ import { useParams } from "react-router-dom"; import ProgressBar from "../../common/ProgressBar"; import {formatNumber} from "../../../utils/dateUtils"; -const WorkArea = ({ workArea, floor, forBuilding }) => { +const WorkArea = ({ workArea, floor, forBuilding,serviceId = null }) => { const selectedProject = useSelector((store) => store.localVariables.projectId); const { projects_Details, loading } = useProjectDetails(selectedProject); const [IsExpandedArea, setIsExpandedArea] = useState(false); const dispatch = useDispatch(); const [Project, setProject] = useState(); - // const { projectId } = useParams(); const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA); const ManageAndAssignTak = useHasUserPermission(ASSIGN_REPORT_TASK); - const { ProjectTaskList, isLoading } = useProjectTasks(workArea.id, IsExpandedArea); + const { ProjectTaskList, isLoading } = useProjectTasks(workArea.id,serviceId, IsExpandedArea); const [workAreaStatus, setWorkAreaStatus] = useState({ completed: 0, diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx index 08ea6e3a..cd7fafbc 100644 --- a/src/components/Project/ProjectInfra.jsx +++ b/src/components/Project/ProjectInfra.jsx @@ -25,7 +25,6 @@ import { useParams } from "react-router-dom"; import GlobalModel from "../common/GlobalModel"; const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => { - // const projectId = useSelector((store)=>store.localVariables.projectId) const projectId = useSelectedProject(); const reloadedData = useSelector((store) => store.localVariables.reload); const [expandedBuildings, setExpandedBuildings] = useState([]); @@ -89,37 +88,31 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => { className="dataTables_length text-start py-2 px-6 col-md-4 col-12" id="DataTables_Table_0_length" > - {servicesLoading ? ( - - ) : assignedServices?.length > 1 ? ( - - ) : ( -
- {assignedServices?.length === 1 - ?
{ assignedServices[0].name}
- : "No service available"} -
+ {!servicesLoading && assignedServices?.length > 0 && ( + assignedServices.length > 1 ? ( + + ) : ( +
{assignedServices[0].name}
+ ) )} + {/* Buttons Section (aligned to right) */}
{ManageInfra && ( @@ -162,11 +155,10 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
{isLoading &&

Loading....

} {projectInfra && projectInfra?.length > 0 && ( - )} {!isLoading && projectInfra?.length == 0 &&

No Infra Avaiable

} diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index e418499d..2c7e0f61 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -202,23 +202,20 @@ export const useProjectInfra = (projectId) => { return { projectInfra, isLoading, error, isFetched }; }; -export const useProjectTasks = (workAreaId, IsExpandedArea = false) => { - const { - data: ProjectTaskList, - isLoading, - error, - } = useQuery({ - queryKey: ["WorkItems", workAreaId], +export const useProjectTasks = (workAreaId, serviceId = null, isExpandedArea = false) => { + const { data, isLoading, error } = useQuery({ + queryKey: ["WorkItems", workAreaId, serviceId], queryFn: async () => { - const res = await ProjectRepository.getProjectTasksByWorkArea(workAreaId); - return res.data; + const res = await ProjectRepository.getProjectTasksByWorkArea(workAreaId, serviceId); + return res.data; // return actual task list }, - enabled: !!workAreaId && !!IsExpandedArea, - onError: (error) => { - showToast(error.message || "Error while Fetching project Tasks", "error"); + enabled: !!workAreaId && isExpandedArea, // only fetch if workAreaId exists and area is expanded + onError: (err) => { + showToast(err.message || "Error while fetching project tasks", "error"); }, }); - return { ProjectTaskList, isLoading, error }; + + return { ProjectTaskList: data, isLoading, error }; }; export const useProjectTasksByEmployee = (employeeId, fromDate, toDate) => { diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx index 113bd627..8f5ece39 100644 --- a/src/repositories/ProjectRepository.jsx +++ b/src/repositories/ProjectRepository.jsx @@ -24,7 +24,6 @@ const ProjectRepository = { api.get(`/api/Project/employees/get/${projectId}`), manageProject: (data) => api.post("/api/project", data), - // updateProject: (data) => api.post("/api/project/update", data), manageProjectAllocation: (data) => api.post("/api/project/allocation", data), @@ -44,13 +43,19 @@ const ProjectRepository = { getProjectDetails: (id) => api.get(`/api/project/details/${id}`), getProjectInfraByproject: (id) => api.get(`/api/project/infra-details/${id}`), - getProjectTasksByWorkArea: (id) => api.get(`/api/project/tasks/${id}`), + getProjectTasksByWorkArea: (workAreaId, serviceId) => { + let url = `/api/project/tasks/${workAreaId}`; + if (serviceId) { + url += `?serviceId=${serviceId}`; + } + + return api.get(url); + }, getProjectTasksByEmployee: (id, fromDate, toDate) => api.get( `/api/project/tasks-employee/${id}?fromDate=${fromDate}&toDate=${toDate}` ), - // Permission Managment for Employee at Project Level getProjectLevelEmployeeList: (projectId) => api.get(`/api/Project/get/proejct-level/employees/${projectId}`),