gatsby-core-theme 44.0.41 → 44.1.0

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+# [44.1.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.42...v44.1.0) (2025-05-21)
+
+
+* Merge branch 'tm-5470-custom-logo-alt' into 'master' ([51d98bb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/51d98bb106549c47f61540780a5efd592202b67e))
+
+
+### Features
+
+* custom logo alt ([ddf1164](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ddf1164ea20a2143dff63a97fff5083293b9bcb8))
+
+## [44.0.42](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.41...v44.0.42) (2025-05-21)
+
+
+### Bug Fixes
+
+* fix test ([033c59d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/033c59d02855f46fe2b484b1927e9d94c81c28d2))
+* make changes ([0155c8c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/0155c8c074b0b51b2926d0a1963ffa26db3401c8))
+* remove static logic for IRL ([d51dd66](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d51dd66f4ef558432b5095940f21a01381e4daa9))
+* remove when content is null ([7ed4f5d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7ed4f5daacbe07658ada459dce15abb6394e5e34))
+
+
+* Merge branch 'tm-5213-head-update' into 'master' ([28abae7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/28abae7bdf0a46f1e8ac05c06dc6a6914ae4f665))
+
 ## [44.0.41](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.40...v44.0.41) (2025-05-20)
 
 

package/package.json

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

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

@@ -7,9 +7,9 @@ import { getUrl, getLanguage } from "~helpers/getters";
 import { getMetaTags, getCanonicalUrl } from "~helpers/head";
 import customData from "./customData";
 
-const HeadData = ({ page = {}, siteInfo }) => {
+const HeadData = ({ page = {} }) => {
   const isTracker = page.template === "tracker";
-  const metaTags = getMetaTags(page, siteInfo, isTracker);
+  const metaTags = getMetaTags(page, isTracker);
   let defaultHref = null;
 
   return (

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

@@ -26,6 +26,7 @@ const Navigation = ({
   stopScrollOnOpen = true,
   canOpenAllSubMenus = true,
   logo = "/images/logo.svg",
+  logoAlt = `${process.env.GATSBY_SITE_NAME} logo`,
   logoWidth = 200,
   logoHeight = 31,
   searchIcon = null,
@@ -39,7 +40,6 @@ const Navigation = ({
   megaMenu = false,
   menu,
 }) => {
-  
   const navRef = useRef(React.createRef());
   const { admin } = useContext(Context) || {};
   const showMenu =
@@ -54,12 +54,7 @@ const Navigation = ({
     pageTypes[template]?.showLogoWithLink ?? pageTypes.default.showLogoWithLink;
 
   const logoImg = (
-    <img
-      alt={`${process.env.GATSBY_SITE_NAME} logo`}
-      src={logo}
-      width={logoWidth}
-      height={logoHeight}
-    />
+    <img alt={logoAlt} src={logo} width={logoWidth} height={logoHeight} />
   );
 
   if (stopScrollOnOpen) toggleScroll("", true);
@@ -135,7 +130,9 @@ const Navigation = ({
               />
 
               <div className={styles.navIconContainer}>
-                {activeMarket && !disableMarketDropdown && <MarketDropdown pageContext={pageContext} />}
+                {activeMarket && !disableMarketDropdown && (
+                  <MarketDropdown pageContext={pageContext} />
+                )}
                 {showNotifications && <Notifications section={section} />}
                 {hasCustomComponent && (
                   <CustomComponent
@@ -205,6 +202,7 @@ Navigation.propTypes = {
   megaMenu: PropTypes.bool,
   menu: PropTypes.string,
   logo: PropTypes.string,
+  logoAlt: PropTypes.string,
   logoWidth: PropTypes.number,
   logoHeight: PropTypes.number,
 };

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

@@ -1,43 +1,86 @@
-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 { getNavigationMenus } from '~tests/factories/sections/navigation.factory';
-import getPageData from '../../../../tests/factories/pages/default.factory';
-import Navigation from '.';
+import { getNavigationMenus } from "~tests/factories/sections/navigation.factory";
+import getPageData from "../../../../tests/factories/pages/default.factory";
+import Navigation from ".";
 
 const menuSection = getNavigationMenus(1, 2, true);
-const pageContext = {page: getPageData()}
-describe('Navigation Component', () => {
-  test('render navigation', async () => {
-    const { container } = render(<Navigation pageContext={pageContext} section={menuSection} />);
+const pageContext = { page: getPageData() };
+describe("Navigation Component", () => {
+  test("render navigation", async () => {
+    const { container } = render(
+      <Navigation pageContext={pageContext} section={menuSection} />
+    );
 
     await waitFor(() => {
-      expect(container.querySelectorAll('.nav')).toHaveLength(1);
-      expect(container.querySelectorAll('.logo')).toHaveLength(1);
-      expect(container.querySelectorAll('.menuContainer')).toHaveLength(1);
-      expect(container.querySelectorAll('.search')).toHaveLength(1);
+      expect(container.querySelectorAll(".nav")).toHaveLength(1);
+      expect(container.querySelectorAll(".logo")).toHaveLength(1);
+      expect(container.querySelectorAll(".menuContainer")).toHaveLength(1);
+      expect(container.querySelectorAll(".search")).toHaveLength(1);
     });
   });
-  test('render navigation when template is ppc', async () => {
-    const { container } = render(<Navigation pageContext={pageContext} section={menuSection} template="ppc" />);
+  test("render navigation when template is ppc", async () => {
+    const { container } = render(
+      <Navigation
+        pageContext={pageContext}
+        section={menuSection}
+        template="ppc"
+      />
+    );
 
     await waitFor(() => {
-      expect(container.querySelectorAll('.nav')).toHaveLength(1);
-      expect(container.querySelectorAll('.logo')).toHaveLength(1);
-      expect(container.querySelectorAll('.menuContainer')).toHaveLength(0);
-      expect(container.querySelectorAll('.search')).toHaveLength(0);
+      expect(container.querySelectorAll(".nav")).toHaveLength(1);
+      expect(container.querySelectorAll(".logo")).toHaveLength(1);
+      expect(container.querySelectorAll(".menuContainer")).toHaveLength(0);
+      expect(container.querySelectorAll(".search")).toHaveLength(0);
     });
   });
-  test('render navigation without search', async () => {
-    const { container } = render(<Navigation pageContext={pageContext} section={menuSection} hasSearch={false} />);
+  test("render navigation without search", async () => {
+    const { container } = render(
+      <Navigation
+        pageContext={pageContext}
+        section={menuSection}
+        hasSearch={false}
+      />
+    );
 
     await waitFor(() => {
-      expect(container.querySelectorAll('.nav')).toHaveLength(1);
-      expect(container.querySelectorAll('.menuContainer')).toHaveLength(1);
-      expect(container.querySelectorAll('.search')).toHaveLength(0);
+      expect(container.querySelectorAll(".nav")).toHaveLength(1);
+      expect(container.querySelectorAll(".menuContainer")).toHaveLength(1);
+      expect(container.querySelectorAll(".search")).toHaveLength(0);
     });
   });
+  test("render navigation with custom logo alt", async () => {
+    const { container } = render(
+      <Navigation
+        pageContext={pageContext}
+        section={menuSection}
+        hasSearch={false}
+        logoAlt="custom logo alt"
+      />
+    );
+
+    expect(container.querySelectorAll("img")[0]).toHaveProperty(
+      "alt",
+      "custom logo alt"
+    );
+  });
+  test("render navigation with default logo alt", async () => {
+    const { container } = render(
+      <Navigation
+        pageContext={pageContext}
+        section={menuSection}
+        hasSearch={false}
+      />
+    );
+
+    expect(container.querySelectorAll("img")[0]).toHaveProperty(
+      "alt",
+      `${process.env.GATSBY_SITE_NAME} logo`
+    );
+  });
 });
 afterEach(() => {
   cleanup();

package/src/constants/metaTags.js

@@ -1,15 +1,71 @@
-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) },
-  ];
+/* eslint-disable camelcase */
+import parse from 'html-react-parser';
+import { getLanguage, setName, getPageImage, imagePrettyUrl } from "~helpers/getters";
+import { getRobotOptions, getCanonicalUrl, transformMetaTitle, getTwitterUsername } from "~helpers/head";
+
+
+
+export default (page, isTracker) => { 
+  const { relation, meta_title, meta_description, relation_type, siteInfo } = page;
+  const pageImage = getPageImage(page) || imagePrettyUrl(siteInfo?.site_logo);
+  const parsedMetaDescr = meta_description ? parse(meta_description) : '';
+  const metaTitle = transformMetaTitle(relation, meta_title, relation_type);
+  const twitterUsername = getTwitterUsername(page.siteSchema?.twitter);
+
+
+  return [
+  { type: "meta", name: "description", content: page.meta_description },
+  {
+    type: "meta",
+    name: "robots",
+    content: getRobotOptions(page.robot_options),
+  },
+  { type: "meta", property: "og:title", content: metaTitle},
+  {
+    type: "meta",
+    property: "og:site_name",
+    content: siteInfo?.site_name ? setName(siteInfo.site_name) : "",
+  },
+  { type: "meta", property: "og:description", content: parsedMetaDescr },
+  {
+    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),
+  },
+  { type: "meta", content: process.env.PLACENAME },
+  { type: "region", content: process.env.COUNTRY },
+  {
+    type: "meta",
+    name: "facebook-domain-verification",
+    content: process.env.FBVERIFACTION,
+  },
+  {
+    type: "meta",
+    name: "robots",
+    content:
+      process.env.GATSBY_ACTIVE_ENV !== "development"
+        ? page?.meta_robots?.join(",")
+        : null,
+  },
+  { type: "meta", name: "twitter:title", content: twitterUsername && metaTitle },
+  { type: "meta", name: "twitter:description", content: twitterUsername && parsedMetaDescr },
+  { type: "meta", name: "twitter:site", content: twitterUsername && `@${twitterUsername}` },
+  { type: "meta", name: "twitter:creator", content: twitterUsername && `@${twitterUsername}` },
+  { type: "meta", name: "twitter:card", content: twitterUsername && 'summary' },
+  { type: "meta", name: "twitter:image", content: twitterUsername && pageImage.replace('/filters:format(webp)', '') },
+]
+};

package/src/helpers/head.js

@@ -1,17 +1,23 @@
 import React from "react";
-import { getPageImage, imagePrettyUrl } from "~helpers/getters";
+import { getPageImage, imagePrettyUrl, getBonus } from "~helpers/getters";
+import { generatePlaceholderString } from "~helpers/generators";
 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}
-    />
-  ));
+  // eslint-disable-next-line array-callback-return
+  return metaTags(page, siteInfo, pageImage, isTracker).map((meta) => {
+    if (meta?.content) {
+      return (
+        <meta
+          key={keygen()}
+          {...(meta.name ? { name: meta.name } : { property: meta.property })}
+          content={meta.content}
+        />
+      );
+    }
+  });
 };
 
 export function getCanonicalUrl(page, isTracker) {
@@ -49,3 +55,37 @@ export function getRobotOptions(options) {
     array.push("noindex,follow");
   return array.join();
 }
+
+export function getLocale(language) {
+  if (language) {
+    const locale = language.split("_").reverse();
+    locale[1] = locale[1].toUpperCase();
+    return locale.join("_");
+  }
+  return null;
+}
+
+export function getTwitterUsername(url) {
+  // eslint-disable-next-line no-useless-escape
+  const regex = /https?:\/\/(www\.)?twitter\.com\/(#!\/)?@?([^\/]*)/;
+  const m = regex.exec(url);
+
+  if (m !== null && m.length >= 3) {
+    return m[3];
+  }
+
+  return null;
+}
+
+export function transformMetaTitle(relation, metaTitle, type) {
+  if (type !== "operator") return metaTitle;
+
+  switch (metaTitle) {
+    case "[OPERATOR_REVIEW_META_TITLE]":
+      return `${relation.name} ${generatePlaceholderString("[YEAR]")} ${
+        getBonus("main", relation).one_liner
+      }`;
+    default:
+      return metaTitle;
+  }
+}

package/src/helpers/head.test.js

@@ -1,4 +1,4 @@
-import {getMetaTags, getCanonicalUrl}  from './head';
+import {getMetaTags, getCanonicalUrl, getTwitterUsername, getLocale}  from './head';
 
 describe('head.js functions', () => {
   describe('getMetaTags', () => {
@@ -47,4 +47,29 @@ describe('head.js functions', () => {
       expect(getCanonicalUrl(page, false)).toBe('https://example.com/about');
     });
   });
+
+  describe('getLocale', () => {
+    it('returns null when no language is provided', () => {
+      expect(getLocale(null)).toBeNull();
+      expect(getLocale(undefined)).toBeNull();
+      expect(getLocale('')).toBeNull();
+    });
+
+    it('transforms language code correctly', () => {
+      expect(getLocale('en_us')).toBe('us_EN');
+    });
+  });
+
+  describe('getTwitterUsername', () => {
+    it('returns null for invalid Twitter URLs', () => {
+      expect(getTwitterUsername('')).toBeNull();
+      expect(getTwitterUsername('https://example.com')).toBeNull();
+      expect(getTwitterUsername('https://twitter.com')).toBeNull();
+    });
+
+    it('extracts username from various Twitter URL formats', () => {
+      expect(getTwitterUsername('https://twitter.com/username')).toBe('username');
+      expect(getTwitterUsername('https://www.twitter.com/username')).toBe('username');
+    });
+  });
 });