(VADC-1455, VADC-1454, VADC-1424): mis 508 fixes (#1637)

uc-cdis · Nov 15, 2024 · 305d9bd · 305d9bd
1 parent 7db9b26
commit 305d9bd
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 24 deletions.
diff --git a/src/UserProfile/UserProfile.jsx b/src/UserProfile/UserProfile.jsx
@@ -59,7 +59,7 @@ const UserProfile = ({
       {
         userProfile.jtis !== undefined && userProfile.jtis !== []
         && (
-          <ul className='user-profile__key-pair-table'>
+          <div className='user-profile__key-pair-table'>
             {
               popups.deleteTokenPopup === true
             && (
@@ -153,7 +153,7 @@ const UserProfile = ({
               />
             )
             }
-          </ul>
+          </div>
         )
       }
       {

diff --git a/src/components/layout/Footer.jsx b/src/components/layout/Footer.jsx
@@ -16,7 +16,7 @@ class Footer extends Component {
     }
     return (
       <footer className='footer-container'>
-        <nav className='footer__nav'>
+        <nav className='footer__nav' aria-label='Footer'>
           <div className='footer__version-area'>
             {
               [{ name: 'Dictionary', version: this.props.dictionaryVersion },

diff --git a/src/components/layout/NavBar.jsx b/src/components/layout/NavBar.jsx
@@ -93,8 +93,8 @@ class NavBar extends Component {
 
     return (
       <div className='nav-bar'>
-        <header className='nav-bar__header'>
-          <nav className='nav-bar__nav--info'>
+        <nav className='nav-bar__header' aria-label='Main'>
+          <div className='nav-bar__nav--info'>
             <div className='nav-bar__logo g3-ring-on-focus'>
               {homepageHref
                 ? (
@@ -142,7 +142,7 @@ class NavBar extends Component {
                 </div>
               )
             }
-          </nav>
+          </div>
           <MediaQuery query={`(max-width: ${breakpoints.tablet}px)`}>
             <div
               className='nav-bar__menu'
@@ -160,21 +160,21 @@ class NavBar extends Component {
             </div>
             {
               this.state.menuOpen ? (
-                <nav className='nav-bar__nav--items'>
+                <div className='nav-bar__nav--items'>
                   { navItems }
-                </nav>
+                </div>
               ) : null
             }
           </MediaQuery>
           <MediaQuery query={`(min-width: ${breakpoints.tablet + 1}px)`}>
-            <nav className='nav-bar__nav--items'>
+            <div className='nav-bar__nav--items'>
               { navItems }
-            </nav>
+            </div>
             { this.state.tooltipDetails.content !== ''
               ? <NavBarTooltip {...this.state.tooltipDetails} />
               : null }
           </MediaQuery>
-        </header>
+        </nav>
       </div>
     );
   }

diff --git a/src/components/layout/TopBar.jsx b/src/components/layout/TopBar.jsx
@@ -36,8 +36,8 @@ class TopBar extends Component {
   render() {
     return (
       <div className='top-bar'>
-        <header className='top-bar__header'>
-          <nav className='top-bar__nav'>
+        <div className='top-bar__header'>
+          <nav className='top-bar__nav' aria-label='Top'>
             <a
               href='#main-content'
               className='top-bar__link g3-ring-on-focus top-bar__link_skip'
@@ -206,7 +206,7 @@ class TopBar extends Component {
                 key={banner.id}
               />
             ))}
-        </header>
+        </div>
       </div>
     );
   }

diff --git a/src/covid19Index.jsx b/src/covid19Index.jsx
@@ -166,8 +166,10 @@ async function init() {
                   </Helmet>
                 )
                 : null}
-              <ReduxTopBar />
-              <ReduxNavBar />
+              <header>
+                <ReduxTopBar />
+                <ReduxNavBar />
+              </header>
               <div className='main-content' id='main-content'>
                 <ReduxWorkspaceShutdownBanner />
                 <ReduxWorkspaceShutdownPopup />

diff --git a/src/ecosystemIndex.jsx b/src/ecosystemIndex.jsx
@@ -169,8 +169,10 @@ async function init() {
                   </Helmet>
                 )
                 : null}
-              <ReduxTopBar />
-              <ReduxNavBar />
+              <header>
+                <ReduxTopBar />
+                <ReduxNavBar />
+              </header>
               <div className='main-content' id='main-content'>
                 <ReduxWorkspaceShutdownBanner />
                 <ReduxWorkspaceShutdownPopup />

diff --git a/src/index.jsx b/src/index.jsx
@@ -178,8 +178,10 @@ async function init() {
                   </Helmet>
                 )
                 : null}
-              <ReduxTopBar />
-              <ReduxNavBar />
+              <header>
+                <ReduxTopBar />
+                <ReduxNavBar />
+              </header>
               <div className='main-content' id='main-content'>
                 <ReduxWorkspaceShutdownBanner />
                 <ReduxWorkspaceShutdownPopup />

diff --git a/src/nctIndex.jsx b/src/nctIndex.jsx
@@ -192,8 +192,10 @@ async function init() {
                   </Helmet>
                 )
                 : null}
-              <ReduxTopBar />
-              <ReduxNavBar />
+              <header>
+                <ReduxTopBar />
+                <ReduxNavBar />
+              </header>
               <div className='main-content' id='main-content'>
                 <ReduxWorkspaceShutdownBanner />
                 <ReduxWorkspaceShutdownPopup />

diff --git a/src/workspaceIndex.jsx b/src/workspaceIndex.jsx
@@ -141,8 +141,10 @@ async function init() {
                   </Helmet>
                 )
                 : null}
-              <ReduxTopBar />
-              <ReduxNavBar />
+              <header>
+                <ReduxTopBar />
+                <ReduxNavBar />
+              </header>
               <div className='main-content' id='main-content'>
                 <ReduxWorkspaceShutdownBanner />
                 <ReduxWorkspaceShutdownPopup />
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ const UserProfile = ({ @@
           {
             userProfile.jtis !== undefined && userProfile.jtis !== []
             && (
-              <ul className='user-profile__key-pair-table'>
+              <div className='user-profile__key-pair-table'>
                 {
                   popups.deleteTokenPopup === true
                 && (
@@ Expand Down Expand Up / @@ -153,7 +153,7 @@ const UserProfile = ({ @@
                   />
                 )
                 }
-              </ul>
+              </div>
             )
           }
           {
@@ Expand Down @@