Skip to content

Commit 1cd546e

Browse files
deedeehdeedeeh
committed
Refactor to add the logic at the data level before rendering
1 parent 7f85e43 commit 1cd546e

File tree

5 files changed

+11
-93
lines changed

5 files changed

+11
-93
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ export type Props = {
163163
headlinePosition?: 'inner' | 'outer';
164164
/** Feature flag for the labs redesign work */
165165
showLabsRedesign?: boolean;
166-
stripBrandingFromCards?: boolean;
167166
};
168167

169168
const starWrapper = (cardHasImage: boolean) => css`
@@ -405,7 +404,6 @@ export const Card = ({
405404
isInAllBoostsTest = false,
406405
headlinePosition = 'inner',
407406
showLabsRedesign = false,
408-
stripBrandingFromCards = false,
409407
}: Props) => {
410408
const hasSublinks = supportingContent && supportingContent.length > 0;
411409
const sublinkPosition = decideSublinkPosition(
@@ -756,7 +754,7 @@ export const Card = ({
756754
* Results in a clickable brand logo and sponsorship label
757755
*/
758756
const LabsBranding = () => {
759-
if (!branding || stripBrandingFromCards) return;
757+
if (!branding) return;
760758
const getLocationPrefix = () => {
761759
if (!onwardsSource) {
762760
return 'front-card';

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ type Props = {
1919
imageLoading: Loading;
2020
isTagPage?: boolean;
2121
aspectRatio: AspectRatio;
22-
stripBrandingFromCards?: boolean;
2322
};
2423

2524
type CardProps = {
@@ -33,10 +32,8 @@ export const OneCardFast = ({
3332
imageLoading,
3433
isTagPage,
3534
aspectRatio,
36-
stripBrandingFromCards,
3735
}: {
3836
trail: DCRFrontCard;
39-
stripBrandingFromCards?: boolean;
4037
} & CardProps) => {
4138
return (
4239
<UL direction="row">
@@ -48,7 +45,6 @@ export const OneCardFast = ({
4845
imageLoading={imageLoading}
4946
isTagPage={isTagPage}
5047
aspectRatio={aspectRatio}
51-
stripBrandingFromCards={stripBrandingFromCards}
5248
/>
5349
</LI>
5450
</UL>
@@ -60,10 +56,8 @@ export const OneCardSlow = ({
6056
imageLoading,
6157
isTagPage,
6258
aspectRatio,
63-
stripBrandingFromCards,
6459
}: {
6560
trail: DCRFrontCard;
66-
stripBrandingFromCards?: boolean;
6761
} & CardProps) => {
6862
return (
6963
<UL direction="row">
@@ -75,7 +69,6 @@ export const OneCardSlow = ({
7569
imageLoading={imageLoading}
7670
isTagPage={isTagPage}
7771
aspectRatio={aspectRatio}
78-
stripBrandingFromCards={stripBrandingFromCards}
7972
/>
8073
</LI>
8174
</UL>
@@ -87,10 +80,8 @@ export const TwoCard = ({
8780
imageLoading,
8881
isTagPage,
8982
aspectRatio,
90-
stripBrandingFromCards,
9183
}: {
9284
trails: Tuple<DCRFrontCard, 2>;
93-
stripBrandingFromCards?: boolean;
9485
} & CardProps) => {
9586
return (
9687
<UL direction="row">
@@ -102,7 +93,6 @@ export const TwoCard = ({
10293
imageLoading={imageLoading}
10394
isTagPage={isTagPage}
10495
aspectRatio={aspectRatio}
105-
stripBrandingFromCards={stripBrandingFromCards}
10696
/>
10797
</LI>
10898
<LI percentage="50%" padSides={true} showDivider={true}>
@@ -113,7 +103,6 @@ export const TwoCard = ({
113103
imageLoading={imageLoading}
114104
isTagPage={isTagPage}
115105
aspectRatio={aspectRatio}
116-
stripBrandingFromCards={stripBrandingFromCards}
117106
/>
118107
</LI>
119108
</UL>
@@ -125,10 +114,8 @@ export const ThreeCard = ({
125114
imageLoading,
126115
isTagPage,
127116
aspectRatio,
128-
stripBrandingFromCards,
129117
}: {
130118
trails: Tuple<DCRFrontCard, 3>;
131-
stripBrandingFromCards?: boolean;
132119
} & CardProps) => {
133120
return (
134121
<UL direction="row">
@@ -140,7 +127,6 @@ export const ThreeCard = ({
140127
imageLoading={imageLoading}
141128
isTagPage={isTagPage}
142129
aspectRatio={aspectRatio}
143-
stripBrandingFromCards={stripBrandingFromCards}
144130
/>
145131
</LI>
146132
<LI percentage="33.333%" padSides={true} showDivider={true}>
@@ -151,7 +137,6 @@ export const ThreeCard = ({
151137
imageLoading={imageLoading}
152138
isTagPage={isTagPage}
153139
aspectRatio={aspectRatio}
154-
stripBrandingFromCards={stripBrandingFromCards}
155140
/>
156141
</LI>
157142
<LI percentage="33.333%" padSides={true} showDivider={true}>
@@ -162,7 +147,6 @@ export const ThreeCard = ({
162147
imageLoading={imageLoading}
163148
isTagPage={isTagPage}
164149
aspectRatio={aspectRatio}
165-
stripBrandingFromCards={stripBrandingFromCards}
166150
/>
167151
</LI>
168152
</UL>
@@ -174,10 +158,8 @@ export const FourCard = ({
174158
imageLoading,
175159
isTagPage,
176160
aspectRatio,
177-
stripBrandingFromCards,
178161
}: {
179162
trails: Tuple<DCRFrontCard, 4>;
180-
stripBrandingFromCards?: boolean;
181163
} & CardProps) => {
182164
return (
183165
<UL direction="row">
@@ -189,7 +171,6 @@ export const FourCard = ({
189171
imageLoading={imageLoading}
190172
isTagPage={isTagPage}
191173
aspectRatio={aspectRatio}
192-
stripBrandingFromCards={stripBrandingFromCards}
193174
/>
194175
</LI>
195176
<LI percentage="25%" padSides={true} showDivider={true}>
@@ -200,7 +181,6 @@ export const FourCard = ({
200181
imageLoading={imageLoading}
201182
isTagPage={isTagPage}
202183
aspectRatio={aspectRatio}
203-
stripBrandingFromCards={stripBrandingFromCards}
204184
/>
205185
</LI>
206186
<LI percentage="25%" padSides={true} showDivider={true}>
@@ -211,7 +191,6 @@ export const FourCard = ({
211191
imageLoading={imageLoading}
212192
isTagPage={isTagPage}
213193
aspectRatio={aspectRatio}
214-
stripBrandingFromCards={stripBrandingFromCards}
215194
/>
216195
</LI>
217196
<LI percentage="25%" padSides={true} showDivider={true}>
@@ -222,7 +201,6 @@ export const FourCard = ({
222201
imageLoading={imageLoading}
223202
isTagPage={isTagPage}
224203
aspectRatio={aspectRatio}
225-
stripBrandingFromCards={stripBrandingFromCards}
226204
/>
227205
</LI>
228206
</UL>
@@ -234,10 +212,8 @@ export const FiveCardFast = ({
234212
imageLoading,
235213
isTagPage,
236214
aspectRatio,
237-
stripBrandingFromCards,
238215
}: {
239216
trails: Tuple<DCRFrontCard, 5>;
240-
stripBrandingFromCards?: boolean;
241217
} & CardProps) => {
242218
return (
243219
<UL direction="row">
@@ -249,7 +225,6 @@ export const FiveCardFast = ({
249225
imageLoading={imageLoading}
250226
isTagPage={isTagPage}
251227
aspectRatio={aspectRatio}
252-
stripBrandingFromCards={stripBrandingFromCards}
253228
/>
254229
</LI>
255230
<LI percentage="33.333%" padSides={true} showDivider={true}>
@@ -260,7 +235,6 @@ export const FiveCardFast = ({
260235
imageLoading={imageLoading}
261236
isTagPage={isTagPage}
262237
aspectRatio={aspectRatio}
263-
stripBrandingFromCards={stripBrandingFromCards}
264238
/>
265239
</LI>
266240
<LI percentage="33.333%">
@@ -272,7 +246,6 @@ export const FiveCardFast = ({
272246
absoluteServerTimes={true}
273247
isTagPage={isTagPage}
274248
aspectRatio={aspectRatio}
275-
stripBrandingFromCards={stripBrandingFromCards}
276249
/>
277250
</LI>
278251
<LI padSides={true}>
@@ -282,7 +255,6 @@ export const FiveCardFast = ({
282255
absoluteServerTimes={true}
283256
isTagPage={isTagPage}
284257
aspectRatio={aspectRatio}
285-
stripBrandingFromCards={stripBrandingFromCards}
286258
/>
287259
</LI>
288260
<LI padSides={true}>
@@ -292,7 +264,6 @@ export const FiveCardFast = ({
292264
absoluteServerTimes={true}
293265
isTagPage={isTagPage}
294266
aspectRatio={aspectRatio}
295-
stripBrandingFromCards={stripBrandingFromCards}
296267
/>
297268
</LI>
298269
</UL>
@@ -943,7 +914,6 @@ export const DecideContainerByTrails = ({
943914
imageLoading,
944915
isTagPage,
945916
aspectRatio,
946-
stripBrandingFromCards,
947917
}: Props) => {
948918
const initialTrails = takeFirst(trails, 8);
949919
if (speed === 'fast') {
@@ -957,7 +927,6 @@ export const DecideContainerByTrails = ({
957927
imageLoading={imageLoading}
958928
isTagPage={isTagPage}
959929
aspectRatio={aspectRatio}
960-
stripBrandingFromCards={stripBrandingFromCards}
961930
/>
962931
);
963932
case 2:
@@ -967,7 +936,6 @@ export const DecideContainerByTrails = ({
967936
imageLoading={imageLoading}
968937
isTagPage={isTagPage}
969938
aspectRatio={aspectRatio}
970-
stripBrandingFromCards={stripBrandingFromCards}
971939
/>
972940
);
973941
case 3:
@@ -977,7 +945,6 @@ export const DecideContainerByTrails = ({
977945
imageLoading={imageLoading}
978946
isTagPage={isTagPage}
979947
aspectRatio={aspectRatio}
980-
stripBrandingFromCards={stripBrandingFromCards}
981948
/>
982949
);
983950
case 4:
@@ -987,7 +954,6 @@ export const DecideContainerByTrails = ({
987954
imageLoading={imageLoading}
988955
isTagPage={isTagPage}
989956
aspectRatio={aspectRatio}
990-
stripBrandingFromCards={stripBrandingFromCards}
991957
/>
992958
);
993959
case 5:
@@ -997,7 +963,6 @@ export const DecideContainerByTrails = ({
997963
imageLoading={imageLoading}
998964
isTagPage={isTagPage}
999965
aspectRatio={aspectRatio}
1000-
stripBrandingFromCards={stripBrandingFromCards}
1001966
/>
1002967
);
1003968
case 6:

‎dotcom-rendering/src/layouts/TagPageLayout.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { StickyBottomBanner } from '../components/StickyBottomBanner.importable'
1818
import { SubNav } from '../components/SubNav.importable';
1919
import { TagPageHeader } from '../components/TagPageHeader';
2020
import { TrendingTopics } from '../components/TrendingTopics';
21-
import { isPaidContentSameBranding } from '../lib/branding';
2221
import { canRenderAds } from '../lib/canRenderAds';
2322
import { getContributionsServiceUrl } from '../lib/contributions';
2423
import {
@@ -66,8 +65,6 @@ export const TagPageLayout = ({ tagPage, NAV }: Props) => {
6665
const isAccessibilityPage =
6766
tagPage.config.pageId === 'help/accessibility-help';
6867

69-
const stripBrandingFromCards = isPaidContentSameBranding(tagPage.branding);
70-
7168
return (
7269
<>
7370
<div data-print-layout="hide" id="bannerandheader">
@@ -180,9 +177,6 @@ export const TagPageLayout = ({ tagPage, NAV }: Props) => {
180177
imageLoading={imageLoading}
181178
isTagPage={true}
182179
aspectRatio={'5:4'}
183-
stripBrandingFromCards={
184-
stripBrandingFromCards
185-
}
186180
/>
187181
</FrontSection>
188182
{mobileAdPositions.includes(index) && (

0 commit comments

Comments
 (0)