gatsby-core-theme 22.0.3 → 22.0.5

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### Bug Fixes
+
+* rage seo ([d0ada4c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d0ada4c34ffde6d3367646d408de047d9214467a))
+* rage-seo error ([c35ccb7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c35ccb788af9e4b5ce37853a094319fac9ff150a))
+
+
+* Merge branch 'rage-seo-fix' into 'master' ([086c818](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/086c8184cc4b012222c9cb427e3aec1914cfef20))
+
 ## [22.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v22.0.2...v22.0.3) (2023-05-16)
 
 

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.3",
+  "version": "22.0.5",
   "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/constants/settings.js

@@ -15,7 +15,8 @@ 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'],
     '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,15 @@ export function removeCurrentPage(list, id) {
   }
   return list;
 }
+
+export function updateMenuPrefixPath(menu, prefixPath) {
+  menu.map((item) => {
+    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,52 @@ describe('Common Helper', () => {
     const result = removeCurrentPage(data, 2);
     expect(result.id === 2).toBeFalsy();
   });
+
+  test('menu update function', () => {
+    const data = [
+      {
+        value: 'test',
+        children: [
+          {
+            value: 'test2',
+          },
+          {
+            value: 'test3',
+            children: [
+              {
+                value: 'test4',
+                children: [
+                  {
+                    value: 'test5',
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            value: 'test6',
+          },
+        ],
+      },
+      {
+        value: 'test3',
+        children: [
+          {
+            value: 'test4',
+            children: [
+              {
+                value: 'test5',
+              },
+            ],
+          },
+        ],
+      },
+    ];
+
+    updateMenuPrefixPath(data, 'prefix/');
+    data.map((menuItem) => {
+      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';
@@ -255,10 +255,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) => {
@@ -313,6 +325,7 @@ export default {
 
           // add responsible gaming to pages
           const gamingIds =
+            data.relations.dms_affiliate_settings.markets_data &&
             data.relations.dms_affiliate_settings.markets_data[market] &&
             data.relations.dms_affiliate_settings.markets_data[market].responsible_gaming_ids
               ? data.relations.dms_affiliate_settings.markets_data[market].responsible_gaming_ids