@nuskin/ns-product-lib 2.7.0-cx24-3682.6 → 2.7.0-cx24-3702.1

package/CHANGELOG.md

@@ -1,46 +1,30 @@
-# [2.7.0-cx24-3682.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.5...v2.7.0-cx24-3682.6) (2023-03-25)
+# [2.7.0-cx24-3702.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2...v2.7.0-cx24-3702.1) (2023-03-25)
 
 
 ### New
 
-* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([13f2b76](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/13f2b76990dd2e4f4226367332212dcc7bd19977)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* adding properties variable to equinox product data ([3a4971b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3a4971bc3620ac848c0ba6c541bf6906b09169fd))
 
-# [2.7.0-cx24-3682.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.4...v2.7.0-cx24-3682.5) (2023-03-25)
+## [2.6.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2) (2023-03-24)
 
 
-### New
-
-* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([588161d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/588161d54fa2e97f6bee2fe33523f3f1bdcb1ed2)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
-
-# [2.7.0-cx24-3682.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.3...v2.7.0-cx24-3682.4) (2023-03-24)
-
-
-### New
-
-* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([f55854a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f55854ad4abb17dbd373fe5e36a38deb2bb8fc53)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
-
-# [2.7.0-cx24-3682.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.2...v2.7.0-cx24-3682.3) (2023-03-24)
-
-
-### New
+### Fix
 
-* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([3ce010e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3ce010e162034d2cc49619f553baf7b8b7fcd4e0)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* Fix drop down variants Cx24 3377 ([262328e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/262328e617b87d6dbf44b1393fdffaa10d8de13d))
 
-# [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)
+# [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)
 
 
-### New
+### Update
 
-* 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)
+* Merge CX24-3563 changes to CX24-337703 ([9e6ca40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e6ca40c35252c24394351275a234e9847f70bfc))
 
-# [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)
+## [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)
 
 
-### New
+### Fix
 
-* 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)
+* Show dropdown for variants ([85cdf69](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/85cdf69cc2bbf6700ec5c9bcacc7222cf2ddf674))
 
 ## [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-3682.6",
+  "version": "2.7.0-cx24-3702.1",
   "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.5",
+    "@nuskin/ns-util": "4.2.7",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/equinox-helpers/index.js

@@ -15,11 +15,6 @@
  * @property {Inventory} [inventory]
  *
  * ---
- * 
- * @description This model represents the response.
- * @typedef EquinoxResponse
- * @type {object}
- * @property {EquinoxProduct} product
  *
  * @description This model represents a product within an Equinox response.
  * @typedef EquinoxProduct

package/src/productData.js

@@ -6,7 +6,6 @@ const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
 const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
-const { productNotFoundInterceptor } = require('./equinox-helpers/interceptors');
 
 const productTypes = {
   kit: 'kit'
@@ -67,11 +66,9 @@ 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((res) => res, productNotFoundInterceptor);
     const response = await axios.request({
       method: 'get',
       url: href,
@@ -84,7 +81,6 @@ const ProductData = {
       withCredentials: true
     });
 
-    axios.interceptors.response.eject(productNotFoundInterceptor);
     return response;
   },
 
@@ -136,9 +132,11 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = 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,
@@ -245,8 +243,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-      "pv": eqVariant.priceFacets.PV,
+      "cv": productCVPrice,
+      "pv": productPVPrice,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -259,14 +257,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
+        "WWHL": productCVPrice,
+        "WADW": productCVPrice,
+        "WHL": productCVPrice
       },
       "pvMap": {
-        "WWHL": eqVariant.priceFacets.PV,
-        "WADW": eqVariant.priceFacets.PV,
-        "WHL": eqVariant.priceFacets.PV
+        "WWHL": productPVPrice,
+        "WADW": productPVPrice,
+        "WHL": productPVPrice
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -299,7 +297,8 @@ const ProductData = {
       },
       "restrictedMarkets": [],
       "addOns": [],
-      "equinoxProductId": eqVariant.identifier
+      "equinoxProductId": eqVariant.identifier,
+      "properties": eqVariant.properties
     };
   },
 
@@ -323,6 +322,16 @@ 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 = [];
 
@@ -336,17 +345,19 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName
+      eventName,
+      CVPrice,
+      PVPrice
     }
   },
 
   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' : ''
@@ -364,10 +375,14 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice
+          defaultProductPrice,
+          CVPrice,
+          PVPrice
         } = 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);
@@ -406,8 +421,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-          "pv": product.priceFacets.PV,
+          "cv": productCVPrice,
+          "pv": productPVPrice,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -420,14 +435,14 @@ const ProductData = {
             "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 : ''
+            "WWHL": productCVPrice,
+            "WADW": productCVPrice,
+            "WHL": productCVPrice
           },
           "pvMap": {
-            "WWHL": product.priceFacets.PV,
-            "WADW": product.priceFacets.PV,
-            "WHL": product.priceFacets.PV
+            "WWHL": productPVPrice,
+            "WADW": productPVPrice,
+            "WHL": productPVPrice
           },
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),
@@ -462,7 +477,8 @@ const ProductData = {
           "restrictedMarkets": [],
           "addOns": [],
           "inventory": product.inventory || "", //inventory label
-          "equinoxProductId": productData.identifier
+          "equinoxProductId": productData.identifier,
+          "properties": product.properties
         };
 
         products.push(new Product(product));

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

@@ -1,5 +0,0 @@
-const productNotFound = require('./productNotFound');
-
-module.exports = {
-  productNotFoundInterceptor: productNotFound
-}

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

@@ -1,51 +0,0 @@
-// httpStatus codes
-const httpStatus = { notFound: 404 };
-
-/**
- * productNotFound returns a model "ProductNotFound" when the status code is Not Found.
- * Note: Do not polute this file. Create a new file for new interceptor.
- * 
- * @param {import('axios').AxiosError} error 
- * @returns {import('axios').AxiosResponse<import('../').EquinoxResponse>}
-*/
-function productNotFound(error) {
-  const segments = 'catalogs/search';
-  const { config, response } = error;
-
-  if (response.status === httpStatus.notFound && config.url.includes(segments)) {
-    const params = new URLSearchParams(config.url);
-    const filterParam = Array.from(params.values())[0];
-    const sku = getSKU(filterParam);
-
-    if (sku !== null) {
-      return {
-        data: {
-          product: {
-            sku
-          }
-        }
-      }
-    }
-
-    console.error('Unable to detect SKU from the given parameter', filterParam);
-  }
-
-  return Promise.reject(error);
-}
-
-/**
- * getSKU returns the SKU from the given parameter.
- * @param {string} param '\\''index_key_productId="02010489" OR index_key_skuId="02010489"'''
- * @returns {string|null} SKU 
- */
-function getSKU(param) {
-  const result = param.match(/\d{8}/);
-
-  if (result === null) {
-    return null;
-  }
-
-  return result[0];
-}
-
-module.exports = productNotFound;