gatsby-core-theme 5.1.3 → 5.1.4

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [5.1.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.1.3...v5.1.4) (2022-03-23)
+
+
+### Bug Fixes
+
+* add default 12 items on archive module ([6c9edf9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6c9edf999f64825ba688bb0f35158d6d534aca9d))
+
+
+### Code Refactoring
+
+* update build array func ([842477e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/842477eb0c04d6e123066c14609f0426b6802989))
+* update generate array func ([ec69c52](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ec69c522f9ae7bba63e50368f849873349db0e9b))
+* update generate array tests ([2edbfeb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2edbfeb3ddad10d5043555b71c1ab69e11ee1638))
+* update header component test ([3e191e7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3e191e70cc08fa132e36b3f84f0cf0b731ddc7b0))
+* update prefilled module generation ([10365c7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/10365c722aee002d69c93db3db3e309c21e19e03))
+* update prefilled module generation ([7eedb0d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7eedb0d6de7baff62315c71284e20cb21228f30d))
+* update prefilled module generation ([e76c655](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e76c655217a5b62d42bcf987aa3d641520a11030))
+* update saved prefilled module func check ([adfcf82](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/adfcf82e738248ed51730445a29d60a9f3836eda))
+
+
+* Merge branch 'tm-2795-update-build-array-func' into 'master' ([cc21cf2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cc21cf288b0fb796e0b1afac1cebae1e7419006d))
+* Merge branch 'tm-2729-update-prefilled-module-generation' into 'master' ([73a094c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/73a094c7b8fdd1e07f0469c8ef78eb2a4f617ace))
+
 ## [5.1.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v5.1.2...v5.1.3) (2022-03-16)
 
 

package/gatsby-node.esm.js

@@ -53,7 +53,7 @@ function createArchivePage(pageObject, marketSections, prefilledModules, createP
 
   if (archiveModule.pagination_type !== 'load_more') {
     const numOfColumns = archiveModule.desktop_num_of_columns;
-    const calDefaultNrOfItems = (numOfColumns !== null ? numOfColumns : 3) * 3;
+    const calDefaultNrOfItems = (numOfColumns !== null ? numOfColumns : 4) * 3;
     const numOfItemsPerPage = Math.sign(archiveModule.num_of_items)
       ? archiveModule.num_of_items
       : calDefaultNrOfItems;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/constants/settings.js

@@ -4,6 +4,11 @@ export default {
     'norskespilleautomater.com': true,
     'playcasino.co.za': true,
   },
+  dynamic_prefilled_modules: {
+    'Irishluck.ie': ['cards', 'cards_v2'],
+    'norskespilleautomater.com': ['cards', 'cards_v2'],
+    'playcasino.co.za': ['cards', 'cards_v2'],
+  },
   keep_page_extra_fields: {
     operator: {
       'norskespilleautomater.com': true, // needed for inoperative / placeholder fields

package/src/helpers/generators.js

@@ -43,3 +43,7 @@ export function generatePlaceholderString(string = '', translations, data) {
       }[match])
   );
 }
+
+export function generateArray(obj) {
+  return obj !== null && obj !== undefined ? Object.keys(obj).map((key) => obj[key]) : [];
+}

package/src/helpers/generators.test.js

@@ -1,4 +1,4 @@
-import { generateTrackerLink, generatePlaceholderString } from './generators';
+import { generateTrackerLink, generatePlaceholderString, generateArray } from './generators';
 import { months } from '~constants/common';
 
 describe('Generate Tracker Link Helper', () => {
@@ -14,13 +14,18 @@ describe('Generate Tracker Link Helper', () => {
     expect(typeof trackerLink).toEqual('string');
     expect(trackerLink).toEqual('/no/visit/bet365/casino/non_main');
   });
+  test('generateTrackerLink no tracker format', () => {
+    process.env.TRACKER_LINK_FORMAT_MAIN = '';
+    process.env.TRACKER_LINK_FORMAT_NON_MAIN = '';
+    const trackerLink = generateTrackerLink({ type: 'casino', short_name: 'bet365' }, 'main');
+    expect(trackerLink).not.toBeTruthy();
+  });
 });
 
 describe('Generate Placeholders String', () => {
   test('generatePlaceholderString uppercase', () => {
     const string = generatePlaceholderString('Some title [MONTH] [YEAR]');
     const date = new Date();
-
     expect(string).not.toContain('[MONTH]');
     expect(string).not.toContain('[YEAR]');
     expect(string).toContain(date.getFullYear());
@@ -36,7 +41,6 @@ describe('Generate Placeholders String', () => {
       }
     );
     const date = new Date();
-
     expect(string).not.toContain('[currentdate]');
     expect(string).not.toContain('[currentmonth]');
     expect(string).not.toContain('[currentyear]');
@@ -59,4 +63,30 @@ describe('Generate Placeholders String', () => {
     expect(string).not.toContain('[MONTH]');
     expect(string).toContain(translateMonths[months[date.getMonth()]]);
   });
+  test('generatePlaceholderString empty', () => {
+    const string = generatePlaceholderString();
+    expect(string).not.toBeTruthy();
+  });
+});
+
+describe('Generate Array From Object', () => {
+  test('generateArray empty', () => {
+    const output = generateArray();
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+    expect(output.length).toEqual(0);
+  });
+  test('generateArray array', () => {
+    const output = generateArray(['a', 'b']);
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+    expect(output.length).toEqual(2);
+    expect(output[0]).toEqual('a');
+    expect(output[1]).toEqual('b');
+  });
+  test('generateArray object', () => {
+    const output = generateArray({ a: 'a', b: 'b' });
+    expect(Object.prototype.toString.call(output)).toEqual('[object Array]');
+    expect(output.length).toEqual(2);
+    expect(output[0]).toEqual('a');
+    expect(output[1]).toEqual('b');
+  });
 });

package/src/helpers/processor/index.js

@@ -10,7 +10,7 @@ import SearchTypesEnable from '../../constants/search-types-enable';
 import { pickHTMLSitemapPageKeys } from '../../constants/pick-keys';
 import { generatePlaceholderString } from '../generators';
 // eslint-disable-next-line import/no-cycle
-import { processModule } from './modules';
+import { shouldSavePrefilled, processModule } from './modules';
 // eslint-disable-next-line import/no-cycle
 import { clonePageForCards, groupBy, removeTags } from './common';
 import { prepareSportsData, addSportsDataToPage, addExtraFieldsToShowcaseEvents } from './sports';
@@ -75,6 +75,7 @@ export function transform(response) {
   return transformed;
 }
 
+const savedModules = {};
 export function processSections(sections, skipPost = false, page) {
   let minutes = 0;
   let seconds = 0;
@@ -88,15 +89,26 @@ export function processSections(sections, skipPost = false, page) {
     }
     if (sections[sectionKey] && sections[sectionKey].modules) {
       sections[sectionKey].modules.forEach((module, key) => {
-        sections[sectionKey].modules[module[key]] = processModule(
-          module,
-          pages,
-          pagesCloned,
-          relations,
-          pagesMappedById,
-          menus,
-          previewMode
-        );
+        if (
+          shouldSavePrefilled(module, page && page.siteInfo && page.siteInfo.site_name) &&
+          savedModules[module.module_value_id]
+        ) {
+          module = savedModules[module.module_value_id];
+        } else {
+          sections[sectionKey].modules[module[key]] = processModule(
+            module,
+            pages,
+            pagesCloned,
+            relations,
+            pagesMappedById,
+            menus,
+            previewMode
+          );
+
+          if (shouldSavePrefilled(module, page && page.siteInfo && page.siteInfo.site_name)) {
+            savedModules[module.module_value_id] = module;
+          }
+        }
 
         // calculate reading time
         if (module.name === 'content') {
@@ -305,12 +317,13 @@ export default {
               // pre NSA launch dirty loop to add prefilled modules as normal modules (as actual value)
               Object.keys(page.sections).forEach((sectionKey) => {
                 if (page.sections[sectionKey] && page.sections[sectionKey].modules) {
-                  page.sections[sectionKey].modules.forEach((sectionModule, index) => {
+                  page.sections[sectionKey].modules.forEach((sectionModule, i) => {
                     if (
                       sectionModule.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET
                     ) {
                       const rawValue = prefilledMarketModulesRaw[sectionModule.value_id];
-                      page.sections[sectionKey].modules[index] = rawValue;
+                      rawValue.value_type = sectionModule.value_type;
+                      page.sections[sectionKey].modules[i] = rawValue;
                     }
                   });
                 }

package/src/helpers/processor/index.test.js

@@ -1,4 +1,4 @@
-import { transform, processExtraFields } from './index';
+import { transform, processExtraFields, processSections } from './index';
 import pages from '~tests/factories/pages/pages.factory.js';
 
 describe('Index Processor', () => {
@@ -18,4 +18,8 @@ describe('Index Processor', () => {
     const result = processExtraFields(false);
     expect(result).toBeFalsy();
   });
+  test('processSections', () => {
+    const result = processSections(pages.prefilled_market_modules);
+    expect(result).toBeTruthy();
+  });
 });

package/src/helpers/processor/modules.js

@@ -2,6 +2,8 @@ import { cloneDeep, pick, sampleSize } from 'lodash';
 
 // eslint-disable-next-line import/no-cycle
 import { clonePageForCards, groupBy, removeDuplicates } from './common';
+import settings from '../../constants/settings';
+import ModuleValue from '../../constants/module-value';
 import { topListPickKeys } from '../../constants/pick-keys';
 
 const pagesGroupedByTemplateId = [];
@@ -213,6 +215,12 @@ export function processTopListModule(module, relations) {
   });
 }
 
+export function shouldSavePrefilled(module = {}, siteName) {
+  return module.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET &&
+    ((settings.dynamic_prefilled_modules[siteName] && !settings.dynamic_prefilled_modules[siteName].includes(module.name)) ||
+      module.sort_by !== 'random');
+}
+
 export function processModule(
   module,
   pages,

package/src/helpers/processor/modules.test.js

@@ -6,7 +6,9 @@ import {
   filterOperators,
   processBonus,
   processTopListModule,
+  shouldSavePrefilled,
 } from './modules';
+import { objectsHolder } from '~tests/factories/modules/modules.factory';
 import getPageDataList from '~tests/factories/pages/list.factory';
 import {
   getSampleCardsV2ModuleManual,
@@ -93,4 +95,11 @@ describe('Modules Helper', () => {
     expect(singleToplistData.items[0].items[0].short_name).toEqual('slotum');
     expect(singleToplistData.items[0].items[0].bonus.deposit_methods).toHaveLength(1);
   });
+
+  test('Should Generate Prefilled', () => {
+    const objects = objectsHolder('prefilledModules');
+    objects.forEach((prefilled) => {
+      expect(shouldSavePrefilled(prefilled.module, prefilled.siteName)).toEqual(prefilled.expected);
+    });
+  });
 });

package/src/helpers/schedule.js

@@ -1,6 +1,4 @@
-export function buildArray(obj) {
-  return Object.keys(obj).map((key) => obj[key]);
-}
+import { generateArray } from './generators';
 
 export function reverseDate(date) {
   return date.split('-').reverse().join('-');
@@ -17,9 +15,9 @@ export function filterScheduleByTournaments(schedule, relationIds) {
     tournamentIds = [relationIds];
   }
 
-  const scheduleArray = buildArray(schedule);
+  const scheduleArray = generateArray(schedule);
   for (let i = 0; i < scheduleArray.length; i += 1) {
-    const tournaments = buildArray(scheduleArray[i].tournaments);
+    const tournaments = generateArray(scheduleArray[i].tournaments);
     const filteredByTournament = tournaments.filter((tournament) =>
       tournamentIds.includes(tournament.id)
     );
@@ -69,9 +67,9 @@ export function getSortedEvents(tournaments, sportEvents) {
 }
 
 export function filterScheduleByTeam(schedule, eventsArray) {
-  const scheduleArray = buildArray(schedule);
+  const scheduleArray = generateArray(schedule);
   for (let i = 0; i < scheduleArray.length; i += 1) {
-    const tournaments = buildArray(scheduleArray[i].tournaments);
+    const tournaments = generateArray(scheduleArray[i].tournaments);
 
     for (let j = 0; j < tournaments.length; j += 1) {
       const filteredByTeam = tournaments[j].events.filter((event) =>

package/tests/factories/modules/modules.factory.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import ModuleValue from '../../../src/constants/module-value';
 import { getListContentData } from '~tests/factories/modules/content.factory';
 // import { sampleGameCards } from '~tests/factories/modules/card.factory.js';
 import { getSpotlightItems } from '~tests/factories/modules/spotlights.factory.js';
@@ -131,6 +132,44 @@ const imageProps = {
   },
 };
 
+const prefilledModules = [
+  {
+    module: { name: 'cards_v2', sort_by: 'random' },
+    siteName: 'no_site',
+    expected: false,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'cards_v2', sort_by: 'random' },
+    siteName: 'playcasino.co.za',
+    expected: false,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'module', sort_by: 'asc' },
+    siteName: 'playcasino.co.za',
+    expected: true,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'module', sort_by: 'random' },
+    siteName: 'playcasino.co.za',
+    expected: true,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'cards', sort_by: 'asc' },
+    siteName: 'playcasino.co.za',
+    expected: true,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'cards', sort_by: 'random' },
+    siteName: 'playcasino.co.za',
+    expected: false,
+  },
+  {
+    module: { value_type: ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET, name: 'cards_v2', sort_by: 'random' },
+    siteName: 'playcasino.co.za',
+    expected: false,
+  },
+];
+
 // eslint-disable-next-line import/prefer-default-export
 export function objectsHolder(elm) {
   if (!elm || elm == null || undefined) {
@@ -147,6 +186,7 @@ export function objectsHolder(elm) {
     bonus: BonusProps,
     image: imageProps,
     spotlights: getSpotlightItems(2),
+    prefilledModules: prefilledModules,
   };
   return data[elm];
 }

package/tests/factories/pages/pages.factory.js

@@ -189,4 +189,100 @@ export default {
       },
     },
   },
+  prefilled_market_modules: {
+    post_main: {
+      1059: {
+        title: 'More casino reviews',
+        link_label: null,
+        link_value: null,
+        model_type: 'operator',
+        display_input: 'automatic',
+        display_type: 'default',
+        sort_by: 'random',
+        sort_order: 'ascending',
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1059,
+        name: 'cards',
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: 'More Casino Reviews',
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: {
+          type: 'page',
+          value: null,
+          title: null,
+        },
+      },
+      1061: {
+        title: 'More slots reviews',
+        link_label: null,
+        link_value: null,
+        model_type: 'game',
+        display_input: 'automatic',
+        display_type: 'default',
+        sort_by: 'created_at',
+        sort_order: 'ascending',
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1061,
+        name: 'cards',
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: 'More Game Reviews',
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: {
+          type: 'page',
+          value: null,
+          title: null,
+        },
+      },
+      1063: {
+        title: 'Latest news',
+        link_label: null,
+        link_value: null,
+        model_type: 'article',
+        display_input: 'automatic',
+        display_type: 'default',
+        sort_by: 'created_at',
+        sort_order: 'ascending',
+        num_of_items: 3,
+        desktop_num_of_columns: 3,
+        tablet_num_of_columns: 3,
+        mobile_num_of_columns: 1,
+        featured_index: null,
+        show_load_more: false,
+        extra_data: null,
+        module_value_id: 1063,
+        name: 'cards',
+        anchored: 0,
+        anchor_label: null,
+        anchor_slug: null,
+        module_title: null,
+        module_title_tag: null,
+        background_color: null,
+        style: null,
+        style_id: null,
+        see_more_link: null,
+      },
+    },
+  },
 };