@nuskin/ns-product-lib 2.6.0-cx24-33721.1 → 2.6.0-cx24-3377.2

package/CHANGELOG.md

@@ -1,9 +1,18 @@
-# [2.6.0-cx24-33721.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.1...v2.6.0-cx24-33721.1) (2023-03-08)
+# [2.6.0-cx24-3377.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.1...v2.6.0-cx24-3377.2) (2023-03-08)
 
 
 ### New
 
-* Update equinox query for KIT and its mapping ([7df6f96](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7df6f9671c58eddb57c9acfd9d4b79b8dec6a78e))
+* Fix multiple variants not loading properly (CX24-3377) ([d3a2663](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d3a266319c8ff7b4650c9ef9a06f411b117d98d3))
+
+# [2.6.0-cx24-3377.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.1...v2.6.0-cx24-3377.1) (2023-03-08)
+
+
+### New
+
+* Fix multiple variants not loading properly (CX24-3377) ([fb7a856](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fb7a856a39cb7189862d7b7be51b36b15569189e))
+* Fix multiple variants not loading properly (CX24-3377) ([2990272](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/29902726ac21a246638586b5645a070bed1b7fa4))
+* Fix multiple variants not loading properly (CX24-3377) ([0cee74b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0cee74bc366a9032966d235e54b731d03333f902))
 
 ## [2.5.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0...v2.5.1) (2023-03-07)
 

package/package.json

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

package/src/product.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { isTrue }  = require("@nuskin/ns-common-lib");
+const { isTrue } = require("@nuskin/ns-common-lib");
 
 const ProductUtils = require("./productUtils.js");
 
@@ -8,7 +8,7 @@ const Agelocme = require("./agelocme.js");
 const PriceType = require("./models/priceType.js");
 const ProductStatus = require("./models/productStatus.js");
 
-const Product = function(productData) {
+const Product = function (productData) {
   this.priceMap = {};
   this.pvMap = {};
   this.cvMap = {};
@@ -77,13 +77,13 @@ const Product = function(productData) {
   this.inventory = "";
   this.equinoxProductId = "";
 
-  this.setMarketAttributes = function(productStatus) {
+  this.setMarketAttributes = function (productStatus) {
     if (productStatus.marketAttributes) {
       this.marketAttributes = productStatus.marketAttributes;
     }
   };
 
-  this.getAgelocmeKeyPart = function() {
+  this.getAgelocmeKeyPart = function () {
     let keyPart = null;
     if (this.agelocme) {
       keyPart =
@@ -97,27 +97,27 @@ const Product = function(productData) {
     return keyPart;
   };
 
-  this.getHighlightedSku = function() {
+  this.getHighlightedSku = function () {
     let rv = this.sku;
     if (this.highlightedSku) rv = this.highlightedSku;
     return rv;
   };
 
-  this.getProductSearchTitle = function() {
+  this.getProductSearchTitle = function () {
     if (this.agelocme && this.agelocme.label) {
       return this.agelocme.label;
     }
     return this.title;
   };
 
-  this.getProductSearchSku = function() {
+  this.getProductSearchSku = function () {
     if (this.agelocme && this.agelocme.code) {
       return this.agelocme.code;
     }
     return this.getHighlightedSku();
   };
 
-  this.getDescription = function() {
+  this.getDescription = function () {
     let description = this.longDescr;
     if (!description || description.length === 0) {
       return this.shortDescr;
@@ -125,7 +125,7 @@ const Product = function(productData) {
     return description;
   };
 
-  this.setFullImage = function(fullImage) {
+  this.setFullImage = function (fullImage) {
     if (fullImage) {
       this.fullImage = fullImage.replace("http:", "https:");
     } else {
@@ -133,19 +133,19 @@ const Product = function(productData) {
     }
   };
 
-  this.getFullImage = function() {
+  this.getFullImage = function () {
     return this.fullImage ? this.fullImage.replace("http:", "https:") : "";
   };
 
-  this.setProductCarouselImages = function(productCarouselImages) {
+  this.setProductCarouselImages = function (productCarouselImages) {
     this.productCarouselImages = productCarouselImages;
   };
 
-  this.getProductCarouselImages = function() {
+  this.getProductCarouselImages = function () {
     return this.productCarouselImages;
   };
 
-  this.setImageAltText = function(altText) {
+  this.setImageAltText = function (altText) {
     if (altText) {
       this.imageAltText = altText;
     } else {
@@ -153,11 +153,11 @@ const Product = function(productData) {
     }
   };
 
-  this.getImageAltText = function() {
+  this.getImageAltText = function () {
     return this.imageAltText || this.title;
   };
 
-  this.setThumbnail = function(thumbnail) {
+  this.setThumbnail = function (thumbnail) {
     if (thumbnail) {
       this.thumbnail = thumbnail.replace("http:", "https:");
     } else {
@@ -165,7 +165,7 @@ const Product = function(productData) {
     }
   };
 
-  this.setThumbnailFromSku = function(sku) {
+  this.setThumbnailFromSku = function (sku) {
     // WARNING: Base URL will need to be handled in the client (call setBaseUrl)
     // eslint-disable-next-line max-len
     // this.thumbnail = `${RunConfigService.getBaseUrl()}/content/products/${ProductUtils.getTokenizedSku(sku)}/jcr:content/fullImage.img.100.100.png`;
@@ -175,43 +175,43 @@ const Product = function(productData) {
     )}/jcr:content/fullImage.img.100.100.png`;
   };
 
-  this.getThumbnail = function() {
+  this.getThumbnail = function () {
     return this.thumbnail ? this.thumbnail.replace("http:", "https:") : "";
   };
 
-  this.hasAvailableQuantity = function(qty = 1) {
+  this.hasAvailableQuantity = function (qty = 1) {
     return Math.min(this.maxQuantity, this.availableQuantity) >= qty;
   };
 
-  this.setPoints = function(points) {
+  this.setPoints = function (points) {
     this.points = ensureFloatVal(points) || "";
   };
 
-  this.getPointsFixed = function() {
+  this.getPointsFixed = function () {
     return parseFloat(this.points).toFixed(2);
   };
 
-  this.setCv = function(cv) {
+  this.setCv = function (cv) {
     this.cv = ensureFloatVal(cv) || "";
   };
 
-  this.getCvFixed = function() {
+  this.getCvFixed = function () {
     return parseFloat(this.cv).toFixed(2);
   };
 
-  this.setPv = function(pv) {
+  this.setPv = function (pv) {
     this.pv = ensureFloatVal(pv) || "";
   };
 
-  this.getPvFixed = function() {
+  this.getPvFixed = function () {
     return parseFloat(this.pv || 0).toFixed(2);
   };
 
-  this.setPrice = function(price) {
+  this.setPrice = function (price) {
     this.price = ensureFloatVal(price, true);
   };
 
-  this.setFormattedPrice = function(formattedPrice) {
+  this.setFormattedPrice = function (formattedPrice) {
     this.formattedPrice = formattedPrice;
   };
 
@@ -220,13 +220,13 @@ const Product = function(productData) {
    * added to the cart the event pricing needs to be remembered if toggling between
    * pricetypes with event pricing and pricetype without event pricing
    */
-  this.lockEventName = function() {
+  this.lockEventName = function () {
     if (!this.savedEventName && this.eventName) {
       this.savedEventName = this.eventName;
     }
   };
 
-  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
+  this.setPriceAndPvFromType = function (_priceType, _activeEvents = null, option = {}) {
     // WARNING: priceType needs to be handled client-side
     // const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
     //     ? PriceType.WWHL
@@ -271,11 +271,11 @@ const Product = function(productData) {
     return changed;
   };
 
-  this.getPrice = function() {
+  this.getPrice = function () {
     return this.price ? this.price : 0;
   };
 
-  this.getPriceFixed = function() {
+  this.getPriceFixed = function () {
     if (typeof this.price === "number") {
       return parseFloat(this.price.toFixed(2));
     } else {
@@ -283,15 +283,15 @@ const Product = function(productData) {
     }
   };
 
-  this.getOriginalPrice = function() {
+  this.getOriginalPrice = function () {
     return this.priceType ? this.priceMap[this.priceType] : null;
   };
 
-  this.addPricing = function(type, price) {
+  this.addPricing = function (type, price) {
     this.priceMap[type] = price;
   };
 
-  this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
+  this.addPricingFromStatus = function (productStatus, priceType, option = {}) {
     let modified = false;
 
     if (!priceType) {
@@ -326,7 +326,7 @@ const Product = function(productData) {
         }, this);
       }
       this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
-      if(productStatus.childSkus) {
+      if (productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }
       this.setPriceAndPvFromType(priceType, null, option);
@@ -346,15 +346,15 @@ const Product = function(productData) {
     return modified;
   };
 
-  this.addPvWithType = function(type, pv) {
+  this.addPvWithType = function (type, pv) {
     this.pvMap[type] = pv;
   };
 
-  this.addCvWithType = function(type, cv) {
+  this.addCvWithType = function (type, cv) {
     this.cvMap[type] = cv;
   };
 
-  this.getPricing = function(type) {
+  this.getPricing = function (type) {
     let retVal = null;
 
     if (type) {
@@ -381,7 +381,7 @@ const Product = function(productData) {
     return eventPriceTypes;
   };
 
-  this.getPvWithType = function(type) {
+  this.getPvWithType = function (type) {
     let rv = this.pvMap[type];
     if (rv == null) {
       // Assumption: we always have WWHL from the service
@@ -391,7 +391,7 @@ const Product = function(productData) {
     return rv;
   };
 
-  this.getCvWithType = function(type) {
+  this.getCvWithType = function (type) {
     let rv = this.cvMap[type];
     if (rv == null) {
       rv = this.cvMap[PriceType.WWHL];
@@ -399,77 +399,80 @@ const Product = function(productData) {
     return rv;
   };
 
-  this.hasAdrOption = function() {
+  this.hasAdrOption = function () {
     return this.orderTypes["adr"];
   };
 
-  this.isAdrOnly = function() {
+  this.isAdrOnly = function () {
     return this.hasAdrOption() && !this.hasOrderOption();
   };
 
-  this.hasMultipleOrderTypes = function() {
+  this.hasMultipleOrderTypes = function () {
     return this.hasOrderOption() && this.hasAdrOption();
   };
 
-  this.hasOrderOption = function() {
+  this.hasOrderOption = function () {
     return this.orderTypes["order"];
   };
 
-  this.isDistributor = function() {
+  this.isDistributor = function () {
     return this.custTypes.includes("10");
   };
 
-  this.isCustomer = function() {
+  this.isCustomer = function () {
     return this.custTypes.includes("20");
   };
 
-  this.isPreferredCustomer = function() {
+  this.isPreferredCustomer = function () {
     return this.custTypes.includes("30");
   };
 
-  this.isBase = function() {
+  this.isBase = function (option = {}) {
+    if (option && option.isEquinoxEnabled) {
+      return !!this.variants;
+    }
     return this.sku.substring(2, 4) === "55";
   };
 
-  this.isVariant = function() {
+  this.isVariant = function () {
     return this.baseSku.length > 0 && this.variantSkus().length === 0;
   };
 
-  this.setVariant = function(variantProduct) {
+  this.setVariant = function (variantProduct) {
     if (variantProduct && variantProduct.sku) {
       this.variants[variantProduct.sku] = variantProduct;
     }
   };
 
-  this.getVariant = function(sku) {
+  this.getVariant = function (sku) {
     return this.variants[sku];
   };
 
-  this.variantSkus = function() {
+  this.variantSkus = function () {
     return Object.keys(this.variants);
   };
 
-  this.getVariantsList = function() {
+  this.getVariantsList = function () {
     return Object.values(this.variants);
   };
 
-  this.getMinPrice = function() {
+  this.getMinPrice = function () {
     return this.priceMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPrice = function() {
+  this.getMaxPrice = function () {
     return this.priceMap[`max-${this.priceType}`];
   };
 
-  this.getMinPv = function() {
+  this.getMinPv = function () {
     return this.pvMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPv = function() {
+  this.getMaxPv = function () {
     return this.pvMap[`max-${this.priceType}`];
   };
 
-  this.toJSON = function() {
+  this.toJSON = function () {
     let retData = {};
     retData.sku = this.sku;
     retData.globalProductID = this.globalProductID;
@@ -538,23 +541,23 @@ const Product = function(productData) {
     return retData;
   };
 
-  this.setMeCommerceProductData = function(/*productData*/) {
+  this.setMeCommerceProductData = function (/*productData*/) {
     console.error("setMeCommerceProductData is deprecated!");
   };
 
-  this.setBaseUrl = function(baseUrl) {
+  this.setBaseUrl = function (baseUrl, option = {}) {
     this.thumbnail = ProductUtils.applyBaseUrl(this.thumbnail, baseUrl);
     this.fullImage = ProductUtils.applyBaseUrl(this.fullImage, baseUrl);
 
-    if (this.isBase()) {
+    if (this.isBase(option)) {
       for (const variantSku in this.variants) {
         const variant = this.variants[variantSku];
-        variant.setBaseUrl(baseUrl);
+        variant.setBaseUrl(baseUrl, option);
       }
     }
   };
 
-  this.setProductData = function(productData) {
+  this.setProductData = function (productData) {
     let data;
 
     if (productData) {
@@ -662,7 +665,7 @@ const Product = function(productData) {
           ? data.pvMap
           : this.pvMap;
       this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, data.orderTypes);
-      if(data.childSkus) {
+      if (data.childSkus) {
         this.childSkus = data.childSkus;
       }
       this.custTypes = data.custTypes || [];
@@ -678,7 +681,7 @@ const Product = function(productData) {
     }
   };
 
-  this.isEmpty = function() {
+  this.isEmpty = function () {
     return (
       isFieldEmpty(this.sku) &&
       isFieldEmpty(this.title) &&

package/src/productData.js

@@ -27,23 +27,11 @@ const ProductData = {
   },
 
   getProductFromEquinox: async function (skus, locale, config) {
-
-    let skuFilter = [];
-
-    if(Array.isArray(skus)) {
-      skus.forEach((sku) => {
-        skuFilter.push(`index_key_productId="${sku}" OR index_key_skuId="${sku}"`)
-      })
-    } else {
-      //all featured products
-      skuFilter.push(`index_key_productId="${skus}" OR index_key_skuId="${skus}"`)
-    }
-
-    const filter = skuFilter.join(" OR ")
+    const filter = `{"filters": [{"field": "index_key_skuId","operation": "IN", "value": "${skus.toString()}"}]}`;
     axios.defaults.withCredentials = true;
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
+    const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
       url: href,
@@ -111,7 +99,7 @@ const ProductData = {
   eqProductVariantMapper: function (eqVariant) {
 
     let imageURL = eqVariant.properties.imageURL;
-    const regex = /\d+\.\d+/
+    const regex = /\d+.\d+/
     let thumbnailImage = ''
 
     if (imageURL.includes('contentstack')) {
@@ -330,9 +318,8 @@ const ProductData = {
     let variants = {};
 
     let prodArr = productDataResponse.map((data) => {
-      let product = (data.type && data.type === "kit") ? data : data.sku[count];
-      let imageURL = product.properties.imageURL;
-      const regex = /\d+\.\d+/
+      let imageURL = data.sku[count].properties.imageURL;
+      const regex = /\d+.\d+/
       let thumbnailImage = ''
 
       if (imageURL.includes('contentstack')) {
@@ -354,15 +341,15 @@ const ProductData = {
         eventLabels,
         computedPrice,
         defaultProductPrice
-      } = this.getEqProductPromotions(product);
-      const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
-      const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+      } = this.getEqProductPromotions(data.sku[count]);
+      const productPrice = eventName ? defaultProductPrice : data.sku[count].priceFacets["Regular Price"];
+      const discountedPrice = eventName ? computedPrice : data.sku[count].priceFacets["Regular Price"];
 
       prod = {
-        "sku": product.identifier,
+        "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
         "title": data.properties.name,
-        "country": product.properties.market,
+        "country": data.sku[count].properties.market,
         "language": "en",
         "shortDescr": data.properties.description,
         "longDescr": data.properties.productDetailsDescription,
@@ -379,7 +366,7 @@ const ProductData = {
         "ingredients": data.properties.ingredients,
         "benefits": data.properties.benefits,
         "usage": data.properties.usage,
-        "resources": product.properties.resources,
+        "resources": data.sku[count].properties.resources,
         "videos": "",
         "movie": "",
         "youtube": "",
@@ -390,48 +377,48 @@ const ProductData = {
           }
         ],
         "scanQualified": data.properties.scanQualifiedCount,
-        "availableQuantity": (product.inventoryProperties) ? product.inventoryProperties.atpQty : 0,
+        "availableQuantity": data.sku[count].inventoryProperties.atpQty,
         "maxQuantity": 999,
         "points": "",
-        "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-        "pv": product.priceFacets.PV,
+        "cv": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
+        "pv": data.sku[count].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"]
+          "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
+          "WADR": data.sku[count].priceFacets["Regular Price"],
+          "RTL": data.sku[count].priceFacets["Regular Price"],
+          "WADW": data.sku[count].priceFacets["Wholesale Price"],
+          "WHL": data.sku[count].priceFacets["Wholesale Price"],
+          "WWHL": data.sku[count].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": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
+          "WADW": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
+          "WHL": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : ''
         },
         "pvMap": {
-          "WWHL": product.priceFacets.PV,
-          "WADW": product.priceFacets.PV,
-          "WHL": product.priceFacets.PV
+          "WWHL": data.sku[count].priceFacets.PV,
+          "WADW": data.sku[count].priceFacets.PV,
+          "WHL": data.sku[count].priceFacets.PV
         },
-        "orderTypes": this._setOrderType(product.properties),
+        "orderTypes": this._setOrderType(data.sku[count].properties),
         "childSkus": [],
-        "custTypes": this.switchCustType(product.properties.customerTypes),
+        "custTypes": this.switchCustType(data.sku[count].properties.customerTypes),
         "division": data.properties.division,
         "backOrderDate": null,
         "locallyProduced": false,
         "agelocme": null,
         "count": "",
         "flavor": "",
-        "size": product.properties.size,
+        "size": data.sku[count].properties.size,
         "shade": "",
-        "status": this.switchStatusFromEquinox(product.properties.productStatus),
+        "status": this.switchStatusFromEquinox(data.sku[count].properties.productStatus),
         "variantType": "Other",
-        "variantDropdownLabel": product.properties.variantLabel || "",
+        "variantDropdownLabel": data.sku[count].properties.variantLabel || "",
         "variantDropdownPlaceholder": "Select Type",
-        "variantsLabel": product.properties.variantLabel || "",
+        "variantsLabel": data.sku[count].properties.variantLabel || "",
         "groupOffer": false,
         "personalOffer": false,
         "savedEventName": eventName,
@@ -441,7 +428,7 @@ const ProductData = {
         "nettoWeight": "",
         "variants": variants,
         "searchScore": 0,
-        "isExclusive": product.properties.isExclusive || false,
+        "isExclusive": data.sku[count].properties.isExclusive || false,
         "marketAttributes": {
           "discount": true,
           "redeem": true,
@@ -449,7 +436,7 @@ const ProductData = {
         },
         "restrictedMarkets": [],
         "addOns": [],
-        "inventory": product.inventory || "", //inventory label
+        "inventory": data.sku[count].inventory || "", //inventory label
         "equinoxProductId": data.identifier
       };
       let newProduct = new Product(prod);