@financial-times/cp-content-pipeline-schema 1.3.4 → 1.3.6

package/src/resolvers/content-tree/references/Recommended.ts

@@ -1,15 +1,32 @@
 import { uuidFromUrl } from '../../../helpers/metadata'
 import { RecommendedResolvers } from '../../../generated'
+import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
+import { OperationalError } from '@dotcom-reliability-kit/errors'
 
 export const Recommended = {
   async teaser(parent, _args, context) {
-    let content = await context.dataSources.capi.getContent(
-      uuidFromUrl(parent.reference.id)
-    )
+    try {
+      let content = await context.dataSources.capi.getContent(
+        uuidFromUrl(parent.reference.id)
+      )
 
-    if (parent.reference.teaserTitleOverride) {
-      content = content.overrideTitle(parent.reference.teaserTitleOverride)
+      if (parent.reference.teaserTitleOverride) {
+        content = content.overrideTitle(parent.reference.teaserTitleOverride)
+      }
+      return content
+    } catch (error) {
+      if (error instanceof Error) {
+        logRecoverableError({
+          logger: context.logger,
+          error: new OperationalError({
+            code: 'RECOMMENDED_TEASER_ERROR',
+            message: `Couldn't load teaser for recommended article ${parent.reference.id}`,
+            cause: error,
+          }),
+        })
+      }
+
+      return null
     }
-    return content
   },
 } satisfies RecommendedResolvers

package/src/resolvers/content-tree/tagMappings.ts

@@ -18,6 +18,7 @@ import {
 
 import * as scrollytelling from '@financial-times/n-scrollytelling-image/server'
 import { LiteralToPrimitiveDeep } from 'type-fest'
+import { CapiResponse } from '../../model/CapiResponse'
 
 const tableResponsiveStyleMap: Record<string, Table['responsiveStyle']> = {
   stacked: 'flat',
@@ -79,10 +80,10 @@ const validScrollytellingOption = <
     : false
 }
 
-const articleTagMappings: TagMappings = {
+const articleTagMappings = (capiData?: CapiResponse): TagMappings => ({
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]:first-child':
     ($el) => ({
-      type: 'main-image',
+      type: capiData?.topperHasImage() ? 'image-set' : 'main-image',
       id: $el.attr('url') || '',
     }),
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]:not(:first-child),:not(body) > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]':
@@ -90,7 +91,7 @@ const articleTagMappings: TagMappings = {
       type: 'image-set',
       id: $el.attr('url') || '',
     }),
-}
+})
 
 const liveBlogPostTagMappings: TagMappings = {
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]': (
@@ -152,6 +153,33 @@ const commonTagMappings: TagMappings = {
     type: 'tweet',
     id: $el.attr('href') || '',
   }),
+
+  'scrollable-text > p,h1,h2': ($el, traverse, context) => {
+    const textStyle = $el.attr('theme-style')
+
+    if (validScrollytellingOption('textStyle', textStyle)) {
+      return {
+        type: 'scrolly-heading',
+        level: scrollytellingOptionsToContentTree.textStyle[textStyle],
+        children: everyChildIsType(
+          'text',
+          traverse(),
+          'scrolly-heading',
+          context
+        ),
+      }
+    }
+
+    return {
+      type: 'paragraph',
+      children: childrenOfTypes(
+        phrasingTypes,
+        traverse(),
+        'paragraph',
+        context
+      ),
+    }
+  },
   h1: ($el, traverse, context) => ({
     type: 'heading',
     level: 'chapter',
@@ -552,33 +580,6 @@ const commonTagMappings: TagMappings = {
     ),
   }),
 
-  'scrollable-text > p': ($el, traverse, context) => {
-    const textStyle = $el.attr('theme-style')
-
-    if (validScrollytellingOption('textStyle', textStyle)) {
-      return {
-        type: 'scrolly-heading',
-        level: scrollytellingOptionsToContentTree.textStyle[textStyle],
-        children: everyChildIsType(
-          'text',
-          traverse(),
-          'scrolly-heading',
-          context
-        ),
-      }
-    }
-
-    return {
-      type: 'paragraph',
-      children: childrenOfTypes(
-        phrasingTypes,
-        traverse(),
-        'paragraph',
-        context
-      ),
-    }
-  },
-
   // HACK:KB:20230703 needs to come after `scrollable-text > p`. todo sort by specificity
   p: ($el, traverse, context) => ({
     type: 'paragraph',