pim-import 2.78.2 → 2.79.1

package/src/pim/data/productFields.json

@@ -265,6 +265,13 @@
     "dictionary": "",
     "type": "number"
   },
+  {
+    "key": "length_us",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
   {
     "key": "netWeight",
     "parent": "logistic",
@@ -475,6 +482,13 @@
     "dictionary": "",
     "type": "number"
   },
+  {
+    "key": "vac",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
   {
     "key": "vdc",
     "parent": "electrical",
@@ -783,6 +797,13 @@
     "dictionary": "",
     "type": "number"
   },
+  {
+    "key": "rgGamutIndex",
+    "parent": "photomestric",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
   {
     "key": "transversalTilting",
     "parent": "physical",
@@ -838,5 +859,229 @@
     "icon": false,
     "dictionary": "DTernaryFlag",
     "type": "object"
+  },
+  {
+    "key": "priceLists",
+    "parent": "",
+    "icon": false,
+    "dictionary": "DPriceList",
+    "type": "array"
+  },
+  {
+    "key": "productionSite",
+    "parent": "",
+    "icon": false,
+    "dictionary": "DProductionSite",
+    "type": "object"
+  },
+  {
+    "key": "customProduct",
+    "parent": "",
+    "icon": false,
+    "dictionary": "DTernaryFlag",
+    "type": "object"
+  },
+  {
+    "key": "bucketColours",
+    "parent": "",
+    "icon": true,
+    "dictionary": "DWebColour",
+    "type": "array"
+  },
+  {
+    "key": "quickDelivery",
+    "parent": "",
+    "icon": false,
+    "dictionary": "DTernaryFlag",
+    "type": "object"
+  },
+  {
+    "key": "reflectorFinish",
+    "parent": "optical",
+    "icon": false,
+    "dictionary": "DReflectorFinish",
+    "type": "object"
+  },
+  {
+    "key": "screenFinish",
+    "parent": "optical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "cutOff",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "boolean"
+  },
+  {
+    "key": "emergencyLightingFlux",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "lightSourceIncluded",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "phases",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "DPhase",
+    "type": "array"
+  },
+  {
+    "key": "maximumWattage",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "driverInputVoltage",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "driverOutputVoltage",
+    "parent": "electrical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "lor",
+    "parent": "photometric",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "rgGamutIndex",
+    "parent": "photometric",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "suspensionType",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "DSuspensionType",
+    "type": "object"
+  },
+  {
+    "key": "constructionMaterial",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "width",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "width_us",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "height",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "height_us",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "cableIngress",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "DCableIngress",
+    "type": "object"
+  },
+  {
+    "key": "cordsColour",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "DWebColour",
+    "type": "array"
+  },
+  {
+    "key": "canopyColor",
+    "parent": "physical",
+    "icon": false,
+    "dictionary": "DWebColour",
+    "type": "object"
+  },
+  {
+    "key": "shippingPkgQty",
+    "parent": "logistic",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "pkgRefCode",
+    "parent": "logistic",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "available",
+    "parent": "logistic",
+    "icon": false,
+    "dictionary": "DTernaryFlag",
+    "type": "object"
+  },
+  {
+    "key": "production",
+    "parent": "logistic",
+    "icon": false,
+    "dictionary": "DProduction",
+    "type": "object"
+  },
+  {
+    "key": "euRule",
+    "parent": "certification",
+    "icon": false,
+    "dictionary": "",
+    "type": "string"
+  },
+  {
+    "key": "lightObjMinDist",
+    "parent": "marking",
+    "icon": false,
+    "dictionary": "",
+    "type": "number"
+  },
+  {
+    "key": "spareParts",
+    "parent": "DTernaryFlag",
+    "icon": false,
+    "dictionary": "",
+    "type": "object"
   }
 ]

package/src/pim/methods/dictionary.ts

@@ -5,9 +5,6 @@ import {
   ProductFieldsRequiredData,
 } from "../../types";
 import {
-  getEnvironment,
-  getEnvironmentDefaultLocaleCode,
-  getEntryByID,
   createEntryWithId,
   updateEntry,
   getEntryByCode,
@@ -20,6 +17,7 @@ import {
   checkConfig as checkS3Config,
   upload as uploadToS3,
   getFileFromS3,
+  saveJsonToS3,
 } from "../../libs/s3";
 import type {
   CreateEntryProps,
@@ -53,69 +51,6 @@ type DictionaryRecord = {
   otherData: ObjectPartial;
 };
 
-interface DictionaryContentfulData {
-  [key: string]: DictionaryRecord[];
-}
-
-const updateContentfulDictionaryData = async (
-  data: DictionaryContentfulData,
-  clearBefore: boolean = false
-) => {
-  log(`updateContentfulDictionaryData - Start`, "INFO");
-
-  const environment = await getEnvironment();
-  const defaultEnvironmentLocaleCode = await getEnvironmentDefaultLocaleCode();
-
-  // Check if entry exists
-  log(`Check if dictionary entry exists`);
-  let entry = await getEntryByID(entryId, contentTypeId);
-
-  const entryData: CreateEntryProps = {
-    fields: {},
-  };
-
-  if (entry) {
-    // Entry exists. Update entry data
-    log(`Dictionary entry exists. Update entry data`);
-    if (
-      clearBefore &&
-      Object.entries(entry.fields.json[defaultEnvironmentLocaleCode]).length
-    ) {
-      entry.fields.json[defaultEnvironmentLocaleCode] = {};
-      entry = await entry.update();
-    }
-
-    entryData.fields = entry?.fields || {};
-
-    entryData.fields = await addFieldValue(
-      entryData,
-      "internalName",
-      "DictionaryProductFields"
-    );
-    entryData.fields = await addFieldValue(entryData, "json", data);
-    entry = await entry.update();
-    entry = await entry.publish();
-  } else {
-    // Entry not exists. Create new entry with data
-    log(`Entry not exists. Create new entry with data`);
-
-    entryData.fields = await addFieldValue(
-      entryData,
-      "internalName",
-      "DictionaryProductFields"
-    );
-    entryData.fields = await addFieldValue(entryData, "json", data);
-    entry = await environment.createEntryWithId(
-      contentTypeId,
-      entryId,
-      entryData
-    );
-    entry = await entry.publish();
-  }
-
-  log(`updateContentfulDictionaryData - Completed`);
-};
-
 const getRequiredDictionaryDataWithIcons = (): ProductFieldsRequiredData[] => {
   return productFieldsRequiredData.filter((field) => field.icon);
 };
@@ -174,17 +109,13 @@ export const importDictionaryIcons = async (
     checkS3Config();
 
     log("importDictionaryIcons - Start", "INFO");
-    log("Get dictionary Contentful entry");
-    const defaultEnvironmentLocaleCode =
-      await getEnvironmentDefaultLocaleCode();
-    const entry = await getEntryByID(entryId, contentTypeId);
+    log("Get S3 JSON dictionary file");
 
-    if (!entry) {
-      throw new Error("Dictionary entry not exists.");
+    const data = await getFileFromS3(`dictionary.json`);
+    if (!data) {
+      throw new Error("Dictionary JSON file not found on S3.");
     }
 
-    const data = entry.fields.json[defaultEnvironmentLocaleCode];
-
     const requiredDictionaryDataWithIcons =
       getRequiredDictionaryDataWithIcons();
     for (const reqField of requiredDictionaryDataWithIcons) {
@@ -224,9 +155,9 @@ export const importDictionaryIcons = async (
       log(`No certifications found into contenful dictionary`);
     }
 
-    // Updating Contentful dictionary entry data
-    log("Updating Contentful dictionary entry data");
-    await updateContentfulDictionaryData(data, true);
+    // Updating S3 dictionary entry data
+    log("Updating S3 dictionary entry data");
+    await saveJsonToS3(data, "dictionary.json");
     log("importDictionaryIcons - Completed");
 
     return { completed: true };
@@ -327,7 +258,9 @@ export const importDictionaryFields = async (
     if (Object.entries(data).length) {
       // Create/Update Contentful entry
       log("Create/Update Contentful entry");
-      await updateContentfulDictionaryData(data, offset === 0);
+      // await updateContentfulDictionaryData(data, offset === 0);
+
+      await saveJsonToS3(data, "dictionary.json", "");
     } else {
       log("no matches found", "ERROR");
     }

package/src/pim/methods/products.ts

@@ -58,7 +58,11 @@ import {
 import { getAudit, getProductDetails } from "../endpoints";
 import { getCategoryTopicCode } from "./catalogs";
 import productFieldsRequiredData from "../data/productFields.json";
-import { getDefaultWrapperImgixAttributesByPimUrl } from "../../libs/imgix";
+import {
+  getDefaultWrapperImgixAttributesByPimUrl,
+  getImgixPimUrlByOriginPath,
+  getOriginPathByPimUrl,
+} from "../../libs/imgix";
 import { generatePDFByUrl } from "../../libs/puppeteer";
 
 export type AvailableProductStatus =
@@ -843,15 +847,34 @@ const getProductData = async (
 
     // THUMB
     if (pimAssetThumb?.url) {
+      log(`Set THUMB`);
       // THUMB WRAPPER IMGIX
       const wrapperImgixID = pimAssetThumb.md5;
       let wrapperImgix = await getEntryByID(
         wrapperImgixID,
         "wrapperImgix",
-        "sys"
+        "sys,fields"
       );
       if (wrapperImgix) {
         log(`wrapperImgix with id ${wrapperImgixID} already exists`);
+        const imgixBasename = basename(
+          wrapperImgix.fields.imgixData[defaultEnvironmentLocaleCode].url
+        );
+        const pimBasename = basename(pimAssetThumb.url);
+        if (imgixBasename !== pimBasename) {
+          log(`Update img url from ${imgixBasename} to ${pimBasename}`);
+          const newImgixUrl = getImgixPimUrlByOriginPath(
+            getOriginPathByPimUrl(pimAssetThumb.url)
+          );
+          wrapperImgix.fields.imgixData[defaultEnvironmentLocaleCode].url =
+            newImgixUrl;
+          wrapperImgix = await wrapperImgix.update();
+          if (wrapperImgix.isPublished()) {
+            wrapperImgix = await wrapperImgix.publish();
+          }
+
+          log(`The new imgix url is: ${newImgixUrl}`);
+        }
       } else {
         log(
           `Add thumbnail imgix wrapper with id ${wrapperImgixID} to Contentful`

package/types/browser.d.ts

@@ -0,0 +1,32 @@
+export { reportError } from "./libs/sentry";
+export { init as initPim } from "./pim/config";
+export { init as initContentful, initBaseEntries, deletePages, deleteEntries, getEntryByID, getTopicPage, } from "./libs/contentful";
+export { init as initS3, upload as uploadS3, saveJsonToS3, getFileFromS3, savePDFToS3, } from "./libs/s3";
+export { importDictionaryFields, importDictionaryIcons, importDictionaryProductLine, importDictionaryProductSubLine, } from "./pim/methods/dictionary";
+export { importCategories } from "./pim/methods/catalogs";
+export { importLatestProducts } from "./pim/methods/latestProducts";
+export { dailyProductsUpdate } from "./pim/methods/dailyProductsUpdate";
+export { importModels } from "./pim/methods/models";
+export { importSubModels } from "./pim/methods/submodels";
+export { importSubFamilies } from "./pim/methods/subfamilies";
+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";
+export { reindexModel, reindexModels, removeModelObject, } from "./algolia/models";
+export { reindexDownload, reindexDownloads, removeDownloadObject, } from "./algolia/downloads";
+export { reindexProject, reindexProjects, removeProjectObject, } from "./algolia/projects";
+export { reindexStory, reindexStories, removeStoryObject, } from "./algolia/stories";
+export { reindexPressReview, reindexPressReviews, removePressReviewObject, } from "./algolia/pressReview";
+export { reindexPressRelease, reindexPressReleases, removePressReleaseObject, } from "./algolia/pressRelease";
+export { reindexPost, reindexPosts, removePostObject } from "./algolia/news";
+export { importDownloads } from "./downloads/import";
+export { getLocalISOTime } from "./utils";
+export { getStaticDailyProducts } from "./pim/endpoints";
+export { log, setLogId, setLogOptions } from "./libs/logs";
+export { removeRecordsByStatus } from "./algolia/clean";
+export { generatePDFByUrl } from "./libs/puppeteer";

package/types/libs/imgix.d.ts

@@ -7,6 +7,7 @@ export declare const getNameByPimUrl: (pimImgUrl: string) => string;
 export declare const getContentTypeByPimUrl: (pimImgUrl: string) => string;
 export declare const getImageAttributesByOriginPath: (originPath: string, sourceId: string) => Promise<{}>;
 export declare const getImageAttributesByPimUrl: (pimUrl: string) => Promise<ImgixAttributes>;
+export declare const getImgixPimUrlByOriginPath: (originPath: string) => string;
 export declare const getWrapperImgixAttributesByPimUrl: (pimUrl: string) => Promise<ImgixData | null>;
 export declare const getDefaultWrapperImgixAttributesByPimUrl: (pimUrl: string) => ImgixData;
 export declare const getWrapperImgixFields: (wrapperImgixId: string) => Promise<{}>;

package/types/libs/logs.d.ts

@@ -2,7 +2,7 @@ import { ObjectPartial } from "../types";
 export declare type LogLevels = "TRACE" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL";
 export declare const logStatus = true;
 export declare const logLevelToHide: LogLevels[];
-export declare const getLogger: () => any;
+export declare const getLogger: () => null;
 export declare const setLogId: (id: string) => void;
 export declare const setLogOptions: (opts: ObjectPartial) => void;
 export declare const log: (message: string, level?: LogLevels) => void;