Merge branch 'main' into rjr-fix-video-main-media-poster-images

Author: KaliedaRik

dotcom-rendering/src/components/Card/Card.tsx

@@ -708,7 +708,9 @@ export const Card = ({
 						(imagePositionOnMobile === 'bottom' ||
 							isMediaCard(format)))
 				}
-				fillBackgroundOnDesktop={isBetaContainer && isMediaCard(format)}
+				fillBackgroundOnDesktop={
+					isBetaContainer && isMediaCardOrNewsletter
+				}
 			/>
 		);
 

dotcom-rendering/src/components/DecideContainer.tsx

@@ -48,6 +48,7 @@ type Props = {
 	frontId?: string;
 	collectionId: number;
 	containerLevel?: DCRContainerLevel;
+	isInNoBoostsAbTestVariant?: boolean;
 };
 
 export const DecideContainer = ({
@@ -63,6 +64,7 @@ export const DecideContainer = ({
 	frontId,
 	collectionId,
 	containerLevel,
+	isInNoBoostsAbTestVariant,
 }: Props) => {
 	switch (containerType) {
 		case 'dynamic/fast':
@@ -268,6 +270,7 @@ export const DecideContainer = ({
 					aspectRatio={aspectRatio}
 					containerLevel={containerLevel}
 					collectionId={collectionId}
+					isInNoBoostsAbTestVariant={isInNoBoostsAbTestVariant}
 				/>
 			);
 		case 'scrollable/small':

dotcom-rendering/src/components/FlexibleGeneral.tsx

@@ -21,6 +21,7 @@ import type { ResponsiveFontSize } from './CardHeadline';
 import type { Loading } from './CardPicture';
 import { FeatureCard } from './FeatureCard';
 import { FrontCard } from './FrontCard';
+import { Hide } from './Hide';
 import type { Alignment } from './SupportingContent';
 
 type Props = {
@@ -32,6 +33,7 @@ type Props = {
 	aspectRatio: AspectRatio;
 	containerLevel?: DCRContainerLevel;
 	collectionId: number;
+	isInNoBoostsAbTestVariant?: boolean;
 };
 
 type RowLayout = 'oneCardHalfWidth' | 'oneCardFullWidth' | 'twoCard';
@@ -580,17 +582,20 @@ export const FlexibleGeneral = ({
 	aspectRatio,
 	containerLevel = 'Primary',
 	collectionId,
+	isInNoBoostsAbTestVariant,
 }: Props) => {
 	const splash = [...groupedTrails.splash].slice(0, 1).map((snap) => ({
 		...snap,
 		uniqueId: `collection-${collectionId}-splash-0`,
 	}));
+
 	const cards = [...groupedTrails.standard]
 		.slice(0, 19)
 		.map((standard, i) => ({
 			...standard,
 			uniqueId: `collection-${collectionId}-standard-${i}`,
 		}));
+
 	const groupedCards = decideCardPositions(cards);
 
 	return (
@@ -608,11 +613,51 @@ export const FlexibleGeneral = ({
 					collectionId={collectionId}
 				/>
 			)}
-
 			{groupedCards.map((row, i) => {
 				switch (row.layout) {
 					case 'oneCardFullWidth':
-						return (
+						return isInNoBoostsAbTestVariant ? (
+							<>
+								<Hide when="above" breakpoint="tablet">
+									<HalfWidthCardLayout
+										key={row.cards[0]?.uniqueId}
+										cards={row.cards}
+										containerPalette={containerPalette}
+										showAge={showAge}
+										absoluteServerTimes={
+											absoluteServerTimes
+										}
+										imageLoading={imageLoading}
+										isFirstRow={!splash.length && i === 0}
+										isFirstStandardRow={i === 0}
+										aspectRatio={aspectRatio}
+										isLastRow={
+											i === groupedCards.length - 1
+										}
+										containerLevel={containerLevel}
+									/>
+								</Hide>
+								<Hide when="below" breakpoint="tablet">
+									<FullWidthCardLayout
+										key={row.cards[0]?.uniqueId}
+										cards={row.cards}
+										containerPalette={containerPalette}
+										showAge={showAge}
+										absoluteServerTimes={
+											absoluteServerTimes
+										}
+										imageLoading={imageLoading}
+										aspectRatio={aspectRatio}
+										isFirstRow={!splash.length && i === 0}
+										isLastRow={
+											i === groupedCards.length - 1
+										}
+										containerLevel={containerLevel}
+										collectionId={collectionId}
+									/>
+								</Hide>
+							</>
+						) : (
 							<FullWidthCardLayout
 								key={row.cards[0]?.uniqueId}
 								cards={row.cards}

dotcom-rendering/src/components/SignInGate/gates/main-control.ts

@@ -15,8 +15,41 @@ const canShow = ({
 	tags,
 	isPaidContent,
 	isPreview,
-}: CanShowGateProps): Promise<boolean> =>
-	Promise.resolve(
+}: CanShowGateProps): Promise<boolean> => {
+	// 31st July 2025
+	// author: Pascal
+	// Investigating broken behavior of this function
+
+	console.log('[60f7e8f7] investigation');
+	console.log(`isSignedIn: ${isSignedIn}`);
+	console.log(`!isSignedIn: ${!isSignedIn}`);
+	console.log(`currentTest.variant: ${currentTest.variant}`);
+	console.log(`currentTest.name: ${currentTest.name}`);
+	console.log(
+		`hasUserDismissedGate: ${hasUserDismissedGate(
+			currentTest.variant,
+			currentTest.name,
+		)}`,
+	);
+	console.log(
+		`!hasUserDismissedGate: ${!hasUserDismissedGate(
+			currentTest.variant,
+			currentTest.name,
+		)}`,
+	);
+	console.log(`isNPageOrHigherPageView: ${isNPageOrHigherPageView(3)}`);
+	console.log(`contentType: ${contentType}`);
+	console.log(`isValidContentType: ${isValidContentType(contentType)}`);
+	console.log(`sectionId: ${sectionId}`);
+	console.log(`isValidSection: ${isValidSection(sectionId)}`);
+	console.log(`tags: ${JSON.stringify(tags)}`);
+	console.log(`isValidTag: ${isValidTag(tags)}`);
+	console.log(`isPaidContent: ${isPaidContent}`);
+	console.log(`!isPaidContent: ${!isPaidContent}`);
+	console.log(`isPreview: ${isPreview}`);
+	console.log(`!isPreview: ${!isPreview}`);
+
+	return Promise.resolve(
 		!isSignedIn &&
 			!hasUserDismissedGate(currentTest.variant, currentTest.name) &&
 			isNPageOrHigherPageView(3) &&
@@ -28,6 +61,7 @@ const canShow = ({
 			// hide the sign in gate on internal tools preview
 			!isPreview,
 	);
+};
 
 export const signInGateComponent: SignInGateComponent = {
 	canShow,

dotcom-rendering/src/layouts/FrontLayout.tsx

@@ -105,7 +105,12 @@ const decideLeftContent = (front: Front, collection: DCRCollectionType) => {
 
 export const FrontLayout = ({ front, NAV }: Props) => {
 	const {
-		config: { isPaidContent, hasPageSkin: hasPageSkinConfig, pageId },
+		config: {
+			isPaidContent,
+			hasPageSkin: hasPageSkinConfig,
+			pageId,
+			abTests,
+		},
 		editionId,
 	} = front;
 
@@ -136,6 +141,8 @@ export const FrontLayout = ({ front, NAV }: Props) => {
 
 	const { absoluteServerTimes = false } = front.config.switches;
 
+	const isInNoBoostsVariant = abTests.noBoostsVariant === 'variant';
+
 	const fallbackAspectRatio = (collectionType: DCRContainerType) => {
 		switch (collectionType) {
 			case 'scrollable/feature':
@@ -199,7 +206,7 @@ export const FrontLayout = ({ front, NAV }: Props) => {
 								'--article-section-background',
 							)}
 						>
-							<HeaderAdSlot abTests={front.config.abTests} />
+							<HeaderAdSlot abTests={abTests} />
 						</Section>
 					</Stuck>
 				)}
@@ -743,6 +750,9 @@ export const FrontLayout = ({ front, NAV }: Props) => {
 									sectionId={ophanName}
 									collectionId={index + 1}
 									containerLevel={collection.containerLevel}
+									isInNoBoostsAbTestVariant={
+										pageId === 'uk' && isInNoBoostsVariant
+									}
 								/>
 							</FrontSection>