pim-import 3.4.5 → 4.1.0

package/src/pim/methods/products.ts

@@ -400,7 +400,8 @@ export const excludeCertificationFieldsKeys = [
   "fMarking",
 ];
 
-const getProductFields = (pimDetails: any) => {
+const getProductFields = async (pimDetails: any) => {
+  const defaultEnvironmentLocaleCode = await getEnvironmentDefaultLocaleCode();
   const productFields: any = {};
   productFieldsRequiredData.forEach((fieldData) => {
     if (fieldData.parent) {
@@ -410,13 +411,18 @@ const getProductFields = (pimDetails: any) => {
       ) {
         if (Array.isArray(pimDetails[fieldData.parent][fieldData.key])) {
           pimDetails[fieldData.parent][fieldData.key].forEach((item: any) => {
-            if (!productFields?.[fieldData.parent]?.[fieldData.key]) {
-              if (!productFields?.[fieldData.parent]) {
-                productFields[fieldData.parent] = {};
+            if (
+              item.code &&
+              sanitizeValue(item.code) &&
+              sanitizeValue(item[`value_${defaultEnvironmentLocaleCode}`])
+            ) {
+              if (!productFields?.[fieldData.parent]?.[fieldData.key]) {
+                if (!productFields?.[fieldData.parent]) {
+                  productFields[fieldData.parent] = {};
+                }
+                productFields[fieldData.parent][fieldData.key] = [];
               }
-              productFields[fieldData.parent][fieldData.key] = [];
-            }
-            if (item.code && sanitizeValue(item.code)) {
+
               productFields[fieldData.parent][fieldData.key].push({
                 code: item.code,
               });
@@ -426,7 +432,12 @@ const getProductFields = (pimDetails: any) => {
           let value: any = "";
           if (
             pimDetails?.[fieldData.parent]?.[fieldData.key]?.code &&
-            sanitizeValue(pimDetails[fieldData.parent][fieldData.key].code)
+            sanitizeValue(pimDetails[fieldData.parent][fieldData.key].code) &&
+            sanitizeValue(
+              pimDetails[fieldData.parent][fieldData.key][
+                `value_${defaultEnvironmentLocaleCode}`
+              ]
+            )
           ) {
             value = {
               code:
@@ -442,11 +453,13 @@ const getProductFields = (pimDetails: any) => {
             value = pimDetails[fieldData.parent][fieldData.key];
           }
 
-          if (!productFields[fieldData.parent]) {
-            productFields[fieldData.parent] = {};
-          }
+          if (value) {
+            if (!productFields[fieldData.parent]) {
+              productFields[fieldData.parent] = {};
+            }
 
-          productFields[fieldData.parent][fieldData.key] = value;
+            productFields[fieldData.parent][fieldData.key] = value;
+          }
         }
       } else {
         log(
@@ -457,10 +470,14 @@ const getProductFields = (pimDetails: any) => {
       if (pimDetails?.[fieldData.key]) {
         if (Array.isArray(pimDetails[fieldData.key])) {
           pimDetails[fieldData.key].forEach((item: any) => {
-            if (!productFields?.[fieldData.key]) {
-              productFields[fieldData.key] = [];
-            }
-            if (item.code && sanitizeValue(item.code)) {
+            if (
+              item.code &&
+              sanitizeValue(item.code) &&
+              sanitizeValue(item[`value_${defaultEnvironmentLocaleCode}`])
+            ) {
+              if (!productFields?.[fieldData.key]) {
+                productFields[fieldData.key] = [];
+              }
               productFields[fieldData.key].push({
                 code: item.code,
               });
@@ -470,7 +487,10 @@ const getProductFields = (pimDetails: any) => {
           let value: any = "";
           if (
             pimDetails[fieldData.key]?.code &&
-            sanitizeValue(pimDetails[fieldData.key].code)
+            sanitizeValue(pimDetails[fieldData.key].code) &&
+            sanitizeValue(
+              pimDetails[fieldData.key][`value_${defaultEnvironmentLocaleCode}`]
+            )
           ) {
             value = {
               code:
@@ -485,7 +505,9 @@ const getProductFields = (pimDetails: any) => {
           ) {
             value = pimDetails[fieldData.key];
           }
-          productFields[fieldData.key] = value;
+          if (value) {
+            productFields[fieldData.key] = value;
+          }
         }
       } else {
         log(`${fieldData.key} product field not found on the pim`);
@@ -633,7 +655,7 @@ const getProductData = async (
   const { currentCatalog, ...pimDetails } = productDetails;
 
   log(`Set productFields`);
-  const productFields = getProductFields(pimDetails);
+  const productFields = await getProductFields(pimDetails);
   data.fields = await addFieldValue(data, "productFields", productFields);
 
   // catalogs
@@ -903,6 +925,8 @@ const getProductData = async (
           }
 
           log(`The new imgix url is: ${newImgixUrl}`);
+        } else {
+          log(`wrapperImgix basename matched`);
         }
       } else {
         log(
@@ -1945,16 +1969,17 @@ export const generateTechSpecPdf = async (topicProductId: string) => {
     );
   log(`pdpSiteUrl: ${pdpSiteUrl}`);
   const contents = {
-    header: {
-      right: "Technical Specifications",
-    },
+    // header: {
+    //   right: "Technical Specifications",
+    // },
     footer: {
-      left: pdpSiteUrl,
-      right:
-        "www.flos.com - " +
-        (topicCatalogIds.includes("OUTDOOR")
-          ? "flos.outdoor@flos.com"
-          : "info@flos.com"),
+      topLeft: `<a style="text-decoration: none; color:#000" href="${pdpSiteUrl}">${pdpSiteUrl}</a>`,
+      topRight: topicProductId,
+      bottomLeft: ``,
+      bottomRight: ``,
+      mail: topicCatalogIds.includes("OUTDOOR")
+        ? "flos.outdoor@flos.com"
+        : "info@flos.com",
     },
   };
 

package/src/resources/ProductDetails.ts

@@ -111,6 +111,7 @@ export interface GenericData {
   value_da: string;
   value_ru: string;
   othersData: OthersData;
+  assistant?: string;
 }
 export interface OthersData {}
 export interface LastModified {

package/types/algolia/families.d.ts

@@ -29,7 +29,7 @@ export declare const reindexFamilies: (offset?: number, limit?: number, catalogC
     s3FilePath?: string | undefined;
     total?: number | undefined;
 }>;
-export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<{
+export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<false | {
     objectID: string;
     names: CfLocalizedEntryField;
     code: string;

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { init as initPim } from "./pim/config";
-export { init as initContentful, initBaseEntries, deletePages, deleteEntries, getEntryByID, getTopicPage, } from "./libs/contentful";
+export { init as initContentful, initBaseEntries, deletePages, deleteEntries, getEntryByID, getTopicPage, getEntries, } 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";

package/types/libs/contentful.d.ts

@@ -1,4 +1,5 @@
-import type { Entry, CreateEntryProps } from "contentful-management/dist/typings/entities/entry";
+import type { Entry, CreateEntryProps, EntryProps } from "contentful-management/dist/typings/entities/entry";
+import type { QueryOptions } from "contentful-management/dist/typings/common-types";
 import { Environment, Locale, CreateAssetProps } from "contentful-management/types";
 import { ContentfulLocale, AvailableCatalogs, TopicDetailsResponse, AssetPropFields, OtherFilters, WrapperImageFields } from "../types";
 import { GenericData } from "../resources/ProductDetails";
@@ -57,3 +58,4 @@ export declare const createWrapperImgix: (id: string, data: WrapperImageFields)
 export declare const archiveEntry: (entry: Entry, isProduct?: boolean) => Promise<Entry>;
 export declare const getDesignerData: (designer: GenericData) => Promise<CreateEntryProps<import("contentful-management/types").KeyValueMap>>;
 export declare const addDesignerData: (data: any, designer: GenericData, manyReferences?: boolean) => Promise<any>;
+export declare const getEntries: (opts: QueryOptions) => Promise<import("contentful-management/dist/typings/common-types").Collection<import("contentful-management/dist/typings/entities/entry").Entry, EntryProps<Record<string, any>>>>;

package/types/libs/puppeteer.d.ts

@@ -1,11 +1,18 @@
 /// <reference types="node" />
-interface Columns {
+interface HeaderColumns {
     left?: string;
     right?: string;
 }
+interface FooterColumns {
+    topLeft?: string;
+    topRight?: string;
+    bottomLeft?: string;
+    bottomRight?: string;
+    mail?: string;
+}
 interface PDFHeaderAndFooter {
-    header?: Columns;
-    footer?: Columns;
+    header?: HeaderColumns;
+    footer?: FooterColumns;
 }
 export declare const generatePDFByUrl: (url: string, path?: string, contents?: PDFHeaderAndFooter | undefined) => Promise<Buffer | null>;
 export {};

package/types/resources/ProductDetails.d.ts

@@ -110,6 +110,7 @@ export interface GenericData {
     value_da: string;
     value_ru: string;
     othersData: OthersData;
+    assistant?: string;
 }
 export interface OthersData {
 }