gatsby-core-theme 44.2.19 → 44.3.0

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+# [44.3.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.20...v44.3.0) (2025-06-25)
+
+
+### Bug Fixes
+
+* filters order ([78bae80](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/78bae801cd85a65cf30007997e7c8973d17d505a))
+* notification time ([355d437](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/355d4373ae1d7636c70e3822f1be52f502143927))
+* rm consoel logs ([9d02b9d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9d02b9d9808b904d53f4fb63ee72bb7c76bc52d6))
+* rm old tests ([41d19a8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/41d19a859a1d9a76e16aa19c374ab5e27f7f8557))
+* sync with main ([dfcc323](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dfcc323274e8578b9de12a04345ec77692c6ca6a))
+* use filterOperators in processFilters ([c6745f1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c6745f1c331746565a769bb3a77f77811f4febce))
+
+
+* Merge branch 'tm-5525-toplist-filters' into 'master' ([e5b1468](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e5b1468a565a367351fe065d44592383ed1d31f0))
+* Merge branch 'tm-5536-notifications-time' into 'master' ([48889f9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/48889f94b175238fffac8fa91e88e5bf15f504f2))
+
+
+### Features
+
+* build filters for enabled templates ([3d201c2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3d201c20fa5e1794b00a7522953d2ab195168bfb))
+* build filters on top list ([908a65f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/908a65fbb2b6fcf6869fadce2e83d96267e2c29e))
+* slice toplists on filters ([6074186](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/60741862f3bc6f9d30a107921a9c1866f9b1d7ac))
+* split filter operators, remove promises ([55483bb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/55483bbe76ed03673ce6feae7ed62bce6e8dda58))
+
+
+### Tests
+
+* buildTopListFilter ([ab811e7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ab811e791e631c6fffb1cd76c05cdce36ec07987))
+* process filters ([d396159](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d396159e6789b86b63d14cd743f7838e9d6dd7e3))
+
+## [44.2.20](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.19...v44.2.20) (2025-06-24)
+
+
+### Bug Fixes
+
+* typo ([68823f3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/68823f353806c946ff9602e61f9046c77d6fcd1c))
+
+
+* Merge branch 'fix-typo' into 'master' ([1cbb641](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1cbb641c00625d0d84668bc74e6c8249cd06d5c3))
+
 ## [44.2.19](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.18...v44.2.19) (2025-06-24)
 
 

package/package.json

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

package/src/components/molecules/floating-area/index.js

@@ -71,7 +71,8 @@ export default function FloatingArea({
 
   return (
     <div className={`${styles.floatingArea} ${showScroll ? styles.show : ""}`}>
-      {pageTypes?.[pageTemplate]?.showScrollToTop || pageTypes.default?.showScrollToTop && <ScrollToTop />}
+      {(pageTypes?.[pageTemplate]?.showScrollToTop ||
+        pageTypes.default?.showScrollToTop) && <ScrollToTop />}
       {OperatorBanner && (
         <Suspense fallback={<></>}>
           <OperatorBanner
@@ -87,27 +88,26 @@ export default function FloatingArea({
         </Suspense>
       )}
 
-      {CookieConsent &&
-        showCookies && (
-          <CookieConsent
-            market={pageContext?.page?.market}
-            type={pageType}
-            template={template}
-            settingsCookie
-            isPageHomepage={isPageHomepage}
-          >
-            {
-              customCookieContent || <p>
-                We use cookies in order to optimise our site and improve your
-                experience with us. By using the site you consent to our
-                <a href="/cookies" className="cookie-consent-gtm">
-                  Cookie Policy
-                </a>
-                .
-              </p>
-            }
-          </CookieConsent>
-        )}
+      {CookieConsent && showCookies && (
+        <CookieConsent
+          market={pageContext?.page?.market}
+          type={pageType}
+          template={template}
+          settingsCookie
+          isPageHomepage={isPageHomepage}
+        >
+          {customCookieContent || (
+            <p>
+              We use cookies in order to optimise our site and improve your
+              experience with us. By using the site you consent to our
+              <a href="/cookies" className="cookie-consent-gtm">
+                Cookie Policy
+              </a>
+              .
+            </p>
+          )}
+        </CookieConsent>
+      )}
       {FooterNavigation && (
         <Suspense fallback={<></>}>
           <FooterNavigation section={footerNavigationData} />

package/src/helpers/date-time.js

@@ -30,14 +30,14 @@ export function formatDate(date, format, separator = '/', market = 'en-GB') {
 }
 
 export const getTimeAgo = (dateString) => {
-  const date = new Date(dateString.includes('Z') ? dateString : `${dateString.replace(" ", "T")}Z`);
-  const now = new Date(new Date().toISOString().slice(0, 19));
+    const date = new Date(dateString.replace(" ", "T")); // Make it ISO-compliant
+    const now = new Date();
 
-  const diffMs = now.getTime() - date.getTime();
-  const diffMinutes = Math.floor(diffMs / (1000 * 60));
-  const diffHours = Math.floor(diffMinutes / 60);
-  const diffDays = Math.floor(diffHours / 24);
-  const diffMonths = Math.floor(diffDays / 30);
+    const diffMs = now.getTime() - date.getTime();
+    const diffMinutes = Math.floor(diffMs / (1000 * 60));
+    const diffHours = Math.floor(diffMinutes / 60);
+    const diffDays = Math.floor(diffHours / 24);
+    const diffMonths = Math.floor(diffDays / 30);
 
   if (diffDays >= 32) {
     return { value: diffMonths, key: diffMonths === 1 ? "month_ago" : "months_ago" };
@@ -49,4 +49,4 @@ export const getTimeAgo = (dateString) => {
     return { value: diffHours, key: diffHours === 1 ? "hour_ago" : "hours_ago" };
   }
   return { value: diffMinutes, key: diffMinutes === 1 ? "minute_ago" : "minutes_ago" };
-};
+};

package/src/helpers/date-time.test.js

@@ -10,16 +10,16 @@ describe('Date-Time Helper', () => {
 
 
   test('getTimeAgo()', () => {
-  const nowUTC = new Date(new Date().toISOString().slice(0, 19));
+    const now = new Date();
 
-  const minutesAgo = new Date(nowUTC.getTime() - 5 * 60 * 1000).toISOString().slice(0, 19); // 5 mins ago
-  const hoursAgo = new Date(nowUTC.getTime() - 2 * 60 * 60 * 1000).toISOString().slice(0, 19); // 2 hours ago
-  const daysAgo = new Date(nowUTC.getTime() - 10 * 24 * 60 * 60 * 1000).toISOString().slice(0, 19); // 10 days ago
-  const monthsAgo = new Date(nowUTC.getTime() - 65 * 24 * 60 * 60 * 1000).toISOString().slice(0, 19); // ~2 months ago
+    const minutesAgo = new Date(now.getTime() - 5 * 60 * 1000).toISOString(); // 5 minutes ago
+    const hoursAgo = new Date(now.getTime() - 2 * 60 * 60 * 1000).toISOString(); // 2 hours ago
+    const daysAgo = new Date(now.getTime() - 10 * 24 * 60 * 60 * 1000).toISOString(); // 10 days ago
+    const monthsAgo = new Date(now.getTime() - 65 * 24 * 60 * 60 * 1000).toISOString(); // ~2 months ago
 
-  expect(getTimeAgo(minutesAgo)).toMatchObject({ key: 'minutes_ago', value: 5 });
-  expect(getTimeAgo(hoursAgo)).toMatchObject({ key: 'hours_ago', value: 2 });
-  expect(getTimeAgo(daysAgo)).toMatchObject({ key: 'days_ago', value: 10 });
-  expect(getTimeAgo(monthsAgo)).toMatchObject({ key: 'months_ago', value: 2 });
-});
+    expect(getTimeAgo(minutesAgo)).toMatchObject({ key: 'minutes_ago', value: 5 });
+    expect(getTimeAgo(hoursAgo)).toMatchObject({ key: 'hours_ago', value: 2 });
+    expect(getTimeAgo(daysAgo)).toMatchObject({ key: 'days_ago', value: 10 });
+    expect(getTimeAgo(monthsAgo)).toMatchObject({ key: 'months_ago', value: 2 });
+  });
 });

package/src/resolver/build-toplist-filter.mjs

@@ -0,0 +1,66 @@
+function buildToplistFilter(pageFilters, operator) {
+  const addToFilter = (category, key, operatorId) => {
+    if (!category[key]) category[key] = { items: [] };
+    category[key].items.push(operatorId);
+  };
+  const operatorId = operator.id;
+  const rating = Math.floor(operator.rating);
+
+  // Rating filters
+  if (rating >= 1 && rating <= 5) {
+    pageFilters.rating[rating].items.push(operatorId);
+
+    // Best online casinos (5-star ratings)
+    if (rating === 5) {
+      pageFilters.popular_filters.best_online.items.push(operatorId);
+    }
+  }
+
+  // Deposit methods
+  operator.deposit_methods?.forEach((method) => {
+    addToFilter(pageFilters.deposit_methods, method.name, operatorId);
+
+    // Crypto filter
+    if (method.name.toLowerCase() === "cryptocurrency") {
+      pageFilters.popular_filters.crypto.items.push(operatorId);
+    }
+  });
+
+  // Withdrawal methods
+  operator.withdrawal_method?.forEach((method) => {
+    addToFilter(pageFilters.withdrawal_method, method.name, operatorId);
+  });
+
+  // Game categories
+  operator.game_categories?.forEach((category) => {
+    addToFilter(pageFilters.game_categories, category, operatorId);
+  });
+
+  // Licenses
+  operator.license_objects?.forEach((license) => {
+    addToFilter(pageFilters.licenses, license.name, operatorId);
+  });
+
+  // Payout time
+  if (operator.payout_time) {
+    addToFilter(pageFilters.payout_time, operator.payout_time, operatorId);
+  }
+
+  // Payout rate
+  const payoutRatio = operator.extra_fields?.payoutRatio;
+  if (payoutRatio) {
+    addToFilter(pageFilters.payout_rate, payoutRatio, operatorId);
+  }
+
+  // Mobile optimized
+  if (operator.extra_fields?.mobile_optimized) {
+    pageFilters.popular_filters.mobile_optimized.items.push(operatorId);
+  }
+
+  // Best live casino
+  if (operator.extra_fields?.best_live_casino) {
+    pageFilters.popular_filters.best_live.items.push(operatorId);
+  }
+}
+
+export default buildToplistFilter;

package/src/resolver/build-toplist-filter.test.js

@@ -0,0 +1,104 @@
+import buildToplistFilter from "./build-toplist-filter.mjs";
+
+describe("buildToplistFilter", () => {
+  let pageFilters;
+  let operator;
+
+  beforeEach(() => {
+    pageFilters = {
+      rating: {
+        1: { items: [] },
+        2: { items: [] },
+        3: { items: [] },
+        4: { items: [] },
+        5: { items: [] },
+      },
+      popular_filters: {
+        best_online: { items: [] },
+        crypto: { items: [] },
+        mobile_optimized: { items: [] },
+        best_live: { items: [] },
+      },
+      deposit_methods: {},
+      withdrawal_method: {},
+      game_categories: {},
+      licenses: {},
+      payout_time: {},
+      payout_rate: {},
+    };
+
+    operator = {
+      id: "operator1",
+      rating: 5,
+      deposit_methods: [{ name: "Cryptocurrency" }, { name: "Credit Card" }],
+      withdrawal_method: [{ name: "Bank Transfer" }],
+      game_categories: ["Slots", "Poker"],
+      license_objects: [{ name: "License A" }],
+      payout_time: "24 hours",
+      extra_fields: {
+        payoutRatio: "95%",
+        mobile_optimized: true,
+        best_live_casino: true,
+      },
+    };
+  });
+
+  it("should add operator to the correct rating filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.rating[5].items).toContain("operator1");
+    expect(pageFilters.popular_filters.best_online.items).toContain(
+      "operator1"
+    );
+  });
+
+  it("should add operator to the deposit methods and crypto filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.deposit_methods.Cryptocurrency.items).toContain(
+      "operator1"
+    );
+    expect(pageFilters.deposit_methods["Credit Card"].items).toContain(
+      "operator1"
+    );
+    expect(pageFilters.popular_filters.crypto.items).toContain("operator1");
+  });
+
+  it("should add operator to the withdrawal methods", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.withdrawal_method["Bank Transfer"].items).toContain(
+      "operator1"
+    );
+  });
+
+  it("should add operator to the game categories", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.game_categories.Slots.items).toContain("operator1");
+    expect(pageFilters.game_categories.Poker.items).toContain("operator1");
+  });
+
+  it("should add operator to the licenses", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.licenses["License A"].items).toContain("operator1");
+  });
+
+  it("should add operator to the payout time filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.payout_time["24 hours"].items).toContain("operator1");
+  });
+
+  it("should add operator to the payout rate filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.payout_rate["95%"].items).toContain("operator1");
+  });
+
+  it("should add operator to the mobile optimized filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.popular_filters.mobile_optimized.items).toContain(
+      "operator1"
+    );
+  });
+
+  it("should add operator to the best live casino filter", () => {
+    buildToplistFilter(pageFilters, operator);
+    expect(pageFilters.popular_filters.best_live.items).toContain("operator1");
+  });
+});

package/src/resolver/index.mjs

@@ -113,21 +113,20 @@ export function transform(response) {
         Object.keys(pages[market][pageType]).forEach((pageId) => {
           const page = pages[market][pageType][pageId];
           if (
-            mainSettings[page.relation_type] && mainSettings[page.relation_type].reading_time &&
+            mainSettings[page.relation_type] &&
+            mainSettings[page.relation_type].reading_time &&
             mainSettings[page.relation_type].reading_time[
               process.env.GATSBY_SITE_NAME
             ]
           ) {
             page.reading_time = getReadingTime(page.sections, response.content);
           }
-          
 
           if (response.site_markets[siteMarket].path_prefix && page) {
             // set page prefix for multiple markets
             page.path = `${response.site_markets[siteMarket].path_prefix}${
               page.path !== "/" ? `/${page.path}` : ""
             }`;
-
             transformed[siteMarket][pageType].push(page);
           } else if (page) {
             transformed[siteMarket][pageType].push(page);
@@ -178,13 +177,19 @@ export function processSections(
           shouldSavePrefilled(module, siteName) &&
           savedModules[module.module_value_id]
         ) {
-          const filteredModule = cloneDeep(savedModules[module.module_value_id]);
+          const filteredModule = cloneDeep(
+            savedModules[module.module_value_id]
+          );
 
           const relationID = pagesMappedById[pageId]?.relation_id;
-          if (filteredModule.name === 'cards_v2' &&
-            relationID && filteredModule.items
+          if (
+            filteredModule.name === "cards_v2" &&
+            relationID &&
+            filteredModule.items
           ) {
-            filteredModule.items = filteredModule.items.filter((item) => !item.relation || item.relation.id !== relationID);
+            filteredModule.items = filteredModule.items.filter(
+              (item) => !item.relation || item.relation.id !== relationID
+            );
           }
 
           Object.assign(module, filteredModule);
@@ -195,13 +200,12 @@ export function processSections(
             module = {
               ...cloneDeep(
                 prefilledMarketModules[module.module_value_id] ||
-                prefilledMarketModules[module.value_id]
+                  prefilledMarketModules[module.value_id]
               ),
               value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET,
             };
           }
 
-          
           processModule(
             module,
             pages,
@@ -239,7 +243,10 @@ export function getReadingTime(sections, content) {
       sections[sectionKey].modules.forEach((module) => {
         // calculate reading time
         if (module.name === "content") {
-          const nrOfWords = removeTags(content ? content[module.value] : module.value).split(" ").length / 250;
+          const nrOfWords =
+            removeTags(content ? content[module.value] : module.value).split(
+              " "
+            ).length / 250;
           const minPerModule = Math.floor(nrOfWords);
           const secPerModule = Math.floor((nrOfWords % 1) * 60);
 
@@ -277,7 +284,7 @@ function processSearchData(data, fs, filename) {
       if (error) {
         console.log(
           chalk.magenta("info") +
-          chalk.whiteBright(` Error writing search json file : ${error}`)
+            chalk.whiteBright(` Error writing search json file : ${error}`)
         );
       }
     }
@@ -316,7 +323,6 @@ export function processExtraFields(
 }
 
 function updatePlaceholders(page, data, translationsData) {
-
   page.title =
     page.title &&
     generatePlaceholderString(page.title, translationsData, {
@@ -328,21 +334,21 @@ function updatePlaceholders(page, data, translationsData) {
     page.meta_title &&
     generatePlaceholderString(page.meta_title, translationsData, {
       siteName: data.site_name,
-      pageTitle: page.title
+      pageTitle: page.title,
     });
 
   page.meta_description =
     page.meta_description &&
     generatePlaceholderString(page.meta_description, translationsData, {
       siteName: data.site_name,
-      pageTitle: page.title
+      pageTitle: page.title,
     });
 }
 
 export default {
   run(data, themeOptions, fs, translationsData, previewPageID = null) {
     const start = new Date();
-    const transformedPages = transform(data);    
+    const transformedPages = transform(data);
 
     const allResponsibleGaming = data.responsible_gamings || null;
     const generalData = data.general;
@@ -365,12 +371,11 @@ export default {
 
     const searchEnabled =
       themeOptions.searchEnabled !== undefined &&
-        themeOptions.searchEnabled !== null
+      themeOptions.searchEnabled !== null
         ? themeOptions.searchEnabled
         : true;
 
     menus = data.menus;
-
     // Menu changes when there is a path prefix configured on hercules
     Object.keys(menus).forEach((menu) => {
       if (data?.site_markets[menus[menu]?.market]?.path_prefix !== null) {
@@ -380,7 +385,6 @@ export default {
         );
       }
     });
-
     Object.keys(data.site_markets).forEach((market) => {
       relations = data.relations;
       pages = transformedPages[market];
@@ -393,10 +397,12 @@ export default {
 
       Object.keys(transformedPages[market]).forEach((pageType) => {
         transformedPages[market][pageType].forEach((page, index) => {
+          // Check if it should build fuilters for this template
           const translations = translationsData
             ? translationsData[page.language]
             : {};
           // process page extra fields
+          //
           page.extra_fields &&
             processExtraFields(
               page.extra_fields,
@@ -404,7 +410,6 @@ export default {
               relations,
               data.content
             );
-
           updatePlaceholders(page, generalData, translations);
 
           // Set Affiliate relations
@@ -528,7 +533,7 @@ export default {
               extra_fields?.operator &&
               filterRelation(
                 extra_fields?.operator,
-                searchReleationPickKeys.operator
+                searchReleationPickKeys?.operator
               );
 
             const minimalPage = {
@@ -549,12 +554,14 @@ export default {
                 cloneDeep({
                   ...minimalPage,
                   ...(filteredRelation && { relation: filteredRelation }),
-                  ...(filteredAuthorRelation && { author: filteredAuthorRelation }),
-                  ...operatorExtraFileds && {
+                  ...(filteredAuthorRelation && {
+                    author: filteredAuthorRelation,
+                  }),
+                  ...(operatorExtraFileds && {
                     extra_fields: {
-                      operator: operatorExtraFileds
-                    }
-                  },
+                      operator: operatorExtraFileds,
+                    },
+                  }),
                 })
               );
             }
@@ -575,7 +582,6 @@ export default {
                 const postSectionModules =
                   data.market_sections[market][res].modules || [];
                 postSectionModules.forEach((item) => {
-                  
                   if (!page.sections.main) {
                     return;
                   }
@@ -590,7 +596,6 @@ export default {
                         ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET,
                     });
                   } else {
-                    
                     if (
                       transformedPages[market][pageType][index].relation &&
                       checkForInactiveOperatorToplist(
@@ -611,7 +616,6 @@ export default {
         });
       });
 
-
       // fill market sections
       if (data.market_sections[market]) {
         data.market_sections[market] = processSections(
@@ -626,7 +630,7 @@ export default {
           data.content
         );
       }
-      
+
       // fill page sections
       if (transformedPages[market]) {
         Object.keys(transformedPages[market]).forEach((pageType) => {
@@ -637,7 +641,6 @@ export default {
               (page.sections && !previewPageID) ||
               (previewPageID && page.id === previewPageID)
             ) {
-              
               transformedPages[market][pageType][index] = Object.assign(page, {
                 sections: processSections(
                   page.sections,

package/src/resolver/modules.mjs

@@ -15,7 +15,12 @@ import {
 import { sanitizeOperatorData } from "./operators.mjs";
 import settings from "../constants/settings.mjs";
 import ModuleValue from "../constants/module-value.mjs";
-import { shiftFirstOperator, getModuleTitle, trailingSlash   } from "../helpers/getters.mjs";
+import {
+  shiftFirstOperator,
+  getModuleTitle,
+  trailingSlash,
+} from "../helpers/getters.mjs";
+import buildToplistFilter from "./build-toplist-filter.mjs";
 
 const pagesGroupedByTemplateId = [];
 const cardItems = {};
@@ -185,7 +190,7 @@ export function processCardsV2(
       // Populate pagesList if page type and template exists
       pagesList =
         !pagesGroupedByTemplateId[`${cardType}_${market}`] ||
-          !pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId]
+        !pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId]
           ? []
           : pagesGroupedByTemplateId[`${cardType}_${market}`][pageTemplateId];
     } else {
@@ -277,7 +282,6 @@ export function processCardsV2(
     }
   }
 
-
   if (styleName !== "comparison_table") {
     const relationID = pagesMappedById[pageId]?.relation_id;
 
@@ -288,7 +292,6 @@ export function processCardsV2(
     }
   }
 
-
   if (
     styleName === "comparison_table" &&
     pageId !== null &&
@@ -303,7 +306,8 @@ export function processCardsV2(
   }
 
   // modify page so it doesn't have too much data
-  module.items = module.items.map((item) => clonePageForCards(cloneDeep(item), module.style, content)
+  module.items = module.items.map((item) =>
+    clonePageForCards(cloneDeep(item), module.style, content)
   );
 }
 
@@ -328,19 +332,33 @@ export function processTopListModule(
   data,
   toplists
 ) {
+  const filterEnabled = module.style === "filter";
+  const filters = {
+    popular_filters: {
+      best_online: { items: [] },
+      crypto: { items: [] },
+      mobile_optimized: { items: [] },
+      best_live: { items: [] },
+    },
+    rating: {
+      1: { items: [] },
+      2: { items: [] },
+      3: { items: [] },
+      4: { items: [] },
+      5: { items: [] },
+    },
+    game_categories: {},
+    deposit_methods: {},
+    withdrawal_method: {},
+    payout_time: {},
+    payout_rate: {},
+    licenses: {},
+  };
+
   module.items = module.items.map((listItem) => {
     const { type } = listItem;
-    const showLoadMore = listItem.show_load_more || 0;
-    const itemsCount = listItem.num_items_initial_load
-      ? Number(listItem.num_items_initial_load)
-      : 0;
-
-    if (showLoadMore === 0 && itemsCount > 0) {
-      listItem.items = listItem.items
-        ? listItem.items.slice(0, itemsCount)
-        : [];
-    }
-
+    const showLoadMore = +listItem.show_load_more;
+    const itemsCount = +listItem.num_items_initial_load;
     if (listItem.id && toplists && toplists[listItem.id.toString()]) {
       listItem.market = toplists[listItem.id].market?.short_code;
       listItem.items = toplists[listItem.id].items;
@@ -348,74 +366,84 @@ export function processTopListModule(
       listItem.tracker = toplists[listItem.id].tracker;
     }
 
+    if (!showLoadMore && itemsCount) {
+      listItem.items = listItem.items?.slice(0, itemsCount);
+    }
+
     listItem.items = listItem.items
       ? listItem.items.map((item) => {
-        const operatorRelation = cloneDeep(
-          Object.values(relations.operator).find(
-            (operator) =>
-              operator.operator_id === item.operator_id &&
-              operator.market === listItem.market &&
-              type === operator.type
-          )
-        );
-
-        if (operatorRelation) {
-          operatorRelation.ribbons =
-            item.ribbon_ids && item.ribbon_ids.length === 0
-              ? operatorRelation.ribbons
-              : item.ribbon_ids;
-
-          operatorRelation.selling_points =
-            item.selling_points && item.selling_points.length === 0
-              ? operatorRelation.selling_points
-              : item.selling_points;
-        }
-
-        operatorRelation.updated_at = item.updated_at;
-        operatorRelation.toplist_bonus = item.bonus_name;
-
-        const operatorPage =
-          pages && pages.operator && operatorRelation
-            ? pages.operator.filter(
-              (page) =>
-                page.relation &&
-                page.relation.operator_id ===
-                operatorRelation.operator_id &&
-                page.relation.type === operatorRelation.type
+          const operatorRelation = cloneDeep(
+            Object.values(relations.operator).find(
+              (operator) =>
+                operator.operator_id === item.operator_id &&
+                operator.market === listItem.market &&
+                type === operator.type
             )
-            : [];
-
-        const reviewLink =
-          process.env.DMS_REVIEW_LINKS_ENABLED === 'true'
-            ? stripDomainAndLeadingSlash(operatorRelation?.review_link) || operatorPage[0]?.path
-            : operatorPage[0]?.path;
-
-        const authorTitle = operatorPage[0] && operatorPage[0]?.author?.author_title;
-
-        const clone = sanitizeOperatorData(
-          cloneDeep(operatorRelation),
-          operatorPage,
-          data,
-          toplists && toplists[listItem.id].label
-        );
-
-        const socialAuthorLinks = [
-          'facebook_profile',
-          'twitter_profile',
-          'instagram_profile',
-          'linkedin_profile',
-        ];  
-
-        return Object.assign(clone, {
-          review_link: reviewLink,
-          author_title: authorTitle,
-          author_same_as: operatorPage[0] && operatorPage[0]?.author && socialAuthorLinks
-            .map((socialLink) => operatorPage[0]?.author?.[socialLink])
-            .filter((socialLink) => socialLink),
-        });
-      })
+          );
+
+          if (operatorRelation) {
+            operatorRelation.ribbons =
+              item.ribbon_ids && item.ribbon_ids.length === 0
+                ? operatorRelation.ribbons
+                : item.ribbon_ids;
+
+            operatorRelation.selling_points =
+              item.selling_points && item.selling_points.length === 0
+                ? operatorRelation.selling_points
+                : item.selling_points;
+          }
+
+          operatorRelation.updated_at = item.updated_at;
+          operatorRelation.toplist_bonus = item.bonus_name;
+
+          const operatorPage =
+            pages && pages.operator && operatorRelation
+              ? pages.operator.filter(
+                  (page) =>
+                    page.relation &&
+                    page.relation.operator_id ===
+                      operatorRelation.operator_id &&
+                    page.relation.type === operatorRelation.type
+                )
+              : [];
+
+          const reviewLink =
+            process.env.DMS_REVIEW_LINKS_ENABLED === "true"
+              ? stripDomainAndLeadingSlash(operatorRelation?.review_link) ||
+                operatorPage[0]?.path
+              : operatorPage[0]?.path;
+
+          const authorTitle =
+            operatorPage[0] && operatorPage[0]?.author?.author_title;
+
+          const clone = sanitizeOperatorData(
+            cloneDeep(operatorRelation),
+            operatorPage,
+            data,
+            toplists && toplists[listItem.id].label
+          );
+
+          const socialAuthorLinks = [
+            "facebook_profile",
+            "twitter_profile",
+            "instagram_profile",
+            "linkedin_profile",
+          ];
+          if (filterEnabled) {
+            buildToplistFilter(filters, clone);
+          }
+          return Object.assign(clone, {
+            review_link: reviewLink,
+            author_title: authorTitle,
+            author_same_as:
+              operatorPage[0] &&
+              operatorPage[0]?.author &&
+              socialAuthorLinks
+                .map((socialLink) => operatorPage[0]?.author?.[socialLink])
+                .filter((socialLink) => socialLink),
+          });
+        })
       : [];
-
     const latestItems = listItem.items
       .map((toplist) => ({
         ...toplist,
@@ -441,10 +469,10 @@ export function processTopListModule(
       // eslint-disable-next-line no-restricted-globals
       latestUpdatedDate instanceof Date && !isNaN(latestUpdatedDate)
         ? new Intl.DateTimeFormat("en-US", {
-          year: "numeric",
-          month: "long",
-          day: "numeric",
-        }).format(latestUpdatedDate)
+            year: "numeric",
+            month: "long",
+            day: "numeric",
+          }).format(latestUpdatedDate)
         : null;
 
     listItem.latest_items = formattedLatestItems;
@@ -452,6 +480,8 @@ export function processTopListModule(
 
     return listItem;
   });
+
+  if (filterEnabled) module.filters = filters;
 }
 
 export function processContentModule(
@@ -523,7 +553,7 @@ export function processFaq(module = {}, content, relationData) {
             null,
             relationData
           )) ||
-        item.question
+          item.question
       );
       item.answer = trailingSlash(
         (content && content[item.answer]) || item.answer