Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management

src/components/Layout/Sidebar.jsx

@@ -4,17 +4,17 @@ import menuData from "../../data/menuData.json";
 import {getCachedProfileData} from "../../slices/apiDataManager";
 
 const Sidebar = () => {
-  const logineUser = getCachedProfileData()
+  // const logineUser = getCachedProfileData()
   const navigate = useNavigate()
-  const handleLogout = (e) => {
-    e.preventDefault(); 
-    // logout();
-  };
+  // const handleLogout = (e) => {
+  //   e.preventDefault(); 
+  //   // logout();
+  // };
 
-  const handleProfilePage = ()=>{
-    console.log(profile?.employeeInfo?.id)
-    navigate(`/employee/${profile?.employeeInfo?.id}?for=account`)
-  }
+  // const handleProfilePage = ()=>{
+  //   console.log(profile?.employeeInfo?.id)
+  //   navigate(`/employee/${profile?.employeeInfo?.id}?for=account`)
+  // }
   return (
     <aside
       id="layout-menu"
@@ -58,7 +58,7 @@ const Sidebar = () => {
         ))}
       </ul>
 
-      <div className="dropdown py-sm-4 mt-sm-auto ms-auto ms-sm-0 flex-shrink-1 ps-5">
+      {/* <div className="dropdown py-sm-4 mt-sm-auto ms-auto ms-sm-0 flex-shrink-1 ps-5">
         <a
           href="#"
           className="d-flex align-items-center  text-decoration-none dropdown-toggle"
@@ -137,7 +137,7 @@ const Sidebar = () => {
             </a>
           </li>
         </ul>
-      </div>
+      </div> */}
     </aside>
   );
 };

src/components/Project/ProjectCard.jsx

@@ -1,4 +1,4 @@
-import React,{useState,useEffect} from "react";
+import React, { useState } from "react";
 import moment from "moment";
 import { getDateDifferenceInDays } from "../../utils/dateUtils";
 import { useNavigate } from "react-router-dom";
@@ -12,16 +12,23 @@ import {MANAGE_PROJECT} from "../../utils/constants";
 
 
 
-const ProjectCard = ( {projectData} ) =>
-{
-  
-  const[projectInfo,setProjectInfo] = useState(projectData)
-  const navigate = useNavigate()
-  const {projects_Details, loading} = useProjectDetails( projectData.id )
+const ProjectCard = ({ projectData }) => {
+  const [projectInfo, setProjectInfo] = useState(projectData);
+  const [projectDetails, setProjectDetails] = useState(null);
   const [showModal, setShowModal] = useState(false);
-  const ManageProject  = useHasUserPermission(MANAGE_PROJECT)
+  const navigate = useNavigate();
+  const ManageProject = useHasUserPermission(MANAGE_PROJECT);
+
+  const handleShow = async () => {
+    try {
+      const response = await ProjectRepository.getProjectDetails(projectInfo.id);
+      setProjectDetails(response.data);
+      setShowModal(true);
+    } catch (error) {
+      showToast("Failed to load project details", "error");
+    }
+  };
 
-  const handleShow = () => setShowModal(true);
   const handleClose = () => setShowModal( false );
   
   const getProjectStatusName = (statusId) => {
@@ -54,71 +61,63 @@ const ProjectCard = ( {projectData} ) =>
     }
   };
 
-  const handleViewProject = (e) => {
-    navigate(`/projects/${projectData.id}`)
+  const handleViewProject = () => {
+    navigate(`/projects/${projectData.id}`);
   };
 
 
-  
-  const handleFormSubmit = ( updatedProject ) =>
-    {
-           if ( projectInfo?.id )
-              {
-                   ProjectRepository.updateProject(projectInfo.id,updatedProject).then( ( response ) =>
-                   { 
+  const handleFormSubmit = (updatedProject) => {
+    if (projectInfo?.id) {
+      ProjectRepository.updateProject(projectInfo.id, updatedProject)
+        .then((response) => {
           const updatedProjectData = {
             ...projectInfo,
             ...response.data,
-                       building:projects_Details.building, 
+            building: projectDetails?.building,
           };
-                     setProjectInfo( updatedProject )
-                     if ( getCachedData( `projectinfo-${ projectInfo.id }` ) )
-                     {
+
+          setProjectInfo(updatedProject);
+
+          if (getCachedData(`projectinfo-${projectInfo.id}`)) {
             cacheData(`projectinfo-${projectInfo.id}`, updatedProjectData);
-                       
           }
-                     const projects_list = getCachedData( "projectslist" );
-                     if ( projects_list )
-                     {  
-                      const updatedProjectsList = projects_list.map(project => 
-                        project.id == projectInfo.id ? {
-                          ...project,       
-                           ...response.data,
-                           tenant:project.tenant
-                        } : project
-                       );
 
-                       cacheData("projectslist",updatedProjectsList)
+          const projects_list = getCachedData("projectslist");
+          if (projects_list) {
+            const updatedProjectsList = projects_list.map((project) =>
+              project.id === projectInfo.id
+                ? { ...project, ...response.data, tenant: project.tenant }
+                : project
+            );
+            cacheData("projectslist", updatedProjectsList);
           }
 
           showToast("Project updated successfully.", "success");
-                      
-                       setShowModal(false)
+          setShowModal(false);
         })
         .catch((error) => {
           showToast(error.message, "error");
-  
         });
     }
   };
 
-
   return (
     <>
-      
+      {showModal && projectDetails && (
         <div
-        className={`modal fade ${showModal ? 'show' : ''}`}
+          className="modal fade show"
           tabIndex="-1"
           role="dialog"
-        style={{ display: showModal ? 'block' : 'none' }}
-        aria-hidden={!showModal}
+          style={{ display: "block" }}
+          aria-hidden="false"
         >
           <ManageProjectInfo
-            project={projects_Details} 
+            project={projectDetails}
             handleSubmitForm={handleFormSubmit}
             onClose={handleClose}
-          ></ManageProjectInfo>
+          />
         </div>
+      )}
 
       <div className="col-md-6 col-lg-4 col-xl-4 order-0 mb-4">
         <div className="card cursor-pointer">
@@ -135,7 +134,6 @@ const ProjectCard = ( {projectData} ) =>
                   <h5 className="mb-0">
                     <a
                       className="stretched-link text-heading"
-                  
                       onClick={handleViewProject}
                     >
                       {projectInfo.name}
@@ -147,7 +145,7 @@ const ProjectCard = ( {projectData} ) =>
                   </div>
                 </div>
               </div>
-            <div className={`ms-auto ${!ManageProject && 'd-none'}`}>
+              <div className={`ms-auto ${!ManageProject && "d-none"}`}>
                 <div className="dropdown z-2">
                   <button
                     type="button"
@@ -168,18 +166,13 @@ const ProjectCard = ( {projectData} ) =>
                         <span className="align-left">View details</span>
                       </a>
                     </li>
-                  <li    data-bs-toggle="modal"
-                          data-bs-target="#edit-project-modal"
-                          onClick={handleShow}>
-                    <a
-                      className="dropdown-item"
-                    >
+                    
+                    <li onClick={handleShow}>
+                      <a className="dropdown-item">
                         <i className="bx bx-pencil me-2"></i>
-                        <span className="align-left"
-                       >Modify</span>
+                        <span className="align-left">Modify</span>
                       </a>
                     </li>
-
                     <li>
                       <a className="dropdown-item">
                         <i className="bx bx-task me-2"></i>