@griddo/cx 10.4.4 → 10.4.6

package/exporter/adapters/gatsby/index.ts

@@ -1,7 +1,7 @@
 import { getGatsbyDomainRunner } from "./utils";
 import { getInstanceDomains } from "../../utils/domains";
 import { createBuildData } from "../../utils/download-build-data";
-import { clearEmptyDirs } from "../../utils/folders";
+import { clearEmptyDirs, removeMultiPagesFromStore } from "../../utils/folders";
 import { uploadSearchContentToAPI } from "../../utils/searches";
 import { doLifeCycle, pause, printExporterLogo } from "../../utils/shared";
 
@@ -81,6 +81,11 @@ async function runGatsbyAdapter() {
 		await doLifeCycle({
 			name: "Archive",
 			steps: [
+				// Elimina las páginas MultiPage del `store`. De este modo nos
+				// aseguramos que se vuelven a crear por Gatsby siempre
+				// actualizadas.
+				removeMultiPagesFromStore, // penalizando optimización...
+				() => pause("MultiPages removed from `store`"),
 				() => clearEmptyDirs(),
 				() => pause("Clean empty dirs done!"),
 				runner.removeDisposableArtifacts,

package/exporter/services/store.ts

@@ -41,10 +41,6 @@ dotenv.config();
 /* prettier-ignore */ const PUBLIC_API_URL = process.env.PUBLIC_API_URL as string;
 /* prettier-ignore */ const RENDER_ID = process.env.GRIDDO_RENDERID || new Date().valueOf().toString();
 
-// Consts
-const createdPages: Array<number> = [];
-const buildProcessData: BuildProcessData = {};
-
 /**
  * Fetch, process and save object pages and sites data into the file system to
  * be consumed by other services (Griddo itself, Adapters, etc.)
@@ -53,6 +49,10 @@ async function createStore(storeDir: string, domain: string) {
 	console.info(`API calls with ${API_CONCURRENCY_COUNT} threads`);
 
 	try {
+		// Vars to save later in the report file
+		const createdPages: Array<number> = [];
+		const buildProcessData: BuildProcessData = {};
+
 		// Get sites objects to publish and unpublish.
 		const { sitesToPublish, sitesToUnpublish } = await checkSites(domain);
 

package/exporter/utils/folders.ts

@@ -7,6 +7,7 @@ import path from "node:path";
 import fs from "fs-extra";
 
 import { CXRootDir, instanceRootDir, logInfo } from "./shared";
+import { getPageInStoreDir, removePagesFromStore } from "./store";
 // eslint-disable-next-line node/no-unpublished-import
 import config from "../../cx.config";
 
@@ -318,10 +319,26 @@ function createBackup(src: string, suffix = "-BACKUP") {
 	}
 }
 
+function isMultiPageId(id: number) {
+	return Number.isInteger(id) && id < 0;
+}
+
+function removeMultiPagesFromStore() {
+	const dirs = config.dirs("");
+	const storePath = path.join(dirs.__cx, "store");
+	try {
+		const multiPageFiles = getPageInStoreDir(storePath).filter(isMultiPageId);
+		removePagesFromStore(storePath, multiPageFiles);
+	} catch (e) {
+		console.info("`store` folder does not exist. Skipping multipage clean up.");
+	}
+}
+
 export {
 	clearEmptyDirs,
 	copyArtifacts,
 	deleteSites,
 	moveArtifacts,
 	removeArtifacts,
+	removeMultiPagesFromStore,
 };

package/exporter/utils/pages.ts

@@ -269,11 +269,7 @@ async function createGriddoListPages(
 			defaultLang,
 		};
 
-		return await createGriddoPageObject(
-			paginatedPage,
-			additionalInfo,
-			!isFirstPage
-		);
+		return await createGriddoPageObject(paginatedPage, additionalInfo);
 	});
 
 	return Promise.all(allPages);
@@ -302,7 +298,7 @@ function createGriddoMultiPages(
 	}
 
 	// Creates each page based on `multiPageElements` from the schema.
-	const allPages = multiPageElements.map(async (pageElement) => {
+	const allPages = multiPageElements.map(async (pageElement, idx) => {
 		// TODO: Use structuredClone() when node 18 is available.
 		const paginatedPage: APIPageObject = JSON.parse(JSON.stringify(cleanPage));
 		const {
@@ -334,6 +330,17 @@ function createGriddoMultiPages(
 			paginatedPage.metaDescription = metaDescription;
 		}
 
+		// Crea un id como número negativo y añadiendo un sufijo para las multipages.
+		// Esto es así para marcarlas y posteriormente borrarlas siempre en cada
+		// nuevo render desde el Adapter.
+		//
+		// id de página con hasMultipageTrue: 1546
+		// ids de las "sub-páginas": -15460, -15461, -1546n, (-)id(idx)
+		//
+		// @todo eliminar el concepto multipage de CX, debería ser algo core de
+		// Griddo itself: API/AX, que fuesen páginas con sus ids, etc..
+		paginatedPage.id = parseInt("-" + paginatedPage.id + idx);
+
 		paginatedPage.fullUrl = `${fullUrl}/${rightSectionSlug}`;
 		paginatedPage.fullPath.compose = newCompose;
 		paginatedPage.slug = newCompose;

package/exporter/utils/store.ts

@@ -243,6 +243,7 @@ export {
 	createStoreDir,
 	getBuildMetadata,
 	getBuildPages,
+	getPageInStoreDir,
 	getPagesToCreateOrDelete,
 	removePagesFromStore,
 	savePagesInStore,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.4.4",
+	"version": "10.4.6",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -70,7 +70,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^10.4.4",
+		"@griddo/eslint-config-back": "^10.4.6",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -117,5 +117,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1177d9b185f1b8768e69600651b07fb028d14b47"
+	"gitHead": "bf836216af29607748b79d098210379423c6914f"
 }