@financial-times/cp-content-pipeline-schema 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.0.2](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.0.1...cp-content-pipeline-schema-v2.0.2) (2024-02-08)
+
+
+### Bug Fixes
+
+* pin @dotcom-reliability-kit/logger to 2.2.5 to avoid breaking change ([902a000](https://github.com/Financial-Times/cp-content-pipeline/commit/902a0001262a1b3232946ed988a0c2d8037bcc0e))
+
+## [2.0.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.0.0...cp-content-pipeline-schema-v2.0.1) (2024-02-02)
+
+
+### Bug Fixes
+
+* use Origami Image Service for poster and fallback image for Clips ([68e75c3](https://github.com/Financial-Times/cp-content-pipeline/commit/68e75c3ebfa5b3afaa96c0375499aec5e904f2b5))
+
 ## [2.0.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v1.8.6...cp-content-pipeline-schema-v2.0.0) (2024-01-29)
 
 

package/lib/model/Clip.d.ts

@@ -19,7 +19,8 @@ export interface ClipVideo {
 }
 export declare class Clip implements ClipVideo {
     private clip;
-    constructor(clip: ClipMetadata);
+    private layout?;
+    constructor(clip: ClipMetadata, layout?: string | undefined);
     type(): string;
     id(): string;
     format(): LiteralUnionScalarValues<typeof ClipFormat>;

package/lib/model/Clip.js

@@ -1,12 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Clip = void 0;
 const metadata_1 = require("../helpers/metadata");
 const literal_union_1 = require("../resolvers/literal-union");
 const scalars_1 = require("../resolvers/scalars");
+const imageService_1 = __importDefault(require("../helpers/imageService"));
 class Clip {
-    constructor(clip) {
+    constructor(clip, layout) {
         this.clip = clip;
+        this.layout = layout;
     }
     type() {
         return 'clip';
@@ -44,7 +49,17 @@ class Clip {
         return dataSource;
     }
     poster() {
-        return this.clip.poster?.members[0].binaryUrl ?? '';
+        const mapSizes = {
+            'in-line': 700,
+            'mid-grid': 900,
+            'full-grid': 1200,
+        };
+        const url = this.clip.poster?.members[0].binaryUrl;
+        return url ? (0, imageService_1.default)({
+            url,
+            systemCode: 'cp-content-pipeline',
+            width: this.layout && mapSizes[this.layout] ? mapSizes[this.layout] : 700,
+        }) : '';
     }
 }
 exports.Clip = Clip;

package/lib/model/Clip.js.map

@@ -1 +1 @@
-{"version":3,"file":"Clip.js","sourceRoot":"","sources":["../../src/model/Clip.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAEjD,8DAGmC;AACnC,kDAAiD;AAoBjD,MAAa,IAAI;IACf,YAAoB,IAAkB;QAAlB,SAAI,GAAJ,IAAI,CAAc;IAAG,CAAC;IAE1C,IAAI;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,EAAE;QACA,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAA;SACtE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAEnC,IAAI,UAAU,KAAK,gBAAgB,EAAE;gBACnC,OAAO,iBAAiB,CAAA;aACzB;YAED,IAAI,IAAA,sCAAsB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAU,CAAC,MAAM,CAAC,EAAE;gBAC/D,OAAO,UAAU,CAAA;aAClB;SACF;QAED,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAED,UAAU;QACR,kKAAkK;QAClK,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5D,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC9D,OAAO,CAAC,CAAC,CAAA;aACV;YACD,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC9D,OAAO,CAAC,CAAA;aACT;YACD,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,UAA0B,CAAA;IACnC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAA;IACrD,CAAC;CACF;AAhDD,oBAgDC"}
+{"version":3,"file":"Clip.js","sourceRoot":"","sources":["../../src/model/Clip.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiD;AAEjD,8DAGmC;AACnC,kDAAiD;AACjD,2EAAqD;AAoBrD,MAAa,IAAI;IACf,YAAoB,IAAkB,EAAU,MAAe;QAA3C,SAAI,GAAJ,IAAI,CAAc;QAAU,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEnE,IAAI;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,EAAE;QACA,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAA;SACtE;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAEnC,IAAI,UAAU,KAAK,gBAAgB,EAAE;gBACnC,OAAO,iBAAiB,CAAA;aACzB;YAED,IAAI,IAAA,sCAAsB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAU,CAAC,MAAM,CAAC,EAAE;gBAC/D,OAAO,UAAU,CAAA;aAClB;SACF;QAED,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAED,UAAU;QACR,kKAAkK;QAClK,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5D,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC9D,OAAO,CAAC,CAAC,CAAA;aACV;YACD,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC9D,OAAO,CAAC,CAAA;aACT;YACD,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,UAA0B,CAAA;IACnC,CAAC;IAED,MAAM;QACJ,MAAM,QAAQ,GAEV;YACF,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,IAAI;SAClB,CAAA;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnD,OAAO,GAAG,CAAE,CAAC,CAAC,IAAA,sBAAe,EAAC;YAC5B,GAAG;YACH,UAAU,EAAE,qBAAqB;YACjC,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;SAC1E,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACT,CAAC;CACF;AA7DD,oBA6DC"}

package/lib/model/Clip.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/model/Clip.test.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Clip_1 = require("./Clip");
+describe('Clip', () => {
+    describe('poster', () => {
+        it('uses the Origami Image Service when a url is provided', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            });
+            expect(clip.poster()).toContain('https://www.ft.com/__origami/service/image/v2/images/raw/');
+            expect(clip.poster()).toContain('source=cp-content-pipeline&fit=scale-down&quality=highest');
+        });
+        it('returns an empty string if an image url is not provided', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: '',
+                        },
+                    ],
+                },
+            });
+            expect(clip.poster()).toEqual('');
+        });
+        it('uses a default width if a layout is not provided', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            });
+            expect(clip.poster()).toContain('width=700');
+        });
+        it('uses a default width if a layout is not supported', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            }, 'I-dont-exist');
+            expect(clip.poster()).toEqual('https://www.ft.com/__origami/service/image/v2/images/raw/http%3A%2F%2Fvideo.ft.com%2F1234.jpg?source=cp-content-pipeline&fit=scale-down&quality=highest&width=700&dpr=1');
+        });
+        it('generates an image with the appropriate width for a `in-line` layout', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            }, 'in-line');
+            expect(clip.poster()).toContain('width=700');
+        });
+        it('generates an image with the appropriate width for a `mid-grid` layout', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            }, 'mid-grid');
+            expect(clip.poster()).toContain('width=900');
+        });
+        it('generates an image with the appropriate width for a `full-grid` layout', () => {
+            const clip = new Clip_1.Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },
+            }, 'full-grid');
+            expect(clip.poster()).toContain('width=1200');
+        });
+    });
+});
+//# sourceMappingURL=Clip.test.js.map

package/lib/model/Clip.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Clip.test.js","sourceRoot":"","sources":["../../src/model/Clip.test.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/content-tree/references/ClipSet.js

@@ -50,7 +50,7 @@ exports.ClipSet = {
     async clips(parent) {
         const clipSet = getClipSet(parent);
         return clipSet && clipSet.members && clipSet.members.length > 0
-            ? clipSet.members.map((clip) => new Clip_1.Clip(clip))
+            ? clipSet.members.map((clip) => new Clip_1.Clip(clip, parent.reference.dataLayout))
             : null;
     },
 };

package/lib/resolvers/content-tree/references/ClipSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClipSet.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/ClipSet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClipSet.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/ClipSet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@apollo/utils.fetcher": "^1.1.1",
-    "@dotcom-reliability-kit/logger": "^2.0.0",
+    "@dotcom-reliability-kit/logger": "2.2.5",
     "@dotcom-tool-kit/npm": "^3.1.4",
     "@financial-times/content-tree": "github:financial-times/content-tree#14370e3",
     "@types/graphql": "^14.5.0",

package/src/model/Clip.test.ts

@@ -0,0 +1,154 @@
+import { Clip } from './Clip';
+
+describe('Clip', () => {
+    describe('poster', () => {
+        it('uses the Origami Image Service when a url is provided', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            });
+            expect(clip.poster()).toContain('https://www.ft.com/__origami/service/image/v2/images/raw/');
+            expect(clip.poster()).toContain('source=cp-content-pipeline&fit=scale-down&quality=highest');
+        });
+        it('returns an empty string if an image url is not provided', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: '',
+                        },
+                    ],
+                },      
+            });
+            expect(clip.poster()).toEqual('');
+        });
+        it('uses a default width if a layout is not provided', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            });
+            expect(clip.poster()).toContain('width=700');
+        });
+        it('uses a default width if a layout is not supported', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            }, 'I-dont-exist');
+            expect(clip.poster()).toEqual('https://www.ft.com/__origami/service/image/v2/images/raw/http%3A%2F%2Fvideo.ft.com%2F1234.jpg?source=cp-content-pipeline&fit=scale-down&quality=highest&width=700&dpr=1');
+        });
+        it('generates an image with the appropriate width for a `in-line` layout', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            }, 'in-line');
+            expect(clip.poster()).toContain('width=700');
+        });
+        it('generates an image with the appropriate width for a `mid-grid` layout', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            }, 'mid-grid');
+            expect(clip.poster()).toContain('width=900');
+        });
+        it('generates an image with the appropriate width for a `full-grid` layout', () => {
+            const clip = new Clip({
+                id: 'http://api.ft.com/things/1234',
+                type: "http://www.ft.com/ontology/content/Clip",
+                dataSource: [
+                    {},
+                ],
+                poster: {
+                    id: 'http://api.ft.com/things/1234',
+                    type: 'http://www.ft.com/ontology/content/ImageSet',
+                    members: [
+                        {
+                            id: 'http://api.ft.com/things/1234',
+                            type: 'http://www.ft.com/ontology/content/Image',
+                            binaryUrl: 'http://video.ft.com/1234.jpg',
+                        },
+                    ],
+                },      
+            }, 'full-grid');
+            expect(clip.poster()).toContain('width=1200');
+        });
+    });
+}); 

package/src/model/Clip.ts

@@ -5,6 +5,7 @@ import {
   validLiteralUnionValue,
 } from '../resolvers/literal-union'
 import { ClipFormat } from '../resolvers/scalars'
+import imageServiceUrl from '../helpers/imageService'
 
 export type ClipSource = {
   binaryUrl: string
@@ -25,7 +26,7 @@ export interface ClipVideo {
 }
 
 export class Clip implements ClipVideo {
-  constructor(private clip: ClipMetadata) {}
+  constructor(private clip: ClipMetadata, private layout?: string) {}
 
   type() {
     return 'clip'
@@ -70,6 +71,19 @@ export class Clip implements ClipVideo {
   }
 
   poster() {
-    return this.clip.poster?.members[0].binaryUrl ?? ''
+    const mapSizes: {
+      [key: string]: number
+    } = {
+      'in-line': 700,
+      'mid-grid': 900,
+      'full-grid': 1200,
+    }
+
+    const url = this.clip.poster?.members[0].binaryUrl;
+    return url  ? imageServiceUrl({
+      url,
+      systemCode: 'cp-content-pipeline',
+      width: this.layout && mapSizes[this.layout] ? mapSizes[this.layout] : 700,
+    }) : ''
   }
 }

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

@@ -73,7 +73,7 @@ export const ClipSet = {
     const clipSet = getClipSet(parent)
 
     return clipSet && clipSet.members && clipSet.members.length > 0
-      ? clipSet.members.map((clip) => new Clip(clip))
+      ? clipSet.members.map((clip) => new Clip(clip, parent.reference.dataLayout))
       : null
   },
 } satisfies ClipSetResolvers