Prevent multiple API calls and display correct data for selected project
This commit is contained in:
parent
2dd324e725
commit
dbfd536ba3
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user