gatsby-core-theme 30.0.70 → 30.0.71

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [30.0.71](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.70...v30.0.71) (2024-02-05)
+
+
+### Bug Fixes
+
+* a create default settings ([3db433d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3db433da9baa56881aedf974cf100eb85f45780d))
+* fix test ([60f0901](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/60f09017d212f526f41d7463640637bdd577ccd7))
+* fix the logic ([371fbed](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/371fbed1770f8521ca7d39360fb29d8ce796388c))
+* search bug ([f073d49](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f073d495a89627b52c7dac1844f280ced97cc06a))
+* tracker and gatsby browser ([b065517](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b065517545eb411bcce7121651881a797a450091))
+* tracker and gatsby browser ([a2ff710](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a2ff7101a31901023c52f8cc5ae7c4a63ac53754))
+
+
+### Code Refactoring
+
+* enable app-ssr page types ([78be6b5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/78be6b5d2cb459b0c4bbdb849ca6db7b4d2a59e9))
+
+
+* Merge branch 'search' into 'master' ([1982bda](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1982bdae3986ff205c55c15394a0ab39ec6dce9d))
+* Merge branch 'tm-3984-sportstake' into 'master' ([56558ef](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/56558efe05a592c224ec785dea4c41dd8f3f4189))
+* Merge branch 'defaultSettings' into 'master' ([27c2c5d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/27c2c5d38de3869223ae79797f1511a2c2bcd2a3))
+
 ## [30.0.70](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v30.0.69...v30.0.70) (2024-02-01)
 
 

package/gatsby-browser.js

@@ -101,11 +101,17 @@ function scrollEvent(event) {
 
   if (process.env.ENABLE_CRAZYEGG === 'true' && !document.getElementById('crazy-egg')) crazyEgg();
 
-  event.currentTarget.removeEventListener(event.type, scrollEvent); // remove the event listener that got triggered
+  if (event) {
+    event.currentTarget.removeEventListener(event.type, scrollEvent); // remove the event listener that got triggered
+  }
 }
 
 exports.onClientEntry = () => {
-  document.addEventListener('scroll', scrollEvent);
-  document.addEventListener('mousemove', scrollEvent);
-  document.addEventListener('touchstart', scrollEvent, { passive: true });
+  if (process.env.PPC === 'true') {
+    scrollEvent(null);
+  } else {
+    document.addEventListener('scroll', scrollEvent);
+    document.addEventListener('mousemove', scrollEvent);
+    document.addEventListener('touchstart', scrollEvent, { passive: true });
+  }
 };

package/gatsby-node.mjs

@@ -14,6 +14,7 @@ import { getData, getLocalData } from './src/helpers/api.mjs';
 import { generateTrackerLink } from './src/helpers/generators.mjs';
 import processor, { processSitemapPages } from './src/helpers/processor/index.mjs';
 import { pickAuthorsPageKeys } from './src/constants/pick-keys.mjs';
+import settings from './src/constants/settings.mjs';
 import { translate } from './src/helpers/getters.mjs';
 import { groupBy } from './src/helpers/processor/common.mjs';
 
@@ -298,8 +299,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
           });
         } else {
           const component =
-            (page.relation_type === 'event' || page.relation_type === 'tournament') &&
-            ['sports'].includes(response.general.type)
+          settings.app_ssr.includes(page.template)
               ? `${__dirname}/src/components/app-ssr.js`
               : `${__dirname}/src/components/app.js`;
 

package/package.json

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

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

@@ -62,7 +62,7 @@ describe('OperatorCtaButton Component', () => {
     expect(affObject.page_type).toEqual('test');
     expect(affObject.module).toEqual('test2');
     expect(affObject.request_url).toEqual('http://test.com/');
-    expect(affObject.facebook_click_id).toEqual('param1');
+    // expect(affObject.facebook_click_id).toEqual('param1');
     expect(affObject.microsoft_click_id).toEqual('param2');
     expect(affObject.google_click_id).toEqual('param3');
     expect(affObject.tracker_name).toEqual('testing');

package/src/components/atoms/pretty-link/pretty-link.test.js

@@ -50,7 +50,7 @@ describe('PrettyLink Component', () => {
     expect(affObject.page_type).toEqual('test');
     expect(affObject.module).toEqual('test2');
     expect(affObject.request_url).toEqual('http://test.com/');
-    expect(affObject.facebook_click_id).toEqual('param1');
+    // expect(affObject.facebook_click_id).toEqual('param1');
     expect(affObject.microsoft_click_id).toEqual('param2');
     expect(affObject.google_click_id).toEqual('param3');
     expect(affObject.tracker_name).toEqual('testing');

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

@@ -107,6 +107,7 @@ const Navigation = ({
                   searchIcon={searchIcon}
                   pageContext={pageContext}
                   searchURLPageName={searchURLPageName}
+                  marketPrefix={activeMarket?.path_prefix || '/'}
                 />
               )}
               {CustomComponent && <CustomComponent pageContext={pageContext} section={section} />}

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

@@ -16,6 +16,7 @@ const SearchForm = ({
   iconWidth = 24,
   iconHeight = 24,
   placeholder = null,
+  marketPrefix = '/',
 }) => {
   const { showSearch, setShowSearch, setShowMenu, showMenu } = useContext(NavigationContext);
   const [searchBoxQuery, setSearchBoxQuery] = useState();
@@ -44,7 +45,9 @@ const SearchForm = ({
     if (searchBoxQuery === '') {
       e.target.querySelector('input').focus();
     } else {
-      navigate(`/s?s=${searchBoxQuery}`);
+      const searchUrl =
+        marketPrefix !== '/' ? `/${marketPrefix}/s?s=${searchBoxQuery}` : `/s?s=${searchBoxQuery}`;
+      navigate(searchUrl);
     }
   };
 
@@ -108,6 +111,7 @@ SearchForm.propTypes = {
   iconHeight: PropTypes.number,
   pageContext: PropTypes.shape({}),
   placeholder: PropTypes.string,
+  marketPrefix: PropTypes.string,
 };
 
 export default SearchForm;

package/src/constants/settings.mjs

@@ -5,10 +5,7 @@ export default {
     'playcasino.co.za': true,
   },
   dynamic_prefilled_modules: {
-    'Irishluck.ie': ['cards', 'cards_v2'],
-    'norskespilleautomater.com': ['cards', 'cards_v2'],
-    'playcasino.co.za': ['cards', 'cards_v2'],
-    'sporttheme.com': ['cards', 'cards_v2'],
+    'default' : ['cards', 'cards_v2']
   },
   filter_cards_modules: {
     'irishluck.ie': ['inactive', 'blacklisted', 'coming_soon'],
@@ -18,12 +15,7 @@ export default {
     'onlinegamblingsa.com': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
     'onlinecasinosouthafrica.net': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
     'free-casinos.co.za': ['inactive', 'blacklisted', 'coming_soon', 'not_recommended'],
-    'sporttheme.com': ['inactive', 'blacklisted'],
-    'partnerships.gigmedia.com': ['inactive', 'blacklisted'],
-    'habibibet.org': ['inactive', 'blacklisted'],
-    'xn--nt-casino-v2a.se': ['inactive', 'blacklisted'],
-    'casinomobile.co.za': ['inactive', 'blacklisted'],
-    'betamericalatina.com': ['inactive', 'blacklisted'],
+    'default': ['inactive', 'blacklisted']
   },
   keep_page_extra_fields: {
     operator: {
@@ -53,4 +45,11 @@ export default {
     operator: { 'Irishluck.ie': ['main'] },
     article: { 'Irishluck.ie': ['main'] },
   },
+  app_ssr: [
+    'event',
+    'tournament',
+    'sportstake_fixtures',
+    'sportstake_results',
+    'lotto',
+  ]
 };

package/src/helpers/processor/modules.mjs

@@ -17,6 +17,9 @@ export function processCardsModule(module, pages, pagesCloned, pagesMappedById)
   const displayInput = module.display_input;
   const sortBy = module.sort_by;
   module.items = [];
+  const filterCardsModules = !settings.filter_cards_modules[process?.env?.GATSBY_SITE_NAME]
+    ? settings.filter_cards_modules.default
+    : settings.filter_cards_modules[process?.env?.GATSBY_SITE_NAME];
 
   if (displayInput === 'automatic' && pages[modelType]) {
     const numOfItems =
@@ -25,11 +28,8 @@ export function processCardsModule(module, pages, pagesCloned, pagesMappedById)
       const samplePages =
         module.cards_page_type !== 'operator'
           ? pagesCloned[modelType]
-          : pagesCloned[modelType].filter(
-              (page) =>
-                !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
-                  page.relation && page.relation.status
-                )
+          : pagesCloned[modelType].filter((page) =>
+              filterCardsModules.includes(page.relation && page.relation.status)
             );
       module.items = sampleSize(samplePages, numOfItems);
     } else {
@@ -238,7 +238,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
           finalizedFilteredPages = filteredPages;
       }
       const uniquePages = removeCurrentPage(removeDuplicates(finalizedFilteredPages, 'id'), pageId);
-      
+
       // Applying sorting
       if (sortType === 'random') {
         module.items = sampleSize(uniquePages, itemLimit);
@@ -248,7 +248,6 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
           module.items = uniquePages.slice(0, itemLimit);
         }
       }
-     
     }
   }
 
@@ -260,7 +259,7 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
   if (pageId !== null) {
     module.module_title = getModuleTitle(module, pagesMappedById[pageId]);
   }
-  
+
   // modify page so it doesn't have too much data
   module.items = module.items.map((item) => clonePageForCards(cloneDeep(item), module.style));
 }
@@ -332,10 +331,12 @@ export function processTopListModule(module, relations, pages, markets) {
 }
 
 export function shouldSavePrefilled(module = {}, siteName) {
+  const dynamicPrefilledModules = settings.dynamic_prefilled_modules[siteName]
+    ? settings.dynamic_prefilled_modules[siteName]
+    : settings.dynamic_prefilled_modules.default;
   return (
     module.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET &&
-    ((settings.dynamic_prefilled_modules[siteName] &&
-      !settings.dynamic_prefilled_modules[siteName].includes(module.name)) ||
+    (!dynamicPrefilledModules.includes(module.name) ||
       module.sort_by !== 'random')
   );
 }

package/src/helpers/tracker.mjs

@@ -80,6 +80,7 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
     user_agent: headers ? headers.get('user-agent') || headers.get('user-agent') : 'N/A',
     user_uuid: cookie ? cookie.affUUID || 'N/A' : 'N/A',
     facebook_browser_id: cookie ? cookie._fbp || 'N/A' : 'N/A',
+    facebook_click_id: cookie ? cookie._fbc || 'N/A' : 'N/A',
     facebook_pixel_id: process.env.PIXEL_ID || 'N/A',
     ...(isJsonString(cookie.affObject) ? JSON.parse(cookie.affObject) : {}),
     ...(extraParams || {}),
@@ -116,9 +117,9 @@ export function getTrackingAPIParams(pageTemplate, module, tracker, clickedEleme
     // eslint-disable-next-line prefer-destructuring
     urlParams.request_url = url.split('?')[0];
     const extraData = deparam(url.split('?')[1]);
-    if (extraData.fbclid) {
-      urlParams.facebook_click_id = extraData.fbclid;
-    }
+    // if (extraData.fbclid) {
+    //   urlParams.facebook_click_id = extraData.fbclid;
+    // }
     if (extraData.msclkid) {
       urlParams.microsoft_click_id = extraData.msclkid;
     }

package/src/helpers/tracker.test.js

@@ -72,7 +72,7 @@ describe('Tracker Helper', () => {
     expect(fetch).toBeCalledWith(
       `${process.env.GATSBY_TRACKING_API_URL}?${new URLSearchParams(
         urlParam
-      ).toString()}&user_agent=N%2FA&user_uuid=N%2FA&facebook_browser_id=N%2FA&facebook_pixel_id=N%2FA`
+      ).toString()}&user_agent=N%2FA&user_uuid=N%2FA&facebook_browser_id=N%2FA&facebook_click_id=N%2FA&facebook_pixel_id=N%2FA`
     );
   });
 
@@ -87,7 +87,7 @@ describe('Tracker Helper', () => {
 
     expect(fetch).toBeCalledTimes(1);
     expect(fetch).toBeCalledWith(
-      `testlink?site_id=82&operator_short_name=rizk&operator_type=sportsbook&language=en&tracker_name=main&market_short_code=ie_en&ip_address=127.0.0.1&user_agent=N%2FA&user_uuid=N%2FA&facebook_browser_id=N%2FA&facebook_pixel_id=N%2FA&extraparam=val&extraparam2=val2`
+      `testlink?site_id=82&operator_short_name=rizk&operator_type=sportsbook&language=en&tracker_name=main&market_short_code=ie_en&ip_address=127.0.0.1&user_agent=N%2FA&user_uuid=N%2FA&facebook_browser_id=N%2FA&facebook_click_id=N%2FA&facebook_pixel_id=N%2FA&extraparam=val&extraparam2=val2`
     );
   });
 
@@ -115,7 +115,7 @@ describe('Tracker Helper', () => {
       'urlValue?fbclid=param1&msclkid=param2&gclid=param3'
     );
     expect(params.request_url).toEqual('urlValue');
-    expect(params.facebook_click_id).toEqual('param1');
+    // expect(params.facebook_click_id).toEqual('param1');
     expect(params.microsoft_click_id).toEqual('param2');
     expect(params.google_click_id).toEqual('param3');
   });