diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index 52a189c0..29e7daa8 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -33,10 +33,11 @@ const Header = () => { /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname); // Define the specific project status IDs you want to filter by + // Changed to explicitly include only 'Active', 'On Hold', 'In Progress' const allowedProjectStatusIds = [ "603e994b-a27f-4e5d-a251-f3d69b0498ba", // On Hold "cdad86aa-8a56-4ff4-b633-9c629057dfef", // In Progress - "ef1c356e-0fe0-42df-a5d3-8daee355492d", // Inactive + "ef1c356e-0fe0-42df-a5d3-8daee355492d", // Inactive - Removed as per requirement "b74da4c2-d07e-46f2-9919-e75e49b12731", // Active ]; @@ -97,8 +98,8 @@ const Header = () => { const projectsForDropdown = isDashboard ? projectNames // On dashboard, show all projects : projectNames?.filter(project => - allowedProjectStatusIds.includes(project.projectStatusId) - ); + allowedProjectStatusIds.includes(project.projectStatusId) + ); // Determine the display text for the project dropdown let displayText = "All Projects"; @@ -119,7 +120,7 @@ const Header = () => { useEffect(() => { if ( - projectNames && // Use the original projectNames for initial setting to ensure all are considered for initial state if needed + projectNames && projectNames.length > 0 && selectedProject === undefined && !getCachedData("hasReceived") @@ -185,6 +186,10 @@ const Header = () => { // No navigation if on dashboard or if "All Projects" is selected }; + // Determine if the dropdown should be shown + const shouldShowDropdown = + isDashboard || (projectsForDropdown && projectsForDropdown.length > 1); + return (