Merge pull request #13590 from guardian/delete-five-four

Remove five four image test

Author: DanielCliftonGuardian

dotcom-rendering/src/components/ImageBlockComponent.stories.tsx

@@ -67,8 +67,6 @@ export const StandardArticle = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					editionId="UK"
-					abTests={{}}
 				/>
 			</Figure>
 		</Wrapper>
@@ -95,8 +93,6 @@ export const Immersive = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -123,8 +119,6 @@ export const Showcase = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -151,8 +145,6 @@ export const Thumbnail = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -179,8 +171,6 @@ export const Supporting = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -208,8 +198,6 @@ export const HideCaption = () => {
 						theme: Pillar.News,
 					}}
 					hideCaption={true}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -238,8 +226,6 @@ export const InlineTitle = () => {
 					}}
 					title="This is the title text"
 					hideCaption={true}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -274,8 +260,6 @@ export const InlineTitleMobile = () => {
 					}}
 					title="This is the title text"
 					hideCaption={true}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -310,8 +294,6 @@ export const ImmersiveTitle = () => {
 					}}
 					title="This is the title text"
 					hideCaption={true}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -340,8 +322,6 @@ export const ShowcaseTitle = () => {
 					}}
 					title="This is the title text"
 					hideCaption={true}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 		</Wrapper>
@@ -394,8 +374,6 @@ export const HalfWidth = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 			<p>
@@ -464,8 +442,6 @@ export const HalfWidthMobile = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 			<p>
@@ -534,8 +510,6 @@ export const HalfWidthWide = () => {
 						design: ArticleDesign.Standard,
 						theme: Pillar.News,
 					}}
-					abTests={{}}
-					editionId={'UK'}
 				/>
 			</Figure>
 			<p>

dotcom-rendering/src/components/ImageBlockComponent.tsx

@@ -1,6 +1,4 @@
 import type { ArticleFormat } from '../lib/articleFormat';
-import type { EditionId } from '../lib/edition';
-import type { ServerSideTests } from '../types/config';
 import type { ImageBlockElement, StarRating } from '../types/content';
 import { ImageComponent } from './ImageComponent';
 
@@ -13,8 +11,6 @@ type Props = {
 	starRating?: StarRating;
 	isAvatar?: boolean;
 	isTimeline?: boolean;
-	abTests: ServerSideTests;
-	editionId: EditionId;
 };
 
 export const ImageBlockComponent = ({
@@ -26,8 +22,6 @@ export const ImageBlockComponent = ({
 	starRating,
 	isAvatar,
 	isTimeline = false,
-	abTests,
-	editionId,
 }: Props) => {
 	const { role } = element;
 	return (
@@ -41,8 +35,6 @@ export const ImageBlockComponent = ({
 			title={title}
 			isAvatar={isAvatar}
 			isTimeline={isTimeline}
-			abTests={abTests}
-			editionId={editionId}
 		/>
 	);
 };

dotcom-rendering/src/components/ImageComponent.tsx

@@ -14,10 +14,8 @@ import {
 	ArticleDisplay,
 	type ArticleFormat,
 } from '../lib/articleFormat';
-import type { EditionId } from '../lib/edition';
 import { getLargest, getMaster } from '../lib/image';
 import { palette as themePalette } from '../palette';
-import type { ServerSideTests } from '../types/config';
 import type {
 	ImageBlockElement,
 	StarRating as Rating,
@@ -42,8 +40,6 @@ type Props = {
 	title?: string;
 	isAvatar?: boolean;
 	isTimeline?: boolean;
-	abTests?: ServerSideTests;
-	editionId?: EditionId;
 };
 
 const timelineBulletStyles = css`
@@ -269,12 +265,7 @@ export const ImageComponent = ({
 	title,
 	isAvatar,
 	isTimeline = false,
-	abTests,
-	editionId,
 }: Props) => {
-	const isInFiveFourImagesAbTestVariant =
-		abTests?.abFiveFourImagesVariant === 'variant';
-
 	const { renderingTarget } = useConfig();
 	// Its possible the tools wont send us any images urls
 	// if so, don't try to render
@@ -315,13 +306,6 @@ export const ImageComponent = ({
 
 	const loading = isMainMedia ? 'eager' : 'lazy';
 
-	const aspectOverride =
-		(editionId === 'INT' || editionId === 'EUR') &&
-		isInFiveFourImagesAbTestVariant &&
-		image.fields.aspectRatio === '5:3'
-			? { aspectRatio: '5:4' }
-			: {};
-
 	if (
 		isMainMedia &&
 		format.display === ArticleDisplay.Immersive &&
@@ -379,7 +363,6 @@ export const ImageComponent = ({
 						height={imageHeight}
 						loading={loading}
 						isMainMedia={isMainMedia}
-						{...aspectOverride}
 					/>
 				)}
 
@@ -440,7 +423,6 @@ export const ImageComponent = ({
 						height={imageHeight}
 						loading={loading}
 						isMainMedia={isMainMedia}
-						{...aspectOverride}
 					/>
 				)}
 
@@ -507,7 +489,6 @@ export const ImageComponent = ({
 						height={imageHeight}
 						loading={loading}
 						isMainMedia={isMainMedia}
-						{...aspectOverride}
 					/>
 				)}
 				{isTimeline && isMainMedia && role === 'showcase' && (

dotcom-rendering/src/lib/renderElement.tsx

@@ -362,8 +362,6 @@ export const renderElement = ({
 					title={element.title}
 					isAvatar={element.isAvatar}
 					isTimeline={isTimeline}
-					abTests={abTests}
-					editionId={editionId}
 				/>
 			);
 		case 'model.dotcomrendering.pageElements.InstagramBlockElement':