gatsby-core-theme 30.0.47 → 30.0.49

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [30.0.49](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.48...v30.0.49) (2024-01-10)
+
+
+### Bug Fixes
+
+* tracker params ([4050591](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/40505912dc53368f58bb9d50293ebfc1fdfde61d))
+* update spotlight module ([dc93784](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/dc937841290a57a072d448a4ef6d6a61a34684d4))
+
+
+* Merge branch 'spotlight-bug' into 'master' ([9582e39](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9582e396e844dcc3d9cef30d08017cd769b2758a))
+
+## [30.0.48](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.47...v30.0.48) (2024-01-09)
+
+
+### Bug Fixes
+
+* tracker params ([3047a28](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3047a289212ecad77bb74391908d5e508a95e0f7))
+
 ## [30.0.47](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.46...v30.0.47) (2024-01-08)
 
 

package/package.json

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

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

@@ -3,7 +3,7 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { Context } from '~context/MainProvider';
 import { prettyTracker, translate } from '~helpers/getters';
-import { setCookie, getCookie } from '~helpers/cookies';
+import { setCookie } from '~helpers/cookies';
 
 import styles from './button.module.scss';
 
@@ -30,6 +30,16 @@ const OperatorCtaButton = ({
   const url = typeof window !== 'undefined' ? window.location.href : '';
   const urlParams = {};
 
+  function deparam(paramStr) {
+    const paramArr = paramStr.split('&');
+    const paramObj = {};
+    paramArr.forEach((e) => {
+      const param = e.split('=');
+      paramObj[param[0]] = decodeURIComponent(param[1]);
+    });
+    return paramObj;
+  }
+
   if (process.env.IS_TRACKING_SSR === 'true') {
     if (pageTemplate) {
       urlParams.page_type = pageTemplate;
@@ -40,7 +50,23 @@ const OperatorCtaButton = ({
     if (tracker !== 'main') {
       urlParams.tracker_name = tracker;
     }
-    urlParams.request_url = url;
+
+    if (url && url.split('?').length === 2) {
+      // eslint-disable-next-line prefer-destructuring
+      urlParams.request_url = url.split('?')[0];
+      const extraData = deparam(url.split('?')[1]);
+      if (extraData.fbclid) {
+        urlParams.facebook_click_id = extraData.fbclid;
+      }
+      if (extraData.msclkid) {
+        urlParams.microsoft_click_id = extraData.msclkid;
+      }
+      if (extraData.gclid) {
+        urlParams.google_click_id = extraData.gclid;
+      }
+    } else if (url) {
+      urlParams.request_url = url;
+    }
   }
 
   const prettyLink = `${prettyTracker(operator, trackerType, false, pageTemplate)}`;

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

@@ -1,7 +1,7 @@
 /* eslint-disable no-lone-blocks */
 /* eslint-disable no-unused-expressions */
 import React from 'react';
-import { render, cleanup } from '@testing-library/react';
+import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 
 import OperatorCtaButton from './operator-cta';
@@ -43,6 +43,47 @@ describe('OperatorCtaButton Component', () => {
     const { getByText } = render(<OperatorCtaButton {...data('coming_soon')} />);
     expect(getByText('Soon Available')).toBeTruthy();
   });
+
+  test('Affiliate object in cookie', () => {
+    window = Object.create(window);
+    const url = 'http://test.com/?fbclid=param1&msclkid=param2&gclid=param3';
+    Object.defineProperty(window, 'location', {
+      value: {
+        href: url,
+      },
+      writable: true, // possibility to override
+    });
+    const { container } = render(
+      <OperatorCtaButton {...data()} pageTemplate="test" module="test2" tracker="testing" />
+    );
+    const button = container.querySelector('a');
+    fireEvent.click(button);
+    const affObject = JSON.parse(document.cookie.split('=')[1]);
+    expect(affObject.page_type).toEqual('test');
+    expect(affObject.module).toEqual('test2');
+    expect(affObject.request_url).toEqual('http://test.com/');
+    expect(affObject.facebook_click_id).toEqual('param1');
+    expect(affObject.microsoft_click_id).toEqual('param2');
+    expect(affObject.google_click_id).toEqual('param3');
+    expect(affObject.tracker_name).toEqual('testing');
+  });
+
+  test('Default Affiliate object in cookie', () => {
+    window = Object.create(window);
+    const url = 'http://testdomain.com/';
+    Object.defineProperty(window, 'location', {
+      value: {
+        href: url,
+      },
+      writable: true, // possibility to override
+    });
+    const { container } = render(<OperatorCtaButton {...data()} />);
+    const button = container.querySelector('a');
+    fireEvent.click(button);
+    const affObject = JSON.parse(document.cookie.split('=')[1]);
+    expect(affObject.page_type).toEqual('default');
+    expect(affObject.request_url).toEqual('http://testdomain.com/');
+  });
 });
 
 afterEach(() => {

package/src/components/molecules/spotlights_v2/image-text/template-one/index.js

@@ -23,7 +23,7 @@ export default function TemplateOne({ module, scrollableContent = false }) {
                 {res?.image && (
                   <LazyImage width={300} height={176} src={imagePrettyUrl(res?.image)} />
                 )}
-                {res?.link_text && <TitleTag>{res?.label}</TitleTag>}
+                {res?.label && <TitleTag>{res.label}</TitleTag>}
                 {res.subtitle && <span>{res.subtitle}</span>}
                 <div
                   className={`${styles.desc} ${scrollableContent ? styles.scroll : ''}`}

package/src/components/molecules/spotlights_v2/image-text/template-two/index.js

@@ -23,7 +23,7 @@ export default function TemplateOne({ module }) {
                 {res?.image && (
                   <LazyImage width={104} height={104} src={imagePrettyUrl(res?.image)} />
                 )}
-                {res?.link_text && <TitleTag>{res?.label}</TitleTag>}
+                {res?.label && <TitleTag>{res.label}</TitleTag>}
                 {res.subtitle && <span>{res.subtitle}</span>}
                 <div className={`${styles.desc}`} dangerouslySetInnerHTML={{ __html: res?.text }} />
               </div>

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

@@ -186,7 +186,8 @@ export async function getServerData({ pageContext, headers, url }) {
     pageContext.operator,
     pageContext.page.path,
     pageContext.page,
-    headers
+    headers,
+    url
   );
   return res;
 }

package/src/helpers/tracker.mjs

@@ -39,11 +39,20 @@ function isJsonString(str) {
   return true;
 }
 
+function deparam(paramStr) {
+  const paramArr = paramStr.split('&');     
+  const paramObj = {};
+  paramArr.forEach(e=>{
+      const param = e.split('=');
+      paramObj[param[0]] = decodeURIComponent(param[1]);
+  });
+  return paramObj;
+}
+
 /* eslint-disable no-return-assign */
 /* eslint-disable import/prefer-default-export */
-export async function getAffiliateLink(operator, path, page, headers) {
+export async function getAffiliateLink(operator, path, page, headers, url) {
   const trackerName = await getTrackerName(operator, page, path);
-
   const cookie =
     headers && headers.get('cookie')
       ? headers
@@ -53,6 +62,12 @@ export async function getAffiliateLink(operator, path, page, headers) {
           .reduce((acc, [k, v]) => (acc[k.trim().replace('"', '')] = v) && acc, {})
       : { affObject: JSON.stringify({}) };
 
+
+  let extraParams = null
+  if(url && url.split('?').length === 2) {
+    extraParams = deparam(`${url.split('?')[1]}`);
+  }
+
   const urlParam = {
     site_id: process.env.SITE_ID,
     operator_short_name: operator.short_name,
@@ -62,7 +77,9 @@ export async function getAffiliateLink(operator, path, page, headers) {
     market_short_code: operator.market,
     ip_address: headers ? headers.get('x-real-ip') || headers.get('host') : '127.0.0.1',
     ...(isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {}),
+    ...(extraParams || {})
   };
+
   const res = await fetch(
     `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
   ).catch((err) => null);

package/src/helpers/tracker.test.js

@@ -73,4 +73,33 @@ describe('Tracker Helper', () => {
       `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
     );
   });
+
+  test('getAffiliateLink url params extras', async () => {
+    await Tracker.getAffiliateLink(
+      operator,
+      '/no/visit/rizk',
+      { template: 'default' },
+      null,
+      '/path?extraparam=val&extraparam2=val2'
+    );
+
+    const tracker = Tracker.getTrackerName(operator, 'default', '/no/visit/rizk');
+
+    const urlParam = {
+      site_id: process.env.SITE_ID,
+      operator_short_name: operator.short_name,
+      operator_type: operator.type,
+      language: operator.market.split('_')[1],
+      tracker_name: tracker.name,
+      market_short_code: operator.market,
+      ip_address: '127.0.0.1',
+      extraparam: 'val',
+      extraparam2: 'val2',
+    };
+
+    expect(fetch).toBeCalledTimes(1);
+    expect(fetch).toBeCalledWith(
+      `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(urlParam).toString()}`
+    );
+  });
 });

package/tests/envVars.js

@@ -6,3 +6,4 @@ process.env.TRACKER_LINK_FORMAT_NON_MAIN = '[no],[visit],short_name,type,[tracke
 
 process.env.SITE_ID = 82;
 process.env.GATSBY_TRACKING_API_URL = 'testlink';
+process.env.IS_TRACKING_SSR = true;