Handle the move of suppressImages to displayHints

guardian · Feb 21, 2025 · 5a1d19f · 5a1d19f
1 parent ea65f61
commit 5a1d19f
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 17 deletions.
diff --git a/build.sbt b/build.sbt
@@ -52,8 +52,8 @@ TwirlKeys.templateImports ++= Seq(
 routesImport += "model.editions._"
 
 val awsVersion = "1.12.470"
-val capiModelsVersion = "25.0.0"
-val capiClientVersion = "32.0.0"
+val capiModelsVersion = "27.0.0"
+val capiClientVersion = "34.0.0"
 val json4sVersion = "4.0.3"
 val circeVersion = "0.13.0"
 
@@ -83,7 +83,7 @@ libraryDependencies ++= Seq(
   "com.gu" %% "content-api-client-aws" % "0.7.6",
   "com.gu" %% "content-api-client-default" % capiClientVersion,
   "com.gu" %% "editorial-permissions-client" % "3.0.0",
-  "com.gu" %% "fapi-client-play30" % "13.0.0",
+  "com.gu" %% "fapi-client-play30" % "15.0.0",
   "com.gu" %% "mobile-notifications-api-models" % "3.0.0",
   "com.gu" %% "pan-domain-auth-play_3-0" % "7.0.0",
   "org.scanamo" %% "scanamo" % "1.1.1" exclude ("org.scala-lang.modules", "scala-java8-compat_2.13"),

diff --git a/fronts-client/src/actions/__tests__/Collections.spec.ts b/fronts-client/src/actions/__tests__/Collections.spec.ts
@@ -221,7 +221,6 @@ describe('Collection actions', () => {
 					previouslyCardIds: [],
 					groups: undefined,
 					frontsToolSettings: undefined,
-					suppressImages: undefined,
 					targetedRegions: [],
 					excludedRegions: [],
 					targetedTerritory: undefined,

diff --git a/fronts-client/src/components/CollectionDisplay.tsx b/fronts-client/src/components/CollectionDisplay.tsx
@@ -322,7 +322,7 @@ class CollectionDisplay extends React.Component<Props, CollectionState> {
 												{oc(collection).metadata[0].type()}
 											</CollectionConfigText>
 										) : null}
-										{collection?.suppressImages ? (
+										{collection?.displayHints?.suppressImages ? (
 											<CollectionConfigText>
 												<CollectionConfigTextPipe> | </CollectionConfigTextPipe>
 												Images suppressed

diff --git a/fronts-client/src/fixtures/shared.ts b/fronts-client/src/fixtures/shared.ts
@@ -636,7 +636,6 @@ const stateWithCollection: any = {
 					automatedCollection: {
 						displayName: 'automated',
 						type: 'type',
-						suppressImages: undefined,
 						targetedRegions: [],
 						excludedRegions: [],
 						targetedTerritory: undefined,

diff --git a/fronts-client/src/types/Collection.ts b/fronts-client/src/types/Collection.ts
@@ -1,6 +1,6 @@
 import { CapiArticle } from 'types/Capi';
 import { Diff } from 'utility-types';
-import type { FrontsToolSettings } from 'types/FaciaApi';
+import type { DisplayHints, FrontsToolSettings } from 'types/FaciaApi';
 import { CardTypes } from 'constants/cardTypes';
 
 interface CollectionArticles {
@@ -190,9 +190,9 @@ interface Collection {
 	frontsToolSettings?: FrontsToolSettings;
 	isHidden?: boolean;
 	targetedTerritory?: string;
-	suppressImages?: boolean;
 	targetedRegions: string[];
 	excludedRegions: string[];
+	displayHints?: DisplayHints;
 }
 
 interface ArticleTag {

diff --git a/fronts-client/src/types/FaciaApi.ts b/fronts-client/src/types/FaciaApi.ts
@@ -33,6 +33,11 @@ interface FrontsToolSettings {
 	displayEditWarning?: boolean;
 }
 
+interface DisplayHints {
+	maxItemsToDisplay?: number;
+	suppressImages?: boolean;
+}
+
 interface CollectionConfigResponse {
 	displayName: string;
 	type?: string;
@@ -54,7 +59,7 @@ interface CollectionConfigResponse {
 	frontsToolSettings?: FrontsToolSettings;
 	prefill?: EditionsPrefill;
 	targetedTerritory?: string;
-	suppressImages?: boolean;
+	displayHints?: DisplayHints;
 }
 
 interface FrontsConfigResponse {
@@ -140,5 +145,6 @@ export {
 	EditionCollectionResponse,
 	VisibleArticlesResponse,
 	FrontsToolSettings,
+	DisplayHints,
 	EditionsFrontMetadata,
 };
diff --git a/fronts-client/src/util/frontsUtils.ts b/fronts-client/src/util/frontsUtils.ts
@@ -44,7 +44,7 @@ const combineCollectionWithConfig = (
 		platform: collectionConfig.platform,
 		metadata: collectionConfig.metadata,
 		targetedTerritory: collectionConfig.targetedTerritory,
-		suppressImages: collectionConfig.suppressImages,
+		displayHints: collectionConfig.displayHints,
 	});
 };
 

diff --git a/public/src/js/models/config/collection.js b/public/src/js/models/config/collection.js
@@ -46,12 +46,12 @@ export default class ConfigCollection extends DropTarget {
                 'platform',
                 'frontsToolSettings',
                 'userVisibility',
-                'targetedTerritory',
-                'suppressImages'
+                'targetedTerritory'
             ]),
             {
                 displayHints: asObservableProps([
-                    'maxItemsToDisplay'
+                    'maxItemsToDisplay',
+					'suppressImages'
                 ], observableNumeric)
             },
             {

diff --git a/public/src/js/widgets/columns/fronts-config.html b/public/src/js/widgets/columns/fronts-config.html
@@ -331,7 +331,7 @@
 			 meta.type() === 'flexible/general')
 			-->
 			<label for="suppressImages">Suppress images</label>
-            <input id="suppressImages" type="checkbox" data-bind="checked: meta.suppressImages" />
+            <input id="suppressImages" type="checkbox" data-bind="checked: meta.displayHints.suppressImages" />
             <!-- /ko -->
 
             <div class="platform-edit">

diff --git a/test/config/TransformationsSpec.scala b/test/config/TransformationsSpec.scala
@@ -60,7 +60,6 @@ class TransformationsSpec extends FlatSpec with Matchers {
     None,
     None,
     None,
-    None,
     None
   )
 

diff --git a/test/services/CollectionServiceTest.scala b/test/services/CollectionServiceTest.scala
@@ -103,8 +103,7 @@ class CollectionServiceTest extends FreeSpec with Matchers {
       userVisibility = None,
       targetedTerritory = None,
       platform = None,
-      frontsToolSettings = None,
-      suppressImages = None
+      frontsToolSettings = None
     )
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,6 @@ class TransformationsSpec extends FlatSpec with Matchers { @@
         None,
         None,
         None,
-        None,
         None
       )
@@ Expand Down @@