gatsby-core-theme 44.0.30 → 44.0.32

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [44.0.32](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.31...v44.0.32) (2025-05-05)
+
+
+### Bug Fixes
+
+* reduce issue ([75b42d2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75b42d27a5d61d49ce367f32cd0f7e313ec20bf8))
+* reduce issue ([f6bbe39](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f6bbe39acf967013cc13fed91e1e84b12d08d41c))
+
+## [44.0.31](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.30...v44.0.31) (2025-05-05)
+
+
+### Bug Fixes
+
+* ammended page relations for smaller build sizes ([a2d0522](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a2d0522c6dacf821274d63393d9d46f769bacbe6))
+* anchor smooth upon scroll ([75abe97](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75abe972ff85cb6ba6e05c33212206680b73e530))
+* tests ([e477d92](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e477d92c4a3f6fcf0ca5102c473880e78ba6def7))
+
+
+### Code Refactoring
+
+* anchor links smooth scroll ([077568e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/077568e1bd3405268cc791e53606f4ddd3c2cbeb))
+
+
+* Merge branch 'tm-5429-page-relation' into 'master' ([38ac892](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/38ac892d2d82a94d61dccfed99ee4409162cfad0))
+* Merge branch 'tm-4830-anchor-links' into 'master' ([f6a9744](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f6a974470c3ed7365e9ed724e64396179e0880db))
+
 ## [44.0.30](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.29...v44.0.30) (2025-05-05)
 
 

package/package.json

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

package/src/components/organisms/anchor/template-one/index.js

@@ -22,6 +22,7 @@ function Anchor({
   leftButtonIcon = <IoIosArrowBack />,
   rightButtonIcon = <IoIosArrowForward />,
   hasAdmin = false,
+  offset = 132,
 }) {
   const [scrollX, setScrollX] = useState(0);
   const [scrollEnd, setScrollEnd] = useState(false);
@@ -111,6 +112,14 @@ function Anchor({
         // eslint-disable-next-line no-return-assign
         ref={(el) => (itemsRef.current[index] = el)}
         href={`#${item?.id && item.id}`}
+        onClick={(e) => {
+          e.preventDefault();
+          const el = document.getElementById(item.id);
+          if (el) {
+            const y = el.getBoundingClientRect().top + window.pageYOffset - offset;
+            window.scrollTo({ top: y, behavior: "smooth" });
+          }
+        }}
       >
         {useTranslate(item.slug, item.label)}
         {icon}
@@ -182,6 +191,7 @@ Anchor.propTypes = {
   minCharactersForButtons: PropTypes.number,
   setShowButtons: PropTypes.bool,
   hasAdmin: PropTypes.bool,
+  offset: PropTypes.number,
 };
 
 export default Anchor;

package/src/helpers/processor/common.mjs

@@ -207,6 +207,7 @@ export function removeUnwantedSections(obj, pageType, ribbonsData) {
 
 export function filterRelation (relation, allowedKeys) {
   if (!relation) return undefined;
+  if (!allowedKeys) return relation;
 
   return allowedKeys.reduce((acc, key) => {
     if (relation[key]) {

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

@@ -20,20 +20,22 @@ export function extractParticipantIds(participantsData) {
 }
 
 function modifyMarketEvents(sportsMarketData, data, market) {
-  // Optimization 1: Avoid cloneDeep if sportsMarketData.events is not modified elsewhere
   const events = sportsMarketData?.events || {};
-
   const pathPrefix = data?.site_markets?.[market]?.path_prefix;
 
-  // Optimization 2: Early exit if no path prefix
-  if (!pathPrefix) {
-    return events;
-  }
-
-  // Optimization 3: More efficient object iteration using for...in
   for (const eventKey in events) {
     if (Object.hasOwnProperty.call(events, eventKey)) {
-      events[eventKey].path = `${pathPrefix}/${events[eventKey].path}`;
+      const event = events[eventKey];
+
+      // Flatten the nested date
+      if (event.date && typeof event.date === 'object' && 'date' in event.date) {
+        event.date = event.date.date;
+      }
+
+      // Prepend path prefix if available
+      if (pathPrefix) {
+        event.path = `${pathPrefix}/${event.path}`;
+      }
     }
   }
 
@@ -85,7 +87,7 @@ function modifyMarketTournaments(
       Object.fromEntries(
         sportsMarketData.tournaments[tournamentID].teams.map((teamID) => [
           data.relations.sports_data.teams?.[teamID].livegoals_v2_id,
-          data.relations.sports_data.team_kits[teams[teamID].livegoals_v2_id],
+          data.relations.sports_data.team_kits[teams[teamID].livegoals_v2_id] && data.relations.sports_data.team_kits[teams[teamID].livegoals_v2_id].map((kit) => kit.items)[0],
         ])
       )
     );
@@ -120,7 +122,7 @@ function modifyMarketTournaments(
       team_kits: tournamentTeamKits,
       schedule:
         schedule && schedule.soccer
-          ? filterScheduleByDate(schedule, sportsMarketData.tournaments)
+          ? filterScheduleByDate(schedule, sportsMarketData.tournaments).schedule
           : {},
       featured_events: allFeaturedEvents
         ? allFeaturedEvents.filter((id) =>
@@ -151,27 +153,59 @@ export const processSportsRelations = (
   let events = null;
 
   if (sportsMarketData) {
+    const filteredKits = {};
+    for (const [key, value] of Object.entries(data.relations.sports_data.team_kits)) {
+      filteredKits[key] = value?.[0]?.items || {};
+    }
+
     switch (page.template) {
       case "homepage_sports":
         events = modifyMarketEvents(sportsMarketData, data, market);
-
-        relation.teams = data.relations.sports_data.teams;
+        
         relation.events = events;
         relation.tournaments = sportsMarketData.tournaments;
-        relation.schedule = filterScheduleByDate(
-          cloneDeep(sportsMarketData.schedule),
-          sportsMarketData.tournaments
-        );
+
+        relation.teams = {};
+        for (const [key, value] of Object.entries(events)) {
+          relation.events[key] = {
+            date: value.date,
+            away_team: value.away_team,
+            home_team: value.home_team,
+            livegoals_v2_id: value.livegoals_v2_id,
+            id: value.id,
+            path: value.path,
+            sport: value.sport,
+            tournament: value.tournament
+          };
+        }
+        
         relation.featured_events = Object.keys(events).filter(
           (id) => events[id].featured === 1
         );
-        relation.team_kits = data.relations.sports_data.team_kits;
+
+        relation.teams = {};
+        for (const [key, value] of Object.entries(data.relations.sports_data.teams)) {
+          relation.teams[key] = {
+            livegoals_v2_id: value.livegoals_v2_id,
+            name: value.name
+          };
+        }
+
+        const filteredSchedule = filterScheduleByDate(
+          cloneDeep(sportsMarketData.schedule),
+          sportsMarketData.tournaments,
+          relation.events,
+          relation.teams,
+          filteredKits
+        );
+
+        relation = { ...relation, ...filteredSchedule};
 
         transformedPages[market][pageType][index].relation = relation;
         break;
       case "event":
         // Optimization 1: Avoid cloneDeep if not strictly necessary
-        const {teams} = data.relations.sports_data;
+        const { teams } = data.relations.sports_data;
         events = modifyMarketEvents(sportsMarketData, data, market);
 
         if (
@@ -181,35 +215,26 @@ export const processSportsRelations = (
           const event = events[page.relation_id]; // Direct access if 'events' is keyed correctly
 
           const tournament = sportsMarketData.tournaments[event.tournament]; // Direct access
-
-          const teamKits = {};
-          const eventTeams = {};
-
-          // Optimization 2: Convert teams and team_kits to Maps if used frequently
-          const teamsMap = new Map(Object.entries(teams));
-
-          const teamKitsMap = new Map(
-            Object.entries(data.relations.sports_data.team_kits)
-          );
-
-          if (tournament && tournament.teams) {
-            tournament.teams.forEach((teamId) => {
-
-              const team = teamsMap.get(teamId.toString());
-              const kit = team?.livegoals_v2_id ? teamKitsMap.get(team?.livegoals_v2_id.toString()) : null;
-
-              if (team && kit) {
-                teamKits[team.livegoals_v2_id] = kit; // Shallow copy might be enough
-                eventTeams[teamId] = team; // Shallow copy might be enough
-              }
-            });
-          }
+          delete tournament.events;
+          delete tournament.teams;
 
           relation = {
             event, // Direct access
             tournament, // Direct access
-            team_kits: teamKits,
-            teams: eventTeams,
+            team_kits: [
+              filteredKits[teams[event.home_team].livegoals_v2_id],
+              filteredKits[teams[event.away_team].livegoals_v2_id]
+            ],
+            teams: [
+              {
+                livegoals_v2_id: teams[event.home_team].livegoals_v2_id,
+                name: teams[event.home_team].name
+              },
+              {
+                livegoals_v2_id: teams[event.away_team].livegoals_v2_id,
+                name: teams[event.away_team].name
+              },
+            ],
           };
 
           transformedPages[market][pageType][index].relation = relation;
@@ -272,4 +297,4 @@ export const processSportsRelations = (
         break;
     }
   }
-};
+};

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

@@ -3,7 +3,6 @@ import {
   processSportsRelations,
   extractParticipantIds,
 } from "./sports-relations.mjs";
-import { filterScheduleByDate } from "../schedule.mjs";
 
 jest.mock("lodash", () => ({
   cloneDeep: jest.fn((obj) => JSON.parse(JSON.stringify(obj))),
@@ -38,16 +37,16 @@ describe("processSportsRelations function", () => {
       },
       relations: {
         sports_data: {
-          teams: { 1: { id: 1, name: "Team 1" }, 2: { id: 2, name: "Team 2" } },
-          team_kits: { 1: { kit: "kit1" } },
+          teams: { 1: { id: 1, livegoals_v2_id: 1, name: "Team 1" }, 2: { id: 2, livegoals_v2_id: 2, name: "Team 2" } },
+          team_kits: { 1: [{ items: "kit1" }], 2: [{ items: "kit2" }] },
           markets: {
             gb_en: {
               events: {
                 1: {
                   featured: 1,
                   id: 1,
-                  home_team: { id: 1 },
-                  away_team: { id: 2 },
+                  home_team: 1,
+                  away_team: 2,
                   tournament: 1,
                 },
               },
@@ -78,19 +77,15 @@ describe("processSportsRelations function", () => {
       data,
       index
     );
-
-    expect(transformedPages[market][pageType][index].relation).toEqual({
-      team_kits: cloneDeep(data.relations.sports_data.team_kits),
-      teams: cloneDeep(data.relations.sports_data.teams),
-      events: cloneDeep(data.relations.sports_data.markets.gb_en.events),
-      schedule: filterScheduleByDate(
-        cloneDeep(data.relations.sports_data.markets.gb_en.schedule)
-      ),
-      tournaments: cloneDeep(
-        data.relations.sports_data.markets.gb_en.tournaments
-      ),
-      featured_events: ["1"],
-    });
+    expect(Object.keys(transformedPages[market][pageType][index].relation)).toEqual(
+      [
+        "events",
+        "tournaments",
+        "teams",
+        "featured_events",
+        "soccer"
+      ]
+    );
   });
 
   test("should process event template with valid relation_id", () => {
@@ -132,14 +127,6 @@ describe("processSportsRelations function", () => {
     ).toEqual({
       1: cloneDeep(data.relations.sports_data.markets.gb_en.tournaments[1]),
     });
-
-    expect(transformedPages[market][pageType][index].relation.schedule).toEqual(
-      {
-        soccer: {
-          "2024-01-01": { tournaments: { 1: { events: [1] } } },
-        },
-      }
-    );
   });
 
   test("should handle unknown page templates", () => {

package/src/helpers/schedule.mjs

@@ -1,3 +1,5 @@
+/* eslint-disable camelcase */
+/* eslint-disable array-callback-return */
 export function reverseDate(date) {
   return date.split('-').reverse().join('-');
 }
@@ -6,21 +8,37 @@ export function zeroPadding(num, places) {
   return String(num).padStart(places, '0');
 }
 
-export function filterScheduleByDate(schedule, tournaments) {
+export function populateTeamKits( tournaments, events, teams, team_kits ){
+  const tournamentKits = {}
+  Object.entries(tournaments || {}).forEach(([, tournament]) => 
+    tournament?.events && tournament?.events.forEach((eventId) => {
+      const homeTeam = events?.[eventId]?.home_team;
+      const awayTeam = events?.[eventId]?.away_team;
+
+      tournamentKits[teams?.[homeTeam]?.livegoals_v2_id] = team_kits?.[teams?.[homeTeam].livegoals_v2_id] && team_kits[teams?.[homeTeam].livegoals_v2_id];
+      tournamentKits[teams?.[awayTeam]?.livegoals_v2_id] = team_kits?.[teams?.[awayTeam].livegoals_v2_id] && team_kits[teams?.[awayTeam].livegoals_v2_id];
+    }) 
+  );
+  return tournamentKits;
+}
+
+export function filterScheduleByDate(schedule, tournaments, events, teams, team_kits) {
   const today = new Date().setHours(0, 0, 0, 0);
   let todayFound = false;
   let todayNextIndex = null;
-
+  let filteredTeamKits = null;
   Object.keys(schedule.soccer).forEach((key, index) => {
     if (new Date(key).setHours(0, 0, 0, 0) === today) {
       schedule.soccer[key] = { ...schedule.soccer[key], active: true};
       todayFound = true;
       todayNextIndex = index;
+      filteredTeamKits = populateTeamKits( schedule.soccer[key].tournaments, events, teams, team_kits );
     }
     if(tournaments){
       schedule.soccer[key].sorting = Object.keys(schedule.soccer[key].tournaments).sort(
         (aKey, bKey) => tournaments?.[aKey]?.sort_order - tournaments?.[bKey]?.sort_order);
     }
+    delete schedule.soccer[key].date;
   });
 
   let nextDay = false;
@@ -53,7 +71,7 @@ export function filterScheduleByDate(schedule, tournaments) {
     schedule.soccer = Object.fromEntries(remainingEntries);
   }
 
-  return schedule;
+  return {schedule, team_kits: filteredTeamKits};
 }
 
 export function filterEvents(tournamentEvents, events) {

package/src/helpers/schedule.test.js

@@ -1679,7 +1679,7 @@ const schedule = {
 describe('Schedule Helper', () => {
   test('filterScheduleByDate()', () => {
     const output = filterScheduleByDate(schedule);
-    expect(output.soccer['2021-04-12'].active).toEqual(true);
-    expect(output.soccer['2021-04-10'].active).toEqual(undefined);
+    expect(output.schedule.soccer['2021-04-12'].active).toEqual(true);
+    expect(output.schedule.soccer['2021-04-10'].active).toEqual(undefined);
   });
 });