@nuskin/ns-product-lib 2.5.1-cx24-3377.1 → 2.5.1

package/CHANGELOG.md

@@ -1,34 +1,40 @@
-## [2.5.1-cx24-3377.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0...v2.5.1-cx24-3377.1) (2023-03-02)
+## [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)
 
 
 ### Fix
 
-* Multiple variants not loading properly ([0462248](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/04622485384522e90e843cc77d686692331bfa36))
+* update getConfiguration call to work with new version of configuration-sdk #CX24-3503 ([8be370e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8be370ebfda910deea01fc562d28c199ed520467)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
 
-# [2.5.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.5.0) (2023-02-22)
+# [2.6.0-cx24-3503.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3503.1...v2.6.0-cx24-3503.2.1) (2023-03-07)
 
 
-### New
+### Fix
 
-* equinox API integration (#CX24) ([a169d58](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a169d5806f20737fae42d0ebe18a7c746861a4fb)), closes [#CX24](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24)
+* update dependencies #CX24-3503 ([0ea7523](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0ea752306f8e64d5f73d397d5ddf3cf1839865c3)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([53cea8d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/53cea8d5eb39ebaf9ff21b45d2310f02db98e25d)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([dd38c23](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/dd38c23b0094dea202fce7c6407c06c917d61676)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([ca67042](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ca670420a7ed79e7c6fabeb4b7c722abc5811a18)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([2ac0b65](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2ac0b652f84937d37716e861504ad8c424b20beb)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([682078f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/682078f703ccb8a0e84a559e828543f31f53ccd8)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
+* update dependencies #CX24-3503 ([d48fb1a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d48fb1ac5e29dc7477be7b65522f25a2bbf25250)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
 
-# [2.5.0-cx24-2179.2.20](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.19...v2.5.0-cx24-2179.2.20) (2023-02-16)
+### Release
 
+* Automated changes by GitLab pipeline [skip ci] ([fa35816](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fa35816ef50672ceaac01173d55615d88cb2c75b))
 
-### Fix
+## [2.5.1-cx24-3503.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0...v2.5.1-cx24-3503.2.1) (2023-03-07)
 
-* Get test environment if not PROD ([913abb6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/913abb61f8bc6aa8a2cb271d67de08f2f9505c5e))
 
-# [2.5.0-cx24-2179.2.19](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.18...v2.5.0-cx24-2179.2.19) (2023-01-27)
+### Fix
 
+* update dependencies #CX24-3503 ([53cea8d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/53cea8d5eb39ebaf9ff21b45d2310f02db98e25d)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3503)
 
-### Fix
+# [2.5.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.5.0) (2023-02-22)
 
-* parent product customer types (#CX24-3175) ([411b2cc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/411b2cc5a7cf687152dc346579766c8f923b795a)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
 
-### Update
+### New
 
-* clean ups - expose customerTypes (#CX24-3175) ([3b7d9b1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3b7d9b12a9cf815b11a8af61621ab9ebc76c37b5)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
+* equinox API integration (#CX24) ([a169d58](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a169d5806f20737fae42d0ebe18a7c746861a4fb)), closes [#CX24](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24)
 
 # [2.5.0-cx24-2179.2.18](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.17...v2.5.0-cx24-2179.2.18) (2023-01-26)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.5.1-cx24-3377.1",
+  "version": "2.5.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -31,9 +31,9 @@
     "prettier": "1.19.1"
   },
   "dependencies": {
-    "@nuskin/configuration-sdk": "1.0.1",
+    "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "3.107.0",
+    "@nuskin/ns-util": "4.2.4",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

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 (option = {}) {
-    if (option && option.isEquinoxEnabled) {
-      return !!this.variants;
-    }
-
+  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

@@ -1,6 +1,5 @@
 "use strict";
 const { getConfiguration } = require('@nuskin/configuration-sdk');
-const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const axios = require("axios");
 const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
@@ -18,14 +17,9 @@ const ProductData = {
     const localeMarket = `${locale}_${market}`;
 
     if (isEquinoxEnabled) {
-      let config = (await getConfiguration({
-        configMapNames: ['Equinox_Markets'],
-        country: market,
-        environment: contentstackEnv(),
-        clientId: '735b1eb810304bba966af0891ab54053'
-      }));
-
-      if (config.Equinox_Markets.country_code === market && config.Equinox_Markets.active) {
+      const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
+
+      if (config.country_code === market && config.active) {
         return await this.getProductFromEquinox(skus, localeMarket, config);
       }
     }
@@ -36,14 +30,14 @@ const ProductData = {
     const filter = `{"filters": [{"field": "index_key_skuId","operation": "IN", "value": "${skus.toString()}"}]}`;
     axios.defaults.withCredentials = true;
 
-    const url = `${config.Equinox_Markets.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
+    const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
       url: href,
       params: {
         locale,
-        storeId: config.Equinox_Markets.store_id
+        storeId: config.store_id
       },
       headers: this.getEquinoxRequestHeaders(),
       responseType: 'json'
@@ -602,12 +596,4 @@ const ProductData = {
   }
 }
 
-function contentstackEnv() {
-  if (typeof window === 'undefined') {
-    return 'test';
-  }
-
-  return (getEnvironmentFromUrl(window.location.host) != "prod") ? "test" : "prod";
-}
-
 module.exports = ProductData;