Skip to content

Rithika taking over for Vivek - Feature: Tracking Resolved Tasks #4797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vivekchandrabs wants to merge 5 commits into
base: development
Choose a base branch
from
Open

Rithika taking over for Vivek - Feature: Tracking Resolved Tasks #4797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
225c52c
Chore: Implement resolved task feature for the frontend.
vivekchandrabs Feb 5, 2026
567f911
chore: regenerate yarn.lock
rithika-paii Jun 11, 2026
d401611
fix: resolve SonarQube issues - remove unused import and add PropTypes
rithika-paii Jun 11, 2026
cfa3661
fix: add missing TASKS import to Header.jsx
rithika-paii Jun 12, 2026
6168361
Fixed merge conflicts in the files
Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 107 additions & 105 deletions src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import '../../App.module.css';
import {
ACTUAL_COST_BREAKDOWN,
BADGE_MANAGEMENT,
BLUE_SQUARE_EMAIL_MANAGEMENT,
DASHBOARD,
JOB_ANALYTICS_REPORT,
LOGOUT,
Expand All @@ -46,6 +45,7 @@ import {
PROJECTS,
REPORTS,
SEND_EMAILS,
TASKS,
TEAM_LOCATIONS,
TEAMS,
TIMELOG,
Expand Down Expand Up @@ -84,7 +84,7 @@ export function Header(props) {
const collapseRef = useRef(null);
const toggleRef = useRef(null);
const [isAckLoading, setIsAckLoading] = useState(false);
const [ showPromotionsPopup, setShowPromotionsPopup ] = useState(false);
const [showPromotionsPopup, setShowPromotionsPopup] = useState(false);

const ALLOWED_ROLES_TO_INTERACT = useMemo(() => ['Owner', 'Administrator'], []);
const canInteractWithViewingUser = useMemo(
Expand All @@ -96,7 +96,7 @@ export function Header(props) {
// Reports
const canGetReports = props.hasPermission(
'getReports',
!isAuthUser ,
!isAuthUser,
);
const canGetWeeklySummaries = props.hasPermission(
'getWeeklySummaries',
Expand All @@ -116,21 +116,21 @@ export function Header(props) {

// Badges
const canAccessBadgeManagement =
props.hasPermission('seeBadges', !isAuthUser ) ||
props.hasPermission('createBadges', !isAuthUser ) ||
props.hasPermission('seeBadges', !isAuthUser) ||
props.hasPermission('createBadges', !isAuthUser) ||
props.hasPermission('updateBadges', !isAuthUser) ||
props.hasPermission('deleteBadges', !isAuthUser );
props.hasPermission('deleteBadges', !isAuthUser);
// Projects
const canAccessProjects =
props.hasPermission('postProject', !isAuthUser ) ||
props.hasPermission('deleteProject', !isAuthUser ) ||
props.hasPermission('putProject', !isAuthUser ) ||
props.hasPermission('getProjectMembers', !isAuthUser ) ||
props.hasPermission('assignProjectToUsers', !isAuthUser ) ||
props.hasPermission('postWbs', !isAuthUser ) ||
props.hasPermission('deleteWbs', !isAuthUser ) ||
props.hasPermission('postTask', !isAuthUser ) ||
props.hasPermission('updateTask', !isAuthUser ) ||
props.hasPermission('postProject', !isAuthUser) ||
props.hasPermission('deleteProject', !isAuthUser) ||
props.hasPermission('putProject', !isAuthUser) ||
props.hasPermission('getProjectMembers', !isAuthUser) ||
props.hasPermission('assignProjectToUsers', !isAuthUser) ||
props.hasPermission('postWbs', !isAuthUser) ||
props.hasPermission('deleteWbs', !isAuthUser) ||
props.hasPermission('postTask', !isAuthUser) ||
props.hasPermission('updateTask', !isAuthUser) ||
props.hasPermission('deleteTask', !isAuthUser);
// Tasks
const canUpdateTask = props.hasPermission(
Expand All @@ -139,21 +139,21 @@ export function Header(props) {
);
// Teams
const canAccessTeams =
props.hasPermission('postTeam', !isAuthUser ) ||
props.hasPermission('postTeam', !isAuthUser) ||
props.hasPermission('putTeam', !isAuthUser) ||
props.hasPermission('deleteTeam', !isAuthUser ) ||
props.hasPermission('deleteTeam', !isAuthUser) ||
props.hasPermission('assignTeamToUsers', !isAuthUser);
// Popups
const canAccessPopups =
props.hasPermission('createPopup', !isAuthUser) ||
props.hasPermission('updatePopup', !isAuthUser );
props.hasPermission('updatePopup', !isAuthUser);
// SendEmails
const canAccessSendEmails = props.hasPermission('sendEmails', !isAuthUser);
// Permissions
const canAccessPermissionsManagement =
props.hasPermission('postRole', !isAuthUser ) ||
props.hasPermission('putRole', !isAuthUser ) ||
props.hasPermission('deleteRole', !isAuthUser ) ||
props.hasPermission('postRole', !isAuthUser) ||
props.hasPermission('putRole', !isAuthUser) ||
props.hasPermission('deleteRole', !isAuthUser) ||
props.hasPermission('putUserProfilePermissions', !isAuthUser);

// Blue Square Email Management
Expand Down Expand Up @@ -455,9 +455,8 @@ export function Header(props) {
</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
>

<DropdownItem
Expand Down Expand Up @@ -526,9 +525,8 @@ export function Header(props) {
<span>{PROJECTS}</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
disabled={headerDisabled}
>
<DropdownItem tag={Link} to="/bmdashboard/inventorytypes" className={fontColor}>
Expand Down Expand Up @@ -617,9 +615,8 @@ export function Header(props) {
<span>{REPORTS}</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
>
{canGetReports && (
<DropdownItem
Expand Down Expand Up @@ -715,88 +712,96 @@ export function Header(props) {
canAccessSendEmails ||
canAccessPermissionsManagement ||
canAccessBlueSquareEmailManagement) && (
<UncontrolledDropdown nav inNavbar>
<DropdownToggle nav caret>
<span>{OTHER_LINKS}</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
>
{canAccessUserManagement && (
<DropdownItem
tag={Link}
to="/usermanagement"
className={fontColor}
disabled={headerDisabled}
>
{USER_MANAGEMENT}
</DropdownItem>
)}
{canAccessBadgeManagement && (
<DropdownItem
tag={Link}
to="/badgemanagement"
className={fontColor}
disabled={headerDisabled}
>
{BADGE_MANAGEMENT}
</DropdownItem>
)}
{canAccessProjects && (
<DropdownItem
tag={Link}
to="/projects"
className={fontColor}
disabled={headerDisabled}
>
{PROJECTS}
</DropdownItem>
)}
{canAccessTeams && (
<DropdownItem
tag={Link}
to="/teams"
className={fontColor}
disabled={headerDisabled}
>
{TEAMS}
</DropdownItem>
)}
{canAccessSendEmails && (
<DropdownItem
tag={Link}
to="/announcements"
className={fontColor}
disabled={headerDisabled}
>
{SEND_EMAILS}
</DropdownItem>
)}
{canAccessPermissionsManagement && (
<>
<DropdownItem divider className={styles.hideInMobile} />
<UncontrolledDropdown nav inNavbar>
<DropdownToggle nav caret>
<span>{OTHER_LINKS}</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
>
{canAccessUserManagement && (
<DropdownItem
tag={Link}
to="/permissionsmanagement"
to="/usermanagement"
className={fontColor}
disabled={headerDisabled}
>
{PERMISSIONS_MANAGEMENT}
{USER_MANAGEMENT}
</DropdownItem>
</>
)}
{canAccessBlueSquareEmailManagement && (
)}
{canAccessBadgeManagement && (
<DropdownItem
tag={Link}
to="/badgemanagement"
className={fontColor}
disabled={headerDisabled}
>
{BADGE_MANAGEMENT}
</DropdownItem>
)}
{canAccessProjects && (
<DropdownItem
tag={Link}
to="/projects"
className={fontColor}
disabled={headerDisabled}
>
{PROJECTS}
</DropdownItem>
)}
{(canAccessProjects || canUpdateTask) && (
<DropdownItem
tag={Link}
to="/resolvedtasks"
className={fontColor}
disabled={headerDisabled}
>
{TASKS}
</DropdownItem>
)}
{canAccessTeams && (
<DropdownItem
tag={Link}
to="/teams"
className={fontColor}
disabled={headerDisabled}
>
{TEAMS}
</DropdownItem>
)}
{canAccessSendEmails && (
<DropdownItem
tag={Link}
to="/announcements"
className={fontColor}
disabled={headerDisabled}
>
{SEND_EMAILS}
</DropdownItem>
)}
{canAccessPermissionsManagement && (
<>
<DropdownItem divider className={styles.hideInMobile} />
<DropdownItem
tag={Link}
to="/permissionsmanagement"
className={fontColor}
disabled={headerDisabled}
>
{PERMISSIONS_MANAGEMENT}
</DropdownItem>
</>
)}
<DropdownItem divider className={styles.hideInMobile} />
<DropdownItem
tag={Link}
to="/bluesquare-email-management"
to="/pr-dashboard/overview"
className={fontColor}
disabled={headerDisabled}
>
{BLUE_SQUARE_EMAIL_MANAGEMENT}
PR Team Analytics
</DropdownItem>
)}
</DropdownMenu>
</UncontrolledDropdown>
)}
Expand Down Expand Up @@ -868,8 +873,6 @@ export function Header(props) {
<BellNotification userId={displayUserId} />
</NavItem>



<NavItem className={styles.hideInMobile}>
<NavLink tag={Link} to={`/userprofile/${displayUserId}`}>
<div
Expand All @@ -894,9 +897,8 @@ export function Header(props) {
</span>
</DropdownToggle>
<DropdownMenu
className={`${styles.noMaxHeight} ${
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
}`}
>
<DropdownItem
header
Expand Down
Loading
Loading