Merge branch 'main' into oa/audio-page-podcast-tags

guardian · Sep 18, 2024 · 76d4c49 · 76d4c49
2 parents 7059a12 + 8a9480f
commit 76d4c49
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 4 deletions.
diff --git a/admin/app/jobs/RefreshFrontsJob.scala b/admin/app/jobs/RefreshFrontsJob.scala
@@ -13,7 +13,7 @@ object LowFrequency extends FrontType
 object StandardFrequency extends FrontType
 object HighFrequency extends FrontType {
   def highFrequencyPaths: List[String] =
-    List("uk", "us", "au", "europe", "international", "uk/sport", "us/sport", "au/sport", "sport/paralympic-games-2024")
+    List("uk", "us", "au", "europe", "international", "uk/sport", "us/sport", "au/sport")
 }
 
 case class CronUpdate(path: String, frontType: FrontType)

diff --git a/common/app/layout/slices/Container.scala b/common/app/layout/slices/Container.scala
@@ -34,6 +34,7 @@ object Container extends GuLogging {
       ("nav/media-list", NavMediaList),
       ("news/most-popular", MostPopular),
       ("flexible/special", Dynamic(FlexibleSpecial)),
+      ("flexible/general", Dynamic(FlexibleGeneral)),
     ) ++ FixedContainers.all.mapV(Fixed.apply) ++ EmailLayouts.all.mapV(Email.apply)
 
   /** So that we don't blow up at runtime, which would SUCK */

diff --git a/common/app/layout/slices/DynamicContainers.scala b/common/app/layout/slices/DynamicContainers.scala
@@ -9,6 +9,7 @@ object DynamicContainers {
     ("dynamic/package", DynamicPackage),
     ("dynamic/slow-mpu", DynamicSlowMPU(omitMPU = false, adFree = false)),
     ("flexible/special", FlexibleSpecial),
+    ("flexible/general", FlexibleGeneral),
   )
 
   def apply(collectionType: Option[String], items: Seq[PressedContent]): Option[ContainerDefinition] = {

diff --git a/common/app/layout/slices/FlexibleGeneral.scala b/common/app/layout/slices/FlexibleGeneral.scala
@@ -0,0 +1,33 @@
+package layout.slices
+
+import layout.slices.Story._
+
+object FlexibleGeneral extends DynamicContainer {
+  override protected def optionalFirstSlice(stories: Seq[Story]): Option[(Slice, Seq[Story])] = {
+    val byGroup = segmentByGroup(stories)
+    val snap = byGroup.getOrElse(1, Seq.empty)
+
+    if (snap.nonEmpty) {
+      Some((FullMedia50, stories.drop(1)))
+    } else {
+      None
+    }
+  }
+
+  override protected def standardSlices(storiesIncludingBackfill: Seq[Story], firstSlice: Option[Slice]): Seq[Slice] = {
+
+    storiesIncludingBackfill.length match {
+      case 0 => Nil
+      case 1 => Seq(FullMedia100)
+      case 2 => Seq(ThreeQuarterQuarter)
+      case 3 => Seq(ThreeQuarterTallQuarter2)
+      case 4 => Seq(ThreeQuarterTallQuarter1Ql2)
+      case 5 => Seq(FullMedia100, QuarterQuarterQuarterQuarter)
+      // This case doesn't look _quite_ right. We end up with a row of four
+      // and then a row of three, slightly stretched. There isn't a layout
+      // which caters for this currently, we'll follow up on this separately.
+      case _ => Seq(FullMedia100, QuarterQuarterQuarterQuarter, Ql1Ql1Ql1Ql1)
+
+    }
+  }
+}
diff --git a/common/app/model/meta.scala b/common/app/model/meta.scala
@@ -271,7 +271,6 @@ object ContentFormat {
       case "FullPageInteractiveDesign" => FullPageInteractiveDesign
       case "InteractiveDesign"         => InteractiveDesign
       case "PhotoEssayDesign"          => PhotoEssayDesign
-      case "PrintShopDesign"           => PrintShopDesign
       case "ObituaryDesign"            => ObituaryDesign
       case _                           => ArticleDesign
     }

diff --git a/facia/app/services/dotcomrendering/FaciaPicker.scala b/facia/app/services/dotcomrendering/FaciaPicker.scala
@@ -46,6 +46,7 @@ object FrontChecks {
       "news/most-popular",
       "scrollable/highlights",
       "flexible/special",
+      "flexible/general",
     )
 
   def hasOnlySupportedCollections(faciaPage: PressedPage) =

diff --git a/facia/test/services/dotcomrendering/FaciaPickerTest.scala b/facia/test/services/dotcomrendering/FaciaPickerTest.scala
@@ -250,6 +250,7 @@ import layout.slices.EmailLayouts
         PressedCollectionBuilder.mkPressedCollection("news/most-popular"),
         PressedCollectionBuilder.mkPressedCollection("scrollable/highlights"),
         PressedCollectionBuilder.mkPressedCollection("flexible/special"),
+        PressedCollectionBuilder.mkPressedCollection("flexible/general"),
       ),
     )
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,8 +6,8 @@ object Dependencies {
   val identityLibVersion = "4.31"
   val awsVersion = "1.12.758"
   val awsSdk2Version = "2.26.27"
-  val capiVersion = "31.1.0"
-  val faciaVersion = "9.0.0"
+  val capiVersion = "32.0.0"
+  val faciaVersion = "10.0.0"
   val dispatchVersion = "0.13.1"
   val romeVersion = "1.0"
   val jerseyVersion = "1.19.4"