gatsby-core-theme 6.1.6 → 6.1.9

package/CHANGELOG.md

@@ -1,3 +1,52 @@
+## [6.1.9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.8...v6.1.9) (2022-04-28)
+
+
+### Bug Fixes
+
+* add getRoundMinutes function in gatsby theme ([e74c629](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e74c62918852b7ee9fe304fc8c6b633e75e543a9))
+* add getRoundMinutes function in getters and testes && updated the project with git pull ([5b61f4b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5b61f4b0b912b4be7eee3eb9dbb9b2ad42b66bd9))
+* added new field in toplist keys ([fbe30a9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fbe30a9072c58022b914c1e0c21a4652dce6e557))
+
+
+* Merge branch 'tm-2814-launch-date' into 'master' ([0c48e60](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0c48e601a1364155b84727eab3c8781493528ae7))
+* Merge branch 'tm-2832-fix-time-to-read-in-OG' into 'master' ([6792364](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/67923641c04f38e10a514e93b4db7bcd8140fac9))
+
+## [6.1.8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.7...v6.1.8) (2022-04-26)
+
+
+### Bug Fixes
+
+* add operator related to the page as the first item in the comparison table automatically ([1fed78a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1fed78afc28bb072420556896dd350bb7351b69d))
+* add unit testing ([a0d4f03](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a0d4f0352553280e80ce08e3b8c533c78ffb6dfc))
+* change map to find ([756e648](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/756e6481ef95b7b080c0e0c1fdbcc0c0caabd8fb))
+* cleanup code ([c3f76aa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c3f76aa2866fa0011e8323c2a61e5ec5d815006e))
+* include module introduction on all modules ([d9e0d01](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d9e0d016503f0afee00cfe1724db48179b77020d))
+
+
+### Code Refactoring
+
+* add condition for null module ([369fa6e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/369fa6ec03b789a08542092c1355ab835d07cd14))
+* fix typo ([e3248a3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e3248a306a12f6a27112ab9515ffb2484590ffe5))
+
+
+* Merge branch 'tm-2823-removing-review' into 'master' ([5a1301c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5a1301c75bcad1b055918d024358f93295c3e1a6))
+* Merge branch 'tm-2689-add-paragraph' into 'master' ([2cf135d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2cf135dd4619e1a1698aacdeb08a85c10ce70be2))
+
+## [6.1.7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.6...v6.1.7) (2022-04-19)
+
+
+### Code Refactoring
+
+* update cards, cards_v2 filtering for operator pages ([08ecad7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/08ecad782f75f6f8105f203e06baf48951d68789))
+
+
+* Merge branch 'tm-2805-cards-random-filter' into 'master' ([206b0e8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/206b0e89234188e5a0ad38ad1fd1aec3a1212e89))
+
+
+### refactoe
+
+* update processor modules tests ([11fd5a0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/11fd5a0f7dcadf71a9550c58eeed383db35437e4))
+
 ## [6.1.6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v6.1.5...v6.1.6) (2022-04-18)
 
 

package/package.json

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

package/src/components/molecules/module/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/no-danger */
 /* eslint-disable react/prop-types */
 import React from 'react';
 import PropTypes from 'prop-types';
@@ -10,13 +11,15 @@ import { prettyTracker } from '~helpers/getters';
 
 const Modules = ({ module, page, pageContext }) => {
   const GetModuleComponent = (moduleItem) => {
-    switch (moduleItem.name) {
+    const { items, name } = moduleItem || {};
+
+    switch (name) {
       case 'content':
         return loadable(() => import('~molecules/content'));
       case 'top_list':
         return loadable(() => import('~organisms/toplist'));
       case 'archive':
-        if (!moduleItem.items || moduleItem.items.length === 0) return null;
+        if (!items || items.length === 0) return null;
         return loadable(() => import('~organisms/archive'));
       case 'counter':
         return loadable(() => import('~molecules/counter'));
@@ -28,14 +31,14 @@ const Modules = ({ module, page, pageContext }) => {
       case 'accordion':
         return loadable(() => import('~organisms/accordion'));
       case 'anchor':
-        if (moduleItem.items && moduleItem.items.length > 0) {
+        if (items && items.length > 0) {
           return loadable(() => import('~organisms/anchor'));
         }
         return null;
       case 'carousel':
         if (
-          moduleItem.items.length > 0 && // has items
-          moduleItem.items.filter((item) => item.image === null).length === 0 // not filled with null items
+          items.length > 0 && // has items
+          items.filter((item) => item.image === null).length === 0 // not filled with null items
         ) {
           return loadable(() => import('~organisms/carousel'));
         }
@@ -79,6 +82,9 @@ const Modules = ({ module, page, pageContext }) => {
         } ${styles.module} ${module?.style && styles[module.style]} module`}
       >
         <ModuleTitle module={module} />
+        {module.module_introduction && (
+          <div dangerouslySetInnerHTML={{ __html: module?.module_introduction }} />
+        )}
         <ModuleComponent module={module} page={page} pageContext={pageContext} {...extraProps} />
       </div>
     )

package/src/constants/pick-keys.js

@@ -29,6 +29,7 @@ export const topListPickKeys = [
   'selling_points',
   'short_name',
   'status',
+  'founded',
 ];
 
 export const pickRelationKeys = {

package/src/helpers/getters.js

@@ -31,8 +31,8 @@ export function getExtraField(extraFields, key, defaultValue) {
 }
 
 export function getSection(shortCode, pageContext) {
-  const page = pageContext?.page;
-  const marketSections = pageContext?.marketSections;
+  const page = pageContext && pageContext.page;
+  const marketSections = pageContext && pageContext.marketSections;
   // eslint-disable-next-line
   if (!page || !page.hasOwnProperty('sections') || !page.sections.hasOwnProperty(shortCode)) {
     return null;
@@ -91,7 +91,7 @@ export function image(filename, width, height, fit = 'cover') {
 }
 
 export function getImageFilename(src) {
-  const srcArr = src?.substring(src?.lastIndexOf('/') + 1)?.split('.');
+  const srcArr = src && src.substring(src.lastIndexOf('/') + 1).split('.');
   if (!srcArr.length) {
     return '';
   }
@@ -321,7 +321,7 @@ export function copyrightText() {
 }
 
 export function getFirstModuleByName(section, moduleName) {
-  if (section && section.modules && section.modules[0]?.name === moduleName) {
+  if (section && section.modules && section.modules[0].name === moduleName) {
     return section.modules[0];
   }
   return null;
@@ -329,7 +329,7 @@ export function getFirstModuleByName(section, moduleName) {
 
 export function translate(translations, key, defaultValue = '') {
   // eslint-disable-next-line
-  if (translations?.hasOwnProperty(key)) {
+  if (translations && translations.hasOwnProperty(key)) {
     return translations[key];
   }
   return defaultValue;
@@ -338,3 +338,33 @@ export function translate(translations, key, defaultValue = '') {
 export function getAws(imageName) {
   return `https://assets-srv.s3.eu-west-1.amazonaws.com/${imageName}`;
 }
+
+// This part of the code, help us to add operator related to the page as the first item in the comparison table automatically
+// example: if we are on the operator review page(Rizk) that should be first in the comparison table
+// First, we check if we have that item in the array, if that item is in the array, we check its position
+// If the item isn't in the array we will add it automatically
+export function shiftFirstOperator(pageId, module, pagesMappedById) {
+  let index = null;
+  // check if exist that element in array
+  const checkIfExistElement = module.items.find((item, i) => {
+    if (item.id === pageId) {
+      index = i;
+      if (index > 0) {
+        // eslint-disable-next-line no-nested-ternary
+        module.items.sort((x, y) => (x.id === pageId ? -1 : y.id === pageId ? 1 : 0));
+      }
+      return true;
+    }
+    return false;
+  });
+  if (!checkIfExistElement) {
+    // eslint-disable-next-line no-unused-expressions
+    pagesMappedById[pageId] && module.items.unshift(pagesMappedById[pageId]);
+  }
+}
+
+export const getRoundMinutes = (time) => {
+  const [minutes, seconds] = time.split(':');
+  const value = seconds > 30 ? Number(minutes) + 1 : Number(minutes);
+  return value === 0 ? 1 : value;
+};

package/src/helpers/getters.test.js

@@ -1,4 +1,5 @@
 import * as Getters from './getters';
+import pagesMappedById from '../../tests/factories/pagesMappedById';
 
 describe('Getters Helper', () => {
   const { location } = window;
@@ -228,4 +229,35 @@ describe('Getters Helper', () => {
     expect(Getters.translate(object, 'hello')).toEqual('world');
     expect(Getters.translate(object, 'foo', 'bar')).toEqual('bar');
   });
+
+  const module = {
+    items: [
+      {
+        id: 12300,
+      },
+      {
+        id: 13212,
+      },
+    ],
+  };
+
+  test('add the operator item', () => {
+    Getters.shiftFirstOperator(11607, module, pagesMappedById);
+    expect(module.items[0].id).toBe(11607);
+  });
+  test('move opeartor first postion', () => {
+    Getters.shiftFirstOperator(13212, module, pagesMappedById);
+    expect(module.items[0].id).toBe(13212);
+  });
+  test('check when we have the operator in first postion', () => {
+    Getters.shiftFirstOperator(13212, module, pagesMappedById);
+    expect(module.items[0].id).toBe(13212);
+  });
+
+  test('If the reading time is bigger than half, it should return the next number ', () => {
+    expect(Getters.getRoundMinutes('3:52')).toBe(4);
+  });
+  test('If reading time is less than half, it should return the last number ', () => {
+    expect(Getters.getRoundMinutes('3:29')).toBe(3);
+  });
 });

package/src/helpers/processor/index.js

@@ -15,6 +15,7 @@ import { shouldSavePrefilled, processModule } from './modules';
 import { clonePageForCards, groupBy, removeTags } from './common';
 import { prepareSportsData, addSportsDataToPage, addExtraFieldsToShowcaseEvents } from './sports';
 import { zeroPadding } from '../schedule';
+import { getRoundMinutes } from '../getters';
 
 const previewMode = process.env.GATSBY_PREVIEW_MODE || false;
 const postSectionsMap = {
@@ -78,6 +79,10 @@ export function transform(response) {
 const savedModules = {};
 export function processSections(sections, skipPost = false, page) {
   const siteName = page && page.siteInfo && page.siteInfo.site_name;
+
+  // pagedId we will use it just on operator review pages
+  const pageId = page && page.type === 'operator' ? page.id : null;
+
   let minutes = 0;
   let seconds = 0;
 
@@ -100,7 +105,8 @@ export function processSections(sections, skipPost = false, page) {
             relations,
             pagesMappedById,
             menus,
-            previewMode
+            previewMode,
+            pageId
           );
 
           if (shouldSavePrefilled(module, siteName)) {
@@ -130,7 +136,7 @@ export function processSections(sections, skipPost = false, page) {
   }
 
   if (page) {
-    page.reading_time = `${zeroPadding(minutes, 2)}:${zeroPadding(seconds, 2)}`;
+    page.reading_time = getRoundMinutes(`${zeroPadding(minutes, 2)}:${zeroPadding(seconds, 2)}`);
   }
 
   return sections;

package/src/helpers/processor/modules.js

@@ -5,6 +5,7 @@ import { clonePageForCards, groupBy, removeDuplicates } from './common';
 import settings from '../../constants/settings';
 import ModuleValue from '../../constants/module-value';
 import { topListPickKeys } from '../../constants/pick-keys';
+import { shiftFirstOperator } from '../getters';
 
 const pagesGroupedByTemplateId = [];
 
@@ -18,9 +19,15 @@ export function processCardsModule(module, pages, pagesCloned, pagesMappedById)
     const numOfItems =
       Math.sign(module.num_of_items) === 0 ? pages[modelType].length : Number(module.num_of_items);
     if (sortBy === 'random') {
-      const samplePages = pagesCloned[modelType].filter(
-        (page) => !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(page.status)
-      );
+      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
+                )
+            );
       module.items = sampleSize(samplePages, numOfItems);
     } else {
       module.items = pagesCloned[modelType].slice(0, numOfItems);
@@ -99,16 +106,18 @@ export function filterOperators(pages, selectedProviders, selectedTypes) {
   return pagesFiltered;
 }
 
-export function processCardsV2(module, pagesCloned, pagesMappedById) {
+export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
   const pageType = module.cards_page_type;
   const pageTemplateId = module.cards_page_type_id;
   const sortType = module.cards_selector_filters_sort_by;
   const cardSelector = module.cards_selector;
+  const styleName = module.style;
   const moduleSelectedProviders =
     module.cards_selector_filters && module.cards_selector_filters.providers;
   const moduleSelectedCategories =
     module.cards_selector_filters && module.cards_selector_filters.categories;
   const moduleSelectedTypes = module.cards_selector_filters && module.cards_selector_filters.types;
+
   module.items = [];
 
   if (cardSelector === 'select_manually') {
@@ -180,10 +189,15 @@ export function processCardsV2(module, pagesCloned, pagesMappedById) {
 
       // Applying sorting
       if (sortType === 'random') {
-        const samplePages = uniquePages.filter(
-          (page) =>
-            !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(page.status)
-        );
+        const samplePages =
+          module.cards_page_type !== 'operator'
+            ? uniquePages
+            : uniquePages.filter(
+                (page) =>
+                  !settings.filter_cards_modules[process.env.GATSBY_SITE_NAME].includes(
+                    page.relation && page.relation.status
+                  )
+              );
         module.items = sampleSize(samplePages, itemLimit);
       } else if (sortType === 'latest') {
         if (uniquePages.length > 0) {
@@ -193,6 +207,11 @@ export function processCardsV2(module, pagesCloned, pagesMappedById) {
       }
     }
   }
+
+  if (styleName === 'comparison_table' && pageId !== null) {
+    shiftFirstOperator(pageId, module, pagesMappedById);
+  }
+
   // modify page so it doesn't have too much data
   module.items = module.items.map((item) => clonePageForCards(cloneDeep(item), module.style));
 }
@@ -238,12 +257,13 @@ export function processModule(
   relations,
   pagesMappedById,
   menus,
-  previewMode
+  previewMode,
+  pageId
 ) {
   if (module.name === 'cards') {
     processCardsModule(module, pages, pagesCloned, pagesMappedById);
   } else if (module.name === 'cards_v2') {
-    processCardsV2(module, pagesCloned, pagesMappedById);
+    processCardsV2(module, pagesCloned, pagesMappedById, pageId);
   } else if (module.name === 'bonus') {
     processBonus(module, relations);
   } else if (module.name === 'archive' && previewMode) {

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

@@ -17,6 +17,11 @@ import {
 import { relationData, singleToplistData } from '../../../tests/factories/modules/toplist.factory';
 
 describe('Modules Helper', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = { ...process.env };
+    delete process.env.NODE_ENV;
+  });
   test('Cards V2 Manual list', () => {
     const pagesNum = 10;
     const moduleData = getSampleCardsV2ModuleManual();
@@ -45,12 +50,14 @@ describe('Modules Helper', () => {
     const moduleData = getSampleCardsV2Filtered(false, 'Game');
     moduleData.cards_selector_filters_sort_by = 'random';
     moduleData.cards_selector_filters_limit = '3';
+    moduleData.cards_page_type = 'operator';
     const pageList = getPageDataList(pagesNum).map((page, i) =>
       i % 2
-        ? { ...page, type: 'game', status: 'inactive' }
-        : { ...page, type: 'game', status: 'active' }
+        ? { ...page, type: 'operator', relation: { ...page.relation, status: 'inactive' } }
+        : { ...page, type: 'operator', relation: { ...page.relation, status: 'active' } }
     );
-    processCardsV2(moduleData, groupBy(pageList, 'type'));
+    const { processCardsV2: processCardsV2Clean } = require('./modules');
+    processCardsV2Clean(moduleData, groupBy(pageList, 'type'), groupBy(pageList, 'id'));
 
     expect(moduleData.items).toHaveLength(3);
     moduleData.items.forEach((item) => {

package/tests/factories/pagesMappedById/index.js

@@ -0,0 +1,117 @@
+export default {
+  11607: {
+    id: 11607,
+    market_id: 7,
+    updated_at: '2021-10-28',
+    created_at: '2020-02-14 14:12:45',
+    template_id: 11,
+    page_hreflang_group_id: null,
+    page_hreflang_combined: 0,
+    relation_id: 3148,
+    relation_type: 'game',
+    market: 'no_no',
+    region_code: null,
+    crawler_location_market: null,
+    author: {
+      name: 'Ida Moen Olsen',
+      profile_page_path: 'om-oss/ida-moen-olsen',
+      image_asset_id: 64615,
+      image_alt: null,
+      site_id: 2,
+      country_id: null,
+      language_id: null,
+      twitter_profile: null,
+      facebook_profile: null,
+      linkedin_profile: null,
+      instagram_profile: null,
+      personal_website: null,
+      email_address: null,
+      author_title: null,
+      additional_url: null,
+      image: 'ida-moen-olsen.webp',
+      image_object: [],
+      country: null,
+      language: null,
+    },
+    reviewer: null,
+    hard_coded_breadcrumbs: 0,
+    breadcrumb_ids: [174],
+    categories: [],
+    author_id: 47,
+    reviewer_id: null,
+    style_id: null,
+    language: 'no',
+    description: null,
+    meta_title: "Caishen's Arrival - Norske Spilleautomater",
+    meta_robots: null,
+    robot_options: {
+      page_index: 1,
+      links_followed: 1,
+      images_index: 1,
+      show_snippet: 1,
+    },
+    meta_description:
+      'Caishens Arrival er en asiatisk inspirert automat med gratisspinn og en massiv multiplikator på x 35,000. Du kan spille automaten gratis her',
+    page_custom_hreflangs: null,
+    title: "Caishen's Arrival",
+    vanity_label: null,
+    path: 'caishens-arrival-spilleautomater',
+    type: 'game',
+    template: 'game_review',
+    banner: '5af66017a898b7a5d6349b9396c1c680.jpeg',
+    featured_image: '5af66017a898b7a5d6349b9396c1c680.jpeg',
+    canonical_url: null,
+    canonical_url_page_id: null,
+    status: 'active',
+    page_group_id: null,
+    page_group_combined: 0,
+    page_group_custom_items: null,
+    sections: {
+      main: [],
+      header: [],
+      navigation: null,
+      footer: null,
+      post_main_games: null,
+    },
+    featured_image_object: {
+      width: '400',
+      height: '250',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/5af66017a898b7a5d6349b9396c1c680.jpeg',
+      filename: '5af66017a898b7a5d6349b9396c1c680.jpeg',
+    },
+    relation: {
+      id: 3148,
+      name: "Caishen's Arrival",
+      short_name: 'caishens_arrival',
+      first_rating: '2',
+      second_rating: '4',
+      third_rating: '4',
+      fourth_rating: '2',
+      average_rating: '',
+      volatility: 2,
+      iframe: '',
+      freespins: 1,
+      rtp: 95.74,
+      launch_date: '2019-10-16',
+      number_of_reels: 5,
+      winning_lines: 25,
+      jackpots: 0,
+      vegas: 0,
+      fruit: 0,
+      wilds: 0,
+      sticky_wilds: 0,
+      respins: 0,
+      mega_ways: 0,
+      bonus_rounds: 0,
+      recommended: 0,
+      exclusive: 0,
+      new: 0,
+      hot: 0,
+      game_provider: [],
+      markets: [],
+      enabled: true,
+      game_categories: [],
+      game_screenshots: [],
+    },
+  },
+};