diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index f8debd51..c41d3e8e 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -5,24 +5,19 @@ import { useDispatch, useSelector } from "react-redux"; import { changeMaster, setProjectId } from "../../slices/localVariablesSlice"; import useMaster from "../../hooks/masterHook/useMaster"; import { useProfile } from "../../hooks/useProfile"; -import { useNavigate } from "react-router-dom"; +import { useLocation, useNavigate } from "react-router-dom"; import Avatar from "../../components/common/Avatar"; import { useChangePassword } from "../Context/ChangePasswordContext"; import { useProjects } from "../../hooks/useProjects"; -import {useEffect, useState} from "react"; - +import { useEffect, useState } from "react"; const Header = () => { - const {profile} = useProfile(); - // const { projects, loading: projectLoading } = useProjects(); - // const selectedProject = useSelector( - // (store) => store.localVariables.projectId - // ); - // const [selectedProjectId, setSelectedProjectId] = useState("all"); + const { profile } = useProfile(); + const location = useLocation(); + const [isGlobalSelectVisible, setIsGlobalSelectVisible] = useState(true); const dispatch = useDispatch(changeMaster("Job Role")); const { data, loading } = useMaster(); const navigate = useNavigate(); - const getRole = (roles, joRoleId) => { if (!Array.isArray(roles)) return "User"; @@ -74,27 +69,30 @@ const Header = () => { (store) => store.localVariables.projectId ); -const selectedProjectName = projects?.find( - (p) => p?.id === selectedProject -)?.name; + const selectedProjectName = projects?.find( + (p) => p?.id === selectedProject + )?.name; -let displayText = ""; -if (selectedProjectName) { - displayText = selectedProjectName; -} else if (projectLoading && selectedProject) { - displayText = selectedProject; -} else if (projectLoading) { - displayText = "Loading..."; -} + let displayText = ""; + if (selectedProjectName) { + displayText = selectedProjectName; + } else if (projectLoading && selectedProject) { + displayText = selectedProject; + } else if (projectLoading) { + displayText = "Loading..."; + } const { openChangePassword } = useChangePassword(); - useEffect( () => - { - if ( projects && selectedProject !== ' ') - { - dispatch(setProjectId(projects[0]?.id)) + useEffect(() => { + if (projects && selectedProject !== " ") { + dispatch(setProjectId(projects[0]?.id)); } -},[projects]) + setIsGlobalSelectVisible( + location.pathname !== `/projects/${selectedProject}` + ); + }, [projects, selectedProject]); + + console.log(isGlobalSelectVisible); return (