@nuskin/ns-product-lib 2.6.1-cx24-3607.4 → 2.6.1-cx24-337701.1

package/CHANGELOG.md

@@ -1,31 +1,11 @@
-## [2.6.1-cx24-3607.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.3...v2.6.1-cx24-3607.4) (2023-03-16)
+## [2.6.1-cx24-337701.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1-cx24-337701.1) (2023-03-19)
 
 
 ### Fix
 
-* The variant drop down label ([3e6b9f5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3e6b9f5e422b71c3e5f73d5a62f0491343ed7afb))
-
-## [2.6.1-cx24-3607.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.2...v2.6.1-cx24-3607.3) (2023-03-16)
-
-
-### Fix
-
-* check for imageURL ([5d56bae](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5d56baeb4c148cc667cc3c9321fb72e87216c921))
-
-## [2.6.1-cx24-3607.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-3607.1...v2.6.1-cx24-3607.2) (2023-03-16)
-
-
-### Fix
-
-* (equinox-enabled) skip product mapping when an error occurs in PLP #CX24-3607 ([49fa749](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/49fa7499b390aa84cc887fc631037363421d252a)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
-
-## [2.6.1-cx24-3607.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1-cx24-3607.1) (2023-03-15)
-
-
-### Fix
-
-* (equinox-enabled) skip product mapping when an error occurs in PLP #CX24-3607 ([950c165](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/950c1650115f92badc5b898b5df722568b034afe)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
-* Cannot read properties of undefined (reading 'qty') in PLP #CX24-3607 ([8cde88f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8cde88f2f61279d20794a0e43696187c4326ca28)), closes [#CX24-3607](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3607)
+* The variant drop down label ([bd60148](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bd60148d1a50e895d36139932740fe4ee7f9f50a))
+* The variant drop down label ([749b476](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/749b47605995405886460b29f20411a21e45fb68))
+* The variant drop down label ([bc555ab](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bc555abec97bca95fc0ba18a0eb4f0a0c9cd537a))
 
 # [2.6.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.2...v2.6.0) (2023-03-13)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.6.1-cx24-3607.4",
+  "version": "2.6.1-cx24-337701.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/equinox-helpers/index.js

@@ -1,11 +1,10 @@
 /**
- * @description This model represents the mapped values of a product
  * @typedef Product
  * @type {object}
- * @property {ProductChildSku[]} childSkus
+ * @property {ChildSku[]} childSkus
  * @property {Inventory} [inventoryProperties]
- *
- * @typedef ProductChildSku
+ * 
+ * @typedef ChildSku
  * @type {object}
  * @property {string} productId
  * @property {string} skuId
@@ -13,52 +12,14 @@
  * @property {number} skuQuantity
  * @property {string} availableChannels
  * @property {Inventory} [inventory]
- *
- * ---
- *
- * @description This model represents a product within an Equinox response.
- * @typedef EquinoxProduct
- * @type {object}
- * @property {string} identifier
- * @property {EquinoxProductSKU[]} sku
- * @property {"kit"|"bundle"} [type]
- *
- * @typedef EquinoxProductSKU
- * @type {object}
- * @property {boolean} default
- *  For multi-variant products, this indicates that this is the searched SKU
- *  when using catalogs/search endpoint.
- * @property {string} identifier
- * @property {Inventory} inventoryProperties
- * @property {EquinoxProductProperties} properties
- *
- * @typedef EquinoxProductProperties
- * @type {object}
- * @property {string} availableChannels
- *
- * ---
- *
- * Types common to Product model and Equinox Product model
  * 
  * @typedef Inventory
  * @type {object}
  * @property {number} atpQty
  * @property {boolean} backOrdered
- *
- * ---
- *
- * Standalone types. These are types not related to Product
- * and Equinox Product models.
- *
- * @typedef KitSKUQuantity
- * @type {object}
- * @property {string} sku
- * @property {number} qty
  */
 const availableQuantity = require('./availableQuantity');
-const childSKU = require('./childSKU');
 
 module.exports = {
-  mapAvailableQuantity: availableQuantity,
-  mapChildSKU: childSKU
+  mapAvailableQuantity: availableQuantity
 };

package/src/productData.js

@@ -5,7 +5,7 @@ const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
-const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
+const { mapAvailableQuantity } = require('./equinox-helpers');
 
 const productTypes = {
   kit: 'kit'
@@ -129,9 +129,15 @@ const ProductData = {
    */
   eqProductVariantMapper: function (eqVariant) {
 
-    let imageURL = eqVariant.properties.imageURL ? eqVariant.properties.imageURL : '';
-    let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
+    let imageURL = eqVariant.properties.imageURL;
+    const regex = /\d+\.\d+/
+    let thumbnailImage = ''
 
+    if (imageURL.includes('contentstack')) {
+      thumbnailImage = imageURL + '?width=40'
+    } else {
+      thumbnailImage = imageURL.replace(regex, '40.40')
+    }
 
     const { eventName, eventLabels, computedPrice, defaultProductPrice } = this.getEqProductPromotions(eqVariant);
     const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
@@ -277,9 +283,9 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": eqVariant.properties.variantLabel || "",
+      "variantDropdownLabel": eqVariant.properties.variantSelectLabel || "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": eqVariant.properties.variantLabel || "",
+      "variantsLabel": eqVariant.properties.variantSelectLabel || "",
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": eventName,
@@ -337,137 +343,151 @@ const ProductData = {
     }
   },
 
+  moveArray: function (arr, from, to) {
+    arr.splice(to, 0, arr.splice(from, 1)[0]);
+    return arr;
+  },
+
+
   eqProductMapper: async function (productDataResponse, skus) {
+    // console.log(productDataResponse, skus);
     let count = 0;
     let variants = {};
     const products = [];
 
     for (const productData of productDataResponse) {
-      try {
-        let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
-        let imageURL = product.properties.imageURL ? product.properties.imageURL : '';
-        let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
-
-
-        if (productData.sku && productData.sku.length > 1) {
-          // exclude base product from variants
-          productData.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
-            variants[variant.identifier] = this.eqProductVariantMapper(variant);
-            return variant;
-          });
+      let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
+      let imageURL = product.properties.imageURL;
+      const regex = /\d+\.\d+/
+      let thumbnailImage = ''
+
+      if (imageURL.includes('contentstack')) {
+        thumbnailImage = imageURL + '?width=40'
+      } else {
+        thumbnailImage = imageURL.replace(regex, '40.40')
+      }
+
+      if (productData.sku && productData.sku.length > 1) {
+        // exclude base product from variants
+        productData.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
+          variants[variant.identifier] = this.eqProductVariantMapper(variant);
+          return variant;
+        });
+
+        //check variants for default and put it in the first element of the variants array
+        if (variants.length > 1) {
+          let defaultKey = variants.map(e => e.default).indexOf(true);
+          variants = this.moveArray(variants, defaultKey, 0);
         }
 
-        const {
-          eventName,
-          eventLabels,
-          computedPrice,
-          defaultProductPrice
-        } = this.getEqProductPromotions(product);
-        const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
-        const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
-
-        product.childSkus = await this.fetchChildSkus(product);
-        product.availableQuantity = mapAvailableQuantity(product);
-        product = {
-          ...product,
-          "sku": product.identifier,
-          "globalProductID": productData.identifier,
-          "title": productData.properties.name,
-          "country": product.properties.market,
-          "language": "en",
-          "shortDescr": productData.properties.description,
-          "longDescr": productData.properties.productDetailsDescription,
-          "fullImage": imageURL,
-          "imageAltText": productData.properties.name,
-          "productCarouselImages": [
-            {
-              "contentType": "img",
-              "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
-              "alt": ""
-            }
-          ],
-          "thumbnail": thumbnailImage,
-          "ingredients": productData.properties.ingredients,
-          "benefits": productData.properties.benefits,
-          "usage": productData.properties.usage,
-          "resources": product.properties.resources,
-          "videos": "",
-          "movie": "",
-          "youtube": "",
-          "salesEventText": "",
-          "contentSection": [
-            {
-              "sectionContent": "<div class=\"contentSections\"></div>\n"
-            }
-          ],
-          "scanQualified": productData.properties.scanQualifiedCount,
-          "maxQuantity": 999,
-          "points": "",
-          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-          "pv": product.priceFacets.PV,
-          "priceType": "WRTL",
-          "price": discountedPrice,
-          "priceMap": {
-            "WRTL": productPrice,
-            "WADW-WRTL": product.priceFacets["Regular Price"],
-            "WADR": product.priceFacets["Regular Price"],
-            "RTL": product.priceFacets["Regular Price"],
-            "WADW": product.priceFacets["Wholesale Price"],
-            "WHL": product.priceFacets["Wholesale Price"],
-            "WWHL": product.priceFacets["Wholesale Price"]
-          },
-          "cvMap": {
-            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
-          },
-          "pvMap": {
-            "WWHL": product.priceFacets.PV,
-            "WADW": product.priceFacets.PV,
-            "WHL": product.priceFacets.PV
-          },
-          "orderTypes": this._setOrderType(product.properties),
-          "custTypes": this.switchCustType(product.properties.customerTypes),
-          "division": productData.properties.division,
-          "backOrderDate": null,
-          "locallyProduced": false,
-          "agelocme": null,
-          "count": "",
-          "flavor": "",
-          "size": product.properties.size,
-          "shade": "",
-          "status": this.switchStatusFromEquinox(product.properties.productStatus),
-          "variantType": "Other",
-          "variantDropdownLabel": product.properties.variantLabel || "",
-          "variantDropdownPlaceholder": "Select Type",
-          "variantsLabel": product.properties.variantLabel || "",
-          "groupOffer": false,
-          "personalOffer": false,
-          "savedEventName": eventName,
-          "salesLabel": eventLabels,
-          "eventName": eventName,
-          "sizeWeight": '',
-          "nettoWeight": "",
-          "variants": variants,
-          "searchScore": 0,
-          "isExclusive": product.properties.isExclusive || false,
-          "marketAttributes": {
-            "discount": true,
-            "redeem": true,
-            "earn": true
-          },
-          "restrictedMarkets": [],
-          "addOns": [],
-          "inventory": product.inventory || "", //inventory label
-          "equinoxProductId": productData.identifier
-        };
-
-        products.push(new Product(product));
-      } catch (err) {
-        console.error('Unable to map the product', productData.identifier, ':', err);
-        console.error('Product info:', productDataResponse, skus);
-        continue;
       }
+
+      const {
+        eventName,
+        eventLabels,
+        computedPrice,
+        defaultProductPrice
+      } = this.getEqProductPromotions(product);
+      const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
+      const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+
+      product.childSkus = await this.fetchChildSkus(product);
+      product.availableQuantity = mapAvailableQuantity(product);
+      product = {
+        ...product,
+        "sku": product.identifier,
+        "globalProductID": productData.identifier,
+        "title": productData.properties.name,
+        "country": product.properties.market,
+        "language": "en",
+        "shortDescr": productData.properties.description,
+        "longDescr": productData.properties.productDetailsDescription,
+        "fullImage": imageURL,
+        "imageAltText": productData.properties.name,
+        "productCarouselImages": [
+          {
+            "contentType": "img",
+            "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
+            "alt": ""
+          }
+        ],
+        "thumbnail": thumbnailImage,
+        "ingredients": productData.properties.ingredients,
+        "benefits": productData.properties.benefits,
+        "usage": productData.properties.usage,
+        "resources": product.properties.resources,
+        "videos": "",
+        "movie": "",
+        "youtube": "",
+        "salesEventText": "",
+        "contentSection": [
+          {
+            "sectionContent": "<div class=\"contentSections\"></div>\n"
+          }
+        ],
+        "scanQualified": productData.properties.scanQualifiedCount,
+        "maxQuantity": 999,
+        "points": "",
+        "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+        "pv": product.priceFacets.PV,
+        "priceType": "WRTL",
+        "price": discountedPrice,
+        "priceMap": {
+          "WRTL": productPrice,
+          "WADW-WRTL": product.priceFacets["Regular Price"],
+          "WADR": product.priceFacets["Regular Price"],
+          "RTL": product.priceFacets["Regular Price"],
+          "WADW": product.priceFacets["Wholesale Price"],
+          "WHL": product.priceFacets["Wholesale Price"],
+          "WWHL": product.priceFacets["Wholesale Price"]
+        },
+        "cvMap": {
+          "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+          "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+          "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
+        },
+        "pvMap": {
+          "WWHL": product.priceFacets.PV,
+          "WADW": product.priceFacets.PV,
+          "WHL": product.priceFacets.PV
+        },
+        "orderTypes": this._setOrderType(product.properties),
+        "custTypes": this.switchCustType(product.properties.customerTypes),
+        "division": productData.properties.division,
+        "backOrderDate": null,
+        "locallyProduced": false,
+        "agelocme": null,
+        "count": "",
+        "flavor": "",
+        "size": product.properties.size,
+        "shade": "",
+        "status": this.switchStatusFromEquinox(product.properties.productStatus),
+        "variantType": "Other",
+        "variantDropdownLabel": product.properties.variantLabel || "",
+        "variantDropdownPlaceholder": "Select Type",
+        "variantsLabel": product.properties.variantLabel || "",
+        "groupOffer": false,
+        "personalOffer": false,
+        "savedEventName": eventName,
+        "salesLabel": eventLabels,
+        "eventName": eventName,
+        "sizeWeight": '',
+        "nettoWeight": "",
+        "variants": variants,
+        "searchScore": 0,
+        "isExclusive": product.properties.isExclusive || false,
+        "marketAttributes": {
+          "discount": true,
+          "redeem": true,
+          "earn": true
+        },
+        "restrictedMarkets": [],
+        "addOns": [],
+        "inventory": product.inventory || "", //inventory label
+        "equinoxProductId": productData.identifier
+      };
+
+      products.push(new Product(product));
     }
 
     let data = {
@@ -510,7 +530,7 @@ const ProductData = {
           type: 'SKUKIT',
           availableChannels: product.properties.availableChannels
         },
-        ...res.data.product.map(p => mapChildSKU(kits, p))
+        ...res.data.product.map(p => this.buildChildSkus(kits, p))
       ];
 
       return childSkus;
@@ -519,6 +539,23 @@ const ProductData = {
     return [];
   },
 
+  buildChildSkus: function (kits, product) {
+    const sku = product.sku[0];
+    const kit = kits.filter(k => k.sku === sku.identifier)[0];
+
+    return {
+      productId: product.identifier,
+      skuId: sku.identifier,
+      type: 'MANDATORY',
+      skuQuantity: kit.qty,
+      availableChannels: sku.properties.availableChannels,
+      inventory: {
+        atpQty: sku.inventoryProperties.atpQty,
+        backOrdered: sku.inventoryProperties.backOrdered
+      }
+    }
+  },
+
   /**
    *
    * Map status from equinox to  legacy

package/src/equinox-helpers/childSKU.js

@@ -1,31 +0,0 @@
-/**
- * childSKU maps a product variant. Used mainly in subscription.
- *
- * @param {import('.').KitSKUQuantity[]} kits 
- * @param {import('.').EquinoxProduct} product 
- */
-function childSKU(kits, product) {
-  const sku = product.sku.filter(sku => sku.default)[0];
-  if (!sku) {
-    throw Error('Unable to find the default SKU.');
-  }
-
-  const kit = kits.filter(k => k.sku === sku.identifier)[0];
-  if (!kit) {
-    throw Error('SKU kit does not exist in the list of available variants.');
-  }
-
-  return {
-    productId: product.identifier,
-    skuId: sku.identifier,
-    type: 'MANDATORY',
-    skuQuantity: kit.qty,
-    availableChannels: sku.properties.availableChannels,
-    inventory: {
-      atpQty: sku.inventoryProperties.atpQty,
-      backOrdered: sku.inventoryProperties.backOrdered
-    }
-  }
-}
-
-module.exports = childSKU;