diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index e2d10ebf..26b070d3 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useState,useMemo } from "react"; +import { useCallback, useEffect, useState, useMemo } from "react"; import getGreetingMessage from "../../utils/greetingHandler"; import { cacheData, @@ -14,7 +14,7 @@ import { useProfile } from "../../hooks/useProfile"; import { useLocation, useNavigate, useParams } from "react-router-dom"; import Avatar from "../../components/common/Avatar"; import { useChangePassword } from "../Context/ChangePasswordContext"; -import { useProjects } from "../../hooks/useProjects"; +import { useProjects } from "../../hooks/useProjects"; import { useProjectName } from "../../hooks/useProjects"; import eventBus from "../../services/eventBus"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; @@ -22,7 +22,7 @@ import { ALLOW_PROJECTSTATUS_ID, MANAGE_PROJECT, UUID_REGEX } from "../../utils/ import { useAuthModal, useLogout } from "../../hooks/useAuth"; const Header = () => { - const { profile } = useProfile(); + const { profile } = useProfile(); const { data: masterData } = useMaster(); const location = useLocation(); const dispatch = useDispatch(); @@ -40,11 +40,12 @@ const Header = () => { const isProjectPath = pathname === "/projects"; const isDirectory = pathname === "/directory"; const isEmployeeList = pathname === "/employees"; + const isMasters = pathname === "/masters"; // const isExpense = pathname === "/expenses"; const isEmployeeProfile = UUID_REGEX.test(pathname); const hideDropPaths = - isDirectory || isEmployeeList || isEmployeeProfile; + isDirectory || isEmployeeList || isMasters || isEmployeeProfile; const showProjectDropdown = !hideDropPaths; @@ -57,8 +58,8 @@ const Header = () => { isDashboardPath ? projectNames : projectNames?.filter((project) => - ALLOW_PROJECTSTATUS_ID.includes(project.projectStatusId) - ), + ALLOW_PROJECTSTATUS_ID.includes(project.projectStatusId) + ), [projectNames, isDashboardPath] ); @@ -66,11 +67,11 @@ const Header = () => { if (projectLoading) return "Loading..."; if (!projectNames?.length) return "No Projects Assigned"; if (projectNames.length === 1) return projectNames[0].name; - if (selectedProject === null) return "All Projects"; + if (selectedProject === null) return "All Projects"; const selectedObj = projectNames.find((p) => p.id === selectedProject); return selectedObj - ? selectedObj.name - : projectNames[0]?.name || "No Projects Assigned"; + ? selectedObj.name + : projectNames[0]?.name || "No Projects Assigned"; }, [projectLoading, projectNames, selectedProject]); // ===== Role Helper ===== @@ -199,13 +200,13 @@ const Header = () => { style={{ overflow: "auto", maxHeight: "300px" }} > -
  • - -
  • - +
  • + +
  • + {[...projectsForDropdown] .sort((a, b) => a?.name?.localeCompare(b.name)) .map((project) => ( @@ -231,7 +232,7 @@ const Header = () => {