From 531978b5d599ba2bf2e135bd035d28e43319bca8 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Tue, 5 Apr 2022 13:17:38 -0700
Subject: [PATCH] remove dropdown from navigation menu

- remove dropdown from gherkin tests
- update snapshots
---
 client/cypress/integration/About.feature      |   6 +-
 .../cypress/integration/Methodology.feature   |   6 +-
 client/src/components/J40Header/J40Header.tsx | 200 ++++++++++--------
 .../__snapshots__/J40Header.test.tsx.snap     | 104 +--------
 .../tests/__snapshots__/about.test.tsx.snap   | 104 +--------
 .../tests/__snapshots__/contact.test.tsx.snap | 104 +--------
 .../__snapshots__/downloads.test.tsx.snap     | 104 +--------
 .../freqAskedQuestions.test.tsx.snap          | 104 +--------
 .../__snapshots__/methodology.test.tsx.snap   | 104 +--------
 .../__snapshots__/publicEng.test.tsx.snap     | 104 +--------
 .../techSupportDoc.test.tsx.snap              | 104 +--------
 11 files changed, 194 insertions(+), 850 deletions(-)

diff --git a/client/cypress/integration/About.feature b/client/cypress/integration/About.feature
index 42d8f2a2..cc4063b0 100644
--- a/client/cypress/integration/About.feature
+++ b/client/cypress/integration/About.feature
@@ -2,18 +2,18 @@ Feature: The About page will open from all other pages
   
   Scenario: About page open when navigating from Methodology page
     Given I am on the "Methodology" page
-    When I click on the "About" dropdown in the navigation
+    # When I click on the "About" dropdown in the navigation
     When I click on the "About" page in the navigation
     Then I see "About" in the title
     
   Scenario: About page open when navigating from Explore the Tool page
     Given I am on the "Explore" page
-    When I click on the "About" dropdown in the navigation
+    # When I click on the "About" dropdown in the navigation
     When I click on the "About" page in the navigation
     Then I see "About" in the title
     
   Scenario: About page open when navigating from Contact page
     Given I am on the "Contact" page
-    When I click on the "About" dropdown in the navigation
+    # When I click on the "About" dropdown in the navigation
     When I click on the "About" page in the navigation
     Then I see "About" in the title
diff --git a/client/cypress/integration/Methodology.feature b/client/cypress/integration/Methodology.feature
index ff314289..973ac151 100644
--- a/client/cypress/integration/Methodology.feature
+++ b/client/cypress/integration/Methodology.feature
@@ -2,18 +2,18 @@ Feature: The Methodology page will open from all other pages
   
   Scenario: Methodology page open when navigating from About page
     Given I am on the "About" page
-    When I click on the "Methodology" dropdown in the navigation
+    # When I click on the "Methodology" dropdown in the navigation
     When I click on the "Methodology" page in the navigation
     Then I see "Methodology" in the title
 
   Scenario: Methodology page open when navigating from Explore the tool page
     Given I am on the "Explore" page
-    When I click on the "Methodology" dropdown in the navigation
+    # When I click on the "Methodology" dropdown in the navigation
     When I click on the "Methodology" page in the navigation
     Then I see "Methodology" in the title
     
   Scenario: Methodology page open when navigating from Contact page
     Given I am on the "Contact" page
-    When I click on the "Methodology" dropdown in the navigation
+    # When I click on the "Methodology" dropdown in the navigation
     When I click on the "Methodology" page in the navigation
     Then I see "Methodology" in the title
\ No newline at end of file
diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx
index 3e3e573b..232e8eeb 100644
--- a/client/src/components/J40Header/J40Header.tsx
+++ b/client/src/components/J40Header/J40Header.tsx
@@ -6,8 +6,8 @@ import {
   PrimaryNav,
   Grid,
   Alert,
-  NavDropDownButton,
-  Menu,
+  // NavDropDownButton,
+  // Menu,
 } from '@trussworks/react-uswds';
 import BetaBanner from '../BetaBanner';
 import J40MainGridContainer from '../J40MainGridContainer';
@@ -42,62 +42,63 @@ const J40Header = () => {
    * index 0 = Data & Methodology dropdown
    * index 1 = About dropdown
    */
-  const [isOpen, setIsOpen] = useState([false, false]);
-  const onToggle = (index: number): void => {
-    setIsOpen((prevIsOpen) => {
-      const newIsOpen = [false, false];
-      newIsOpen[index] = !prevIsOpen[index];
-      return newIsOpen;
-    });
-  };
+  // const [isOpen, setIsOpen] = useState([false, false]);
+  // const onToggle = (index: number): void => {
+  //   setIsOpen((prevIsOpen) => {
+  //     const newIsOpen = [false, false];
+  //     newIsOpen[index] = !prevIsOpen[index];
+  //     return newIsOpen;
+  //   });
+  // };
 
-  const methPageSubNavLinks = [
-    <Link
-      to={PAGES_ENDPOINTS.METHODOLOGY}
-      key={'methodology'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-methodology'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
-    </Link>,
-    <Link
-      to={PAGES_ENDPOINTS.DOWNLOADS}
-      key={'downloads'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-downloads'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS)}
-    </Link>,
-    <Link
-      to={PAGES_ENDPOINTS.TSD}
-      key={'tsd'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-technical-support-docs'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.TSD)}
-    </Link>,
-  ];
+  // Commenting out subnav links for now
+  // const methPageSubNavLinks = [
+  //   <Link
+  //     to={PAGES_ENDPOINTS.METHODOLOGY}
+  //     key={'methodology'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-methodology'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
+  //   </Link>,
+  //   <Link
+  //     to={PAGES_ENDPOINTS.DOWNLOADS}
+  //     key={'downloads'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-downloads'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.DOWNLOADS)}
+  //   </Link>,
+  //   <Link
+  //     to={PAGES_ENDPOINTS.TSD}
+  //     key={'tsd'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-technical-support-docs'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.TSD)}
+  //   </Link>,
+  // ];
 
-  const aboutSubNavLinks = [
-    <Link
-      to={PAGES_ENDPOINTS.ABOUT}
-      key={'about'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-about'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
-    </Link>,
-    <Link
-      to={PAGES_ENDPOINTS.FAQS}
-      key={'faqs'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-faqs'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.FAQs)}
-    </Link>,
-    <Link
-      to={PAGES_ENDPOINTS.PUBLIC_ENG}
-      key={'publicEng'}
-      activeClassName="usa-current"
-      data-cy={'nav-link-public-engagement'}>
-      {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)}
-    </Link>,
-  ];
+  // const aboutSubNavLinks = [
+  //   <Link
+  //     to={PAGES_ENDPOINTS.ABOUT}
+  //     key={'about'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-about'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
+  //   </Link>,
+  //   <Link
+  //     to={PAGES_ENDPOINTS.FAQS}
+  //     key={'faqs'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-faqs'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.FAQs)}
+  //   </Link>,
+  //   <Link
+  //     to={PAGES_ENDPOINTS.PUBLIC_ENG}
+  //     key={'publicEng'}
+  //     activeClassName="usa-current"
+  //     data-cy={'nav-link-public-engagement'}>
+  //     {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)}
+  //   </Link>,
+  // ];
 
   const navLinks = [
     <Link
@@ -107,42 +108,57 @@ const J40Header = () => {
       data-cy={'nav-link-explore-the-tool'}>
       {intl.formatMessage(COMMON_COPY.HEADER.EXPLORE)}
     </Link>,
-    <>
-      <NavDropDownButton
-        key="methDropDown"
-        label={intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
-        menuId="methMenu"
-        isOpen={isOpen[0]}
-        onToggle={(): void => onToggle(0)}
-        data-cy={'nav-dropdown-methodology'}
-      >
-      </NavDropDownButton>
-      <Menu
-        id='methMenu'
-        type='subnav'
-        items={methPageSubNavLinks}
-        isOpen={isOpen[0]}
-      >
-      </Menu>
-    </>,
-    <>
-      <NavDropDownButton
-        key="aboutDropDown"
-        label={intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
-        menuId="aboutMenu"
-        isOpen={isOpen[1]}
-        onToggle={(): void => onToggle(1)}
-        data-cy={'nav-dropdown-about'}
-      >
-      </NavDropDownButton>
-      <Menu
-        id='aboutMenu'
-        type='subnav'
-        items={aboutSubNavLinks}
-        isOpen={isOpen[1]}
-      >
-      </Menu>
-    </>,
+    <Link
+      to={PAGES_ENDPOINTS.METHODOLOGY}
+      key={'methodology'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-methodology'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
+    </Link>,
+    <Link
+      to={PAGES_ENDPOINTS.ABOUT}
+      key={'about'}
+      activeClassName="usa-current"
+      data-cy={'nav-link-about'}>
+      {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
+    </Link>,
+    // <>
+    //   <NavDropDownButton
+    //     key="methDropDown"
+    //     label={intl.formatMessage(COMMON_COPY.HEADER.METHODOLOGY)}
+    //     menuId="methMenu"
+    //     isOpen={isOpen[0]}
+    //     onToggle={(): void => onToggle(0)}
+    //     data-cy={'nav-dropdown-methodology'}
+    //     className={styles.navDropDownBtn}
+    //   >
+    //   </NavDropDownButton>
+    //   <Menu
+    //     id='methMenu'
+    //     type='subnav'
+    //     items={methPageSubNavLinks}
+    //     isOpen={isOpen[0]}
+    //   >
+    //   </Menu>
+    // </>,
+    // <>
+    //   <NavDropDownButton
+    //     key="aboutDropDown"
+    //     label={intl.formatMessage(COMMON_COPY.HEADER.ABOUT)}
+    //     menuId="aboutMenu"
+    //     isOpen={isOpen[1]}
+    //     onToggle={(): void => onToggle(1)}
+    //     data-cy={'nav-dropdown-about'}
+    //   >
+    //   </NavDropDownButton>
+    //   <Menu
+    //     id='aboutMenu'
+    //     type='subnav'
+    //     items={aboutSubNavLinks}
+    //     isOpen={isOpen[1]}
+    //   >
+    //   </Menu>
+    // </>,
     <Link
       to={PAGES_ENDPOINTS.CONTACT}
       key={'contact'}
diff --git a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
index 5dfb9898..a62dc1ce 100644
--- a/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
+++ b/client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
index 1374b734..8533aa39 100644
--- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
index e8078c6c..498ecea3 100644
--- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
index e11ba5c9..775bdf7c 100644
--- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
index 20348c29..3e2671a2 100644
--- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
index bb63e65d..4bb0c97c 100644
--- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
index c1b11949..3a679631 100644
--- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
index 4886e010..0113f62d 100644
--- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
+++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
@@ -231,106 +231,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="methMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-methodology"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-methodology"
+                  href="/en/methodology"
                 >
-                  <span>
-                    Methodology & data
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="methMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-methodology"
-                      href="/en/methodology"
-                    >
-                      Methodology & data
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-downloads"
-                      href="/en/downloads"
-                    >
-                      Downloads
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-technical-support-docs"
-                      href="/en/technical-support-document"
-                    >
-                      Technical Support Document
-                    </a>
-                  </li>
-                </ul>
+                  Methodology & data
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"
               >
-                <button
-                  aria-controls="aboutMenu"
-                  aria-expanded="false"
-                  class="usa-accordion__button usa-nav__link"
-                  data-cy="nav-dropdown-about"
-                  data-testid="navDropDownButton"
-                  type="button"
+                <a
+                  data-cy="nav-link-about"
+                  href="/en/about"
                 >
-                  <span>
-                    About
-                  </span>
-                </button>
-                <ul
-                  class="usa-nav__submenu"
-                  hidden=""
-                  id="aboutMenu"
-                >
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-about"
-                      href="/en/about"
-                    >
-                      About
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-faqs"
-                      href="/en/frequently-asked-questions"
-                    >
-                      Frequently asked questions
-                    </a>
-                  </li>
-                  <li
-                    class="usa-nav__submenu-item"
-                  >
-                    <a
-                      data-cy="nav-link-public-engagement"
-                      href="/en/public-engagement"
-                    >
-                      Engagement calendar
-                    </a>
-                  </li>
-                </ul>
+                  About
+                </a>
               </li>
               <li
                 class="usa-nav__primary-item"