@nuskin/ns-product-lib 2.7.0-cx24-337705.1 → 2.7.0-cx24-3682.2

package/CHANGELOG.md

@@ -1,24 +1,18 @@
-# [2.7.0-cx24-337705.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-337703.1...v2.7.0-cx24-337705.1) (2023-03-23)
+# [2.7.0-cx24-3682.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.1...v2.7.0-cx24-3682.2) (2023-03-24)
 
 
-### Fix
-
-* Added override flag for equinox products ([d098245](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d098245007f453e33cae8fb574dad61fadfc1e5e))
-* Added override flag for equinox products ([2f4af3d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2f4af3d5f7fcfa14f23c9cd18eacfaaa9262e0a0))
-
-# [2.7.0-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2-cx24-337703.1...v2.7.0-cx24-337703.1) (2023-03-22)
-
-
-### Update
+### New
 
-* Merge CX24-3563 changes to CX24-337703 ([9e6ca40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e6ca40c35252c24394351275a234e9847f70bfc))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([219fbd5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/219fbd59b96ed9cbbc3ea94a24d886f0e8ca563f)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([b86a1d2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b86a1d2610892564c643bd851d873e507efedd49)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([60d61cc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/60d61ccd38e9b971b7ac53cf4224a9897a63fef4)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
-## [2.6.2-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2-cx24-337703.1) (2023-03-22)
+# [2.7.0-cx24-3682.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.7.0-cx24-3682.1) (2023-03-24)
 
 
-### Fix
+### New
 
-* Show dropdown for variants ([85cdf69](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/85cdf69cc2bbf6700ec5c9bcacc7222cf2ddf674))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([99cc11a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/99cc11a7a274d97c03efc0a4bcdd0e03eb7b552a)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
 ## [2.6.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1) (2023-03-16)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.7.0-cx24-337705.1",
+  "version": "2.7.0-cx24-3682.2",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "4.2.7",
+    "@nuskin/ns-util": "4.2.5",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/equinox-helpers/interceptors/product.js

@@ -0,0 +1,19 @@
+/**
+ * productFoundInterceptor is executed when an equinox product is found
+ * @param {import('axios').AxiosResponse} response 
+ */
+function productFoundInterceptor(response) {
+  console.log('productFoundInterceptor', response);
+  return response;
+}
+
+/**
+ * productNotFoundInterceptor is called when an equinox product is not found
+ * @param {import('axios').AxiosError} error 
+*/
+function productNotFoundInterceptor(error) {
+  console.log('productNotFoundInterceptor', error);
+  return Promise.reject(error);
+}
+
+module.exports = { productFoundInterceptor, productNotFoundInterceptor };

package/src/product.js

@@ -325,15 +325,10 @@ const Product = function(productData) {
           return this.addCvWithType(csvKey, productStatus.csv[csvKey]);
         }, this);
       }
-      
-      //dont override orderTypes and childSkus when product came from equinox
-      if(!this.equinoxProductId) {
-        this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
-        if(productStatus.childSkus) {
-          this.childSkus = productStatus.childSkus;
-        }
+      this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
+      if(productStatus.childSkus) {
+        this.childSkus = productStatus.childSkus;
       }
-      
       this.setPriceAndPvFromType(priceType, null, option);
       modified = true;
     } else {

package/src/productData.js

@@ -6,6 +6,10 @@ const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
 const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
+const {
+  productFoundInterceptor,
+  productNotFoundInterceptor
+} = require('./equinox-helpers/interceptors/product');
 
 const productTypes = {
   kit: 'kit'
@@ -34,6 +38,7 @@ const ProductData = {
 
   getProductFromEquinox: async function (skus, locale, config) {
     const response = await this.searchEquinoxProduct(skus, locale, config);
+    console.log(response);
 
     if (response.data.product) {
       return await this.eqProductMapper(response.data.product, skus);
@@ -66,9 +71,11 @@ const ProductData = {
     }
 
     const filter = skuFilter.join(" OR ")
+    //axios.defaults.withCredentials = true;
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
+    axios.interceptors.response.use(productFoundInterceptor, productNotFoundInterceptor);
     const response = await axios.request({
       method: 'get',
       url: href,
@@ -81,6 +88,8 @@ const ProductData = {
       withCredentials: true
     });
 
+    axios.interceptors.response.eject(productFoundInterceptor);
+    axios.interceptors.response.eject(productNotFoundInterceptor);
     return response;
   },
 
@@ -132,11 +141,9 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice } = this.getEqProductPromotions(eqVariant);
     const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
     const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
-    const productCVPrice = eventName ? CVPrice : eqVariant.priceFacets.CV;
-    const productPVPrice = eventName ? PVPrice : eqVariant.priceFacets.PV;
 
     return {
       "sku": eqVariant.identifier,
@@ -243,8 +250,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": productCVPrice,
-      "pv": productPVPrice,
+      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+      "pv": eqVariant.priceFacets.PV,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -257,14 +264,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": productCVPrice,
-        "WADW": productCVPrice,
-        "WHL": productCVPrice
+        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
       },
       "pvMap": {
-        "WWHL": productPVPrice,
-        "WADW": productPVPrice,
-        "WHL": productPVPrice
+        "WWHL": eqVariant.priceFacets.PV,
+        "WADW": eqVariant.priceFacets.PV,
+        "WHL": eqVariant.priceFacets.PV
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -321,16 +328,6 @@ const ProductData = {
     const computedPrice = product.totalValue && product.totalValue.priceAfterDiscount
       ? product.totalValue.priceAfterDiscount
       : 0;
-
-    let CVPrice = 0,
-      PVPrice = 0;
-    
-    if(product.totalValue && product.totalValue.priceFacets) {
-      const productPriceFacets = product.totalValue.priceFacets;
-      CVPrice = productPriceFacets.CV && productPriceFacets.CV.CVAfterDiscount ? productPriceFacets.CV.CVAfterDiscount : 0;
-      PVPrice = productPriceFacets.PV && productPriceFacets.PV.PVAfterDiscount ? productPriceFacets.PV.PVAfterDiscount : 0;
-    }
-
     let eventName = "";
     const eventLabels = [];
 
@@ -344,19 +341,17 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName,
-      CVPrice,
-      PVPrice
+      eventName
     }
   },
 
   eqProductMapper: async function (productDataResponse, skus) {
     let count = 0;
+    let variants = {};
     const products = [];
 
     for (const productData of productDataResponse) {
       try {
-        let variants = {};
         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' : ''
@@ -374,14 +369,10 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice,
-          CVPrice,
-          PVPrice
+          defaultProductPrice
         } = this.getEqProductPromotions(product);
         const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
         const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
-        const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
-        const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
 
         product.childSkus = await this.fetchChildSkus(product);
         product.availableQuantity = mapAvailableQuantity(product);
@@ -420,8 +411,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": productCVPrice,
-          "pv": productPVPrice,
+          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+          "pv": product.priceFacets.PV,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -434,14 +425,14 @@ const ProductData = {
             "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
-            "WWHL": productCVPrice,
-            "WADW": productCVPrice,
-            "WHL": productCVPrice
+            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
           },
           "pvMap": {
-            "WWHL": productPVPrice,
-            "WADW": productPVPrice,
-            "WHL": productPVPrice
+            "WWHL": product.priceFacets.PV,
+            "WADW": product.priceFacets.PV,
+            "WHL": product.priceFacets.PV
           },
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),