gatsby-core-theme 41.1.30 → 41.1.32

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [41.1.32](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.31...v41.1.32) (2025-01-23)
+
+
+### Bug Fixes
+
+* sports data ([25dd87c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/25dd87c8fb284b12fda130787aa2252ab32661a5))
+
+## [41.1.31](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.30...v41.1.31) (2025-01-23)
+
+
+### Bug Fixes
+
+* featured events and multi market event paths ([8a7cb12](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8a7cb1222a17cd08283c6ba77df99a0ad9600d44))
+
 ## [41.1.30](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.29...v41.1.30) (2025-01-21)
 
 

package/package.json

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

package/src/helpers/processor/sports-relations.mjs

@@ -18,12 +18,17 @@ export function extractParticipantIds(participantsData) {
     .filter((id) => id !== null);
 }
 
-export function extractTeamParticipantIds(participant) {
-  const match =
-    participant && participant.logo
-      ? participant.logo.match(/participants\/(\d+)\//)
-      : null; // Regex to extract the ID
-  return match ? match[1] : null;
+function modifyMarketEvents(sportsMarketData, data, market) {
+  const events = cloneDeep(sportsMarketData.events);
+
+  if (data.site_markets[market].path_prefix) {
+    Object.keys(events).map((eventkey) => {
+      events[
+        eventkey
+      ].path = `${data.site_markets[market].path_prefix}/${events[eventkey].path}`;
+    });
+  }
+  return events;
 }
 
 // eslint-disable-next-line import/prefer-default-export
@@ -40,28 +45,30 @@ export const processSportsRelations = (
 
   const teams = cloneDeep(data.relations.sports_data.teams);
   const sportsMarketData = data.relations.sports_data.markets[page.market];
+  let events = null;
 
   if (page.template === "homepage_sports") {
     relation.teams = cloneDeep(teams);
-
-    relation.events = cloneDeep(sportsMarketData.events);
+    events = modifyMarketEvents(sportsMarketData, data, market);
+    relation.events = events;
     relation.tournaments = cloneDeep(sportsMarketData.tournaments);
     relation.schedule = filterScheduleByDate(
       cloneDeep(sportsMarketData.schedule)
     );
-    relation.featured_events = Object.keys(sportsMarketData.events).filter(
-      (id) => sportsMarketData.events[id].featured === 1
+    relation.featured_events = Object.keys(events).filter(
+      (id) => events[id].featured === 1
     );
     transformedPages[market][pageType][index].relation = relation;
   }
 
   switch (page.template) {
     case "event":
+      events = modifyMarketEvents(sportsMarketData, data, market);
       if (
         transformedPages[market][pageType][index].relation_id &&
-        sportsMarketData.events[page.relation_id]
+        events[page.relation_id]
       ) {
-        const event = cloneDeep(sportsMarketData.events[page.relation_id]);
+        const event = cloneDeep(events[page.relation_id]);
 
         const tournament = sportsMarketData.tournaments[event.tournament]
           ? cloneDeep(sportsMarketData.tournaments[event.tournament])
@@ -95,7 +102,8 @@ export const processSportsRelations = (
     case "tournament":
       const tournaments = [];
       const tournamentIds = [];
-
+      events = modifyMarketEvents(sportsMarketData, data, market);
+      
       if (
         Array.isArray(transformedPages[market][pageType][index].relation_id)
       ) {
@@ -105,9 +113,7 @@ export const processSportsRelations = (
               cloneDeep(sportsMarketData.tournaments[tournament])
             );
             if (sportsMarketData.tournaments[tournament]) {
-              tournamentIds.push(
-                sportsMarketData.tournaments[tournament].id
-              );
+              tournamentIds.push(sportsMarketData.tournaments[tournament].id);
             }
           }
         );
@@ -131,12 +137,11 @@ export const processSportsRelations = (
 
       if (schedule.soccer) {
         Object.entries(schedule.soccer).forEach(([date, value]) => {
-          
           Object.entries(value.tournaments).forEach(([tournamentId, value]) => {
             if (!tournamentIds.includes(parseInt(tournamentId))) {
               delete schedule.soccer[date].tournaments[tournamentId];
             }
-          })
+          });
 
           if (Object.keys(schedule.soccer[date].tournaments).length === 0) {
             delete schedule.soccer[date];
@@ -145,12 +150,19 @@ export const processSportsRelations = (
       }
 
       relation.teams = cloneDeep(data.relations.sports_data.teams);
-      relation.events = cloneDeep(sportsMarketData.events);
+      relation.events = events;
       relation.schedule = filterScheduleByDate(schedule);
       relation.tournaments = tournaments;
-      relation.featured_events = Object.keys(sportsMarketData.events).filter(
+
+      const allFeaturedEvents = Object.keys(sportsMarketData.events).filter(
         (id) => sportsMarketData.events[id].featured === 1
       );
+
+      relation.featured_events = allFeaturedEvents.filter((id) =>
+        tournaments.length > 0
+          ? tournaments[0].events.includes(parseInt(id))
+          : false
+      );
       transformedPages[market][pageType][index].relation = relation;
       break;
     default:

package/src/helpers/processor/sports-relations.test.js

@@ -31,6 +31,11 @@ describe("processSportsRelations function", () => {
     };
     market = "market1";
     data = {
+      site_markets: {
+        market1: {
+          path_prefix: null
+        }
+      },
       relations: {
         sports_data: {
           teams: { 1: { id: 1, name: "Team 1" }, 2: { id: 2, name: "Team 2" } },
@@ -51,7 +56,7 @@ describe("processSportsRelations function", () => {
                   "2024-01-01": { tournaments: { 1: { events: [1] } } },
                 },
               },
-              tournaments: { 1: { id: 1, stage_id: "stage1", teams: [1, 2] } },
+              tournaments: { 1: { id: 1, stage_id: "stage1", teams: [1, 2], events: [1] } },
             },
           },
         },