diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx index 236b209c..c89236ef 100644 --- a/src/components/Activities/InfraPlanning.jsx +++ b/src/components/Activities/InfraPlanning.jsx @@ -47,8 +47,7 @@ const InfraPlanning = () => > {(project_listLoader || projects.length < 0) && Loading... } - {!project_listLoader && projects?.filter(project => - LoggedUser?.projects?.map(Number).includes(project.id)).map((project)=>( + {!project_listLoader && projects?.map((project)=>( {project.name} ))} diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 9450c499..feacd1f8 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/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 ) && ( Loading... )} - {!project_lodaing && + {(!project_lodaing && projects) && projects - ?.filter((project) => - LoggedUser?.projects?.map(Number).includes(project.id) - ) .map((project) => ( {project.name} @@ -171,7 +161,7 @@ const DailyTask = () => { {TaskLists?.length === 0 && !task_loading && ( - No Data Found + No Task Found )} @@ -179,15 +169,11 @@ const DailyTask = () => { {task_loading && ( - Loading.. + Loading.;;. )} - {(!initialized || !selectedProject) && ( - - Loading.. - - )} + {TaskLists.map((task, index) => { return (
Loading..
Loading.;;.