gatsby-core-theme 32.0.0 → 32.0.2

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [32.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v32.0.1...v32.0.2) (2024-05-30)
+
+
+### Bug Fixes
+
+* added props for aria-label and title ([747243c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/747243c71c7a3801644ebb98fb72174d39e1c467))
+* ammended implementation ([19e26c1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/19e26c1fed853487a322da46c2625ed7ed246c03))
+* implemented on cta ([5650f82](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5650f82b871cc5d0447373d89f938a5373a8528d))
+
+
+* Merge branch 'tm-4323-pretty-link-props' into 'master' ([a8f0ca5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a8f0ca5c7b0edad285b74c6aaf0d4c17d6a965ae))
+
+## [32.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v32.0.0...v32.0.1) (2024-05-30)
+
+
+### Bug Fixes
+
+* tracker ([72f0022](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/72f0022e49a21ab9e6a7750a090257aac6058072))
+
 # [32.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v31.0.2...v32.0.0) (2024-05-28)
 
 

package/package.json

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

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

@@ -18,6 +18,7 @@ const OperatorCtaButton = ({
   buttonSize = '',
   module = null,
   tracker = 'main',
+  titleSuffix,
   icon = null,
   translationsObj = {
     active: { translationKey: 'play_now', defaultValue: 'Visit' },
@@ -74,8 +75,12 @@ const OperatorCtaButton = ({
   return status === 'active' ? (
     <a
       href={prettyLink || '#'}
-      title={typeof translateBtn === 'string' ? translateBtn : ''}
-      aria-label={typeof translateBtn === 'string' ? translateBtn : ''}
+      title={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
+        titleSuffix || ''
+      }`.trimEnd()}
+      aria-label={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
+        titleSuffix || ''
+      }`.trimEnd()}
       className={`${classes} ${gtmClass}`}
       target="_blank"
       rel={rel}
@@ -86,8 +91,12 @@ const OperatorCtaButton = ({
     </a>
   ) : (
     <div
-      title={typeof translateBtn === 'string' ? translateBtn : ''}
-      aria-label={typeof translateBtn === 'string' ? translateBtn : ''}
+      title={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
+        titleSuffix || ''
+      }`.trimEnd()}
+      aria-label={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
+        titleSuffix || ''
+      }`.trimEnd()}
       className={`${classes || ''} ${gtmClass || ''}`}
     >
       {translateBtn}
@@ -101,6 +110,7 @@ OperatorCtaButton.propTypes = {
     name: PropTypes.string,
     status: PropTypes.string,
   }),
+  titleSuffix: PropTypes.string,
   gtmClass: PropTypes.string,
   pageTemplate: PropTypes.string,
   buttonSize: PropTypes.string,

package/src/components/atoms/pretty-link/index.js

@@ -12,7 +12,7 @@ const PrettyLink = ({
   pageTemplate,
   module,
   tracker,
-  clickedElement,
+  titleSuffix,
   className,
   children,
   rel = 'nofollow noreferrer sponsored',
@@ -48,11 +48,11 @@ const PrettyLink = ({
   return (
     <a
       href={prettyLink || '#'}
-      title={operator?.name}
+      title={`${operator?.name} ${titleSuffix || ''}`.trimEnd()}
       className={className}
       target="_blank"
       rel={rel}
-      aria-label={`${operator?.name} Link`}
+      aria-label={`${operator?.name} ${titleSuffix || 'Link'}`}
       onClick={onCTAClick}
     >
       {children}
@@ -66,8 +66,8 @@ PrettyLink.propTypes = {
   }),
   pageTemplate: PropTypes.string,
   module: PropTypes.string,
+  titleSuffix: PropTypes.string,
   tracker: PropTypes.string,
-  clickedElement: PropTypes.string,
   className: PropTypes.string,
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node, PropTypes.any]),
   rel: PropTypes.string,

package/src/components/molecules/bonus-box/template-one/index.js

@@ -11,6 +11,7 @@ export default function BonusBox({
   splitBy = '+',
   feSeparator = '+',
   module = 'bonus_box',
+  titleSuffix,
 }) {
   const data = getBonusData(item, tracker, splitBy);
 
@@ -20,6 +21,7 @@ export default function BonusBox({
       pageTemplate={pageTemplate}
       module={module}
       tracker={tracker}
+      titleSuffix={titleSuffix}
       clickedElement="oneliner"
       className={`${styles.detailsBox} ${'bonus-box-gtm'}`}
     >
@@ -38,4 +40,5 @@ BonusBox.propTypes = {
   splitBy: PropTypes.string,
   feSeparator: PropTypes.string,
   module: PropTypes.string,
+  titleSuffix: PropTypes.string,
 };

package/src/helpers/tracker.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable no-underscore-dangle */
 import { generateTrackerLink } from '~helpers/generators';
 
@@ -90,6 +91,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     facebook_browser_id: cookie ? cookie._fbp || null : null,
     facebook_click_id: cookie ? cookie._fbc || null : null,
     split_test_name: cookie ? cookie.split_test_name || null : null,
+    google_client_id:  cookie ? cookie._ga || null : null,
     split_test_variant: cookie ? cookie.split_test_variant || null : null,
     facebook_pixel_id: process.env.PIXEL_ID || null,
     ...(isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {}),
@@ -102,7 +104,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
       : {}),
     ...(extraURLParams || {}),
   };
-
+  
   const res = await fetch(
     `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(clean(urlParam)).toString()}`
   ).catch((err) => null);
@@ -115,6 +117,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
 
 export function getTrackingAPIParams(pageTemplate, module, tracker, clickedElement, url, referer) {
   const urlParams = {};
+  let extraData = {}
 
   if (pageTemplate) {
     urlParams.page_type = pageTemplate;
@@ -137,22 +140,20 @@ export function getTrackingAPIParams(pageTemplate, module, tracker, clickedEleme
   if (url && url.split('?').length === 2) {
     // eslint-disable-next-line prefer-destructuring
     urlParams.request_url = url.split('?')[0];
-    const extraData = deparam(url.split('?')[1]);
+    extraData = deparam(url.split('?')[1]);
     
     if (extraData.msclkid) {
-      urlParams.microsoft_click_id = extraData.msclkid;
-    }
-
-    if (extraData.brevo_customer_id) {
-      urlParams.brevo_customer_id = extraData.brevo_customer_id;
+      extraData.microsoft_click_id = extraData.msclkid;
+      delete extraData.msclkid;
     }
 
     if (extraData.gclid) {
-      urlParams.google_click_id = extraData.gclid;
+      extraData.google_click_id = extraData.gclid;
+      delete extraData.gclid;
     }
   } else if (url) {
     urlParams.request_url = url;
   }
-
-  return urlParams;
+  
+  return {...urlParams, ...extraData};
 }