Add additional blocks in enhanceArticleType

Co-authored-by: Oliver Abrahams <[email protected]>
guardian · Jan 16, 2025 · 5d0ce6b · 5d0ce6b
1 parent 12d7460
commit 5d0ce6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/dotcom-rendering/src/model/enhanceBlocks.ts b/dotcom-rendering/src/model/enhanceBlocks.ts
@@ -31,7 +31,6 @@ type Options = {
 	imagesForLightbox: ImageForLightbox[];
 	hasAffiliateLinksDisclaimer: boolean;
 	audioArticleImage?: ImageBlockElement;
-	additionalBlocks?: Block[];
 	tags?: TagType[];
 };
 
@@ -107,7 +106,6 @@ export const enhanceBlocks = (
 	options: Options,
 ): Block[] => {
 	const additionalElements: FEElement[] = [];
-	const additionalBlocks: Block[] = options.additionalBlocks ?? [];
 	if (options.audioArticleImage) {
 		additionalElements.push(options.audioArticleImage);
 	}
@@ -120,6 +118,5 @@ export const enhanceBlocks = (
 				options,
 			)([...block.elements, ...additionalElements]),
 		})),
-		...additionalBlocks,
 	];
 };
diff --git a/dotcom-rendering/src/types/article.ts b/dotcom-rendering/src/types/article.ts
@@ -37,10 +37,6 @@ export const enhanceArticleType = (
 ): Article => {
 	const format = decideFormat(data.format);
 
-	const crosswordBlock = buildCrosswordBlock(data);
-
-	const additionalBlocks = crosswordBlock ? [crosswordBlock] : [];
-
 	const imagesForLightbox = data.config.switches.lightbox
 		? buildLightboxImages(data.format, data.blocks, data.mainMediaElements)
 		: [];
@@ -51,10 +47,14 @@ export const enhanceArticleType = (
 		imagesForLightbox,
 		hasAffiliateLinksDisclaimer: !!data.affiliateLinksDisclaimer,
 		audioArticleImage: data.audioArticleImage,
-		additionalBlocks,
 		tags: data.tags,
 	});
 
+	const crosswordBlock = buildCrosswordBlock(data);
+	const additionalBlocks = crosswordBlock ? [crosswordBlock] : [];
+
+	const blocks = [...enhancedBlocks, ...additionalBlocks];
+
 	const mainMediaElements = enhanceMainMedia(
 		format,
 		imagesForLightbox,
@@ -67,7 +67,7 @@ export const enhanceArticleType = (
 		frontendData: {
 			...data,
 			mainMediaElements,
-			blocks: enhancedBlocks,
+			blocks,
 			pinnedPost: enhancePinnedPost(
 				format,
 				renderingTarget,