gatsby-core-theme 44.30.6 → 44.30.7

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [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.30.7",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

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,
       },
     };
   }