Selected Project Resets to "All Projects" After Page Refresh in Daily Task Planning
This commit is contained in:
parent
52b0b9b2da
commit
9f9bfbe922
@ -15,13 +15,15 @@ import {useDispatch, useSelector} from "react-redux";
|
|||||||
import {useProfile} from "../../hooks/useProfile";
|
import {useProfile} from "../../hooks/useProfile";
|
||||||
import {refreshData, setProjectId} from "../../slices/localVariablesSlice";
|
import {refreshData, setProjectId} from "../../slices/localVariablesSlice";
|
||||||
import InfraTable from "../Project/Infrastructure/InfraTable";
|
import InfraTable from "../Project/Infrastructure/InfraTable";
|
||||||
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
|
||||||
|
|
||||||
const InfraPlanning = () =>
|
const InfraPlanning = () =>
|
||||||
{
|
{
|
||||||
const {profile: LoggedUser, refetch : fetchData} = useProfile()
|
const {profile: LoggedUser, refetch : fetchData} = useProfile()
|
||||||
const dispatch = useDispatch()
|
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 )
|
const {projectInfra, isLoading, error} = useProjectInfra( selectedProject )
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,11 +16,13 @@ import SubTask from "../../components/Activities/SubTask";
|
|||||||
import {formatNumber} from "../../utils/dateUtils";
|
import {formatNumber} from "../../utils/dateUtils";
|
||||||
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
||||||
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
|
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
|
||||||
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
|
||||||
const DailyTask = () => {
|
const DailyTask = () => {
|
||||||
const selectedProject = useSelector(
|
// const selectedProject = useSelector(
|
||||||
(store) => store.localVariables.projectId
|
// (store) => store.localVariables.projectId
|
||||||
);
|
// );
|
||||||
|
const selectedProject = useSelectedproject();
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
||||||
|
|
||||||
|
@ -4,12 +4,14 @@ import InfraPlanning from "../../components/Activities/InfraPlanning";
|
|||||||
import { useProjectName } from "../../hooks/useProjects";
|
import { useProjectName } from "../../hooks/useProjects";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
import { setProjectId } from "../../slices/localVariablesSlice";
|
||||||
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
|
||||||
|
|
||||||
const TaskPlannng = () => {
|
const TaskPlannng = () => {
|
||||||
const selectedProject = useSelector(
|
// const selectedProject = useSelector(
|
||||||
(store) => store.localVariables.projectId
|
// (store) => store.localVariables.projectId
|
||||||
);
|
// );
|
||||||
|
const selectedProject = useSelectedproject();
|
||||||
|
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user