gatsby-core-theme 40.0.29 → 40.0.30

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [40.0.30](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.29...v40.0.30) (2024-11-06)
+
+
+### Bug Fixes
+
+* add tets for prioritysortedkeys function ([808a44f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/808a44fb56ab77d5ed6e2a82a2ed2ed588af0c53))
+* checked with template ([da6a1b1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/da6a1b10b776df5751dd914513bafbf533b7ce1b))
+* get latst changes ([86aa9bd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/86aa9bd30d2f721780d7128e29525e9d23f8a452))
+* remove breadcrumbs and webPage schema on tracker ([d2da70a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d2da70a673cf50c2c904de7cfe017faf81e642a3))
+* resolve conflicts ([3547eb2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3547eb2df7185c15ca3f3ca10685bdcfb27c6f8d))
+* revert back changes ([67fab31](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/67fab3151e99266bc265761b9ac62caf13592dda))
+* transaltion data ([5430b90](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5430b90bed91a20c01d3a0b14df87a0eb60dbc7b))
+* unique selling points ([fb8813e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/fb8813eee68b036c1cadbb2c7c2a5433e415041f))
+* update search logic so the first tabs and items to appear to be the operator and game ([f95d9fd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f95d9fd62bf6744f33bf898416d5e83bbf9bcbcc))
+* update tests ([7ab4ce0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7ab4ce07b620030bf826bc9515eb872c76811a85))
+
+
+* Merge branch 'translation-page-description' into 'master' ([3f5632a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3f5632abfed9e927947c400e41f81fc4d605bbe9))
+* Merge branch 'tm-4878-search-page' into 'master' ([4d6b3c4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4d6b3c440d2df4d33388b4a5664724bbdebbb751))
+* Merge branch 'tm-4917-schema' into 'master' ([545e278](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/545e2786b5acb1f76a1a7eb255bd7edace7af2be))
+* Merge branch 'master' into tm-4917-schema ([db5e910](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/db5e9105bcbbeedabf9a0755901e345336d3c524))
+
 ## [40.0.29](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.28...v40.0.29) (2024-11-04)
 
 

package/package.json

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

package/src/components/molecules/search/index.js

@@ -9,6 +9,7 @@ import ModuleTitle from '~atoms/module-title';
 import Archive from '~organisms/archive';
 import keygen from '~helpers/keygen';
 import { sortDateOn, sortIntOn, sortStringOn } from '~helpers/search';
+import { getOrderedKeys } from '../../../helpers/getPrioritySortedKeys';
 import CustomSelect from '~atoms/custom-select';
 import Tabs from '~hooks/tabs';
 
@@ -27,7 +28,7 @@ const Search = ({
 
   const marketPrefix = activeMarket?.path_prefix || '/';
   const showAll = useTranslate('showAll', "showAll");
-  
+
   const sortHandle = (field, name, type) => {
     // eslint-disable-next-line array-callback-return
     Object.keys(searchData).map((item) => {
@@ -45,9 +46,8 @@ const Search = ({
     });
     setSearchData({ ...searchData });
   };
-  
-  const typeTabs = searchData ? [showAll, ...Object.keys(searchData)] : [];
-  
+
+  const typeTabs = searchData ? [showAll, ...getOrderedKeys(searchData)] : [];
   const getItems = (item) => {
     const titleObj = pageSearchOptions.archiveOptions.titles.find((title) => title.type === item);    
     const items = {
@@ -133,7 +133,7 @@ const Search = ({
                             
               return (
                 <div results={data.length} label={item} tabId="scas" key={keygen()}>
-                  {Object.keys(searchData).map((item2) => getItems(item2))}
+                  {getOrderedKeys(searchData).map((item2) => getItems(item2))}
                 </div>
               );
             })}

package/src/components/molecules/search/search.test.js

@@ -65,7 +65,7 @@ describe('Search Component', () => {
         />
       );
 
-      expect(getByText('Search For: casino')).toBeTruthy();
+      expect(getByText('Search For: casino')).toBeInTheDocument();
       const input = container.querySelectorAll('input');
       expect(input).toHaveLength(1);
       expect(input[0].getAttribute('placeholder')).toEqual('casino');
@@ -74,34 +74,28 @@ describe('Search Component', () => {
       expect(container.querySelectorAll('.tab-content > div h2').length).toBe(8);
       expect(container.querySelectorAll('.tabList ol li').length).toBe(2);
 
-      // Article Cards
-      expect(getByText('Best Online Casino Payment Methods For Arab Players In 2024')).toBeTruthy();
-      expect(getByText('Real Money Online Casinos for Arab Players 2024')).toBeTruthy();
-      expect(getByText('VIP Online Casinos for Arab Players 2024')).toBeTruthy();
+      // Operator pages re-ordered
+      expect(getByText('VIPArabClub Casino Review 2024')).toBeInTheDocument();
+      expect(getByText('Casombie Casino Review 2024')).toBeInTheDocument();
+      expect(getByText('Playfina Casino Review 2024')).toBeInTheDocument();
 
       const button = container.querySelector('.tabList ol li:nth-child(2) button');
       fireEvent.click(button);
 
-      // Operator pages re-ordered
-      expect(getByText('VIPArabClub Casino Review 2024')).toBeTruthy();
-      expect(getByText('Casombie Casino Review 2024')).toBeTruthy();
-      expect(getByText('Playfina Casino Review 2024')).toBeTruthy();
+      // Article Cards
+      expect(getByText('Best Online Casino Payment Methods For Arab Players In 2024')).toBeInTheDocument();
+      expect(getByText('Real Money Online Casinos for Arab Players 2024')).toBeInTheDocument();
+      expect(getByText('VIP Online Casinos for Arab Players 2024')).toBeInTheDocument();
+
 
       const button2 = container.querySelector('.customSelectContainer ol li:nth-child(2) button');
       fireEvent.click(button2);
 
       // Default Pages
-      expect(getByText('10bet Casino Review 2024')).toBeTruthy();
-      expect(getByText('BC.Game Casino Review 2024')).toBeTruthy();
-      expect(getByText('Betandyou Casino Review 2024')).toBeTruthy();
-
-      const button3 = container.querySelector('.customSelectContainer ol li:last-child button');
-      fireEvent.click(button3);
+      expect(getByText('Best Arabic Online Casinos 2024')).toBeInTheDocument();
+      expect(getByText('Best Online Casino Payment Methods For Arab Players In 2024')).toBeInTheDocument();
+      expect(getByText('Best Online Casinos in Algeria 2024')).toBeInTheDocument();
 
-      // Payment pages re-ordered
-      expect(getByText('10bet Casino Review 2024')).toBeTruthy();
-      expect(getByText('Megapari Casino Review 2024')).toBeTruthy();
-      expect(getByText('Lucky Dreams Casino 2024')).toBeTruthy();
     });
   });
 });

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

@@ -1,11 +1,9 @@
-/* eslint-disable react/no-array-index-key */
-/* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable no-nested-ternary */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-unused-expressions */
 /* eslint-disable prefer-destructuring */
 /* eslint-disable react-hooks/exhaustive-deps */
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState } from "react";
 import PropTypes from 'prop-types';
 import { IoIosArrowBack } from '@react-icons/all-files/io/IoIosArrowBack';
 import { IoIosArrowForward } from '@react-icons/all-files/io/IoIosArrowForward';
@@ -124,6 +122,7 @@ function Anchor({
   const sticky = isFixed && isSticky(stickyOffset, setActiveAnchor, anchorContainerRef);
 
   const anchorItems = anchorList?.map((item, index) => (
+    // eslint-disable-next-line react/no-array-index-key
     <li key={index} className={styles.anchorItem || ''}>
       <a
         className={`${styles.link || ''} anchor-carousel-gtm anchor-menu-gtm`}
@@ -133,6 +132,7 @@ function Anchor({
         ref={(el) => (itemsRef.current[index] = el)}
         href={`#${item?.id && item.id}`}
       >
+        {/* eslint-disable-next-line react-hooks/rules-of-hooks */}
         {useTranslate(item.slug, item.label)}
         {icon}
       </a>
@@ -143,6 +143,7 @@ function Anchor({
     <div className={styles.containerAnchor || ''} ref={anchorContainerRef}>
       {showTitle && (
         <div className={`${styles.anchorTitle || ''}`}>
+          {/* eslint-disable-next-line react-hooks/rules-of-hooks */}
           <span>{useTranslate('anchor_title', 'Table of Contents')}</span>
         </div>
       )}

package/src/helpers/getPrioritySortedKeys.js

@@ -0,0 +1,11 @@
+// eslint-disable-next-line import/prefer-default-export
+export const getOrderedKeys = (incomingData) => {
+  const priority = ["operator", "game"];
+  return Object.keys(incomingData).sort((a, b) => {
+    const aIndex = priority.indexOf(a);
+    const bIndex = priority.indexOf(b);
+    if (aIndex === -1) return 1;
+    if (bIndex === -1) return -1;
+    return aIndex - bIndex;
+  });
+};

package/src/helpers/getPrioritySortedKeys.test.js

@@ -0,0 +1,92 @@
+import { getOrderedKeys } from "./getPrioritySortedKeys";
+
+describe("getOrderedKeys", () => {
+  test("sorts keys with priority items appearing first", () => {
+    const incomingData = {
+      game: "game value",
+      operator: "operator value",
+      article: "article value",
+      page: "default value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["operator", "game", "article", "page"]);
+  });
+
+  test("returns non-priority items in original order after priority items", () => {
+    const incomingData = {
+      page: "default value",
+      article: "article value",
+      operator: "operator value",
+      game: "game value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["operator", "game", "page", "article"]);
+  });
+
+  test("returns all keys in the order if no priority keys are present", () => {
+    const incomingData = {
+      page: "default value",
+      article: "article value",
+      news: "news value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["page", "article", "news"]);
+  });
+
+  test("returns only priority keys if they are the only keys present", () => {
+    const incomingData = {
+      game: "game value",
+      operator: "operator value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["operator", "game"]);
+  });
+
+  test("returns empty array if incomingData is empty", () => {
+    const incomingData = {};
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual([]);
+  });
+
+  test("places multiple non-priority keys after priority keys in the original order", () => {
+    const incomingData = {
+      game: "game value",
+      article: "article value",
+      page: "default value",
+      operator: "operator value",
+      news: "news value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["operator", "game", "article", "page", "news"]);
+  });
+
+  test("places priority key correctly if only one is present, in this case only operator", () => {
+    const incomingData = {
+      article: "article value",
+      page: "default value",
+      operator: "operator value",
+      news: "news value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["operator", "article", "page", "news"]);
+  });
+
+  test("places priority key correctly if only one is present, in this case only game", () => {
+    const incomingData = {
+      article: "article value",
+      page: "default value",
+      game: "game value",
+      news: "news value",
+    };
+
+    const result = getOrderedKeys(incomingData);
+    expect(result).toEqual(["game", "article", "page", "news"]);
+  });
+});

package/src/helpers/processor/index.mjs

@@ -411,7 +411,7 @@ export default {
           if (page.description !== null) {
             page.description = generatePlaceholderString(
               page.description,
-              translationsData,
+              translations,
               {
                 siteName: generalData.site_name,
                 pageTitle: page.title,

package/src/helpers/processor/modules.mjs

@@ -307,7 +307,8 @@ export function processTopListModule(
   pages,
   markets,
   data,
-  toplists
+  toplists,
+  translations
 ) {
   module.items = module.items.map((listItem) => {
     const { type } = listItem;
@@ -358,7 +359,7 @@ export function processTopListModule(
               operatorRelation.selling_points =
                 item.selling_points && item.selling_points.length === 0
                   ? operatorRelation.selling_points
-                  : item.selling_points;
+                  : item.selling_points.map(sellingPoint => translations ? translations[sellingPoint] : sellingPoint);
           }
 
           const operatorPage =
@@ -479,7 +480,7 @@ export function processModule(
       markets,
       data,
       toplists,
-      isPreview
+      translations
     );
   } else if (module.name === "spotlights") {
     processSpotlightModule(module, content);

package/src/helpers/schema.js

@@ -486,16 +486,17 @@ export function templateSchemas(page, pageImage) {
 
 export function schemaGenerator(page = {}, pageImage) {
   const isHomepage = page.path === '/';
-
+  const tracker = page?.template === 'tracker';  
+  
   const jsonSchema = [
     // Page Schema
     ...(page.seo_json_schemas && page.seo_json_schemas.length
       ? page.seo_json_schemas
       : [page.seo_json_schema]),
     // Breadcrumbs Schema
-    !isHomepage ? breadcrumbsSchema(page) : null,
+    (!isHomepage && !tracker) ? breadcrumbsSchema(page) : null,
     // Modules Schemas
-    webPageSchema(page, pageImage),
+   !tracker ? webPageSchema(page, pageImage): null,
     organizationSchema(page, pageImage),
     templateSchemas(page, pageImage),
     ...(page.sections?.main?.modules