@griddo/cx 10.3.22 → 10.3.23

package/exporter/adapters/gatsby/index.ts

@@ -1,5 +1,6 @@
 import { getInstanceDomains } from "@exporter/utils/domains";
 import { downloadBuildData } from "@exporter/utils/download-build-data";
+import { uploadSearchContentToAPI } from "@exporter/utils/searches";
 import {
 	measureExecutionTime,
 	printExporterLogo,
@@ -66,6 +67,22 @@ async function runGatsbyAdapter() {
 
 		console.info(`success gatsby build command - ${exeTime}s`);
 
+		/*
+		* Gatsby build is done, if the .env GRIDDO_SEARCH_FEATURE is set to true 
+		* we save the search data in the API. 
+		*/
+		const shouldUploadSearchData = JSON.parse(process.env.GRIDDO_SEARCH_FEATURE || "false");
+		if (shouldUploadSearchData) {
+			exeTime = await measureExecutionTime(uploadSearchContentToAPI).catch((err) => {
+				console.error(
+					"Error while uploads search content in DDBB :",
+					err?.stdout?.toString() || err
+				);
+				process.exit(1);
+			});
+	
+			console.info(`success upload search information to DDBB - ${exeTime}s`);
+		}
 		/*
 		 * When Gatsby ends, remove disposable artifacts and save .cache and
 		 * public foler to use in the next render.

package/exporter/types/global.ts

@@ -32,8 +32,8 @@ export type Petition = Record<string, unknown>;
 // TODO: JSDoc
 export interface PostSearchInfoProps {
 	title?: string;
-	description: string;
-	image: string;
+	description: string | null | undefined;
+	image: string | null | undefined;
 	pageId?: number;
 	siteId: number;
 	content: string;

package/exporter/utils/pages.ts

@@ -11,20 +11,13 @@ import type {
 import type { TemplateWithDistributor } from "../types/templates";
 import type { Core, Fields } from "@griddo/core";
 
-import fs from "node:fs";
-import path from "node:path";
-
 import dotenv from "dotenv";
 
-import { postSearchInfo } from "./searches";
 import { formatImage } from "../../src/utils";
 
 dotenv.config();
 
 // Envs
-const GRIDDO_SEARCH_FEATURE = !!JSON.parse(
-	process.env.GRIDDO_SEARCH_FEATURE || "false"
-);
 const STRIP_DOMAIN_FROM_PATH = JSON.parse(
 	process.env.GRIDDO_EXPORT_STRIP_DOMAIN_FROM_PATH || "false"
 );
@@ -213,29 +206,6 @@ async function createGriddoPageObject(
 		},
 	};
 
-	if (GRIDDO_SEARCH_FEATURE && !excludeFromSearch) {
-		const exportFile = path.resolve(
-			__dirname,
-			"../../dist/",
-			`./${pagePath}index.html`
-		);
-		const content = fs.existsSync(exportFile)
-			? fs.readFileSync(exportFile).toString()
-			: "";
-
-		await postSearchInfo({
-			title,
-			description: openGraph.description || "",
-			image: openGraph.image || "",
-			pageId: id,
-			languageId,
-			template: page?.template?.templateType || page?.templateId || null,
-			siteId: page.site,
-			url: page.fullUrl,
-			content,
-		});
-	}
-
 	return griddoPageObject;
 }
 

package/exporter/utils/searches.ts

@@ -1,7 +1,11 @@
 import type { PostSearchInfoResponse } from "../types/api";
 import type { PostSearchInfoProps } from "../types/global";
 
+import fs from "node:fs";
+import path from "node:path";
+
 import { post } from "./api";
+import { getBuildPages } from "./store";
 
 // Envs
 const API_URL = process.env.API_URL as string;
@@ -98,4 +102,49 @@ function stripSpaces(str: string) {
 	return str.replace(/\s+/g, " ");
 }
 
-export { postSearchInfo };
+/**
+ * Function that search in the /public folder the content info of the pages and send it to the search table in the ddbb using the API.
+ */
+async function uploadSearchContentToAPI() {
+	// Extraemos el path de la carpeta store
+	const storeFolder = path.resolve(__dirname, `../store`);
+	// Convertimos el string que nos devuelve el env en un booleano
+	const isDomainStrippedFromPath: boolean = JSON.parse(process.env.GRIDDO_EXPORT_STRIP_DOMAIN_FROM_PATH || "false");
+
+
+	for await (const store of getBuildPages(storeFolder)) {
+		const { 
+			context: { 
+				page,
+				openGraph
+			} 
+		} = store;
+
+		const { 
+			compose, 
+			domain 
+		} = page.fullPath;
+
+		const contextPath = isDomainStrippedFromPath 
+			? path.resolve(__dirname, `../dist/${compose}/index.html`)
+			: path.resolve(__dirname, `../dist${domain}${compose}/index.html`);
+		
+		const content = fs.readFileSync(contextPath).toString();
+
+		const pageObject: PostSearchInfoProps = { 
+			siteId: page.site,
+			pageId: page.id,
+			title: page.title,
+			languageId: page.language,
+			url: page.fullUrl,
+			template: page.template.templateType || page.templateId,
+			description: openGraph.description,
+			image: openGraph.image,
+			content
+		};
+
+		await postSearchInfo(pageObject);
+	}
+}
+
+export { postSearchInfo, uploadSearchContentToAPI };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.3.22",
+	"version": "10.3.23",
 	"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.3.22",
+		"@griddo/eslint-config-back": "^10.3.23",
 		"@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": "1016e656a2fb09acc98c3576dcbc3f092bd85ee1"
+	"gitHead": "e7753f3423d12e77162843c53fcaac6e6a79c5d9"
 }