SONAR-16683 [891475] global menu aria-current

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx
index 866004c5051fb7f5acf2f232ab9de3a4eb90e020..ae72bfedf00b432da7eebc73726fa5f78ca78d7e 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx
@@ -46,7 +46,10 @@ export class GlobalNavMenu extends React.PureComponent<Props> {
 
     return (
       <li>
-        <Link className={classNames({ active })} to="/projects">
+        <Link
+          aria-current={active ? 'page' : undefined}
+          className={classNames({ active })}
+          to="/projects">
           {translate('projects.page')}
         </Link>
       </li>
@@ -64,17 +67,18 @@ export class GlobalNavMenu extends React.PureComponent<Props> {
   }
 
   renderIssuesLink() {
-    const active = this.props.location.pathname.startsWith('/issues');
-
     const search = (this.props.currentUser.isLoggedIn && isMySet()
       ? new URLSearchParams({ resolved: 'false', myIssues: 'true' })
       : new URLSearchParams({ resolved: 'false' })
     ).toString();
+
     return (
       <li>
-        <Link className={classNames({ active })} to={{ pathname: '/issues', search }}>
+        <NavLink
+          className={({ isActive }) => (isActive ? ACTIVE_CLASS_NAME : '')}
+          to={{ pathname: '/issues', search }}>
           {translate('issues.page')}
-        </Link>
+        </NavLink>
       </li>
     );
   }