src/components/Activities/InfraPlanning.jsx

@@ -47,7 +47,8 @@ const InfraPlanning = () =>
                    >
                                  {(project_listLoader || projects.length < 0) && <option value="Loading..." disabled>Loading...</option>  }
                   
-                                 {!project_listLoader && projects?.map((project)=>(
+                                  {!project_listLoader && projects?.filter(project =>
+                                    LoggedUser?.projects?.map(String).includes(project.id)).map((project)=>(
                                      <option key={project.id} value={project.id}>{project.name}</option>
                                   ))} 
                       </select>

src/components/Activities/ReportTaskComments.jsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState, useRef } from "react";
+import { useProfile } from "../../hooks/useProfile";
 import moment from "moment";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -15,6 +16,7 @@ const schema = z.object({
 
 const ReportTaskComments = ({ commentsData, closeModal }) => {
   const [loading, setloading] = useState(false);
+  const { profile } = useProfile();
   const [comments, setComment] = useState([]);
   const [bgClass, setBgClass] = useState("");
   const {
@@ -36,6 +38,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
       containerRef.current.scrollTop = containerRef.current.scrollHeight;
     }
   }, [comments]);
+  const isLoggedUser = (usrId) => profile?.employeeInfo.id === usrId;
 
   const onSubmit = async (data) => {
     let sendComment = {

src/components/Project/Infrastructure/WorkItem.jsx

@@ -2,9 +2,6 @@ import React, { useState, useEffect } from "react";
 import { useModal } from "../../../ModalContext";
 import AssignRoleModel from "../AssignRole";
 import { useParams } from "react-router-dom";
-import EditActivityModal from "./EditActivityModal";
-import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
-import { MANAGE_TASK } from "../../../utils/constants";
 
 const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
   const { projectId } = useParams();
@@ -12,7 +9,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
   const [NewWorkItem, setNewWorkItem] = useState();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [showModal, setShowModal] = useState(false);
-  const ManageTasks = useHasUserPermission(MANAGE_TASK);
+
   const openModal = () => setIsModalOpen(true);
   const closeModal = () => setIsModalOpen(false);
   const getProgress = (planned, completed) => {
@@ -63,11 +60,24 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
         style={{ display: showModal ? "block" : "none" }}
         aria-hidden={!showModal}
       >
-        <EditActivityModal workItem={workItem}
+        <div
-          workArea={forWorkArea}
+          className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal"
-          building={forBuilding}
+          role="document"
-          floor={forFloor}
+        >
-          onClose={ closeModal1} />
+          <div className="modal-content">
+            <div className="modal-body p-sm-4 p-0">
+              <button
+                type="button"
+                className="btn-close"
+                onClick={closeModal1}
+                aria-label="Close"
+              ></button>
+              <div className="container my-1"></div>
+
+              <h6>Comming Soon</h6>
+            </div>
+          </div>
+        </div>
       </div>
 
       <tr>
@@ -121,7 +131,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
         </td>
         <td className="d-none d-md-table-cell">
           <div className="dropdown">
-          {!projectId && ManageTasks && (
+            {!projectId && (
               <button
                 aria-label="Modify"
                 type="button"

src/hooks/useProjects.js

@@ -14,46 +14,54 @@ export const useProjects = () =>
   const [error, setError] = useState("");
 
   const fetchData = async () => {
-    const projectIds = profile?.projects || []; 
+    const projects_cache = getCachedData("projectslist");
-  
-    const filterProjects = (projectsList) => {
-      return projectsList
-        .filter((proj) => projectIds.includes(String(proj.id)))
-        .sort((a, b) => a.name.localeCompare(b.name));
-    };
-  
 
     if (!projects_cache) {
       setLoading(true);
-      try {
+      ProjectRepository.getProjectList()
-        const response = await ProjectRepository.getProjectList();
+        .then((response) => {
-        const allProjects = response.data;
+          let projects = response.data;
-        const filtered = filterProjects(allProjects);
+          const sortedProject = [...projects].sort((a, b) =>
-        setProjects(filtered);
+            a.name.localeCompare(b.name)
-        cacheData("projectslist", allProjects); 
+          );
-      } catch (err) {
+
-        setError("Failed to fetch data.");
+          setProjects(sortedProject);
-      } finally {
+          cacheData( "projectslist", sortedProject );
-        setLoading(false);
+          setLoading(false);
-      }
+        })
+        .catch((error) => {
+          setLoading(false);
+          setError("Failed to fetch data.");
+        });
     } else {
       if (!projects.length) {
-        const filtered = filterProjects(projects_cache);
+        let projects = projects_cache;
-        setProjects(filtered);
+        const sortedProject = [...projects].sort((a, b) =>
+          a.name.localeCompare(b.name)
+        );
+        setProjects( sortedProject );
 
       }
     }
   };
 
-  useEffect( () =>
+  useEffect(() => {
-    {
+    fetchData();
-    if ( profile )
-    {
-      fetchData();
-    }
   }, []);
 
-
+  // useEffect( () =>
+  // {
+  //   if (projects )
+  //   {
+  //     if ( profile?.projects && profile?.projects?.length > 0 )
+  //     {
+  //       dispatch(setProjectId(profile?.projects[0]))
+  //     } else
+  //     {
+  //       dispatch(setProjectId(1))
+  //     }
+  //   }
+  // }, [profile]);
 
   return { projects, loading, error, refetch: fetchData };
 };

src/pages/Activities/DailyTask.jsx

@@ -16,6 +16,7 @@ import DatePicker from "../../components/common/DatePicker";
 import { useSearchParams } from "react-router-dom";
 
 const DailyTask = () => {
+  const { profile: LoggedUser } = useProfile();
   const [searchParams] = useSearchParams();
   const projectId = searchParams.get("project");
   const selectedProject = useSelector(
@@ -34,15 +35,17 @@ const DailyTask = () => {
   // Sync projectId (either from URL or pick first accessible one)
   useEffect(() => {
     if (!project_lodaing && projects.length > 0 && !initialized) {
- 
+      const userProjects = projects.filter((p) =>
+        LoggedUser?.projects?.map(String).includes(p.id)
+      );
   
       if (projectId) {
         dispatch(setProjectId(projectId));
-      } else if (!selectedProject) {
+      } else if (!selectedProject && userProjects.length > 0) {
-        dispatch(setProjectId(projects[0].id)); 
+        dispatch(setProjectId(userProjects[0].id));
       }
   
-      setInitialized(true);
+      setInitialized(true); // <-- This blocks re-running this effect again
     }
   }, [project_lodaing, projects, projectId, selectedProject, initialized]);
   
@@ -133,12 +136,12 @@ const DailyTask = () => {
                   onChange={(e) => dispatch(setProjectId(e.target.value))}
                   aria-label=""
                 >
-                   {(project_lodaing )  && (
+                  {(project_lodaing || projects.length < 0) && (
                     <option value="Loading..." disabled>
                       Loading...
                     </option>
                   )}
-                   {(!project_lodaing && projects) &&
+                  {!project_lodaing &&
                     projects
                       ?.filter((project) =>
                         LoggedUser?.projects?.map(String).includes(project.id)
@@ -168,7 +171,7 @@ const DailyTask = () => {
                   {TaskLists?.length === 0 && !task_loading && (
                     <tr>
                       <td colSpan={7} className="text-center">
-                      No Task Found
+                        No Data Found
                       </td>
                     </tr>
                   )}
@@ -180,7 +183,11 @@ const DailyTask = () => {
                       </td>
                     </tr>
                   )}
-             
+                  {(!initialized || !selectedProject) && ( <tr>
+                      <td colSpan={7} className="text-center">
+                        <p>Loading..</p>
+                      </td>
+                    </tr>)}
 
                   {TaskLists.map((task, index) => {
                     return (

src/pages/Activities/TaskPlannng.jsx

@@ -1,3 +1,4 @@
+
 import React, { useState, useEffect } from "react";
 import "../../components/Project/ProjectInfra.css";
 
@@ -10,17 +11,14 @@ import { useDispatch, useSelector } from "react-redux";
 import { useProjectDetails, useProjects } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
 
+
 const TaskPlannng = () => {
-  const { profile } = useProfile();
+
-  const {
+ const {profile} = useProfile();
-    projects,
+  const {projects,loading:project_listLoader,error:projects_error} = useProjects();
-    loading: project_listLoader,
-    error: projects_error,
-  } = useProjects();
   const dispatch = useDispatch();
-  const selectedProject = useSelector(
+  const selectedProject = useSelector((store)=>store.localVariables.projectId);
-    (store) => store.localVariables.projectId
+
-  );
 
   const [project, setProject] = useState(null);
   const [projectDetails, setProjectDetails] = useState(null);
@@ -59,11 +57,8 @@ const TaskPlannng = () => {
         ProjectRepository.getProjectByprojectId(selectedProject)
           .then((response) => {
             setProjectDetails(response);
-            setProject(response);
+            setProject( response );
-            cacheData("projectInfo", {
+            cacheData("projectInfo",{data:response.data,projectId:selectedProject})
-              data: response.data,
-              projectId: selectedProject,
-            });
           })
           .catch((error) => {
             console.error(error);
@@ -86,15 +81,17 @@ const TaskPlannng = () => {
   };
 
   const handleDataChange = (data) => {
+
     fetchData();
   };
   
-  useEffect(() => {
+   useEffect(() => {
-    if (projects.length != 0 && selectedProject) {
+      if((projects.length != 0)){
-      fetchData();
+        fetchData();
       fetchActivities();
-    }
+      }
-  }, [selectedProject]);
+    }, [selectedProject]);
+
 
   return (
     <>    
@@ -103,19 +100,14 @@ const TaskPlannng = () => {
           data={[
             { label: "Home", link: "/dashboard" },
             { label: "Daily Task Planning", link: "/task" },
+    
           ]}
         ></Breadcrumb>
-        {project_listLoader && <p>Loading..</p>}
+             <InfraPlanning 
-        {!project_listLoader && projects.length === 0 && (
+               data={projectDetails}
-          <p>No Project Found.</p>
+               activityMaster={activities}
-        )}
+               onDataChange={handleDataChange} 
-        {!project_listLoader && projects.length > 0 && (
+            /> 
-          <InfraPlanning
-            data={projectDetails}
-            activityMaster={activities}
-            onDataChange={handleDataChange}
-          />
-        )}
       </div>
     </>
   );

src/utils/constants.jsx

@@ -20,5 +20,5 @@ export const ASSIGN_TO_PROJECT = "fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3";
 
 export const INFRASTRUCTURE = "9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c";
 
-export const MANAGE_TASK = "08752f33-3b29-4816-b76b-ea8a968ed3c5"
+