@financial-times/cp-content-pipeline-schema 3.7.3 → 3.9.0

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

@@ -3,7 +3,7 @@ import { CustomCodeComponentResolvers } from '../../../generated'
 import { ReferenceWithCAPIData } from '.'
 import { ContentTree } from '@financial-times/content-tree'
 import { RichText } from '../../../model/RichText'
-import { CapiResponse } from '../../../model/CapiResponse'
+import { Content } from '../../../model/Content'
 import type { QueryContext } from '../../..'
 import isError from '../../../helpers/isError'
 import { OperationalError } from '@dotcom-reliability-kit/errors'
@@ -18,7 +18,7 @@ async function getReferencesFromBody(
     return null
   }
 
-  let customCodeComponentContentData: CapiResponse
+  let customCodeComponentContentData: Content
   try {
     customCodeComponentContentData = await context.dataSources.capi.getContent(
       uuidFromUrl(customCodeComponentEmbedData.apiUrl)

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

@@ -1,5 +1,5 @@
 import type { ContentTree } from '@financial-times/content-tree'
-import type { CapiResponse } from '../../../model/CapiResponse'
+import type { Content } from '../../../model/Content'
 
 import { Reference } from './Reference'
 
@@ -35,7 +35,7 @@ import { Author } from './Author'
 
 export type ReferenceWithCAPIData<ReferenceType = ContentTree.Node> = {
   reference: ReferenceType
-  contentApiData?: CapiResponse
+  contentApiData?: Content
 }
 
 export const resolvers: {

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

@@ -21,7 +21,7 @@ import {
 
 import * as scrollytelling from '@financial-times/n-scrollytelling-image/server'
 import { LiteralToPrimitiveDeep } from 'type-fest'
-import { CapiResponse } from '../../model/CapiResponse'
+import { Content } from '../../model/Content'
 import type { Cheerio, Element } from 'cheerio'
 
 const tableResponsiveStyleMap: Record<string, Table['responsiveStyle']> = {
@@ -85,7 +85,7 @@ const validScrollytellingOption = <
     : false
 }
 
-const articleTagMappings = (capiData?: CapiResponse): TagMappings => ({
+const articleTagMappings = (capiData?: Content): TagMappings => ({
   'body > ft-content[type="http://www.ft.com/ontology/content/ImageSet"]:first-child':
     ($el) => ({
       // CustomCodeComponent uses an inner bodyXML parsed as a RichText

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

@@ -1,5 +1,5 @@
 import { ContentTree } from '@financial-times/content-tree'
-import { CapiResponse } from '../../model/CapiResponse'
+import { Content } from '../../model/Content'
 import { ReferenceWithCAPIData, mapNodeToReference } from './references'
 
 function isParent(node: ContentTree.Node): node is ContentTree.Parent {
@@ -12,7 +12,7 @@ const isValidReferenceType = (
 
 export default function updateTreeWithReferenceIds(
   tree: ContentTree.Parent,
-  contentApiData?: CapiResponse
+  contentApiData?: Content
 ): {
   tree: ContentTree.Parent
   references: ReferenceWithCAPIData[]

package/src/resolvers/content.ts

@@ -98,6 +98,7 @@ const resolvers = {
     indicators: (parent) => {
       return {
         isPartnerContent: parent.isPartnerContent(),
+        isFTEdit: parent.isFTEdit(),
       }
     },
   },
@@ -105,6 +106,11 @@ const resolvers = {
   Placeholder: {
     ...contentResolvers,
     containedIn: (parent) => parent.containedIn(),
+    indicators(parent) {
+      return {
+        isFTEdit: parent.isFTEdit(),
+      }
+    },
   },
 
   LiveBlogPost: {
@@ -131,6 +137,11 @@ const resolvers = {
       }),
     pinnedPost: (parent) => parent.pinnedPost(),
     realtime: (parent) => parent.realtime(),
+    indicators(parent) {
+      return {
+        isFTEdit: parent.isFTEdit(),
+      }
+    },
   },
 
   ContentPackage: {
@@ -138,6 +149,11 @@ const resolvers = {
     contains: (parent, args) => parent.contains(args),
     tableOfContents: (parent) => parent.tableOfContents(),
     containsLength: (parent) => parent.containsLength(),
+    indicators(parent) {
+      return {
+        isFTEdit: parent.isFTEdit(),
+      }
+    },
   },
 
   Audio: {
@@ -146,10 +162,20 @@ const resolvers = {
       // TODO:20230712:IM should probably return captions too
       parent.media()?.filter(({ mediaType }) => mediaType === 'audio/mpeg') ??
       null,
+    indicators(parent) {
+      return {
+        isFTEdit: parent.isFTEdit(),
+      }
+    },
   },
 
   Video: {
     ...contentResolvers,
+    indicators(parent) {
+      return {
+        isFTEdit: parent.isFTEdit(),
+      }
+    },
   },
 
   AltStandfirst: {
@@ -168,6 +194,7 @@ const resolvers = {
   // TODO:20240829:IM Rename this to ContentIndicators to clearly differentiate
   // it from other Indicators types in the next major release.
   Indicators: {
+    isFTEdit: (parent) => parent.isFTEdit ?? null,
     isOpinion: (parent) => parent.isOpinion ?? null,
     isPartnerContent: (parent) => parent.isPartnerContent ?? null,
   },

package/src/resolvers/core.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import { QueryResolvers, MutationResolvers } from '../generated'
-import { CapiResponse } from '../model/CapiResponse'
+import { Content } from '../model/Content'
 import { BaseError, HttpError } from '@dotcom-reliability-kit/errors'
 
 const packageJson = JSON.parse(
@@ -59,7 +59,7 @@ const resolvers = {
       return context.dataSources.capi.getList(args.uuid)
     },
     contentFromJSON(_, { content }, context) {
-      return CapiResponse.fromJSON(content, context)
+      return Content.fromJSON(content, context)
     },
   },
   Mutation: {

package/src/resolvers/teaser.ts

@@ -24,6 +24,7 @@ const resolvers = {
         isEditorsChoice: parent.isEditorsChoice(),
         isExclusive: parent.isExclusive(),
         isScoop: parent.isScoop(),
+        isFTEdit: parent.isFTEdit(),
       }
     },
     standfirst: (parent) => parent.standfirst(),
@@ -41,6 +42,7 @@ const resolvers = {
     isEditorsChoice: (parent) => parent.isEditorsChoice ?? null,
     isExclusive: (parent) => parent.isExclusive ?? null,
     isScoop: (parent) => parent.isScoop ?? null,
+    isFTEdit: (parent) => parent.isFTEdit ?? null,
   },
 } satisfies {
   Teaser: TeaserResolvers