Merge branch 'latest' into amp-iframe-externalembed-constructor

src/app/legacy/components/ScrollablePromo/index.jsx

@@ -20,8 +20,6 @@ import { GridItemMediumNoMargin } from '#components/Grid';
 import useViewTracker from '#hooks/useViewTracker';
 import useClickTrackerHandler from '#hooks/useClickTrackerHandler';
 import idSanitiser from '#lib/utilities/idSanitiser';
-import { OptimizelyContext } from '@optimizely/react-sdk';
-import useOptimizelyScrollDepth from '#app/hooks/useOptimizelyScrollDepth';
 import { ServiceContext } from '../../../contexts/ServiceContext';
 import Promo from './Promo';
 import PromoList from './PromoList';
@@ -61,19 +59,15 @@ const LabelComponent = styled.strong`
 
 const ScrollablePromo = ({ blocks, blockGroupIndex = null }) => {
   const { script, service, dir, translations } = useContext(ServiceContext);
-  const { optimizely } = useContext(OptimizelyContext);
 
   const eventTrackingData = {
     componentName: `edoj${blockGroupIndex}`,
     format: 'CHD=edoj',
-    optimizely,
   };
 
   const viewRef = useViewTracker(eventTrackingData);
   const handleClickTracking = useClickTrackerHandler(eventTrackingData);
 
-  useOptimizelyScrollDepth();
-
   if (!blocks || isEmpty(blocks)) {
     return null;
   }

src/app/legacy/components/ScrollablePromo/index.test.jsx

@@ -12,11 +12,6 @@ import ScrollablePromo from '.';
 import { edOjA, edOjB } from './fixtures';
 import { MEDIA_ARTICLE_PAGE } from '../../../routes/utils/pageTypes';
 
-jest.mock('#app/hooks/useOptimizelyScrollDepth', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
 describe('ScrollablePromo', () => {
   it('should return null if no data is passed', () => {
     const { container } = render(<ScrollablePromo blocks={[]} />);
@@ -83,7 +78,6 @@ describe('ScrollablePromo', () => {
       expect(viewTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj1',
         format: 'CHD=edoj',
-        optimizely: null,
       });
     });
 
@@ -100,12 +94,10 @@ describe('ScrollablePromo', () => {
       expect(viewTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj1',
         format: 'CHD=edoj',
-        optimizely: null,
       });
       expect(viewTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj2',
         format: 'CHD=edoj',
-        optimizely: null,
       });
     });
 
@@ -118,7 +110,6 @@ describe('ScrollablePromo', () => {
       expect(clickTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj1',
         format: 'CHD=edoj',
-        optimizely: null,
       });
     });
 
@@ -135,12 +126,10 @@ describe('ScrollablePromo', () => {
       expect(clickTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj1',
         format: 'CHD=edoj',
-        optimizely: null,
       });
       expect(clickTrackerSpy).toHaveBeenCalledWith({
         componentName: 'edoj2',
         format: 'CHD=edoj',
-        optimizely: null,
       });
     });
   });

src/app/pages/ArticlePage/ArticlePage.tsx

@@ -39,10 +39,6 @@ import CpsRecommendations from '#containers/CpsRecommendations';
 import InlinePodcastPromo from '#containers/PodcastPromo/Inline';
 import { Article, OptimoBylineBlock } from '#app/models/types/optimo';
 import ScrollablePromo from '#components/ScrollablePromo';
-
-import useOptimizelyVariation from '#app/hooks/useOptimizelyVariation';
-import OptimizelyArticleCompleteTracking from '#app/legacy/containers/OptimizelyArticleCompleteTracking';
-import OptimizelyPageViewTracking from '#app/legacy/containers/OptimizelyPageViewTracking';
 import ImageWithCaption from '../../components/ImageWithCaption';
 import AdContainer from '../../components/Ad';
 import EmbedImages from '../../components/Embeds/EmbedImages';
@@ -135,10 +131,6 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
     ...(isCPS && { pageTitle: `${atiAnalytics.pageTitle} - ${brandName}` }),
   };
 
-  const scrollablePromoVariation = useOptimizelyVariation(
-    'scrollable_promo',
-  ) as unknown as string;
-
   const componentsToRender = {
     visuallyHiddenHeadline,
     headline: headings,
@@ -172,12 +164,7 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
     embedImages: EmbedImages,
     embedUploader: Uploader,
     group: gist,
-    links: (props: ComponentToRenderProps) =>
-      scrollablePromoVariation === 'variation_1_aa' ? (
-        <ScrollablePromo {...props} />
-      ) : (
-        <ScrollablePromo {...props} />
-      ),
+    links: (props: ComponentToRenderProps) => <ScrollablePromo {...props} />,
     mpu: (props: ComponentToRenderProps) =>
       allowAdvertising ? <AdContainer {...props} slotType="mpu" /> : null,
     wsoj: (props: ComponentToRenderProps) => (
@@ -292,8 +279,6 @@ const ArticlePage = ({ pageData }: { pageData: Article }) => {
           mobileDivider={showTopics}
         />
       )}
-      <OptimizelyArticleCompleteTracking />
-      <OptimizelyPageViewTracking />
     </div>
   );
 };

src/app/pages/ArticlePage/index.test.tsx

@@ -46,16 +46,7 @@ jest.mock('../../components/ChartbeatAnalytics', () => {
   const ChartbeatAnalytics = () => <div>chartbeat</div>;
   return ChartbeatAnalytics;
 });
-
 jest.mock('../../components/ATIAnalytics');
-jest.mock('#app/legacy/containers/OptimizelyArticleCompleteTracking');
-jest.mock('#app/legacy/containers/OptimizelyPageViewTracking');
-jest.mock('#app/hooks/useOptimizelyScrollDepth');
-
-jest.mock('#app/hooks/useOptimizelyVariation', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
 
 const input = {
   bbcOrigin: 'https://www.test.bbc.co.uk',

src/app/pages/ArticlePage/index.tsx

@@ -1,7 +1,4 @@
-import withOptimizelyProvider from '#app/legacy/containers/PageHandlers/withOptimizelyProvider';
 import ArticlePage from './ArticlePage';
 import applyBasicPageHandlers from '../utils/applyBasicPageHandlers';
 
-const OptimizelyArticle = withOptimizelyProvider(ArticlePage);
-
-export default applyBasicPageHandlers(OptimizelyArticle);
+export default applyBasicPageHandlers(ArticlePage);