Make layout content the point of forking

Author: frederickobrien

dotcom-rendering/src/layouts/DecideLayout.tsx

@@ -11,8 +11,7 @@ import { HostedArticleLayout } from './HostedArticleLayout';
 import { HostedGalleryLayout } from './HostedGalleryLayout';
 import { HostedVideoLayout } from './HostedVideoLayout';
 import { ImmersiveLayout } from './ImmersiveLayout';
-import { InteractiveLayout } from './InteractiveLayout';
-import { InteractiveLayoutDeprecated } from './InteractiveLayoutDeprecated';
+import { InteractiveLayout } from './interactives/InteractiveLayout';
 import { LiveLayout } from './LiveLayout';
 import { NewsletterSignupLayout } from './NewsletterSignupLayout';
 import { PictureLayout } from './PictureLayout';
@@ -34,8 +33,6 @@ interface WebProps extends BaseProps {
 
 export type Props = WebProps | AppProps;
 
-export const interactiveLayoutSwitchoverDate = new Date('2024-06-01T00:00:00Z');
-
 const DecideLayoutApps = ({ article, renderingTarget }: AppProps) => {
 	const notSupported = <pre>Not supported</pre>;
 	const format = {
@@ -45,7 +42,6 @@ const DecideLayoutApps = ({ article, renderingTarget }: AppProps) => {
 	};
 
 	const serverTime = article.serverTime;
-	const publicationDate = new Date(article.frontendData.webPublicationDate);
 
 	switch (article.display) {
 		case ArticleDisplay.Immersive: {
@@ -119,24 +115,13 @@ const DecideLayoutApps = ({ article, renderingTarget }: AppProps) => {
 		default: {
 			switch (article.design) {
 				case ArticleDesign.Interactive:
-					if (publicationDate < interactiveLayoutSwitchoverDate) {
-						return (
-							<InteractiveLayoutDeprecated
-								article={article.frontendData}
-								format={format}
-								renderingTarget={renderingTarget}
-								serverTime={serverTime}
-							/>
-						);
-					} else {
-						return (
-							<InteractiveLayout
-								article={article.frontendData}
-								format={format}
-								renderingTarget={renderingTarget}
-							/>
-						);
-					}
+					return (
+						<InteractiveLayout
+							article={article.frontendData}
+							format={format}
+							renderingTarget={renderingTarget}
+						/>
+					);
 				case ArticleDesign.FullPageInteractive: {
 					return (
 						<FullPageInteractiveLayout
@@ -233,7 +218,6 @@ const DecideLayoutWeb = ({ article, NAV, renderingTarget }: WebProps) => {
 	};
 
 	const serverTime = article.serverTime;
-	const publicationDate = new Date(article.frontendData.webPublicationDate);
 
 	switch (article.display) {
 		case ArticleDisplay.Immersive: {
@@ -313,26 +297,14 @@ const DecideLayoutWeb = ({ article, NAV, renderingTarget }: WebProps) => {
 		default: {
 			switch (article.design) {
 				case ArticleDesign.Interactive:
-					if (publicationDate < interactiveLayoutSwitchoverDate) {
-						return (
-							<InteractiveLayoutDeprecated
-								article={article.frontendData}
-								NAV={NAV}
-								format={format}
-								renderingTarget={renderingTarget}
-								serverTime={serverTime}
-							/>
-						);
-					} else {
-						return (
-							<InteractiveLayout
-								article={article.frontendData}
-								NAV={NAV}
-								format={format}
-								renderingTarget={renderingTarget}
-							/>
-						);
-					}
+					return (
+						<InteractiveLayout
+							article={article.frontendData}
+							NAV={NAV}
+							format={format}
+							renderingTarget={renderingTarget}
+						/>
+					);
 				case ArticleDesign.FullPageInteractive: {
 					return (
 						<FullPageInteractiveLayout

dotcom-rendering/src/layouts/FullPageInteractiveLayout.tsx

@@ -27,7 +27,7 @@ import type { ArticleDeprecated } from '../types/article';
 import type { ServerSideTests, Switches } from '../types/config';
 import type { FEElement } from '../types/content';
 import type { RenderingTarget } from '../types/renderingTarget';
-import { temporaryBodyCopyColourOverride } from './InteractiveLayoutDeprecated';
+import { temporaryBodyCopyColourOverride } from './interactives/InteractiveGridV1';
 import { interactiveGlobalStyles } from './lib/interactiveLegacyStyling';
 import { BannerWrapper, Stuck } from './lib/stickiness';