use maxitemstodisplay to set flex story limit

guardian · Jan 8, 2025 · 5633883 · 5633883
1 parent 944edd9
commit 5633883
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/app/controllers/StoriesVisibleController.scala b/app/controllers/StoriesVisibleController.scala
@@ -22,7 +22,7 @@ class StoriesVisibleController(
   def storiesVisible(containerType: String) =
     AccessAPIAuthAction(parse.json[StoriesVisibleRequest]) { implicit request =>
       val storiesVisible =
-        containerService.getStoriesVisible(containerType, request.body.stories)
+        containerService.getStoriesVisible(containerType, request.body.stories, collectionConfigJson = null)
 
       logger.info(
         s"got stories-visible=$storiesVisible for containerType=$containerType"

diff --git a/app/services/CollectionService.scala b/app/services/CollectionService.scala
@@ -97,14 +97,15 @@ object CollectionService {
       config: ConfigJson,
       containerService: ContainerService
   ): Option[StoriesVisibleByStage] = {
+		val cConfigJson = config.collections.get(collectionId).get
     val stages =
       CollectionService.getStoriesForCollectionStages(collectionId, collection)
     config.collections.get(collectionId).flatMap(_.`type`) match {
       case Some(cType) =>
         Some(
           StoriesVisibleByStage(
-            containerService.getStoriesVisible(cType, stages._1),
-            containerService.getStoriesVisible(cType, stages._2)
+            containerService.getStoriesVisible(cType, stages._1, cConfigJson),
+            containerService.getStoriesVisible(cType, stages._2, cConfigJson)
           )
         )
       case None => None

diff --git a/app/services/ContainerService.scala b/app/services/ContainerService.scala
@@ -2,6 +2,7 @@ package services
 
 import play.api.libs.json.{Json, OFormat}
 import slices._
+import com.gu.facia.client.models.CollectionConfigJson
 
 case class StoriesVisibleResponse(
     desktop: Option[Int],
@@ -14,7 +15,7 @@ object StoriesVisibleResponse {
 }
 
 class ContainerService(val containers: Containers) {
-  def getStoriesVisible(containerType: String, stories: Seq[Story]) = {
+  def getStoriesVisible(containerType: String, stories: Seq[Story], collectionConfigJson: CollectionConfigJson) = {
     val numberOfStories = stories.length
     containers.all.get(containerType) map {
       case Fixed(container) =>
@@ -48,7 +49,7 @@ class ContainerService(val containers: Containers) {
         )
 
       case Flexible(container) =>
-        val numberVisible = container.storiesVisible(stories)
+        val numberVisible = container.storiesVisible(stories, collectionConfigJson: CollectionConfigJson)
         StoriesVisibleResponse(
           Some(numberVisible),
           Some(numberVisible)

diff --git a/app/slices/FlexibleContainer.scala b/app/slices/FlexibleContainer.scala
@@ -1,24 +1,30 @@
 package slices
+import com.gu.facia.client.models.CollectionConfigJson
 
 trait FlexibleContainer {
-  def storiesVisible(stories: Seq[Story]): Int
+  def storiesVisible(stories: Seq[Story], collectionConfigJson: CollectionConfigJson): Int
 }
 
 object FlexibleGeneral extends FlexibleContainer {
-  def storiesVisible(stories: Seq[Story]): Int = {
+  def storiesVisible(stories: Seq[Story], collectionConfigJson: CollectionConfigJson): Int = {
     val byGroup = Story.segmentByGroup(stories)
     val splash = byGroup.getOrElse(3, Seq.empty) ++
       byGroup.getOrElse(2, Seq.empty) ++
       byGroup.getOrElse(1, Seq.empty)
     val numOfSplash = splash.size min 1
     val numOfStandard = stories.size - numOfSplash
+  	val defaultStandardStoryLimit = 8
 
-    numOfSplash + (numOfStandard min 8)
+    val standardStoryLimit = collectionConfigJson.displayHints
+      .flatMap(_.maxItemsToDisplay)
+      .getOrElse(defaultStandardStoryLimit)
+
+    numOfSplash + (numOfStandard min standardStoryLimit)
   }
 }
 
 object FlexibleSpecial extends FlexibleContainer {
-  def storiesVisible(stories: Seq[Story]): Int = {
+  def storiesVisible(stories: Seq[Story], collectionConfigJson: CollectionConfigJson): Int = {
     val byGroup = Story.segmentByGroup(stories)
     val snap = byGroup.getOrElse(3, Seq.empty) ++
       byGroup.getOrElse(2, Seq.empty) ++

diff --git a/public/src/js/widgets/columns/fronts-config.html b/public/src/js/widgets/columns/fronts-config.html
@@ -258,6 +258,12 @@
                 <label>Groups</label>
                 <span class="cnf-form__value" data-bind="text: meta.groups"></span>
             <!-- /ko -->
+
+			<!-- ko if: meta.type() === "flexible/general"-->
+			<label for="flexGenStoryLimit">flexGenStoryAmount</label>
+			<input id="flexGenStoryLimit" type="number" data-bind="value: meta.displayHints.maxItemsToDisplay" placeholder="6">
+			<!-- /ko -->
+
             <label for="userVisibility">User visibility</label>
             <select id="userVisibility" data-bind="
                 optionsCaption: 'Select user visibility',