@nuskin/product-components 3.3.7 → 3.3.9

package/CHANGELOG.md

@@ -1,8 +1,26 @@
+## [3.3.9](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.8...v3.3.9) (2023-04-10)
+
+
+### Fix
+
+* fixes to get exclusive offer working (#CX15-6971) ([2333571](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/23335712d88116f3238536b0a53b8a270a5d11e4)), closes [#CX15-6971](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX15-6971)
+
+## [3.3.8](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7...v3.3.8) (2023-04-06)
+
+
+### Fix
+
+* added waitForConfig in NsPrductMixin #CX16-8633 ([53813b0](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/53813b05400128f0de8e350cd545345684dc8917)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+
+## [3.3.7-cx16-8633.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7-cx16-8633.2...v3.3.7-cx16-8633.3) (2023-04-05)
 ## [3.3.7](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.6...v3.3.7) (2023-04-05)
 
 
 ### Fix
 
+* added wait in NsProductMixin #CX16-8633 ([b802a9b](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b802a9b188ef90c4e5568e47031f41ab5ca67efa)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+
+## [3.3.7-cx16-8633.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7-cx16-8633.1...v3.3.7-cx16-8633.2) (2023-04-04)
 * CX24 Batch 2 Fixes ([5eaec1e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/5eaec1e9bb7c7d7979f4da14dcf3732a43c3ed2c))
 
 # [3.4.0-cx24-3706.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.3...v3.4.0-cx24-3706.4) (2023-04-04)
@@ -10,6 +28,10 @@
 
 ### Fix
 
+* default export #CX16-8633 ([aa2baa5](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/aa2baa5f19cb74427d232543d2a02e7b7d06c5b7)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+* trying wait in different place #CX16-8633 ([4c9eb00](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/4c9eb00b16974e5ac93104a1ca30db4503d08e36)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+
+## [3.3.7-cx16-8633.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.6...v3.3.7-cx16-8633.1) (2023-04-03)
 * Add to Bag in product offer ([3212ce0](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/3212ce049979b7f2f3c26c5e64ef8a98eb669e9b))
 
 # [3.4.0-cx24-3706.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.2...v3.4.0-cx24-3706.3) (2023-04-04)
@@ -17,6 +39,7 @@
 
 ### Fix
 
+* unit tests and wait in NsProductMixin #CX16-8633 ([868234a](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/868234a9cf5803efc389a966274ba66a5be87b4d)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
 * Add to Bag in product offer ([b6fb956](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b6fb9561044911f58ac680e497a74661c5c14894))
 
 # [3.4.0-cx24-3706.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.1...v3.4.0-cx24-3706.2) (2023-04-03)

package/mixins/NsProductMixin.js

@@ -17,18 +17,45 @@ import {
   AdrService,
   FavoritesService,
   ProductStatus,
-  QualificationService,
+  QualificationService as OldQualificationService,
   Product as ShopProduct,
   EquinoxCartService
 } from "@nuskin/ns-shop";
+import { default as NewQualificationService } from "@nuskin/exclusive-offer-sdk";
 import webLoyalty from "@nuskin/ns-loyalty-web";
 import { getProp, getFullUrl } from "@nuskin/ns-common-lib";
 import { PriceType } from "@nuskin/ns-product-lib";
 import { ProductDataService } from "@nuskin/ns-product";
+import { waitForConfig } from "../services/configHelper";
 
 const PENDING_FAVORITE = "pendingFavorite";
 const KEY_BREADCRUMB_BACK = "breadcrumbBack";
 
+let equinoxMarket = {
+  promise: getConfiguration(["Equinox_Markets"]).then(config => {
+    equinoxMarket = {
+      value:
+        config && config.Equinox_Markets
+          ? !!config.Equinox_Markets.active
+          : false,
+      promise: null,
+      loaded: true
+    };
+  }),
+  loaded: false,
+  value: undefined
+};
+
+const getQualificationService = async () => {
+  if (!equinoxMarket.loaded) {
+    await equinoxMarket.promise;
+  }
+  if (equinoxMarket.value) {
+    return NewQualificationService;
+  }
+  return OldQualificationService;
+};
+
 /**
  * NsProductMixin
  *
@@ -342,6 +369,7 @@ const NsProductMixin = {
      * Initializes product data
      */
     async refreshProductData(sku) {
+      await waitForConfig();
       if (
         !sku ||
         this.$NsProductAppService.loading ||
@@ -571,7 +599,9 @@ const NsProductMixin = {
         (this.baseSku === product.sku ||
           product.variantSkus().includes(this.activeSku));
       const productChanged =
-        !baseProductChanged && this.activeSku === product.sku;
+        !baseProductChanged &&
+        (this.activeSku === product.sku ||
+          this.activeSku === product.equinoxProductId);
       if (baseProductChanged || productChanged) {
         this.setFromProductData(this.activeSku, product);
       }
@@ -667,9 +697,9 @@ const NsProductMixin = {
       this.exclusiveOfferMessage = "";
       if (this.isExclusive) {
         if (this.isLoggedIn) {
-          const productQualification = await QualificationService.getQualification(
-            this.activeSku
-          );
+          const productQualification = await (
+            await getQualificationService()
+          ).getQualification(this.activeSku);
 
           let cartQuantity;
           if (!this.baseSku) {
@@ -682,10 +712,10 @@ const NsProductMixin = {
             cartQuantity = (cartItem || {}).qty || 0;
           } else {
             const cartData =
-              (await QualificationService.convertCartDataToBaseSkus(
-                CartService.getItemData(),
-                true
-              )) || {};
+              (await (
+                await getQualificationService()
+              ).convertCartDataToBaseSkus(CartService.getItemData(), true)) ||
+              {};
             const cartItem = cartData[this.baseSku] || {};
             cartQuantity = cartItem.qty || 0;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.3.7",
+  "version": "3.3.9",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {
@@ -42,6 +42,7 @@
     "fibers": "^4.0.1"
   },
   "peerDependencies": {
+    "@nuskin/exclusive-offer-sdk": "1.x",
     "@nuskin/ns-account": "5.x",
     "@nuskin/ns-checkout-common": "3.x",
     "@nuskin/ns-feature-flags": "1.x",

package/services/NsProductDataService.js

@@ -198,7 +198,10 @@ if (!NsProductDataService) {
             continue;
           }
           const product = this.products.find(
-            p => p.sku === sku || p.variantSkus().includes(sku)
+            p =>
+              p.sku === sku ||
+              p.variantSkus().includes(sku) ||
+              p.equinoxProductId === sku
           );
           if (product) {
             if (product.sku === sku || top) {

package/stories/NsProductMixinPreview.vue

@@ -200,10 +200,40 @@
 </template>
 
 <script>
-import { QualificationService, CartService } from "@nuskin/ns-shop";
-
+import {
+  QualificationService as OldQualificationService,
+  CartService
+} from "@nuskin/ns-shop";
+import { getConfiguration } from "@nuskin/configuration-sdk";
+import { default as NewQualificationService } from "@nuskin/exclusive-offer-sdk";
 import NsProductMixin from "../mixins/NsProductMixin";
 import "@nuskin/ns-core-styles/src/dist/main.css";
+
+let equinoxMarket = {
+  promise: getConfiguration(["Equinox_Markets"]).then(config => {
+    equinoxMarket = {
+      value:
+        config && config.Equinox_Markets
+          ? !!config.Equinox_Markets.active
+          : false,
+      promise: null,
+      loaded: true
+    };
+  }),
+  loaded: false,
+  value: undefined
+};
+
+const getQualificationService = async () => {
+  if (!equinoxMarket.loaded) {
+    await equinoxMarket.promise;
+  }
+  if (equinoxMarket.value) {
+    return NewQualificationService;
+  }
+  return OldQualificationService;
+};
+
 export default {
   name: "NsProductMixinPreview",
   filters: {
@@ -377,9 +407,9 @@ export default {
   async mounted() {
     if (this.isExclusive) {
       if (this.isLoggedIn) {
-        this.productQualification = await QualificationService.getQualification(
-          this.activeSku
-        );
+        this.productQualification = await (
+          await getQualificationService()
+        ).getQualification(this.activeSku);
 
         this.cartItem = await CartService.getFirstItemBySku(this.activeSku, {
           cartOrderItems: true