gatsby-core-theme 40.0.34 → 40.0.36

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [40.0.36](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.35...v40.0.36) (2024-11-14)
+
+
+### Bug Fixes
+
+* fix tests ([ff37177](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ff371775811a2c0ef972faf10f5ef87153b3d19c))
+* remove pageTemplate logjik ([c8396d8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c8396d82eef96cb5b0450a98b77cfcbba7dac561))
+
+## [40.0.35](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.34...v40.0.35) (2024-11-14)
+
+
+### Bug Fixes
+
+* toplist tracker ([e6da7f8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e6da7f8f6fc53719ca506db726133c970436975c))
+
+
+* Merge branch 'toplist-fix-links' into 'master' ([3605777](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/360577755f9e31597d6e9f2f330c6d30f90bbef3))
+
 ## [40.0.34](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.33...v40.0.34) (2024-11-14)
 
 

package/package.json

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

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

@@ -45,14 +45,14 @@ const OperatorCtaButton = ({
   const referer =
     typeof document !== 'undefined' && document?.referrer
       ? document.referrer
-      : ''
+      : '';
+      
   const prettyLink = `${prettyTracker(
     operator,
     trackerType,
-    false,
-    pageTemplate
+    false
   )}`
-
+  
   const translateBtn =
     status && translationsObj[status]
       ? // eslint-disable-next-line react-hooks/rules-of-hooks

package/src/helpers/getters.mjs

@@ -207,17 +207,7 @@ export function prettyTracker(
   operator,
   trackerType = "main",
   provider = false,
-  pageTemplateName = null
-) {
-  if (
-    pageTemplateName &&
-    operator &&
-    operator.links &&
-    operator.links[pageTemplateName]
-  ) {
-    return generateTrackerLink(operator, pageTemplateName, provider);
-  }
-
+) {  
   if (
     !operator ||
     !operator.short_name ||

package/src/helpers/getters.test.js

@@ -138,19 +138,6 @@ describe('Getters Helper', () => {
     expect(Getters.prettyTracker({ short_name: 'short', relation_type: 'game' })).toEqual(
       '/no/visit/short'
     );
-    expect(
-      Getters.prettyTracker(
-        {
-          type: 'casino',
-          relation_type: 'casino',
-          short_name: 'short',
-          links: { 'page-template-test': 'granular' },
-        },
-        'non_main',
-        false,
-        'page-template-test'
-      )
-    ).toEqual('/no/visit/short/page-template-test');
   });
 
   test('getBonus()', () => {

package/src/helpers/processor/modules.mjs

@@ -188,7 +188,7 @@ export function processCardsV2(
       // Populate pagesList if page type and template exists
       pagesList =
         !pagesGroupedByTemplateId[`${cardType}_${market}`] ||
-        !pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId]
+          !pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId]
           ? []
           : pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId];
     } else {
@@ -334,53 +334,55 @@ export function processTopListModule(
     if (listItem.id && toplists && toplists[listItem.id.toString()]) {
       listItem.market = toplists[listItem.id].market?.short_code;
       listItem.items = toplists[listItem.id].items;
+      listItem.one_liner = toplists[listItem.id].one_liner;
+      listItem.tracker = toplists[listItem.id].tracker;
     }
-    
+
     listItem.items = listItem.items
       ? listItem.items.map((item) => {
-          const operatorRelation = Object.values(relations.operator).find(
-            (operator) =>
-              operator.operator_id === item.operator_id &&
-              operator.market === listItem.market &&
-              type === operator.type
-          );
-
-          if (operatorRelation) {      
-            operatorRelation.ribbons =
-              item.ribbon_ids && item.ribbon_ids.length === 0
-                ? operatorRelation.ribbons
-                : item.ribbon_ids;
-                
-              operatorRelation.selling_points =
-                item.selling_points && item.selling_points.length === 0
-                  ? operatorRelation.selling_points
-                  : item.selling_points.map(sellingPoint => translations ? translations[sellingPoint] : sellingPoint);
-          }
-
-          const operatorPage =
-            pages && pages.operator && operatorRelation
-              ? pages.operator.filter(
-                  (page) =>
-                    page.relation.operator_id === operatorRelation.operator_id
-                )
-              : [];
-
-          const reviewLink =
-            operatorPage.length > 0 ? operatorPage[0].path : null;
-
-          const clone = pick(
-            sanitizeOperatorData(
-              cloneDeep(operatorRelation),
-              operatorPage,
-              [],
-              [],
-              data
-            ),
-            topListPickKeys
-          );
-
-          return Object.assign(clone, { review_link: reviewLink });
-        })
+        const operatorRelation = Object.values(relations.operator).find(
+          (operator) =>
+            operator.operator_id === item.operator_id &&
+            operator.market === listItem.market &&
+            type === operator.type
+        );
+
+        if (operatorRelation) {
+          operatorRelation.ribbons =
+            item.ribbon_ids && item.ribbon_ids.length === 0
+              ? operatorRelation.ribbons
+              : item.ribbon_ids;
+
+          operatorRelation.selling_points =
+            item.selling_points && item.selling_points.length === 0
+              ? operatorRelation.selling_points
+              : item.selling_points.map(sellingPoint => translations ? translations[sellingPoint] : sellingPoint);
+        }
+
+        const operatorPage =
+          pages && pages.operator && operatorRelation
+            ? pages.operator.filter(
+              (page) =>
+                page.relation.operator_id === operatorRelation.operator_id
+            )
+            : [];
+
+        const reviewLink =
+          operatorPage.length > 0 ? operatorPage[0].path : null;
+
+        const clone = pick(
+          sanitizeOperatorData(
+            cloneDeep(operatorRelation),
+            operatorPage,
+            [],
+            [],
+            data
+          ),
+          topListPickKeys
+        );
+
+        return Object.assign(clone, { review_link: reviewLink });
+      })
       : [];
     return listItem;
   });
@@ -431,9 +433,9 @@ export function processSpotlightModule(module = {}, content) {
 export function processFaq(module = {}, content) {
   // eslint-disable-next-line no-unused-expressions
   module.items && module.items.map(item => {
-    item.question =  (content && content[item.question]) || item.question;
-    item.answer =  (content && content[item.answer]) || item.answer;
-  }) 
+    item.question = (content && content[item.question]) || item.question;
+    item.answer = (content && content[item.answer]) || item.answer;
+  })
 }
 
 export function processModule(
@@ -486,7 +488,7 @@ export function processModule(
       toplists,
       translations
     );
-  } else if(module.name === "faq") {
+  } else if (module.name === "faq") {
     processFaq(module, content);
   } else if (module.name === "spotlights") {
     processSpotlightModule(module, content);