gatsby-matrix-theme 7.2.2 → 7.2.3

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [7.2.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.2.2...v7.2.3) (2022-10-13)
+
+
+### Bug Fixes
+
+* core version ([9159d5f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/9159d5f477acbab05397fa94535d630b9e525b83))
+* old schema matrix ([3f7040e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3f7040ee0d6c29c2a54af820c6232c4d5ff54688))
+
+
+* Merge branch 'tm-2833-old-schema-matrix' into 'master' ([6b5f5ea](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6b5f5ea58fc2222cf977ba3ae47018b72cc3e451))
+
 ## [7.2.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.2.1...v7.2.2) (2022-10-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "gatsby": "^4.20.0",
-    "gatsby-core-theme": "12.0.3",
+    "gatsby-core-theme": "12.0.4",
     "gatsby-plugin-sharp": "^4.10.2",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^4.10.0",

package/src/gatsby-core-theme/helpers/schema. /342/200/216test.js"

@@ -0,0 +1,165 @@
+import { getUrl } from 'gatsby-core-theme/src/helpers/getters';
+import * as Schema from './schema';
+
+const parseCheckSchema = (schema) => {
+  const json = JSON.parse(schema);
+  expect(Object.prototype.toString.call(schema)).toEqual('[object String]');
+  expect(Object.prototype.toString.call(json)).toEqual('[object Object]');
+  expect(json['@context']).toEqual('https://schema.org');
+  return json;
+};
+
+describe('Schema Helper', () => {
+  test('breadcrumbsSchema()', () => {
+    const output = Schema.breadcrumbsSchema({
+      path: 'some_path',
+      title: 'Some Title Review',
+      breadcrumbs: [
+        { path: 'breadcrumb_a', label: 'Breadcrumb A' },
+        { path: 'breadcrumb_b', label: 'Breadcrumb B' },
+      ],
+      siteSchema: {
+        site_name: 'Site Name',
+      },
+    });
+
+    const json = parseCheckSchema(output);
+    expect(json['@type']).toEqual('BreadcrumbList');
+
+    expect(Object.prototype.toString.call(json.itemListElement)).toEqual('[object Array]');
+    expect(json.itemListElement).toHaveLength(4);
+    json.itemListElement.forEach((element, i) => {
+      expect(Object.prototype.toString.call(element)).toEqual('[object Object]');
+      expect(Object.prototype.toString.call(element.item)).toEqual('[object Object]');
+      expect(element['@type']).toEqual('ListItem');
+      expect(element.position).toEqual(i + 1);
+      switch (i) {
+        case 1:
+          expect(element.name).toEqual('Breadcrumb A');
+          expect(element.item['@type']).toEqual('Thing');
+          expect(element.item['@id']).toEqual(getUrl('breadcrumb_a'));
+          expect(element.item.url).toEqual(getUrl('breadcrumb_a'));
+          break;
+        case 2:
+          expect(element.name).toEqual('Breadcrumb B');
+          expect(element.item['@type']).toEqual('Thing');
+          expect(element.item['@id']).toEqual(getUrl('breadcrumb_b'));
+          expect(element.item.url).toEqual(getUrl('breadcrumb_b'));
+          break;
+        case 3:
+          expect(element.name).toEqual('Some Title Review');
+          expect(element.item['@type']).toEqual('Thing');
+          expect(element.item['@id']).toEqual(getUrl('some_path'));
+          expect(element.item.url).toEqual(getUrl('some_path'));
+          break;
+        default:
+          expect(element.name).toEqual('Site Name');
+          expect(element.item['@type']).toEqual('Thing');
+          expect(element.item['@id']).toEqual(getUrl('/'));
+          expect(element.item.url).toEqual(getUrl('/'));
+          break;
+      }
+    });
+  });
+
+  test('schemaGenerator(PCSA)', () => {
+    process.env.GATSBY_SITE_NAME = 'playcasino.co.za';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
+      breadcrumbs: [{ path: '/' }],
+      type: 'operator',
+      path: '/',
+      sections: { main: { modules: [{ name: 'faq' }] } },
+      siteSchema: {
+        site_name: 'Site Name',
+      },
+    });
+
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
+
+    const jsonBreadcrumbs = parseCheckSchema(output[1]);
+    expect(jsonBreadcrumbs['@type']).toEqual('BreadcrumbList');
+
+    expect(output[2]).toEqual(null);
+
+    const jsonOrganization = parseCheckSchema(output[3]);
+    expect(jsonOrganization['@type']).toEqual('Organization');
+
+    const jsonArticle = parseCheckSchema(output[4]);
+    expect(jsonArticle['@type']).toEqual('Review');
+
+    const jsonFaq = parseCheckSchema(output[5]);
+    expect(jsonFaq['@type']).toEqual('FAQPage');
+  });
+
+  test('schemaGenerator(IL)', () => {
+    process.env.GATSBY_SITE_NAME = 'irishluck.ie';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
+      type: 'article',
+      path: '/test-path',
+    });
+
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
+
+    expect(output[1]).toEqual(null);
+
+    const jsonWebpage = parseCheckSchema(output[2]);
+    expect(jsonWebpage['@type']).toEqual('WebPage');
+    expect(jsonWebpage.keywords).toEqual(undefined);
+    expect(jsonWebpage.author.publishingPrinciples).toEqual(undefined);
+    expect(jsonWebpage.author.knowsAbout).toEqual(undefined);
+
+    expect(output[3]).toEqual(null);
+
+    const jsonArticle = parseCheckSchema(output[4]);
+    expect(jsonArticle['@type']).toEqual('Article');
+
+    expect(output[5]).toEqual(null);
+  });
+
+  test('schemaGenerator(NSA)', () => {
+    process.env.GATSBY_SITE_NAME = 'norskespilleautomater.com';
+    const output = Schema.schemaGenerator({
+      seo_json_schema: 'SEO JSON Schema',
+      type: 'other',
+      path: '/test-path',
+      siteSchema: {
+        publishing_principles: 'https://www.norskespilleautomater.com/om-oss/prinsipper',
+      },
+    });
+
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+
+    expect(Object.prototype.toString.call(output[0])).toEqual('[object String]');
+    expect(output[0]).toEqual('SEO JSON Schema');
+
+    expect(output[1]).toEqual(null);
+
+    const jsonWebpage = parseCheckSchema(output[2]);
+    expect(jsonWebpage['@type']).toEqual('WebPage');
+    expect(jsonWebpage.keywords).toEqual(undefined);
+    expect(jsonWebpage.author.publishingPrinciples).toEqual(
+      'https://www.norskespilleautomater.com/om-oss/prinsipper'
+    );
+    expect(Object.prototype.toString.call(jsonWebpage.author.knowsAbout)).toEqual('[object Array]');
+    expect(jsonWebpage.author.knowsAbout).toHaveLength(4);
+    expect(Object.prototype.toString.call(jsonWebpage.author.knowsAbout[0])).toEqual(
+      '[object Object]'
+    );
+    expect(jsonWebpage.author.knowsAbout[0]['@type']).toEqual('Thing');
+    expect(jsonWebpage.author.knowsAbout[0].name).toEqual('Norway');
+
+    expect(output[3]).toEqual(null);
+
+    expect(output[4]).toEqual(null);
+
+    expect(output[5]).toEqual(null);
+  });
+});

package/src/gatsby-core-theme/helpers/schema.js

@@ -0,0 +1,137 @@
+/* eslint-disable import/prefer-default-export */
+import {
+  generateSchemaObject,
+  webPageSchema,
+  organizationSchema,
+  moduleSchemas,
+  templateSchemas,
+} from 'gatsby-core-theme/src/helpers/schema';
+import { getUrl } from 'gatsby-core-theme/src/helpers/getters';
+
+const knowsAbout = [
+  {
+    '@type': 'Thing',
+    name: 'Norway',
+    sameAs: [
+      'https://no.wikipedia.org/wiki/Norge',
+      'https://www.google.no/search?q=Norge&pws=0&nord=1&hl=no&gl=NO',
+    ],
+  },
+  {
+    '@type': 'Thing',
+    name: 'LottStift',
+    sameAs: [
+      'https://no.wikipedia.org/wiki/Lotteri-_og_stiftelsestilsynet',
+      'https://www.google.no/search?q=lottstift&pws=0&nord=1&hl=no&gl=NO',
+    ],
+  },
+  {
+    '@type': 'Thing',
+    name: 'Kasino',
+    sameAs: [
+      'https://no.wikipedia.org/wiki/Kasino',
+      'https://www.google.no/search?q=Kasino&pws=0&nord=1&hl=no&gl=NO',
+    ],
+  },
+  {
+    '@type': 'Thing',
+    name: 'Norsk Tipping Kommisjonær',
+    sameAs: [
+      'https://no.wikipedia.org/wiki/Norsk_Tipping',
+      'https://www.google.no/search?q=norsk+tipping&pws=0&nord=1&hl=no&gl=NO',
+    ],
+  },
+];
+
+export function breadcrumbsSchema({
+  // type,
+  path,
+  title,
+  breadcrumbs,
+  siteSchema: { site_name: siteName } = {},
+  // relation: { game_provider: gameProvider } = {},
+}) {
+  /* Disabled until we get a confirmation from NSA Seo */
+  // const hasExtra = process.env.GATSBY_SITE_NAME === 'norskespilleautomater.com' && type === 'game';
+  const schema = {
+    '@context': 'https://schema.org',
+    '@type': 'BreadcrumbList',
+    '@id': `${getUrl(path)}#breadcrumblist`,
+    itemListElement: [
+      {
+        '@type': 'ListItem',
+        name: siteName,
+        position: 1,
+        item: {
+          '@type': 'Thing',
+          '@id': getUrl('/'),
+          url: getUrl('/'),
+        },
+      },
+      ...breadcrumbs.map((breadcrumb, index) => ({
+        '@type': 'ListItem',
+        name: breadcrumb.label,
+        position: index + 2,
+        item: {
+          '@type': 'Thing',
+          '@id': getUrl(breadcrumb.path),
+          url: getUrl(breadcrumb.path),
+        },
+      })),
+      /* Disabled until we get a confirmation from NSA Seo */
+      // ...(hasExtra
+      //   ? [
+      //       {
+      //         '@type': 'ListItem',
+      //         name: gameProvider?.name,
+      //         position: breadcrumbs.length + 2,
+      //         item: {
+      //           '@type': 'Thing',
+      //           '@id': getUrl(`spilleverandorer/${gameProvider?.short_name}`),
+      //           url: getUrl(`spilleverandorer/${gameProvider?.short_name}`),
+      //         },
+      //       },
+      //     ]
+      //   : []),
+      {
+        '@type': 'ListItem',
+        name: title,
+        // position: breadcrumbs.length + (hasExtra ? 3 : 2),
+        position: breadcrumbs.length + 2,
+        item: {
+          '@type': 'Thing',
+          '@id': getUrl(path),
+          url: getUrl(path),
+        },
+      },
+    ],
+  };
+
+  return JSON.stringify(generateSchemaObject(schema));
+}
+
+export function schemaGenerator(page = {}, pageImage) {
+  const isNSA = process.env.GATSBY_SITE_NAME === 'norskespilleautomater.com';
+  if (isNSA) {
+    page.knowsAbout = knowsAbout;
+  }
+
+  // Temporary Change for removing webPageSchema
+  const hasWebPageSchema = (page.type !== 'operator' && page.type !== 'game') || isNSA;
+  const hasOrganisationSchema = page.path === '/' || page.path === 'about-us';
+  const jsonSchema = [
+    // Page Schema
+    page.seo_json_schema,
+    // Breadcrumbs Schema
+    page.breadcrumbs?.length ? breadcrumbsSchema(page) : null,
+    hasWebPageSchema ? webPageSchema(page, pageImage) : null,
+    hasOrganisationSchema ? organizationSchema(page, pageImage) : null,
+    templateSchemas(page, pageImage),
+    // Modules Schemas
+    ...(page.sections?.main?.modules
+      ? moduleSchemas(page.sections.main.modules, page.path)
+      : [null]),
+  ];
+
+  return jsonSchema;
+}