Remove Show More feature

ab-testing/config/abTests.ts

@@ -109,14 +109,14 @@ const ABTests: ABTest[] = [
 	{
 		name: "fronts-and-curation-slim-homepage",
 		description:
-			"Test placing the Most Viewed and Deeply Read components in the right-hand column on the homepage.",
+			"Test slimming content and placing Most Popular components on the right-hand side on the UK front.",
 		owners: ["fronts.and.curation@guardian.co.uk"],
 		status: "ON",
-		expirationDate: `2026-04-28`,
+		expirationDate: "2026-04-28",
 		type: "server",
 		audienceSize: 0 / 100,
 		audienceSpace: "A",
-		groups: ["control", "variant"],
+		groups: ["control", "variant-one", "variant-two"],
 		shouldForceMetricsCollection: false,
 	},
 	{

dotcom-rendering/.storybook/main.ts

@@ -103,24 +103,34 @@ const webpackConfig = (config: Configuration) => {
 	const rules = config.module?.rules ?? [];
 
 	config.resolve ??= {};
-	config.resolve.alias ??= {};
 
-	// Mock JSDOM for storybook - it relies on native node.js packages
-	// Allows us to use enhancers in stories for better testing of components & full articles
-	config.resolve.alias['jsdom$'] = path.resolve(
-		__dirname,
-		'./mocks/jsdom.ts',
-	);
+	config.resolve.alias = {
+		...config.resolve?.alias,
 
-	// log4js tries to call "fs" in storybook -- we can ignore it
-	config.resolve.alias[
-		`${path.resolve(__dirname, '../src/server/lib/logging')}$`
-	] = path.resolve(__dirname, './mocks/log4js.ts');
+		Buffer: 'buffer',
+		react: 'react',
+		'react-dom': 'react-dom',
 
-	// Mock BridgetApi for storybook
-	config.resolve.alias[
-		`${path.resolve(__dirname, '../src/lib/bridgetApi')}$`
-	] = path.resolve(__dirname, './mocks/bridgetApi.ts');
+		// Mock JSDOM for storybook - it relies on native node.js packages
+		// Allows us to use enhancers in stories for better testing of components & full articles
+		jsdom$: path.resolve(__dirname, './mocks/jsdom.ts'),
+
+		// log4js tries to call "fs" in storybook -- we can ignore it
+		[`${path.resolve(__dirname, '../src/server/lib/logging')}$`]:
+			path.resolve(__dirname, './mocks/log4js.ts'),
+
+		// Mock BridgetApi for storybook
+		[`${path.resolve(__dirname, '../src/lib/bridgetApi')}$`]: path.resolve(
+			__dirname,
+			'./mocks/bridgetApi.ts',
+		),
+
+		// Mock identity auth frontend to prevent Storybook components from hanging in Pending
+		'@guardian/identity-auth-frontend': path.resolve(
+			__dirname,
+			'./mocks/identityAuthFrontend.ts',
+		),
+	};
 
 	const webpackLoaders = getLoaders('client.web');
 
@@ -149,12 +159,7 @@ const webpackConfig = (config: Configuration) => {
 	config.resolve.modules = [
 		...((config && config.resolve && config.resolve.modules) || []),
 	];
-	config.resolve.alias = {
-		...config.resolve.alias,
-		Buffer: 'buffer',
-		react: 'react',
-		'react-dom': 'react-dom',
-	};
+
 	return config;
 };
 

dotcom-rendering/.storybook/mocks/identityAuthFrontend.ts

@@ -0,0 +1,8 @@
+export const getIdentityAuth = () => ({
+	isSignedInWithAuthState: () =>
+		Promise.resolve({
+			isAuthenticated: false,
+			accessToken: undefined,
+			idToken: undefined,
+		}),
+});

dotcom-rendering/fixtures/manual/frontCollections.ts

@@ -9,7 +9,7 @@ const defaultGrouped = {
 
 const defaultValues = {
 	backfill: [],
-	collectionType: 'fixed/small/slow-IV',
+	collectionType: 'static/medium/4',
 	config: {
 		showDateHeader: false,
 	},
@@ -35,13 +35,13 @@ export const testCollectionsUk = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'LongRunningAltPalette',
 		displayName: 'Ukraine invasion',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-V-mpu',
+		collectionType: 'static/medium/4',
 		displayName: 'News extra',
 	},
 	{
@@ -71,12 +71,12 @@ export const testCollectionsUk = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Lifestyle',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VII',
+		collectionType: 'flexible/general',
 		displayName: 'Culture',
 	},
 	{
@@ -91,7 +91,7 @@ export const testCollectionsUk = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		displayName: 'The rural network',
 	},
 	{
@@ -111,23 +111,23 @@ export const testCollectionsUk = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Multimedia',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'Branded',
 		displayName: 'Guardian Labs',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-XII-mpu',
+		collectionType: 'flexible/general',
 		displayName: 'Explore',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-I',
+		collectionType: 'flexible/general',
 		displayName: 'The big picture',
 	},
 	{
@@ -162,7 +162,7 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		displayName: 'In depth',
 	},
 	{
@@ -172,13 +172,13 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'LongRunningAltPalette',
 		displayName: 'Ukraine invasion',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Opinion',
 	},
 	{
@@ -193,7 +193,7 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		displayName: 'Climate crisis',
 	},
 	{
@@ -218,7 +218,7 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VII',
+		collectionType: 'flexible/general',
 		displayName: 'Podcasts',
 	},
 	{
@@ -228,28 +228,28 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Culture',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'Branded',
 		displayName: 'Business briefs',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Lifestyle',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		displayName: 'Take part',
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'Explore',
 	},
 	{
@@ -259,7 +259,7 @@ export const testCollectionsUs = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/medium/slow-VI',
+		collectionType: 'flexible/general',
 		displayName: 'In pictures',
 	},
 	{
@@ -282,7 +282,7 @@ export const brandedTestCollections = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'Branded',
 		displayName: 'Guardian Labs',
 	},
@@ -293,7 +293,7 @@ export const brandedTestCollections = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'Branded',
 		displayName: 'Guardian Labs',
 	},
@@ -304,7 +304,7 @@ export const brandedTestCollections = [
 	},
 	{
 		...defaultValues,
-		collectionType: 'fixed/small/slow-IV',
+		collectionType: 'static/medium/4',
 		containerPalette: 'Branded',
 		displayName: 'Guardian Labs',
 	},