@nuskin/ns-product-lib 2.6.0-cx24-3377.12 → 2.6.0-cx24-3464.1

package/CHANGELOG.md

@@ -1,92 +1,16 @@
-# [2.6.0-cx24-3377.12](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.11...v2.6.0-cx24-3377.12) (2023-03-10)
+# [2.6.0-cx24-3464.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.2...v2.6.0-cx24-3464.1) (2023-03-10)
 
 
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([b66be37](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b66be37163a64c6fcc0d763b748a653d3fc0ebb9))
-* Fix multiple variants not loading properly (CX24-3377) ([10821f1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/10821f1924f5f0d7b985af15d382948e99592e42))
-
-# [2.6.0-cx24-3377.11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.10...v2.6.0-cx24-3377.11) (2023-03-10)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([9f8273b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f8273b5a8ae3aaf40fb417d04e2087b4b0f036b))
-
-# [2.6.0-cx24-3377.10](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.9...v2.6.0-cx24-3377.10) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([1b08b2a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1b08b2ad4ea7bdceca494f6121f14f74236afb97))
-
-# [2.6.0-cx24-3377.9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.8...v2.6.0-cx24-3377.9) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([fbeaa05](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fbeaa050c39a486c81979e6034ce1ae19a613ff6))
-
-# [2.6.0-cx24-3377.8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.7...v2.6.0-cx24-3377.8) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([e32840a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e32840aabdec5b13c7a6b8dd276adb523689890f))
-
-# [2.6.0-cx24-3377.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.6...v2.6.0-cx24-3377.7) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([15431ae](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/15431aef763e3d70ab8d1485509ec571df3b78f3))
-
-# [2.6.0-cx24-3377.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.5...v2.6.0-cx24-3377.6) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([d653c88](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d653c887a529d2e93e05028e9eed8064991470ee))
-
-# [2.6.0-cx24-3377.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.4...v2.6.0-cx24-3377.5) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([d681803](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d681803ccbc2290a0e843e8eb1b191d33ba97cbe))
-
-# [2.6.0-cx24-3377.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.3...v2.6.0-cx24-3377.4) (2023-03-09)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([1b37ed5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1b37ed513dbd9a8751b8378d5133582b88fdcb97))
-* Fix multiple variants not loading properly (CX24-3377) ([ae2c91f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ae2c91fa98838e60745009e4b66b8c728fad58b8))
-
-# [2.6.0-cx24-3377.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.2...v2.6.0-cx24-3377.3) (2023-03-08)
-
-
-### New
-
-* Fix multiple variants not loading properly (CX24-3377) ([da9eff4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/da9eff46094279a657d6318d96291b94fddcfcf9))
-* Fix multiple variants not loading properly (CX24-3377) ([c6e06c4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/c6e06c488ecdd74876c9cb989a8766b473e7d1f2))
-* Fix multiple variants not loading properly (CX24-3377) ([9b75c96](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9b75c96f681bd3c780bf8ba0ac018d525abe7033))
-
-# [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
 
-* Fix multiple variants not loading properly (CX24-3377) ([d3a2663](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d3a266319c8ff7b4650c9ef9a06f411b117d98d3))
+* get child skus to be used for add-to-cart #CX24-3464 ([9e74775](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e7477519f133a82851159d50408b1fbfe87bae5)), closes [#CX24-3464](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3464)
 
-# [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)
+## [2.5.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.1...v2.5.2) (2023-03-09)
 
 
-### New
+### Fix
 
-* 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))
+* CORS error in MySite when IsEquinoxEnabled = true ([3f66250](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3f66250de211a63906ca0aa50f60257f63e3bc56))
 
 ## [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-3377.12",
+  "version": "2.6.0-cx24-3464.1",
   "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,81 +399,77 @@ 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 () {
-    if (this.equinoxProductId != "") {
-      console.log(this.variants)
-      return (Object.keys(this.variants).length && this.sku == Object.keys(this.variants)[0]) ? true : false
-    }
+  this.isBase = function() {
     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;
@@ -542,11 +538,11 @@ 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) {
     this.thumbnail = ProductUtils.applyBaseUrl(this.thumbnail, baseUrl);
     this.fullImage = ProductUtils.applyBaseUrl(this.fullImage, baseUrl);
 
@@ -558,7 +554,7 @@ const Product = function (productData) {
     }
   };
 
-  this.setProductData = function (productData) {
+  this.setProductData = function(productData) {
     let data;
 
     if (productData) {
@@ -666,7 +662,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 || [];
@@ -682,7 +678,7 @@ const Product = function (productData) {
     }
   };
 
-  this.isEmpty = function () {
+  this.isEmpty = function() {
     return (
       isFieldEmpty(this.sku) &&
       isFieldEmpty(this.title) &&

package/src/productData.js

@@ -28,6 +28,7 @@ const ProductData = {
 
   getProductFromEquinox: async function (skus, locale, config) {
     const filter = `{"filters": [{"field": "index_key_skuId","operation": "IN", "value": "${skus.toString()}"}]}`;
+
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
@@ -40,7 +41,6 @@ const ProductData = {
       headers: this.getEquinoxRequestHeaders(),
       responseType: 'json',
       withCredentials: true
-
     });
 
     if (response.data.product) {
@@ -255,7 +255,6 @@ const ProductData = {
       "variantDropdownLabel": eqVariant.properties.variantSelectLabel || "",
       "variantDropdownPlaceholder": "Select Type",
       "variantsLabel": eqVariant.properties.variantSelectLabel || "",
-      "variants": {},
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": eventName,
@@ -314,6 +313,7 @@ const ProductData = {
   },
 
   eqProductMapper: function (productDataResponse, skus) {
+    console.log(productDataResponse, skus);
     let prod = [];
     let count = 0;
     let variants = {};