gatsby-core-theme 29.0.2 → 29.0.3

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [29.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v29.0.2...v29.0.3) (2023-09-06)
+
+
+### Bug Fixes
+
+* search for multiple markets ([39cb250](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/39cb250a1728420d38cba94534e6cea771127f8b))
+* update default title tag ([631f5cd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/631f5cda840225a534c642117d5837cf6efe66fd))
+* update schema and module ([c74282c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c74282c6299e66d5a66516ac3aad9938a7970d92))
+* update schema to include speakable ([95744c9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/95744c9fc11bc7ea7a8de1236150ca421c8b6796))
+* update schema to include speakable ([2b76573](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2b7657399300cbe7fc469b2088f36991a4d8feaf))
+* update speakable schema ([d11d779](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d11d779b41cb934fc5305b729d22132a9300d2a9))
+* update speakable schema ([9c0802b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9c0802bd40eb39adc0a545ea94a33a42d6c16157))
+* update tests ([6b944ca](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b944ca93a11379f539bd16455d155409c28d90d))
+* updte tests ([0814735](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/081473596fa535f86be6cbc17ac4f312281481b8))
+
+
+### Code Refactoring
+
+* add custom icons for author box ([64f3dcb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/64f3dcbe4d3a581ad513f317e1a4f551355b1824))
+
+
+* Merge branch 'tm-3628-author-box' into 'master' ([b0bc0c3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b0bc0c3db99826c5d999a3bed8b6ea3382c848a8))
+* Merge branch 'tm-3576-speakable-schema' into 'master' ([19b1194](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/19b1194eb65cb20b83c6a3592b20e4bd8e1cb7a4))
+
 ## [29.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v29.0.1...v29.0.2) (2023-09-05)
 
 

package/gatsby-node.mjs

@@ -445,8 +445,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
 
 export const onCreatePage = ({ page, actions }) => {
   const { createPage, deletePage } = actions;
-
-  if (page.path.match(/^\/[a-z]{2}\/404\/$/)) {
+  if (page.path.match(/^\/[a-z]{2}\/404$/)) {
     const oldPage = { ...page };
     const langCode = page.path.split(`/`)[1];
     page.matchPath = `/${langCode}/*`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "29.0.2",
+  "version": "29.0.3",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "directories": {

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

@@ -26,8 +26,12 @@ export default function AuthorBox({
   readingTime = '',
   reviewer = {},
   check = '../../../images/check.svg',
-  checkCircle = '../../../images/checkCircle.svg',
+  verifiedIcon = '../../../images/checkCircle.svg',
+  verifiedIconWidth = 20,
+  verifiedIconHeight = 20,
   showReadMore = true,
+  readTimeIcon = <FaClock />,
+  contReadIcon = <FaArrowRight />,
 }) {
   const { translations } = useContext(Context) || {};
   const socialLinks = [
@@ -61,10 +65,10 @@ export default function AuthorBox({
             <p className={styles.name || ''}>
               <span>{author?.name}</span>
               <LazyImage
-                src="../../../images/verify.svg"
+                src={verifiedIcon}
                 alt={translate(translations, 'verified', 'Verified')}
-                width={20}
-                height={20}
+                width={verifiedIconWidth}
+                height={verifiedIconHeight}
               />
             </p>
             {author?.author_title && <p className={styles.title || ''}>{author?.author_title}</p>}
@@ -123,7 +127,7 @@ export default function AuthorBox({
                   author?.biography?.split(' ').length > 30 && isReadMore
                     ? `${textWordsLimit(author?.biography, 30)} <span class='${
                         styles.contReadText
-                      }'>...${translate(translations, 'cont_read', 'continue reading')}</span>`
+                      }'>${translate(translations, 'cont_read', 'continue reading')}</span>`
                     : author?.biography,
               }}
             />
@@ -134,11 +138,13 @@ export default function AuthorBox({
               title={author?.name}
               className={`${styles.readMore || ''} author-gtm`}
             >
-              {translate(translations, 'read_more_about', 'More about [author]').replace(
-                '[author]',
-                author?.name.split(' ')[0]
-              )}
-              <FaArrowRight />
+              {isReadMore
+                ? translate(translations, 'read_more_about', 'More about [author]').replace(
+                    '[author]',
+                    author?.name.split(' ')[0]
+                  )
+                : translate(translations, 'cont_read', 'continue reading')}
+              {contReadIcon}
             </Link>
           )}
           {author?.expertise && (
@@ -159,7 +165,7 @@ export default function AuthorBox({
             <div className={styles.pageInfo || ''}>
               {readingTime && (
                 <div className={styles.readingTime || ''}>
-                  <FaClock />
+                  {readTimeIcon}
                   {` ${readingTime} ${translate(translations, 'minutes', 'min')} `}
                   <span className={styles.readText || ''}>
                     {translate(translations, 'read', 'read')}
@@ -168,7 +174,13 @@ export default function AuthorBox({
               )}
               {reviewer && (
                 <div className={styles.reviewer || ''}>
-                  <img className={styles.check || ''} src={checkCircle} alt="checkCircle" />
+                  {/* <img className={styles.check || ''} src={checkCircle} alt="checkCircle" /> */}
+                  <LazyImage
+                    src={verifiedIcon}
+                    alt={translate(translations, 'verified', 'Verified')}
+                    width={verifiedIconWidth}
+                    height={verifiedIconHeight}
+                  />
                   <span>{` ${translate(
                     translations,
                     'fact_checked_by',
@@ -235,6 +247,10 @@ AuthorBox.propTypes = {
     name: PropTypes.string,
   }),
   check: PropTypes.string,
-  checkCircle: PropTypes.string,
+  verifiedIcon: PropTypes.string,
+  verifiedIconWidth: PropTypes.number,
+  verifiedIconHeight: PropTypes.number,
+  readTimeIcon: PropTypes.node,
+  contReadIcon: PropTypes.node,
   showReadMore: PropTypes.bool,
 };

package/src/components/atoms/module-title/index.js

@@ -18,9 +18,9 @@ const ModuleTitle = ({
     if (module.module_title_tag === 'h5') return <h5 id={anchorLabel}>{module.module_title}</h5>;
     if (module.module_title_tag === 'h6') return <h6 id={anchorLabel}>{module.module_title}</h6>;
     return (
-      <span className={`${styles?.noTag || ''} ${classname || ''}`} id={anchorLabel}>
+      <h2 className={`${styles?.noTag || ''} ${classname || ''}`} id={anchorLabel}>
         {module.module_title}
-      </span>
+      </h2>
     );
   };
   // if (

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

@@ -67,7 +67,7 @@ const Modules = ({ module, page, pageContext }) => {
     ? removeSymbols(anchorLink(module.anchor_label))
     : module.name === 'archive'
     ? 'archiveLabel'
-    : null;
+    : module.module_value_id;
 
   const extraProps =
     module.name === 'bonus'

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

@@ -61,7 +61,7 @@ describe('Modules Component ', () => {
   });
   test('title no tag', () => {
     const { container } = render(<Module module={{ name: 'content', ...contentTableOne }} />);
-    expect(container.querySelectorAll('h2')).toHaveLength(0);
+    expect(container.querySelectorAll('h2')).toHaveLength(1);
   });
 
   test('Swich for All component', () => {

package/src/helpers/schema.js

@@ -113,34 +113,61 @@ export function breadcrumbsSchema(breadcrumbs, path) {
   return JSON.stringify(generateSchemaObject(schema));
 }
 
+export function processSpeakableModules(modules) {
+  const speakAbleModules = [];
+
+  modules.forEach((module) => {
+    if (module?.name === 'content' && module.speakable_enabled === '1') {
+      const id = module.anchor_slug ? module.anchor_slug : module.module_value_id;
+      const htag = module.tag ? module.tag : 'h2';
+      const moduleSchema = {
+        '@context': 'https://schema.org',
+        '@type': 'WebPage',
+        name: module.title,
+        speakable: {
+          '@type': 'SpeakableSpecification',
+          cssSelector: [`#${id}>${htag}`, `#${id}>p`],
+        },
+        url: getUrl(module.path),
+      };
+
+      speakAbleModules.push(JSON.stringify(generateSchemaObject(moduleSchema)));
+    }
+  });
+
+  return speakAbleModules;
+}
+
 export function webPageSchema(page, pageImage) {
+  const speakAbleModules = processSpeakableModules(page?.sections?.main?.modules || []);
+
   const schema = {
     '@context': 'https://schema.org',
     '@type': 'WebPage',
-    '@id': `${getUrl(page.path)}#webpage`,
-    url: getUrl(page.path),
-    name: page.meta_title || '',
-    description: page.meta_description || '',
-    inLanguage: getLanguage(page.language),
-    datePublished: page.created_at,
-    dateModified: page.updated_at,
+    '@id': `${getUrl(page?.path)}#webpage`,
+    url: getUrl(page?.path),
+    name: page?.meta_title || '',
+    description: page?.meta_description || '',
+    inLanguage: getLanguage(page?.language),
+    datePublished: page?.created_at,
+    dateModified: page?.updated_at,
     isPartOf: {
       '@type': 'WebSite',
       '@id': `${process.env.GATSBY_SITE_URL}#website`,
       url: `${process.env.GATSBY_SITE_URL}`,
-      inLanguage: getLanguage(page.language),
+      inLanguage: getLanguage(page?.language),
     },
     author: {
       '@type': 'Organization',
-      name: page.siteSchema?.site_name || '',
-      alternateName: page.siteSchema?.alias_site_name || '',
-      foundingDate: page.siteSchema?.organization_founding_date || '',
-      publishingPrinciples: page.siteSchema?.publishing_principles,
+      name: page?.siteSchema?.site_name || '',
+      alternateName: page?.siteSchema?.alias_site_name || '',
+      foundingDate: page?.siteSchema?.organization_founding_date || '',
+      publishingPrinciples: page?.siteSchema?.publishing_principles,
       logo: {
         '@type': 'ImageObject',
         url: pageImage,
       },
-      contactPoint: page.authors?.map((author) => ({
+      contactPoint: page?.authors?.map((author) => ({
         '@type': 'ContactPoint',
         contactType: 'Author',
         name: author.name || '',
@@ -148,11 +175,14 @@ export function webPageSchema(page, pageImage) {
         url: getUrl(author.profile_page_path || '/'),
       })),
       sameAs: socialLinks
-        .map((socialLink) => page.siteSchema?.[socialLink])
+        .map((socialLink) => page?.siteSchema?.[socialLink])
         .filter((socialLink) => socialLink),
-      ...(page.knowsAbout ? { knowsAbout: page.knowsAbout } : {}),
+      ...(page?.knowsAbout ? { knowsAbout: page?.knowsAbout } : {}),
     },
   };
+  if (speakAbleModules.length > 0) {
+    schema['@speakAbleModules'] = speakAbleModules.map((module) => JSON.parse(module));
+  }
 
   if (pageImage) {
     schema.primaryImageOfPage = {
@@ -163,7 +193,7 @@ export function webPageSchema(page, pageImage) {
     };
   }
 
-  if (page.seo_keywords) {
+  if (page?.seo_keywords) {
     schema.keywords = page.seo_keywords;
   }
 
@@ -209,6 +239,26 @@ export function moduleSchemas(modules, path) {
         }
         return null;
       }
+      case 'content': {
+        if (module.speakable_enabled === '1') {
+          const id = module.anchor_slug ? module.anchor_slug : module.module_value_id;
+          const htag = module.tag ? module.tag : 'h2';
+          const moduleSchema = {
+            '@context': 'https://schema.org',
+            '@type': 'WebPage',
+            name: module.title,
+            speakable: {
+              '@type': 'SpeakableSpecification',
+              cssSelector: [`#${id}>${htag}`, `#${id}>p`],
+            },
+            url: getUrl(path),
+          };
+
+          return JSON.stringify(generateSchemaObject(moduleSchema));
+        }
+        return null;
+      }
+
       default: {
         return null;
       }

package/src/helpers/schema.test.js

@@ -1,5 +1,6 @@
 import { getUrl } from './getters';
 import * as Schema from './schema';
+import { processSpeakableModules } from './schema';
 
 const parseCheckSchema = (schema) => {
   const json = JSON.parse(schema);
@@ -34,6 +35,50 @@ describe('Schema Helper', () => {
     expect(json.itemListElement[1].item['@id']).toEqual(`${getUrl('breadcrumb_b')}#webpage`);
   });
 
+  describe('processSpeakableModules()', () => {
+    test('should return an empty array if no speakable modules are provided', () => {
+      const modules = [
+        { name: 'other' },
+        { name: 'faq', speakable_enabled: '0' },
+        { name: 'content', speakable_enabled: '0' },
+      ];
+
+      const result = processSpeakableModules(modules);
+
+      expect(result).toEqual([]);
+    });
+
+    test('should return an array of speakable modules', () => {
+      const modules = [
+        { name: 'other' },
+        {
+          name: 'content',
+          speakable_enabled: '1',
+          path: '/content-module',
+          title: 'SpeakableTitle',
+          tag: 'h2',
+        },
+      ];
+
+      const result = processSpeakableModules(modules);
+
+      const expectedResults = [
+        JSON.stringify({
+          '@context': 'https://schema.org',
+          '@type': 'WebPage',
+          name: 'SpeakableTitle',
+          speakable: {
+            '@type': 'SpeakableSpecification',
+            cssSelector: ['#undefined>h2', '#undefined>p'], // Updated expected value
+          },
+          url: getUrl('/content-module'),
+        }),
+      ];
+
+      expect(result).toEqual(expectedResults);
+    });
+  });
+
   test('webPageSchema()', () => {
     const output = Schema.webPageSchema(
       {
@@ -210,6 +255,29 @@ describe('Schema Helper', () => {
     expect(json.mainEntity[2].acceptedAnswer.text).toEqual('Answer C');
   });
 
+  test('moduleSchemas(content)', () => {
+    const output = Schema.moduleSchemas(
+      [
+        {
+          path: 'web_page',
+          name: 'content',
+          speakable_enabled: '1',
+          title: 'SpeakableTitle',
+          module_value_id: 1,
+          tag: 'h2',
+        },
+      ],
+      '/'
+    )[0];
+
+    const json = parseCheckSchema(output);
+    expect(json['@type']).toEqual('WebPage');
+    expect(json.name).toEqual('SpeakableTitle');
+    expect(json.speakable).toBeDefined();
+    expect(json.speakable['@type']).toEqual('SpeakableSpecification');
+    expect(json.speakable.cssSelector).toEqual(['#1>h2', '#1>p']);
+  });
+
   test('templateSchemas(null)', () => {
     const output = Schema.templateSchemas({
       relation_type: 'other',