gatsby-core-theme 24.0.2 → 24.0.4

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [24.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.3...v24.0.4) (2023-07-11)
+
+
+### Bug Fixes
+
+* add categoryids we need for them in cards v2 module to filter cards ([5379774](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5379774c4b78cb16fc0aa2723e17d095a114050f))
+* fix bug ([5ca1006](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5ca10064d321eeba1890ef3ae63e07ef55c73e03))
+* fix bug for hreflangs ([b5327ef](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b5327ef42fba0730f822e044bc139907fb61060c))
+* splash screen operator name ([b044a45](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b044a45581c60cc5399aa798993382be9e731510))
+
+
+* Merge branch 'hreflangs' into 'master' ([c97602b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c97602bd5b7bbea64326724fecc5968b8d53e552))
+* Merge branch 'tm-3548-splash-screen' into 'master' ([74647fc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/74647fc48c55af1981601ff5ad65a79306ca6d6d))
+* Merge branch 'tm-3414-cards' into 'master' ([f380b1a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f380b1a9da7391292c1f3800a5eb0f1887d8acd6))
+
+## [24.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.2...v24.0.3) (2023-07-04)
+
+
+### Bug Fixes
+
+* make test for content ([c943167](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c943167615cb964d6edd5a5732b9c54c2df7be44))
+* validate if h2 isn't empty ([2b42f4b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2b42f4b83c93a15471191cd3464f1c06488eddec))
+
+
+* Merge branch 'fix-bug-placheloder' into 'master' ([5346c7b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5346c7b20a2163aa8b7f144c486ea168b4cb4d97))
+
 ## [24.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.1...v24.0.2) (2023-07-04)
 
 

package/package.json

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

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

@@ -1,10 +1,31 @@
 import React from 'react';
-import { render, cleanup, fireEvent } from '@testing-library/react';
+import { render, cleanup, fireEvent, screen } from '@testing-library/react';
+import { generatePlaceholderString } from '../../../helpers/generators';
 import '@testing-library/jest-dom/extend-expect';
 import { getSingleContentData } from '~tests/factories/modules/content.factory';
 import Content from '.';
 
 describe('Content Component', () => {
+  const page = {
+    siteInfo: {
+      site_name: 'My Site',
+    },
+    title: 'My Page',
+    relation: {
+      name: 'Page Relation',
+    },
+  };
+
+  const module = {
+    anchor_label: 'Anchor',
+    name: 'Module Name',
+    module_title: 'Module Title',
+    value: '<h2>[YEAR]</h2>',
+    style: 'default',
+    show_more_content: '<p>More content</p>',
+    show_more_enabled: '1',
+  };
+
   test('render content props', () => {
     const correctData = getSingleContentData('h4');
     const { container } = render(<Content module={correctData} />);
@@ -200,6 +221,17 @@ describe('Content Component', () => {
 
     expect(getByText('More COntent test')).toBeTruthy();
   });
+
+  test('renders content with placeholder string for h2', () => {
+    const { container } = render(<Content module={module} page={page} />);
+    expect(container.querySelector('h2')).toHaveTextContent('2023');
+  });
+
+  test('renders content without placeholder string for h2', () => {
+    module.value = '<h2></h2>';
+    const { container } = render(<Content module={module} page={page} />);
+    expect(container.querySelector('h2')).toHaveTextContent('');
+  });
 });
 afterEach(() => {
   cleanup();

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

@@ -63,7 +63,13 @@ const Content = ({ module, isHomepageFirstModule = false, isModuleIntroduction =
         pageTitle: page?.title,
         name: page?.relation?.name,
       };
-      node.children[0].data = generatePlaceholderString(node.children[0].data, translations, data);
+      // check if h2 is empty
+      if (node?.children[0]?.data !== undefined)
+        node.children[0].data = generatePlaceholderString(
+          node.children[0].data,
+          translations,
+          data
+        );
     }
 
     return null;

package/src/components/organisms/head/index.js

@@ -56,6 +56,14 @@ const HeadData = ({ page = {}, siteInfo }) => {
       )}
       <link rel="canonical" href={getCanonicalUrl(page)} />
       {page?.hreflangs?.map((link) => {
+        if (link?.default) {
+          return (
+            <>
+              <link rel="alternate" href={getUrl(link.path)} hrefLang="x-default" />;
+              <link rel="alternate" href={getUrl(link.path)} hrefLang={link.language} />;
+            </>
+          );
+        }
         return <link rel="alternate" href={getUrl(link.path)} hrefLang={link.language} />;
       })}
       {page.preconnect_links &&

package/src/components/organisms/navigation/index.js

@@ -48,6 +48,9 @@ const Navigation = ({
 
   if (stopScrollOnOpen) toggleScroll('', true);
 
+  const activeMarket = pageContext?.allMarkets[pageContext.page.market];
+  if (activeMarket) activeMarket.market = pageContext?.page?.market;
+
   const onClickHandler = () => {
     if (
       typeof window !== 'undefined' &&
@@ -72,7 +75,7 @@ const Navigation = ({
             <Link
               className={`${styles.logo || ''} main-menu-gtm logo-cta`}
               aria-label="Nav Logo"
-              to="/"
+              to={activeMarket?.path_prefix || '/'}
               onClick={onClickHandler}
             >
               {logoImg}
@@ -116,7 +119,12 @@ Navigation.propTypes = {
       })
     ),
   }).isRequired,
-  pageContext: PropTypes.shape({}),
+  pageContext: PropTypes.shape({
+    allMarkets: PropTypes.shape({}),
+    page: PropTypes.shape({
+      market: PropTypes.shape({}),
+    }),
+  }),
   hasSearch: PropTypes.bool,
   sticky: PropTypes.bool,
   orientation: PropTypes.oneOf(['horizontal']),

package/src/components/pages/tracker/index.js

@@ -99,7 +99,7 @@ const Tracker = ({
                 }`}
               >{`${translate(translations, 'splash_screen_main_text', mainText).replace(
                 '[operator_name]',
-                operator.name
+                operator?.bonus?.operator_name || operator.name
               )}`}</p>
               {operatorLogo && (
                 <LazyImage

package/src/components/pages/tracker-geo/index.js

@@ -120,7 +120,10 @@ export default function TrackerGeo({
               <LazyImage alt="Site logo" src={logo} />
               <p
                 className={`${styles.mainText} ${operatorLogo && styles.mainTextWithlogo}`}
-              >{`${mainText.replace('[operator_name]', operator.name)}`}</p>
+              >{`${mainText.replace(
+                '[operator_name]',
+                operator?.bonus?.operator_name || operator.name
+              )}`}</p>
               {operatorLogo && (
                 <LazyImage
                   src={imagePrettyUrl(

package/src/helpers/processor/index.js

@@ -326,6 +326,8 @@ export default {
 
           // add categories object to page
           const categoryIds = transformedPages[market][pageType][index].categories;
+          transformedPages[market][pageType][index].categoryIds = categoryIds;
+
           if (categoryIds.length) {
             let categoryArray = [];
             for (let i = 0; i < categoryIds.length; i += 1) {
@@ -456,6 +458,14 @@ export default {
 
             hreflangs &&
               hreflangs.forEach((href, i) => {
+                if (
+                  pagesMappedById[href.page_id] &&
+                  pagesMappedById[href.page_id].path &&
+                  !data.site_markets[pagesMappedById[href.page_id].market].path_prefix
+                ) {
+                  hreflangs[i].default = true;
+                }
+
                 const pagePathPrefix =
                   pagesMappedById[href.page_id] &&
                   data.site_markets[pagesMappedById[href.page_id].market].path_prefix;

package/src/helpers/processor/modules.js

@@ -194,7 +194,8 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
       const pagesFilteredByAuthorAndCategory = filterPages(
         pagesFilteredByReviewer,
         selectedCategories,
-        'categories'
+        'categoryIds',
+        pageId
       );
 
       // Removing any duplicate pages in the final array (because pages may have more than one category)