@nuskin/ns-product-lib 2.6.1-cx24-337701.12 → 2.6.1-cx24-337701.14

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.6.1-cx24-337701.14](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.13...v2.6.1-cx24-337701.14) (2023-03-21)
+
+
+### Fix
+
+* Show dropdown for variants ([cf5e6a6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/cf5e6a600008465d32b0d77ed46f8518802f4295))
+* Show dropdown for variants ([8c29f14](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8c29f14e20e9f674c8942274607abd1dd4f82964))
+
+## [2.6.1-cx24-337701.13](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.12...v2.6.1-cx24-337701.13) (2023-03-20)
+
+
+### Fix
+
+* multi variant drop down ([4c61780](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c617806a2934b1aca7b5280810107cf0356b29b))
+
 ## [2.6.1-cx24-337701.12](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1-cx24-337701.11...v2.6.1-cx24-337701.12) (2023-03-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.6.1-cx24-337701.12",
+  "version": "2.6.1-cx24-337701.14",
   "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 = {};
@@ -76,14 +76,15 @@ const Product = function(productData) {
   //@example "IN STOCK"
   this.inventory = "";
   this.equinoxProductId = "";
+  this.variantDefault = false;
 
-  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 +98,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 +126,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 +134,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 +154,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 +166,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 +176,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 +221,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 +272,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 +284,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 +327,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 +347,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 +382,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 +392,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 +400,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() {
+  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;
@@ -538,11 +539,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);
 
@@ -554,7 +555,7 @@ const Product = function(productData) {
     }
   };
 
-  this.setProductData = function(productData) {
+  this.setProductData = function (productData) {
     let data;
 
     if (productData) {
@@ -662,7 +663,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 +679,7 @@ const Product = function(productData) {
     }
   };
 
-  this.isEmpty = function() {
+  this.isEmpty = function () {
     return (
       isFieldEmpty(this.sku) &&
       isFieldEmpty(this.title) &&

package/src/productData.js

@@ -302,7 +302,8 @@ const ProductData = {
       },
       "restrictedMarkets": [],
       "addOns": [],
-      "equinoxProductId": eqVariant.identifier
+      "equinoxProductId": eqVariant.identifier,
+      "variantDefault": eqVariant.default
     };
   },
 
@@ -343,11 +344,6 @@ const ProductData = {
     }
   },
 
-  moveArray: function (arr, from, to) {
-    arr.splice(to, 0, arr.splice(from, 1)[0]);
-    return { arr };
-  },
-
 
   eqProductMapper: async function (productDataResponse, skus) {
     // console.log(productDataResponse, skus);
@@ -374,10 +370,6 @@ const ProductData = {
           variants[variant.identifier] = this.eqProductVariantMapper(variant);
           return variant;
         });
-
-        let defaultKey = productData.sku.map(e => e.default).indexOf(true)
-        if (defaultKey)
-          variants = this.moveArray(Object.values(variants), defaultKey, 0);
       }