gatsby-core-theme 40.0.29 → 40.0.31

package/CHANGELOG.md

@@ -1,3 +1,41 @@
+## [40.0.31](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.30...v40.0.31) (2024-11-12)
+
+
+### Bug Fixes
+
+* convert all page creations to V2 apis ([9247ccc](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9247ccc8c6c1db5ce499a0912c0ba01c74814a4d))
+* search bar ([f4fca5c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f4fca5c18bdab617d935d581a35127c0c9663d0b))
+* search show nav ([063f27f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/063f27f888bc54aa6f53cea3c183b6b0b0af3712))
+* search show nav ([522a245](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/522a245c24ed7f57ae6f77d0bd87730f6c18a307))
+* site name ([2273e13](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2273e1317f0525de8d698feb53de389e636b7612))
+* tests ([7ef4caa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7ef4caaab2aa09ac3ea5bd79f752e210e37b7846))
+
+
+* Merge branch 'tm-3392-pages-v2' into 'master' ([d1a2403](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d1a2403aadbfc9d03945cae6e7c7b610bf725549))
+* Merge branch 'tm-4925-search-bar' into 'master' ([741a2ce](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/741a2ce879309c4fcb55fc4577dfa6e510c5d085))
+
+## [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/gatsby-node.mjs

@@ -196,6 +196,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
   console.log(chalk.magenta('info') + chalk.whiteBright(' starting processor'));
   
   delete response.site_markets;
+  delete response.pages;
   delete response.redirects;
   delete response.breadcrumbs;
   delete response.general;
@@ -210,6 +211,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
   delete response.relations.translations;
   delete response.relations.responsible_gamings;
   delete response.relations.dms_affiliate_settings;
+
   // Note: Not used
   delete response.colors;
   delete response.module_styles
@@ -219,6 +221,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
   const processed = processor.run({
     ...response,
     ...siteSettingsData,
+    pages: pagesData,
     general: siteGeneralData,
     prefilled_market_modules: siteSettingsData.prefilled_modules,
     responsible_gamings: responsableGamingData,
@@ -525,27 +528,25 @@ export const sourceNodes = async ({ actions, createNodeId, createContentDigest }
     const page = pagesData[pageId]
     if(page && page.robot_options && page.robot_options.page_index) {
       const pageSitemap = {
-      'path': page.path,
-      'updated_at': page.updated_at,
-      'market': page.market,
-      'language': page.language
-    }
+        'path': page.path,
+        'updated_at': page.updated_at,
+        'market': page.market,
+        'language': page.language
+      }
 
-    const nodeMeta = {
-      id: createNodeId(keygen()),
-      parent: null,
-      children: [],
-      internal: {
-        type: `Sitemap`,
-        mediaType: `text/html`,
-        contentDigest: createContentDigest(pageId),
-      },
-    };
-    const node = { ...pageSitemap, ...nodeMeta}
-    createNode(node)
+      const nodeMeta = {
+        id: createNodeId(keygen()),
+        parent: null,
+        children: [],
+        internal: {
+          type: `Sitemap`,
+          mediaType: `text/html`,
+          contentDigest: createContentDigest(pageId),
+        },
+      };
+      const node = { ...pageSitemap, ...nodeMeta}
+      createNode(node)
     }
-    
-
   })
 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "40.0.29",
+  "version": "40.0.31",
   "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/components/organisms/search/index.js

@@ -18,6 +18,7 @@ const SearchForm = ({
   const [localSearch, setLocalSearch] = useState(false);
   const [searchBoxQuery,] = useState();
   const searchInputRef = useRef();
+  const searchFormRef = useRef();
 
   const handleOnSearchIconClick = () => {
     setLocalSearch(!localSearch);
@@ -45,12 +46,26 @@ const SearchForm = ({
   };
 
   useEffect(() => {
-    // eslint-disable-next-line no-unused-expressions
-    localSearch && searchInputRef.current.focus();
+    const handleClickOutside = (event) => {
+      if (localSearch && searchFormRef.current && !searchFormRef.current.contains(event.target)) {
+        setLocalSearch(false);
+        toggleScroll('search');
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [localSearch]);
+
+  useEffect(() => {
+    if (localSearch) searchInputRef.current.focus();
   }, [localSearch]);
 
   return (
-    <div className={className || ''}>
+    <div className={className || ''} ref={searchFormRef}>
       <button
         type="button"
         aria-label="Search"

package/src/components/organisms/search/search.module.scss

@@ -1,25 +1,26 @@
 .searchForm {
   position: absolute;
-  top: 0;
+  top: var(--nav-height, 0);
   left: 0;
   width: 100%;
   background-color: var(--modal-overlay-color);
-  height: 100vh;
-  z-index: map-get($z-index, search);
+  height: calc(100vh - var(--nav-height));
 
+  @include customZindex(search);
   @include collapse(0s, 100vh);
 }
+
 .storyContainer {
   position: relative;
   height: 20rem;
   width: 100%;
+
   > div {
     position: absolute;
     width: 100%;
   }
 }
 
-
 .form {
   width: 100%;
   max-width: var(--main-container-max);
@@ -30,41 +31,39 @@
   top: var(--search-top-space, 2.4rem);
   left: 50%;
   transform: translateX(-50%);
-  >input{
+
+  > input {
     align-items: center;
     border-radius: var(--border-radius);
     color: #0e1118;
     display: flex;
-    font-size: 1.8rem;
     font-size: 1.6rem;
     font-weight: 500;
     line-height: 2.7rem;
     padding: 2.2rem 1.6rem;
     width: 100%;
   }
+}
 
-  .searchButton > button >img{
-    filter: brightness(0);
-    height: 2.4rem;
-    width: 2.4rem;
-  }
+.searchButton > button > img {
+  filter: brightness(0);
+  height: 2.4rem;
+  width: 2.4rem;
+}
 
-  .searchButton {
-    position: absolute;
-    right: 3rem;
-    top: 2.3rem;
+.searchButton {
+  position: absolute;
+  right: 3rem;
+  top: 2.3rem;
 
-    svg {
-      color: var(--nav-icon-color);
-      font-size: 3rem;
-    }
+  svg {
+    color: var(--nav-icon-color);
+    font-size: 3rem;
   }
-}
 
-.searchButton {
   &:disabled {
     background: transparent;
-    border: none;
-    cursor: not-allowed
+    border: unset;
+    cursor: not-allowed;
   }
-}
+}

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

@@ -88,16 +88,33 @@ export function processSitemapPages(pages, markets) {
   return pageListByMarket;
 }
 
+const groupByLanguageAndType = (data) => Object.values(data).reduce((acc, item) => {
+    const lang = item.language;
+    const type = item.type;
+
+    // Initialize language and type groupings if not already present
+    if (!acc[lang]) acc[lang] = {};
+    if (!acc[lang][type]) acc[lang][type] = [];
+
+    // Add the item to the appropriate group
+    acc[lang][type].push(item);
+    return acc;
+  }, {});
+
 export function transform(response) {
   const transformed = {};
+
+  const pages = groupByLanguageAndType(response.pages);
+
   Object.keys(response.site_markets).forEach((siteMarket) => {
     const language = siteMarket.split("_")[1];
     transformed[siteMarket] = {};
-    if (response.pages[language]) {
-      Object.keys(response.pages[language]).forEach((pageType) => {
+
+    if (pages[language]) {
+      Object.keys(pages[language]).forEach((pageType) => {
         transformed[siteMarket][pageType] = [];
-        Object.keys(response.pages[language][pageType]).forEach((pagePath) => {
-          const page = response.pages[language][pageType][pagePath][siteMarket];
+        Object.keys(pages[language][pageType]).forEach((pageId) => {
+          const page = pages[language][pageType][pageId];
 
           if (response.site_markets[siteMarket].path_prefix && page) {
             // set page prefix for multiple markets
@@ -113,7 +130,6 @@ export function transform(response) {
     }
   });
   console.log("transform done");
-
   return transformed;
 }
 
@@ -411,7 +427,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/index.test.js

@@ -1,7 +1,9 @@
 import { transform, processExtraFields, processSections, getReadingTime } from './index';
 import pages from '~tests/factories/pages/pages.factory.js';
+// eslint-disable-next-line camelcase
+import pages_v2 from '~tests/factories/pages/pages_v2.factory.js';
 import getPageList from '~tests/factories/pages/page.factory';
-import multipleMarketsPages from '~tests/factories/pages/multiple-markets-pages.factory.js';
+import multipleMarketsPages from '~tests/factories/pages/multiple-markets-pages_v2.factory.js';
 import getOperatorData from '../../../tests/factories/relations/operator.factory';
 
 const tempContent = {
@@ -32,12 +34,13 @@ const relations = {
 
 describe('Index Processor', () => {
   test('Transform', () => {
-    const results = transform(pages);
-    expect(results?.za_en?.page).toBeTruthy();
+    const results = transform(pages_v2);
+    expect(results?.za_en?.page[0].id).toEqual(99408);
   });
 
   test('Transform multiple markets', () => {
     const results = transform(multipleMarketsPages);
+    
     Object.keys(multipleMarketsPages.site_markets).forEach((siteMarket) => {
       const prefix = multipleMarketsPages.site_markets[siteMarket].path_prefix;
       expect(results[siteMarket].page[0].path).toBe(`${prefix ? `${prefix}/` : ''}test-page`);
@@ -103,8 +106,10 @@ describe('Index Processor', () => {
 
   test('processSections', () => {
     const result = processSections(pages.prefilled_market_modules);
-    expect(result).toBeTruthy();
+    expect(result.post_main['1059'].title).toBe('More casino reviews');
   });
+
+
   test('reading time', () => {
     const relationType = 'author';
     const market = 'ie_en';
@@ -122,7 +127,6 @@ describe('Index Processor', () => {
     page.reading_time = result;
 
     expect(result).toBe(1);
-    expect(page.reading_time).toBeTruthy();
     expect(page.reading_time).toBe(result);
 
     // Add more content for testing purpose of longer reading time
@@ -145,7 +149,6 @@ describe('Index Processor', () => {
     page.reading_time = result1;
 
     expect(result1).toBe(11);
-    expect(page.reading_time).toBeTruthy();
     expect(page.reading_time).toBe(result1);
   });
 });

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 =
@@ -431,6 +432,14 @@ export function processSpotlightModule(module = {}, content) {
   return module;
 }
 
+export function processFaq(module = {}, content) {
+  // eslint-disable-next-line no-unused-expressions
+  module.items && module.items.map(item => {
+    item.question =  (content && content[item.question]) || item.question;
+    item.answer =  (content && content[item.answer]) || item.answer;
+  }) 
+}
+
 export function processModule(
   module,
   pages,
@@ -479,8 +488,10 @@ export function processModule(
       markets,
       data,
       toplists,
-      isPreview
+      translations
     );
+  } else if(module.name === "faq") {
+    processFaq(module, content);
   } else if (module.name === "spotlights") {
     processSpotlightModule(module, content);
   } else if (module.name === "menu" && menus && menus[module.menu_id]) {

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

package/src/helpers/tracker.mjs

@@ -109,6 +109,8 @@ function buildUrlParams(operator, trackerName, headers, cookie, extraParams) {
   const userAgent = headers?.get("user-agent") || null;
   const affObject = isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {};
 
+  if (extraParams && extraParams.pt) affObject.module = extraParams.pt;
+
   return {
     site_id: process.env.SITE_ID,
     operator_short_name: operator.short_name,
@@ -138,6 +140,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     const trackerName = await getTrackerName(operator, page, path);
     const cookie = parseCookies(headers);
     const extraParams = extractUrlParams(url);
+    
     const urlParam = buildUrlParams(operator, trackerName, headers, cookie, extraParams);
 
     const queryString = new URLSearchParams(clean(urlParam)).toString();

package/tests/factories/pages/multiple-markets-pages_v2.factory.js

@@ -0,0 +1,108 @@
+export default {
+  site_markets: {
+    za_en: { path_prefix: null },
+    es_es: {
+      path_prefix: "es",
+    },
+  },
+  pages: {
+    99407: {
+      id: 99407,
+      market_id: 67,
+      updated_at: "2021-12-08",
+      created_at: "2021-12-08 16:15:50",
+      template_id: 97,
+      page_hreflang_group_id: null,
+      page_hreflang_combined: 0,
+      relation_id: 0,
+      relation_type: "page",
+      market: "za_en",
+      region_code: null,
+      author: null,
+      hard_coded_breadcrumbs: 0,
+      breadcrumb_ids: null,
+      categories: [],
+      author_id: null,
+      style_id: null,
+      language: "en",
+      description: null,
+      meta_title: null,
+      meta_robots: null,
+      robot_options: {
+        page_index: 0,
+        links_followed: 0,
+        images_index: 0,
+        show_snippet: 0,
+      },
+      meta_description: null,
+      seo_keywords: null,
+      seo_raw_js: "",
+      seo_json_schema: null,
+      seo_json_schemas: [],
+      page_custom_hreflangs: null,
+      title: "test-page",
+      vanity_label: null,
+      path: "test-page",
+      type: "page",
+      template: "default",
+      extra_fields: [],
+      banner: null,
+      featured_image: null,
+      canonical_url: null,
+      canonical_url_page_id: null,
+      status: "active",
+      page_group_id: null,
+      page_group_combined: 0,
+      page_group_custom_items: null,
+    },
+    99408: {
+      id: 99408,
+      market_id: 67,
+      updated_at: "2021-12-08",
+      created_at: "2021-12-08 16:15:50",
+      template_id: 97,
+      page_hreflang_group_id: null,
+      page_hreflang_combined: 0,
+      relation_id: 0,
+      relation_type: "page",
+      market: "es_es",
+      region_code: null,
+      author: null,
+      hard_coded_breadcrumbs: 0,
+      breadcrumb_ids: null,
+      categories: [],
+      author_id: null,
+      style_id: null,
+      language: "es",
+      description: null,
+      meta_title: null,
+      meta_robots: null,
+      robot_options: {
+        page_index: 0,
+        links_followed: 0,
+        images_index: 0,
+        show_snippet: 0,
+      },
+      meta_description: null,
+      seo_keywords: null,
+      seo_raw_js: "",
+      seo_json_schema: null,
+      seo_json_schemas: [],
+      page_custom_hreflangs: null,
+      title: "test-page",
+      vanity_label: null,
+      path: "test-page",
+      type: "page",
+      template: "default",
+      extra_fields: [],
+      banner: null,
+      featured_image: null,
+      canonical_url: null,
+      canonical_url_page_id: null,
+      status: "active",
+      page_group_id: null,
+      page_group_combined: 0,
+      page_group_custom_items: null,
+    },
+  },
+};

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

@@ -0,0 +1,283 @@
+export default {
+  site_markets: { za_en: [] },
+  pages: {
+    99408: {
+      id: 99408,
+      market_id: 67,
+      updated_at: "2021-12-08",
+      created_at: "2021-12-08 16:15:50",
+      template_id: 97,
+      page_hreflang_group_id: null,
+      page_hreflang_combined: 0,
+      relation_id: 0,
+      relation_type: "page",
+      market: "za_en",
+      region_code: null,
+      author: null,
+      hard_coded_breadcrumbs: 0,
+      breadcrumb_ids: null,
+      categories: [],
+      author_id: null,
+      style_id: null,
+      language: "en",
+      description: null,
+      meta_title: null,
+      meta_robots: null,
+      robot_options: {
+        page_index: 0,
+        links_followed: 0,
+        images_index: 0,
+        show_snippet: 0,
+      },
+      meta_description: null,
+      seo_keywords: null,
+      seo_raw_js: "",
+      seo_json_schema: null,
+      seo_json_schemas: [],
+      page_custom_hreflangs: null,
+      title: "404 Page",
+      vanity_label: null,
+      path: "404",
+      type: "page",
+      template: "default",
+      extra_fields: [],
+      banner: null,
+      featured_image: null,
+      canonical_url: null,
+      canonical_url_page_id: null,
+      status: "active",
+      page_group_id: null,
+      page_group_combined: 0,
+      page_group_custom_items: null,
+      sections: {
+        navigation: null,
+        header: null,
+        main: null,
+        links: null,
+        site_markets: { za_en: [] },
+        pages: {
+          en: {
+            page: {
+              404: {
+                za_en: {
+                  id: 99408,
+                  market_id: 67,
+                  updated_at: "2021-12-08",
+                  created_at: "2021-12-08 16:15:50",
+                  template_id: 97,
+                  page_hreflang_group_id: null,
+                  page_hreflang_combined: 0,
+                  relation_id: 0,
+                  relation_type: "page",
+                  market: "za_en",
+                  region_code: null,
+                  author: null,
+                  hard_coded_breadcrumbs: 0,
+                  breadcrumb_ids: null,
+                  categories: [],
+                  author_id: null,
+                  style_id: null,
+                  language: "en",
+                  description: null,
+                  meta_title: null,
+                  meta_robots: null,
+                  robot_options: {
+                    page_index: 0,
+                    links_followed: 0,
+                    images_index: 0,
+                    show_snippet: 0,
+                  },
+                  meta_description: null,
+                  seo_keywords: null,
+                  seo_raw_js: "",
+                  seo_json_schema: null,
+                  seo_json_schemas: [],
+                  page_custom_hreflangs: null,
+                  title: "404 Page",
+                  vanity_label: null,
+                  path: "404",
+                  type: "page",
+                  template: "default",
+                  extra_fields: [],
+                  banner: null,
+                  featured_image: null,
+                  canonical_url: null,
+                  canonical_url_page_id: null,
+                  status: "active",
+                  page_group_id: null,
+                  page_group_combined: 0,
+                  page_group_custom_items: null,
+                  sections: {
+                    navigation: null,
+                    header: null,
+                    main: null,
+                    links: null,
+                    footer: null,
+                    popup: null,
+                    footer_navigation: null,
+                  },
+                },
+              },
+            },
+          },
+        },
+        footer: null,
+        popup: null,
+        footer_navigation: null,
+      },
+    },
+  },
+  market_sections: {
+    za_en: {
+      footer: {
+        extra_fields: {
+          logos: {
+            value: "339",
+            type: "menu",
+          },
+          links: {
+            value: "340",
+            type: "menu",
+          },
+          social_icons: {
+            value: "341",
+            type: "menu",
+          },
+          copyright_disclaimer: {
+            value:
+              '<p ><br><a href="https://www.dmca.com/Protection/Status.aspx?ID=c33e0a2a-0b14-4cba-bb31-194e23738540&amp;refurl=https://www.playcasino.co.za" target="_blank" title="DMCA Compliance information for playcasino.co.za"></a><a href="https://responsiblegambling.org.za/" target="_blank"></a>Advertising Disclosure: <a href="https://www.playcasino.co.za/">Playcasino.co.za</a> contains paid links to our partner affiliates. If a user visiting our site clicks on any of these paid links and makes a purchase from our partner, Playcasino.co.za will get paid a commission.</p><p>© PlayCasino All rights reserved</p><p>Marketing Performance Media Limited BVI Company number: 2028811 </p>',
+            type: "html",
+          },
+        },
+        modules: [],
+      },
+      navigation: {
+        extra_fields: [],
+        modules: [
+          {
+            menu_id: 337,
+            menu_short_code: "main_menu",
+            module_value_id: 213604,
+            name: "menu",
+          },
+          {
+            value: "14076",
+            type: null,
+            module_value_id: 213608,
+            name: "bonus",
+            anchored: 0,
+            anchor_label: null,
+            anchor_slug: null,
+            module_title:
+              "R500 Free No Deposit Bonus (Code: 500FM) + 500% up to R15,000",
+            module_title_tag: null,
+            background_color: null,
+            style: null,
+            style_id: null,
+            see_more_link: {
+              type: "page",
+              value: null,
+              title: null,
+            },
+          },
+        ],
+      },
+    },
+  },
+  prefilled_market_modules: {
+    post_main: {
+      1059: {
+        title: "More casino reviews",
+        link_label: null,
+        link_value: null,
+        model_type: "operator",
+        display_input: "automatic",
+        display_type: "default",
+        sort_by: "random",
+        sort_order: "ascending",
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1059,
+        name: "cards",
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: "More Casino Reviews",
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: {
+          type: "page",
+          value: null,
+          title: null,
+        },
+      },
+      1061: {
+        title: "More slots reviews",
+        link_label: null,
+        link_value: null,
+        model_type: "game",
+        display_input: "automatic",
+        display_type: "default",
+        sort_by: "created_at",
+        sort_order: "ascending",
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1061,
+        name: "cards",
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: "More Game Reviews",
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: {
+          type: "page",
+          value: null,
+          title: null,
+        },
+      },
+      1063: {
+        title: "Latest news",
+        link_label: null,
+        link_value: null,
+        model_type: "article",
+        display_input: "automatic",
+        display_type: "default",
+        sort_by: "created_at",
+        sort_order: "ascending",
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1063,
+        name: "cards",
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: null,
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: null,
+      },
+    },
+  },
+};