gatsby-core-theme 24.0.0 → 24.0.2

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+## [24.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.1...v24.0.2) (2023-07-04)
+
+
+### Bug Fixes
+
+* remove console log ([1a3396b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1a3396beec0e5b887c109acac812e8bc82b92ce7))
+
+## [24.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v24.0.0...v24.0.1) (2023-07-04)
+
+
+### Bug Fixes
+
+* add alternate linls ([15cb91d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/15cb91d4e8fe78abc021ccf3edbf8f7d9bedc608))
+* add default market ([bf1c2c2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bf1c2c2ee7dc76d4282bc25dff01beecdb27765b))
+* add placeholder for h1,h2,h3 ([79b793b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/79b793b9d564b4497bc655ff1f085b8323b24ece))
+* add tracker type in the bonus module ([42acf68](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/42acf68f747060e6c887e5abc324946811b3c2b3))
+* add trcaker type ([6e92571](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6e92571f257274e6c3e56f939d777543effcdedb))
+* fix name of label ([e39bd21](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e39bd21b8d811ff2f6a9d3e7e76154aac1627616))
+* hreflang ([375c89d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/375c89d0e28d39af60d18ab10a1b374876cb6697))
+* pass data for sitename, operator_name and title ([4e398ca](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4e398ca23a87f01e24d8a1bc97bef32f557b6a3f))
+* refactor ([c8b071f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c8b071fb531d7529e11587108c9fb4e47bb562c9))
+* refactor code ([d026394](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d02639498926eaab05851ad9b3df720b448fb87b))
+* refactor code ([0ae55f1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0ae55f1954cabef399c4742c2df23946626a214e))
+* tests ([8c2c651](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8c2c651a609f7b41edb53446fac57ef50d523641))
+* tests ([3d1d567](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3d1d567518406d9d5e304ae2a39c920bc2b98e0a))
+* validate hreflangs ([306c09a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/306c09a67a74254b3a1b8797c9da683ff5bd4c0d))
+
+
+* Merge branch 'tm-3396-bonus' into 'master' ([d8f27df](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d8f27dfffaff66945cb71ef2f34d99796f7f084c))
+* Merge branch 'tm-3526-multi-markets' into 'master' ([715c9c9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/715c9c995b82005d8c0ef6a3aa279dec710058d2))
+* Merge branch 'master' into tm-3526-multi-markets ([2d8b4ad](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2d8b4addd5c765962b4c29ddea26034ccb9f309b))
+* Merge branch 'tm-3086' into 'master' ([d0ba16f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d0ba16fdab86de26b2bd6ef725ee8b8ded7d4386))
+* Merge branch 'master' into tm-3526-multi-markets ([16b9caa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/16b9caad374c8e7a78a7718c59be7e029d954647))
+
 # [24.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v23.0.2...v24.0.0) (2023-06-27)
 
 

package/package.json

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

package/src/components/atoms/author-box/author-box.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, cleanup } from '@testing-library/react';
+import { render, cleanup, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 
 import { authorObject } from '~tests/factories/modules/author-box.factory';
@@ -26,6 +26,28 @@ describe('author box component', () => {
     // CTA
     expect(getByText('More about Ida')).toBeTruthy();
   });
+
+  test('render with read more ', async () => {
+    const author = authorObject;
+
+    author.biography =
+      "The purpose of lorem ipsum is to create a natural looking block of text (sentence, paragraph, page, etc.) that doesn't distract from the layout. A practice not without controversy, laying out";
+
+    const { container, getByText } = render(<AuthorBox author={author} />);
+
+    expect(container).toBeTruthy();
+    expect(
+      getByText(
+        "The purpose of lorem ipsum is to create a natural looking block of text (sentence, paragraph, page, etc.) that doesn't distract from the layout. A practice not without controversy, laying..."
+      )
+    ).toBeTruthy();
+    const button = container.querySelector('.contReadText');
+    fireEvent.click(button);
+
+    await waitFor(() => {
+      expect(getByText(author.biography)).toBeTruthy();
+    }, 4000);
+  });
 });
 afterEach(() => {
   cleanup();

package/src/components/atoms/menu/items/item/item.test.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import { render, cleanup, waitFor, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import getNavigation from '~tests/factories/sections/navigationStatic.factory';
+import { getMenuObj } from '~helpers/menu';
+import Item from '.';
+
+let data;
+let section;
+let menus;
+
+beforeEach(() => {
+  data = getNavigation();
+  section = {
+    modules: [data],
+  };
+  menus = getMenuObj(section.modules, 'menu');
+});
+describe('Menu Component', () => {
+  test('render menu link item', async () => {
+    const { container, getByText } = render(<Item item={menus.children[3]} />);
+    await waitFor(() => {
+      expect(container).toBeTruthy();
+      expect(container.querySelectorAll('a')).toHaveLength(1);
+      expect(getByText('Sportsbooks').getAttribute('href')).toEqual('/sportsbooks');
+    });
+  });
+
+  test('render item ', async () => {
+    const { container, getByText } = render(<Item item={menus.children[3]} />);
+    await waitFor(() => {
+      expect(container).toBeTruthy();
+      expect(container.querySelectorAll('a')).toHaveLength(1);
+      expect(getByText('Sportsbooks').getAttribute('href')).toEqual('/sportsbooks');
+    });
+  });
+});
+afterEach(() => {
+  cleanup();
+});

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

@@ -1,16 +1,19 @@
 /* eslint-disable camelcase */
 /* eslint-disable import/no-extraneous-dependencies */
-import React, { useState } from 'react';
+import React, { useState, useContext } from 'react';
 import parse from 'html-react-parser';
 import PropTypes from 'prop-types';
 import LazyImage from 'gatsby-core-theme/src/hooks/lazy-image';
 import { parseCss } from 'gatsby-core-theme/src/helpers/css-parser';
 import loadable from '@loadable/component';
 import { parseContentImageUrl } from 'gatsby-core-theme/src/helpers/strings';
+import { generatePlaceholderString } from '../../../helpers/generators';
+import { Context } from '~context/MainProvider';
 import styles from './content.module.scss';
 
-const Content = ({ module, isHomepageFirstModule = false, isModuleIntroduction = '' }) => {
+const Content = ({ module, isHomepageFirstModule = false, isModuleIntroduction = '', page }) => {
   const { show_more_label, show_more_enabled } = module || {};
+  const { translations } = useContext(Context) || {};
   const [showMore, setShowMore] = useState(show_more_enabled === '1');
 
   const replaceMedia = (node) => {
@@ -54,6 +57,15 @@ const Content = ({ module, isHomepageFirstModule = false, isModuleIntroduction =
       }
     }
 
+    if (node.name === 'h1' || node.name === 'h2' || node.name === 'h3') {
+      const data = {
+        siteName: page?.siteInfo?.site_name,
+        pageTitle: page?.title,
+        name: page?.relation?.name,
+      };
+      node.children[0].data = generatePlaceholderString(node.children[0].data, translations, data);
+    }
+
     return null;
   };
   const switchStyle = (style) => {
@@ -115,6 +127,7 @@ Content.propTypes = {
     style: PropTypes.string,
     show_more_content: PropTypes.string,
   }),
+  page: PropTypes.shape({}),
   isHomepageFirstModule: PropTypes.bool,
   isModuleIntroduction: PropTypes.string,
   // eslint-disable-next-line react/forbid-prop-types

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

@@ -7,7 +7,6 @@ import loadable from '@loadable/component';
 import styles from './module.module.scss';
 import ModuleTitle from '~atoms/module-title';
 import { anchorLink, removeSymbols } from '~helpers/strings';
-import { prettyTracker } from '~helpers/getters';
 
 const Modules = ({ module, page, pageContext }) => {
   const GetModuleComponent = (moduleItem) => {
@@ -61,6 +60,7 @@ const Modules = ({ module, page, pageContext }) => {
 
   const ModuleComponent = GetModuleComponent(module);
 
+  // eslint-disable-next-line no-nested-ternary
   const anchorLabel = module.anchor_label
     ? removeSymbols(anchorLink(module.anchor_label))
     : module.name === 'archive'
@@ -73,7 +73,6 @@ const Modules = ({ module, page, pageContext }) => {
           operator: module?.value,
           logo: module?.value?.logo_url,
           hasLink: true,
-          prettyLink: prettyTracker(module?.value, 'main', false, page.template),
         }
       : {
           anchorLabel,

package/src/components/molecules/operator-banner/index.js

@@ -19,8 +19,15 @@ export default function OperatorBanner({
   sticky = false,
   stickyOffset = 0,
   pageTemplate,
+  module,
 }) {
-  const prettyLink = prettyTracker(operator, 'main', false, pageTemplate);
+  const prettyLink = prettyTracker(
+    operator,
+    module?.tracking_link_name || 'main',
+    false,
+    pageTemplate
+  );
+
   const [show, setShow] = useState(!sticky);
   const [closed, setClosed] = useState(false);
   const { cookieAccepted, setBannerActive } = useContext(Context) || {};
@@ -96,14 +103,18 @@ export default function OperatorBanner({
 
           {!isPlaceholder && !sticky && (
             <div className={styles.bonusTnc || ''}>
-              <Bonus item={operator} tracker="main" />
+              <Bonus item={operator} tracker={module?.type || 'main'} />
               {operator?.extra_fields?.terms_and_conditions_text_enabled === '1' && (
                 <Tnc hasCollapse={false} operator={operator} />
               )}
             </div>
           )}
-          {sticky && <Bonus item={operator} tracker="main" />}
-          <OperatorCta operator={operator} pageTemplate={pageTemplate} />
+          {sticky && <Bonus item={operator} tracker={module?.type || 'main'} />}
+          <OperatorCta
+            operator={operator}
+            pageTemplate={pageTemplate}
+            tracker={module?.tracking_link_name || 'main'}
+          />
           {sticky && operator?.extra_fields?.terms_and_conditions_text_enabled === '1' && (
             <Tnc hasCollapse={false} operator={operator} />
           )}
@@ -137,4 +148,8 @@ OperatorBanner.propTypes = {
   sticky: PropTypes.bool,
   stickyOffset: PropTypes.number,
   pageTemplate: PropTypes.string,
+  module: PropTypes.shape({
+    tracking_link_name: PropTypes.string,
+    type: PropTypes.string,
+  }),
 };

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

@@ -38,6 +38,7 @@ function setName(string) {
 
 const HeadData = ({ page = {}, siteInfo }) => {
   const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
+
   // When google re-indexes dev NSA and IRL, remove lines 28, 41, 42, 43 and process.env.GATSBY_ACTIVE_ENV !== 'development' from lines 24, 25, 27, 29, 43
   return (
     <>
@@ -54,6 +55,9 @@ const HeadData = ({ page = {}, siteInfo }) => {
         <meta name="googlebot" content="noindex,follow" />
       )}
       <link rel="canonical" href={getCanonicalUrl(page)} />
+      {page?.hreflangs?.map((link) => {
+        return <link rel="alternate" href={getUrl(link.path)} hrefLang={link.language} />;
+      })}
       {page.preconnect_links &&
         page.preconnect_links.map((link) => <link key={keygen()} rel="preconnect" href={link} />)}
       <meta name="og:title" content={page.meta_title} />

package/src/helpers/processor/index.js

@@ -77,6 +77,7 @@ export function transform(response) {
         transformed[siteMarket][pageType] = [];
         Object.keys(response.pages[language][pageType]).forEach((pagePath) => {
           const page = response.pages[language][pageType][pagePath][siteMarket];
+
           if (response.site_markets[siteMarket].path_prefix && page) {
             // set page prefix for multiple markets
             page.path = `${response.site_markets[siteMarket].path_prefix}${
@@ -445,6 +446,27 @@ export default {
       if (transformedPages[market]) {
         Object.keys(transformedPages[market]).forEach((pageType) => {
           transformedPages[market][pageType].forEach((page, index) => {
+            // Href Lang
+            let hreflangs = page.page_group_id ? data.page_groups[page.page_group_id] : null;
+            if (page.page_custom_hreflangs) {
+              hreflangs = hreflangs
+                ? [...hreflangs, ...page.page_custom_hreflangs]
+                : page.page_custom_hreflangs;
+            }
+
+            hreflangs &&
+              hreflangs.forEach((href, i) => {
+                const pagePathPrefix =
+                  pagesMappedById[href.page_id] &&
+                  data.site_markets[pagesMappedById[href.page_id].market].path_prefix;
+
+                if (pagePathPrefix) {
+                  hreflangs[i].path = `${pagePathPrefix}/${href.path}`;
+                }
+              });
+
+            page.hreflangs = hreflangs;
+
             if (page.sections) {
               // pre NSA launch dirty loop to add prefilled modules as normal modules (as actual value)
               Object.keys(page.sections).forEach((sectionKey) => {