Merge branch 'main' into add-gallery-lightbox

Author: marjisound

dotcom-rendering/README.md

@@ -30,9 +30,17 @@ $ cd dotcom-rendering
 
 ### Install Node.js
 
-To install and manage Node versions, we highly recommend installing a Node version manager such as [fnm](https://github.com/Schniz/fnm) (preferred), [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://asdf-vm.com/guide/getting-started.html).
+We highly recommend installing a Node version manager such as [fnm](https://github.com/Schniz/fnm) (preferred), [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://asdf-vm.com/guide/getting-started.html).
 
-Ensure you're at the root directory of this project, then follow the instructions for your version manager to install Node.
+Install the Node version manager of your choice.
+
+Ensure you're at the root directory of the project:
+
+```
+cd ~/code/dotcom-rendering
+```
+
+Run the command for your version manager to use the Node version as specified in [.nvmrc](../.nvmrc).
 
 For `fnm` this will be:
 
@@ -94,22 +102,20 @@ $ make install
 
 If you get an Node version error then check the setup for your version manager.
 
-### Running locally
+### Run
 
 ```sh
 $ make dev
 ```
 
-The development server will start on [http://localhost:3030](http://localhost:3030).
+The development server will start on [http://localhost:3030](http://localhost:3030)
 
-A list of content types with example URLs are available on the [root path](http://localhost:3030).
+The development server home page lists examples of the various page and content types.
 
 You can render a specific article by appending the production URL to the `Article` endpoint, for example:
-
 http://localhost:3030/Article/https://www.theguardian.com/sport/2019/jul/28/tour-de-france-key-moments-egan-bernal-yellow-jersey
 
-You can view the JSON representation of an article as sent to DCR by [Frontend](https://github.com/guardian/frontend), by appending `.json?dcr=true` to the production URL, for example:
-
+You can view the JSON data model of a page as sent by [Frontend](https://github.com/guardian/frontend) to DCR by appending `.json?dcr=true` to the production URL, for example:
 https://www.theguardian.com/sport/2019/jul/28/tour-de-france-key-moments-egan-bernal-yellow-jersey.json?dcr=true
 
 ### Detailed setup

dotcom-rendering/fixtures/manual/sign-in-gate.ts

@@ -8,7 +8,7 @@ export const mockAuxiaResponseDismissible = {
 			treatmentContent: JSON.stringify({
 				title: 'Like uninterrupted reading?\nSo do we. Sign in.',
 				subtitle:
-					"Sign in to keep reading. It's free, and we'll bring you right back here in under a minute.",
+					"Sign in to keep reading.\n\nIt's free, and we'll bring you right back here in under a minute.",
 				body: '',
 				first_cta_name: 'Create a free account',
 				first_cta_link: 'https://profile.theguardian.com/register',

dotcom-rendering/src/components/AdSlot.web.tsx

@@ -115,7 +115,7 @@ const topAboveNavContainerStyles = css`
 	display: block;
 `;
 
-const topAboveNavContainerVaraintStyles = css`
+const topAboveNavContainerVariantStyles = css`
 	padding-bottom: ${space[5]}px;
 	position: relative;
 	margin: 0 auto;
@@ -128,6 +128,25 @@ const topAboveNavContainerVaraintStyles = css`
 	&[top-above-nav-ad-rendered='true'] {
 		min-height: auto;
 	}
+
+	/* Ad placeholder grey box rendered while loading the ad */
+	&:not([top-above-nav-ad-rendered='true']) {
+		::before {
+			content: '';
+			position: absolute;
+			height: 250px;
+			width: 728px;
+			top: ${labelHeight}px;
+			left: 50%;
+			transform: translateX(-50%);
+			background-color: ${palette.neutral[93]};
+		}
+		${from.desktop} {
+			::before {
+				width: 970px;
+			}
+		}
+	}
 `;
 
 /**
@@ -600,7 +619,7 @@ export const AdSlot = ({
 				<AdSlotWrapper
 					css={
 						isIn250ReservationVariant
-							? topAboveNavContainerVaraintStyles
+							? topAboveNavContainerVariantStyles
 							: topAboveNavContainerStyles
 					}
 				>

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/Carousel.importable.tsx

@@ -425,6 +425,10 @@ const getDataLinkNameCarouselButton = (
 	return `${isVideoContainer ? 'video-container' : arrowName}-${direction}`;
 };
 
+const cleanTitle = (title: string) => {
+	return title.replace('More', '').trimStart();
+};
+
 const Title = ({
 	title,
 	isCuratedContent,
@@ -453,7 +457,9 @@ const Title = ({
 	) : (
 		<h2 css={headerStyles}>
 			{isCuratedContent ? 'More from ' : ''}
-			<span css={titleStyle(isCuratedContent)}>{title}</span>
+			<span css={titleStyle(isCuratedContent)}>
+				{isCuratedContent ? cleanTitle(title) : title}
+			</span>
 		</h2>
 	);
 

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.stories.tsx

@@ -54,7 +54,9 @@ const standardCards = standards.map((card, index) => {
 
 	switch (index + 1) {
 		case 2:
-			return enhanceCardFields({ supportingContent: getSublinks(2) });
+			return enhanceCardFields({
+				supportingContent: getSublinks(2),
+			});
 		case 3:
 			return enhanceCardFields({
 				boostLevel: 'boost',
@@ -437,13 +439,13 @@ const slideshowCard = {
 	],
 } satisfies DCRFrontCard;
 
-export const DefaultSplashWithLiveUpdatesAndSlideshow: Story = {
-	name: 'Standard splash with live updates and slideshow',
+// Boost level is ignored for slideshows
+export const SplashWithLiveUpdatesAndSlideshow: Story = {
+	name: 'Splash with live updates and slideshow',
 	args: {
-		frontSectionTitle: 'Standard splash with live updates and slideshow',
+		frontSectionTitle: 'Splash with live updates and slideshow',
 		groupedTrails: {
 			...emptyGroupedTrails,
-
 			splash: [{ ...slideshowCard }],
 		},
 	},
@@ -460,6 +462,21 @@ export const StandardCards: Story = {
 	},
 };
 
+export const StandardBoostedMediaCardWithSublinks: Story = {
+	name: 'Standard boosted media card with sublinks',
+	args: {
+		frontSectionTitle: 'Standard boosted media card with sublinks',
+		groupedTrails: {
+			...emptyGroupedTrails,
+			standard: [trails[1]].map((card) => ({
+				...card,
+				boostLevel: 'boost',
+				supportingContent: getSublinks(2),
+			})),
+		},
+	},
+};
+
 export const OpinionStandardCards: Story = {
 	name: 'Opinion standard cards',
 	args: {

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}