@nuskin/ns-product-lib 2.5.0-cx24-2862.2 → 2.5.0-cx24-2462.3.1

package/CHANGELOG.md

@@ -1,24 +1,16 @@
-# [2.5.0-cx24-2862.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2862.1...v2.5.0-cx24-2862.2) (2022-11-11)
+# [2.5.0-cx24-2462.3.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-CX24.2.1...v2.5.0-cx24-2462.3.1) (2022-11-15)
 
 
 ### Update
 
-* set ADR pricing from equinox (CX24-2862) ([b64dcea](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b64dcea4dd3374be992c667db5c0b2604aacc029))
+* map equinox properties (CX24-2462) ([fdb813d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fdb813d6b2f5d9f877ffa870e4102e7d5e0dff07))
 
-# [2.5.0-cx24-2862.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-cx24-2612.1.1...v2.5.0-cx24-2862.1) (2022-11-10)
-
-
-### Update
-
-* set ADR pricing from equinox (CX24-2862) ([9f6dfb7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f6dfb726f40b1335411318629a2ebdf1b4dac96))
-* set ADR pricing from equinox (CX24-2862) ([61f550a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/61f550a21c5cc9d062549ec2aaf2758aebccf2be))
-
-## [2.4.2-cx24-2612.1.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-cx24-2612.1.1) (2022-11-07)
+## [2.4.2-CX24.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-CX24.2.1) (2022-11-07)
 
 
 ### Fix
 
-* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([9d9d106](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9d9d10667477b4c7ef7bf8ec013aab322d3cdbcc))
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([82611ca](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/82611cab93c990ed1ce05690feb9d00967090dea))
 
 ## [2.4.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.4.1) (2022-11-06)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.5.0-cx24-2862.2",
+  "version": "2.5.0-cx24-2462.3.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -25,8 +25,8 @@
     "eslint-config-prettier": "4.1.0",
     "eslint-plugin-json": "2.1.1",
     "eslint-plugin-prettier": "3.1.2",
-    "jest": "29.2.2",
-    "jest-environment-jsdom": "29.2.2",
+    "jest": "26.0.1",
+    "jest-environment-jsdom": "26.0.1",
     "jest-sonar-reporter": "2.0.0",
     "prettier": "1.19.1"
   },

package/src/productData.js

@@ -81,7 +81,7 @@ const ProductData = {
   /**
    * @param {contentstack.MarketConfig} marketConfig
    */
-  getLegacyRequestHeaders: function(marketConfig) {
+  getLegacyRequestHeaders: function (marketConfig) {
     return {
       'Content-Type': 'application/json',
       client_id: marketConfig.checkout_client_id,
@@ -95,7 +95,7 @@ const ProductData = {
    * @param {*} eqVariant
    * @returns Array<Product>
    */
-  eqProductVariantMapper : function (eqVariant) {
+  eqProductVariantMapper: function (eqVariant) {
 
     let imageURL = eqVariant.properties.imageURL;
     const regex = /\d+.\d+/
@@ -104,7 +104,7 @@ const ProductData = {
     if (imageURL.includes('contentstack')) {
       thumbnailImage = imageURL + '?width=40'
     } else {
-      thumbnailImage = imageURL.replace(regex,'40.40')
+      thumbnailImage = imageURL.replace(regex, '40.40')
     }
 
     return {
@@ -125,7 +125,7 @@ const ProductData = {
         }
       ],
       "thumbnail": thumbnailImage,
-      "ingredients": eqVariant.properties.ingredients,
+      ingredients: mapIngredients(eqVariant.properties.ingredients),
       "benefits": eqVariant.properties.benefits,
       "usage": eqVariant.properties.usage,
       "resources": eqVariant.properties.resources,
@@ -142,17 +142,17 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": (eqVariant.priceFacets.CV) ?  eqVariant.priceFacets.CV : '',
-      "pv":eqVariant.priceFacets.PV,
+      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+      "pv": eqVariant.priceFacets.PV,
       "priceType": "WRTL",
       "price": eqVariant.priceFacets["Regular Price"],
       "priceMap": {
         "WRTL": eqVariant.priceFacets["Regular Price"],
         "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
-        "WADR": eqVariant.priceFacets["Regular Price"],
+        "WADR": 9999.01,
         "RTL": eqVariant.priceFacets["Regular Price"],
         "WWHL": eqVariant.priceFacets["Wholesale Price"],
-        "WADW": eqVariant.priceFacets["Wholesale Price"],
+        "WADW": 9998.01,
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
@@ -165,7 +165,19 @@ const ProductData = {
         "WADW": eqVariant.priceFacets.PV,
         "WHL": eqVariant.priceFacets.PV
       },
-      "orderTypes": this._setOrderType(eqVariant.properties),
+      "orderTypes": {
+        "adr": true,
+        "order": true,
+        "zpfc": false,
+        "zadp": true,
+        "ars": true,
+        "kiosk": true,
+        "mobile": true,
+        "preferred customer": true,
+        "retail": true,
+        "web": true,
+        "web display": true
+      },
       "division": eqVariant.properties.division,
       "backOrderDate": null,
       "locallyProduced": false,
@@ -176,9 +188,9 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": eqVariant.properties.variantLabel  ||  "",
+      "variantDropdownLabel": eqVariant.properties.variantLabel || "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": eqVariant.properties.variantLabel  ||  "",
+      "variantsLabel": eqVariant.properties.variantLabel || "",
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": null,
@@ -211,7 +223,7 @@ const ProductData = {
       if (imageURL.includes('contentstack')) {
         thumbnailImage = imageURL + '?width=40'
       } else {
-        thumbnailImage = imageURL.replace(regex,'40.40')
+        thumbnailImage = imageURL.replace(regex, '40.40')
       }
 
       if (data.sku && data.sku.length > 1) {
@@ -231,18 +243,19 @@ const ProductData = {
         "longDescr": data.properties.productDetailsDescription,
         "fullImage": imageURL,
         "imageAltText": data.properties.name,
-        "productCarouselImages": [
-          {
-            "contentType": "img",
-            "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
-            "alt": ""
-          }
-        ],
+        productCarouselImages: data.sku[count].properties.productImages
+          ? JSON.parse(data.sku[count].properties.productImages).map(img => (
+            {
+              contentType: /\.jpg/i.test(img.url) ? 'img' : 'video',
+              src: img.url,
+              alt: img.alt
+            }
+          )) : [],
         "thumbnail": thumbnailImage,
         "ingredients": data.properties.ingredients,
-        "benefits": data.properties.benefits,
-        "usage": data.properties.usage,
-        "resources": data.sku[count].properties.resources,
+        benefits: mapBenefits(data.properties.benefits),
+        usage: mapUsage(data.properties.usage),
+        resources: mapResources(data.properties.resources),
         "videos": "",
         "movie": "",
         "youtube": "",
@@ -256,16 +269,16 @@ const ProductData = {
         "availableQuantity": data.sku[count].inventoryProperties.atpQty,
         "maxQuantity": 999,
         "points": "",
-        "cv": (data.sku[count].priceFacets.CV) ?  data.sku[count].priceFacets.CV : '',
+        "cv": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
         "pv": data.sku[count].priceFacets.PV,
         "priceType": "WRTL",
         "price": data.sku[count].priceFacets["Regular Price"],
         "priceMap": {
           "WRTL": data.sku[count].priceFacets["Regular Price"],
           "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
-          "WADR": data.sku[count].priceFacets["Regular Price"],
+          "WADR": 9999.01,
           "RTL": data.sku[count].priceFacets["Regular Price"],
-          "WADW": data.sku[count].priceFacets["Wholesale Price"],
+          "WADW": 9998.01,
           "WHL": data.sku[count].priceFacets["Wholesale Price"],
           "WWHL": data.sku[count].priceFacets["Wholesale Price"]
         },
@@ -279,7 +292,19 @@ const ProductData = {
           "WADW": data.sku[count].priceFacets.PV,
           "WHL": data.sku[count].priceFacets.PV
         },
-        "orderTypes": this._setOrderType(data.sku[count].properties),
+        "orderTypes": {
+          "adr": true,
+          "order": true,
+          "zpfc": false,
+          "zadp": true,
+          "ars": true,
+          "kiosk": true,
+          "mobile": true,
+          "preferred customer": true,
+          "retail": true,
+          "web": true,
+          "web display": true
+        },
         "childSkus": [],
         "custTypes": this.switchCustType(data.properties.customerTypes),
         "division": data.properties.division,
@@ -292,9 +317,9 @@ const ProductData = {
         "shade": "",
         "status": this.switchStatusFromEquinox(data.sku[count].properties.productStatus),
         "variantType": "Other",
-        "variantDropdownLabel": data.sku[count].properties.variantLabel  ||  "",
+        "variantDropdownLabel": data.sku[count].properties.variantLabel || "",
         "variantDropdownPlaceholder": "Select Type",
-        "variantsLabel": data.sku[count].properties.variantLabel  ||  "",
+        "variantsLabel": data.sku[count].properties.variantLabel || "",
         "groupOffer": false,
         "personalOffer": false,
         "savedEventName": null,
@@ -381,73 +406,82 @@ const ProductData = {
 
   _sortProductsBySku: function (skus, products) {
 
-    if(!skus || !products || products.length === 1) {
+    if (!skus || !products || products.length === 1) {
       return products
     }
 
-    const sortedProducts = products.sort(function (a, b) {
+    return products.sort(function (a, b) {
       return skus.indexOf(a.sku) - skus.indexOf(b.sku);
     });
 
-    return sortedProducts
+  }
+}
 
-  },
+function mapBenefits(benefits) {
+  if (!benefits) {
+    return {};
+  }
 
-  /**
-   * 
-   * @param {*} availableChannels 
-   * 
-   * This function is use to convert arsPhone,web,kiosk,mobile,subscription
-   * to orderType object
-   *  "adr”
-      "order"
-      "zpfc"
-      "zadp"
-      "ars"
-      "kiosk"
-      "mobile"
-      "preferred customer"
-      "retail"
-      "web"
-      "web display"
-   */
-  _setOrderType: function (properties) {
-    let orderTypeArr = {
-      "adr": false,
-      "order": false,
-      "zpfc": false,
-      "zadp": false,
-      "ars": false,
-      "kiosk": false,
-      "mobile": false,
-      "preferred customer": false,
-      "retail": false,
-      "web": false,
-      "web display": false
-    };
-    let availableChannelsArr = properties.availableChannels.split(',')
-    
-    availableChannelsArr.forEach(channel => {
-      if (channel == 'arsPhone') 
-        orderTypeArr.ars = true
-      if (channel == 'web') {
-        orderTypeArr.order = true
-        orderTypeArr.web = true
-      }
-      if (channel == 'kiosk')
-        orderTypeArr.kiosk = true
-      if (channel == 'mobile')
-        orderTypeArr.mobile = true
-      if (channel == 'subscription')
-        orderTypeArr.adr = true
+  const list = JSON.parse(benefits)
+    .map(item => item.benefits.map(benefit => benefit).join(''))
+    .join('');
 
-    });
-    if (properties.retail)
-      orderTypeArr.retail = true
-    if (properties.prefferredCustomer)
-      orderTypeArr['preferred customer'] = true
-    
-    return orderTypeArr;
+  return {
+    benefitsHTML: list,
+    benefitsText: 'Benefits',
+    benefitItems: []
+  };
+}
+
+function mapIngredients(ingredients) {
+  if (!mapIngredients) {
+    return {};
+  }
+
+  // concatenating the name, description, keyIngredients, and otherIngredients
+  const list = JSON.parse(ingredients)
+    .map(i => [
+      i.keyIngredients
+        .map(k => `<img src="${k.image.url}" alt="${k.image.alt}" /> ${k.name} ${k.description}`)
+        .join(' '),
+      i.otherIngredients
+    ].join(' '))
+    .join(' ');
+
+  return {
+    ingredientsHTML: list,
+    ingredientsText: 'Ingredients',
+    ingredients: []
+  }
+}
+
+function mapResources(resources) {
+  if (!resources) {
+    return {};
+  }
+
+  const text = JSON.parse(resources)
+    .map(res => `<p><a href="${res.url}" target="_blank">${res.title}</a></p>`)
+    .join('');
+
+  return {
+    resourcesHTML: text,
+    resourcesText: 'Resources',
+    resourceLinks: []
+  }
+}
+
+function mapUsage(usage) {
+  if (!usage) {
+    return {};
+  }
+
+  const text = JSON.parse(usage).additionalText
+    .map(t => t).join('');
+
+  return {
+    usageHTML: text,
+    usageText: 'Usage'
   }
 }