Skip to content

Commit 38d2c62

Browse files
GHaberisGHaberis
authored
Merge pull request #15038 from guardian/revert-15018-gh-track-affiliate-disclaimer
Revert "Track Affiliate Disclaimer with Ophan"
2 parents 1c373fe + da623a8 commit 38d2c62

File tree

9 files changed

+75
-141
lines changed

9 files changed

+75
-141
lines changed

‎dotcom-rendering/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@guardian/identity-auth": "6.0.1",
3939
"@guardian/identity-auth-frontend": "8.1.0",
4040
"@guardian/libs": "26.1.0",
41-
"@guardian/ophan-tracker-js": "2.8.0",
41+
"@guardian/ophan-tracker-js": "2.6.3",
4242
"@guardian/react-crossword": "11.1.0",
4343
"@guardian/shimport": "1.0.2",
4444
"@guardian/source": "11.3.0",

dotcom-rendering/src/components/AffiliateDisclaimer.importable.tsx renamed to dotcom-rendering/src/components/AffiliateDisclaimer.tsx

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {
77
textSans15,
88
} from '@guardian/source/foundations';
99
import { Hide } from '@guardian/source/react-components';
10-
import { useEffect } from 'react';
11-
import { submitComponentEvent } from '../client/ophan/ophan';
1210
import { palette as themePalette } from '../palette';
1311

1412
const disclaimerLeftColStyles = css`
@@ -77,59 +75,36 @@ const DisclaimerText = () => (
7775
</p>
7876
);
7977

80-
const useAffiliateDisclaimerEvent = () => {
81-
useEffect(() => {
82-
void submitComponentEvent(
83-
{
84-
action: 'DETECT',
85-
component: {
86-
componentType: 'AFFILIATE_DISCLAIMER',
87-
},
88-
},
89-
'Web',
90-
);
91-
}, []);
92-
};
93-
94-
const AffiliateDisclaimer = () => {
95-
useAffiliateDisclaimerEvent();
96-
return (
97-
<Hide until="leftCol">
98-
<aside
99-
css={[disclaimerLeftColStyles]}
100-
data-testid="affiliate-disclaimer"
101-
>
102-
<DisclaimerText />
103-
</aside>
104-
</Hide>
105-
);
106-
};
107-
108-
const AffiliateDisclaimerInline = () => {
109-
useAffiliateDisclaimerEvent();
110-
return (
111-
<Hide from="leftCol">
112-
<aside
113-
css={[disclaimerInlineStyles]}
114-
data-testid="affiliate-disclaimer-inline"
115-
>
116-
<DisclaimerText />
117-
</aside>
118-
</Hide>
119-
);
120-
};
121-
122-
const GalleryAffiliateDisclaimer = () => {
123-
useAffiliateDisclaimerEvent();
124-
return (
78+
const AffiliateDisclaimer = () => (
79+
<Hide until="leftCol">
12580
<aside
126-
css={[disclaimerLeftColStyles, galleryDisclaimerStyles]}
81+
css={[disclaimerLeftColStyles]}
12782
data-testid="affiliate-disclaimer"
12883
>
12984
<DisclaimerText />
13085
</aside>
131-
);
132-
};
86+
</Hide>
87+
);
88+
89+
const AffiliateDisclaimerInline = () => (
90+
<Hide from="leftCol">
91+
<aside
92+
css={[disclaimerInlineStyles]}
93+
data-testid="affiliate-disclaimer-inline"
94+
>
95+
<DisclaimerText />
96+
</aside>
97+
</Hide>
98+
);
99+
100+
const GalleryAffiliateDisclaimer = () => (
101+
<aside
102+
css={[disclaimerLeftColStyles, galleryDisclaimerStyles]}
103+
data-testid="affiliate-disclaimer"
104+
>
105+
<DisclaimerText />
106+
</aside>
107+
);
133108

134109
export {
135110
AffiliateDisclaimer,

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from '@guardian/source/foundations';
88
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
99
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
10-
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer.importable';
10+
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';
1111
import { ArticleBody } from '../components/ArticleBody';
1212
import { ArticleContainer } from '../components/ArticleContainer';
1313
import { ArticleHeadline } from '../components/ArticleHeadline';
@@ -272,12 +272,7 @@ export const AudioLayout = (props: WebProps) => {
272272
}
273273
/>
274274
{!!article.affiliateLinksDisclaimer && (
275-
<Island
276-
priority="enhancement"
277-
defer={{ until: 'idle' }}
278-
>
279-
<AffiliateDisclaimer />
280-
</Island>
275+
<AffiliateDisclaimer />
281276
)}
282277
</div>
283278
</GridItem>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Hide } from '@guardian/source/react-components';
99
import { AdPlaceholder } from '../components/AdPlaceholder.apps';
1010
import { AdPortals } from '../components/AdPortals.importable';
1111
import { AdSlot } from '../components/AdSlot.web';
12-
import { GalleryAffiliateDisclaimer } from '../components/AffiliateDisclaimer.importable';
12+
import { GalleryAffiliateDisclaimer } from '../components/AffiliateDisclaimer';
1313
import { AppsFooter } from '../components/AppsFooter.importable';
1414
import { ArticleHeadline } from '../components/ArticleHeadline';
1515
import { ArticleMetaApps } from '../components/ArticleMeta.apps';
@@ -496,9 +496,7 @@ const Meta = ({
496496
/>
497497
) : null}
498498
{!!frontendData.affiliateLinksDisclaimer && (
499-
<Island priority="enhancement" defer={{ until: 'idle' }}>
500-
<GalleryAffiliateDisclaimer />
501-
</Island>
499+
<GalleryAffiliateDisclaimer />
502500
)}
503501
</div>
504502
);

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
1010
import { AdPortals } from '../components/AdPortals.importable';
1111
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
12-
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer.importable';
12+
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';
1313
import { AppsFooter } from '../components/AppsFooter.importable';
1414
import { ArticleBody } from '../components/ArticleBody';
1515
import { ArticleContainer } from '../components/ArticleContainer';
@@ -601,12 +601,7 @@ export const ImmersiveLayout = (props: WebProps | AppProps) => {
601601
}
602602
/>
603603
{!!article.affiliateLinksDisclaimer && (
604-
<Island
605-
priority="enhancement"
606-
defer={{ until: 'idle' }}
607-
>
608-
<AffiliateDisclaimer />
609-
</Island>
604+
<AffiliateDisclaimer />
610605
)}
611606
</Hide>
612607
</>
@@ -636,12 +631,7 @@ export const ImmersiveLayout = (props: WebProps | AppProps) => {
636631
}
637632
/>
638633
{!!article.affiliateLinksDisclaimer && (
639-
<Island
640-
priority="enhancement"
641-
defer={{ until: 'idle' }}
642-
>
643-
<AffiliateDisclaimer />
644-
</Island>
634+
<AffiliateDisclaimer />
645635
)}
646636
</>
647637
)}

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Hide } from '@guardian/source/react-components';
99
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
1010
import { AdPortals } from '../components/AdPortals.importable';
1111
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
12-
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer.importable';
12+
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';
1313
import { AppsFooter } from '../components/AppsFooter.importable';
1414
import { ArticleBody } from '../components/ArticleBody';
1515
import { ArticleContainer } from '../components/ArticleContainer';
@@ -482,12 +482,7 @@ export const ShowcaseLayout = (props: WebProps | AppsProps) => {
482482
}
483483
/>
484484
{!!article.affiliateLinksDisclaimer && (
485-
<Island
486-
priority="enhancement"
487-
defer={{ until: 'idle' }}
488-
>
489-
<AffiliateDisclaimer />
490-
</Island>
485+
<AffiliateDisclaimer />
491486
)}
492487
</Hide>
493488
</>
@@ -517,12 +512,7 @@ export const ShowcaseLayout = (props: WebProps | AppsProps) => {
517512
}
518513
/>
519514
{!!article.affiliateLinksDisclaimer && (
520-
<Island
521-
priority="enhancement"
522-
defer={{ until: 'idle' }}
523-
>
524-
<AffiliateDisclaimer />
525-
</Island>
515+
<AffiliateDisclaimer />
526516
)}
527517
</>
528518
)}

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Hide } from '@guardian/source/react-components';
99
import { StraightLines } from '@guardian/source-development-kitchen/react-components';
1010
import { AdPortals } from '../components/AdPortals.importable';
1111
import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web';
12-
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer.importable';
12+
import { AffiliateDisclaimer } from '../components/AffiliateDisclaimer';
1313
import { AppsEpic } from '../components/AppsEpic.importable';
1414
import { AppsFooter } from '../components/AppsFooter.importable';
1515
import { ArticleBody } from '../components/ArticleBody';
@@ -644,12 +644,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
644644
/>
645645
</div>
646646
{!!article.affiliateLinksDisclaimer && (
647-
<Island
648-
priority="enhancement"
649-
defer={{ until: 'idle' }}
650-
>
651-
<AffiliateDisclaimer />
652-
</Island>
647+
<AffiliateDisclaimer />
653648
)}
654649
</Hide>
655650
</>
@@ -679,12 +674,7 @@ export const StandardLayout = (props: WebProps | AppProps) => {
679674
}
680675
/>
681676
{!!article.affiliateLinksDisclaimer && (
682-
<Island
683-
priority="enhancement"
684-
defer={{ until: 'idle' }}
685-
>
686-
<AffiliateDisclaimer />
687-
</Island>
677+
<AffiliateDisclaimer />
688678
)}
689679
</div>
690680
)}

‎dotcom-rendering/src/lib/renderElement.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AdPlaceholder } from '../components/AdPlaceholder.apps';
2-
import { AffiliateDisclaimerInline } from '../components/AffiliateDisclaimer.importable';
2+
import { AffiliateDisclaimerInline } from '../components/AffiliateDisclaimer';
33
import { AudioAtomWrapper } from '../components/AudioAtomWrapper.importable';
44
import { BlockquoteBlockComponent } from '../components/BlockquoteBlockComponent';
55
import { CalloutBlockComponent } from '../components/CalloutBlockComponent.importable';
@@ -956,11 +956,7 @@ export const renderElement = ({
956956
</Island>
957957
);
958958
case 'model.dotcomrendering.pageElements.DisclaimerBlockElement': {
959-
return (
960-
<Island priority="enhancement" defer={{ until: 'idle' }}>
961-
<AffiliateDisclaimerInline />
962-
</Island>
963-
);
959+
return <AffiliateDisclaimerInline />;
964960
}
965961
case 'model.dotcomrendering.pageElements.CrosswordElement':
966962
return (

0 commit comments

Comments
 (0)