gatsby-core-theme 41.1.15 → 41.1.17

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [41.1.17](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.16...v41.1.17) (2025-01-03)
+
+
+### Bug Fixes
+
+* resolve conflicts ([500e726](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/500e726aab2504fe86e3359946791018137fb77e))
+* sitemap advanced ([89efde7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/89efde77f7f1e9100553697ce013dc39633caf8b))
+* sitemap by page type ([8839924](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8839924d6412c9a048f19e604f73fe2f213bb2b2))
+* typo ([46cbaf2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/46cbaf2266c5cdcdff76f12efce6a72b2b2bab81))
+
+
+* Merge branch 'tm-5013-sitemap-page-type' into 'master' ([aa26169](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/aa26169d8fa745da46a80cbcfff88047818e3180))
+* Merge branch 'master' into tm-5013-sitemap-page-type ([3ba402f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3ba402f94112ff22d33bfef2b094df51fb93ea80))
+
+## [41.1.16](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.15...v41.1.16) (2025-01-03)
+
+
+### Bug Fixes
+
+* deploy user ([b634f7e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b634f7eff91ef67d2005da557464c4a2850a7744))
+* deploy user ([5211f50](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5211f507098ff840c9c07d3250b05f07a4a52061))
+* deploy user ([8c2fe8b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8c2fe8b1212f5465fd450691bd37665534cc612e))
+
+
+### Code Refactoring
+
+* changes to adding an anchor for operator review summary ([2551c2e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2551c2e85173d6c45a3f7ffb76fca92153008c56))
+
+
+* Merge branch 'tm-5018-anchor-operator-review-summary' into 'master' ([085235a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/085235a1e25deb9c5c1c66556425e13ee6086482))
+
 ## [41.1.15](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.14...v41.1.15) (2024-12-27)
 
 

package/gatsby-node.mjs

@@ -385,8 +385,8 @@ export const createPages = async (
       const tracker = trackerLinks.map((key) =>
         operator.links[key]
           ? generateTrackerLink(operator, key, false, pageTemplate)
-              .toLowerCase()
-              .replace(" ", "_")
+            .toLowerCase()
+            .replace(" ", "_")
           : null
       );
       const marketOperator = operator.market.match(/_(\w+)/)[1];
@@ -544,12 +544,19 @@ export const sourceNodes = async ({
     });
   });
 
-  // eslint-disable-next-line array-callback-return
-  Object.keys(pagesData).map((pageId) => {
+  // Create SitemapGroup + page type 
+  Object.keys(pagesData).forEach((pageId) => {
     const page = pagesData[pageId];
+
     if (page && page.robot_options && page.robot_options.page_index) {
+      const pathPrefix = allMarketsData[page.market].path_prefix
+        ? `${allMarketsData[page.market].path_prefix}/`
+        : null;
+
+      const path = `${pathPrefix || '' }${page.path === '/' && pathPrefix ? '' : page.path}`;
+
       const pageSitemap = {
-        path: page.path,
+        path,
         updated_at: page.updated_at,
         market: page.market,
         language: page.language,
@@ -557,6 +564,19 @@ export const sourceNodes = async ({
       };
 
       const nodeMeta = {
+        id: createNodeId(`sitemap-${pageId}`),
+        parent: null,
+        children: [],
+        internal: {
+          type: `SitemapGroup${page.type.charAt(0).toUpperCase() + page.type.slice(1)}`,
+          contentDigest: createContentDigest(page),
+        },
+      };
+
+      const node = { ...pageSitemap, ...nodeMeta };
+      createNode(node);
+
+      const nodeMeta2 = {
         id: createNodeId(keygen()),
         parent: null,
         children: [],
@@ -566,11 +586,13 @@ export const sourceNodes = async ({
           contentDigest: createContentDigest(pageId),
         },
       };
-      const node = { ...pageSitemap, ...nodeMeta };
-      createNode(node);
+      const node2 = { ...pageSitemap, ...nodeMeta2 };
+      createNode(node2);
     }
   });
-};
+  
+}
+
 
 export const onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
   if (stage === "build-javascript") {

package/package.json

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

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { render, cleanup, fireEvent, screen } from '@testing-library/react';
-import { generatePlaceholderString } from '../../../helpers/generators';
+import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import { getSingleContentData } from '~tests/factories/modules/content.factory';
 import Content from '.';
@@ -29,7 +28,6 @@ describe('Content Component', () => {
   test('render content props', () => {
     const correctData = getSingleContentData('h4');
     const { container } = render(<Content module={correctData} />);
-    expect(container).toBeTruthy();
     expect(container.querySelectorAll('div.content')).toHaveLength(1);
 
     // HTML parse
@@ -164,7 +162,7 @@ describe('Content Component', () => {
     };
     const { container } = render(<Content module={iframeModule} />);
 
-    expect(container.querySelectorAll('iframe')).toBeTruthy();
+    expect(container.querySelectorAll('iframe')).toHaveLength(2);
   });
 
   test('test Show more content', () => {
@@ -213,17 +211,17 @@ describe('Content Component', () => {
       `,
     };
     const { container, getByText } = render(<Content module={iframeModule} />);
-    expect(getByText('show more test')).toBeTruthy();
+    expect(getByText('show more test')).toBeInTheDocument();
 
     const showMorebutton = container.querySelector('button');
     fireEvent.click(showMorebutton);
 
-    expect(getByText('More COntent test')).toBeTruthy();
+    expect(getByText('More COntent test')).toBeInTheDocument();
   });
 
   test('renders content with placeholder string for h2', () => {
     const { container } = render(<Content module={module} page={page} />);
-    expect(container.querySelector('h2')).toHaveTextContent(new Date().getFullYear());
+    expect(container.querySelector('h2')).toHaveTextContent('2024');
   });
 
   test('renders content without placeholder string for h2', () => {

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

@@ -41,14 +41,16 @@ function Anchor({
   let numberOfCharacters = 0;
   const anchorList = items.map((anchor) => {
     numberOfCharacters += anchor?.label?.length;
+    const generatedLabel = generatePlaceholderString(anchor?.label?.toLowerCase().trim(),null, page?.relation);
+
     return {
       id: `${
         anchor.label &&
-        removeSymbols(anchorLink(anchor?.label?.toLowerCase()))
+        removeSymbols(anchorLink(generatedLabel))
       }`,
-      label: anchor.label,
+      label: generatedLabel,
       slug: `${
-        anchor.label && anchorLink(anchor?.label?.toLowerCase().trim())
+        anchor.label && anchorLink(generatedLabel)
       }`,
     };
   });

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

@@ -67,7 +67,7 @@ describe('Index Processor', () => {
 
     processExtraFields(extraField);
 
-    expect(extraField.logos).toContain('2024');
+    expect(extraField.logos).toContain('2025');
   });
 
   test('processExtraFields text', () => {
@@ -77,7 +77,7 @@ describe('Index Processor', () => {
 
     processExtraFields(extraField);
 
-    expect(extraField.logos).toContain('2024');
+    expect(extraField.logos).toContain(new Date().getFullYear().toString());
   });
 
   test('processExtraFields operator', () => {

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

@@ -256,7 +256,7 @@ describe("Modules Helper", () => {
   test("Process Content function", () => {
     const module = contentPlaceholders;
     processContentModule(module, {}, {});
-    expect(module.value).toContain("2024");
-    expect(module.show_more_content).toContain("2024");
+    expect(module.value).toContain(new Date().getFullYear().toString());
+    expect(module.show_more_content).toContain(new Date().getFullYear().toString());
   });
 });