pim-import 3.1.1 → 3.1.4

package/src/pim/methods/families.ts

@@ -271,6 +271,13 @@ export const importFamilies = async (
 
         await createOrUpdatePage(topicFamily);
 
+        if (serverUtils) {
+          const currentTotal =
+            families.length > limit && limit !== -1 ? limit : families.length;
+          const progress = Math.floor((++current / currentTotal) * 100);
+          serverUtils.updateProgress(progress);
+        }
+
         if (limit !== -1 && count + 1 - offset >= limit) {
           break;
         }
@@ -282,18 +289,16 @@ export const importFamilies = async (
           serverUtils.log(family.data.code);
         }
       }
-      if (serverUtils) {
-        const currentTotal =
-          families.length > limit && limit !== -1 ? limit : families.length;
-        const progress = Math.floor((++current / currentTotal) * 100);
-        serverUtils.updateProgress(progress);
-      }
     }
     count++;
   }
 
   const nextOffset = Number(offset) + Number(limit);
 
+  if (serverUtils) {
+    serverUtils.updateProgress(100);
+  }
+
   return {
     offset: nextOffset,
     limit: Number(limit),

package/src/pim/methods/products.ts

@@ -1224,7 +1224,10 @@ export const importProduct = async (
     return false;
   }
 
-  if (productDetails.visibleToWeb === true) {
+  if (
+    productDetails.visibleToWeb === true ||
+    productDetails.code === "0000000-TEST"
+  ) {
     await addProduct(productDetails);
     return true;
   } else {
@@ -1442,6 +1445,10 @@ export const setProductsRelationships = async (
   const seconds = secondBetweenTwoDate(timeStart, timeEnd);
   log(`Request time: ${seconds} seconds`);
 
+  if (serverUtils) {
+    serverUtils.updateProgress(100);
+  }
+
   return {
     offset: Number(offset) + Number(limit),
     limit: Number(limit),
@@ -1539,6 +1546,11 @@ export const audit = async (
     await saveJsonToS3(allAudit, filename, path);
     const s3Path = `${path}/${filename}`;
 
+    if (serverUtils) {
+      serverUtils.log(`Saved s3FilePath: ${s3FilePath}`);
+      serverUtils.updateProgress(100);
+    }
+
     return {
       offset: Number(offset),
       limit: Number(limit),
@@ -1589,6 +1601,11 @@ export const audit = async (
       const secs = secondBetweenTwoDate(timeStart, tEnd);
       log(`Execution time: ${secs} seconds`);
 
+      if (serverUtils) {
+        serverUtils.log(`Audit completed`);
+        serverUtils.updateProgress(100);
+      }
+
       return {
         offset: nextOffset,
         limit: limit,
@@ -1626,13 +1643,18 @@ export const audit = async (
       );
 
       if (!productEntry) {
+        let logMessage = "";
         if (catalog) {
-          log(
-            `The ${audit.product} product was not found in the CMS with catalog ${catalog}`,
-            "WARN"
-          );
+          logMessage = `The ${audit.product} product was not found in the CMS with catalog ${catalog}`;
         } else {
-          log(`The ${audit.product} product was not found in the CMS`, "WARN");
+          logMessage = `The ${audit.product} product was not found in the CMS`;
+        }
+        log(logMessage, "WARN");
+
+        if (serverUtils) {
+          serverUtils.log(logMessage);
+          const progress = Math.floor((++current / allAudit.length) * 100);
+          serverUtils.updateProgress(progress);
         }
         continue;
       }
@@ -1796,6 +1818,10 @@ export const audit = async (
     };
   } else {
     log(`Execution completed`);
+    if (serverUtils) {
+      serverUtils.log(`Execution completed`);
+      serverUtils.updateProgress(100);
+    }
   }
   const tEnd = new Date();
   const secs = secondBetweenTwoDate(timeStart, tEnd);
@@ -1910,33 +1936,41 @@ export const generateTechSpecPdf = async (topicProductId: string) => {
   }
 
   const pdf = await generatePDFByUrl(layoutUrl, "", contents);
-  if (serverUtils) {
-    serverUtils.updateProgress(45);
-  }
-  const s3Url = await savePDFToS3(pdf, fileName, "tech-spec");
-  if (serverUtils) {
-    serverUtils.updateProgress(75);
-  }
+  if (pdf) {
+    if (serverUtils) {
+      serverUtils.updateProgress(45);
+    }
+    const s3Url = await savePDFToS3(pdf, fileName, "tech-spec");
+    if (serverUtils) {
+      serverUtils.updateProgress(75);
+    }
 
-  log(`Update techSpec field...`);
-  topicProduct.fields = await addFieldValue(topicProduct, "techSpec", s3Url);
+    log(`Update techSpec field...`);
+    topicProduct.fields = await addFieldValue(topicProduct, "techSpec", s3Url);
 
-  topicProduct = await topicProduct.update();
-  if (topicProduct.isPublished()) {
-    try {
-      topicProduct = await topicProduct.publish();
-    } catch (err) {
-      log(`Cannot publish entry.`);
-      log(err);
+    topicProduct = await topicProduct.update();
+    if (topicProduct.isPublished()) {
+      try {
+        topicProduct = await topicProduct.publish();
+      } catch (err) {
+        log(`Cannot publish entry.`);
+        log(err);
+      }
     }
-  }
 
-  log(`${topicProductId} techSpec field updated!`);
-  if (serverUtils) {
-    serverUtils.updateProgress(100);
-  }
+    if (serverUtils) {
+      serverUtils.updateProgress(100);
+    }
 
-  return s3Url;
+    log(`${topicProductId} techSpec field updated!`);
+    return s3Url;
+  } else {
+    log(
+      `TechSpec PDF generation failed for product: ${topicProductId}!`,
+      "ERROR"
+    );
+    return "";
+  }
 };
 
 const getLightModuleAutoDescriptionByProductFields = async (

package/src/pim/methods/subfamilies.ts

@@ -535,6 +535,10 @@ export const importSubFamilies = async (
 
   const nextOffset = Number(offset) + Number(limit);
 
+  if (serverUtils) {
+    serverUtils.updateProgress(100);
+  }
+
   return {
     offset: nextOffset,
     limit: Number(limit),

package/types/browser.d.ts

@@ -11,7 +11,6 @@ export { importFamilies } from "./pim/methods/families";
 export { importProductByCode, setProductsRelationships, setProductRelationships, getAllProductEntriesByCatalog, audit, generateTechSpecPdf, setProductsAutodescription, getProductAutodescription, setProductAutodescriptionByTopicId, removeProductFromColorVariantsByProductLine, removeAllProductModelProductRelations, } from "./pim/methods/products";
 export { resetIndexSettings } from "./algolia/config";
 export { reindexFamilies, reindexFamily, removeFamilyObject, } from "./algolia/families";
-export { pipedreamReindex } from "./algolia/pipedreamReindex";
 export { reindexSubFamilies, reindexSubFamily, removeSubFamilyObject, } from "./algolia/subFamilies";
 export { reindexProduct, reindexProducts, removeProductObject, } from "./algolia/products";
 export { reindexSubModel, reindexSubModels, removeSubModelObject, } from "./algolia/subModels";

package/types/index.d.ts

@@ -11,7 +11,6 @@ export { importFamilies } from "./pim/methods/families";
 export { importProductByCode, setProductsRelationships, setProductRelationships, getAllProductEntriesByCatalog, audit, generateTechSpecPdf, setProductsAutodescription, getProductAutodescription, setProductAutodescriptionByTopicId, removeProductFromColorVariantsByProductLine, removeAllProductModelProductRelations, } from "./pim/methods/products";
 export { resetIndexSettings } from "./algolia/config";
 export { reindexFamilies, reindexFamily, removeFamilyObject, } from "./algolia/families";
-export { pipedreamReindex } from "./algolia/pipedreamReindex";
 export { reindexSubFamilies, reindexSubFamily, removeSubFamilyObject, } from "./algolia/subFamilies";
 export { reindexProduct, reindexProducts, removeProductObject, } from "./algolia/products";
 export { reindexSubModel, reindexSubModels, removeSubModelObject, } from "./algolia/subModels";

package/types/libs/puppeteer.d.ts

@@ -7,5 +7,5 @@ interface PDFHeaderAndFooter {
     header?: Columns;
     footer?: Columns;
 }
-export declare const generatePDFByUrl: (url: string, path?: string, contents?: PDFHeaderAndFooter | undefined) => Promise<Buffer>;
+export declare const generatePDFByUrl: (url: string, path?: string, contents?: PDFHeaderAndFooter | undefined) => Promise<"" | Buffer>;
 export {};

package/dist/algolia/pipedreamReindex.js

@@ -1,22 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pipedreamReindex = void 0;
-const logs_1 = require("../libs/logs");
-const axios_1 = __importDefault(require("@atoms-studio/axios"));
-const pipedreamReindex = async (reindexType, catalogCode) => {
-    logs_1.log(`pipedreamReindex - reindexType: ${reindexType} catalogCode: ${catalogCode}`);
-    if (!process?.env?.FPI_PIPEDREAM_ALGOLIA) {
-        logs_1.log(`FPI PIPEDREAM ALGOLIA environment variable not found, reindex algolia from Pipedream cannot be started!`, "WARN");
-        return;
-    }
-    axios_1.default.post(process.env.FPI_PIPEDREAM_ALGOLIA, {
-        isReindexByImport: true,
-        reindexType,
-        catalogCode,
-    });
-};
-exports.pipedreamReindex = pipedreamReindex;
-//# sourceMappingURL=pipedreamReindex.js.map

package/dist/algolia/pipedreamReindex.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pipedreamReindex.js","sourceRoot":"","sources":["../../src/algolia/pipedreamReindex.ts"],"names":[],"mappings":";;;;;;AACA,uCAAmC;AACnC,gEAAwC;AAIjC,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAkC,EAClC,WAA8B,EACf,EAAE;IACjB,UAAG,CACD,mCAAmC,WAAW,iBAAiB,WAAW,EAAE,CAC7E,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE;QACxC,UAAG,CACD,yGAAyG,EACzG,MAAM,CACP,CAAC;QACF,OAAO;KACR;IAED,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QAC5C,iBAAiB,EAAE,IAAI;QACvB,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,gBAAgB,oBAqB3B"}

package/src/algolia/pipedreamReindex.ts

@@ -1,28 +0,0 @@
-import { AvailableCatalogs } from "src/types";
-import { log } from "../libs/logs";
-import axios from "@atoms-studio/axios";
-
-type AvailablreReindexType = "reindexFamilies" | "reindexSubFamilies";
-
-export const pipedreamReindex = async (
-  reindexType: AvailablreReindexType,
-  catalogCode: AvailableCatalogs
-): Promise<void> => {
-  log(
-    `pipedreamReindex - reindexType: ${reindexType} catalogCode: ${catalogCode}`
-  );
-
-  if (!process?.env?.FPI_PIPEDREAM_ALGOLIA) {
-    log(
-      `FPI PIPEDREAM ALGOLIA environment variable not found, reindex algolia from Pipedream cannot be started!`,
-      "WARN"
-    );
-    return;
-  }
-
-  axios.post(process.env.FPI_PIPEDREAM_ALGOLIA, {
-    isReindexByImport: true,
-    reindexType,
-    catalogCode,
-  });
-};