From a513e75f7518bb87f6ab16f2dd5eb68bb3276a94 Mon Sep 17 00:00:00 2001 From: LaKeishaW Date: Tue, 16 Jun 2026 09:58:29 -0500 Subject: [PATCH 1/5] FDG-11738 --- .../site-header/mobile-menu/mobile-menu.jsx | 8 + .../site-header/site-header-helper.js | 229 +++++++++--------- 2 files changed, 127 insertions(+), 110 deletions(-) diff --git a/src/components/site-header/mobile-menu/mobile-menu.jsx b/src/components/site-header/mobile-menu/mobile-menu.jsx index 616dd3543..5ac59f1bf 100644 --- a/src/components/site-header/mobile-menu/mobile-menu.jsx +++ b/src/components/site-header/mobile-menu/mobile-menu.jsx @@ -74,10 +74,18 @@ const MobileMenu = ({ setOpenGlossary }) => { isExperimental: true, featureId: 'featured-content', children: [ + { + to: '/featured-content/historic-data-now-available/', + name: 'Historic Data Now Available', + }, { to: '/featured-content/story-of-data-transparency/', name: 'The Story of Data Transparency', }, + { + to: '/featured-content/history-of-government-spending/', + name: 'A History of Government Spending', + }, ], }, ]; diff --git a/src/components/site-header/site-header-helper.js b/src/components/site-header/site-header-helper.js index 343db1ee3..b35d36fd8 100644 --- a/src/components/site-header/site-header-helper.js +++ b/src/components/site-header/site-header-helper.js @@ -1,111 +1,120 @@ export const menuSections = [ - { - title: 'Topics', - children: [ - { - header: 'FEATURED TOPICS', - analyticsAction: 'Topics Click', - children: [ - { - to: '/interest-expense-avg-interest-rates/', - title: 'Interest Expense', - }, - { - to: '/treasury-savings-bonds/', - title: 'Savings Bonds', - }, - { - to: '/state-and-local-government-series/', - title: 'State and Local Government Series', - }, - ], - }, - { - header: "AMERICA'S FINANCE GUIDE", - analyticsAction: 'Topics Click', - children: [ - { - to: '/americas-finance-guide/', - title: 'Overview', - }, - { - to: '/americas-finance-guide/government-revenue/', - title: 'Revenue', - }, - { - to: '/americas-finance-guide/federal-spending/', - title: 'Spending', - }, - { - to: '/americas-finance-guide/national-deficit/', - title: 'Deficit', - }, - { - to: '/americas-finance-guide/national-debt/', - title: 'Debt', - }, - ], - }, - { - header: 'FEATURED CONTENT', - analyticsAction: 'Topics Click', - isExperimental: true, - featureId: 'featured-content', - children: [ - { - to: '/featured-content/story-of-data-transparency/', - title: 'The Story of Data Transparency', - }, - ], - }, - ], - }, - { - title: 'Tools', - children: [ - { - to: '/currency-exchange-rates-converter/', - title: 'Currency Exchange Rates Converter', - }, - ], - }, - { - title: 'Dataset Search', - to: '/datasets/', - testId: 'search', - }, - { - title: 'Resources', - children: [ - { - title: 'Glossary', - }, - { - to: '/api-documentation/', - title: 'API Documentation', - }, - { - to: '/release-calendar/', - title: 'Release Calendar', - }, - { - to: 'https://onevoicecrm.my.site.com/FiscalDataCommunity/s/', - title: 'Community Site', - external: true, - skipExternalModal: true, - }, - ], - }, - { - title: 'About Us', - to: '/about-us/', - testId: 'about', - }, - { - title: 'Experimental', - to: '/experimental/', - testId: 'experimental', - isExperimental: true, - featureId: 'experimental-page', - }, -]; + { + title: 'Topics', + children: [ + { + header: 'FEATURED TOPICS', + analyticsAction: 'Topics Click', + children: [ + { + to: '/interest-expense-avg-interest-rates/', + title: 'Interest Expense', + }, + { + to: '/treasury-savings-bonds/', + title: 'Savings Bonds', + }, + { + to: '/state-and-local-government-series/', + title: 'State and Local Government Series', + }, + ], + }, + { + header: "AMERICA'S FINANCE GUIDE", + analyticsAction: 'Topics Click', + children: [ + { + to: '/americas-finance-guide/', + title: 'Overview', + }, + { + to: '/americas-finance-guide/government-revenue/', + title: 'Revenue', + }, + { + to: '/americas-finance-guide/federal-spending/', + title: 'Spending', + }, + { + to: '/americas-finance-guide/national-deficit/', + title: 'Deficit', + }, + { + to: '/americas-finance-guide/national-debt/', + title: 'Debt', + }, + ], + }, + { + header: 'FEATURED CONTENT', + analyticsAction: 'Topics Click', + isExperimental: true, + featureId: 'featured-content', + children: [ + { + to: '/featured-content/historic-data-now-available/', + + title: 'Historic Data Now Available', + }, + { + to: '/featured-content/story-of-data-transparency/', + title: 'The Story of Data Transparency', + }, + { + to: '/featured-content/history-of-government-spending/', + title: 'A History of Government Spending', + }, + ], + }, + ], + }, + { + title: 'Tools', + children: [ + { + to: '/currency-exchange-rates-converter/', + title: 'Currency Exchange Rates Converter', + }, + ], + }, + { + title: 'Dataset Search', + to: '/datasets/', + testId: 'search', + }, + { + title: 'Resources', + children: [ + { + title: 'Glossary', + }, + { + to: '/api-documentation/', + title: 'API Documentation', + }, + { + to: '/release-calendar/', + title: 'Release Calendar', + }, + { + to: 'https://onevoicecrm.my.site.com/FiscalDataCommunity/s/', + title: 'Community Site', + external: true, + skipExternalModal: true, + }, + ], + }, + { + title: 'About Us', + to: '/about-us/', + testId: 'about', + }, + { + title: 'Experimental', + to: '/experimental/', + testId: 'experimental', + isExperimental: true, + featureId: 'experimental-page', + }, + ]; From 330ce84fbcf58d2a82efa85545d8d5733df19714 Mon Sep 17 00:00:00 2001 From: LaKeishaW Date: Mon, 22 Jun 2026 12:05:56 -0500 Subject: [PATCH 2/5] featured content header now a link --- .../site-header/menu-dropdown/menu-dropdown.jsx | 10 +++++++++- src/components/site-header/site-header-helper.js | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/site-header/menu-dropdown/menu-dropdown.jsx b/src/components/site-header/menu-dropdown/menu-dropdown.jsx index 56ac33a58..7fd28c3a0 100644 --- a/src/components/site-header/menu-dropdown/menu-dropdown.jsx +++ b/src/components/site-header/menu-dropdown/menu-dropdown.jsx @@ -105,7 +105,15 @@ const MenuDropdown = ({ content, activeDropdown, setActiveDropdown, glossaryClic const sectionContent = (
-
{section.header}
+
+ {section.to ? ( + handlePageClick(title, section.header)}> + {section.header} + + ) : ( + section.header + )} +
{section.children.map(page => (
diff --git a/src/components/site-header/site-header-helper.js b/src/components/site-header/site-header-helper.js index b35d36fd8..25cacad3c 100644 --- a/src/components/site-header/site-header-helper.js +++ b/src/components/site-header/site-header-helper.js @@ -48,6 +48,7 @@ export const menuSections = [ }, { header: 'FEATURED CONTENT', + to: '/featured-content/', analyticsAction: 'Topics Click', isExperimental: true, featureId: 'featured-content', From 12eae91cc6f5773f293eebdff775260cef1a2191 Mon Sep 17 00:00:00 2001 From: LaKeishaW Date: Mon, 22 Jun 2026 16:26:39 -0500 Subject: [PATCH 3/5] updated links --- src/components/site-header/mobile-menu/mobile-menu.jsx | 4 ++-- src/components/site-header/site-header-helper.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/site-header/mobile-menu/mobile-menu.jsx b/src/components/site-header/mobile-menu/mobile-menu.jsx index 5ac59f1bf..24a849057 100644 --- a/src/components/site-header/mobile-menu/mobile-menu.jsx +++ b/src/components/site-header/mobile-menu/mobile-menu.jsx @@ -75,7 +75,7 @@ const MobileMenu = ({ setOpenGlossary }) => { featureId: 'featured-content', children: [ { - to: '/featured-content/historic-data-now-available/', + to: '/featured-content/historic-data-announcement/', name: 'Historic Data Now Available', }, { @@ -83,7 +83,7 @@ const MobileMenu = ({ setOpenGlossary }) => { name: 'The Story of Data Transparency', }, { - to: '/featured-content/history-of-government-spending/', + to: '/featured-content/historic-govt-spending/', name: 'A History of Government Spending', }, ], diff --git a/src/components/site-header/site-header-helper.js b/src/components/site-header/site-header-helper.js index 25cacad3c..3afe538e6 100644 --- a/src/components/site-header/site-header-helper.js +++ b/src/components/site-header/site-header-helper.js @@ -54,7 +54,7 @@ export const menuSections = [ featureId: 'featured-content', children: [ { - to: '/featured-content/historic-data-now-available/', + to: '/featured-content/historic-data-announcement/', title: 'Historic Data Now Available', }, @@ -63,7 +63,7 @@ export const menuSections = [ title: 'The Story of Data Transparency', }, { - to: '/featured-content/history-of-government-spending/', + to: '/featured-content/historic-govt-spending/', title: 'A History of Government Spending', }, ], From e59715a38df6596d470d2d464127139bb74aadd6 Mon Sep 17 00:00:00 2001 From: LaKeishaW Date: Tue, 23 Jun 2026 10:09:07 -0500 Subject: [PATCH 4/5] link added to mobile menu --- .../mobile-menu-dropdown/mobile-menu-dropdown.jsx | 12 +++++++++++- .../site-header/mobile-menu/mobile-menu.jsx | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx index 7a27de287..8a8c37fbc 100644 --- a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx +++ b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx @@ -77,7 +77,17 @@ const MobileMenuDropdown = ({ header, sections, defaultOpen, setOpenGlossary, se {sections.map(section => { const sectionContent = (
- {section.sectionHeader &&
{section.sectionHeader}
} + {section.sectionHeader && ( +
+ {section.to ? ( + clickHandler(title, section.sectionHeader)}> + {section.sectionHeader} + + ) : ( + section.sectionHeader + )} +
+ )}
{section.children.map(page => { if (page.name === 'Glossary') { diff --git a/src/components/site-header/mobile-menu/mobile-menu.jsx b/src/components/site-header/mobile-menu/mobile-menu.jsx index 24a849057..ceef5982d 100644 --- a/src/components/site-header/mobile-menu/mobile-menu.jsx +++ b/src/components/site-header/mobile-menu/mobile-menu.jsx @@ -70,6 +70,7 @@ const MobileMenu = ({ setOpenGlossary }) => { }, { sectionHeader: 'FEATURED CONTENT', + to: '/featured-content/', analyticsAction: 'Topics Click', isExperimental: true, featureId: 'featured-content', From afd495d66f13f37db2c397df8ef73531ff23f05b Mon Sep 17 00:00:00 2001 From: Noah_Simcoe Date: Tue, 23 Jun 2026 11:18:34 -0500 Subject: [PATCH 5/5] FDG-11738 fixes for mobile link --- .../mobile-menu-dropdown.jsx | 18 ++++++++++++++---- .../mobile-menu-dropdown.module.scss | 7 +++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx index 8a8c37fbc..d0d9205d1 100644 --- a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx +++ b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.jsx @@ -1,5 +1,13 @@ import React, { useState } from 'react'; -import { caret, headerExpanded, linkContainer, mainHeader, resourceLink, sectionHeader } from './mobile-menu-dropdown.module.scss'; +import { + caret, + headerExpanded, + linkContainer, + mainHeader, + resourceLink, + sectionHeader, + sectionHeaderContainer, +} from './mobile-menu-dropdown.module.scss'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faCaretDown } from '@fortawesome/free-solid-svg-icons/faCaretDown'; import { faCaretRight } from '@fortawesome/free-solid-svg-icons/faCaretRight'; @@ -80,9 +88,11 @@ const MobileMenuDropdown = ({ header, sections, defaultOpen, setOpenGlossary, se {section.sectionHeader && (
{section.to ? ( - clickHandler(title, section.sectionHeader)}> - {section.sectionHeader} - +
+ clickHandler(title, section.sectionHeader)}> + {section.sectionHeader} + +
) : ( section.sectionHeader )} diff --git a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.module.scss b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.module.scss index bcd3359e7..d3cfbc1b4 100644 --- a/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.module.scss +++ b/src/components/site-header/mobile-menu/mobile-menu-dropdown/mobile-menu-dropdown.module.scss @@ -26,6 +26,13 @@ } } +.sectionHeaderContainer { + a { + text-decoration: none; + color: $font-body-copy; + } +} + .mainHeader { padding: 0.875rem 0 0.875rem 1rem; }