gatsby-core-theme 30.0.23 → 30.0.25

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [30.0.25](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.24...v30.0.25) (2023-11-29)
+
+
+### Bug Fixes
+
+* tracker SSR optimizations ([9968c54](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9968c544e423a3671f0edce7d5cfba1831099b09))
+
+## [30.0.24](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.23...v30.0.24) (2023-11-23)
+
+
+### Bug Fixes
+
+* tracker ([3961809](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3961809b1e20695eb8e02b788c77d45c40eb2759))
+
 ## [30.0.23](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.22...v30.0.23) (2023-11-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "30.0.23",
+  "version": "30.0.25",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/button/operator-cta.js

@@ -30,7 +30,7 @@ const OperatorCtaButton = ({
   const urlParams = [];
 
   if (process.env.IS_TRACKING_SSR === 'true') {
-    pageTemplate && urlParams.push(`template=${pageTemplate}`);
+    pageTemplate && urlParams.push(`page_type=${pageTemplate}`);
     module && urlParams.push(`module=${module}`);
     tracker !== 'main' && urlParams.push(`tracker_name=${tracker}`);
   }

package/src/components/pages/tracker/index-ssr.js

@@ -2,10 +2,9 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Button from '~atoms/button/button';
 import LazyImage from '~hooks/lazy-image';
-import { imagePrettyUrl, getAltText, translate, stripTrailingSlash } from '~helpers/getters';
-import { generateTrackerLink } from '~helpers/generators';
+import { imagePrettyUrl, getAltText, translate } from '~helpers/getters';
 import styles from './tracker.module.scss';
-import { getAffiliateLink } from '~helpers/tracker';
+import { getAffiliateLink, getTrackerName } from '~helpers/tracker';
 
 const Tracker = ({
   pageContext,
@@ -26,27 +25,8 @@ const Tracker = ({
 }) => {
   const { operator, page } = pageContext;
   const translations = page?.translations;
-  const trackerLinks = operator ? Object.keys(operator.links) : [];
 
-  let tracker = '';
-  for (let i = 0; i < trackerLinks.length; i += 1) {
-    const trackerLink = trackerLinks[i].toLowerCase().replace(' ', '_');
-    if (
-      generateTrackerLink(operator, trackerLink, false, page.template) === stripTrailingSlash(path)
-    ) {
-      tracker =
-        operator.links[
-          Object.keys(operator.links).find((key) => key.toLowerCase() === trackerLink.toLowerCase())
-        ];
-      break;
-    }
-    if (path.includes('ppc_fallback')) {
-      // eslint-disable-next-line react/prop-types
-      tracker = operator.links['PPC Fallback'];
-      break;
-    }
-    tracker = operator.links.main;
-  }
+  const tracker = getTrackerName(operator, page, path);
 
   const showSplashScreen = typeof window !== 'undefined';
 
@@ -57,7 +37,7 @@ const Tracker = ({
         window.location.replace(serverData.result.link);
       } else {
         console.log('FROM LOCAL');
-        window.location.replace(tracker);
+        window.location.replace(tracker.value);
       }
     }
   }
@@ -196,7 +176,7 @@ Tracker.propTypes = {
 export async function getServerData({ pageContext, url }) {
   let res = '';
 
-  res = await getAffiliateLink(pageContext.operator, url);
+  res = await getAffiliateLink(pageContext.operator, url, pageContext.page.path, pageContext.page);
   return res;
 }
 

package/src/components/pages/tracker/index.js

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Button from '~atoms/button/button';
 import LazyImage from '~hooks/lazy-image';
-import { stripTrailingSlash, imagePrettyUrl, getAltText, translate } from '~helpers/getters';
+import { imagePrettyUrl, getAltText, translate } from '~helpers/getters';
 import { generateTrackerLink } from '~helpers/generators';
 import styles from './tracker.module.scss';
 
@@ -26,6 +26,8 @@ const Tracker = ({
   const translations = page?.translations;
   const trackerLinks = operator ? Object.keys(operator.links) : [];
 
+  const stripTrailingSlash = (str) => (str.endsWith('/') ? str.slice(0, -1) : str);
+
   let tracker = '';
   for (let i = 0; i < trackerLinks.length; i += 1) {
     const trackerLink = trackerLinks[i].toLowerCase().replace(' ', '_');

package/src/helpers/getters.mjs

@@ -176,12 +176,6 @@ export function getParameterCaseInsensitive(object, key) {
   ];
 }
 
-export function stripTrailingSlash(str) {
-  return str.endsWith('/') ?
-      str.slice(0, -1) :
-      str;
-};
-
 export function prettyTracker(
   operator,
   trackerType = 'main',

package/src/helpers/tracker.mjs

@@ -1,5 +1,37 @@
+import { generateTrackerLink } from '~helpers/generators';
+
+
+export function getTrackerName(operator, page, path) {
+  const trackerLinks = operator ? Object.keys(operator.links) : [];
+  const stripTrailingSlash = (str) => (str.endsWith('/') ? str.slice(0, -1) : str);
+  let trackerName = 'main';
+  let tracker = '';
+  for (let i = 0; i < trackerLinks.length; i += 1) {
+    const trackerLink = trackerLinks[i].toLowerCase().replace(' ', '_');
+    if (
+      generateTrackerLink(operator, trackerLink, false, page.template) === stripTrailingSlash(path)
+    ) {
+      tracker =
+        operator.links[
+          Object.keys(operator.links).find((key) => key.toLowerCase() === trackerLink.toLowerCase())
+        ];
+      trackerName = trackerLink.toLowerCase();
+      break;
+    }
+    if (path.includes('ppc_fallback')) {
+      // eslint-disable-next-line react/prop-types
+      tracker = operator.links['PPC Fallback'];
+      break;
+    }
+    tracker = operator.links.main;
+  }
+
+  return { name: trackerName, value: tracker };
+}
+
+
 /* eslint-disable import/prefer-default-export */
-export async function getAffiliateLink(operator, url) {
+export async function getAffiliateLink(operator, url, path, page) {
   let urlParams = `site_id=${process.env.SITE_ID}&operator_short_name=${
     operator.short_name
   }&operator_type=${operator.type}&language=${operator.market.split('_')[1]}&market_short_code=${
@@ -12,6 +44,12 @@ export async function getAffiliateLink(operator, url) {
     urlParams += `&${urlSplit[1]}`;
   }
 
+  const trackerName = await getTrackerName(operator, page, path);
+
+  if(trackerName.name !== 'main') {
+    urlParams += `&tracker_name=${trackerName.name}`;
+  }
+
   const res = await fetch(`${process.env.GATSBY_TRACKING_API_URL}?${urlParams}`).catch(
     (err) => null
   );