@nuskin/product-components 3.2.1-cx24-3503.4 → 3.2.2

package/.releaserc

@@ -1,6 +1,6 @@
 {
     "branches": [
-      "master", {"name":"CX24-33772", "channel":"prerelease", "prerelease":"cx24-33772"}
+      "master"
     ],
     "plugins": [
         "@semantic-release/npm",

package/CHANGELOG.md

@@ -1,9 +1,16 @@
-## [3.2.1-cx24-3503.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.2.1-cx24-3503.3...v3.2.1-cx24-3503.4) (2023-03-07)
+## [3.2.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.2.1...v3.2.2) (2023-03-11)
 
 
 ### Fix
 
-* Multiple variants not loading properly for equinox ([26967cb](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/26967cb3a5d0c7d5d1d5eab7413a97ab1a43df71))
+* Version bump ([e45439e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/e45439e69eae62082630f86b352fb45003ea4504))
+
+## [3.2.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.2.0...v3.2.1) (2023-03-08)
+
+
+### Fix
+
+* update getConfiguration call to work with new version of configuration-sdk #CX24-3503 ([1b028dc](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/1b028dce8cbbca9fb909eda46bf3df3e837ba096)), closes [#CX24-3503](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX24-3503)
 
 ## [3.2.1-cx24-3503.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.2.1-cx24-3503.2...v3.2.1-cx24-3503.3) (2023-03-03)
 

package/mixins/NsProductMixin.js

@@ -9,6 +9,7 @@ import {
   PersonalOfferStorageService,
   dateFormatter,
   UrlService,
+  RunConfigService,
   equinoxLocalStorage
 } from "@nuskin/ns-util";
 import {
@@ -370,7 +371,7 @@ const NsProductMixin = {
         return;
       }
 
-      if (product.isBase(this.checkEquinoxMarketEnabled())) {
+      if (product.isBase()) {
         this.baseSku = product.sku;
         this.variants = product.getVariantsList();
         this.baseProduct = product;
@@ -488,10 +489,7 @@ const NsProductMixin = {
      * Sets product to new selection
      */
     setActiveProduct() {
-      if (
-        this.baseProduct &&
-        this.baseProduct.isBase(this.checkEquinoxMarketEnabled())
-      ) {
+      if (this.baseProduct && this.baseProduct.isBase()) {
         let activeProduct = this.variants.find(
           variantProduct => variantProduct.sku === this.activeSku
         );
@@ -507,7 +505,7 @@ const NsProductMixin = {
       );
       this.description = this.product.longDescr;
 
-      this.isBaseSku = this.product.isBase(this.checkEquinoxMarketEnabled());
+      this.isBaseSku = this.product.isBase();
       this.isVariantSku = this.product.isVariant();
 
       this.isExclusive = this.product.isExclusive;
@@ -542,7 +540,7 @@ const NsProductMixin = {
 
     handleProductChanged(product) {
       const baseProductChanged =
-        product.isBase(this.checkEquinoxMarketEnabled()) &&
+        product.isBase() &&
         (this.baseSku === product.sku ||
           product.variantSkus().includes(this.activeSku));
       const productChanged =
@@ -911,9 +909,12 @@ const NsProductMixin = {
           domain: window.location.hostname
         };
 
+        const country = RunConfigService.getRunConfig().country;
         getConfiguration(["Equinox_Markets"]).then(config => {
+          const countryCode = config.Equinox_Markets.country_code;
+
           if (
-            config.Equinox_Markets.active &&
+            countryCode === country &&
             equinoxLocalStorage.isEquinoxEnabled()
           ) {
             ProductDataService.getProductData(options.sku)
@@ -1350,14 +1351,6 @@ const NsProductMixin = {
         });
       }
       return text || "";
-    },
-    checkEquinoxMarketEnabled() {
-      getConfiguration("Equinox_Markets").then(config => {
-        return config.Equinox_Markets.active &&
-          equinoxLocalStorage.isEquinoxEnabled()
-          ? { isEquinoxEnabled: true }
-          : null;
-      });
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.2.1-cx24-3503.4",
+  "version": "3.2.2",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@nuskin/ns-common-lib": "1.4.5",
     "@nuskin/ns-core-styles": "2.11.2",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.6.0-cx24-3503.1",
+    "@nuskin/ns-product-lib": "2.5.1",
     "@nuskin/product-recommendation": "2.0.1",
     "axios": "^0.19.2",
     "lodash": "^4.17.15",