diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js index aa5fa3f6..16af5c78 100644 --- a/src/hooks/useProjects.js +++ b/src/hooks/useProjects.js @@ -49,19 +49,19 @@ export const useProjects = () => fetchData(); }, []); - useEffect( () => - { - if (projects ) - { - if ( profile?.projects && profile?.projects?.length > 0 ) - { - dispatch(setProjectId(profile?.projects[0])) - } else - { - dispatch(setProjectId(1)) - } - } - }, [profile]); + // 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 }; }; diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index f4146ac6..d38211f3 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -34,20 +34,21 @@ const DailyTask = () => { // Sync projectId (either from URL or pick first accessible one) useEffect(() => { - if (!project_lodaing && projects.length > 0) { + 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)); } - - setInitialized(true); + + setInitialized(true); // <-- This blocks re-running this effect again } - }, [project_lodaing, projects, projectId, selectedProject]); + }, [project_lodaing, projects, projectId, selectedProject, initialized]); + const dispatch = useDispatch(selectedProject); @@ -58,13 +59,15 @@ const DailyTask = () => { loading: task_loading, error: task_error, refetch, - } = useTaskList(selectedProject, dateRange.startDate, dateRange.endDate); + } = useTaskList( initialized ? selectedProject : null, + initialized ? dateRange.startDate : null, + initialized ? dateRange.endDate : null); const [TaskLists, setTaskLists] = useState([]); useEffect(() => { setTaskLists(TaskList); - }, [TaskList, selectedProject]); + }, [TaskList,selectedProject]); const [selectedTask, selectTask] = useState(null); const [comments, setComment] = useState(null); diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index d28a00c2..2cdaa15a 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -293,7 +293,7 @@ const EmployeeList = () => {