gatsby-core-theme 22.0.4 → 22.0.6

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [22.0.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v22.0.5...v22.0.6) (2023-05-31)
+
+
+### Bug Fixes
+
+* add free-casinos as well ([b36474e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b36474e236aaa2c3cb6156ab6b127b3f2361b9a3))
+* multiple market bugs ([9ea03b7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9ea03b74137c9ea5013cb68467623698040ac89a))
+* multiple market bugs ([caf25e3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/caf25e31d2d664e727092c3c085dfab59e86b857))
+
+
+* Merge branch 'tm-3473-multiple-market-fixes' into 'master' ([37556d3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/37556d3ab485fc89c32b46391c7a16839049ad58))
+* Merge branch 'bug-fix-request-add-not-recommended' into 'master' ([27b345b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/27b345bdda19e4151c82edb7377a176b0894fc44))
+
+## [22.0.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v22.0.4...v22.0.5) (2023-05-18)
+
+
+### Bug Fixes
+
+* add not recommended to the cardsv2 filter constant ([09475f7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/09475f7ad3c6043220f975dacfd0126514859da4))
+* preview, translations and menu item fixes ([3ed8ba5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3ed8ba5c25dfa7ae6fa041adbacf26e788ce190b))
+
+
+* Merge branch 'tm-3461-preview-translations-menu' into 'master' ([635247b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/635247baf344c467106d5c97fc6af9e919e4cd70))
+* Merge branch 'bug-fix-request-add-not-recommended' into 'master' ([a0e8d09](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a0e8d090bd6cff242002e164e6ac7fc43f139db0))
+
 ## [22.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v22.0.3...v22.0.4) (2023-05-17)
 
 

package/gatsby-node.esm.js

@@ -257,7 +257,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           siteInfo,
           autogenerated,
           siteSchema,
-          translations,
+          translations: processed.relations.translations[page.language],
           authors,
           ...themeOptions,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "22.0.4",
+  "version": "22.0.6",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/app.js

@@ -18,6 +18,7 @@ const App = ({ pageContext }) => {
     getPreview(
       pageContext.siteName,
       !staticPath ? searchParams.get('path') || '/' : staticPath,
+      searchParams.get('market_id'),
       pageContext
     ).then((previewResponse) => {
       if (previewResponse.page) {
@@ -39,12 +40,12 @@ const App = ({ pageContext }) => {
         window.location = `${window.location.origin}/preview?path=/`;
       }
       getData(searchParams);
-      globalHistory.listen(({ location }) => {
-        const searchParams2 =
-          typeof window !== 'undefined' ? new URLSearchParams(location.search) : null;
-        setIsLoading(true);
-        window.location = `${window.location.origin}/preview?path=${searchParams2.get('path')}`;
-      });
+      // globalHistory.listen(({ location }) => {
+      //   const searchParams2 =
+      //     typeof window !== 'undefined' ? new URLSearchParams(location.search) : null;
+      //   setIsLoading(true);
+      //   window.location = `${window.location.origin}/preview?path=${searchParams2.get('path')}&market_id=${searchParams2.get('market_id')}`;
+      // });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

package/src/components/atoms/breadcrumbs/breadcrumbs.test.js

@@ -4,7 +4,7 @@ import '@testing-library/jest-dom/extend-expect';
 
 import getPageData from '~tests/factories/pages/default.factory';
 import MainProvider from '~context/MainProvider';
-import Breadcrumbs from '.';
+import Breadcrumbs from './index';
 
 function renderComponent(pageData) {
   return render(
@@ -72,6 +72,15 @@ describe('Show Breadcrumbs in a page', () => {
     const { getByText } = renderComponent(page);
     expect(getByText('Simple Casino')).toBeTruthy();
   });
+  test('Breadcrumbs with multiple markets', () => {
+    const data = getPageData();
+    const { getByText } = render(
+      <Breadcrumbs page={data} markets={{ en_za: { path_prefix: 'en' } }} />
+    );
+    expect(getByText('The Page Title')).toBeTruthy();
+    expect(getByText('Home').getAttribute('href')).toEqual('/en');
+    expect(getByText('Sport').getAttribute('href')).toEqual('/sport');
+  });
 });
 afterEach(() => {
   cleanup();

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

@@ -8,8 +8,9 @@ import keygen from '~helpers/keygen';
 import { translate } from '~helpers/getters';
 import { Context } from '~context/MainProvider';
 
-function Breadcrumbs({ page, separator = <span> / </span> }) {
+function Breadcrumbs({ page, separator = <span> / </span>, markets }) {
   const { translations } = useContext(Context) || {};
+  const activeMarket = markets && markets[page.market];
 
   if (page.path === '/') {
     return <></>;
@@ -29,7 +30,11 @@ function Breadcrumbs({ page, separator = <span> / </span> }) {
         {isPPC ? (
           home
         ) : (
-          <Link to="/" title="Home" className="breadcrumbs-gtm">
+          <Link
+            to={(activeMarket && activeMarket.path_prefix) || '/'}
+            title="Home"
+            className="breadcrumbs-gtm"
+          >
             {home}
           </Link>
         )}
@@ -55,7 +60,11 @@ function Breadcrumbs({ page, separator = <span> / </span> }) {
 }
 
 Breadcrumbs.propTypes = {
+  markets: PropTypes.shape({
+    path_prefix: PropTypes.string,
+  }),
   page: PropTypes.shape({
+    market: PropTypes.string,
     title: PropTypes.string,
     path: PropTypes.string,
     breadcrumbs: PropTypes.arrayOf(PropTypes.shape({})),

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

@@ -59,7 +59,7 @@ function Header({ section, content = null, backgroundImage = true, showAuthor =
         }`}
       >
         <div className={styles.topSection || ''}>
-          {section.page.path && <Breadcrumbs page={section.page} />}
+          {section.page.path && <Breadcrumbs markets={section.allMarkets} page={section.page} />}
           {Author && (
             <div className={styles.authorContainer || ''}>
               <Author
@@ -90,6 +90,7 @@ function Header({ section, content = null, backgroundImage = true, showAuthor =
 Header.propTypes = {
   content: PropTypes.element,
   section: PropTypes.shape({
+    allMarkets: PropTypes.shape([PropTypes.shape({})]),
     page: PropTypes.shape({
       template: PropTypes.string,
       relation_type: PropTypes.string,

package/src/constants/settings.js

@@ -15,7 +15,9 @@ export default {
     'norskespilleautomater.com': ['inactive', 'blacklisted', 'coming_soon'],
     'playcasino.co.za': ['inactive', 'blacklisted', 'coming_soon'],
     'onlinegamblingsa.co.za': ['inactive', 'blacklisted', 'coming_soon'],
-    'onlinegamblingsa.com': ['inactive', 'blacklisted', 'coming_soon'],
+    'onlinegamblingsa.com': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
+    'onlinecasinosouthafrica.net': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
+    'free-casinos.co.za': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
     'sporttheme.com': ['inactive', 'blacklisted'],
     'partnerships.gigmedia.com': ['inactive', 'blacklisted'],
     'habibibet.org': ['inactive', 'blacklisted'],

package/src/helpers/api.js

@@ -6,25 +6,27 @@ const API_URL = process.env.GATSBY_API_URL;
 
 /* eslint no-console: ["error", { allow: ["log"] }] */
 
-export async function getPreview(siteName, page = null, themeOptions) {
+export async function getPreview(siteName, page = null, marketId, themeOptions) {
   return new Promise((resolve, reject) => {
     axios
       .get(
-        `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}&path=${page}&preview=1&relations=1`
+        `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}&path=${page}&market_id=${marketId}&preview=1&relations=1`
       )
       .then((response) => {
         console.log(response);
+        const pagePreview = response.data.result.pages.preview;
         const processed = processor.run(response.data.result, themeOptions);
-        const siteMarket = Object.keys(processed.site_markets)[0];
 
-        const pagePreview = processed.pages[siteMarket].preview[0];
-        const pagePreviewProcessed = processed.pages[siteMarket][pagePreview.relation_type].find(
-          (page) => page.path === pagePreview.path
-        );
+        const { path } = processed.pages[pagePreview.market].preview[0];
+
+        const pagePreviewProcessed = processed.pages[pagePreview.market][
+          pagePreview.relation_type
+          // eslint-disable-next-line no-shadow
+        ].find((page) => page.path === path);
 
         resolve({
-          marketSections: processed.market_sections[siteMarket],
-          prefilledModules: processed.prefilled_market_modules[siteMarket],
+          marketSections: processed.market_sections[pagePreview.market],
+          prefilledModules: processed.prefilled_market_modules[pagePreview.market],
           page: pagePreviewProcessed,
           allMarkets: processed.site_markets,
           siteInfo: processed.general,

package/src/helpers/path.js

@@ -8,7 +8,9 @@ export function previewFormat(path) {
 }
 
 export function previewPath(path) {
-  return `/preview?path=${previewFormat(path)}`;
+  // eslint-disable-next-line no-restricted-globals
+  const searchParams2 = typeof window !== 'undefined' ? new URLSearchParams(location.search) : null;
+  return `/preview?path=${previewFormat(path)}&market_id=${searchParams2.get('market_id')}`;
 }
 
 export function formatPath(path) {

package/src/helpers/path.test.js

@@ -26,13 +26,13 @@ describe('Path format component', () => {
     const path = previewPath('/test/link');
     expect(typeof path).toEqual('string');
 
-    expect(path).toBe('/preview?path=test/link');
+    expect(path).toBe('/preview?path=test/link&market_id=null');
   });
 
   test('preview mode path navigation keep no initial / on path param', () => {
     const path = previewPath('test/link');
 
     expect(typeof path).toEqual('string');
-    expect(path).toBe('/preview?path=test/link');
+    expect(path).toBe('/preview?path=test/link&market_id=null');
   });
 });

package/src/helpers/processor/common.js

@@ -116,3 +116,17 @@ export function removeCurrentPage(list, id) {
   }
   return list;
 }
+
+export function updateMenuPrefixPath(menu, prefixPath) {
+  menu.map((item) => {
+    if (item.value) {
+      item.value = item.value === '/' ? prefixPath : `${prefixPath}/${item.value}`;
+    }
+
+    if (item.children) {
+      updateMenuPrefixPath(item.children, prefixPath);
+    }
+
+    return true;
+  });
+}

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

@@ -1,4 +1,10 @@
-import { groupBy, removeDuplicates, clonePageForCards, removeCurrentPage } from './common';
+import {
+  groupBy,
+  removeDuplicates,
+  clonePageForCards,
+  removeCurrentPage,
+  updateMenuPrefixPath,
+} from './common';
 import getPageDataList from '~tests/factories/pages/list.factory';
 
 describe('Common Helper', () => {
@@ -30,4 +36,54 @@ describe('Common Helper', () => {
     const result = removeCurrentPage(data, 2);
     expect(result.id === 2).toBeFalsy();
   });
+
+  test('menu update function', () => {
+    const data = [
+      {
+        value: 'test',
+        children: [
+          {
+            value: 'null',
+          },
+          {
+            value: 'test3',
+            children: [
+              {
+                value: 'test4',
+                children: [
+                  {
+                    value: 'test5',
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            value: 'test6',
+          },
+        ],
+      },
+      {
+        value: 'test3',
+        children: [
+          {
+            value: 'test4',
+            children: [
+              {
+                value: 'test5',
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    updateMenuPrefixPath(data, 'prefix/');
+    data.map((menuItem) => {
+      if (menuItem.value) {
+        expect(menuItem.value).toContain('prefix/');
+      }
+      return true;
+    });
+  });
 });

package/src/helpers/processor/index.js

@@ -14,7 +14,7 @@ import { generatePlaceholderString } from '../generators';
 // eslint-disable-next-line import/no-cycle
 import { shouldSavePrefilled, processModule } from './modules';
 // eslint-disable-next-line import/no-cycle
-import { clonePageForCards, groupBy, removeTags } from './common';
+import { clonePageForCards, groupBy, removeTags, updateMenuPrefixPath } from './common';
 import { prepareSportsData, addSportsDataToPage, addExtraFieldsToShowcaseEvents } from './sports';
 import { processRelations } from './relations';
 import { zeroPadding } from '../schedule';
@@ -96,7 +96,7 @@ export function transform(response) {
 }
 
 const savedModules = {};
-export function processSections(sections, skipPost = false, page, translations) {
+export function processSections(sections, skipPost = false, page, translations, markets) {
   const siteName = page && page.siteInfo && page.siteInfo.site_name;
   // pagedId we will use it just on operator review pages
   const pageId = page ? page.id : null;
@@ -127,7 +127,8 @@ export function processSections(sections, skipPost = false, page, translations)
             previewMode,
             pageId,
             translations,
-            relationData
+            relationData,
+            markets
           );
 
           if (shouldSavePrefilled(module, siteName)) {
@@ -255,10 +256,22 @@ export default {
       sportsData = prepareSportsData(data.relations.sports_data);
     }
 
+    menus = data.menus;
+
+    // Menu changes when there is a path prefix configured on hercules
+    Object.keys(menus).forEach((menu) => {
+      if (data.site_markets[menus[menu].market].path_prefix) {
+        updateMenuPrefixPath(
+          menus[menu].children,
+          data.site_markets[menus[menu].market].path_prefix
+        );
+      }
+    });
+
     Object.keys(data.site_markets).forEach((market) => {
       relations = data.relations;
       pages = transformedPages[market];
-      menus = data.menus;
+
       prefilledMarketModules = data.prefilled_market_modules || {};
       prefilledMarketModulesRaw = cloneDeep(data.prefilled_market_modules);
       Object.keys(transformedPages[market]).forEach((pageType) => {
@@ -290,7 +303,13 @@ export default {
           if (pageBreadcrumbIds) {
             let breadcrumbsArray = [];
             for (let i = 0; i < pageBreadcrumbIds.length; i += 1) {
-              breadcrumbsArray = [...breadcrumbsArray, ...data.breadcrumbs[pageBreadcrumbIds[i]]];
+              const breadcrumbData = cloneDeep(data.breadcrumbs[pageBreadcrumbIds[i]]);
+
+              if (data.site_markets[market].path_prefix) {
+                breadcrumbData[0].path = `${data.site_markets[market].path_prefix}/${breadcrumbData[0].path}`;
+              }
+
+              breadcrumbsArray = [...breadcrumbsArray, ...breadcrumbData];
             }
             transformedPages[market][pageType][index].breadcrumbs = breadcrumbsArray;
           }
@@ -406,7 +425,8 @@ export default {
           data.market_sections[market],
           true,
           null,
-          translations
+          translations,
+          data.site_markets
         );
       }
 
@@ -433,7 +453,13 @@ export default {
               });
 
               transformedPages[market][pageType][index] = Object.assign(page, {
-                sections: processSections(page.sections, false, page, translations),
+                sections: processSections(
+                  page.sections,
+                  false,
+                  page,
+                  translations,
+                  data.site_markets
+                ),
               });
             }
           });

package/src/helpers/processor/modules.js

@@ -265,7 +265,7 @@ export function processArchiveModule(module, pages) {
   module.numOfPages = 1;
 }
 
-export function processTopListModule(module, relations, pages) {
+export function processTopListModule(module, relations, pages, markets) {
   module.items = module.items.map((listItem) => {
     listItem.items = listItem.items.map((item) => {
       // Remove the ribbons if are empty, will be add ribbons from operator
@@ -282,6 +282,18 @@ export function processTopListModule(module, relations, pages) {
         clone.authorPath =
           operatorPage[0].author.profile_page_path && operatorPage[0].author.profile_page_path;
       }
+
+      // Multiple market fix
+      if (
+        item.review_link &&
+        operatorPage.length >= 1 &&
+        markets &&
+        markets[operatorPage[0].market] &&
+        markets[operatorPage[0].market].path_prefix
+      ) {
+        item.review_link = `${markets[operatorPage[0].market].path_prefix}/${item.review_link}`;
+      }
+
       delete clone.software;
       delete clone.bonus.deposit_methods;
       return Object.assign(clone, item);
@@ -309,7 +321,8 @@ export function processModule(
   previewMode,
   pageId,
   translations,
-  relationData
+  relationData,
+  markets
 ) {
   module.module_title =
     module.module_title &&
@@ -326,7 +339,7 @@ export function processModule(
   } else if (module.name === 'archive' && previewMode) {
     processArchiveModule(module, pages);
   } else if (module.name === 'top_list') {
-    processTopListModule(module, relations, pages);
+    processTopListModule(module, relations, pages, markets);
   } else if (module.name === 'menu' && menus && menus[module.menu_id]) {
     module = Object.assign(module, menus[module.menu_id]);
   }

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

@@ -172,6 +172,23 @@ describe('Modules Helper', () => {
     expect(singleToplistData.items[0].items[0].bonus.deposit_methods).toHaveLength(1);
   });
 
+  test('Process TopList module multiple market', () => {
+    processTopListModule(
+      singleToplistData,
+      relationData,
+      {
+        operator: [{ relation_id: 6342, market: 'en_za' }],
+      },
+      { en_za: { path_prefix: 'en' } }
+    );
+
+    expect(singleToplistData.items[0].items[0].review_link).toEqual('en/slotum');
+    expect(singleToplistData.items[0].items[0].rating_casino).toEqual('4');
+    expect(singleToplistData.items[0].items[0].selling_points).toHaveLength(2);
+    expect(singleToplistData.items[0].items[0].short_name).toEqual('slotum');
+    expect(singleToplistData.items[0].items[0].bonus.deposit_methods).toHaveLength(1);
+  });
+
   test('Should Generate Prefilled', () => {
     const objects = objectsHolder('prefilledModules');
     objects.forEach((prefilled) => {

package/src/hooks/link/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Link } from 'gatsby';
-import { navigate } from '@reach/router';
 import PropTypes from 'prop-types';
 import { previewFormat, previewPath, formatPath } from '~helpers/path';
 
@@ -30,7 +29,7 @@ function LinkCustom({
           {...other}
           onClick={(event) => {
             event.preventDefault();
-            navigate(previewPath(to));
+            window.location = previewPath(to);
           }}
         >
           {children}

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

@@ -439,7 +439,7 @@ export const singleToplistData = {
           short_name: 'slotum',
           logo_url: 'slotum-casino-logo-transparentpng6b10407566-original.png',
           rating: '4',
-          review_link: '/slotum',
+          review_link: 'slotum',
           selling_points: ['200% Bonus', 'Nice design'],
           links: {
             main: 'https://media.dunderaffiliates.com/redirect.aspx?pid=630524&bid=1477',

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

@@ -8,6 +8,7 @@ export default function getPageData() {
     title: 'The Page Title',
     relation_type: 'operator',
     type: 'operator',
+    market: 'en_za',
     name: 'Rizk Casino',
     logo_url: '#',
     banner: '313df295c19d7c5f137ceda9d0cc5df7.jpeg',