diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx index 6e51e9f7..af463fac 100644 --- a/src/components/Activities/InfraPlanning.jsx +++ b/src/components/Activities/InfraPlanning.jsx @@ -15,13 +15,15 @@ import {useDispatch, useSelector} from "react-redux"; import {useProfile} from "../../hooks/useProfile"; import {refreshData, setProjectId} from "../../slices/localVariablesSlice"; import InfraTable from "../Project/Infrastructure/InfraTable"; +import { useSelectedproject } from "../../slices/apiDataManager"; const InfraPlanning = () => { const {profile: LoggedUser, refetch : fetchData} = useProfile() const dispatch = useDispatch() - const selectedProject = useSelector((store)=>store.localVariables.projectId) + // const selectedProject = useSelector((store)=>store.localVariables.projectId) + const selectedProject = useSelectedproject(); const {projectInfra, isLoading, error} = useProjectInfra( selectedProject ) diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 116b1fcb..fe34c26a 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -16,11 +16,13 @@ import SubTask from "../../components/Activities/SubTask"; import {formatNumber} from "../../utils/dateUtils"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants"; +import { useSelectedproject } from "../../slices/apiDataManager"; const DailyTask = () => { - const selectedProject = useSelector( - (store) => store.localVariables.projectId - ); + // const selectedProject = useSelector( + // (store) => store.localVariables.projectId + // ); + const selectedProject = useSelectedproject(); const dispatch = useDispatch() const { projectNames, loading: projectLoading, fetchData } = useProjectName(); diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx index 57bd9506..4ced1b42 100644 --- a/src/pages/Activities/TaskPlannng.jsx +++ b/src/pages/Activities/TaskPlannng.jsx @@ -4,12 +4,14 @@ import InfraPlanning from "../../components/Activities/InfraPlanning"; import { useProjectName } from "../../hooks/useProjects"; import { useDispatch, useSelector } from "react-redux"; import { setProjectId } from "../../slices/localVariablesSlice"; +import { useSelectedproject } from "../../slices/apiDataManager"; const TaskPlannng = () => { - const selectedProject = useSelector( - (store) => store.localVariables.projectId - ); + // const selectedProject = useSelector( + // (store) => store.localVariables.projectId + // ); + const selectedProject = useSelectedproject(); const dispatch = useDispatch() const { projectNames, loading: projectLoading, fetchData } = useProjectName();