gatsby-core-theme 44.0.27 → 44.0.29

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [44.0.29](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.28...v44.0.29) (2025-05-02)
+
+
+### Bug Fixes
+
+* add max-height ([e6761ec](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e6761ec824947c1a2737c8445a55994a68f5d798))
+* autocomplete ([8c6e7df](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8c6e7dff541dcb2f881d069fa47acd4af267d9b1))
+* extra-filed operator filter search ([a1a5519](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a1a55199d87ccee533c41f794651680a5bcb838d))
+* game cards need extra fields ([658caab](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/658caab2e01eb4f846e5894e8ebb1f067bac7d0c))
+* jest ([022231d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/022231dafd7b6e3a8b454cedeb3b3ed02b1a4278))
+* logo on operator ([5658824](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5658824db41998591596f3b9bc304dbb21419989))
+* new structure search pick ([05e9106](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/05e9106a14d02605c27106951351a116a4be4cac))
+* search icons ([2ef9a3f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2ef9a3f3462f15531158a3c82752538e44bebd05))
+* search json ([54019af](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/54019af88626c6b4fb265adab402a5351b50836b))
+* update stats ([17aa455](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/17aa455826d426bcd8903f543ce1679860c85b62))
+
+
+* Merge branch 'search-json' into 'master' ([710a55f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/710a55f0f922b0e986666e40315c4073d3908205))
+* Merge branch 'tm-5424-update-sportsbook-value' into 'master' ([21a7d4a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/21a7d4a5affe9cab7608958fb7f9088fa8e46855))
+
+## [44.0.28](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.27...v44.0.28) (2025-04-25)
+
+
+### Bug Fixes
+
+* sports relation kit bug ([de7f998](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/de7f998a91f2583548026d56325ab23fc834302c))
+* sports relation kit bug ([53bcd9c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/53bcd9c324355e1f3f0f570f526df44c4601e404))
+
 ## [44.0.27](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.0.26...v44.0.27) (2025-04-24)
 
 

package/package.json

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

package/src/components/atoms/search/autocomplete/game/index.js

@@ -7,7 +7,7 @@ import { imagePrettyUrl } from '~helpers/getters';
 import styles from './game.module.scss';
 
 const Game = ({ item = {}, width = 56, height = 56, btnText = '', icon = <FaArrowRight title="Right-pointing Arrow Icon" /> }) => {
-  const { relation } = item;
+  const { logo } = item;
 
   return (
     <li className={styles.row || ''}>
@@ -15,7 +15,7 @@ const Game = ({ item = {}, width = 56, height = 56, btnText = '', icon = <FaArro
         className={styles.gameImage}
         width={width}
         height={height}
-        src={relation?.logo?.filename ? imagePrettyUrl(relation?.logo?.filename, width, height) : '/images/default-slot.jpg'}
+        src={logo ? imagePrettyUrl(logo, width, height) : '/images/default-slot.jpg'}
         alt={item.title}
       />
       <h3 className={styles.gameTitle}>{item.title}</h3>

package/src/components/atoms/search/autocomplete/operator/index.js

@@ -7,17 +7,17 @@ import { imagePrettyUrl } from '~helpers/getters';
 import styles from './operator.module.scss';
 
 const Operator = ({ item = {}, width = 56, height = 56, btnText = '', icon = <FaArrowRight title="Right-pointing Arrow Icon" /> }) => {
-  const { relation } = item;
+  const { logo } = item;
 
   return (
     <li className={styles.row || ''}>
-      <LazyImage
+      {logo && <LazyImage
         className={styles.operatorImage}
         width={width}
         height={height}
-        src={imagePrettyUrl(relation?.logo?.filename, width, height)}
+        src={imagePrettyUrl(logo, width, height)}
         alt={item.title}
-      />
+      />}
       <h3 className={styles.operatorTitle}>{item.title}</h3>
       <Button
         to={item?.path}

package/src/components/molecules/search/search.module.scss

@@ -9,14 +9,20 @@
 }
 
 .formInput {
-    width: 100%;
-    border: 1px solid;
-    padding: 2.4rem;
-    padding-left: 5rem;
-    border-radius: 4rem;
+  width: 100%;
+  border: 1px solid;
+  padding: 2.4rem;
+  border-radius: 4rem;
+  padding-right: 6rem;
+}
+
+.searchButton {
+  position: absolute;
+  right: 2.4rem;
+  top: 2.5rem;
 }
 
 .noData {
   padding: 2.4rem;
   font-weight: bold;
-}
+}

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

@@ -84,7 +84,7 @@ const SearchForm = ({
     setAutoCompleteLoading(true);
 
     try {
-      autoCompleteData.current = autoCompleteData.current || await loadSource(market)
+      autoCompleteData.current = autoCompleteData.current || await loadSource(market, 'data-simple.json')
 
       setFilteredData(autoCompleteData.current.filter(item =>
         item.title.toLowerCase().includes(query.toLowerCase())
@@ -204,7 +204,7 @@ const SearchForm = ({
                                     }
                                   }}
                                 >
-                                  {useTranslate('autocomplete_see_all', 'View more')} {type}
+                                  {useTranslate('autocomplete_see_all', 'View more')} {useTranslate(type, type)}
                                 </button>
                               )}
 

package/src/components/organisms/search/search-input.test.js

@@ -0,0 +1,81 @@
+/* eslint-disable camelcase */
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import SearchForm from '.';
+
+// Mock loadSource
+jest.mock('../../../helpers/search-source', () => ({
+    //   __esModule: true,
+    default: jest.fn().mockResolvedValue([
+        { title: 'Game One', pageType: 'game' },
+        { title: 'Article One', pageType: 'article' }
+    ])
+}));
+
+const mockPageContext = {
+    page: {
+        market: 'test_market',
+        template: 'main'
+    }
+};
+
+describe('SearchForm Component', () => {
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    test('renders search button and hides input initially', () => {
+        render(<SearchForm pageContext={mockPageContext} />);
+        const button = screen.getByRole('button', { name: 'Search' });
+        expect(button).toBeInTheDocument();
+        expect(screen.queryByPlaceholderText('search')).not.toBeInTheDocument();
+    });
+
+    test('displays search input when button is clicked', () => {
+        render(<SearchForm pageContext={mockPageContext} />);
+        const button = screen.getByRole('button', { name: 'Search' });
+
+        fireEvent.click(button);
+
+        const input = screen.getByPlaceholderText('Search...');
+        expect(input).toBeInTheDocument();
+    });
+
+    test('shows grouped autocomplete results on input', async () => {
+        render(<SearchForm pageContext={mockPageContext} />);
+        fireEvent.click(screen.getByRole('button', { name: 'Search' }));
+
+        const input = screen.getByPlaceholderText('Search...');
+        fireEvent.keyUp(input, { target: { value: 'Game' } });
+
+
+    });
+
+
+
+    test('closes form when clicking outside', async () => {
+        render(
+            <div>
+                <SearchForm pageContext={mockPageContext} />
+                <div data-testid="outside">Outside</div>
+            </div>
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: 'Search' }));
+        const input = screen.getByPlaceholderText('Search...');
+        expect(input).toBeInTheDocument();
+
+        fireEvent.mouseDown(screen.getByTestId('outside'));
+
+        await waitFor(() => {
+            expect(screen.queryByPlaceholderText('search')).not.toBeInTheDocument();
+        });
+    });
+
+
+});
+
+
+
+

package/src/components/organisms/search/search.module.scss

@@ -67,6 +67,8 @@
 .autoCompleteContainer {
   background-color: #fff;
   margin-top: 0.8rem;
+  max-height: 65rem;
+  overflow: auto;
   border-radius: 0.8rem;
 }
 

package/src/constants/searchReleationPickKeys.mjs

@@ -1,24 +1,91 @@
 /* eslint-disable import/prefer-default-export */
-export const searchReleationPickKeys = [
-    'bonuses',
-    'logo',
-    'path',
-    'short_name',
-    'status',
-    "type",
-    "selling_points",
-    "support_types",
-    "ribbons",
-    "rating",
-    'name',
-    "standardised_logo_filename_object",
-    "game_provider",
-    "average_rating",
-    "first_rating",
-    "second_rating",
-    "third_rating",
-    "fourth_rating",
-    "extra_fields",
-    'rtp',
-    'volatility',
-];
+
+export const searchReleationPickKeys = {
+    page: [""],
+    operator: [
+        "name",
+        "logo",
+        "path",
+        "type",
+        "short_name",
+        "links",
+        "market",
+        "bonuses",
+        "status",
+        "selling_points",
+        "support_types",
+        "ribbons",
+        "rating",
+        "average_rating",
+        "first_rating",
+        "second_rating",
+        "third_rating",
+        "fourth_rating",
+        "extra_fields",
+        'rtp',
+        'volatility',
+    ],
+    game: [
+        "logo",
+        "name",
+        "type",
+        "rating",
+        "path",
+        "average_rating",
+        "first_rating",
+        "second_rating",
+        "third_rating",
+        "fourth_rating",
+        "extra_fields",
+        "status",
+        "game_provider",
+        "thumbnail_filename_object",
+        "standardised_logo_filename_object",
+        'rtp',
+        'volatility',
+    ],
+    article: ["type",],
+    author: [
+        "name",
+        "logo",
+        "type",
+        "image_object",
+        "author_title",
+        "image_alt",
+        "pages_count",
+        "biography",
+        "facebook_profile",
+        "instagram_profile",
+        "linkedin_profile",
+        "twitter_profile",
+        "tik_tok",
+        "personal_website"
+
+    ],
+    payment_method: [
+        "type",
+        "logo",
+        "name",
+        "rating",
+        "status",
+        "selling_points",
+        "average_rating",
+        "first_rating",
+        "second_rating",
+        "third_rating",
+        "fourth_rating",
+    ],
+    software_provider: [
+        "type",
+        "logo",
+        "name",
+        "rating",
+        "status",
+        "standardised_logo_filename_object",
+        "average_rating",
+        "first_rating",
+        "second_rating",
+        "third_rating",
+        "fourth_rating",
+    ]
+}

package/src/data/search/data-simple.json

@@ -0,0 +1 @@
+{}

package/src/helpers/processor/index.mjs

@@ -52,6 +52,7 @@ let menus = null;
 let prefilledMarketModules = null;
 let prefilledMarketModulesRaw = null;
 
+const searchSimpleData = {};
 const searchData = {};
 
 export function processSitemapPages(pages, markets) {
@@ -242,13 +243,13 @@ export function getReadingTime(sections) {
   );
 }
 
-function processSearchData(data, fs) {
+function processSearchData(data, fs, filename) {
   if (!fs) {
     return;
   }
 
   fs.writeFile(
-    `./src/data/search/data.json`,
+    `./src/data/search/${filename}`,
     JSON.stringify(data, null, " "),
     (error) => {
       if (error) {
@@ -364,7 +365,10 @@ export default {
 
       prefilledMarketModules = data.prefilled_market_modules || {};
       prefilledMarketModulesRaw = cloneDeep(data.prefilled_market_modules);
+
+      searchSimpleData[market] = [];
       searchData[market] = [];
+
       Object.keys(transformedPages[market]).forEach((pageType) => {
         transformedPages[market][pageType].forEach((page, index) => {
           const translations = translationsData
@@ -474,31 +478,45 @@ export default {
 
           pagesMappedById[page.id] = page;
 
-         
+
           // add search data
           if (searchTemplatesAcitve.includes(page.template) && searchEnabled) {
-            const { title, path, status, type, relation, author } = transformedPages[market][pageType][index];
+            const { title, path, status, banner, type, relation, author, extra_fields } = transformedPages[market][pageType][index];
 
-            const filteredRelation = filterRelation(relation, searchReleationPickKeys);
+            const filteredRelation = filterRelation(relation, searchReleationPickKeys[type]);
 
             const allowedAuthorRelationKeys = ['image', 'name'];
-            const filteredAuthorRelation = filterRelation(author, allowedAuthorRelationKeys);
+            const filteredAuthorRelation = author && filterRelation(author, allowedAuthorRelationKeys);
+
+            const operatorExtraFileds = extra_fields?.operator && filterRelation(extra_fields?.operator, searchReleationPickKeys['operator']);
 
             const minimalPage = {
               title,
               pageType,
               path,
+              banner,
+              type,
               ...(relation?.short_name && { short_name: relation.short_name }),
-              // ...(relation?.logo && { logo: relation.logo.filename }),
+              ...(relation?.logo && { logo: relation.logo.filename }),
               ...(relation?.game_id && { game_id: relation.game_id }),
-              type,
-              ...(filteredRelation && { relation: filteredRelation }),
-              ...(filteredAuthorRelation && { author: filteredAuthorRelation }),
             };
 
-            status === 'active' && searchData[page.market].push(
-              cloneDeep(minimalPage)
-            );
+            if (status === 'active') {
+              searchSimpleData[page.market].push(
+                cloneDeep(minimalPage)
+              );
+              searchData[page.market].push(
+                cloneDeep({
+                  ...minimalPage,
+                  ...(filteredRelation && { relation: filteredRelation }),
+                  ...(filteredAuthorRelation && { author: filteredAuthorRelation }),
+                  ...operatorExtraFileds && { extra_fields: { 
+                    operator: operatorExtraFileds 
+                  } },
+                })
+              );
+            }
+
           }
 
           const sectionList = postSectionsMap[page.relation_type];
@@ -596,7 +614,8 @@ export default {
     });
 
     if (searchEnabled) {
-      processSearchData(searchData, fs);
+      processSearchData(searchSimpleData, fs, "data-simple.json");
+      processSearchData(searchData, fs, "data.json");
     }
 
     data.pages = transformedPages;

package/src/helpers/processor/modules.mjs

@@ -556,6 +556,11 @@ export function processModule(
         makeCount[page.template] = (makeCount[page.template] || 0) + 1;
         return makeCount;
       }, {});
+
+    pagesByTemplate.operatorTimesBonus =
+      (pagesByTemplate.operator_review || 0) *
+      (pagesByTemplate.free_bonuses || 0);
+
     module.stats = pagesByTemplate;
   } else if (module.name === "carousel") {
     processCarouselModule(module, content);

package/src/helpers/processor/sports-relations.mjs

@@ -187,14 +187,16 @@ export const processSportsRelations = (
 
           // Optimization 2: Convert teams and team_kits to Maps if used frequently
           const teamsMap = new Map(Object.entries(teams));
+
           const teamKitsMap = new Map(
             Object.entries(data.relations.sports_data.team_kits)
           );
 
           if (tournament && tournament.teams) {
             tournament.teams.forEach((teamId) => {
-              const team = teamsMap.get(teamId);
-              const kit = teamKitsMap.get(team?.livegoals_v2_id);
+
+              const team = teamsMap.get(teamId.toString());
+              const kit = team?.livegoals_v2_id ? teamKitsMap.get(team?.livegoals_v2_id.toString()) : null;
 
               if (team && kit) {
                 teamKits[team.livegoals_v2_id] = kit; // Shallow copy might be enough

package/src/helpers/search-source.js

@@ -1,4 +1,4 @@
-export default async function loadSource(market) {
+export default async function loadSource(market, file = 'data.json') {
   // Search data source
-  return import('../data/search/data.json').then((data) => data[market]);
+  return import(`../data/search/${file}`).then((data) => data[market]);
 }

package/src/helpers/search.test.js

@@ -3,7 +3,7 @@ import loadSource from './search-source';
 
 describe('Scroll test', () => {
   test('loadSource()', () => {
-    const data = loadSource('id', ['title']);
+    const data = loadSource('id');
     expect(data).toBeInstanceOf(Promise);
   });
 

package/src/helpers/server-data.js

@@ -84,7 +84,7 @@ export async function getAPIData(page, url, headers, preview) {
     return { props: {} };
   }
 
-  const results = await loadSource(page.market);
+  const results = await loadSource(page.market, "data.json");
   if (page.path.endsWith("/s") || page.path === "s") {
     let urlParams = null;
     if (url && url.split("?").length === 2) {