fixed correct projectId is used when navigating to DailyTask

This commit is contained in:
Pramod Mahajan 2025-04-21 22:32:42 +05:30
parent d4fed67912
commit b5b55a7962

View File

@ -19,15 +19,37 @@ const DailyTask = () => {
const { profile: LoggedUser } = useProfile();
const [searchParams] = useSearchParams();
const projectId = searchParams.get("project");
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const {
projects,
loading: project_lodaing,
error: projects_Error,
} = useProjects();
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const [initialized, setInitialized] = useState(false);
// Sync projectId (either from URL or pick first accessible one)
useEffect(() => {
if (!project_lodaing && projects.length > 0) {
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);
}
}, [project_lodaing, projects, projectId, selectedProject]);
const dispatch = useDispatch(selectedProject);
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
@ -60,9 +82,6 @@ const DailyTask = () => {
openModal();
};
useEffect(() => {
if (projectId) dispatch(setProjectId(projectId));
}, [projectId]);
return (
<>
<div
@ -161,6 +180,11 @@ const DailyTask = () => {
</td>
</tr>
)}
{(!initialized || !selectedProject) && ( <tr>
<td colSpan={7} className="text-center">
<p>Loading..</p>
</td>
</tr>)}
{TaskLists.map((task, index) => {
const accordionId = `accordion-${index}`;