add us wellness navlink (#26661)

guardian · Nov 1, 2023 · 9bf3c85 · 9bf3c85
1 parent f83bbeb
commit 9bf3c85
Show file tree

Hide file tree

Showing 3 changed files with 3,217 additions and 3,204 deletions.
diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala
@@ -170,6 +170,7 @@ object NavLinks {
   val ukTravel = NavLink("Travel", "/travel", children = List(travelUk, travelEurope, travelUs))
   val usTravel = ukTravel.copy(children = List(travelUs, travelEurope, travelUk))
   val auTravel = ukTravel.copy(children = List(travelAustralasia, travelAsia, travelUk, travelEurope, travelUs))
+  val usWellness = NavLink("Wellness", "/us/wellness")
 
   val todaysPaper = NavLink(
     "Today's paper",
@@ -304,7 +305,7 @@ object NavLinks {
       tech,
       science,
       newsletters.copy(url = s"${newsletters.url}"),
-      fightForDemocracy,
+      usWellness,
     ),
   )
   val intNewsPillar = ukNewsPillar.copy(
@@ -512,6 +513,7 @@ object NavLinks {
   )
   val usLifestylePillar = ukLifestylePillar.copy(
     children = List(
+      usWellness,
       fashion,
       food,
       recipes,

diff --git a/common/app/navigation/Navigation.scala b/common/app/navigation/Navigation.scala
@@ -137,13 +137,19 @@ object NavMenu {
       pillars: Seq[NavLink],
       otherLinks: Seq[NavLink],
   ): Option[NavLink] = {
-    // Football is currently in the News Pillar and the Sport pillar, however we don't want the parent to be News.
-    def isFootballInNews(parentTitle: String): Boolean = {
-      currentNavLink.title == "Football" && parentTitle == "News"
+
+    // When nav items can appear in two pillars, we want to ignore the least relevant one
+    def shouldIgnoreParent(parentTitle: String): Boolean = {
+      // Football is currently in the News Pillar and the Sport pillar, however we don't want the parent to be News.
+      (currentNavLink.title == "Football" && parentTitle == "News") ||
+      // Wellness is in both the News Pillar and the Lifestyle pillar, however we don't want the parent to be News.
+      (currentNavLink.title == "Wellness" && parentTitle == "News")
     }
 
-    def isParent(link: NavLink): Boolean =
-      link == currentNavLink || link.children.contains(currentNavLink) && !isFootballInNews(link.title)
+    def isParent(link: NavLink): Boolean = {
+      link == currentNavLink ||
+      link.children.contains(currentNavLink) && !shouldIgnoreParent(link.title)
+    }
 
     find(pillars ++ otherLinks, isParent)
       .orElse(find(getChildrenFromOtherEditions(edition), isParent))