@griddo/cx 1.56.10 → 1.57.0

package/gatsby-node.js

@@ -22,8 +22,6 @@ const baseUrl = process.env.API_URL;
 const publicBaseUrl = process.env.PUBLIC_API_URL;
 const IS_SERVE = !!process.env.IS_SERVE && JSON.parse(process.env.IS_SERVE);
 const BUILD_MODE = process.env.CXBRANCH;
-const isIE = process.env.CLIENT === 'IEEDU';
-const isGARRIGUES = process.env.CLIENT && process.env.CLIENT.startsWith('CEG');
 
 // Share info between actions (createPages and onPostBuild)
 let updatedSites;
@@ -125,8 +123,6 @@ exports.createPages = async ({ actions }) => {
       componentsVersion,
       showBasicMetaRobots,
       BUILD_MODE,
-      isIE,
-      isGARRIGUES,
       sitePages,
     };
 
@@ -153,29 +149,34 @@ exports.createPages = async ({ actions }) => {
 
       const isList = distributorTemplate?.type?.mode?.toLowerCase() === 'list';
 
+      const multiPageElements = await helpers.getMultiPageElements(
+        distributorTemplate
+      );
+
       // Multi-page (pagination) or single-page
       isList
-        ? await utils.renderMultiplePages(
-          {
-            rootPage: page,
-            pages: utils.getList(distributorTemplate),
-            isRoot: false,
-            defaultLang,
-            distributorTemplate,
-          },
-          additionalInfo,
-          actions.createPage
-        )
-        : await utils.renderSinglePage(
-          {
-            ...page,
-            template: distributorTemplate,
-            isRoot: false,
-            defaultLang,
-          },
-          additionalInfo,
-          actions.createPage
-        );
+        ? await utils.renderListPages(
+            {
+              rootPage: page,
+              pages: utils.getList(distributorTemplate),
+              isRoot: false,
+              defaultLang,
+              distributorTemplate,
+            },
+            additionalInfo,
+            actions.createPage
+          )
+        : await utils.renderPage(
+            {
+              ...page,
+              template: distributorTemplate,
+              isRoot: false,
+              defaultLang,
+              multiPageElements,
+            },
+            additionalInfo,
+            actions.createPage
+          );
 
       buildProcessData[siteID].publishHashes.push(page.hash);
     }

package/gatsby-ssr.js

@@ -21,7 +21,7 @@ export const onRenderBody = ({
     htmlAttributes,
     bodyAttributes,
     bodyProps,
-  } = onRenderBodyFromClient;
+  } = onRenderBodyFromClient || {};
 
   setHeadComponents(headComponents);
   setPreBodyComponents(preBodyComponents);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/cx",
   "description": "Griddo SSG based on Gatsby",
-  "version": "1.56.10",
+  "version": "1.57.0",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -61,7 +61,7 @@
     "react-helmet": "^6.0.0"
   },
   "devDependencies": {
-    "@griddo/eslint-config-back": "^1.56.10",
+    "@griddo/eslint-config-back": "^1.57.0",
     "eslint": "^7.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-react": "7.14.3",
@@ -93,5 +93,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "586a090d1cb535fa0577fd12d2e874860c1fc3b8"
+  "gitHead": "fe9a8f9481f35021584d79706fd7020c8c87b685"
 }

package/src/utils/helpers.js

@@ -69,6 +69,28 @@ const getOpenGraph = ({
   twitterImage: addCloudinaryParams(socialImage, 'c_fill,w_1024,h_512')
 });
 
+const getMultiPageElements = (distributorTemplate) => new Promise((resolve) => {
+  const getMultiPageComponent = (template, level = 0) => {
+    if (!template || typeof (template) !== 'object') return;
+    for (let key in template) {
+      const currentComponent = template[key];
+      if (!currentComponent || typeof (currentComponent) !== 'object') continue;
+      const {
+        component,
+        hasGriddoMultiPage,
+        elements,
+      } = currentComponent;
+      if (component && hasGriddoMultiPage) {
+        resolve(elements || []);
+      }
+      getMultiPageComponent(currentComponent, level + 1);
+    }
+    if (!level) resolve(null);
+  };
+  getMultiPageComponent([distributorTemplate]);
+});
+
 exports.getOpenGraph = getOpenGraph;
 exports.getPageMetaData = getPageMetaData;
 exports.log = log;
+exports.getMultiPageElements = getMultiPageElements;

package/src/utils/index.js

@@ -12,8 +12,8 @@ const getPageCluster = (itemsPerPage, items) => {
     .fill(0)
     .map((x, idx) => idx + 1)
 
-    
-    const result = pageNumbers.map(x => getPage(itemsPerPage, items, x))
+
+  const result = pageNumbers.map(x => getPage(itemsPerPage, items, x))
   return result;
 }
 
@@ -33,6 +33,6 @@ const getList = distributorTemplate => {
 exports.default = {
   getPagePath,
   getList,
-  renderSinglePage: pageUtils.renderSinglePage,
-  renderMultiplePages: pageUtils.renderMultiplePages
+  renderPage: pageUtils.renderPage,
+  renderListPages: pageUtils.renderListPages,
 }

package/src/utils/pages.js

@@ -1,9 +1,15 @@
 const path = require('path');
 const helpers = require('./helpers.js');
 
+async function renderPage(page, additionalInfo, createPage) {
+  const { multiPageElements, ...cleanPage } = page;
+  if (!multiPageElements)
+    return await renderSinglePage(cleanPage, additionalInfo, createPage);
+  await renderMultiplePages(page, additionalInfo, createPage);
+}
+
 async function renderSinglePage(page, additionalInfo, createPage) {
   const { id, name, title, fullPath, language: languageId, breadcrumb } = page;
-
   helpers.log('info', `renderSinglePage: ${id}`);
 
   const {
@@ -86,7 +92,7 @@ async function renderSinglePage(page, additionalInfo, createPage) {
   return createPage(mappedPage);
 }
 
-async function renderMultiplePages(
+async function renderListPages(
   { rootPage, pages, isRoot, defaultLang, distributorTemplate },
   additionalInfo,
   createPage
@@ -121,5 +127,39 @@ async function renderMultiplePages(
   });
 }
 
-exports.renderSinglePage = renderSinglePage;
-exports.renderMultiplePages = renderMultiplePages;
+async function renderMultiplePages(page, additionalInfo, createPage) {
+  const { multiPageElements, ...cleanPage } = page;
+
+  // si no hay un elemento sin slug, como mínimo hay que dibujar una página principal para el conjunto de páginas
+  if (!multiPageElements.find(({ sectionSlug }) => sectionSlug === '/')) multiPageElements.push({});
+
+  // crear cada página
+  for (const pageElement of multiPageElements) {
+    const paginatedPage = JSON.parse(JSON.stringify(cleanPage));
+    const {
+      sectionSlug = '/',
+      title = '',
+      metaTitle = '',
+      metaDescription = '',
+    } = pageElement;
+    const compose = paginatedPage?.fullPath?.compose || '';
+    const fullUrl = paginatedPage.fullUrl;
+    const rightSectionSlug = sectionSlug?.replace(/\//g, '');
+    const newCompose = `${compose}${
+      compose.endsWith('/') ? '' : '/'
+    }${rightSectionSlug}`;
+    paginatedPage.fullUrl = `${fullUrl}${
+      fullUrl.endsWith('/') ? '' : '/'
+    }${rightSectionSlug}`;
+    paginatedPage.fullPath.compose = newCompose;
+    paginatedPage.slug = newCompose;
+    paginatedPage.template.activeSectionSlug = sectionSlug;
+    if (title.trim()) paginatedPage.title = title;
+    if (metaTitle.trim()) paginatedPage.metaTitle = metaTitle;
+    if (metaDescription.trim()) paginatedPage.metaDescription = metaDescription;
+    await renderSinglePage(paginatedPage, additionalInfo, createPage);
+  }
+}
+
+exports.renderPage = renderPage;
+exports.renderListPages = renderListPages;