Merge branch 'main' into ahe/product-summary-element

Author: andrewHEguardian

common/app/navigation/FooterLinks.scala

@@ -47,7 +47,7 @@ object FooterLinks {
   def taxStrategy(edition: String): FooterLink =
     FooterLink(
       "Tax strategy",
-      "https://uploads.guim.co.uk/2025/09/05/Tax_strategy_for_the_year_ended_31_March_2025.pdf",
+      "https://uploads.guim.co.uk/2026/07/22/STL_Global_Tax_Strategy_for_the_year_to_31_March_2027.pdf",
       s"${edition} : footer : tax strategy",
     )
   def newsletters(edition: String): FooterLink = {

common/app/navigation/NavLinks.scala

@@ -117,13 +117,11 @@ object NavLinks {
   private val footballCompetitions = NavLink("Competitions", "/football/competitions", Some("football/competitions"))
   private val footballClubs = NavLink("Clubs", "/football/teams", Some("football/teams"))
   private val soccerSchedules = footballFixtures.copy(title = "Schedules")
-  private val footballWorldCup2026 = NavLink("World Cup 2026", "/football/world-cup-2026")
 
   val football = NavLink(
     "Football",
     "/football",
     children = List(
-      footballWorldCup2026,
       footballScores,
       footballTables,
       footballFixtures,
@@ -136,7 +134,6 @@ object NavLinks {
     "Soccer",
     "/us/soccer",
     children = List(
-      footballWorldCup2026,
       footballScores,
       footballTables,
       soccerSchedules,
@@ -276,7 +273,6 @@ object NavLinks {
     iconName = Some("home"),
     List(
       ukNews,
-      footballWorldCup2026,
       usPolitics,
       world,
       climateCrisis,
@@ -299,7 +295,6 @@ object NavLinks {
       world,
       auPolitics,
       auEnvironment,
-      footballWorldCup2026,
       climateCrisis,
       indigenousAustralia,
       auImmigration,
@@ -316,12 +311,12 @@ object NavLinks {
     List(
       usNews,
       usPolitics,
-      footballWorldCup2026,
       world,
       climateCrisis,
       middleEast,
       ukraine,
       usImmigration,
+      usSoccer,
       usBusiness,
       usEnvironment,
       usTech,
@@ -334,7 +329,6 @@ object NavLinks {
   val intNewsPillar = ukNewsPillar.copy(
     children = List(
       world,
-      footballWorldCup2026,
       usPolitics,
       ukNews,
       climateCrisis,
@@ -352,7 +346,6 @@ object NavLinks {
   val eurNewsPillar = ukNewsPillar.copy(
     children = List(
       world,
-      footballWorldCup2026,
       ukNews,
       climateCrisis,
       ukraine,
@@ -423,7 +416,6 @@ object NavLinks {
     longTitle = Some("Sport home"),
     iconName = Some("home"),
     List(
-      footballWorldCup2026,
       football,
       cricket,
       rugbyUnion,
@@ -439,7 +431,6 @@ object NavLinks {
   )
   val auSportPillar = ukSportPillar.copy(
     children = List(
-      footballWorldCup2026,
       football,
       AFL,
       NRL,
@@ -453,7 +444,6 @@ object NavLinks {
   )
   val usSportPillar = ukSportPillar.copy(
     children = List(
-      footballWorldCup2026,
       usSoccer,
       NFL,
       tennis,
@@ -468,7 +458,6 @@ object NavLinks {
   )
   val intSportPillar = ukSportPillar.copy(
     children = List(
-      footballWorldCup2026,
       football,
       cricket,
       rugbyUnion,
@@ -481,7 +470,6 @@ object NavLinks {
   )
   val eurSportPillar = ukSportPillar.copy(
     children = List(
-      footballWorldCup2026,
       football,
       cricket,
       rugbyUnion,

common/app/navigation/Navigation.scala

@@ -276,22 +276,7 @@ object NavMenu {
             currentParent.map(_.children).getOrElse(Nil)
           }
 
-        // Editorial: on the Football and Soccer fronts (and their child pages), the World Cup 2026
-        // link should appear before the Football/Soccer self-link in the subnav. The default
-        // ParentSubnav layout always renders the parent first, so we instead emit a FlatSubnav
-        // with the World Cup promoted to first position, the parent self-link second, and the
-        // remaining children following.
-        //
-        // Guarded on the first child being the World Cup link, so this special case
-        // automatically disappears when the link is removed from NavLinks after the tournament.
-        val isFootballOrSoccerSubnav =
-          parent.exists(p => p.url == "/football" || p.url == "/us/soccer")
-        val firstChildIsWorldCup =
-          links.headOption.exists(_.url == "/football/world-cup-2026")
-
         parent match {
-          case Some(p) if isFootballOrSoccerSubnav && firstChildIsWorldCup =>
-            Some(FlatSubnav(links.head +: p +: links.tail))
           case Some(p)                => Some(ParentSubnav(p, links))
           case None if links.nonEmpty => Some(FlatSubnav(links))
           case None                   => None

common/test/navigation/NavigationTest.scala

@@ -128,55 +128,6 @@ import test.{ConfiguredTestSuite, WithMaterializer, WithTestContentApiClient, Wi
     subnav shouldBe Some(FlatSubnav(auCulturePillar.children))
   }
 
-  "On `/football`, the subnav" should "promote World Cup 2026 above the Football self-link" in {
-    val edition = Uk
-    val root = NavMenu.navRoot(edition)
-    val maybeNavLink = NavMenu.findDescendantByUrl("/football", edition, root.children, root.otherLinks)
-    val parent = maybeNavLink.flatMap(link => NavMenu.findParent(link, edition, root.children, root.otherLinks))
-    val pillar = NavMenu.getPillar(parent, edition, root.children, root.otherLinks)
-    val subnav = NavMenu.getSubnav(fakePage().metadata.customSignPosting, maybeNavLink, parent, pillar)
-
-    subnav match {
-      case Some(FlatSubnav(links)) =>
-        links.map(_.title).take(2) shouldBe List("World Cup 2026", "Football")
-        links.map(_.url) should contain("/football")
-        links.map(_.url) should contain("/football/world-cup-2026")
-      case other => fail(s"Expected FlatSubnav with promoted World Cup, got $other")
-    }
-  }
-
-  "On `/football/tables`, the subnav" should "also promote World Cup 2026 above the Football self-link" in {
-    val edition = Uk
-    val root = NavMenu.navRoot(edition)
-    val maybeNavLink = NavMenu.findDescendantByUrl("/football/tables", edition, root.children, root.otherLinks)
-    val parent = maybeNavLink.flatMap(link => NavMenu.findParent(link, edition, root.children, root.otherLinks))
-    val pillar = NavMenu.getPillar(parent, edition, root.children, root.otherLinks)
-    val subnav = NavMenu.getSubnav(fakePage().metadata.customSignPosting, maybeNavLink, parent, pillar)
-
-    subnav match {
-      case Some(FlatSubnav(links)) =>
-        links.map(_.title).take(2) shouldBe List("World Cup 2026", "Football")
-      case other => fail(s"Expected FlatSubnav with promoted World Cup, got $other")
-    }
-  }
-
-  "On `/us/soccer`, the subnav" should "promote World Cup 2026 above the Soccer self-link" in {
-    val edition = Us
-    val root = NavMenu.navRoot(edition)
-    val maybeNavLink = NavMenu.findDescendantByUrl("/us/soccer", edition, root.children, root.otherLinks)
-    val parent = maybeNavLink.flatMap(link => NavMenu.findParent(link, edition, root.children, root.otherLinks))
-    val pillar = NavMenu.getPillar(parent, edition, root.children, root.otherLinks)
-    val subnav = NavMenu.getSubnav(fakePage().metadata.customSignPosting, maybeNavLink, parent, pillar)
-
-    subnav match {
-      case Some(FlatSubnav(links)) =>
-        links.map(_.title).take(2) shouldBe List("World Cup 2026", "Soccer")
-        links.map(_.url) should contain("/us/soccer")
-        links.map(_.url) should contain("/football/world-cup-2026")
-      case other => fail(s"Expected FlatSubnav with promoted World Cup, got $other")
-    }
-  }
-
   "The section `Indigenous Australians`" should "still be in the pillar News in the Uk edition" in {
     val edition = Uk
     val root = NavMenu.navRoot(edition)