Skip to content

Commit db22948

Browse files
domlanderdomlander
committed
Remove 'show more' functionality from containers
1 parent b079e0b commit db22948

26 files changed

+48
-2524
lines changed

‎dotcom-rendering/fixtures/manual/show-more-trails.ts‎

Lines changed: 0 additions & 1741 deletions
This file was deleted.

‎dotcom-rendering/src/components/Accessibility.importable.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const Accessibility = () => {
9393
};
9494

9595
return (
96-
<FrontSection title="Preferences" editionId="UK" discussionApiUrl="">
96+
<FrontSection title="Preferences" editionId="UK">
9797
<form>
9898
<fieldset css={formStyle}>
9999
<p>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,7 @@ export const WithSpecialPaletteVariations = () => {
15551555
{containerPalettes.map((containerPalette) => (
15561556
<FrontSection
15571557
title={containerPalette}
1558-
discussionApiUrl=""
1559-
editionId={'UK'}
1558+
editionId="UK"
15601559
containerPalette={containerPalette}
15611560
key={containerPalette}
15621561
isLabs={containerPalette === 'Branded'}

‎dotcom-rendering/src/components/DecideContainerByTrails.stories.tsx‎

Lines changed: 20 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { breakpoints } from '@guardian/source/foundations';
2-
import { discussionApiUrl } from '../../fixtures/manual/discussionApiUrl';
32
import {
43
multipleBrandedTrails,
54
singleBrandedTrails,
@@ -26,11 +25,7 @@ const ASPECT_RATIO = '5:4';
2625

2726
export const OneCardFast = () => {
2827
return (
29-
<FrontSection
30-
title="Fast - One card"
31-
discussionApiUrl={discussionApiUrl}
32-
editionId={'UK'}
33-
>
28+
<FrontSection title="Fast - One card" editionId="UK">
3429
<DecideContainerByTrails
3530
trails={trails.slice(0, 1)}
3631
speed="fast"
@@ -44,11 +39,7 @@ OneCardFast.storyName = 'Fast - One card';
4439

4540
export const TwoCardFast = () => {
4641
return (
47-
<FrontSection
48-
title="Fast - Two cards"
49-
discussionApiUrl={discussionApiUrl}
50-
editionId={'UK'}
51-
>
42+
<FrontSection title="Fast - Two cards" editionId="UK">
5243
<DecideContainerByTrails
5344
trails={trails.slice(0, 2)}
5445
speed="fast"
@@ -62,11 +53,7 @@ TwoCardFast.storyName = 'Fast - Two cards';
6253

6354
export const ThreeCardFast = () => {
6455
return (
65-
<FrontSection
66-
title="Fast - Three cards"
67-
discussionApiUrl={discussionApiUrl}
68-
editionId={'UK'}
69-
>
56+
<FrontSection title="Fast - Three cards" editionId="UK">
7057
<DecideContainerByTrails
7158
trails={trails.slice(0, 3)}
7259
speed="fast"
@@ -80,11 +67,7 @@ ThreeCardFast.storyName = 'Fast - Three cards';
8067

8168
export const FourCardFast = () => {
8269
return (
83-
<FrontSection
84-
title="Fast - Four cards"
85-
discussionApiUrl={discussionApiUrl}
86-
editionId={'UK'}
87-
>
70+
<FrontSection title="Fast - Four cards" editionId="UK">
8871
<DecideContainerByTrails
8972
trails={trails.slice(0, 4)}
9073
speed="fast"
@@ -98,11 +81,7 @@ FourCardFast.storyName = 'Fast - Four cards';
9881

9982
export const FiveCardFast = () => {
10083
return (
101-
<FrontSection
102-
title="Fast - Five cards"
103-
discussionApiUrl={discussionApiUrl}
104-
editionId={'UK'}
105-
>
84+
<FrontSection title="Fast - Five cards" editionId="UK">
10685
<DecideContainerByTrails
10786
trails={trails.slice(0, 5)}
10887
speed="fast"
@@ -116,11 +95,7 @@ FiveCardFast.storyName = 'Fast - Five cards';
11695

11796
export const SixCardFast = () => {
11897
return (
119-
<FrontSection
120-
title="Fast - Six cards"
121-
discussionApiUrl={discussionApiUrl}
122-
editionId={'UK'}
123-
>
98+
<FrontSection title="Fast - Six cards" editionId="UK">
12499
<DecideContainerByTrails
125100
trails={trails.slice(0, 6)}
126101
speed="fast"
@@ -134,11 +109,7 @@ SixCardFast.storyName = 'Fast - Six cards';
134109

135110
export const SevenCardFast = () => {
136111
return (
137-
<FrontSection
138-
title="Fast - Seven cards"
139-
discussionApiUrl={discussionApiUrl}
140-
editionId={'UK'}
141-
>
112+
<FrontSection title="Fast - Seven cards" editionId="UK">
142113
<DecideContainerByTrails
143114
trails={trails.slice(0, 7)}
144115
speed="fast"
@@ -152,11 +123,7 @@ SevenCardFast.storyName = 'Fast - Seven cards';
152123

153124
export const EightCardFast = () => {
154125
return (
155-
<FrontSection
156-
title="Fast - Eight cards"
157-
discussionApiUrl={discussionApiUrl}
158-
editionId={'UK'}
159-
>
126+
<FrontSection title="Fast - Eight cards" editionId="UK">
160127
<DecideContainerByTrails
161128
trails={trails.slice(0, 8)}
162129
speed="fast"
@@ -171,11 +138,7 @@ EightCardFast.storyName = 'Fast - Eight cards';
171138

172139
export const TwelveCardFast = () => {
173140
return (
174-
<FrontSection
175-
title="Fast - Twelve cards"
176-
discussionApiUrl={discussionApiUrl}
177-
editionId={'UK'}
178-
>
141+
<FrontSection title="Fast - Twelve cards" editionId="UK">
179142
<DecideContainerByTrails
180143
trails={trails.slice(0, 12)}
181144
speed="fast"
@@ -189,11 +152,7 @@ TwelveCardFast.storyName = 'Fast - Twelve cards';
189152

190153
export const OneCardSlow = () => {
191154
return (
192-
<FrontSection
193-
title="Slow - One card"
194-
discussionApiUrl={discussionApiUrl}
195-
editionId={'UK'}
196-
>
155+
<FrontSection title="Slow - One card" editionId="UK">
197156
<DecideContainerByTrails
198157
trails={trails.slice(0, 1)}
199158
speed="slow"
@@ -207,11 +166,7 @@ OneCardSlow.storyName = 'Slow - One card';
207166

208167
export const TwoCardSlow = () => {
209168
return (
210-
<FrontSection
211-
title="Slow - Two cards"
212-
discussionApiUrl={discussionApiUrl}
213-
editionId={'UK'}
214-
>
169+
<FrontSection title="Slow - Two cards" editionId="UK">
215170
<DecideContainerByTrails
216171
trails={trails.slice(0, 2)}
217172
speed="slow"
@@ -225,11 +180,7 @@ TwoCardSlow.storyName = 'Slow - Two cards';
225180

226181
export const ThreeCardSlow = () => {
227182
return (
228-
<FrontSection
229-
title="Slow - Three cards"
230-
discussionApiUrl={discussionApiUrl}
231-
editionId={'UK'}
232-
>
183+
<FrontSection title="Slow - Three cards" editionId="UK">
233184
<DecideContainerByTrails
234185
trails={trails.slice(0, 3)}
235186
speed="slow"
@@ -243,11 +194,7 @@ ThreeCardSlow.storyName = 'Slow - Three cards';
243194

244195
export const FourCardSlow = () => {
245196
return (
246-
<FrontSection
247-
title="Slow - Four cards"
248-
discussionApiUrl={discussionApiUrl}
249-
editionId={'UK'}
250-
>
197+
<FrontSection title="Slow - Four cards" editionId="UK">
251198
<DecideContainerByTrails
252199
trails={trails.slice(0, 4)}
253200
speed="slow"
@@ -261,11 +208,7 @@ FourCardSlow.storyName = 'Slow - Four cards';
261208

262209
export const FiveCardSlow = () => {
263210
return (
264-
<FrontSection
265-
title="Slow - Five cards"
266-
discussionApiUrl={discussionApiUrl}
267-
editionId={'UK'}
268-
>
211+
<FrontSection title="Slow - Five cards" editionId="UK">
269212
<DecideContainerByTrails
270213
trails={trails.slice(0, 5)}
271214
speed="slow"
@@ -279,11 +222,7 @@ FiveCardSlow.storyName = 'Slow - Five cards';
279222

280223
export const SixCardSlow = () => {
281224
return (
282-
<FrontSection
283-
title="Slow - Six cards"
284-
discussionApiUrl={discussionApiUrl}
285-
editionId={'UK'}
286-
>
225+
<FrontSection title="Slow - Six cards" editionId="UK">
287226
<DecideContainerByTrails
288227
trails={trails.slice(0, 6)}
289228
speed="slow"
@@ -297,11 +236,7 @@ SixCardSlow.storyName = 'Slow - Six cards';
297236

298237
export const SevenCardSlow = () => {
299238
return (
300-
<FrontSection
301-
title="Slow - Seven cards"
302-
discussionApiUrl={discussionApiUrl}
303-
editionId={'UK'}
304-
>
239+
<FrontSection title="Slow - Seven cards" editionId="UK">
305240
<DecideContainerByTrails
306241
trails={trails.slice(0, 7)}
307242
speed="slow"
@@ -315,11 +250,7 @@ SevenCardSlow.storyName = 'Slow - Seven cards';
315250

316251
export const EightCardSlow = () => {
317252
return (
318-
<FrontSection
319-
title="Slow - Eight cards"
320-
discussionApiUrl={discussionApiUrl}
321-
editionId={'UK'}
322-
>
253+
<FrontSection title="Slow - Eight cards" editionId="UK">
323254
<DecideContainerByTrails
324255
trails={trails.slice(0, 8)}
325256
speed="slow"
@@ -334,11 +265,7 @@ EightCardSlow.storyName = 'Slow - Eight cards';
334265

335266
export const TwelveCardSlow = () => {
336267
return (
337-
<FrontSection
338-
title="Slow - Twelve cards"
339-
discussionApiUrl={discussionApiUrl}
340-
editionId={'UK'}
341-
>
268+
<FrontSection title="Slow - Twelve cards" editionId="UK">
342269
<DecideContainerByTrails
343270
trails={trails.slice(0, 12)}
344271
speed="slow"
@@ -354,8 +281,7 @@ export const FiveCardWithSingleBranding = () => {
354281
return (
355282
<FrontSection
356283
title="Five cards with single branding"
357-
discussionApiUrl={discussionApiUrl}
358-
editionId={'UK'}
284+
editionId="UK"
359285
collectionBranding={{
360286
kind: 'paid-content',
361287
isFrontBranding: false,
@@ -394,11 +320,7 @@ FiveCardWithSingleBranding.storyName = 'Five cards with single branding';
394320

395321
export const FiveCardWithMultipleBranding = () => {
396322
return (
397-
<FrontSection
398-
title="Five cards with multiple branding"
399-
discussionApiUrl={discussionApiUrl}
400-
editionId={'UK'}
401-
>
323+
<FrontSection title="Five cards with multiple branding" editionId="UK">
402324
<DecideContainerByTrails
403325
trails={multipleBrandedTrails}
404326
speed="fast"

‎dotcom-rendering/src/components/ElementContainer.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ export const ElementContainer = ({
103103
className,
104104
children: (
105105
<div
106-
/**
107-
* id is being used to set the containerId in @see {ShowMore.importable.tsx}
108-
* this id pre-existed showMore so is probably also being used for something else.
109-
*/
110106
id={sectionId}
111107
style={{
112108
borderColor: borderColour,

‎dotcom-rendering/src/components/FlexibleGeneral.stories.tsx‎

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ const meta = {
162162
render: ({ frontSectionTitle, ...args }) => (
163163
<FrontSection
164164
title={frontSectionTitle}
165-
discussionApiUrl={discussionApiUrl}
166165
editionId="UK"
167166
showTopBorder={true}
168167
slimifySectionForSlimHomepageAbTest={
@@ -218,12 +217,7 @@ export const SplashWithSublinks: Story = {
218217
title: string;
219218
supportingContent?: DCRSupportingContent[];
220219
}) => (
221-
<FrontSection
222-
title={title}
223-
discussionApiUrl={discussionApiUrl}
224-
editionId="UK"
225-
showTopBorder={true}
226-
>
220+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
227221
<FlexibleGeneral
228222
{...args}
229223
groupedTrails={{
@@ -313,12 +307,7 @@ export const SplashBoostLevels: Story = {
313307
title: string;
314308
boostLevel?: BoostLevel;
315309
}) => (
316-
<FrontSection
317-
title={title}
318-
discussionApiUrl={discussionApiUrl}
319-
editionId="UK"
320-
showTopBorder={true}
321-
>
310+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
322311
<FlexibleGeneral
323312
{...args}
324313
groupedTrails={{
@@ -362,12 +351,7 @@ export const SplashWithImageSupression: Story = {
362351
title: string;
363352
boostLevel?: BoostLevel;
364353
}) => (
365-
<FrontSection
366-
title={title}
367-
discussionApiUrl={discussionApiUrl}
368-
editionId="UK"
369-
showTopBorder={true}
370-
>
354+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
371355
<FlexibleGeneral
372356
{...args}
373357
groupedTrails={{
@@ -402,12 +386,7 @@ export const SplashWithLiveUpdates: Story = {
402386
title: string;
403387
boostLevel?: BoostLevel;
404388
}) => (
405-
<FrontSection
406-
title={title}
407-
discussionApiUrl={discussionApiUrl}
408-
editionId="UK"
409-
showTopBorder={true}
410-
>
389+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
411390
<FlexibleGeneral
412391
{...args}
413392
groupedTrails={{
@@ -440,12 +419,7 @@ export const StandardBoostedWithLiveUpdates: Story = {
440419
title: string;
441420
boostLevel: BoostLevel;
442421
}) => (
443-
<FrontSection
444-
title={title}
445-
discussionApiUrl={discussionApiUrl}
446-
editionId="UK"
447-
showTopBorder={true}
448-
>
422+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
449423
<FlexibleGeneral
450424
{...args}
451425
groupedTrails={{
@@ -523,8 +497,7 @@ export const WithSpecialPaletteVariations = {
523497
<>
524498
{containerPalettes.map((containerPalette) => (
525499
<FrontSection
526-
discussionApiUrl={discussionApiUrl}
527-
editionId={'UK'}
500+
editionId="UK"
528501
showTopBorder={true}
529502
containerPalette={containerPalette}
530503
key={containerPalette}
@@ -578,12 +551,7 @@ export const SelfHostedVideoCardsInSplashSlots: Story = {
578551
video: DCRFrontCard;
579552
boostLevel?: BoostLevel;
580553
}) => (
581-
<FrontSection
582-
title={title}
583-
discussionApiUrl={discussionApiUrl}
584-
editionId="UK"
585-
showTopBorder={true}
586-
>
554+
<FrontSection title={title} editionId="UK" showTopBorder={true}>
587555
<FlexibleGeneral
588556
{...args}
589557
groupedTrails={{

0 commit comments

Comments
 (0)