src/components/Project/Infrastructure/InfraTable.jsx

@@ -143,7 +143,7 @@ const InfraTable = ({ buildings, projectId}) => {
   // }, [handler]);
 
   return (
-    <div className="px-6">
+    <div>
       {projectBuilding && projectBuilding.length > 0 && (
         <table className="table table-bordered">
           <tbody>

src/components/Project/ProjectInfra.jsx

@@ -17,21 +17,22 @@ import {
   getCachedData,
   useSelectedProject,
 } from "../../slices/apiDataManager";
-import { useProjectAssignedServices, useProjectDetails, useProjectInfra } from "../../hooks/useProjects";
+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 [ expandedBuildings, setExpandedBuildings ] = useState( [] );
-  const { projectInfra, isLoading, error } = useProjectInfra(projectId)
+   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);
@@ -39,46 +40,47 @@ 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);
   }
 
   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>}
+      </GlobalModel>} 
-      {showModalFloor && <GlobalModel isOpen={showModalFloor} size="md" closeModal={() => setshowModalFloor(false)}>
+      {showModalFloor && <GlobalModel isOpen={showModalFloor} size="md" closeModal={()=>setshowModalFloor(false)}>
         <FloorModel
-          project={projectInfra}
+            project={projectInfra}
-          onClose={() => setshowModalFloor(false)}
+            onClose={()=>setshowModalFloor(false)}
-        />
+          />
       </GlobalModel>}
-      {showModalWorkArea && <GlobalModel isOpen={showModalWorkArea} size="lg" closeModal={() => setshowModalWorkArea(false)} >
+      {showModalWorkArea && <GlobalModel isOpen={showModalWorkArea} size="lg" closeModal={()=>setshowModalWorkArea(false)} >
-        <WorkAreaModel
+          <WorkAreaModel
-          project={projectInfra}
+            project={projectInfra}
-          onClose={() => setshowModalWorkArea(false)}
+            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}
+            project={projectInfra}
-          onClose={() => setshowModalTask(false)}
+            onClose={()=>setshowModalTask(false)}
-        />
+          />
       </GlobalModel>)}
       <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
         <div className="card">
@@ -86,73 +88,38 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
             <div className="align-items-center">
               <div className="row ">
                 <div
-                  className="dataTables_length text-start py-2 px-6 col-md-4 col-12"
+                  className={`col-12 text-end mb-1 `}
-                  id="DataTables_Table_0_length"
                 >
-                  {servicesLoading ? (
+                  {ManageInfra && (<>
-                    <span></span>
+                    <button
-                  ) : assignedServices?.length > 1 ? (
+                    type="button"
-                    <label>
+                    className="link-button btn btn-xs rounded-md link-button-sm m-1 btn-primary"
-                      <select
+                    onClick={()=>setshowModalBuilding(true)}
-                        name="DataTables_Table_0_length"
+                  >
-                        aria-controls="DataTables_Table_0"
+                   <i className="bx bx-plus-circle me-2"></i>
-                        className="form-select form-select-sm"
+                    Manage Building
-                        aria-label="Select Service"
+                  </button>
-                        value={selectedService}
+                  <button
-                        onChange={handleServiceChange}
+                    type="button"
-                      >
+                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
-                        {assignedServices.map((service) => (
+                    onClick={()=>setshowModalFloor(true)}
-                          <option key={service.id} value={service.id}>
+                  >
-                            {service.name}
+                    <i className="bx bx-plus-circle me-2"></i>
-                          </option>
+                    Manage Floors
-                        ))}
+                  </button>
-                      </select>
+                  <button
-                    </label>
+                    type="button"
-                  ) : (
+                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
-                    <div
+                    onClick={() => setshowModalWorkArea(true)}
-                      style={{
+                  >
-                        
+                    <i className="bx bx-plus-circle me-2"></i>
-                      }}
+                    Manage Work Areas
-                    >
+                  </button></>)}
-                      {assignedServices?.length === 1
+                
-                        ? <h5>{ assignedServices[0].name}</h5>
-                        : "No service available"}
-                    </div>
-                  )}
-                </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
@@ -165,8 +132,8 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
                   <InfraTable
                     buildings={projectInfra}
                     projectId={projectId}
-                  // handleFloor={submitData}
+                    // handleFloor={submitData}
-                  // signalRHandler ={signalRHandler}
+                    // signalRHandler ={signalRHandler}
                   />
                 )}
                 {!isLoading && projectInfra?.length == 0 && <div className="mt-5"><p>No Infra Avaiable</p></div>}