Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[NASAA-203/204] - Create AmpExperiment component, add top stories experiment to PS articles" #12066

Closed
wants to merge 1 commit into from
Closed

Revert "[NASAA-203/204] - Create AmpExperiment component, add top stories experiment to PS articles" #12066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 0 additions & 86 deletions src/app/components/AmpExperiment/index.test.tsx
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions src/app/components/AmpExperiment/index.tsx
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/app/components/AmpExperiment/types.d.ts
View file
Open in desktop

This file was deleted.

20 changes: 2 additions & 18 deletions src/app/pages/ArticlePage/ArticlePage.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,30 +81,14 @@ export default {
paddingBottom: `${spacings.QUADRUPLE}rem`,
},
}),
featuresSection: ({ spacings, mq }: Theme) =>
css({
marginBottom: `${spacings.TRIPLE}rem`,

[mq.GROUP_4_MIN_WIDTH]: {
marginBottom: `${spacings.FULL}rem`,
padding: `${spacings.DOUBLE}rem`,
},
}),
topStoriesSection: ({ spacings, mq }: Theme) =>
topStoriesAndFeaturesSection: ({ spacings, mq }: Theme) =>
css({
marginBottom: `${spacings.TRIPLE}rem`,

[mq.GROUP_4_MIN_WIDTH]: {
display: 'block',
marginBottom: `${spacings.FULL}rem`,
padding: `${spacings.DOUBLE}rem`,
},
'[amp-x-topStoriesExperiment="show_at_halfway"] &': {
display: 'none',
[mq.GROUP_4_MIN_WIDTH]: {
display: 'block',
marginBottom: `${spacings.FULL}rem`,
padding: `${spacings.DOUBLE}rem`,
},
},
}),
};
33 changes: 5 additions & 28 deletions src/app/pages/ArticlePage/ArticlePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,20 @@ import {
import { ServiceContext } from '../../contexts/ServiceContext';
import RelatedContentSection from '../../components/RelatedContentSection';
import Disclaimer from '../../components/Disclaimer';

import SecondaryColumn from './SecondaryColumn';

import styles from './ArticlePage.styles';
import { ComponentToRenderProps, TimeStampProps } from './types';
import AmpExperiment from '../../components/AmpExperiment';
import {
experimentTopStoriesConfig,
getExperimentTopStories,
ExperimentTopStories,
} from './experimentTopStories/helpers';

const ArticlePage = ({ pageData }: { pageData: Article }) => {
const { isApp, pageType, service, isAmp, id } = useContext(RequestContext);

const { isApp, pageType, service } = useContext(RequestContext);
const {
articleAuthor,
isTrustProjectParticipant,
showRelatedTopics,
brandName,
} = useContext(ServiceContext);

const { enabled: preloadLeadImageToggle } = useToggle('preloadLeadImage');

const {
Expand Down Expand Up @@ -137,16 +131,6 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
...(isCPS && { pageTitle: `${atiAnalytics.pageTitle} - ${brandName}` }),
};

const topStoriesContent = pageData?.secondaryColumn?.topStories;
const { shouldEnableExperimentTopStories, transformedBlocks } =
getExperimentTopStories({
blocks,
topStoriesContent,
isAmp,
service,
id,
});

const componentsToRender = {
visuallyHiddenHeadline,
headline: headings,
Expand Down Expand Up @@ -190,10 +174,6 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
<Disclaimer {...props} increasePaddingOnDesktop={false} />
),
podcastPromo: () => (podcastPromoEnabled ? <InlinePodcastPromo /> : null),
experimentTopStories: () =>
topStoriesContent ? (
<ExperimentTopStories topStoriesContent={topStoriesContent} />
) : null,
};

const visuallyHiddenBlock = {
Expand All @@ -203,8 +183,8 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
};

const articleBlocks = startsWithHeading
? transformedBlocks
: [visuallyHiddenBlock, ...transformedBlocks];
? blocks
: [visuallyHiddenBlock, ...blocks];

const promoImageBlocks =
pageData?.promo?.images?.defaultPromoImage?.blocks ?? [];
Expand All @@ -226,9 +206,6 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {

return (
<div css={styles.pageWrapper}>
{shouldEnableExperimentTopStories && (
<AmpExperiment experimentConfig={experimentTopStoriesConfig} />
)}
<ATIAnalytics atiData={atiData} />
<ChartbeatAnalytics
sectionName={pageData?.relatedContent?.section?.name}
Expand Down
7 changes: 5 additions & 2 deletions src/app/pages/ArticlePage/SecondaryColumn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ const SecondaryColumn = ({ pageData }: { pageData: Article }) => {
return (
<div css={styles.secondaryColumn}>
{topStoriesContent && (
<div css={styles.topStoriesSection} data-testid="top-stories">
<div
css={styles.topStoriesAndFeaturesSection}
data-testid="top-stories"
>
<TopStoriesSection content={topStoriesContent} />
</div>
)}
{featuresContent && (
<div css={styles.featuresSection} data-testid="features">
<div css={styles.topStoriesAndFeaturesSection} data-testid="features">
<FeaturesAnalysis
content={featuresContent}
parentColumns={{}}
Expand Down
109 changes: 0 additions & 109 deletions src/app/pages/ArticlePage/experimentTopStories/helpers.test.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading