gatsby-core-theme 35.0.2 → 35.0.3

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [35.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v35.0.2...v35.0.3) (2024-07-19)
+
+
+### Bug Fixes
+
+* added tests ([c9ae199](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c9ae1999426a2d70f82f688dcc000d5a715924ee))
+* fix data for extra fields ([f05d381](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f05d38125e0d616ca6ab1cea6d2479b0d71d9e3a))
+
+
+* Merge branch 'tm-4583-operator-as-extrafields' into 'master' ([19633b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/19633b1f230e7c9b95ae781367360f186aac3210))
+
 ## [35.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v35.0.1...v35.0.2) (2024-07-18)
 
 

package/package.json

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

package/src/helpers/processor/index.mjs

@@ -8,7 +8,7 @@
 import loadash from 'lodash/index.js';
 import chalk from 'chalk';
 import ModuleValue from '../../constants/module-value.mjs';
-import { pickHTMLSitemapPageKeys } from '../../constants/pick-keys.mjs';
+import { pickHTMLSitemapPageKeys, pickRelationKeys } from '../../constants/pick-keys.mjs';
 import { generatePlaceholderString } from '../generators.mjs';
 // eslint-disable-next-line import/no-cycle
 import { shouldSavePrefilled, processModule } from './modules.mjs';
@@ -22,6 +22,7 @@ import { processRelations } from './relations.mjs';
 import { zeroPadding } from '../schedule.mjs';
 import { getRoundMinutes } from '../getters.mjs';
 import { checkForInactiveOperatorToplist } from '../validateData.mjs';
+import { sanitizeOperatorData } from './operators.mjs';
 
 const { cloneDeep, pick } = loadash;
 const previewMode = process.env.GATSBY_PREVIEW_MODE || false;
@@ -110,7 +111,7 @@ export function processSections(sections, skipPost = false, page, translations,
       return;
     }
     if (sections[sectionKey] && sections[sectionKey].hasOwnProperty('extra_fields')) {
-      processExtraFields(sections[sectionKey].extra_fields);
+      processExtraFields(sections[sectionKey].extra_fields, translations, relations);
     }
     if (sections[sectionKey] && sections[sectionKey].modules) {
       sections[sectionKey].modules.forEach((module, key) => {
@@ -199,14 +200,14 @@ function processSearchData(data, fs) {
   });
 }
 
-export function processExtraFields(extraFields, translations) {
+export function processExtraFields(extraFields, translations, relations) {
   if (!extraFields) {
     return;
   }
   Object.keys(extraFields).forEach((key) => {
     const { type, value } = extraFields[key];
     if (type === 'operator') {
-      extraFields[key] = relations[type][value];
+      extraFields[key] = relations && relations[type][value] && pick(sanitizeOperatorData(relations[type][value]), pickRelationKeys.operator);
     } else if (type === 'menu') {
       extraFields[key] = menus[value];
     } else if (type === 'text') {
@@ -302,7 +303,7 @@ export default {
       Object.keys(transformedPages[market]).forEach((pageType) => {
         transformedPages[market][pageType].forEach((page, index) => {
           // process page extra fields
-          page.extra_fields && processExtraFields(page.extra_fields, translations);
+          page.extra_fields && processExtraFields(page.extra_fields, translations, relations);
           updatePlaceholders(page, data);
           // set page relation
           processRelations(

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

@@ -2,6 +2,7 @@ import { transform, processExtraFields, processSections, getReadingTime } from '
 import pages from '~tests/factories/pages/pages.factory.js';
 import getPageList from '~tests/factories/pages/page.factory';
 import multipleMarketsPages from '~tests/factories/pages/multiple-markets-pages.factory.js';
+import getOperatorData from '../../../tests/factories/relations/operator.factory';
 
 const tempContent = {
   value: `What is Lorem Ipsum?
@@ -16,6 +17,19 @@ const tempContent = {
   name: 'content',
 };
 
+const translations = {
+  placeholder1: 'Translated Placeholder 1',
+  placeholder2: 'Translated Placeholder 2',
+};
+
+const relations = {
+  operator: {
+    123: {
+      ...getOperatorData(),
+    },
+  },
+};
+
 describe('Index Processor', () => {
   test('Transform', () => {
     const results = transform(pages);
@@ -37,6 +51,7 @@ describe('Index Processor', () => {
     processExtraFields(extraFields);
     expect(extraFields?.logos).toBe(339);
   });
+
   test('processExtraFields null', () => {
     const result = processExtraFields(false);
     expect(result).toBeFalsy();
@@ -52,6 +67,40 @@ describe('Index Processor', () => {
     expect(extraField.logos).toContain('2024');
   });
 
+  test('processExtraFields text', () => {
+    const extraField = {
+      logos: { value: 'test ts [YEAR] asca', type: 'text' },
+    };
+
+    processExtraFields(extraField);
+
+    expect(extraField.logos).toContain('2024');
+  });
+
+  test('processExtraFields operator', () => {
+    const extraFields = {
+      key1: {
+        type: 'operator',
+        value: '123',
+      },
+    };
+    delete relations.operator['123'].logo;
+    processExtraFields(extraFields, translations, relations);
+    expect(extraFields.key1.logo.filename).toEqual('norskelodd-logo.png');
+    expect(extraFields.key1.name).toEqual('Ice Casino');
+  });
+
+  test('processExtraFields without operator data', () => {
+    const extraFields = {
+      key1: {
+        type: 'operator',
+        value: '123',
+      },
+    };
+    processExtraFields(extraFields);
+    expect(extraFields).toHaveProperty('key1');
+  });
+
   test('processSections', () => {
     const result = processSections(pages.prefilled_market_modules);
     expect(result).toBeTruthy();

package/src/helpers/processor/operators.mjs

@@ -65,7 +65,7 @@ export function sanitizeOperatorData(
         }))
       : [];
 
-  if (operatorPage[0]?.extra_fields) {
+  if (operatorPage.length > 0 && operatorPage[0]?.extra_fields) {
     clone.reviewSummery = getExtraField(
       operatorPage[0]?.extra_fields,
       'operator_review_summary',

package/tests/factories/relations/operator.factory.js

@@ -198,6 +198,14 @@ export default function getOperatorData(
       types: ['casino', 'livecasino', 'sportsbook', 'bonus'],
       url: 'www.ice-casino.com',
     },
+    standardised_logo_url_object: {
+      width: '412',
+      height: '412',
+      title: 'Norskelodd logo',
+      alt: 'Logo image for Norskelodd',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/1651670827/norskelodd-logo.png',
+      filename: 'norskelodd-logo.png',
+    },
     extra_fields: {
       summary_background: 'fe63f69ca1618cf2e7ff810197001dec.png',
       summary: 'Summary',