gatsby-core-theme 40.0.36 → 40.0.38

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [40.0.38](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.37...v40.0.38) (2024-11-20)
+
+
+### Bug Fixes
+
+* betamerica issue ([3640184](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/36401841ab582b79273cfd9594523fc83059aff4))
+* preview ([67752fb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/67752fbafacfa464331a3936d20d8a1c80ac0f48))
+* search data json ([74b4bc3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/74b4bc36548c786305c82caae9e879c8a069fd5a))
+
+
+* Merge branch 'market-issue' into 'master' ([c343693](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c3436931dfb8416d7ca26889058d54e65be7c189))
+
+## [40.0.37](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.36...v40.0.37) (2024-11-18)
+
+
+### Bug Fixes
+
+* remove trim from anchor ([5866c2c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5866c2cb7bf966b3b83d635cdba89849c4331e5b))
+
 ## [40.0.36](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.35...v40.0.36) (2024-11-14)
 
 

package/package.json

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

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

@@ -42,7 +42,7 @@ function Anchor({
     return {
       id: `${
         anchor.label &&
-        removeSymbols(anchorLink(anchor?.label?.toLowerCase().trim()))
+        removeSymbols(anchorLink(anchor?.label?.toLowerCase()))
       }`,
       label: anchor.label,
       slug: `${

package/src/helpers/processor/index.mjs

@@ -88,33 +88,34 @@ export function processSitemapPages(pages, markets) {
   return pageListByMarket;
 }
 
-const groupByLanguageAndType = (data) => Object.values(data).reduce((acc, item) => {
-    const lang = item.language;
+const groupByMarketAndType = (data) => Object.values(data).reduce((acc, item) => {
+    const market = item.market;
     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] = [];
+    if (!acc[market]) acc[market] = {};
+    if (!acc[market][type]) acc[market][type] = [];
 
     // Add the item to the appropriate group
-    acc[lang][type].push(item);
+    acc[market][type].push(item);
     return acc;
   }, {});
 
 export function transform(response) {
   const transformed = {};
 
-  const pages = groupByLanguageAndType(response.pages);
+  const pages = groupByMarketAndType(response.pages);
+
 
   Object.keys(response.site_markets).forEach((siteMarket) => {
-    const language = siteMarket.split("_")[1];
+    const market = siteMarket
     transformed[siteMarket] = {};
 
-    if (pages[language]) {
-      Object.keys(pages[language]).forEach((pageType) => {
+    if (pages[market]) {
+      Object.keys(pages[market]).forEach((pageType) => {
         transformed[siteMarket][pageType] = [];
-        Object.keys(pages[language][pageType]).forEach((pageId) => {
-          const page = pages[language][pageType][pageId];
+        Object.keys(pages[market][pageType]).forEach((pageId) => {
+          const page = pages[market][pageType][pageId];
 
           if (response.site_markets[siteMarket].path_prefix && page) {
             // set page prefix for multiple markets
@@ -279,6 +280,7 @@ export function processExtraFields(
     return;
   }
   Object.keys(extraFields).forEach((key) => {
+   if (key && extraFields[key]) {
     const { type, value } = extraFields[key];
 
     if (type === "operator") {
@@ -300,6 +302,7 @@ export function processExtraFields(
     } else {
       extraFields[key] = value;
     }
+    }
   });
 }
 
@@ -554,10 +557,6 @@ export default {
         });
       });
 
-      if (searchEnabled) {
-        processSearchData(searchData, fs);
-      }
-
       pagesCloned = cloneDeep(transformedPages[market]);
 
       // fill market sections
@@ -603,6 +602,10 @@ export default {
       }
     });
 
+    if (searchEnabled) {
+      processSearchData(searchData, fs);
+    }
+
     data.pages = transformedPages;
     const end = new Date() - start;
     console.log(

package/src/helpers/server-data.js

@@ -4,37 +4,38 @@
 import loadSource from '~helpers/search-source';
 import { deparam } from '~helpers/strings';
 import { groupBy } from '~helpers/getters';
-import {getData} from '~helpers/api'
+import { getData } from '~helpers/api'
 import processor from "./processor/index.mjs";
 import { fetchSiteSettings } from './fetch-site-settings.mjs';
- 
-export async function getAPIData(page, url, headers, preview) {  
+
+export async function getAPIData(page, url, headers, preview) {
   if (preview) {
     try {
-      const siteName = process.env.GATSBY_SITE_NAME;      
+      const siteName = process.env.GATSBY_SITE_NAME;
       const params = deparam(url.split('?')[1]);
       // eslint-disable-next-line camelcase
       const response = await getData(siteName, params?.path, params?.market_id, true);
-       const {siteSettingsData, siteGeneralData, responsableGamingData, toplistData, contentData, ribbonsData} = await fetchSiteSettings(siteName, true);
-       
+      const { siteSettingsData, siteGeneralData, responsableGamingData, toplistData, contentData, ribbonsData } = await fetchSiteSettings(siteName, true);
+
       const pagePreview = response.pages.preview;
-     
+
       const processed = processor.run({
         ...response,
         siteSettingsData,
         general: siteGeneralData,
-        prefilled_market_modules:siteSettingsData.prefilled_modules,
+        prefilled_market_modules: siteSettingsData.prefilled_modules,
         responsible_gamings: responsableGamingData,
         toplists: toplistData,
         content: contentData,
         ribbons: ribbonsData
-      },{}, null, null, true);
- 
+      }, {}, null, null, true);
+
+
       const pagePreviewProcessed = processed.pages[pagePreview.market][
         pagePreview.relation_type
         // eslint-disable-next-line no-shadow
-      ].find((page) => page.path === params?.path);
-           
+      ][0]
+
       return {
         props: {
           marketSections: processed.market_sections[pagePreview.market],
@@ -49,23 +50,23 @@ export async function getAPIData(page, url, headers, preview) {
       console.log("Error fetching preview data:", error);
     }
   }
- 
+  
   const results = await loadSource(page.market);
   if (page.path.endsWith('/s') || page.path === 's') {
     let urlParams = null;
     if (url && url.split('?').length === 2) {
       urlParams = deparam(`${url.split('?')[1]}`);
     }
- 
+
     const searchData = urlParams
       ? urlParams.hasOwnProperty('s')
         ? groupBy(
-            results.filter((item) => item.title.toLowerCase().includes(urlParams.s.toLowerCase())),
-            'type'
-          )
+          results.filter((item) => item.title.toLowerCase().includes(urlParams.s.toLowerCase())),
+          'type'
+        )
         : null
       : null;
- 
+
     return {
       props: {
         data: searchData,
@@ -73,10 +74,10 @@ export async function getAPIData(page, url, headers, preview) {
       },
     };
   }
- 
+
   const res = await fetch(`https://random-data-api.com/api/appliance/random_appliance/`);
   const data = await res.json();
- 
+
   return {
     props: data.equipment,
   };