@times-components/ssr 2.59.37-046150db36af324c2d3b86a7678c43de4c8def9c.17 → 2.59.37-1cf7d53b4588143a651811d12b4d5a1288605704.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@times-components/ssr",
   "main": "src",
-  "version": "2.59.37-046150db36af324c2d3b86a7678c43de4c8def9c.17+046150db36",
+  "version": "2.59.37-1cf7d53b4588143a651811d12b4d5a1288605704.22+1cf7d53b45",
   "scripts": {
     "bundle:dev": "yarn cleanup-dist && webpack --config=webpack.config.js",
     "bundle:prod": "yarn cleanup-dist && NODE_ENV=production webpack --config=webpack.config.js -p",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "046150db36af324c2d3b86a7678c43de4c8def9c"
+  "gitHead": "1cf7d53b4588143a651811d12b4d5a1288605704"
 }

package/src/component/article.js

@@ -13,7 +13,9 @@ const {
   defaults
 } = require("@times-components/context/rnw");
 const { scales, themeFactory } = require("@times-components/ts-styleguide/rnw");
-const { setExternalLinkTargets } = require("../lib/set-external-links");
+const {
+  affiliateLinksValidation
+} = require("../lib/affiliate-links-validation");
 
 const scale = scales.large;
 
@@ -60,12 +62,15 @@ module.exports = (client, analyticsStream, data, helmetContext) => {
             ? providerData.draftArticle
             : providerData.article;
           const articleTemplate = article ? article.template : null;
-          const formattedArticle = article.content.map(contentItem =>
-            setExternalLinkTargets(contentItem.children)
+          const articleContent = affiliateLinksValidation(
+            article.content,
+            articleDataFromRender
           );
 
+          const formattedArticle = { ...article, content: articleContent };
+
           // eslint-disable-next-line no-console
-          console.log("Article: ", article);
+          console.log("Article: ", article, articleDataFromRender);
 
           // eslint-disable-next-line no-console
           console.log("Formatted Article: ", formattedArticle);

package/src/lib/{set-external-links.js → affiliate-links-validation.js}

@@ -3,12 +3,10 @@ const {
   travelSiteCode,
   skimlinksId,
   regexTrackonomics
-} = require("./affiliate-validation");
+} = require("../constants/affiliate-validation");
 
-const wrapAffiliateLink = affiliateLink => {
+const wrapAffiliateLink = (affiliateLink, contentPageUrl) => {
   const wrapTrackonomics = trackonomicsUrl => {
-    const contentPageUrl =
-      "https://www.thetimes.com/travel/inspiration/tour-holidays/adventurous-summer-holidays-kklt22gp8";
     const isTravel =
       contentPageUrl.includes("https://www.thetimes.com/travel") ||
       contentPageUrl.includes("https://www.thetimes.co.uk/travel");
@@ -17,8 +15,7 @@ const wrapAffiliateLink = affiliateLink => {
       return trackonomicsUrl;
     }
 
-    const referrerUrl =
-      "https://www.thetimes.com/travel/inspiration/tour-holidays/adventurous-summer-holidays-kklt22gp8";
+    const referrerUrl = "";
     const siteCode = isTravel ? travelSiteCode : theTimesSiteCode;
     const affiliateWrapper = `https://clicks.trx-hub.com/xid/${siteCode}?q=${encodeURIComponent(
       trackonomicsUrl
@@ -30,8 +27,6 @@ const wrapAffiliateLink = affiliateLink => {
   };
 
   const wrapSkimlinks = skimlinkUrl => {
-    const contentPageUrl =
-      "https://www.thetimes.com/travel/inspiration/tour-holidays/adventurous-summer-holidays-kklt22gp8";
     const affiliateWrapper = `https://go.skimresources.com/?id=${skimlinksId}&url=${encodeURIComponent(
       skimlinkUrl
     )}&sref=${encodeURIComponent(contentPageUrl)}`;
@@ -43,8 +38,10 @@ const wrapAffiliateLink = affiliateLink => {
   return wrapTrackonomics(wrapInSkimlinks);
 };
 
-module.exports.setExternalLinkTargets = children => {
+module.exports.affiliateLinksValidation = (children, articleDataFromRender) => {
   const clonedChildren = [...children];
+  const { canonicalUrl, hostName } = articleDataFromRender;
+  const contentPageUrl = `${hostName}${canonicalUrl}`;
 
   const checkAndSetLinkTarget = elements =>
     elements.map(el => {
@@ -78,7 +75,7 @@ module.exports.setExternalLinkTargets = children => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                url: wrapAffiliateLink(href)
+                url: wrapAffiliateLink(href, contentPageUrl)
               }
             };
           } else {
@@ -87,7 +84,7 @@ module.exports.setExternalLinkTargets = children => {
               attributes: {
                 ...attributes,
                 target: "_blank",
-                href: wrapAffiliateLink(href)
+                href: wrapAffiliateLink(href, contentPageUrl)
               }
             };
           }