gatsby-core-theme 30.0.104 → 30.0.105

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [30.0.105](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.104...v30.0.105) (2024-04-03)
+
+
+### Bug Fixes
+
+* added required keys to the WebPage schema ([0372ef1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0372ef1f55935ece04f7d2b785a926ce4f355ec6))
+* breadcrumbs ([6f7f7fc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6f7f7fc47111c6fb6c304ac4b305adf060786798))
+* fixed tests for the schema ([54d0c14](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/54d0c14f6abede9a8461d25b12e9d0332e2c6e62))
+* increased test coverage ([51cb07f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/51cb07fd0d97b01a58f9afe86ff7fdeda6a6c5fa))
+* remove continue reading link from author box description ([eae0f9a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/eae0f9a2516dc8e8bc708baba8ecafafedca0f5c))
+* update breadcrumbs translations ([0289c66](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0289c66b97801e32b885e8a3e110ec3bc43ce4c8))
+* update tests ([f15a058](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f15a0582057c413f839211e0c0107cc65bd4b448))
+
+
+* Merge branch 'tm-4187-webpage-schema' into 'master' ([04ff989](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/04ff989b0fb0b43e8e1c6f7fb77be6f6cbcf38b7))
+* Merge remote-tracking branch 'origin' into tm-4187-webpage-schema ([f080656](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f080656adc8e0c9ce6bb1dcd94f6c650f329d6c7))
+* Merge branch 'tm-4223-breadcrumbs' into 'master' ([a53736d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a53736d18d9f8dddf543f34a65893db6febc6c06))
+* Merge branch 'tm-4178-author-box-changes' into 'master' ([ca1e276](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ca1e276bb2da842e138527a0da64adffe111e923))
+
 ## [30.0.104](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.103...v30.0.104) (2024-04-02)
 
 

package/package.json

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

package/src/components/atoms/author-box/description/index.js

@@ -1,14 +1,11 @@
 import React, { useContext, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { FaArrowRight } from '@react-icons/all-files/fa/FaArrowRight';
 import { translate } from '~helpers/getters';
 import styles from './author-description.module.scss';
-import Link from '~hooks/link';
 import { Context } from '~context/MainProvider';
 
 export default function AuthorDescription({
   author,
-  contReadIcon = <FaArrowRight title="Right-pointing Arrow Icon" />,
   template = '',
   readMore = false,
   maximumLength = 30,
@@ -45,16 +42,6 @@ export default function AuthorDescription({
               : author?.biography,
         }}
       />
-      {author?.profile_page_path && (
-        <Link
-          to={author?.profile_page_path}
-          title={author?.name}
-          className={`${styles.readMore || ''} author-gtm`}
-        >
-          {translate(translations, 'cont_read', 'continue reading')}
-          {contReadIcon}
-        </Link>
-      )}
     </div>
   );
 }
@@ -66,7 +53,6 @@ AuthorDescription.propTypes = {
     expertise: PropTypes.arrayOf(PropTypes.string),
     profile_page_path: PropTypes.string,
   }).isRequired,
-  contReadIcon: PropTypes.node,
   template: PropTypes.string,
   readMore: PropTypes.bool,
   maximumLength: PropTypes.number,

package/src/components/atoms/author-box/details/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { imagePrettyUrl, getAltText, translate } from '~helpers/getters';
 import styles from './author-details.module.scss';
 import LazyImage from '~hooks/lazy-image';
+import Link from '~hooks/link';
 import socialIcons from '../icons/socialIcons';
 import FactCheckIcon from '../../../../images/icons/fact-check';
 import { Context } from '~context/MainProvider';
@@ -29,10 +30,10 @@ export default function AuthorDetails({
         />
       )}
       <div className={styles.information || ''}>
-        <p className={styles.name || ''}>
+        <Link to={author?.profile_page_path} className={`${styles.name || ''} author-gtm`}>
           <span>{author?.name}</span>
           <FactCheckIcon width={verifiedIconWidth} height={verifiedIconHeight} color="#457BF9" />
-        </p>
+        </Link>
         <div className={styles.ribbonAndExpert}>
           {author?.author_title && <p className={styles.title || ''}>{author?.author_title}</p>}
           {author?.ribbon_label && ribbon && (
@@ -87,6 +88,7 @@ AuthorDetails.propTypes = {
     ribbon_label: PropTypes.string,
     experience: PropTypes.string,
     pages_count: PropTypes.string,
+    profile_page_path: PropTypes.string,
   }),
   width: PropTypes.number,
   height: PropTypes.number,

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

@@ -14,7 +14,6 @@ describe('author box component', () => {
     expect(getByText('Casino Specialist')).toBeTruthy();
     expect(container.querySelectorAll('.contactLinks a')).toBeTruthy();
     expect(container.querySelectorAll('.socialIcons a')).toBeTruthy();
-    expect(getByText('continue reading')).toBeTruthy();
   });
 
   test('render with read more ', async () => {

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

@@ -14,7 +14,6 @@ describe('author box component', () => {
     expect(getByText('Casino Specialist')).toBeTruthy();
     expect(container.querySelectorAll('.contactLinks a')).toBeTruthy();
     expect(container.querySelectorAll('.socialIcons a')).toBeTruthy();
-    expect(getByText('continue reading')).toBeTruthy();
   });
 
   test('render with read more ', async () => {

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

@@ -14,7 +14,6 @@ describe('author box component', () => {
     expect(getByText('Casino Specialist')).toBeTruthy();
     expect(container.querySelectorAll('.contactLinks a')).toBeTruthy();
     expect(container.querySelectorAll('.socialIcons a')).toBeTruthy();
-    expect(getByText('continue reading')).toBeTruthy();
   });
 
   test('render with read more ', async () => {

package/src/components/atoms/breadcrumbs/breadcrumbs.test.js

@@ -54,13 +54,7 @@ describe('Show Breadcrumbs in a page', () => {
     expect(getByText('Home').getAttribute('href')).toEqual('/');
     expect(getByText('Alternative title')).toBeTruthy();
   });
-  test('Translation for Home available', () => {
-    const page = {
-      template: 'operator_review',
-    };
-    const { getByText } = renderComponent(page);
-    expect(getByText('Sample Casino')).toBeTruthy();
-  });
+
   test('Page category available', () => {
     const page = {
       categories: [

package/src/components/atoms/breadcrumbs/index.js

@@ -5,7 +5,7 @@ import Link from '~hooks/link';
 
 import styles from './breadcrumbs.module.scss';
 import keygen from '~helpers/keygen';
-import { translate } from '~helpers/getters';
+import { getHomeBreadcrumbs } from '~helpers/getters';
 import { Context } from '~context/MainProvider';
 
 function Breadcrumbs({ page, separator = <span> / </span>, markets }) {
@@ -19,13 +19,8 @@ function Breadcrumbs({ page, separator = <span> / </span>, markets }) {
     return <></>;
   }
   const isPPC = page?.template === 'ppc';
-  const home = translate(
-    translations,
-    page.categories?.length
-      ? `home_${page.template}_${page.categories[0].short_name}`
-      : `home_${page.template}`,
-    translate(translations, 'Home', 'Home')
-  );
+
+  const home = getHomeBreadcrumbs(page, translations);
 
   return (
     <ol className={styles.breadcrumbs || ''}>
@@ -74,6 +69,7 @@ Breadcrumbs.propTypes = {
     vanity_label: PropTypes.string,
     translations: PropTypes.shape({}),
     template: PropTypes.string,
+    type: PropTypes.string,
     categories: PropTypes.arrayOf({
       short_name: PropTypes.string,
     }),

package/src/helpers/getters.mjs

@@ -359,6 +359,19 @@ export function translate(translations, key, defaultValue = '') {
   return defaultValue;
 }
 
+export function getHomeBreadcrumbs(page, translations) {
+  const home = translate(
+    translations,
+    (page.categories?.length > 0 &&
+      translations[`home_${page.template}_${page.categories[0].short_name}`] !== undefined)
+      ? `home_${page.template}_${page.categories[0].short_name}`
+      : `home_${page.type}`,
+    translate(translations, 'Home', 'Home')
+  );
+
+  return home;
+}
+
 // This part of the code, help us to add operator related to the page as the first item in the comparison table automatically
 // example: if we are on the operator review page(Rizk) that should be first in the comparison table
 // First, we check if we have that item in the array, if that item is in the array, we check its position

package/src/helpers/getters.test.js

@@ -266,6 +266,56 @@ describe('Getters Helper', () => {
     expect(Getters.translate(object, 'foo', 'bar')).toEqual('bar');
   });
 
+  test('getHomeBreadcrumbs() with categories', () => {
+    const page = {
+      categories: [{ short_name: 'category1' }],
+      template: 'template1',
+      type: 'type1',
+    };
+    const translations = {
+      home_template1_category1: 'Template 1 Category 1 Home',
+      Home: 'Home',
+    };
+    expect(Getters.getHomeBreadcrumbs(page, translations)).toEqual('Template 1 Category 1 Home');
+  });
+
+  test('getHomeBreadcrumbs() with categories but with no category translations', () => {
+    const page = {
+      categories: [{ short_name: 'category2' }, { short_name: 'category1' }],
+      template: 'template1',
+      type: 'type1',
+    };
+    const translations = {
+      home_type1_category1: 'Template 1 Category 1 Home',
+      home_type1: 'Template 1',
+      Home: 'Home',
+    };
+    expect(Getters.getHomeBreadcrumbs(page, translations)).toEqual('Template 1');
+  });
+
+  test('getHomeBreadcrumbs() without categories', () => {
+    const page = {
+      categories: [],
+      type: 'type1',
+    };
+    const translations = {
+      home_type1: 'Type 1 Home',
+      Home: 'Home',
+    };
+    expect(Getters.getHomeBreadcrumbs(page, translations)).toEqual('Type 1 Home');
+  });
+
+  test('getHomeBreadcrumbs() with missing translation', () => {
+    const page = {
+      categories: [],
+      type: 'type2',
+    };
+    const translations = {
+      Home: 'Home',
+    };
+    expect(Getters.getHomeBreadcrumbs(page, translations)).toEqual('Home');
+  });
+
   const module = {
     items: [
       {

package/src/helpers/processor/index.mjs

@@ -318,7 +318,7 @@ export default {
           }
 
           // add reviewer object to page
-          if (page.reviewer_id !== null && Object.values(data.authors).length) {
+          if (page.reviewer_id !== null && data.authors[page.reviewer_id]) {
             transformedPages[market][pageType][index].reviewer = data.authors[page.reviewer_id];
           }
 

package/src/helpers/schema.js

@@ -185,7 +185,26 @@ export function webPageSchema(page, pageImage) {
       url: `${process.env.GATSBY_SITE_URL}`,
       inLanguage: getLanguage(page?.language),
     },
-    author: {
+    reviewedBy: page?.reviewer_id
+      ? {
+          '@type': 'Person',
+          name: page?.reviewer?.name,
+          jobTitle: page?.reviewer?.author_title,
+          image: page?.reviewer?.image_object?.url,
+          email: page?.reviewer?.email_address,
+          nationality: {
+            '@type': 'Country',
+            name: page?.reviewer?.country?.name,
+          },
+
+          knowsAbout: page?.reviewer?.knows_abouts?.map((item) => ({
+            '@type': item?.type,
+            name: item?.name,
+            sameAs: item?.links.map((link) => link?.link).filter((link) => link),
+          })),
+        }
+      : '',
+    publisher: {
       '@type': 'Organization',
       name: page?.siteSchema?.site_name || '',
       alternateName: page?.siteSchema?.alias_site_name || '',
@@ -207,6 +226,23 @@ export function webPageSchema(page, pageImage) {
         .filter((socialLink) => socialLink),
       ...(page?.knowsAbout ? { knowsAbout: page?.knowsAbout } : {}),
     },
+    author: {
+      '@type': 'Person',
+      name: page?.author?.name,
+      jobTitle: page?.author?.author_title,
+      image: page?.author?.image_object?.url,
+      email: page?.author?.email_address,
+      nationality: {
+        '@type': 'Country',
+        name: page?.author?.country?.name,
+      },
+
+      knowsAbout: page?.author?.knows_abouts?.map((item) => ({
+        '@type': item?.type,
+        name: item?.name,
+        sameAs: item?.links.map((link) => link?.link).filter((link) => link),
+      })),
+    },
   };
   if (speakAbleModules.length > 0) {
     schema['@speakAbleModules'] = speakAbleModules.map((module) => JSON.parse(module));
@@ -285,6 +321,7 @@ export function templateSchemas(page, pageImage) {
       '@type': 'Person',
       name: page.author?.name?.substring(0, 100),
       url: getUrl(page.author?.profile_page_path || '/'),
+      ...(page?.author?.knowsAbout ? { knowsAbout: page?.author?.knowsAbout } : {}),
     },
     publisher: {
       '@type': 'Organization',

package/src/helpers/schema.test.js

@@ -118,18 +118,75 @@ describe('Schema Helper', () => {
         created_at: '01/01/01',
         updated_at: '02/02/02',
         seo_keywords: ['keyword_a', 'keyword_b'],
-        authors: [
-          {
-            profile_page_path: 'author_a/author_page',
-            email_address: 'email_a@email.com',
-            name: 'Author_A',
+        author: {
+          profile_page_path: 'author_a/author_page',
+          email_address: 'email_a@email.com',
+          name: 'Author_A',
+          image_object: {
+            url: 'author_image.jpg',
           },
-          {
-            profile_page_path: 'author_b/author_page',
-            email_address: 'email_b@email.com',
-            name: 'Author_B',
+          knows_abouts: [
+            {
+              '@type': 'Thing',
+              name: 'Ireland',
+              links: [
+                {
+                  link: 'www.test.com',
+                },
+                {
+                  link: 'www.test2.com',
+                },
+              ],
+            },
+            {
+              '@type': 'Thing',
+              name: 'South Africa',
+              links: [
+                {
+                  link: 'www.test.com',
+                },
+                {
+                  link: 'www.test2.com',
+                },
+              ],
+            },
+          ],
+        },
+        reviewer_id: 112,
+        reviewer: {
+          profile_page_path: 'reviewer_a/author_page',
+          email_address: 'email_a@email.com',
+          name: 'Reviewer_A',
+          image_object: {
+            url: 'reviewer_image.jpg',
           },
-        ],
+          knows_abouts: [
+            {
+              '@type': 'Thing',
+              name: 'Ireland',
+              links: [
+                {
+                  link: 'www.test.com',
+                },
+                {
+                  link: 'www.test2.com',
+                },
+              ],
+            },
+            {
+              '@type': 'Thing',
+              name: 'South Africa',
+              links: [
+                {
+                  link: 'www.test.com',
+                },
+                {
+                  link: 'www.test2.com',
+                },
+              ],
+            },
+          ],
+        },
         siteSchema: {
           site_name: 'Site Name',
           alias_site_name: 'Alias Site Name',
@@ -151,56 +208,26 @@ describe('Schema Helper', () => {
     expect(json.inLanguage).toEqual('site_lang');
     expect(json.datePublished).toEqual('01/01/01');
     expect(json.dateModified).toEqual('02/02/02');
-
     expect(Object.prototype.toString.call(json.isPartOf)).toEqual('[object Object]');
     expect(json.isPartOf['@type']).toEqual('WebSite');
     expect(json.isPartOf['@id']).toEqual(`${process.env.GATSBY_SITE_URL}#website`);
     expect(json.isPartOf.url).toEqual(`${process.env.GATSBY_SITE_URL}`);
     expect(json.isPartOf.inLanguage).toEqual('site_lang');
-
     expect(Object.prototype.toString.call(json.primaryImageOfPage)).toEqual('[object Object]');
     expect(json.primaryImageOfPage['@type']).toEqual('ImageObject');
     expect(json.primaryImageOfPage['@id']).toEqual(`${getUrl('web_page')}#primaryimage`);
     expect(json.primaryImageOfPage.url).toEqual(pageImage);
     expect(json.primaryImageOfPage.inLanguage).toEqual('site_lang');
-
     expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
-    expect(json.author['@type']).toEqual('Organization');
-    expect(json.author.name).toEqual('Site Name');
-    expect(json.author.alternateName).toEqual('Alias Site Name');
-    expect(json.author.foundingDate).toEqual('01/02/03');
-    expect(json.author.publishingPrinciples).toEqual(undefined);
-
-    expect(Object.prototype.toString.call(json.author.logo)).toEqual('[object Object]');
-    expect(json.author.logo['@type']).toEqual('ImageObject');
-    expect(json.author.logo.url).toEqual(pageImage);
-
-    expect(Object.prototype.toString.call(json.author.contactPoint)).toEqual('[object Array]');
-    expect(json.author.contactPoint).toHaveLength(2);
-    expect(Object.prototype.toString.call(json.author.contactPoint[0])).toEqual('[object Object]');
-    expect(Object.prototype.toString.call(json.author.contactPoint[1])).toEqual('[object Object]');
-    expect(json.author.contactPoint[0]['@type']).toEqual('ContactPoint');
-    expect(json.author.contactPoint[1]['@type']).toEqual('ContactPoint');
-    expect(json.author.contactPoint[0].contactType).toEqual('Author');
-    expect(json.author.contactPoint[1].contactType).toEqual('Author');
-    expect(json.author.contactPoint[0].url).toEqual(`${getUrl('/')}author_a/author_page`);
-    expect(json.author.contactPoint[1].url).toEqual(`${getUrl('/')}author_b/author_page`);
-    expect(json.author.contactPoint[0].name).toEqual('Author_A');
-    expect(json.author.contactPoint[1].name).toEqual('Author_B');
-    expect(json.author.contactPoint[0].email).toEqual('email_a@email.com');
-    expect(json.author.contactPoint[1].email).toEqual('email_b@email.com');
-
-    expect(Object.prototype.toString.call(json.author.sameAs)).toEqual('[object Array]');
-    expect(json.author.sameAs).toHaveLength(3);
-    expect(json.author.sameAs[0]).toEqual('author_linkedin');
-    expect(json.author.sameAs[1]).toEqual('author_spotify');
-    expect(json.author.sameAs[2]).toEqual('author_wikipedia');
-    expect(json.author.knowsAbout).toEqual(undefined);
-
-    expect(Object.prototype.toString.call(json.keywords)).toEqual('[object Array]');
-    expect(json.keywords).toHaveLength(2);
-    expect(json.keywords[0]).toEqual('keyword_a');
-    expect(json.keywords[1]).toEqual('keyword_b');
+    expect(json.author['@type']).toEqual('Person');
+    expect(json.author.image).toEqual('author_image.jpg');
+    expect(Object.prototype.toString.call(json.author.knowsAbout)).toEqual('[object Array]');
+    expect(json.author.knowsAbout).toHaveLength(2);
+    expect(Object.prototype.toString.call(json.reviewedBy)).toEqual('[object Object]');
+    expect(json.reviewedBy['@type']).toEqual('Person');
+    expect(json.reviewedBy.image).toEqual('reviewer_image.jpg');
+    expect(Object.prototype.toString.call(json.reviewedBy.knowsAbout)).toEqual('[object Array]');
+    expect(json.reviewedBy.knowsAbout).toHaveLength(2);
   });
 
   test('organizationSchema()', () => {