gatsby-core-theme 44.0.39 → 44.0.40

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [44.0.40](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.39...v44.0.40) (2025-05-19)
+
+
+### Bug Fixes
+
+* add customeData ([b5936fa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b5936fac9e928cd78b70f48a2521ba9eb6118c20))
+* add validation for archive pages ([5561b9c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5561b9c2540ffe7f9917e6c2cba4d3cec7055e67))
+* centralaize the meta data ([3a21c76](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3a21c76f694482f587a31e26bd64eb8bbd5f78b1))
+* clean up the function ([91773ef](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/91773ef08cc1b40b5ca388715941eb033f3ae466))
+* fix aleternative links default ([e97e985](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e97e9854498f669c423597b4d68c9f6d8ff105a5))
+* fix issues ([dbcfcec](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dbcfcec545657a18ac35296033933a7728b6b0fd))
+* fix meta data ([c29976b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c29976bf95cc763695099ceec8044f5066a17dfa))
+* fix test ([3711007](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3711007e4427f057ff3a0a0019e19836aae1e304))
+* update meta data ([2888046](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2888046a7c512fc01d83159f06ab48be6f6d1546))
+* update the schema ([8eda362](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8eda362674e2fa2cf2e2f40d37a067944163e0f2))
+
+
+* Merge branch 'tm-5213-head' into 'master' ([90fb1d7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/90fb1d793113ffbda45ea6dc4f43bbcfd5052424))
+* Merge branch 'master' into 'tm-5213-head' ([28a6b72](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/28a6b72f1c15bca3bd755ba93863df48d0b91e9a))
+* Merge branch 'master' into tm-5213-head ([a14780f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a14780ff0d5b36080e94970c6ad674660c255f9e))
+
 ## [44.0.39](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.38...v44.0.39) (2025-05-15)
 
 

package/gatsby-node.mjs

@@ -88,7 +88,7 @@ function createArchivePage(
 
   if (process.env.CUSTOM_CONTENT_PAGES_PATH && archivePages) {
     // eslint-disable-next-line array-callback-return
-    archivePages = archivePages.filter((item) => {
+    archivePages = archivePages && archivePages.filter((item) => {
       if (item.path.includes(process.env.CUSTOM_CONTENT_PAGES_PATH)) {
         return item;
       }

package/package.json

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

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

@@ -0,0 +1 @@
+export default function customData() {}

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

@@ -1,76 +1,40 @@
-import React from 'react';
-import { render, cleanup, waitFor } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import React from "react";
+import { render, cleanup, waitFor } from "@testing-library/react";
+import "@testing-library/jest-dom/extend-expect";
 
-import Head, { getLanguage, getCanonicalUrl, getRobotOptions } from '.';
+import Head from ".";
 
-describe('Head Component', () => {
-  test('getLanguage()', () => {
-    expect(getLanguage('str')).toEqual('str');
-    expect(getLanguage('')).toEqual('en');
-    expect(getLanguage('no')).toEqual('nb-NO');
-  });
-
-  test('getCanonicalUrl()', () => {
-    expect(getCanonicalUrl({ path: '/' })).toEqual(process.env.GATSBY_SITE_URL);
-    expect(getCanonicalUrl({ path: 'sdsdasdsajkdhjkashk' })).toEqual(
-      `${process.env.GATSBY_SITE_URL}sdsdasdsajkdhjkashk`
-    );
-    expect(getCanonicalUrl({ path: 'about', canonical_url: 'contact' })).toEqual(
-      `${process.env.GATSBY_SITE_URL}contact`
-    );
-  });
-
-  test('getRobotOptions()', () => {
-    const arrOne = {
-      page_index: 0,
-      links_followed: 0,
-      images_index: 0,
-      show_snippet: 0,
-    };
-    expect(getRobotOptions(arrOne)).toEqual('noindex,nofollow,noimageindex,nosnippet');
-    arrOne.page_index = 1;
-    arrOne.show_snippet = 1;
-    expect(getRobotOptions(arrOne)).toEqual('nofollow,noimageindex');
-  });
-
-  test('render with props', async () => {
+describe("Head Component", () => {
+  test("render with props", async () => {
     const { container } = render(
       <Head
         siteInfo={{
-          site_name: 'test',
-          site_logo: '#',
+          site_name: "test",
+          site_logo: "#",
         }}
         page={{
-          meta_title: 'my meta title',
-          language: 'en',
-          meta_description: 'my meta description',
-          meta_robots: ['one', 'two', 'three'],
-          path: 'my path',
-          preconnect_links: ['1', '2', '3'],
+          meta_title: "my meta title",
+          language: "en",
+          meta_description: "my meta description",
+          meta_robots: ["one", "two", "three"],
+          path: "my path",
+          preconnect_links: ["1", "2", "3"],
           seo_json_schema: [],
           sections: { main: {} },
+          robot_options: { page_index: 1 },
         }}
       />
     );
+    // eslint-disable-next-line no-restricted-syntax
     expect(container).toBeTruthy();
     await waitFor(() => {
-      expect(document.title).toEqual('my meta title');
+      expect(document.title).toEqual("my meta title");
       // expect(document.documentElement.lang).toEqual('en');
-      expect(document.querySelectorAll('link[rel=preconnect]')).toHaveLength(3);
-      expect(document.getElementsByTagName('meta')[0].getAttribute('content')).toEqual(
-        'my meta description'
-      );
-      expect(document.getElementsByTagName('meta')[1].getAttribute('content')).toEqual(
-        'one,two,three'
-      );
+      expect(document.querySelectorAll("link[rel=preconnect]")).toHaveLength(3);
+      expect(
+        document.getElementsByTagName("meta")[0].getAttribute("content")
+      ).toEqual("my meta description");
 
-      expect(document.querySelector("meta[name='og:title']").getAttribute('content')).toEqual(
-        'my meta title'
-      );
-      // expect(document.querySelector('meta[name=og:site_name]').getAttribute('content')).toEqual(
-      //   'test'
-      // );
     });
   });
 });

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

@@ -1,95 +1,52 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { schemaGenerator } from '~helpers/schema';
-import { getUrl, getPageImage, imagePrettyUrl } from '~helpers/getters';
-import keygen from '~helpers/keygen';
-
-export function getLanguage(language) {
-  if (process.env.GATSBY_SITE_LANG) return process.env.GATSBY_SITE_LANG;
-  if (language === 'no') return 'nb-NO';
-  return language || 'en';
-}
-export function getCanonicalUrl(page, isTracker) {
-  if (page.canonical_url) {
-    return `${process.env.GATSBY_SITE_URL}${page.canonical_url}`;
-  }
-  if (page.path === '/') {
-    return process.env.GATSBY_SITE_URL;
-  }
-  const trailingSlash = process.env.TRAILING_SLASH ? '/' : '';
-
-  return `${process.env.GATSBY_SITE_URL}${page.path.replace(/^\//, '')}${
-    !isTracker ? trailingSlash : ''
-  }`
-
-}
-export function getRobotOptions(options) {
-  const array = [];
-  if (!options.page_index && process.env.GATSBY_ACTIVE_ENV !== 'development') array.push('noindex');
-  if (!options.links_followed && process.env.GATSBY_ACTIVE_ENV !== 'development')
-    array.push('nofollow');
-  if (!options.images_index && process.env.GATSBY_ACTIVE_ENV !== 'development')
-    array.push('noimageindex');
-  if (!options.show_snippet && process.env.GATSBY_ACTIVE_ENV !== 'development')
-    array.push('nosnippet');
-  if (process.env.GATSBY_ACTIVE_ENV === 'development') array.push('noindex,follow');
-  return array.join();
-}
-
-function setName(string) {
-  const [name] = string.split('.');
-  return name[0].toUpperCase() + name.slice(1);
-}
+/* eslint-disable no-unused-vars */
+import React from "react";
+import PropTypes from "prop-types";
+import { schemaGenerator } from "~helpers/schema";
+import keygen from "~helpers/keygen";
+import { getUrl, getLanguage } from "~helpers/getters";
+import { getMetaTags, getCanonicalUrl } from "~helpers/head";
+import customData from "./customData";
 
 const HeadData = ({ page = {}, siteInfo }) => {
-  const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
-  const isTracker = page.template === 'tracker';
+  const isTracker = page.template === "tracker";
+  const metaTags = getMetaTags(page, siteInfo, isTracker);
   let defaultHref = null;
-  // 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 (
     <>
       <title>{page.meta_title}</title>
       <html lang={getLanguage(page.language)} />
-      <meta name="description" content={page.meta_description} />
-      {page.meta_robots && process.env.GATSBY_ACTIVE_ENV !== 'development' && (
-        <meta name="robots" content={page.meta_robots.join()} />
-      )}
-      <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-      {page.robot_options && <meta name="robots" content={getRobotOptions(page.robot_options)} />}
-
-      {process.env.GATSBY_ACTIVE_ENV === 'development' && (
+      {metaTags}
+      {customData()}
+      {process.env.GATSBY_ACTIVE_ENV === "development" && (
         <meta name="googlebot" content="noindex,follow" />
       )}
-      <link rel="canonical" href={getCanonicalUrl(page, isTracker)} />
-      {page?.hreflangs?.map((link) => {
-        if (link?.default) defaultHref = link?.path;
-        return <link rel="alternate" href={getUrl(link.path)} hrefLang={link.language} />;
+      <link rel="canonical" href={getCanonicalUrl(page, isTracker)} />\
+      {page?.hreflangs?.map((link) => {        
+        if (link?.default) {
+          defaultHref = link?.path;
+        }
+        return (
+          <link
+            key={keygen()}
+            rel="alternate"
+            href={getUrl(link.path)}
+            hrefLang={link.language}
+          />
+        );
       })}
-      {defaultHref && <link rel="alternate" href={getUrl(defaultHref)} hrefLang="x-default" />}
-
-      {page.preconnect_links &&
-        page.preconnect_links.map((link) => <link key={keygen()} rel="preconnect" href={link} />)}
-      <meta name="og:title" content={page.meta_title} />
-      <meta name="og:site_name" content={siteInfo?.site_name && setName(siteInfo?.site_name)} />
-      <meta name="og:description" content={page.meta_description} />
-      <meta name="og:type" content={page.path === '/' ? 'website' : 'article'} />
-      <meta name="og:image" content={pageImage} />
-      <meta name="og:url" content={getCanonicalUrl(page, isTracker)} />
-      <meta
-        property="og:locale"
-        content={getLanguage(page.language) === 'en' ? 'en_GB' : getLanguage(page.language)}
-      />
-
-      {schemaGenerator(page, pageImage).map(
-        (schema) =>
-          schema && (
-            <script key={keygen()} type="application/ld+json">
-              {`${schema}`}
-            </script>
-          )
+      {defaultHref && (
+        <link rel="alternate" href={getUrl(defaultHref)} hrefLang="x-default" />
       )}
+      {page.preconnect_links &&
+        page.preconnect_links.map((link) => (
+          <link key={keygen()} rel="preconnect" href={link} />
+        ))}
+      {schemaGenerator(page, getUrl(page.path)).map((schema) => (
+        <script key={keygen()} type="application/ld+json">
+          {`${schema}`}
+        </script>
+      ))}
     </>
   );
 };

package/src/constants/metaTags.js

@@ -0,0 +1,15 @@
+import { getLanguage,setName } from '~helpers/getters';
+import {  getRobotOptions, getCanonicalUrl } from '~helpers/head';
+
+
+export default (page, siteInfo, pageImage, isTracker) =>  [
+    { type: "meta", name: "description", content: page.meta_description },
+    { type: "meta", name: "robots", content: getRobotOptions(page.robot_options) },
+    { type: "meta", property: "og:title", content: page.meta_title },
+    { type: "meta", property: "og:site_name", content: siteInfo?.site_name ? setName(siteInfo.site_name) : "" },
+    { type: "meta", property: "og:description", content: page.meta_description },
+    { type: "meta", property: "og:type", content: page.path === '/' ? 'website' : 'article' },
+    { type: "meta", property: "og:image", content: pageImage },
+    { type: "meta", property: "og:url", content: getCanonicalUrl(page, isTracker) },
+    { type: "meta", property: "og:locale", content: getLanguage(page.language) === 'en' ? 'en_GB' : getLanguage(page.language) },
+  ];

package/src/helpers/getters.mjs

@@ -363,10 +363,11 @@ export function getUrl(path) {
     return process.env.GATSBY_SITE_URL;
   }
 
-  return `${process.env.GATSBY_SITE_URL}${path.replace(/^\//, "")}`;
+  return `${process.env.GATSBY_SITE_URL}${path.replace(/^\//, "")}${process.env.TRALING_SLASH ? "/" : ""}`;
 }
 
 export function getLanguage(language) {
+  if (process.env.GATSBY_SITE_LANG) return process.env.GATSBY_SITE_LANG;
   if (language === "no") return "nb-NO";
   return language || "en";
 }
@@ -534,6 +535,11 @@ export const filterNonNullValues = (data) =>
     return acc;
   }, {});
 
+
+export function setName(string) {
+  const [name] = string.split(".");
+  return name[0].toUpperCase() + name.slice(1);
+}
   export const trailingSlash = (content) => {
     if (!content || process.env.TRAILING_SLASH !== "true") return content;
   

package/src/helpers/getters.test.js

@@ -457,6 +457,36 @@ describe('Getters Helper', () => {
     const expected = { a: 1, c: 2 };
     expect(Getters.filterNonNullValues(input)).toEqual(expected);
   });
+
+  describe('getLanguage', () => {
+    it('returns GATSBY_SITE_LANG if set', () => {
+      process.env.GATSBY_SITE_LANG = 'fr';
+      expect(Getters.getLanguage('en')).toBe('fr');
+    });
+
+    it('returns "nb-NO" if language is "no"', () => {
+      delete process.env.GATSBY_SITE_LANG;
+      expect(Getters.getLanguage('no')).toBe('nb-NO');
+    });
+
+    it('returns provided language if GATSBY_SITE_LANG is not set', () => {
+      delete process.env.GATSBY_SITE_LANG;
+      expect(Getters.getLanguage('es')).toBe('es');
+    });
+
+    it('returns "en" if no language is provided', () => {
+      delete process.env.GATSBY_SITE_LANG;
+      expect(Getters.getLanguage()).toBe('en');
+    });
+  });
+
+  describe('setName', () => {
+    it('returns capitalized name from string', () => {
+      expect(Getters.setName('example.com')).toBe('Example');
+    });
+  });
+
+
   test('basic functionality with sample HTML', () => {
     process.env.TRAILING_SLASH = 'true';
     process.env.GATSBY_SITE_URL = 'https://demo-gatsby-theme.gigmedia.com/';

package/src/helpers/head.js

@@ -0,0 +1,51 @@
+import React from "react";
+import { getPageImage, imagePrettyUrl } from "~helpers/getters";
+import keygen from "~helpers/keygen";
+import metaTags from "~constants/metaTags";
+
+export const getMetaTags = (page, siteInfo, isTracker) => {
+  const pageImage = getPageImage(page) || imagePrettyUrl(siteInfo?.site_logo);
+  return metaTags(page, siteInfo, pageImage, isTracker).map((meta) => (
+    <meta
+      key={keygen()}
+      {...(meta.name ? { name: meta.name } : { property: meta.property })}
+      content={meta.content}
+    />
+  ));
+};
+
+export function getCanonicalUrl(page, isTracker) {
+  if (page.canonical_url) {
+    return `${process.env.GATSBY_SITE_URL}${page.canonical_url}`;
+  }
+  if (page.path === "/") {
+    return process.env.GATSBY_SITE_URL;
+  }
+  const trailingSlash = process.env.TRAILING_SLASH ? "/" : "";
+
+  return `${process.env.GATSBY_SITE_URL}${page.path.replace(/^\//, "")}${
+    !isTracker ? trailingSlash : ""
+  }`;
+}
+
+export function getRobotOptions(options) {
+  const array = [];
+  if (
+    !options &&
+    !options.page_index &&
+    process.env.GATSBY_ACTIVE_ENV !== "development"
+  )
+    array.push("noindex");
+  if (
+    !options.links_followed &&
+    process.env.GATSBY_ACTIVE_ENV !== "development"
+  )
+    array.push("nofollow");
+  if (!options.images_index && process.env.GATSBY_ACTIVE_ENV !== "development")
+    array.push("noimageindex");
+  if (!options.show_snippet && process.env.GATSBY_ACTIVE_ENV !== "development")
+    array.push("nosnippet");
+  if (process.env.GATSBY_ACTIVE_ENV === "development")
+    array.push("noindex,follow");
+  return array.join();
+}

package/src/helpers/head.test.js

@@ -0,0 +1,50 @@
+import {getMetaTags, getCanonicalUrl}  from './head';
+
+describe('head.js functions', () => {
+  describe('getMetaTags', () => {
+    it('returns meta tags correctly', () => {
+      const page = {
+        robot_options: { page_index: 1 },
+        path:"/"
+      };
+      const siteInfo = { site_logo: 'logo.png' };
+      const isTracker = false;
+
+      const result = getMetaTags(page, siteInfo, isTracker);
+      // eslint-disable-next-line no-restricted-syntax
+      expect(result).toBeTruthy();
+    });
+  });
+
+  describe('getCanonicalUrl', () => {
+    beforeEach(() => {
+      process.env.GATSBY_SITE_URL = 'https://example.com';
+    });
+
+    it('returns canonical_url if set', () => {
+      const page = { canonical_url: 'canonical' };
+      process.env.GATSBY_SITE_URL = 'https://example.com/';
+      expect(getCanonicalUrl(page, false)).toBe('https://example.com/canonical');
+    });
+
+    it('returns site URL if page path is "/"', () => {
+      const page = { path: '/' };
+      process.env.GATSBY_SITE_URL = 'https://example.com/';
+      expect(getCanonicalUrl(page, false)).toBe('https://example.com/');
+    });
+
+    it('returns URL with trailing slash if TRAILING_SLASH is set', () => {
+      process.env.TRAILING_SLASH = 'true';
+      process.env.GATSBY_SITE_URL = 'https://example.com/';
+      const page = { path: 'about' };
+      expect(getCanonicalUrl(page, false)).toBe('https://example.com/about/');
+    });
+
+    it('returns URL without trailing slash if TRAILING_SLASH is not set', () => {
+      delete process.env.TRAILING_SLASH;
+      process.env.GATSBY_SITE_URL = 'https://example.com/';
+      const page = { path: 'about' };
+      expect(getCanonicalUrl(page, false)).toBe('https://example.com/about');
+    });
+  });
+});

package/src/helpers/schema.js

@@ -109,6 +109,9 @@ export const prosAndConsData = (pageObj) => {
   const prosAndConstObj =
     pageObj?.sections?.main?.modules?.find((elm) => elm?.name === 'pros_and_cons') || {};
 
+    const anchroUrl = prosAndConstObj?.anchored ? prosAndConstObj?.anchor_slug : '';
+    
+    
   // There are url keys because it is required
   // otherwise it would throw errors
   return (
@@ -120,8 +123,8 @@ export const prosAndConsData = (pageObj) => {
             prosAndConstObj?.pros?.map((elm, index) => ({
               '@type': 'ListItem',
               position: index + 1,
-              url: `${getUrl('/')}#${elm}`,
               name: elm,
+              url: `${getUrl('/')}${anchroUrl ? `#${anchroUrl}` : ''}`
             })) || [],
         },
       }),
@@ -132,7 +135,7 @@ export const prosAndConsData = (pageObj) => {
             prosAndConstObj?.cons?.map((elm, index) => ({
               '@type': 'ListItem',
               position: index + 1,
-              url: `${getUrl('/')}#${elm}`,
+              url: `${getUrl('/')}${anchroUrl ? `#${anchroUrl}` : ''}`,
               name: elm,
             })) || [],
         },
@@ -422,7 +425,7 @@ export function templateSchemas(page, pageImage) {
 
       return JSON.stringify(generateSchemaObject(schema));
     }
-    case 'operator': {
+    case 'operator': {      
       const schema = {
         '@context': 'https://schema.org',
         '@type': 'Review',
@@ -434,7 +437,7 @@ export function templateSchemas(page, pageImage) {
           '@type': 'Organization',
           url: getUrl(page.path),
           name: page.title || '',
-          image: page.relation?.logo?.filename,
+          image: imagePrettyUrl(page.relation?.logo?.filename),
         },
         reviewRating: {
           '@type': 'Rating',

package/src/helpers/schema.test.js

@@ -466,7 +466,7 @@ describe('Schema Helper', () => {
     expect(json.itemReviewed['@type']).toEqual('Organization');
     expect(json.itemReviewed.url).toEqual(getUrl('operator_page'));
     expect(json.itemReviewed.name).toEqual('Operator Title');
-    expect(json.itemReviewed.image).toEqual('logo_url/image.jpg');
+    expect(json.itemReviewed.image).toEqual('https://cdn.images.com/logo_url/image.jpg');
 
     expect(Object.prototype.toString.call(json.reviewRating)).toEqual('[object Object]');
     expect(json.reviewRating['@type']).toEqual('Rating');