From ea219b717696cf618678abaa53789f73ea1f074d Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 15:03:25 +0530
Subject: [PATCH 1/4] Adding Services Dropdown in Infrastructure.

---
 src/components/Project/ProjectInfra.jsx | 124 ++++++++++++++----------
 1 file changed, 72 insertions(+), 52 deletions(-)

diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 38c05567..c99b08c9 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -21,18 +21,17 @@ import { useProjectDetails, useProjectInfra } from "../../hooks/useProjects";
 import { useDispatch, useSelector } from "react-redux";
 import { refreshData } from "../../slices/localVariablesSlice";
 import eventBus from "../../services/eventBus";
-import {useParams} from "react-router-dom";
+import { useParams } from "react-router-dom";
 import GlobalModel from "../common/GlobalModel";
 
-const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
-{
+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( [] );
-   const {projectInfra,isLoading,error} = useProjectInfra(projectId)
+  const [expandedBuildings, setExpandedBuildings] = useState([]);
+  const { projectInfra, isLoading, error } = useProjectInfra(projectId)
   const { projects_Details, refetch, loading } = useProjectDetails(data?.id);
-  const [ project, setProject ] = useState( projects_Details );
+  const [project, setProject] = useState(projects_Details);
   const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
   const ManageTask = useHasUserPermission(MANAGE_TASK)
   const [showModalFloor, setshowModalFloor] = useState(false);
@@ -58,29 +57,29 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
 
   return (
     <>
-      {showModalBuilding && <GlobalModel isOpen={showModalBuilding} size="md" closeModal={() => setshowModalBuilding( false )}>
+      {showModalBuilding && <GlobalModel isOpen={showModalBuilding} size="md" closeModal={() => setshowModalBuilding(false)}>
         <BuildingModel
           project={projectInfra}
-          onClose={() => setshowModalBuilding( false )}
+          onClose={() => setshowModalBuilding(false)}
         />
-      </GlobalModel>} 
-      {showModalFloor && <GlobalModel isOpen={showModalFloor} size="md" closeModal={()=>setshowModalFloor(false)}>
+      </GlobalModel>}
+      {showModalFloor && <GlobalModel isOpen={showModalFloor} size="md" closeModal={() => setshowModalFloor(false)}>
         <FloorModel
-            project={projectInfra}
-            onClose={()=>setshowModalFloor(false)}
-          />
+          project={projectInfra}
+          onClose={() => setshowModalFloor(false)}
+        />
       </GlobalModel>}
-      {showModalWorkArea && <GlobalModel isOpen={showModalWorkArea} size="lg" closeModal={()=>setshowModalWorkArea(false)} >
-          <WorkAreaModel
-            project={projectInfra}
-            onClose={()=>setshowModalWorkArea(false)}
-          />
+      {showModalWorkArea && <GlobalModel isOpen={showModalWorkArea} size="lg" closeModal={() => setshowModalWorkArea(false)} >
+        <WorkAreaModel
+          project={projectInfra}
+          onClose={() => setshowModalWorkArea(false)}
+        />
       </GlobalModel>}
-      {showModalTask && ( <GlobalModel isOpen={showModalTask} size="lg" closeModal={()=>setshowModalTask(false)}>
+      {showModalTask && (<GlobalModel isOpen={showModalTask} size="lg" closeModal={() => setshowModalTask(false)}>
         <TaskModel
-            project={projectInfra}
-            onClose={()=>setshowModalTask(false)}
-          />
+          project={projectInfra}
+          onClose={() => setshowModalTask(false)}
+        />
       </GlobalModel>)}
       <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
         <div className="card">
@@ -88,38 +87,59 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
             <div className="align-items-center">
               <div className="row ">
                 <div
-                  className={`col-12 text-end mb-1 `}
+                  className="dataTables_length text-start py-2 px-6 col-md-4 col-12"
+                  id="DataTables_Table_0_length"
                 >
-                  {ManageInfra && (<>
-                    <button
-                    type="button"
-                    className="link-button btn btn-xs rounded-md link-button-sm m-1 btn-primary"
-                    onClick={()=>setshowModalBuilding(true)}
-                  >
-                   <i className="bx bx-plus-circle me-2"></i>
-                    Manage Building
-                  </button>
-                  <button
-                    type="button"
-                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
-                    onClick={()=>setshowModalFloor(true)}
-                  >
-                    <i className="bx bx-plus-circle me-2"></i>
-                    Manage Floors
-                  </button>
-                  <button
-                    type="button"
-                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
-                    onClick={() => setshowModalWorkArea(true)}
-                  >
-                    <i className="bx bx-plus-circle me-2"></i>
-                    Manage Work Areas
-                  </button></>)}
-                
+                  <label>
+                    <select
+                      name="DataTables_Table_0_length"
+                      aria-controls="DataTables_Table_0"
+                      className="form-select form-select-sm"
+                      aria-label="Select Service"
+                      defaultValue="Fire-Fitting"
+                    // onChange={handleServiceChange}
+                    >
+                      <option value="Fire-Fitting">Fire-Fitting</option>
+                      <option value="Welding">Welding</option>
+                      <option value="Plumbing">Plumbing</option>
+                      <option value="Electrical">Electrical</option>
+                    </select>
+                  </label>
+                </div>
+
+                {/* Buttons Section (aligned to right) */}
+                <div className="col-md-8 col-12 text-end mb-1">
+                  {ManageInfra && (
+                    <>
+                      <button
+                        type="button"
+                        className="link-button btn btn-xs rounded-md link-button-sm m-1 btn-primary"
+                        onClick={() => setshowModalBuilding(true)}
+                      >
+                        <i className="bx bx-plus-circle me-2"></i>
+                        Manage Building
+                      </button>
+                      <button
+                        type="button"
+                        className="link-button btn btn-xs rounded-md m-1 btn-primary"
+                        onClick={() => setshowModalFloor(true)}
+                      >
+                        <i className="bx bx-plus-circle me-2"></i>
+                        Manage Floors
+                      </button>
+                      <button
+                        type="button"
+                        className="link-button btn btn-xs rounded-md m-1 btn-primary"
+                        onClick={() => setshowModalWorkArea(true)}
+                      >
+                        <i className="bx bx-plus-circle me-2"></i>
+                        Manage Work Areas
+                      </button></>)}
+
                   {(ManageTask || ManageInfra) && (<button
                     type="button"
                     className="link-button btn btn-xs rounded-md m-1 btn-primary"
-                    onClick={()=>setshowModalTask(true)}
+                    onClick={() => setshowModalTask(true)}
                   >
                     <i className="bx bx-plus-circle me-2"></i>
                     Create Tasks
@@ -132,8 +152,8 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
                   <InfraTable
                     buildings={projectInfra}
                     projectId={projectId}
-                    // handleFloor={submitData}
-                    // signalRHandler ={signalRHandler}
+                  // handleFloor={submitData}
+                  // signalRHandler ={signalRHandler}
                   />
                 )}
                 {!isLoading && projectInfra?.length == 0 && <div className="mt-5"><p>No Infra Avaiable</p></div>}

From e154bac64a0ddadb36fc1377af6d8d1a5b726dc1 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 15:54:29 +0530
Subject: [PATCH 2/4] Calling api for services dropdwon.

---
 src/components/Project/ProjectInfra.jsx | 31 +++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index c99b08c9..38821a6a 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -17,7 +17,7 @@ import {
   getCachedData,
   useSelectedProject,
 } from "../../slices/apiDataManager";
-import { useProjectDetails, useProjectInfra } from "../../hooks/useProjects";
+import { useProjectAssignedServices, useProjectDetails, useProjectInfra } from "../../hooks/useProjects";
 import { useDispatch, useSelector } from "react-redux";
 import { refreshData } from "../../slices/localVariablesSlice";
 import eventBus from "../../services/eventBus";
@@ -39,18 +39,17 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
   const [showModalTask, setshowModalTask] = useState(false);
   const [showModalBuilding, setshowModalBuilding] = useState(false);
   const dispatch = useDispatch();
+  const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId);
+
+  const [selectedService, setSelectedService] = useState("");
+  const handleServiceChange = (e) => {
+    setSelectedService(e.target.value);
+  };
 
   useEffect(() => {
     setProject(projectInfra);
   }, [data, projects_Details]);
 
-  // useEffect(() => {
-  //   if (reloadedData) {
-  //     refetch();
-  //     dispatch(refreshData(false));
-  //   }
-  // }, [reloadedData]);
-
   const signalRHandler = (response) => {
     setProject(response);
   }
@@ -96,17 +95,19 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
                       aria-controls="DataTables_Table_0"
                       className="form-select form-select-sm"
                       aria-label="Select Service"
-                      defaultValue="Fire-Fitting"
-                    // onChange={handleServiceChange}
+                      value={selectedService}
+                      onChange={handleServiceChange}
                     >
-                      <option value="Fire-Fitting">Fire-Fitting</option>
-                      <option value="Welding">Welding</option>
-                      <option value="Plumbing">Plumbing</option>
-                      <option value="Electrical">Electrical</option>
+                   
+                      {servicesLoading && <option>Loading...</option>}
+                      {assignedServices?.map((service) => (
+                        <option key={service.id} value={service.id}>
+                          {service.name}
+                        </option>
+                      ))}
                     </select>
                   </label>
                 </div>
-
                 {/* Buttons Section (aligned to right) */}
                 <div className="col-md-8 col-12 text-end mb-1">
                   {ManageInfra && (

From 1ef82ad0b261de5ee32a44bca7577f77d5b8cd1b Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 19:20:01 +0530
Subject: [PATCH 3/4] Only 1 project or no project is assigned then dropdown
 will be hide.

---
 src/components/Project/ProjectInfra.jsx | 53 +++++++++++++++++--------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 38821a6a..86195381 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -89,24 +89,43 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
                   className="dataTables_length text-start py-2 px-6 col-md-4 col-12"
                   id="DataTables_Table_0_length"
                 >
-                  <label>
-                    <select
-                      name="DataTables_Table_0_length"
-                      aria-controls="DataTables_Table_0"
-                      className="form-select form-select-sm"
-                      aria-label="Select Service"
-                      value={selectedService}
-                      onChange={handleServiceChange}
+                  {servicesLoading ? (
+                    <span>Loading...</span>
+                  ) : assignedServices?.length > 1 ? (
+                    <label>
+                      <select
+                        name="DataTables_Table_0_length"
+                        aria-controls="DataTables_Table_0"
+                        className="form-select form-select-sm"
+                        aria-label="Select Service"
+                        value={selectedService}
+                        onChange={handleServiceChange}
+                      >
+                        {assignedServices.map((service) => (
+                          <option key={service.id} value={service.id}>
+                            {service.name}
+                          </option>
+                        ))}
+                      </select>
+                    </label>
+                  ) : (
+                    <div
+                      style={{
+                        fontSize: "0.875rem",
+                        height: "32px",
+                        width: "190px",
+                        border: "1px solid #ced4da",
+                        borderRadius: "0.25rem",
+                        padding: "4px 8px",
+                        display: "flex",
+                        alignItems: "center",
+                      }}
                     >
-                   
-                      {servicesLoading && <option>Loading...</option>}
-                      {assignedServices?.map((service) => (
-                        <option key={service.id} value={service.id}>
-                          {service.name}
-                        </option>
-                      ))}
-                    </select>
-                  </label>
+                      {assignedServices?.length === 1
+                        ? assignedServices[0].name
+                        : "No service available"}
+                    </div>
+                  )}
                 </div>
                 {/* Buttons Section (aligned to right) */}
                 <div className="col-md-8 col-12 text-end mb-1">

From 994f22e8c0404cb0a08ffe6f17639cec1b428d75 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 20 Sep 2025 11:29:29 +0530
Subject: [PATCH 4/4] Changes in Infrastructure service dropdown.

---
 .../Project/Infrastructure/InfraTable.jsx           |  2 +-
 src/components/Project/ProjectInfra.jsx             | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx
index fb484f6e..77c6f905 100644
--- a/src/components/Project/Infrastructure/InfraTable.jsx
+++ b/src/components/Project/Infrastructure/InfraTable.jsx
@@ -143,7 +143,7 @@ const InfraTable = ({ buildings, projectId}) => {
   // }, [handler]);
 
   return (
-    <div>
+    <div className="px-6">
       {projectBuilding && projectBuilding.length > 0 && (
         <table className="table table-bordered">
           <tbody>
diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 86195381..0669c136 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -90,7 +90,7 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
                   id="DataTables_Table_0_length"
                 >
                   {servicesLoading ? (
-                    <span>Loading...</span>
+                    <span></span>
                   ) : assignedServices?.length > 1 ? (
                     <label>
                       <select
@@ -111,18 +111,11 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
                   ) : (
                     <div
                       style={{
-                        fontSize: "0.875rem",
-                        height: "32px",
-                        width: "190px",
-                        border: "1px solid #ced4da",
-                        borderRadius: "0.25rem",
-                        padding: "4px 8px",
-                        display: "flex",
-                        alignItems: "center",
+                        
                       }}
                     >
                       {assignedServices?.length === 1
-                        ? assignedServices[0].name
+                        ? <h5>{ assignedServices[0].name}</h5>
                         : "No service available"}
                     </div>
                   )}