gatsby-core-theme 44.25.2 → 44.25.3

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [44.25.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.25.2...v44.25.3) (2026-06-08)
+
+
+### Bug Fixes
+
+* add tests ([ef7bba6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ef7bba67ffc98946830fe0d6c59a1c5e11753463))
+* update short codes to include images and different operator types ([8c48199](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8c48199182778c9d1b87d09d5c407f7c754eba5f))
+
+
+* Merge branch 'en-441-shortcodes' into 'master' ([658d10f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/658d10fc7c5b0b57631468b8ff44c2a381fd8e07))
+
 ## [44.25.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.25.1...v44.25.2) (2026-06-02)
 
 

package/package.json

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

package/src/helpers/getters.mjs

@@ -581,9 +581,13 @@ export const mapEntitiesByKey = ({ data = {}, keyField }) =>
 
     if (!key) return acc;
 
-    acc[String(key).toLowerCase()] = item;
+    const normalizedKey = String(key).toLowerCase();
 
+    if (!acc[normalizedKey]) {
+      acc[normalizedKey] = [];
+    }
 
+    acc[normalizedKey].push(item);
 
     return acc;
   }, {});

package/src/helpers/operatorContentShortCode.test.js

@@ -169,3 +169,131 @@ describe("resolveOperatorContentShortcode", () => {
     expect(result).toBeNull();
   });
 });
+
+describe("new array and operator_type behavior", () => {
+  beforeEach(() => {
+    process.env.IMAGE_CDN_URL = "https://cdn.example.com";
+  });
+
+  test("returns operator matching operator_type", () => {
+    const operators = {
+      142: [
+        {
+          id: 76387,
+          type: "casino",
+          name: "Bet365 Casino",
+        },
+        {
+          id: 60184,
+          type: "sportsbook",
+          name: "Bet365 Sportsbook",
+        },
+      ],
+    };
+
+    const match = "[field=name type=operator id=142 operator_type=sportsbook]";
+
+    const result = resolveOperatorContentShortcode(match, operators, {});
+
+    expect(result).toEqual("Bet365 Sportsbook");
+  });
+
+  test("returns first operator when operator_type is not provided", () => {
+    const operators = {
+      142: [
+        {
+          type: "casino",
+          name: "Bet365 Casino",
+        },
+        {
+          type: "sportsbook",
+          name: "Bet365 Sportsbook",
+        },
+      ],
+    };
+
+    const match = "[field=name type=operator id=142]";
+
+    const result = resolveOperatorContentShortcode(match, operators, {});
+
+    expect(result).toEqual("Bet365 Casino");
+  });
+
+  test("returns null when operator_type does not match", () => {
+    const operators = {
+      142: [
+        {
+          type: "casino",
+          name: "Bet365 Casino",
+        },
+      ],
+    };
+
+    const match = "[field=name type=operator id=142 operator_type=sportsbook]";
+
+    const result = resolveOperatorContentShortcode(match, operators, {});
+
+    expect(result).toBeNull();
+  });
+
+  test("returns first game when game entity is an array", () => {
+    const games = {
+      1962: [
+        {
+          game_id: 1962,
+          name: "Wolf Gold",
+        },
+      ],
+    };
+
+    const match = "[field=name type=game id=1962]";
+
+    const result = resolveOperatorContentShortcode(match, {}, games);
+
+    expect(result).toEqual("Wolf Gold");
+  });
+
+  test("returns standardized logo img tag", () => {
+    const operators = {
+      1: {
+        logo: {
+          filename: "logo.png",
+          width: 100,
+          height: 50,
+          alt: "Bet365",
+        },
+      },
+    };
+
+    const match = "[field=standardized_logo type=operator id=1]";
+
+    const result = resolveOperatorContentShortcode(match, operators, {});
+
+    expect(result).toContain("<img");
+    expect(result).toContain("logo.png");
+    expect(result).toContain('alt="Bet365"');
+    expect(result).toContain('width="100"');
+    expect(result).toContain('height="50"');
+  });
+
+  test("handles operator_type case-insensitively", () => {
+    const operators = {
+      142: [
+        {
+          type: "casino",
+          name: "Bet365 Casino",
+        },
+        {
+          type: "sportsbook",
+          name: "Bet365 Sportsbook",
+        },
+      ],
+    };
+
+    const match = "[field=name type=operator id=142 operator_type=SPORTSBOOK]";
+
+    const result = resolveOperatorContentShortcode(match, operators, {});
+
+    expect(result).toEqual("Bet365 Sportsbook");
+  });
+});

package/src/helpers/operatorContentShortcode.mjs

@@ -1,9 +1,49 @@
+// eslint-disable-next-line import/no-cycle
+
+const getImageExtension = (filename) => filename && filename.split(".").pop();
+
+const imagePrettyUrl = (filename, width = null, height = null) => {
+  if (filename) {
+    const extension = getImageExtension(filename);
+
+    const hasFilters = extension !== "svg" && extension !== "gif";
+    const cdnURL =
+      // eslint-disable-next-line no-nested-ternary
+      (hasFilters
+        ? process.env.IMAGE_CDN_URL
+        : process.env.IMAGE_CDN_URL
+        ? process.env.IMAGE_CDN_URL.replace("/filters:format(webp)", "")
+        : "") || process.env.STORYBOOK_IMAGE_CDN_URL;
+
+    if (width && height && hasFilters) {
+      const urlPath = "/fit-in";
+      const urlSize = `/${width}x${height}`;
+
+      return `${cdnURL}${urlPath}${urlSize}/${filename}`;
+    }
+
+    return `${cdnURL}/${filename}`;
+  }
+
+  return "/images/placeholder-image.jpg";
+};
+
 const stripHtml = (html = "") => html.replace(/<[^>]*>/g, "").trim();
 
 const getMainBonus = (operator) =>
   Object.values(operator.bonuses || {})[0] || {};
 
 const operatorFieldResolvers = {
+  standardized_logo: (operator) => `<img 
+  src="${imagePrettyUrl(
+    operator.logo.filename,
+    operator.logo.width,
+    operator.logo.height,
+  )}" 
+  alt="${operator.logo.alt}" 
+  width="${operator.logo.width || ""}" 
+  height="${operator.logo.height || ""}" 
+/>`,
   average_rating: (operator) => operator.rating,
 
   currencies: (operator) =>
@@ -35,6 +75,8 @@ export const resolveOperatorContentShortcode = (match, operators, games) => {
   const fieldMatch = match.match(/field=([^\s\]]+)/i);
   const typeMatch = match.match(/type=([^\s\]]+)/i);
   const idMatch = match.match(/id=(\d+)/);
+  const operatorTypeMatch = match.match(/operator_type=([^\s\]]+)/i);
+  const operatorType = operatorTypeMatch?.[1]?.toLowerCase();
 
   const field = fieldMatch?.[1];
   const type = typeMatch?.[1]?.toLowerCase();
@@ -47,10 +89,17 @@ export const resolveOperatorContentShortcode = (match, operators, games) => {
     game: games,
   };
 
-
   if (!entityMaps[type]) return null;
 
-  const entity = entityMaps[type]?.[String(id).toLowerCase()];
+  let entity = entityMaps[type]?.[String(id).toLowerCase()];
+
+  if (Array.isArray(entity)) {
+    if (type === "operator" && operatorType) {
+      entity = entity.find((op) => op.type?.toLowerCase() === operatorType);
+    } else {
+      [entity] = entity;
+    }
+  }
 
   if (!entity) return null;