Skip to content

Commit afffa7d

Browse files
vivekchandrabsrithika-paii
vivekchandrabs
authored and
rithika-paii
committed
Chore: Implement resolved task feature for the frontend.
1 parent 156cbf7 commit afffa7d

6 files changed

Lines changed: 3071 additions & 4817 deletions

File tree

‎src/components/Header/Header.jsx‎

Lines changed: 106 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export function Header(props) {
8484
const collapseRef = useRef(null);
8585
const toggleRef = useRef(null);
8686
const [isAckLoading, setIsAckLoading] = useState(false);
87-
const [ showPromotionsPopup, setShowPromotionsPopup ] = useState(false);
87+
const [showPromotionsPopup, setShowPromotionsPopup] = useState(false);
8888

8989
const ALLOWED_ROLES_TO_INTERACT = useMemo(() => ['Owner', 'Administrator'], []);
9090
const canInteractWithViewingUser = useMemo(
@@ -96,7 +96,7 @@ export function Header(props) {
9696
// Reports
9797
const canGetReports = props.hasPermission(
9898
'getReports',
99-
!isAuthUser ,
99+
!isAuthUser,
100100
);
101101
const canGetWeeklySummaries = props.hasPermission(
102102
'getWeeklySummaries',
@@ -116,21 +116,21 @@ export function Header(props) {
116116

117117
// Badges
118118
const canAccessBadgeManagement =
119-
props.hasPermission('seeBadges', !isAuthUser ) ||
120-
props.hasPermission('createBadges', !isAuthUser ) ||
119+
props.hasPermission('seeBadges', !isAuthUser) ||
120+
props.hasPermission('createBadges', !isAuthUser) ||
121121
props.hasPermission('updateBadges', !isAuthUser) ||
122-
props.hasPermission('deleteBadges', !isAuthUser );
122+
props.hasPermission('deleteBadges', !isAuthUser);
123123
// Projects
124124
const canAccessProjects =
125-
props.hasPermission('postProject', !isAuthUser ) ||
126-
props.hasPermission('deleteProject', !isAuthUser ) ||
127-
props.hasPermission('putProject', !isAuthUser ) ||
128-
props.hasPermission('getProjectMembers', !isAuthUser ) ||
129-
props.hasPermission('assignProjectToUsers', !isAuthUser ) ||
130-
props.hasPermission('postWbs', !isAuthUser ) ||
131-
props.hasPermission('deleteWbs', !isAuthUser ) ||
132-
props.hasPermission('postTask', !isAuthUser ) ||
133-
props.hasPermission('updateTask', !isAuthUser ) ||
125+
props.hasPermission('postProject', !isAuthUser) ||
126+
props.hasPermission('deleteProject', !isAuthUser) ||
127+
props.hasPermission('putProject', !isAuthUser) ||
128+
props.hasPermission('getProjectMembers', !isAuthUser) ||
129+
props.hasPermission('assignProjectToUsers', !isAuthUser) ||
130+
props.hasPermission('postWbs', !isAuthUser) ||
131+
props.hasPermission('deleteWbs', !isAuthUser) ||
132+
props.hasPermission('postTask', !isAuthUser) ||
133+
props.hasPermission('updateTask', !isAuthUser) ||
134134
props.hasPermission('deleteTask', !isAuthUser);
135135
// Tasks
136136
const canUpdateTask = props.hasPermission(
@@ -139,21 +139,21 @@ export function Header(props) {
139139
);
140140
// Teams
141141
const canAccessTeams =
142-
props.hasPermission('postTeam', !isAuthUser ) ||
142+
props.hasPermission('postTeam', !isAuthUser) ||
143143
props.hasPermission('putTeam', !isAuthUser) ||
144-
props.hasPermission('deleteTeam', !isAuthUser ) ||
144+
props.hasPermission('deleteTeam', !isAuthUser) ||
145145
props.hasPermission('assignTeamToUsers', !isAuthUser);
146146
// Popups
147147
const canAccessPopups =
148148
props.hasPermission('createPopup', !isAuthUser) ||
149-
props.hasPermission('updatePopup', !isAuthUser );
149+
props.hasPermission('updatePopup', !isAuthUser);
150150
// SendEmails
151151
const canAccessSendEmails = props.hasPermission('sendEmails', !isAuthUser);
152152
// Permissions
153153
const canAccessPermissionsManagement =
154-
props.hasPermission('postRole', !isAuthUser ) ||
155-
props.hasPermission('putRole', !isAuthUser ) ||
156-
props.hasPermission('deleteRole', !isAuthUser ) ||
154+
props.hasPermission('postRole', !isAuthUser) ||
155+
props.hasPermission('putRole', !isAuthUser) ||
156+
props.hasPermission('deleteRole', !isAuthUser) ||
157157
props.hasPermission('putUserProfilePermissions', !isAuthUser);
158158

159159
// Blue Square Email Management
@@ -455,9 +455,8 @@ export function Header(props) {
455455
</span>
456456
</DropdownToggle>
457457
<DropdownMenu
458-
className={`${styles.noMaxHeight} ${
459-
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
460-
}`}
458+
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
459+
}`}
461460
>
462461

463462
<DropdownItem
@@ -526,9 +525,8 @@ export function Header(props) {
526525
<span>{PROJECTS}</span>
527526
</DropdownToggle>
528527
<DropdownMenu
529-
className={`${styles.noMaxHeight} ${
530-
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
531-
}`}
528+
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
529+
}`}
532530
disabled={headerDisabled}
533531
>
534532
<DropdownItem tag={Link} to="/bmdashboard/inventorytypes" className={fontColor}>
@@ -622,9 +620,8 @@ export function Header(props) {
622620
<span>{REPORTS}</span>
623621
</DropdownToggle>
624622
<DropdownMenu
625-
className={`${styles.noMaxHeight} ${
626-
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
627-
}`}
623+
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
624+
}`}
628625
>
629626
{canGetReports && (
630627
<DropdownItem
@@ -720,88 +717,96 @@ export function Header(props) {
720717
canAccessSendEmails ||
721718
canAccessPermissionsManagement ||
722719
canAccessBlueSquareEmailManagement) && (
723-
<UncontrolledDropdown nav inNavbar>
724-
<DropdownToggle nav caret>
725-
<span>{OTHER_LINKS}</span>
726-
</DropdownToggle>
727-
<DropdownMenu
728-
className={`${styles.noMaxHeight} ${
729-
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
730-
}`}
731-
>
732-
{canAccessUserManagement && (
733-
<DropdownItem
734-
tag={Link}
735-
to="/usermanagement"
736-
className={fontColor}
737-
disabled={headerDisabled}
738-
>
739-
{USER_MANAGEMENT}
740-
</DropdownItem>
741-
)}
742-
{canAccessBadgeManagement && (
743-
<DropdownItem
744-
tag={Link}
745-
to="/badgemanagement"
746-
className={fontColor}
747-
disabled={headerDisabled}
748-
>
749-
{BADGE_MANAGEMENT}
750-
</DropdownItem>
751-
)}
752-
{canAccessProjects && (
753-
<DropdownItem
754-
tag={Link}
755-
to="/projects"
756-
className={fontColor}
757-
disabled={headerDisabled}
758-
>
759-
{PROJECTS}
760-
</DropdownItem>
761-
)}
762-
{canAccessTeams && (
763-
<DropdownItem
764-
tag={Link}
765-
to="/teams"
766-
className={fontColor}
767-
disabled={headerDisabled}
768-
>
769-
{TEAMS}
770-
</DropdownItem>
771-
)}
772-
{canAccessSendEmails && (
773-
<DropdownItem
774-
tag={Link}
775-
to="/announcements"
776-
className={fontColor}
777-
disabled={headerDisabled}
778-
>
779-
{SEND_EMAILS}
780-
</DropdownItem>
781-
)}
782-
{canAccessPermissionsManagement && (
783-
<>
784-
<DropdownItem divider className={styles.hideInMobile} />
720+
<UncontrolledDropdown nav inNavbar>
721+
<DropdownToggle nav caret>
722+
<span>{OTHER_LINKS}</span>
723+
</DropdownToggle>
724+
<DropdownMenu
725+
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
726+
}`}
727+
>
728+
{canAccessUserManagement && (
785729
<DropdownItem
786730
tag={Link}
787-
to="/permissionsmanagement"
731+
to="/usermanagement"
788732
className={fontColor}
789733
disabled={headerDisabled}
790734
>
791-
{PERMISSIONS_MANAGEMENT}
735+
{USER_MANAGEMENT}
792736
</DropdownItem>
793-
</>
794-
)}
795-
{canAccessBlueSquareEmailManagement && (
737+
)}
738+
{canAccessBadgeManagement && (
739+
<DropdownItem
740+
tag={Link}
741+
to="/badgemanagement"
742+
className={fontColor}
743+
disabled={headerDisabled}
744+
>
745+
{BADGE_MANAGEMENT}
746+
</DropdownItem>
747+
)}
748+
{canAccessProjects && (
749+
<DropdownItem
750+
tag={Link}
751+
to="/projects"
752+
className={fontColor}
753+
disabled={headerDisabled}
754+
>
755+
{PROJECTS}
756+
</DropdownItem>
757+
)}
758+
{(canAccessProjects || canUpdateTask) && (
759+
<DropdownItem
760+
tag={Link}
761+
to="/resolvedtasks"
762+
className={fontColor}
763+
disabled={headerDisabled}
764+
>
765+
{TASKS}
766+
</DropdownItem>
767+
)}
768+
{canAccessTeams && (
769+
<DropdownItem
770+
tag={Link}
771+
to="/teams"
772+
className={fontColor}
773+
disabled={headerDisabled}
774+
>
775+
{TEAMS}
776+
</DropdownItem>
777+
)}
778+
{canAccessSendEmails && (
779+
<DropdownItem
780+
tag={Link}
781+
to="/announcements"
782+
className={fontColor}
783+
disabled={headerDisabled}
784+
>
785+
{SEND_EMAILS}
786+
</DropdownItem>
787+
)}
788+
{canAccessPermissionsManagement && (
789+
<>
790+
<DropdownItem divider className={styles.hideInMobile} />
791+
<DropdownItem
792+
tag={Link}
793+
to="/permissionsmanagement"
794+
className={fontColor}
795+
disabled={headerDisabled}
796+
>
797+
{PERMISSIONS_MANAGEMENT}
798+
</DropdownItem>
799+
</>
800+
)}
801+
<DropdownItem divider className={styles.hideInMobile} />
796802
<DropdownItem
797803
tag={Link}
798-
to="/bluesquare-email-management"
804+
to="/pr-dashboard/overview"
799805
className={fontColor}
800806
disabled={headerDisabled}
801807
>
802-
{BLUE_SQUARE_EMAIL_MANAGEMENT}
808+
PR Team Analytics
803809
</DropdownItem>
804-
)}
805810
</DropdownMenu>
806811
</UncontrolledDropdown>
807812
)}
@@ -873,8 +878,6 @@ export function Header(props) {
873878
<BellNotification userId={displayUserId} />
874879
</NavItem>
875880

876-
877-
878881
<NavItem className={styles.hideInMobile}>
879882
<NavLink tag={Link} to={`/userprofile/${displayUserId}`}>
880883
<div
@@ -899,9 +902,8 @@ export function Header(props) {
899902
</span>
900903
</DropdownToggle>
901904
<DropdownMenu
902-
className={`${styles.noMaxHeight} ${
903-
darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
904-
}`}
905+
className={`${styles.noMaxHeight} ${darkMode ? styles.darkMenuDropdown : styles.mobileMenuDropdown
906+
}`}
905907
>
906908
<DropdownItem
907909
header

0 commit comments

Comments
 (0)