gatsby-core-theme 44.30.6 → 44.31.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [44.31.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.30.7...v44.31.0) (2026-07-07)
+
+
+* Merge branch 'feat/coupon-acts-like-cta' into 'master' ([f5e1823](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f5e182396a398e9fcf8dd598474483b4c05e0ff1))
+
+
+### Features
+
+* coupon act as cta opt in option for bonus ([6e2bcb6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6e2bcb67404c234e7935567762668cc694607811))
+* share CTA tracking data-attributes and expose fireTracking for coupon CTA ([17025e2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/17025e229d2b097662aa81ea9b0de26b6758c1e8))
+
+## [44.30.7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.30.6...v44.30.7) (2026-07-06)
+
+
+### Bug Fixes
+
+* filter nonactive opertors ([9b9e7ee](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9b9e7eed246697404be814022f09b9cc430de7d1))
+
+
+* Merge branch 'en=580-nonactive-operators' into 'master' ([4896cdd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4896cdd5304f25c51c0b85cc342cb37419604292))
+
 ## [44.30.6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.30.5...v44.30.6) (2026-06-29)
 
 

package/package.json

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

package/src/components/atoms/button/operator-cta.js

@@ -4,10 +4,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import useTranslate from '~hooks/useTranslate/useTranslate';
 import { prettyTracker } from '~helpers/getters';
-import { trackerLinkActive } from '~helpers/tracker';
+import { trackerLinkActive, getCtaDataAttributes } from '~helpers/tracker';
 import styles from './button.module.scss';
 import useCtaClickHandler from '../../../hooks/useCtaClickHandler/index';
-import operatorTypes from "../../../constants/operatorTypes";
 
 const OperatorCtaButton = ({
   operator,
@@ -71,14 +70,6 @@ const OperatorCtaButton = ({
   const classes = `${styles[buttonType] || ''} ${status && styles[status] ? styles[status] : ''} ${buttonSize ? styles[`${buttonSize}_size`] : ''
     } `;
 
-  const operatorName = operator?.short_name || operator?.name || undefined;
-  const dataModule = moduleName && modulePosition ? `${moduleName}-${modulePosition}` : undefined;
-  const dataLocation =
-    moduleName && modulePosition
-      ? `${moduleName}-${modulePosition}${
-          itemPosition ? `-position-${itemPosition}` : ""
-        }`
-      : undefined;
   return (
     trackerLinkActive(operator, tracker) && status === "active" ? (
       <a
@@ -92,13 +83,12 @@ const OperatorCtaButton = ({
         target="_blank"
         rel={rel}
         onClick={handleCtaClick}
-        data-interaction="outbound-click"
-        {...(operator?.type && { 'data-vertical': operatorTypes[operator?.type] || operator?.type })}
-        {...(operatorName && { 'data-operator': operatorName })}
-        {...(trackerType && { 'data-tracker': trackerType })}
-        {...(modulePosition && { 'data-location': dataLocation })}
-        {...(itemPosition && { 'data-position': itemPosition })}
-        {...(dataModule && { 'data-module': dataModule })}
+        {...getCtaDataAttributes(operator, {
+          tracker,
+          moduleName,
+          modulePosition,
+          itemPosition,
+        })}
       >
         {translateBtn}
         {icon && icon}

package/src/components/molecules/bonus/template-one/index.js

@@ -8,7 +8,7 @@ import OperatorCta from "~atoms/button/operator-cta";
 import Rating from "~molecules/star-rating/one-star";
 import Tnc from "~molecules/tnc";
 import PrettyLink from "~atoms/pretty-link";
-import { TrackingKeys } from '~constants/tracking-api'
+import { TrackingKeys } from "~constants/tracking-api";
 import styles from "./bonus.module.scss";
 import Ribbons from "../../../atoms/ribbons";
 
@@ -26,12 +26,16 @@ export default function Bonus({
   ctaIcon = <FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />,
   modulePosition,
   showRibbon = false,
-  customClass='',
+  customClass = "",
+  couponActsAsCta = false,
 }) {
-  
   const { logo, bonus, name } = operator || {};
   return (
-    <div className={`${styles.operatorBanner || ""} ${customClass && styles[customClass]}`}>
+    <div
+      className={`${styles.operatorBanner || ""} ${
+        customClass && styles[customClass]
+      }`}
+    >
       <div className={styles.container}>
         {showRibbon && <Ribbons item={operator.ribbons} />}
         <div>
@@ -72,6 +76,7 @@ export default function Bonus({
               pageTemplate={pageTemplate}
               tracker={module?.type || "main"}
               modulePosition={modulePosition}
+              couponActsAsCta={couponActsAsCta}
             />
             {!tncFixed && (
               <Tnc
@@ -135,5 +140,6 @@ Bonus.propTypes = {
   ctaIcon: PropTypes.elementType,
   modulePosition: PropTypes.number,
   showRibbon: PropTypes.bool,
-  customClass: PropTypes.string
+  customClass: PropTypes.string,
+  couponActsAsCta: PropTypes.bool,
 };

package/src/components/molecules/bonus/template-two/index.js

@@ -11,7 +11,7 @@ import Rating from "~molecules/star-rating/one-star";
 import Tnc from "~molecules/tnc";
 import PrettyLink from "~atoms/pretty-link";
 import useTranslate from "~hooks/useTranslate/useTranslate";
-import { TrackingKeys } from '~constants/tracking-api'
+import { TrackingKeys } from "~constants/tracking-api";
 import styles from "./bonus.module.scss";
 
 export default function TemplateOne({
@@ -29,12 +29,12 @@ export default function TemplateOne({
   height = 120,
   showRatingLabel = false,
   showLabelMiddle = false,
-  ctaIcon = <FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />
-
+  couponActsAsCta = false,
+  ctaIcon = <FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />,
 }) {
   const { logo, bonus, name } = operator || {};
   const hasTncEnable = getOperatorTnc(operator);
-  
+
   const welcomeBonusText = useTranslate("welcome_bonus", "Welcome Bonus");
   const translationsObj = {
     active: {
@@ -54,8 +54,9 @@ export default function TemplateOne({
        ${hasTncEnable ? styles.operatorBannerTNC : ""}
        ${!closedBanner ? styles.show : styles.hide} 
        ${styles.tncEnable}
-       ${tncFixed ? styles.showTncFixed || "" : ""} ${floating ? styles.floating : ""
-        }`}
+       ${tncFixed ? styles.showTncFixed || "" : ""} ${
+        floating ? styles.floating : ""
+      }`}
     >
       <div className={styles.container}>
         <div>
@@ -94,7 +95,13 @@ export default function TemplateOne({
               <p className={styles.welcomeBonus}>{welcomeBonusText}</p>
             )}
 
-            <BonusBox moduleName={moduleName} item={operator} tracker={module?.type || "main"} pageTemplate={pageTemplate} />
+            <BonusBox
+              moduleName={moduleName}
+              item={operator}
+              tracker={module?.type || "main"}
+              pageTemplate={pageTemplate}
+              couponActsAsCta={couponActsAsCta}
+            />
             {!tncFixed && (
               <Tnc
                 isFixed={tncFixed}
@@ -158,4 +165,5 @@ TemplateOne.propTypes = {
   showLabelMiddle: PropTypes.bool,
   ctaIcon: PropTypes.elementType,
   showRoundedRating: PropTypes.bool,
+  couponActsAsCta: PropTypes.bool,
 };

package/src/helpers/search.js

@@ -50,3 +50,20 @@ export function sortIntOn(key) {
 export function normalizeForSearch(str) {
   return str.toLowerCase().replace(/\s+/g, "");
 }
+
+const isInactiveOperator = (item) =>
+  item.type === "operator" && item?.relation?.status !== "active";
+export function filterSearchResults(results = [], searchTerm) {
+  const term = (searchTerm || "").toLowerCase();
+  const matched = results.filter((item) =>
+    item.title.toLowerCase().includes(term)
+  );
+
+  if (!searchTerm) {
+    return matched.filter((item) => !isInactiveOperator(item));
+  }
+
+  return [...matched].sort(
+    (a, b) => Number(isInactiveOperator(a)) - Number(isInactiveOperator(b))
+  );
+}

package/src/helpers/search.test.js

@@ -1,5 +1,12 @@
-import { filterByKey, sortStringOn, sortIntOn, sortDateOn } from './search';
+import {
+  filterByKey,
+  sortStringOn,
+  sortIntOn,
+  sortDateOn,
+  filterSearchResults,
+} from './search';
 import loadSource from './search-source';
+import searchIndex from '../../tests/factories/search/data.json';
 
 describe('Scroll test', () => {
   test('loadSource()', () => {
@@ -62,3 +69,67 @@ describe('Scroll test', () => {
     expect(arr.sort(sortDateOn('created_at'))).toEqual(sorted);
   });
 });
+
+describe('filterSearchResults', () => {
+  const results = [
+    { title: 'Ladbrokes Casino', type: 'operator', relation: { status: 'inactive' } },
+    { title: 'Betfair Casino', type: 'operator', relation: { status: 'blacklisted' } },
+    { title: 'Upcoming Casino', type: 'operator', relation: { status: 'coming_soon' } },
+    { title: 'NotRec Casino', type: 'operator', relation: { status: 'not_recommended' } },
+    { title: 'Active Casino', type: 'operator', relation: { status: 'active' } },
+    { title: 'Another Active Casino', type: 'operator', relation: { status: 'active' } },
+    { title: 'Casino News Article', type: 'article' },
+    { title: 'Blackjack Game', type: 'game' },
+  ];
+
+  test('empty search shows active casinos only (hides inactive/upcoming/blacklisted/not_recommended)', () => {
+    const titles = filterSearchResults(results, '').map((i) => i.title);
+    expect(titles).toContain('Active Casino');
+    expect(titles).toContain('Another Active Casino');
+    expect(titles).not.toContain('Ladbrokes Casino');
+    expect(titles).not.toContain('Betfair Casino');
+    expect(titles).not.toContain('Upcoming Casino');
+    expect(titles).not.toContain('NotRec Casino');
+  });
+
+  test('empty search keeps non-operator content (articles, games)', () => {
+    const titles = filterSearchResults(results, '').map((i) => i.title);
+    expect(titles).toContain('Casino News Article');
+    expect(titles).toContain('Blackjack Game');
+  });
+
+  test('active search keeps inactive casinos so they remain findable', () => {
+    const titles = filterSearchResults(results, 'ladbrokes').map((i) => i.title);
+    expect(titles).toContain('Ladbrokes Casino');
+  });
+
+  test('active search orders active casinos before inactive ones', () => {
+    const operators = filterSearchResults(results, 'casino').filter(
+      (i) => i.type === 'operator'
+    );
+    let seenInactive = false;
+    const activeAfterInactive = operators.some((op) => {
+      const active = op.relation?.status === 'active';
+      if (!active) {
+        seenInactive = true;
+        return false;
+      }
+      return seenInactive;
+    });
+    expect(activeAfterInactive).toBe(false);
+  });
+
+  test('does not mutate the input array', () => {
+    const snapshot = [...results];
+    filterSearchResults(results, 'casino');
+    expect(results).toEqual(snapshot);
+  });
+
+  test('empty search on the generated index keeps only active operators', () => {
+    const operatorStatuses = filterSearchResults(searchIndex.arab_en, '')
+      .filter((i) => i.type === 'operator')
+      .map((i) => i.relation?.status);
+    expect(operatorStatuses.length).toBeGreaterThan(0);
+    expect(operatorStatuses.every((status) => status === 'active')).toBe(true);
+  });
+});

package/src/helpers/server-data.js

@@ -8,6 +8,7 @@ import { deparam } from "~helpers/strings";
 import { groupBy } from "~helpers/getters";
 import processor from "../resolver/index.mjs";
 import { fetchSiteSettings } from "../services/fetch.mjs";
+import { filterSearchResults } from "~helpers/search";
 
 export async function getAPIData(page, url, headers, preview) {
   if (preview) {
@@ -91,22 +92,16 @@ export async function getAPIData(page, url, headers, preview) {
       urlParams = deparam(`${url.split("?")[1]}`);
     }
 
-    const searchData = urlParams
-      ? urlParams.hasOwnProperty("s")
-        ? groupBy(
-            results.filter((item) =>
-              item.title.toLowerCase().includes(urlParams.s.toLowerCase())
-            ),
-            "pageType"
-          )
-        : null
-      : null;
+    const hasSearchParam = Boolean(urlParams && urlParams.hasOwnProperty("s"));
 
+    const searchData = hasSearchParam
+      ? groupBy(filterSearchResults(results, urlParams.s), "pageType")
+      : null;
 
     return {
       props: {
         data: searchData,
-        searchParam: urlParams ? urlParams.s : null,
+        searchParam: hasSearchParam ? urlParams.s : null,
       },
     };
   }

package/src/helpers/tracker.mjs

@@ -3,6 +3,7 @@
 import { generateTrackerLink } from "./generators.mjs";
 import { stripSuffixSlash } from "./strings.mjs";
 import { getCookie } from "./cookies.mjs";
+import operatorTypes from "../constants/operatorTypes.js";
 
 export function getTrackerName(operator, page, path) {
   const trackerLinks = operator ? Object.keys(operator.links) : [];
@@ -352,3 +353,33 @@ export function buildExternalRefererDeleteSetCookies(headers) {
 
   return buildDeleteCookie("");
 }
+
+// Builds the GTM `data-*` attributes for an outbound CTA anchor so that every
+// CTA (operator button, coupon redirect, …) tags clicks identically.
+export function getCtaDataAttributes(
+  operator,
+  { tracker = "main", moduleName, modulePosition, itemPosition } = {}
+) {
+  const trackerType = tracker?.toLowerCase()?.replace(" ", "_");
+  const operatorName = operator?.short_name || operator?.name || undefined;
+  const dataModule =
+    moduleName && modulePosition ? `${moduleName}-${modulePosition}` : undefined;
+  const dataLocation =
+    moduleName && modulePosition
+      ? `${moduleName}-${modulePosition}${
+          itemPosition ? `-position-${itemPosition}` : ""
+        }`
+      : undefined;
+
+  return {
+    "data-interaction": "outbound-click",
+    ...(operator?.type && {
+      "data-vertical": operatorTypes[operator?.type] || operator?.type,
+    }),
+    ...(operatorName && { "data-operator": operatorName }),
+    ...(trackerType && { "data-tracker": trackerType }),
+    ...(modulePosition && { "data-location": dataLocation }),
+    ...(itemPosition && { "data-position": itemPosition }),
+    ...(dataModule && { "data-module": dataModule }),
+  };
+}

package/src/helpers/tracker.test.js

@@ -470,4 +470,36 @@ describe("Tracker Helper", () => {
       expect(result[1]).toBe(`${cookieBase}; SameSite=Lax`);
     });
   });
+
+  describe("getCtaDataAttributes", () => {
+    test("builds outbound data-* attributes from operator + tracking context", () => {
+      const attrs = Tracker.getCtaDataAttributes(
+        { short_name: "rizk", type: "sportsbook" },
+        {
+          tracker: "PPC Fallback",
+          moduleName: "wageringCalculator",
+          modulePosition: 2,
+          itemPosition: 3,
+        }
+      );
+      expect(attrs).toEqual({
+        "data-interaction": "outbound-click",
+        "data-vertical": "sportsbook",
+        "data-operator": "rizk",
+        "data-tracker": "ppc_fallback",
+        "data-location": "wageringCalculator-2-position-3",
+        "data-position": 3,
+        "data-module": "wageringCalculator-2",
+      });
+    });
+
+    test("omits optional attributes when tracking context is missing", () => {
+      const attrs = Tracker.getCtaDataAttributes({ name: "Rizk Casino" });
+      expect(attrs).toEqual({
+        "data-interaction": "outbound-click",
+        "data-operator": "Rizk Casino",
+        "data-tracker": "main",
+      });
+    });
+  });
 });

package/src/hooks/useCtaClickHandler/index.js

@@ -76,7 +76,7 @@ const useCtaClickHandler = ({
     [fireTracking]
   );
 
-  return { ctaRef, handleCtaClick };
+  return { ctaRef, handleCtaClick, fireTracking };
 };
 
 export default useCtaClickHandler;