admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Hide Project Dropdown and All Projects Data for Users Assigned to Only One Project. #306

Merged
pramod.mahajan merged 1 commits from Kartik_Bug#797 into Issues_July_4W 2025-07-30 07:54:06 +00:00
Conversation 0 Commits 1 Files Changed 1 +41 -37
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/components/Layout/Header.jsx
View File

@ -37,7 +37,6 @@ const Header = () => {
const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba", // On Hold
"cdad86aa-8a56-4ff4-b633-9c629057dfef", // In Progress
// "ef1c356e-0fe0-42df-a5d3-8daee355492d", // Inactive - Removed as per requirement
"b74da4c2-d07e-46f2-9919-e75e49b12731", // Active
];
@ -93,44 +92,54 @@ const Header = () => {
(store) => store.localVariables.projectId
);
// Conditional filtering for projectsForDropdown
// If on Dashboard, show all projects. Otherwise, filter by allowedProjectStatusIds.
const projectsForDropdown = isDashboard
? projectNames // On dashboard, show all projects
: projectNames?.filter(project =>
allowedProjectStatusIds.includes(project.projectStatusId)
);
// Determine the display text for the project dropdown
let displayText = "All Projects";
if (selectedProject === null) {
displayText = "All Projects";
} else if (selectedProject) {
// Find the selected project from the full projectNames list
const selectedProjectObj = projectNames?.find(
(p) => p?.id === selectedProject
);
// Fallback to selectedProject ID if name not found during loading or mismatch
displayText = selectedProjectObj ? selectedProjectObj.name : selectedProject;
} else if (projectLoading) {
displayText = "Loading...";
// Determine the display text for the project section
let currentProjectDisplayName = "Loading...";
if (!projectLoading && projectNames) {
if (projectNames.length === 0) {
// If no projects are assigned at all
currentProjectDisplayName = "No Projects Assigned";
} else if (projectNames.length === 1) {
// If there's exactly one project overall (unfiltered list)
currentProjectDisplayName = projectNames[0].name;
} else { // projectNames.length > 1 (multiple projects)
if (selectedProject === null) {
currentProjectDisplayName = "All Projects";
} else {
const selectedProjectObj = projectNames.find(
(p) => p?.id === selectedProject
);
currentProjectDisplayName = selectedProjectObj ? selectedProjectObj.name : "Unknown Project";
}
}
}
const { openChangePassword } = useChangePassword();
// Effect to set initial projectId based on scenarios
useEffect(() => {
if (
projectNames &&
projectNames.length > 0 &&
selectedProject === undefined &&
!getCachedData("hasReceived")
selectedProject === undefined && // Only set if no project is explicitly selected yet
!getCachedData("hasReceived") // To avoid re-setting on every render
) {
if (isDashboard) {
dispatch(setProjectId(null)); // Always set to null for "All Projects" on Dashboard initial load
if (projectNames.length === 1) {
// If only one project exists, automatically select it
dispatch(setProjectId(projectNames[0]?.id || null));
} else {
// If not dashboard, set to the first project that matches the allowed statuses if available
const firstAllowedProject = projectNames.find(project => allowedProjectStatusIds.includes(project.projectStatusId));
dispatch(setProjectId(firstAllowedProject?.id || null)); // Fallback to null if no allowed projects
// If multiple projects, default to "All Projects" on dashboard, or first allowed for others
if (isDashboard) {
dispatch(setProjectId(null)); // Default to "All Projects" for dashboard when multiple projects
} else {
const firstAllowedProject = projectNames.find(project => allowedProjectStatusIds.includes(project.projectStatusId));
dispatch(setProjectId(firstAllowedProject?.id || null));
}
}
}
}, [projectNames, selectedProject, dispatch, isDashboard]);
@ -183,12 +192,10 @@ const Header = () => {
if (isProjectPath && project !== null) {
navigate("/projects/details"); // Navigate only if on /projects and a specific project is selected
}
// 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);
// Determine if the dropdown should be shown: Only if there are genuinely multiple projects
const shouldShowDropdown = projectNames && projectNames.length > 1;
return (
<nav
@ -211,33 +218,30 @@ const Header = () => {
<div className="align-items-center">
<i className="rounded-circle bx bx-building-house bx-sm-lg bx-md me-2"></i>
<div className="btn-group">
{/* Conditionally render the button based on shouldShowDropdown */}
{/* Conditionally render as a dropdown toggle button or a plain span */}
{shouldShowDropdown ? (
<button
className={`btn btn-sm-sm btn-xl ${projectsForDropdown && projectsForDropdown.length > 0 ? "dropdown-toggle" : ""
} px-1`}
className={`btn btn-sm-sm btn-xl dropdown-toggle px-1`}
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
{displayText}
{currentProjectDisplayName}
</button>
) : (
// If only one project, just display its name without a dropdown
// If no dropdown (single or zero projects), just display the text
<span className="btn btn-sm-sm btn-xl px-1">
{projectsForDropdown && projectsForDropdown.length === 1
? projectsForDropdown[0].name
: displayText}
{currentProjectDisplayName}
</span>
)}
{/* Only render the dropdown menu if shouldShowDropdown is true */}
{/* Only render the dropdown menu if shouldShowDropdown is true AND there are projects to display in it */}
{shouldShowDropdown && projectsForDropdown && projectsForDropdown.length > 0 && (
<ul
className="dropdown-menu"
style={{ overflow: "auto", maxHeight: "300px" }}
>
{isDashboard && (
{isDashboard && ( // "All Projects" option only appears in the dropdown if on dashboard and multiple projects
<li>
<button
className="dropdown-item"