Remove US nav redirects

guardian · May 3, 2024 · 24aa374 · 24aa374
1 parent 40b7e96
commit 24aa374
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala
@@ -86,6 +86,7 @@ object NavLinks {
     NavLink("Environment", "/us/environment", children = List(climateCrisis, wildlife, energy, pollution, greenLight))
 
   val money = NavLink("Money", "/money", children = List(property, pensions, savings, borrowing, careers))
+  val usMoney = NavLink("Money", "/us/money", children = List(property, pensions, savings, borrowing, careers))
   val ukBusiness = NavLink(
     "Business",
     "/business",
@@ -164,13 +165,15 @@ object NavLinks {
 
   /* CULTURE */
   val film = NavLink("Film", "/film")
+  val usFilm = NavLink("Film", "/us/film")
   val tvAndRadio = NavLink("TV & radio", "/tv-and-radio")
+  val usTvAndRadio = NavLink("TV & radio", "/us/tv-and-radio")
   val music = NavLink("Music", "/music")
   val games = NavLink("Games", "/games")
   val books = NavLink("Books", "/books")
   val artAndDesign = NavLink("Art & design", "/artanddesign")
   val stage = NavLink("Stage", "/stage")
-  val classical = NavLink("Classical", "/music/classicalmusicandopera")
+  val classical = NavLink("Classical", "/music/classical-music-and-opera")
 
   /* LIFE */
   val fashion = NavLink("Fashion", "/fashion")
@@ -194,7 +197,7 @@ object NavLinks {
   val travelAustralasia = NavLink("Australasia", "/travel/australasia")
   val travelAsia = NavLink("Asia", "/travel/asia")
   val ukTravel = NavLink("Travel", "/travel", children = List(travelUk, travelEurope, travelUs))
-  val usTravel = ukTravel.copy(children = List(travelUs, travelEurope, travelUk))
+  val usTravel = NavLink("Travel", "/us/travel", children = List(travelUs, travelEurope, travelUk))
   val auTravel = ukTravel.copy(children = List(travelAustralasia, travelAsia, travelUk, travelEurope, travelUs))
   val usWellness = NavLink("Wellness", "/us/wellness")
 
@@ -473,11 +476,11 @@ object NavLinks {
   )
   val usCulturePillar = ukCulturePillar.copy(
     children = List(
-      film,
+      usFilm,
       books,
       music,
       artAndDesign,
-      tvAndRadio,
+      usTvAndRadio,
       stage,
       classical,
       games,
@@ -540,7 +543,7 @@ object NavLinks {
       health,
       family,
       usTravel,
-      money,
+      usMoney,
     ),
   )
   val intLifestylePillar = ukLifestylePillar.copy(

diff --git a/common/test/resources/reference-navigation.json b/common/test/resources/reference-navigation.json
@@ -606,7 +606,7 @@
 				},
 				{
 					"title": "Classical",
-					"url": "/music/classicalmusicandopera",
+					"url": "/music/classical-music-and-opera",
 					"children": [],
 					"classList": []
 				}
@@ -1385,7 +1385,7 @@
 			"children": [
 				{
 					"title": "Film",
-					"url": "/film",
+					"url": "/us/film",
 					"children": [],
 					"classList": []
 				},
@@ -1409,7 +1409,7 @@
 				},
 				{
 					"title": "TV & radio",
-					"url": "/tv-and-radio",
+					"url": "/us/tv-and-radio",
 					"children": [],
 					"classList": []
 				},
@@ -1421,7 +1421,7 @@
 				},
 				{
 					"title": "Classical",
-					"url": "/music/classicalmusicandopera",
+					"url": "/music/classical-music-and-opera",
 					"children": [],
 					"classList": []
 				},
@@ -1490,7 +1490,7 @@
 				},
 				{
 					"title": "Travel",
-					"url": "/travel",
+					"url": "/us/travel",
 					"children": [
 						{
 							"title": "US",
@@ -1515,7 +1515,7 @@
 				},
 				{
 					"title": "Money",
-					"url": "/money",
+					"url": "/us/money",
 					"children": [
 						{
 							"title": "Property",
@@ -2145,7 +2145,7 @@
 				},
 				{
 					"title": "Classical",
-					"url": "/music/classicalmusicandopera",
+					"url": "/music/classical-music-and-opera",
 					"children": [],
 					"classList": []
 				}
@@ -2936,7 +2936,7 @@
 				},
 				{
 					"title": "Classical",
-					"url": "/music/classicalmusicandopera",
+					"url": "/music/classical-music-and-opera",
 					"children": [],
 					"classList": []
 				},
@@ -3928,7 +3928,7 @@
 				},
 				{
 					"title": "Classical",
-					"url": "/music/classicalmusicandopera",
+					"url": "/music/classical-music-and-opera",
 					"children": [],
 					"classList": []
 				},