gatsby-matrix-theme 52.0.27 → 52.0.29

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+## [52.0.29](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v52.0.28...v52.0.29) (2024-10-30)
+
+
+### Bug Fixes
+
+* build error ([ae10da7](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/ae10da7eca5d9b0165c071c6c85e2cf24550b8dd))
+* env ([2ab4622](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/2ab4622cd0d6a9735d2a27a674f87b5aa575bcd4))
+* error ([aaff1b5](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/aaff1b5c32151e6aa3dc8515a32c4b541029f544))
+* error handling in server data ([143086a](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/143086aa5c0e7682608b418e176e78037f015148))
+* tracking api v3 ([ffa354e](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/ffa354e77d9770c8fc13db9c1893ff55bd305578))
+* typo ([1578ca0](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/1578ca05ea6ab202a0fe0301645bee4179c680b2))
+* update core version ([1ada41d](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/1ada41dd5a7dc5c3abf976a639e4bf563a776d19))
+
+
+* Merge branch 'tm-4898-tracking-api-v3' into 'master' ([57031a7](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/57031a7d29a450fdd9cbdff9e358b0438e94faf2))
+
+## [52.0.28](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v52.0.27...v52.0.28) (2024-10-28)
+
+
+### Bug Fixes
+
+* more case handled ([ee7da9f](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/ee7da9fc7cbaec71459f6dc8e634cee728a8ef2b))
+* more case handled ([74ef6e5](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/74ef6e590a7990900e430327121405fb167bd9f6))
+* tracking api ([c7ac8a6](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/c7ac8a6d6f47853125cca918d6527730bc34864b))
+* update version ([9fe3097](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/9fe30977fdc2e84b1d5cbf437553ade858a9f5e6))
+
+
+### Config
+
+* update theme ([3448e79](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/3448e79cbb8b86feca0ec26bdfbd98ca0fe3fec3))
+
+
+* Merge branch 'tm-4898-tracking-api-v2' into 'master' ([8442900](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/8442900fbf61613c458a8f19d64f95319647a998))
+
 ## [52.0.27](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v52.0.26...v52.0.27) (2024-10-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "52.0.27",
+  "version": "52.0.29",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "40.0.11",
+    "gatsby-core-theme": "40.0.21",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^6.13.1",

package/src/components/atoms/cards/comparison-table/table/index.js

@@ -107,7 +107,7 @@ export default function ComparisonTable({
               <span>{itemName}</span>
               {item?.relation?.status !== 'not_recommended' && (
                 <OperatorCta
-                  module="comparison-table"
+                  module="comparison_table"
                   tracker="main"
                   operator={item?.relation}
                   translationsObj={{
@@ -161,6 +161,7 @@ export default function ComparisonTable({
               module="comparison_table"
               tracker="main"
               item={item?.relation}
+              pageTemplate={tempate}
               itemPosition={index + 1}
               modulePosition={modulePosition}
             />

package/src/components/atoms/cards/operator-card/template-four/index.js

@@ -63,6 +63,7 @@ const TemplateFour = ({
         {showBonusForAll ? (
           <BonusTemplate
             module="cards"
+            pageTemplate={page?.template}
             welcomeBonus={false}
             item={relation}
             ctaBtn
@@ -74,6 +75,7 @@ const TemplateFour = ({
           !isInactive && (
             <BonusTemplate
               welcomeBonus={false}
+              pageTemplate={page?.template}
               item={relation}
               ctaBtn
               tracker="main"

package/src/components/atoms/cards/operator-card/template-one/index.js

@@ -89,6 +89,7 @@ const TemplateOne = ({
               module="cards"
               item={relation}
               tracker="main"
+              pageTemplate={page?.template}
               modulePosition={modulePosition}
               itemPosition={itemPosition}
             />
@@ -98,6 +99,7 @@ const TemplateOne = ({
                 module="cards"
                 item={relation}
                 tracker="main"
+                pageTemplate={page?.template}
                 modulePosition={modulePosition}
                 itemPosition={itemPosition}
               />
@@ -110,6 +112,7 @@ const TemplateOne = ({
               item={item}
               page={page}
               featured={false}
+              pageTemplate={page?.template}
               modulePosition={modulePosition}
               itemPosition={itemPosition}
             />

package/src/components/atoms/cards/operator-card/template-three/index.js

@@ -39,9 +39,8 @@ const TemplateThree = ({
 
   return (
     <div
-      className={`${styles?.operatorCard || ''} ${
-        ribbons?.length > 0 ? styles?.withRibbon || '' : ''
-      }`}
+      className={`${styles?.operatorCard || ''} ${ribbons?.length > 0 ? styles?.withRibbon || '' : ''
+        }`}
     >
       <OperatorDetails
         item={item?.relation}
@@ -67,6 +66,7 @@ const TemplateThree = ({
           {showBonusForAll ? (
             <BonusTemplate
               module="cards"
+              pageTemplate={page?.template}
               item={relation}
               tracker="main"
               modulePosition={modulePosition}
@@ -76,6 +76,7 @@ const TemplateThree = ({
             !isInactive && (
               <BonusTemplate
                 module="cards"
+                pageTemplate={page?.template}
                 item={relation}
                 tracker="main"
                 modulePosition={modulePosition}

package/src/components/atoms/cards/operator-card/template-two/index.js

@@ -76,6 +76,7 @@ const TemplateTwo = ({
             ctaBtn
             item={relation}
             tracker="main"
+            pageTemplate={page?.template}
             modulePosition={modulePosition}
             itemPosition={itemPosition}
           />

package/src/components/atoms/cards/popup-card/index.js

@@ -43,7 +43,7 @@ const PopupCard = ({
         )}
         {showName && <p className={styles?.name || ''}>{operatorName}</p>}
       </div>
-      <Bonus module="popup" item={item} tracker={tracker}  itemPosition={itemPosition} />
+      <Bonus module="popup" item={item} tracker={tracker}  itemPosition={itemPosition} pageTemplate={template} />
       <div className={styles?.buttonContainer || ''}>
         <OperatorCta
           tracker={tracker}

package/src/components/atoms/recommended-operators/index.js

@@ -17,6 +17,7 @@ const RecommendedOperators = ({
   title = 'Recommended Casinos:',
   buttonType = 'primary',
   operators,
+  pageTemplate,
   tncFixed = false,
   operatorLogoWidth,
   operatorLogoHeight,
@@ -32,6 +33,7 @@ const RecommendedOperators = ({
           <OperatorDetails
             showRating={showRating}
             item={operator}
+            template={pageTemplate}
             showAuthor={showAuthor}
             showReviewLink={false}
             costumeStyle={styles.operatorDetails || ''}
@@ -44,14 +46,15 @@ const RecommendedOperators = ({
           <div className={styles.operatorBonus}>
             <PrettyLink
               operator={operator}
-              pageTemplate={null}
+              pageTemplate={pageTemplate}
               module="wagering_calculator"
               tracker="main"
               clickedElement="oneliner"
               modulePosition={modulePosition}
               itemPosition={index + 1}
             >
-              <Bonus item={operator} tracker="main" />
+              <Bonus item={operator} module="wagering_calculator" tracker="main" pageTemplate={pageTemplate} modulePosition={modulePosition}
+                itemPosition={index + 1} />
             </PrettyLink>
 
             <TermsConditions operator={operator} isFixed={tncFixed} />
@@ -63,6 +66,7 @@ const RecommendedOperators = ({
                 operator={operator}
                 tracker="main"
                 buttonType={buttonType}
+                pageTemplate={pageTemplate}
                 module="wagering_calculator"
                 modulePosition={modulePosition}
                 itemPosition={index + 1}
@@ -72,6 +76,7 @@ const RecommendedOperators = ({
           {(!showCouponCode || !couponCode) && (
             <OperatorCta
               operator={operator}
+              pageTemplate={pageTemplate}
               tracker="main"
               buttonType={buttonType}
               module="wagering_calculator"
@@ -102,4 +107,5 @@ RecommendedOperators.propTypes = {
   operatorLogoWidth: PropTypes.number,
   operatorLogoHeight: PropTypes.number,
   modulePosition: PropTypes.number,
+  pageTemplate: PropTypes.string,
 };

package/src/components/molecules/header/variants/operator/template-five/index.js

@@ -33,9 +33,9 @@ const TemplateFive = ({
     <PrettyLink
       operator={relation}
       pageTemplate={pageTemplate}
-      module="header_operator"
+      module="header_operator_logo"
       tracker="main"
-      clickedElement="logo"
+      clickedElement="operator_logo"
       className="header-gtm logo-cta "
     >
       <LazyImage

package/src/components/molecules/header/variants/operator/template-four/index.js

@@ -33,9 +33,9 @@ const TemplateFour = ({
     <PrettyLink
       operator={relation}
       pageTemplate={pageTemplate}
-      module="header_operator"
+      module="header_operator_logo"
       tracker="main"
-      clickedElement="logo"
+      clickedElement="operator_logo"
       className="header-gtm logo-cta "
     >
       <LazyImage

package/src/components/molecules/header/variants/operator/template-three/index.js

@@ -29,9 +29,9 @@ const TemplateThree = ({
     <PrettyLink
       operator={relation}
       pageTemplate={pageTemplate}
-      module="header_operator"
+      module="header_operator_logo"
       tracker="main"
-      clickedElement="logo"
+      clickedElement="operator_logo"
       className="header-gtm logo-cta "
     >
       <LazyImage

package/src/components/molecules/operator-details/index.js

@@ -58,14 +58,14 @@ const OperatorDetails = ({
   const rating = item?.rating || item?.relation?.rating;
 
   // eslint-disable-next-line react/prop-types
-  const Tag = ({ children, classStyle = '' }) =>
+  const Tag = ({ children, classStyle = '', clickedElement = "operator_logo" }) =>
     prettyLinkTracker ? (
       <PrettyLink
         operator={item?.relation || item}
         pageTemplate={template}
         module={module}
         tracker={trackerType}
-        clickedElement="logo"
+        clickedElement={clickedElement}
         className={classStyle}
         modulePosition={modulePosition}
         itemPosition={itemPosition}
@@ -93,19 +93,18 @@ const OperatorDetails = ({
           !contentRibbon &&
           (status === 'active'
             ? hasRibbons && (
-                <span className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon}`}>
-                  {ribbons[0]}
-                </span>
-              )
+              <span className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon}`}>
+                {ribbons[0]}
+              </span>
+            )
             : showNonActiveRibbons && (
-                <span
-                  className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon} ${
-                    styles[status] || ''
+              <span
+                className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon} ${styles[status] || ''
                   }`}
-                >
-                  {useTranslate(`${status}_ribbon`, ribbonText[`${status}_ribbon`])}
-                </span>
-              ))}
+              >
+                {useTranslate(`${status}_ribbon`, ribbonText[`${status}_ribbon`])}
+              </span>
+            ))}
       </Tag>
 
       <div className={styles.details}>
@@ -113,20 +112,19 @@ const OperatorDetails = ({
           contentRibbon &&
           (status === 'active'
             ? hasRibbons && (
-                <span className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon}`}>
-                  {ribbons[0]}
-                </span>
-              )
+              <span className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon}`}>
+                {ribbons[0]}
+              </span>
+            )
             : showNonActiveRibbons && (
-                <span
-                  className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon} ${
-                    styles[status] || ''
+              <span
+                className={`${styles.ribbon} ${contentRibbon && styles.contentRibbon} ${styles[status] || ''
                   }`}
-                >
-                  {useTranslate(`${status}_ribbon`, ribbonText[`${status}_ribbon`])}
-                </span>
-              ))}
-        <Tag classStyle={`${styles.operatorName} name-cta `}>{itemName}</Tag>
+              >
+                {useTranslate(`${status}_ribbon`, ribbonText[`${status}_ribbon`])}
+              </span>
+            ))}
+        <Tag classStyle={`${styles.operatorName} name-cta `} clickedElement="operator_name">{itemName}</Tag>
 
         {(showAuthor || showRating) && (
           <div

package/src/components/molecules/sportstake/lotto-module/winning-numbers/index.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { prettyTracker } from 'gatsby-core-theme/src/helpers/getters';
 import keygen from 'gatsby-core-theme/src/helpers/keygen';
 import HeaderOperatorBaner from 'gatsby-core-theme/src/components/atoms/header-operator-bannner';
+import PrettyLink from "~atoms/pretty-link";
 import useTranslate from '~hooks/useTranslate/useTranslate';
 import { formatDate } from '../../../../../gatsby-core-theme/helpers/lotto';
 import styles from './lotto.module.scss';
@@ -10,7 +10,6 @@ import styles from './lotto.module.scss';
 const WinningNumbers = ({ data, template, operator = null, modulePosition }) => {
   const { balls } = data?.drawDetails || {};
   const imageName = data?.lottery !== 'daily-lotto' ? data?.lottery : 'lotto';
-  const prettyLink = prettyTracker(operator, 'main', false, template);
 
   const getWinningNumbers = () => (
     <ul className={styles.numbersWrapper}>
@@ -57,11 +56,19 @@ const WinningNumbers = ({ data, template, operator = null, modulePosition }) =>
           <p className={styles.label}>
             {useTranslate(`no_winners`, 'There were no winners this week.')}
           </p>
-          <a target="_blank" href={prettyLink} rel="nofollow noreferrer sponsored">
+          <PrettyLink
+            operator={operator}
+            pageTemplate={template}
+            module="lotto_get_ticket"
+            modulePosition={modulePosition}
+            rel="nofollow noreferrer sponsored"
+            clickedElement='lotto_text'
+            >
             <p className={styles.linkCta}>
               {useTranslate(`get_tickets`, 'Get your ticket in for the next draw!')}
             </p>
-          </a>
+          </PrettyLink>
+
         </div>
       </div>
       {operator && (

package/src/components/molecules/toplist/row/variant-one.js

@@ -69,6 +69,7 @@ export default function Row({
         tracker={oneliner}
         modulePosition={modulePosition}
         itemPosition={itemPosition}
+        pageTemplate={template}
       />
 
       {showSellingPoints && <SellingPoints sellingPoints={sellingPoints} limit={3} />}

package/src/components/molecules/wagering-calculator/index.js

@@ -170,6 +170,7 @@ const WageringCalculator = ({
           <RecomendedOperators
             title={useTranslate('wagecalc_recommended_casinos', 'Recommeded Casinos for you: ')}
             operators={operators}
+            pageTemplate={pageContext?.page?.template}
             modulePosition={modulePosition}
           />
         )}

package/src/gatsby-core-theme/components/molecules/header/index.js

@@ -57,7 +57,7 @@ export default function Header({ section, numOfStarsRating = 5, showAuthor }) {
           numOfStars: 5,
           description:
             pageSection.page.description ||
-            getSectionExtraField(null, pageSection.page.sections.header, 'header_text'),
+            getSectionExtraField(null, pageSection?.page?.sections?.header, 'header_text'),
         };
         switch (pageSection?.page?.page_styles?.short_name) {
           case 'template_two': {

package/src/gatsby-core-theme/components/molecules/module/index.js

@@ -4,7 +4,7 @@
 import React, { lazy, Suspense, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { anchorLink } from 'gatsby-core-theme/src/helpers/strings';
-import { prettyTracker, getSectionExtraField } from 'gatsby-core-theme/src/helpers/getters';
+import { getSectionExtraField } from 'gatsby-core-theme/src/helpers/getters';
 import Content from 'gatsby-core-theme/src/components/molecules/content';
 import Toplist from 'gatsby-core-theme/src/components/organisms/toplist';
 import Anchor from 'gatsby-core-theme/src/components/organisms/anchor/template-one';
@@ -215,8 +215,7 @@ const Modules = ({ module, pageContext, index, exclOperator, serverData, moduleP
           operator: module?.value,
           logo: module?.value?.logo_url,
           hasLink: true,
-          prettyLink: prettyTracker(module?.value, 'main', false, page?.template),
-          pageTemplate:  page?.template,
+          pageTemplate: page?.template,
           isStickyCta: false,
         };
       case 'newsletter':
@@ -366,6 +365,8 @@ const Modules = ({ module, pageContext, index, exclOperator, serverData, moduleP
                 isModuleIntroduction={module.module_introduction}
                 module={{ value: module.module_introduction }}
                 isHomepageFirstModule={homepageFirstModule}
+                pageTemplate={page?.template} 
+                modulePosition={modulePosition}
               />
             )}
           </>

package/src/gatsby-core-theme/helpers/server-data.js

@@ -106,12 +106,12 @@ export async function getAPIData(page, url, header, preview) {
     'powerball'
   ];
 
-  const containsFixtures = page.categories.filter((category) => category.short_name === 'fixtures');
-  const containsResults = page.categories.filter((category) => category.short_name === 'results');
-  const containsLotto = page.categories.filter((category) => category.short_name === 'lotto');
-  const conatinsLottoUK49 = page.categories.filter(
+  const containsFixtures = (page?.categories && page?.categories.filter((category) => category.short_name === 'fixtures')) || [];
+  const containsResults = (page?.categories && page?.categories.filter((category) => category.short_name === 'results')) || [];
+  const containsLotto = (page?.categories && page?.categories.filter((category) => category.short_name === 'lotto')) || [];
+  const conatinsLottoUK49 = (page?.categories && page?.categories.filter(
     (category) => category.short_name === 'lotto_uk_49'
-  );
+  )) || [];
   let responseFixtures = {};
   let responseResults = {};
   let responseLotto = {};
@@ -160,7 +160,7 @@ export async function getAPIData(page, url, header, preview) {
     responseFixtures = {
       data: Object.assign({}, ...fixtureData.filter(Boolean)),
     };
-  }
+  }else{ responseFixtures = { data: [] }; }
 
   if (containsResults.length >= 1) {
     const filteredArray = page?.sections?.main?.modules.filter(
@@ -204,7 +204,7 @@ export async function getAPIData(page, url, header, preview) {
     responseResults = {
       data: Object.assign({}, ...resultData.filter(Boolean)),
     };
-  }
+  }else{ responseResults = { data: [] }; }
 
   if (containsLotto.length >= 1) {
     const filteredArray = page?.sections?.main?.modules.filter(
@@ -258,7 +258,7 @@ export async function getAPIData(page, url, header, preview) {
     responseLotto = {
       data: responseArray.filter((n) => n),
     };
-  }
+  }else{ responseLotto = { data: [] }; }
 
   if (conatinsLottoUK49.length >= 1) {
     const types = ['lunchtime', 'teatime'];
@@ -286,7 +286,7 @@ export async function getAPIData(page, url, header, preview) {
       tabs:[...responseArray[0].tabs, ...responseArray[1].tabs],
       data: [...responseArray[0].data, ...responseArray[1].data]
     } 
-  }
+  }else{ lottoUK49 = { data: [], tabs: [] }; }
 
   return {
     props: {

package/src/helpers/info-grid.js

@@ -208,6 +208,7 @@ export const generateLink = (value, props) => {
           tracker='main'
           pageTemplate={template}
           rel='nofollow sponsored'
+          clickedElement="info_box"
           module={props?.module}
           modulePosition={props?.modulePosition}
         >