From d07f205c2ee51e7ec24ccdef16d44e44bc998474 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Wed, 27 Jul 2022 15:44:32 +0200
Subject: [PATCH] SONAR-16683 [891479] Semantic web for help, search and
 account menu

---
 .../src/main/js/app/components/nav/global/GlobalNav.css   | 8 +++++---
 .../src/main/js/app/components/nav/global/GlobalNav.tsx   | 4 ++--
 .../main/js/app/components/nav/global/GlobalNavUser.tsx   | 7 +++----
 .../__tests__/__snapshots__/GlobalNav-test.tsx.snap       | 8 ++++----
 .../__tests__/__snapshots__/GlobalNavUser-test.tsx.snap   | 5 ++---
 .../src/main/js/app/components/search/Search.tsx          | 4 ++--
 .../components/embed-docs-modal/EmbedDocsPopupHelper.tsx  | 4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
index 949f6f212b9..4555cecf010 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
@@ -41,7 +41,6 @@
 
 .navbar-login {
   margin-right: -10px;
-  white-space: nowrap;
 }
 
 .navbar-avatar {
@@ -70,7 +69,8 @@
   height: var(--globalNavHeight);
 }
 
-.global-navbar-menu > li > a {
+.global-navbar-menu > li > a,
+.global-navbar-menu .navbar-login {
   display: block;
   height: var(--globalNavHeight);
   padding: calc((var(--globalNavHeight) - var(--globalNavContentHeight)) / 2) 10px;
@@ -88,7 +88,9 @@
 .global-navbar-menu > li > a.active,
 .global-navbar-menu > li > a:hover,
 .global-navbar-menu > li > a:focus,
-.global-navbar-menu > .dropdown.open > a {
+.navbar-login.active,
+.navbar-login:hover,
+.navbar-login:focus {
   background-color: #020202;
   border-bottom-color: var(--blue);
 }
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
index 6dd85f5fde4..f04302d2f4a 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
@@ -42,11 +42,11 @@ export function GlobalNav(props: GlobalNavProps) {
 
       <GlobalNavMenu currentUser={currentUser} location={location} />
 
-      <ul className="global-navbar-menu global-navbar-menu-right">
+      <div className="global-navbar-menu global-navbar-menu-right">
         <EmbedDocsPopupHelper />
         <Search />
         <GlobalNavUser currentUser={currentUser} />
-      </ul>
+      </div>
     </NavBar>
   );
 }
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx
index b56309057c0..089c8705516 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx
@@ -75,8 +75,7 @@ export class GlobalNavUser extends React.PureComponent<Props> {
               </a>
             </li>
           </ul>
-        }
-        tagName="li">
+        }>
         <a className="dropdown-toggle navbar-avatar" href="#" title={currentUser.name}>
           <Avatar
             hash={currentUser.avatar}
@@ -90,11 +89,11 @@ export class GlobalNavUser extends React.PureComponent<Props> {
 
   renderAnonymous() {
     return (
-      <li>
+      <div>
         <a className="navbar-login" href="/sessions/new" onClick={this.handleLogin}>
           {translate('layout.login')}
         </a>
-      </li>
+      </div>
     );
   }
 
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNav-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNav-test.tsx.snap
index a6e53684300..e0baf5bebbd 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNav-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNav-test.tsx.snap
@@ -20,7 +20,7 @@ exports[`should render correctly: anonymous users 1`] = `
       }
     }
   />
-  <ul
+  <div
     className="global-navbar-menu global-navbar-menu-right"
   >
     <EmbedDocsPopupHelper />
@@ -33,7 +33,7 @@ exports[`should render correctly: anonymous users 1`] = `
         }
       }
     />
-  </ul>
+  </div>
 </NavBar>
 `;
 
@@ -56,7 +56,7 @@ exports[`should render correctly: logged in users 1`] = `
       }
     }
   />
-  <ul
+  <div
     className="global-navbar-menu global-navbar-menu-right"
   >
     <EmbedDocsPopupHelper />
@@ -68,6 +68,6 @@ exports[`should render correctly: logged in users 1`] = `
         }
       }
     />
-  </ul>
+  </div>
 </NavBar>
 `;
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavUser-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavUser-test.tsx.snap
index 40956326a7d..de81a2b9674 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavUser-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavUser-test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`should render the right interface for anonymous user 1`] = `
-<li>
+<div>
   <a
     className="navbar-login"
     href="/sessions/new"
@@ -9,7 +9,7 @@ exports[`should render the right interface for anonymous user 1`] = `
   >
     layout.login
   </a>
-</li>
+</div>
 `;
 
 exports[`should render the right interface for logged in user 1`] = `
@@ -51,7 +51,6 @@ exports[`should render the right interface for logged in user 1`] = `
       </li>
     </ul>
   }
-  tagName="li"
 >
   <a
     className="dropdown-toggle navbar-avatar"
diff --git a/server/sonar-web/src/main/js/app/components/search/Search.tsx b/server/sonar-web/src/main/js/app/components/search/Search.tsx
index 98996b99490..6663320ef6c 100644
--- a/server/sonar-web/src/main/js/app/components/search/Search.tsx
+++ b/server/sonar-web/src/main/js/app/components/search/Search.tsx
@@ -343,7 +343,7 @@ export class Search extends React.PureComponent<Props, State> {
 
   render() {
     const search = (
-      <li className="navbar-search dropdown">
+      <div className="navbar-search dropdown">
         <DeferredSpinner className="navbar-search-icon" loading={this.state.loading} />
 
         <SearchBox
@@ -393,7 +393,7 @@ export class Search extends React.PureComponent<Props, State> {
             </div>
           </DropdownOverlay>
         )}
-      </li>
+      </div>
     );
 
     return this.state.open ? (
diff --git a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
index 00ba400af41..b78665a57aa 100644
--- a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
+++ b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
@@ -52,7 +52,7 @@ export default class EmbedDocsPopupHelper extends React.PureComponent<{}, State>
 
   render() {
     return (
-      <li className="dropdown">
+      <div className="dropdown">
         <Toggler
           onRequestClose={this.closeHelp}
           open={this.state.helpOpen}
@@ -66,7 +66,7 @@ export default class EmbedDocsPopupHelper extends React.PureComponent<{}, State>
             <HelpIcon />
           </ButtonLink>
         </Toggler>
-      </li>
+      </div>
     );
   }
 }
-- 
2.39.5