@nuskin/ns-product-lib 2.19.3 → 2.19.5-pur-1420.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.19.3",
+  "version": "2.19.5-pur-1420.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/blob/master/README.md",
   "devDependencies": {
-    "@nuskin/configuration-sdk": "2.3.2",
+    "@nuskin/configuration-sdk": "3.0.0",
     "@nuskin/ns-common-lib": "1.4.7",
     "@nuskin/ns-util": "4.5.4",
     "@nuskin/product-lib": "2.2.1",
@@ -36,7 +36,7 @@
     "prettier": "1.19.1"
   },
   "peerDependencies": {
-    "@nuskin/configuration-sdk": "2.x",
+    "@nuskin/configuration-sdk": "3.x",
     "@nuskin/ns-common-lib": "1.x",
     "@nuskin/ns-util": "4.x",
     "axios": "1.6.7"

package/src/graph-ql/product.js

@@ -129,7 +129,7 @@ function mapSkusToProducts(skus, products){
 
 }
 
-const addPrice = (productData, priceTypeKey, subKey, priceValue) => {
+function addPrice(productData, priceTypeKey, subKey, priceValue) {
   if (!['Points', 'cv', 'price', 'pv'].includes(priceTypeKey)) {
     // if the priceTypeKey is not one of these, then we don't want it to show.
     return;
@@ -155,7 +155,7 @@ const addPrice = (productData, priceTypeKey, subKey, priceValue) => {
   productData[priceTypeKey][subKey] = priceValue;
 }
 
-function convertPricing(pricing, productData) {
+function convertPricingJson(pricing, productData) {
   if (pricing) {
     Object.keys(pricing).forEach((channelKey) => {
       Object.keys(pricing[channelKey]).forEach((contextKey) => {
@@ -225,6 +225,17 @@ function convertPricing(pricing, productData) {
   }
 }
 
+function mapPricingJson(productDetail, kitOrVariant, isContentStack) {
+  if (isContentStack) {
+    const pricingMap = JSON.parse(kitOrVariant.pricingJson)
+    const convertedMap = {}
+    convertPricingJson(pricingMap, convertedMap)
+    Object.assign(productDetail.priceMap, convertedMap.price)
+    Object.assign(productDetail.cvMap, convertedMap.csv)
+    Object.assign(productDetail.pvMap, convertedMap.psv)
+  }
+}
+
 /**
  *
  * Map product data to be product card consumable structure *
@@ -320,16 +331,12 @@ function mapProduct(product, market, locale, config) {
     }
   }
 
-  const pricingMap = JSON.parse(kitOrVariant.pricingJson)
-  const convertedMap = {}
-  convertPricing(pricingMap, convertedMap)
-  Object.assign(productDetail.priceMap, convertedMap.price)
-  Object.assign(productDetail.cvMap, convertedMap.csv)
-  Object.assign(productDetail.pvMap, convertedMap.psv)
+  const isContentStack = product.productDataSource.source === 'contentstack'
+  mapPricingJson(productDetail, kitOrVariant, isContentStack)
 
   //map only if it is normal product
   if (product.variants && !kitBundleProducts) {
-    productDetail.variants = mapVariants(product);
+    productDetail.variants = mapVariants(product, isContentStack);
   }
 
   if (kitBundleProducts) {
@@ -354,9 +361,10 @@ function mapProduct(product, market, locale, config) {
 /**
  * Map product variants
  * @param {*} product
+ * @param {boolean} isContentStack
  * @returns {Array<object>}  productVariants
  */
-function mapVariants(product) {
+function mapVariants(product, isContentStack) {
 
   //return if it  has no variant
   if (!product.variants || (product.variants && product.variants.length === 1)) {
@@ -445,6 +453,7 @@ function mapVariants(product) {
         productStatus: mapProductStatus(variant.status.status)
       }
     }
+    mapPricingJson(variants[sku], variant, isContentStack)
   });
 
   return variants;
@@ -651,7 +660,8 @@ function mapProductStatus(status) {
 
 /* istanbul ignore next */
 function mapPromos(product) {
-  if ((product.price.retailSales !== null && product.price.retailSales >= 0) || (product.price.wholesaleSales !== null && product.price.wholesaleSales >= 0)) {
+  if ((product.price.retailSales !== null && product.price.retailSales >= 0) ||
+      (product.price.wholesaleSales !== null && product.price.wholesaleSales >= 0)) {
     if (product.pricingJson) {
       const parsedPricing = JSON.parse(product.pricingJson)
       let promotion = parsedPricing.promotion
@@ -671,8 +681,10 @@ function mapPromos(product) {
       if (parsedPricing.retail) {
         const filter = ['adr', 'order', 'webAdr', 'webOrder']
         const priceMap = {}, cvMap = {}, pvMap = {}
-        const retailActiveEvents = Object.fromEntries(Object.entries(parsedPricing.retail).filter(([k]) => !filter.includes(k)));
-        const wholesaleActiveEvents = Object.fromEntries(Object.entries(parsedPricing.wholesale).filter(([k]) => !filter.includes(k)));
+        const retailActiveEvents =
+          Object.fromEntries(Object.entries(parsedPricing.retail).filter(([k]) => !filter.includes(k)));
+        const wholesaleActiveEvents =
+          Object.fromEntries(Object.entries(parsedPricing.wholesale).filter(([k]) => !filter.includes(k)));
         let offerId = null
         for (const key in retailActiveEvents) {
           if (Object.hasOwnProperty.call(retailActiveEvents, key)) {
@@ -694,7 +706,7 @@ function mapPromos(product) {
     }
     return { message: product.salesLabel, offerId: null, priceMap: {}, cvMap: {}, pvMap: {} }
   }
-  return {message: null, offerId: null}
+  return {message: product.salesLabel, offerId: null}
 }
 
 /* istanbul ignore next */