Removed unnecessary filtering from the UI.

src/components/Activities/InfraPlanning.jsx

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

src/components/Activities/ReportTaskComments.jsx

@@ -1,5 +1,4 @@
 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";
@@ -16,7 +15,6 @@ 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 {
@@ -38,7 +36,6 @@ 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,14 +2,15 @@ import React, { useState, useEffect } from "react";
 import { useModal } from "../../../ModalContext";
 import AssignRoleModel from "../AssignRole";
 import { useParams } from "react-router-dom";
-
+import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
+import { MANAGE_TASK } from "../../../utils/constants";
 const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
   const { projectId } = useParams();
   const [itemName, setItemName] = useState("");
   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) => {
@@ -131,7 +132,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
         </td>
         <td className="d-none d-md-table-cell">
           <div className="dropdown">
-            {!projectId && (
+            {!projectId && ManageTasks && (
               <button
                 aria-label="Modify"
                 type="button"
@@ -140,7 +141,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
                 data-bs-target="#project-modal"
                 onClick={openModal}
               >
-                <span className="badge  badge-md bg-label-primary me-1">
+                <span className="badge badge-md bg-label-primary me-1">
                   Assign
                 </span>
               </button>

src/hooks/useProjects.js

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

src/pages/Activities/DailyTask.jsx

@@ -5,7 +5,6 @@ import { dailyTask } from "../../data/masters";
 import { useTaskList } from "../../hooks/useTasks";
 import { useProjects } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
-import { useProfile } from "../../hooks/useProfile";
 import { formatDate } from "../../utils/dateUtils";
 import GlobalModel from "../../components/common/GlobalModel";
 import AssignRoleModel from "../../components/Project/AssignRole";
@@ -16,7 +15,6 @@ 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(
@@ -32,20 +30,15 @@ const DailyTask = () => {
   
   const [initialized, setInitialized] = useState(false);
 
-  // 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(Number).includes(p.id)
-      );
-  
       if (projectId) {
         dispatch(setProjectId(projectId));
-      } else if (!selectedProject && userProjects.length > 0) {
-        dispatch(setProjectId(userProjects[0].id));
+      } else if (!selectedProject) {
+        dispatch(setProjectId(projects[0].id)); 
       }
   
-      setInitialized(true); // <-- This blocks re-running this effect again
+      setInitialized(true);
     }
   }, [project_lodaing, projects, projectId, selectedProject, initialized]);
   
@@ -136,16 +129,13 @@ const DailyTask = () => {
                   onChange={(e) => dispatch(setProjectId(e.target.value))}
                   aria-label=""
                 >
-                  {(project_lodaing || projects.length < 0) && (
+                  {(project_lodaing ) && (
                     <option value="Loading..." disabled>
                       Loading...
                     </option>
                   )}
-                  {!project_lodaing &&
+                  {(!project_lodaing && projects) &&
                     projects
-                      ?.filter((project) =>
-                        LoggedUser?.projects?.map(Number).includes(project.id)
-                      )
                       .map((project) => (
                         <option value={project.id} key={project.id}>
                           {project.name}
@@ -171,7 +161,7 @@ const DailyTask = () => {
                   {TaskLists?.length === 0 && !task_loading && (
                     <tr>
                       <td colSpan={7} className="text-center">
-                        No Data Found
+                        No Task Found
                       </td>
                     </tr>
                   )}
@@ -179,15 +169,11 @@ const DailyTask = () => {
                   {task_loading && (
                     <tr>
                       <td colSpan={7} className="text-center">
-                        <p>Loading..</p>
+                        <p>Loading.;;.</p>
                       </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

@@ -86,7 +86,7 @@ const TaskPlannng = () => {
   };
   
    useEffect(() => {
-      if((projects.length != 0)){
+      if((projects.length != 0 && selectedProject)){
         fetchData();
       fetchActivities();
       }
@@ -103,11 +103,16 @@ const TaskPlannng = () => {
     
           ]}
         ></Breadcrumb>
-             <InfraPlanning 
-               data={projectDetails}
-               activityMaster={activities}
-               onDataChange={handleDataChange} 
-            /> 
+
+        {project_listLoader && <p>Loading..</p>}
+        {(!project_listLoader && projects.length === 0) && (<p>No Project Found.</p>)}
+        {( !project_listLoader && projects.length > 0 ) && (
+           <InfraPlanning 
+           data={projectDetails}
+           activityMaster={activities}
+           onDataChange={handleDataChange} 
+        /> 
+        )}
       </div>
     </>
   );

src/utils/constants.jsx

@@ -20,5 +20,7 @@ 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"
+