gatsby-core-theme 41.1.27 → 41.1.28

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [41.1.28](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.27...v41.1.28) (2025-01-20)
+
+
+### Bug Fixes
+
+* add extra data on processor ([a6fb1e9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a6fb1e92de07681e4915de17c78a110615017dbf))
+* add new tests for module ([b9be671](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b9be671b30b18d9183c8c32eeeb88b32fc19f8f5))
+* conflict ([d0a3e5b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d0a3e5b0875463398a603895d49853cb28e01f34))
+* disquss loading ([1631094](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/16310943baa3510f27a0d54c405103cb00878f4d))
+* get latest changes ([1c71701](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1c71701732d17f19af0746e491ff9bd26e3d8e9c))
+* test ([2f01557](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2f01557a7190ca2a93bf7e5899e398cece7a3cf6))
+* update tests ([89014c0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/89014c08ee468baed30168a49acbc797e7ed1a33))
+* update tests ([343b32f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/343b32fcd126d1c314711ffc896faabc538db8a2))
+
+
+* Merge branch 'tm-5077-processor-extra-data' into 'master' ([2b5e2e0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2b5e2e044cdb8ae21243bf3759539176fa095921))
+
 ## [41.1.27](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.26...v41.1.27) (2025-01-20)
 
 

package/package.json

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

package/src/components/atoms/disquss/index.js

@@ -1,43 +1,70 @@
-/* eslint-disable no-var */
-/* eslint-disable one-var */
-/* eslint-disable no-unused-vars */
-/* eslint-disable func-names */
-/* eslint-disable camelcase */
-/* eslint-disable vars-on-top */
-/* eslint-disable react-hooks/exhaustive-deps */
-/* eslint-disable react/no-this-in-sfc */
-/* eslint-disable no-undef */
-import React, { useEffect } from "react";
-import PropTypes from "prop-types";
-
-import { getUrl } from "~helpers/getters";
+/* eslint-disable */
+import React, { useEffect, useRef, useState } from 'react';
+import PropTypes from 'prop-types';
+
+import { getUrl } from '~helpers/getters';
+
+function useInViewport(callback) {
+  const elementRef = useRef(null);
+
+  useEffect(() => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          callback();
+        }
+      },
+      { threshold: 0.1 }
+    );
+
+    if (elementRef.current) {
+      observer.observe(elementRef.current);
+    }
+
+    return () => {
+      if (elementRef.current) {
+        observer.unobserve(elementRef.current);
+      }
+    };
+  }, [callback]);
+
+  return elementRef;
+}
 
 const Disquss = ({ page }) => {
+  const [disqussLoaded, setDisqussLoaded] = useState(false);
+
   // Function to load Disqus
   const disquss = () => {
-    if (document.getElementById("disquss-code")) {
+    if (typeof window === 'undefined' || typeof document === 'undefined') {
+      return; // Ensure it runs only in the browser
+    }
+
+    if (document.getElementById('disquss-code')) {
       return; // Prevent multiple script injections
     }
 
-    // eslint-disable-next-line no-var
-    var disqus_config = function () {
+    const disqus_config = function () {
       this.page.url = window.location.href;
       this.page.identifier = window.location.pathname;
     };
 
-    var d = document,
-      s = d.createElement("script");
-    s.src = `${process.env.DISQUSS_URL}`; // Replace with your Disqus URL
-    s.id = "disquss-code";
-    s.setAttribute("data-timestamp", +new Date());
+    const script = document.createElement('script');
+    script.src = `${process.env.DISQUSS_URL}`; // Replace with your Disqus URL
+    script.id = 'disquss-code';
+    script.setAttribute('data-timestamp', +new Date());
+
+    (document.head || document.body).appendChild(script);
 
-    (d.head || d.body).appendChild(s);
+    setDisqussLoaded(true);
   };
 
   useEffect(() => {
-    disquss();
-
-    if (typeof DISQUS !== "undefined") {
+    if (typeof window !== 'undefined' && typeof DISQUS !== 'undefined') {
       DISQUS.reset({
         reload: true,
         config() {
@@ -46,10 +73,12 @@ const Disquss = ({ page }) => {
         },
       });
     }
-  }, []); 
+  }, [disqussLoaded]);
+
+  const ref = useInViewport(disquss);
 
   return (
-    <div className="module">
+    <div className="module" ref={ref}>
       <div id="disqus_thread" />
     </div>
   );

package/src/constants/pick-keys.mjs

@@ -111,6 +111,7 @@ export const pickRelationKeys = {
     "license_objects",
     "launch_date",
     "game_categories",
+    "updated_at",
   ],
   operator_simplified: [
     "short_name",

package/src/helpers/api.mjs

@@ -101,7 +101,7 @@ export async function getCountries() {
 }
 
 export async function getToplists(siteName) {
-  return callAPIV2(`v0.1/toplists/lists-sorted/sorted-v2/${siteName}`);
+  return callAPIV2(`v0.1/toplists/lists-sorted/sorted-v2/${siteName}?include_timestamps=true`);
 }
 
 export async function getContent(siteName) {

package/src/helpers/processor/modules.mjs

@@ -310,13 +310,6 @@ export function processTopListModule(
         : [];
     }
 
-    if (listItem.updated_at) {
-      const date = new Date(listItem?.updated_at);
-      const options = { year: "numeric", month: "long" };
-      listItem.formated_date = date
-        .toLocaleString("en-US", options)
-        .replace(" ", ", ");
-    }
 
     if (listItem.id && toplists && toplists[listItem.id.toString()]) {
       listItem.market = toplists[listItem.id].market?.short_code;
@@ -346,6 +339,7 @@ export function processTopListModule(
                 : item.selling_points;
           }
 
+        operatorRelation.updated_at = item.updated_at;
         operatorRelation.toplist_bonus = item.bonus_name
 
         const operatorPage =
@@ -362,6 +356,41 @@ export function processTopListModule(
           return Object.assign(clone, { review_link: reviewLink });
         })
       : [];
+
+    const latestItems = listItem.items
+      .map((toplist) => ({
+        ...toplist,
+        updated_at: new Date(toplist.updated_at),
+      }))
+      .sort((a, b) => b.updated_at - a.updated_at)
+      .slice(0, 3);
+
+    const formattedLatestItems = latestItems
+      .map((item) => item.name)
+      .reduce((acc, curr, index, array) => {
+        if (index === array.length - 1 && array.length > 1) {
+          return `${acc} and ${curr}`;
+        }
+        return acc ? `${acc}, ${curr}` : curr;
+      }, "");
+
+    const latestUpdatedDate = listItem.items
+      .map((item) => new Date(item.updated_at))
+      .sort((a, b) => b - a)[0];
+
+    const formattedDate =
+      // 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)
+        : null;
+
+    listItem.latest_items = formattedLatestItems;
+    listItem.latest_updated_date = formattedDate;
+
     return listItem;
   });
 }
@@ -420,6 +449,7 @@ export function processCarouselModule(module = {}, content) {
 export function processFaq(module = {}, content, relationData) {
   // eslint-disable-next-line no-unused-expressions
   module.items &&
+    // eslint-disable-next-line array-callback-return
     module.items.map((item) => {
       item.question = (content && generatePlaceholderString(content[item.question],null,relationData)) || item.question;
       item.answer = (content && content[item.answer]) || item.answer;

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

@@ -9,9 +9,12 @@ import {
   processBonus,
   processTopListModule,
   shouldSavePrefilled,
-} from "./modules";
+ processContentModule,
+ processAnchor
+} from "./modules.mjs";
 import { objectsHolder } from "~tests/factories/modules/modules.factory";
 import getPageDataList from "~tests/factories/pages/list.factory";
+import getPageData from '~tests/factories/pages/default.factory';
 import {
   getSampleCardsV2ModuleManual,
   getSampleCardsV2Filtered,
@@ -21,8 +24,6 @@ import {
   relationData,
   singleToplistItemData,
 } from "../../../tests/factories/modules/toplist.factory";
-import { processContentModule, processAnchor } from "./modules.mjs";
-import getPageData from '~tests/factories/pages/default.factory';
 
 const { cloneDeep } = loadash;
 
@@ -261,6 +262,18 @@ describe("Modules Helper", () => {
     expect(module.show_more_content).toContain(new Date().getFullYear().toString());
   });
 
+  test("Process TopList module computes latest_items and latest_updated_date correctly", () => {
+    const toplistData = cloneDeep(singleToplistItemData);
+    expect(toplistData.items[0].latest_items).toBe(undefined);
+    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", () => {    
     const module = {
       items: [

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

@@ -517,6 +517,7 @@ export const singleToplistData = {
           logo_url: "slotum-casino-logo-transparentpng6b10407566-original.png",
           rating: "4",
           review_link: "slotum",
+          updated_at: "2025-01-14 11:04:49",
           selling_points: ["200% Bonus", "Nice design"],
           links: {
             main: "https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477",
@@ -550,6 +551,7 @@ export const singleToplistData = {
           },
           logo_url: "rizk-logopng7ed316ac19-original.png",
           rating: "4",
+          updated_at: "2025-01-12 11:04:49",
           review_link: "/rizk",
           selling_points: [
             "100% Bonus",
@@ -589,6 +591,7 @@ export const singleToplistData = {
           },
           logo_url: "casoola-logopng381ab5c04f-original.png",
           rating: "3",
+          updated_at: "2025-01-10 11:04:49",
           review_link: "/casoola",
           selling_points: ["25 free spins", "Loyalty scheme"],
           links: {
@@ -619,6 +622,7 @@ export const singleToplistData = {
           logo_url: "image-63.png",
           rating: "3",
           review_link: "/bet365",
+          updated_at: "2025-01-14 11:04:49",
           selling_points: ["Loyalty programme", "Wager-free free spins"],
           links: {
             main: "https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477",
@@ -958,6 +962,19 @@ export const singleToplistItemData = {
           operator_id: 6342,
           selling_points: ["classicslots", "bitcoin", "bingo"],
           short_name: "slotum",
+          updated_at: "2025-01-14 11:04:49",
+        },
+        {
+          operator_id: 6343,
+          updated_at: "2025-01-13 11:04:49",
+        },
+        {
+          operator_id: 6344,
+          updated_at: "2025-01-12 11:04:49",
+        },
+        {
+          operator_id: 6345,
+          updated_at: "2025-01-11 11:04:49",
         },
       ],
       tracker: "main",
@@ -982,6 +999,7 @@ export const relationData = {
   },
   operator: {
     6342: {
+      name: "Slotum",
       id: 6342,
       market_id: 25,
       short_name: "slotum",
@@ -990,6 +1008,72 @@ export const relationData = {
       rating_casino: "4",
       rating_games: "4.3",
       rating_bonuses: "4.3",
+      updated_at: "2025-01-14 11:04:49",
+      rating_customer: "4.5",
+      rating_payout: "",
+      rating: "4.3",
+      selling_points: [],
+      per_site_enabled: true,
+      status: "active",
+      date_last_modified: "2020-10-06",
+      links: {
+        main: "https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477",
+        "PPC Fallback":
+          "https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803",
+      },
+      custom_links: [],
+      owner: "Burstit Limited",
+      types: ["casino"],
+      type: "casino",
+      deposit_wagering: "0x",
+
+      support_types: "Live chat, Email, Vip Support",
+      deposit_methods: [123, 124],
+      software: [
+        {
+          id: 2,
+          name: "2by2 Gaming",
+          short_name: "2_by_2_gaming",
+          logo_asset_id: 10737,
+          games_count: 1,
+          updated_at: null,
+        },
+        {
+          id: 5,
+          name: "Amaya",
+          short_name: "amaya",
+          logo_asset_id: 0,
+          games_count: 0,
+          updated_at: null,
+        },
+      ],
+      bonuses: {
+        main: {
+          one_liner: "€100 Welcome bonus+ 120 Free Spins",
+          start_date: null,
+          end_date: null,
+          categories: [],
+          percentage: "",
+          amount: "",
+          freespins: "",
+          freemoney: "",
+          freespins_nodeposit_amount: "",
+          freespins_nodeposit_bonuscode: "",
+          freespins_nodeposit_games: "",
+        },
+      },
+    },
+    6343: {
+      id: 6343,
+      name: "Risk",
+      market_id: 25,
+      short_name: "Risk",
+      operator_id: 6343,
+      review_link: "http://www.irishluck.ie/dunder-casino-review/",
+      rating_casino: "4",
+      rating_games: "4.3",
+      rating_bonuses: "4.3",
+      updated_at: "2025-01-14 11:04:49",
       rating_customer: "4.5",
       rating_payout: "",
       rating: "4.3",
@@ -1007,6 +1091,7 @@ export const relationData = {
       types: ["casino"],
       type: "casino",
       deposit_wagering: "0x",
+
       support_types: "Live chat, Email, Vip Support",
       deposit_methods: [123, 124],
       software: [
@@ -1043,5 +1128,68 @@ export const relationData = {
         },
       },
     },
+    6344: {
+      name: "Casoola",
+      type: "casino",
+      operator_id: 6344,
+      bonus: {
+        deposit_methods: [],
+      },
+      short_name: "casoola",
+      logo: {
+        filename: "casoola-logopng381ab5c04f-original.png",
+      },
+      logo_url: "casoola-logopng381ab5c04f-original.png",
+      rating: "3",
+      updated_at: "2025-01-10 11:04:49",
+      review_link: "/casoola",
+      selling_points: ["25 free spins", "Loyalty scheme"],
+      links: {
+        main: "https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477",
+        "PPC Fallback":
+          "https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803",
+      },
+      bonuses: {
+        main: {
+          one_liner: "80% Bonus + 25 free spins",
+        },
+        secondary: {
+          one_liner: "Up to £100 New Player Bonus!",
+        },
+      },
+    },
+    6345: {
+      name: "Bet365",
+      type: "casino",
+      operator_id: 6345,
+      bonus: {
+        deposit_methods: [],
+      },
+      short_name: "bet365",
+      logo: {
+        filename: "image-63.png",
+      },
+      logo_url: "image-63.png",
+      rating: "3",
+      review_link: "/bet365",
+      updated_at: "2025-01-14 11:04:49",
+      selling_points: ["Loyalty programme", "Wager-free free spins"],
+      links: {
+        main: "https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477",
+        "PPC Fallback":
+          "https://media.dunderaffiliates.com/redirect.aspx?pid=740444&bid=1803",
+      },
+      bonuses: {
+        main: {
+          one_liner: "Up to £100 New Player Bonus!",
+        },
+        secondary: {
+          one_liner: "80% Bonus + 25 free spins",
+        },
+      },
+      extra_fields: {
+        terms_and_conditions_text_enabled: "1",
+      },
+    },
   },
 };