@nuskin/product-components 3.17.1 → 3.17.2

package/docs/CHANGELOG.md

@@ -1 +1 @@
-## [3.17.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.17.0...v3.17.1) (2024-06-11)
+## [3.17.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.17.1...v3.17.2) (2024-06-17)

package/gl-sbom-npm-yarn.cdx.json

@@ -1,10 +1,10 @@
 {
   "bomFormat": "CycloneDX",
   "specVersion": "1.4",
-  "serialNumber": "urn:uuid:3c48d34c-022f-42f4-bd1b-b2227ef69b90",
+  "serialNumber": "urn:uuid:d791f546-6b5a-47e2-b278-d5d586e7caee",
   "version": 1,
   "metadata": {
-    "timestamp": "2024-06-11T10:52:35Z",
+    "timestamp": "2024-06-17T16:53:01Z",
     "tools": [
       {
         "vendor": "GitLab",

package/mixins/NsProductMixin.js

@@ -21,12 +21,10 @@ import {
   AdrService,
   FavoritesService,
   ProductStatus,
-  QualificationService as OldQualificationService,
   Product as ShopProduct,
   EquinoxCartService
 } from "@nuskin/ns-shop";
-import { default as NewQualificationService } from "@nuskin/exclusive-offer-sdk";
-import { retrieveTogglesBasedOnEnvironment } from "@nuskin/ns-feature-flags";
+import QualificationService 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";
@@ -38,31 +36,6 @@ const PENDING_FAVORITE = "pendingFavorite";
 const KEY_BREADCRUMB_BACK = "breadcrumbBack";
 const BUNDLE = "BUNDLE";
 
-let flagsPromise = null;
-let featureFlags = false;
-const checkFlag = async flag => {
-  if (!featureFlags && !flagsPromise) {
-    flagsPromise = retrieveTogglesBasedOnEnvironment().then(
-      flagsFromServer => (featureFlags = flagsFromServer)
-    );
-  }
-
-  if (!featureFlags) {
-    await flagsPromise;
-  }
-
-  return featureFlags.has(flag);
-};
-
-const getQualificationService = async () => {
-  const equinoxMarket = (await getConfiguration(["Equinox_Markets"]))
-    .Equinox_Markets;
-  return equinoxMarket.active ||
-    (await checkFlag("cx15_use_new_exclusive_offer_api"))
-    ? NewQualificationService
-    : OldQualificationService;
-};
-
 /**
  * NsProductMixin
  *
@@ -672,25 +645,32 @@ const NsProductMixin = {
       if (this.product) {
         // WARNING: There's a instanceof check on CartService.getAddToCartQty for the ns-shop Product, previously different
         const shopProduct = new ShopProduct(this.product);
-        // check if a user is qualified to purchase the product
-        CartService.getAddToCartQty(shopProduct)
-          .then(productQuantity => {
-            // WARNING: this.product is volatile here. re-check is using this.product.
-            this.maxQuantity = Math.min(
-              shopProduct.maxQuantity,
-              shopProduct.availableQuantity,
-              productQuantity
-            );
-          })
-          .catch(error => {
-            this.maxQuantity = 0;
-            console.error("Failed to retrieve add to cart quantity.", error);
-          })
-          .finally(() => {
-            this.setStatus();
-            this.checkedQualifications = true;
-            this.emitAvailability();
-          });
+
+        getConfiguration(["Equinox_Markets"]).then(({ Equinox_Markets }) => {
+          const { active } = Equinox_Markets;
+
+          const cartService = active ? EquinoxCartService : CartService;
+          // check if a user is qualified to purchase the product
+          cartService
+            .getAddToCartQty(shopProduct)
+            .then(productQuantity => {
+              // WARNING: this.product is volatile here. re-check is using this.product.
+              this.maxQuantity = Math.min(
+                shopProduct.maxQuantity,
+                shopProduct.availableQuantity,
+                productQuantity
+              );
+            })
+            .catch(error => {
+              this.maxQuantity = 0;
+              console.error("Failed to retrieve add to cart quantity.", error);
+            })
+            .finally(() => {
+              this.setStatus();
+              this.checkedQualifications = true;
+              this.emitAvailability();
+            });
+        });
       }
     },
 
@@ -755,9 +735,9 @@ const NsProductMixin = {
       this.exclusiveOfferMessage = "";
       if (this.isExclusive) {
         if (this.isLoggedIn) {
-          const productQualification = await (
-            await getQualificationService()
-          ).getQualification(this.activeSku);
+          const productQualification = await QualificationService.getQualification(
+            this.activeSku
+          );
 
           let cartQuantity = 0;
 
@@ -787,10 +767,10 @@ const NsProductMixin = {
               cartQuantity = (cartItem || {}).qty || 0;
             } else {
               const cartData =
-                (await (
-                  await getQualificationService()
-                ).convertCartDataToBaseSkus(CartService.getItemData(), true)) ||
-                {};
+                (await QualificationService.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.17.1",
+  "version": "3.17.2",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {

package/stories/NsProductMixinPreview.vue

@@ -200,40 +200,11 @@
 </template>
 
 <script>
-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 { CartService } from "@nuskin/ns-shop";
+import QualificationService 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: {
@@ -407,9 +378,9 @@ export default {
   async mounted() {
     if (this.isExclusive) {
       if (this.isLoggedIn) {
-        this.productQualification = await (
-          await getQualificationService()
-        ).getQualification(this.activeSku);
+        this.productQualification = await QualificationService.getQualification(
+          this.activeSku
+        );
 
         this.cartItem = await CartService.getFirstItemBySku(this.activeSku, {
           cartOrderItems: true