gatsby-core-theme 31.0.1 → 31.0.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [31.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v31.0.1...v31.0.2) (2024-05-22)
+
+
+### Code Refactoring
+
+* add author data to schema ([1fb10aa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1fb10aae770de676ec84fbba2db317aa4e9aa1ec))
+* correction to knows about ([a019d7a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a019d7a706041f5dcc142bb50b2e767cc22c92b1))
+
+
+* Merge branch 'tm-4271-multiple-contributors' into 'master' ([7bc03c4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7bc03c425ebc85b583324ddac976a56c9b17569e))
+
+
+### Tests
+
+* fix test ([0bcbf37](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0bcbf3784962944ebb5b85d77043bd9895116cbc))
+
 ## [31.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v31.0.0...v31.0.1) (2024-05-20)
 
 

package/package.json

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

package/src/helpers/schema.js

@@ -1,4 +1,4 @@
-import { getGameRating, getUrl, getLanguage } from './getters';
+import { getGameRating, getUrl, getLanguage, imagePrettyUrl } from './getters';
 import { cleanHTML } from './strings';
 
 /* HardCoded Start */
@@ -31,7 +31,53 @@ const socialLinks = [
   'wikipedia',
   'youtube',
 ];
+const socialAuthorLinks = [
+  'facebook_profile',
+  'twitter_profile',
+  'instagram_profile',
+  'linkedin_profile',
+];
+
 /* HardCoded End */
+const authorObj = (page, author, webSiteImage) => ({
+  '@context': 'https://schema.org',
+  '@type': 'Person',
+  name: author?.name || '',
+  image: author?.image ? imagePrettyUrl(author?.image) : '',
+  url: getUrl(author?.profile_page_path),
+  jobTitle: author?.author_title,
+  email: author?.email_address,
+  description: author?.biography,
+  sameAs: socialAuthorLinks
+    .map((socialLink) => author?.[socialLink])
+    .filter((socialLink) => socialLink),
+  knowsLanguage: getLanguage(page?.language),
+  nationality: {
+    '@type': 'Country',
+    name: author?.country?.name || '',
+  },
+  worksFor: {
+    '@type': 'Organization',
+    name: page?.siteSchema?.site_name,
+    logo: webSiteImage,
+    url: getUrl('/'),
+    sameAs: socialLinks
+      .map((socialLink) => page.siteSchema?.[socialLink])
+      .filter((socialLink) => socialLink),
+  },
+  knowsAbout: author?.knows_abouts?.map((item) => ({
+    '@type': item?.type,
+    name: item?.name,
+    sameAs: item?.links.map((link) => link?.link).filter((link) => link),
+  })),
+});
+
+const getAuthors = (page, webSiteImage) => {
+  if (page?.allAuthors?.length) {
+    return page?.allAuthors?.map((author) => authorObj(page, author, webSiteImage)) || [];
+  }
+  return page?.author_id ? authorObj(page, page?.author, webSiteImage) : '';
+};
 
 function checkSchemaProp(prop) {
   return (
@@ -196,7 +242,6 @@ export function webPageSchema(page, pageImage) {
             '@type': 'Country',
             name: page?.reviewer?.country?.name,
           },
-
           knowsAbout: page?.reviewer?.knows_abouts?.map((item) => ({
             '@type': item?.type,
             name: item?.name,
@@ -226,23 +271,7 @@ 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),
-      })),
-    },
+    author: getAuthors(page),
   };
   if (speakAbleModules.length > 0) {
     schema['@speakAbleModules'] = speakAbleModules.map((module) => JSON.parse(module));
@@ -359,12 +388,7 @@ export function moduleSchemas(modules, path, page, pageImage) {
 
 export function templateSchemas(page, pageImage) {
   const sharedProps = {
-    author: {
-      '@type': 'Person',
-      name: page.author?.name?.substring(0, 100),
-      url: getUrl(page.author?.profile_page_path || '/'),
-      ...(page?.author?.knowsAbout ? { knowsAbout: page?.author?.knowsAbout } : {}),
-    },
+    author: getAuthors(page),
     publisher: {
       '@type': 'Organization',
       name:

package/src/helpers/schema.test.js

@@ -118,9 +118,11 @@ describe('Schema Helper', () => {
         created_at: '01/01/01',
         updated_at: '02/02/02',
         seo_keywords: ['keyword_a', 'keyword_b'],
+        author_id: 112,
         author: {
           profile_page_path: 'author_a/author_page',
           email_address: 'email_a@email.com',
+          image: 'author_image.jpg',
           name: 'Author_A',
           image_object: {
             url: 'author_image.jpg',
@@ -220,7 +222,7 @@ describe('Schema Helper', () => {
     expect(json.primaryImageOfPage.inLanguage).toEqual('site_lang');
     expect(Object.prototype.toString.call(json.author)).toEqual('[object Object]');
     expect(json.author['@type']).toEqual('Person');
-    expect(json.author.image).toEqual('author_image.jpg');
+    expect(json.author.image).toEqual('https://cdn.images.com/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]');
@@ -330,9 +332,41 @@ describe('Schema Helper', () => {
       featured_image_object: {
         url: 'featured_image/image.jpg',
       },
+      author_id: 112,
       author: {
-        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
         profile_page_path: 'article_author/author_page',
+        email_address: 'email_a@email.com',
+        image: 'author_image.jpg',
+        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN',
+        image_object: {
+          url: 'author_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',
+              },
+            ],
+          },
+        ],
       },
       siteInfo: {
         site_logo: 'logo.jpg',
@@ -379,9 +413,41 @@ describe('Schema Helper', () => {
       featured_image_object: {
         url: 'featured_image/image.jpg',
       },
+      author_id: 112,
       author: {
-        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
+        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN',
         profile_page_path: 'operator_review_author/author_page',
+        email_address: 'email_a@email.com',
+        image: 'author_image.jpg',
+        image_object: {
+          url: 'author_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',
+              },
+            ],
+          },
+        ],
       },
       siteInfo: {
         site_logo: 'logo.jpg',
@@ -434,9 +500,41 @@ describe('Schema Helper', () => {
       featured_image_object: {
         url: 'featured_image/image.jpg',
       },
+      author_id: 112,
       author: {
-        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ',
+        name: 'Very long name for the 100 characters Article Author test - ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMN',
         profile_page_path: 'operator_review_author/author_page',
+        email_address: 'email_a@email.com',
+        image: 'author_image.jpg',
+        image_object: {
+          url: 'author_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',
+              },
+            ],
+          },
+        ],
       },
       siteInfo: {
         site_logo: 'logo.jpg',