gatsby-core-theme 44.2.0 → 44.2.2

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [44.2.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.1...v44.2.2) (2025-06-10)
+
+
+### Bug Fixes
+
+* add id on relation ([698e1fd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/698e1fd3f1a7cc09eefaaf5b973f5701a4ac5056))
+* added author_title and author_same_as to toplist ([0482c89](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/0482c8995ccc4e9e7f18f18e2b979d16d987366a))
+* added condition if the itemd dont have relation ([6942f04](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6942f04cdbadef6ab3185e42e1c14c2706118ce3))
+* filter out cards items that are on the same relation as the current page ([418692e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/418692e48662aab5b72af25eaacffbff5a0a2530))
+* jest ([2d8291f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2d8291f47d26cafdfd92d79979657a39d46875c4))
+* jest ([43e82e4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/43e82e44236be358a70e7dae79539be95e7bae58))
+* jest ([8b3ce52](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8b3ce527f8c0b421cddf29c86ca49b8d9c693b9a))
+* modules ([4cd9671](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4cd9671f06dd8140738a07a7dac647f8c6d1ffab))
+* prefilled module cards on the same page as the relation ([675de03](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/675de0392384b6a3d036aa1b9f19e64f603c846d))
+* remove comments ([e3fc17e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e3fc17e7a6204ffd3642a888be60d3faa460dade))
+
+
+* Merge branch 'tm-5515-prefilled-module-cards' into 'master' ([b8364fc](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b8364fca1d5579536a9b261ba9cca36291d8d82e))
+
+## [44.2.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.0...v44.2.1) (2025-06-10)
+
+
+### Bug Fixes
+
+* enable coupon code on bonus box template one ([9bde912](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9bde912a4ae8de2489f05880da286ba5735766bf))
+
+
+* Merge branch 'tm-5469-enable-coupon-code' into 'master' ([780db9f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/780db9f15a9949870d3767874819cef3b7220c3c))
+
 # [44.2.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.1.8...v44.2.0) (2025-06-09)
 
 

package/package.json

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

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

@@ -1,40 +1,56 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { getBonusData } from '~helpers/getters.mjs';
-import PrettyLink from '~atoms/pretty-link';
-import styles from './bonus-box.module.scss';
+import React from "react";
+import PropTypes from "prop-types";
+import { getBonusData } from "~helpers/getters.mjs";
+import PrettyLink from "~atoms/pretty-link";
+import styles from "./bonus-box.module.scss";
+import VariableComponent from "../variables";
 
 export default function BonusBox({
   item,
   tracker,
+  showVariablesComponent = false,
   pageTemplate = null,
-  splitBy = '+',
-  feSeparator = '+',
+  splitBy = "+",
+  feSeparator = "+",
   moduleName = null,
   clickedElement = "bonusBox",
   titleSuffix,
   modulePosition,
-  itemPosition
+  itemPosition,
 }) {
   const data = getBonusData(item, tracker, splitBy);
 
   return (
-    <PrettyLink
-      operator={item}
-      pageTemplate={pageTemplate}
-      moduleName={moduleName}
-      tracker={tracker}
-      titleSuffix={titleSuffix}
-      clickedElement={clickedElement}
-      className={`${styles.detailsBox} ${'bonus-box-gtm'}`}
-      modulePosition={modulePosition}
-      itemPosition={itemPosition}
-    >
-      {data?.mainLine && <span className={styles.firstPart}>{data.mainLine}</span>}
-      {data?.secondLine && (
-        <span className={styles.secondPart}>{`${feSeparator}${data.secondLine}`}</span>
-      )}
-    </PrettyLink>
+
+      <PrettyLink
+        operator={item}
+        pageTemplate={pageTemplate}
+        moduleName={moduleName}
+        tracker={tracker}
+        titleSuffix={titleSuffix}
+        clickedElement={clickedElement}
+        className={`${styles.detailsBox} ${"bonus-box-gtm"}`}
+        modulePosition={modulePosition}
+        itemPosition={itemPosition}
+      >
+        {data?.mainLine && (
+          <span className={styles.firstPart}>{data.mainLine}</span>
+        )}
+        {data?.secondLine && (
+          <span
+            className={styles.secondPart}
+          >{`${feSeparator}${data.secondLine}`}</span>
+        )}
+        {showVariablesComponent && (
+          <VariableComponent
+            item={item}
+            moduleName={moduleName}
+            modulePosition={modulePosition}
+            itemPosition={itemPosition}
+            clickedElement={clickedElement}
+          />
+        )}
+      </PrettyLink>
   );
 }
 
@@ -49,4 +65,5 @@ BonusBox.propTypes = {
   titleSuffix: PropTypes.string,
   modulePosition: PropTypes.number,
   itemPosition: PropTypes.number,
+  showVariablesComponent: PropTypes.bool,
 };

package/src/constants/pick-keys.mjs

@@ -72,6 +72,8 @@ export const pickRelationKeys = {
     "author_name",
     "author_path",
     "author_image",
+    "author_title",
+    "author_same_as",
     "author_image_object",
     "software",
     "deposit_methods",

package/src/helpers/processor/index.mjs

@@ -140,7 +140,7 @@ export function processSections(
   toplists,
   content
 ) {
-  // pagedId we will use it just on operator review pages
+  // pageId we will use it just on operator review pages
   const pageId = page ? page.id : null;
   const relationData = page && page.relation;
 
@@ -165,7 +165,18 @@ export function processSections(
           shouldSavePrefilled(module, siteName) &&
           savedModules[module.module_value_id]
         ) {
-          Object.assign(module, savedModules[module.module_value_id]);
+          const filteredModule = cloneDeep(savedModules[module.module_value_id]);
+
+          const relationID = pagesMappedById[pageId]?.relation_id;
+          if (filteredModule.name === 'cards_v2' &&
+            relationID && filteredModule.items
+          ) {
+            filteredModule.items = filteredModule.items.filter((item) => {
+              return !item.relation || item.relation.id !== relationID;
+            });
+          }
+
+          Object.assign(module, filteredModule);
         } else {
           if (
             module.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET
@@ -511,9 +522,11 @@ export default {
                   ...minimalPage,
                   ...(filteredRelation && { relation: filteredRelation }),
                   ...(filteredAuthorRelation && { author: filteredAuthorRelation }),
-                  ...operatorExtraFileds && { extra_fields: { 
-                    operator: operatorExtraFileds 
-                  } },
+                  ...operatorExtraFileds && {
+                    extra_fields: {
+                      operator: operatorExtraFileds
+                    }
+                  },
                 })
               );
             }

package/src/helpers/processor/modules.mjs

@@ -187,7 +187,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 {
@@ -279,6 +279,18 @@ export function processCardsV2(
     }
   }
 
+
+  if (styleName !== "comparison_table") {
+    const relationID = pagesMappedById[pageId]?.relation_id;
+
+    if (module.items && module.items.length > 0 && relationID) {
+      module.items = module.items.filter(
+        (item) => !item.relation || item.relation.id !== relationID
+      );
+    }
+  }
+
+
   if (
     styleName === "comparison_table" &&
     pageId !== null &&
@@ -341,53 +353,60 @@ export function processTopListModule(
 
     listItem.items = listItem.items
       ? listItem.items.map((item) => {
-          const operatorRelation = cloneDeep(
-            Object.values(relations.operator).find(
-              (operator) =>
-                operator.operator_id === item.operator_id &&
-                operator.market === listItem.market &&
-                type === operator.type
+        const operatorRelation = cloneDeep(
+          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;
+        }
+
+        operatorRelation.updated_at = item.updated_at;
+        operatorRelation.toplist_bonus = item.bonus_name;
+
+        const operatorPage =
+          pages && pages.operator && operatorRelation
+            ? pages.operator.filter(
+              (page) =>
+                page.relation &&
+                page.relation.operator_id ===
+                operatorRelation.operator_id &&
+                page.relation.type === operatorRelation.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;
-          }
-
-          operatorRelation.updated_at = item.updated_at;
-          operatorRelation.toplist_bonus = item.bonus_name;
-
-          const operatorPage =
-            pages && pages.operator && operatorRelation
-              ? pages.operator.filter(
-                  (page) =>
-                    page.relation &&
-                    page.relation.operator_id ===
-                      operatorRelation.operator_id &&
-                    page.relation.type === operatorRelation.type
-                )
-              : [];
-
-          const reviewLink =
-            operatorPage.length > 0 ? operatorPage[0].path : null;
-
-          const clone = sanitizeOperatorData(
-            cloneDeep(operatorRelation),
-            operatorPage,
-            data,
-            toplists && toplists[listItem.id].label
-          );
-
-          return Object.assign(clone, { review_link: reviewLink });
-        })
+            : [];
+
+        const reviewLink = operatorPage.length > 0 ? operatorPage[0].path : null;
+        const authorTitle = operatorPage[0] && operatorPage[0]?.author?.author_title;
+        const authorSameAs = operatorPage[0] && operatorPage[0]?.author?.knows_abouts && operatorPage[0].author.knows_abouts.map(knowsAboutItem => 
+          knowsAboutItem.links.map((link) => link.link)[0]
+        )
+
+        const clone = sanitizeOperatorData(
+          cloneDeep(operatorRelation),
+          operatorPage,
+          data,
+          toplists && toplists[listItem.id].label
+        );
+
+        return Object.assign(clone, { 
+          review_link: reviewLink,
+          author_title: authorTitle,
+          author_same_as: authorSameAs
+        });
+      })
       : [];
 
     const latestItems = listItem.items
@@ -415,10 +434,10 @@ export function processTopListModule(
       // eslint-disable-next-line no-restricted-globals
       latestUpdatedDate instanceof Date && !isNaN(latestUpdatedDate)
         ? new Intl.DateTimeFormat("en-US", {
-            year: "numeric",
-            month: "long",
-            day: "numeric",
-          }).format(latestUpdatedDate)
+          year: "numeric",
+          month: "long",
+          day: "numeric",
+        }).format(latestUpdatedDate)
         : null;
 
     listItem.latest_items = formattedLatestItems;
@@ -497,7 +516,7 @@ export function processFaq(module = {}, content, relationData) {
             null,
             relationData
           )) ||
-          item.question
+        item.question
       );
       item.answer = trailingSlash(
         (content && content[item.answer]) || item.answer

package/src/helpers/processor/modules.test.js

@@ -9,8 +9,8 @@ import {
   processBonus,
   processTopListModule,
   shouldSavePrefilled,
- processContentModule,
- processAnchor
+  processContentModule,
+  processAnchor
 } from "./modules.mjs";
 import { objectsHolder } from "~tests/factories/modules/modules.factory";
 import getPageDataList from "~tests/factories/pages/list.factory";
@@ -61,15 +61,15 @@ describe("Modules Helper", () => {
     const pageList = getPageDataList(pagesNum).map((page, i) =>
       i % 2
         ? {
-            ...page,
-            relation_type: "operator",
-            relation: { ...page.relation, status: "inactive" },
-          }
+          ...page,
+          relation_type: "operator",
+          relation: { ...page.relation, status: "inactive" },
+        }
         : {
-            ...page,
-            relation_type: "operator",
-            relation: { ...page.relation, status: "active" },
-          }
+          ...page,
+          relation_type: "operator",
+          relation: { ...page.relation, status: "active" },
+        }
     );
 
     processCardsV2(
@@ -114,6 +114,20 @@ describe("Modules Helper", () => {
     expect(moduleData.items).toHaveLength(4);
   });
 
+  test("Cards V2 with Comparison Style", () => {
+    const pagesNum = 3;
+    const moduleData = getSampleCardsV2ModuleManual("comparison_table");
+    const pageList = getPageDataList(pagesNum);
+    processCardsV2(
+      moduleData,
+      groupBy(pageList, "relation_type"),
+      groupBy(pageList, "id", true),
+      1
+    );
+
+    expect(moduleData.items).toHaveLength(2);
+  });
+
   test("Cards V2 FIltered inactive", () => {
     process.env.GATSBY_SITE_NAME = "irishluck.ie";
     const pagesNum = 10;
@@ -124,15 +138,15 @@ describe("Modules Helper", () => {
     const pageList = getPageDataList(pagesNum).map((page, i) =>
       i === 1
         ? {
-            ...page,
-            relation_type: "operator",
-            relation: { ...page.relation, status: "inactive" },
-          }
+          ...page,
+          relation_type: "operator",
+          relation: { ...page.relation, status: "inactive" },
+        }
         : {
-            ...page,
-            relation_type: "operator",
-            relation: { ...page.relation, status: "active" },
-          }
+          ...page,
+          relation_type: "operator",
+          relation: { ...page.relation, status: "active" },
+        }
     );
 
     processCardsV2(
@@ -271,13 +285,13 @@ describe("Modules Helper", () => {
     expect(toplistData.items[0].latest_updated_date).toBe(undefined);
 
     processTopListModule(toplistData, relationData);
-    
+
     expect(toplistData.items[0].latest_items).toBe('Slotum, Risk and Casoola');
     expect(toplistData.items[0].latest_updated_date).toBe('January 14, 2025');
   });
 
 
-  test("Process Anchor module", () => {    
+  test("Process Anchor module", () => {
     const module = {
       items: [
         { slug: 'section-one-year', label: 'Section one [YEAR]' },
@@ -291,7 +305,7 @@ describe("Modules Helper", () => {
     expect(processedAnchor.items[2].slug).toBe('section-three');
     expect(processedAnchor.items[3].id).toBe('section-four');
   });
-  test("Process Anchor module with shortcodes", () => {    
+  test("Process Anchor module with shortcodes", () => {
     const module = {
       items: [
         { slug: 'section-one-year', label: 'Section one [YEAR]' },

package/tests/factories/modules/card.factory.js

@@ -446,7 +446,7 @@ export function getSampleOperatorCards(type) {
   return sampleOperatorCards;
 }
 
-export function getSampleCardsV2ModuleManual() {
+export function getSampleCardsV2ModuleManual(ModuleStyle = '') {
   const sampleOperatorCards = {
     cards_page_type: 'operator',
     cards_page_type_id: 5,
@@ -465,6 +465,7 @@ export function getSampleCardsV2ModuleManual() {
     module_title: `Operator Cards`,
     link_label: 'View more',
     link_value: '/sample',
+    style: ModuleStyle,
     num_of_items: 3,
   };
 

package/tests/factories/pages/default.factory.js

@@ -68,6 +68,7 @@ export default function getPageData() {
       status: 'active',
       short_name: 'rizk',
       type: 'casino',
+      links: { main: 'https://www.youtube.com/' },
       iframe: 'https://www.youtube.com/embed/DU1Pio4n_N0',
       bonus: {
         bonuses: {

package/tests/factories/pages/list.factory.js

@@ -46,6 +46,7 @@ export default function getPageDataList(length) {
       operator_review_summary: 'lorem ipsum',
     },
     relation: {
+      id: 1,
       name: 'Rizk Casino',
       logo_url: 'rizk-logopng7ed316ac19-original.png',
       url: 'https://rizk.com',