@nuskin/ns-shop 6.2.1 → 6.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "6.2.1",
+  "version": "6.2.2",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@nuskin/ns-common-lib": "1.4.5",
     "@nuskin/ns-feature-flags": "1.4.2",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.5.0",
+    "@nuskin/ns-product-lib": "2.5.1",
     "@nuskin/nuskinjquery": "2.3.1",
     "axios": "0.21.1",
     "decimal.js": "10.2.1",
@@ -35,11 +35,11 @@
     "request": "2.88.2"
   },
   "devDependencies": {
-    "@nuskin/ns-account": "5.7.0",
-    "@nuskin/configuration-sdk": "2.2.0",
+    "@nuskin/ns-account": "5.7.1",
+    "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-jsanalyzer": "1.0.1",
-    "@nuskin/ns-product": "3.38.0",
-    "@nuskin/ns-util": "4.0.0",
+    "@nuskin/ns-product": "3.38.2",
+    "@nuskin/ns-util": "4.2.4",
     "axios-mock-adapter": "1.18.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/cart/cartService.js

@@ -13,7 +13,7 @@ import QualificationService from '../qualification/qualificationService.js';
 import {ProductStatus} from '@nuskin/ns-product-lib';
 import webLoyalty from '@nuskin/ns-loyalty-web';
 import axios from 'axios';
-import { getCachedConfigField } from '@nuskin/configuration-sdk';
+import { getCachedConfigField, getConfiguration } from '@nuskin/configuration-sdk';
 
 export default {
     goToCartPage,
@@ -95,6 +95,10 @@ let _cart_;
 let activeEvents = [];
 let cartSynced = false;
 
+const awaitForConfig = async () => {
+    await getConfiguration(['Cart', 'Checkout']);
+};
+
 /**
  *
  * @memberof CartService
@@ -219,6 +223,7 @@ function updateItemPrices() {
 }
 
 async function checkForMissingEventNames(order) {
+    await awaitForConfig();
     const cart = _getCart();
     await cart.setMissingEventNames(order);
     setCart(cart);
@@ -320,6 +325,7 @@ function itemIsAvailable(product) {
  * @private
  */
 async function addProductToCart(options) {
+    await awaitForConfig();
     let cart = _getCart();
 
     if (!options.sapLineId && !itemIsAvailable(options.product)) {
@@ -444,6 +450,7 @@ async function addSkuToCart(options) {
 }
 
 async function getBaseSkuCartQuantity(baseSku) {
+    await awaitForConfig();
     const cartContents = await QualificationService.convertCartDataToBaseSkus(_getCart().getItemData(), true) || {}
     const baseSkuData = cartContents[baseSku] || {}
     const quantity = baseSkuData.qty || 0
@@ -461,6 +468,9 @@ async function getAddToCartQty(product) {
     const featureEnabled = await checkFlag('cx15-4373');
     let retVal = 0;
 
+    // Make sure the needed config is loaded.
+    await awaitForConfig();
+
     if (typeof product === 'string') {
         const response = await ProductService.getProductBySku({sku: product});
         product = response.success && response.product;
@@ -494,6 +504,7 @@ async function getAddToCartQty(product) {
 }
 
 async function changeItemQty(cartItemInfo, qty = 0, referror) {
+    await awaitForConfig();
     if (qty === 0) {
         // Remove the Product
         removeItemByKey(cartItemInfo.key);
@@ -778,6 +789,7 @@ function syncCartItemToSapItem(sapItemKey, cartItemKey = null) {
  * the cart is too high an adjustment is made.
  */
 async function checkItemAvailability() {
+    await awaitForConfig();
     const featureEnabled = await checkFlag('cx15-4373');
     const cart = _getCart();
 

package/src/cart/equinoxCartService.js

@@ -89,19 +89,19 @@ async function addBundleToEquinoxCart(productBundleSkus = []) {
     const cartType = _getCartShoppingContext();
     const bundleItems = [];
     let cachedProducts = [];
-    
+
     productsLocalStorage.searchResults.map((searchResult) => {
-        if(searchResult.resultsList && searchResult.resultsList.length > 0) {
+        if (searchResult.resultsList && searchResult.resultsList.length > 0) {
             cachedProducts = cachedProducts.concat(searchResult.resultsList)
         }
     })
-    
+
     productBundleSkus.forEach((sku) => {
         const productItem = cachedProducts.find((product) => {
             return product.sku === sku;
         })
 
-        if(productItem) {
+        if (productItem) {
             bundleItems.push({
                 "quantity": 1, //TODO clarify if there are bundles that has > 1 qty of item of type
                 "skus": [
@@ -117,7 +117,7 @@ async function addBundleToEquinoxCart(productBundleSkus = []) {
             })
         }
     })
-    
+
     const options = {
         method: 'POST',
         endpoint: `carts/${cartType}/items`,
@@ -168,12 +168,7 @@ async function getEquinoxCart() {
 async function getEquinoxRequestConfiguration() {
     const marketLocale = UrlService.getLocale();
     const [, market] = marketLocale.split("_");
-    const config = (await getConfiguration({
-        configMapNames: ['Equinox_Markets'],
-        country: market,
-        environment: RunConfigService.getEnvironmentCode(),
-        clientId: ConfigService.getMarketConfig().checkout.clientId
-    })).Equinox_Markets;
+    const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
     const mySiteKongURL = config.API_Base_URLs;
     const equinoxMarket = {
         market_name: config.market_name,
@@ -214,7 +209,7 @@ async function _equinoxRequest(options) {
         url: `${mySiteKongURL}/orchestrationservices/storefront/${options.endpoint}`,
         headers: defaultHeaders,
         withCredentials: (options.method !== "DELETE"),
-        params: (options.params) ? options.params : defaultEquinoxParams   
+        params: (options.params) ? options.params : defaultEquinoxParams
     };
 
     if (options.data) {
@@ -233,7 +228,7 @@ function goToCartPage() {
 }
 
 $(async function () {
-    if(equinoxLocalStorage.isEquinoxEnabled()) {
+    if (equinoxLocalStorage.isEquinoxEnabled()) {
         _getEquinoxSession();
         $.subscribe(events.shop.ADD_TO_CART, (options) => {
             getEquinoxCart().then((response) => {
@@ -241,6 +236,6 @@ $(async function () {
                 events.publish(events.shop.CART_UPDATED, { cartInfo: { qty: cart.value.count }, ...options });
             });
         });
-       
+
     }
 })

package/src/favorites/FavoritesService.js

@@ -1,8 +1,8 @@
+import { getConfiguration } from '@nuskin/configuration-sdk';
+import { EquinoxService } from '@nuskin/ns-account';
 import {RunConfigService, storage, UrlService, equinoxLocalStorage} from '@nuskin/ns-util';
 import Favorite from './favorite';
 import ServiceUtils from '../ServiceUtils';
-import {Contentstack } from '@nuskin/ns-product-lib';
-import { EquinoxService } from '@nuskin/ns-account';
 
 
 const FAVORITE_RESPONSE_LIST = 'FavoriteResponseList';
@@ -96,8 +96,7 @@ async function getFavorites(options) {
  * @public
  */
 async function addToFavorites(sku) {
-    let url = `${getServiceUrl()}?cntry=${getCountry()}`,
-        response;
+    let url = `${getServiceUrl()}?cntry=${getCountry()}`;
 
     if (!isAwsMode()) {
         url += `&eid=${ServiceUtils.getUser().eid}`;
@@ -108,19 +107,22 @@ async function addToFavorites(sku) {
 
     let body = {'sku': sku};
 
-    if (await isMarketEquinoxEnabled()) {
-        await EquinoxService.addItemToEquinoxList(sku)
-        const equinoxFavoriteResponse = await EquinoxService.getEquinoxFavorite();        
-        response = EquinoxService.equinoxFavoritesMapper(equinoxFavoriteResponse)
-    } else {
-        response = await fetch(url, {
-            method: 'POST',
-            headers: headers,
-            credentials: 'omit',
-            body: JSON.stringify(body)
-        });
+    if (equinoxLocalStorage.isEquinoxEnabled()) {
+        if (await isMarketEquinoxEnabled()) {
+            await EquinoxService.addItemToEquinoxList(sku)
+            const equinoxFavoriteResponse = await EquinoxService.getEquinoxFavorite();
+            const response = EquinoxService.equinoxFavoritesMapper(equinoxFavoriteResponse);
+            return handleFavoritesListResponse(response);
+        }
     }
 
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: headers,
+        credentials: 'omit',
+        body: JSON.stringify(body)
+    });
+
     return handleFavoritesListResponse(response);
 }
 
@@ -235,7 +237,7 @@ async function getFavoritesFromServer(options) {
     if (!isAwsMode()) {
         url += `&eid=${ServiceUtils.getUser().eid}`;
     }
-    
+
     if(await isMarketEquinoxEnabled()) {
 
         const equinoxFavoriteResponse = await EquinoxService.getEquinoxFavorite();
@@ -262,11 +264,11 @@ async function getFavoritesFromServer(options) {
  */
 async function handleFavoritesListResponse(response) {
     let data = response;
-    
+
     if(!await isMarketEquinoxEnabled()) {
         data = await ServiceUtils.transformFetchResponse(response);
     }
-    
+
     if (!(FAVORITE_RESPONSE_LIST in data) || !(data[FAVORITE_RESPONSE_LIST] instanceof Array)) {
         throw new Error('Malformed Favorites List response from server');
     }
@@ -323,10 +325,7 @@ function getHeaders() {
 
 async function isMarketEquinoxEnabled() {
 
-    const marketLocale = UrlService.getLocale();
-    const [, market] = marketLocale.split("_");
-    const equinoxMarket = await Contentstack.isMarketEnabled(market);
-    const isEquinoxEnabled = equinoxMarket && equinoxLocalStorage.isEquinoxEnabled();
+    const equinoxMarket = (await getConfiguration(["Equinox_Markets"])).Equinox_Markets;
 
-    return isEquinoxEnabled;
+    return equinoxMarket.active;
 }

package/src/product/ProductStatusService.js

@@ -1,7 +1,7 @@
 import {nuskin, RunConfigService, events, storage, UrlService} from '@nuskin/ns-util';
 import $ from '@nuskin/nuskinjquery';
 import {ProductStatusMapper} from '@nuskin/ns-product-lib';
-import {getCachedConfigField} from '@nuskin/configuration-sdk';
+import {getCachedConfigField, getConfiguration} from '@nuskin/configuration-sdk';
 
 /**
  * Storage metadata for caching product statuses in session storage.
@@ -220,7 +220,7 @@ export default {
  * @memberof ProductStatusService
  * @public
  */
-function getProductStatus(skus, countryCode, queryParams = {}) {
+async function getProductStatus(skus, countryCode, queryParams = {}) {
     const options = {countryCode: countryCode|| RunConfigService.getRunConfig().country};
     if (queryParams.version) {
         const version = queryParams.version;
@@ -231,6 +231,7 @@ function getProductStatus(skus, countryCode, queryParams = {}) {
         }
     }
 
+    await getConfiguration(['Shopping', 'Url'])
     queryParams.context = getCachedConfigField('productStatusContext');
     queryParams.storageLocation = getCachedConfigField('productStatusStorageLocation');
     options.filter = UrlService.toQueryString(queryParams);
@@ -347,9 +348,11 @@ function queueForPublish(sku) {
         return;
     }
 
-    let batch = getCurrentSubscriberBatch();
-    batch.requests.push(getProductStatus(sku)
-        .catch(err => {console.error(err); return null;}));
+    getConfiguration(['Url', 'Shopping']).then(() => {
+        let batch = getCurrentSubscriberBatch();
+        batch.requests.push(getProductStatus(sku)
+            .catch(err => {console.error(err); return null;}));
+    });
 }
 
 /**
@@ -388,7 +391,7 @@ function publishStatuses() {
         // Wait for all status requests to be satisfied
         Promise.all(batch.requests)
 
-            // Filter out nulls and flatten the status lists to a single list
+        // Filter out nulls and flatten the status lists to a single list
             .then(lists => lists.filter(s => !!s).reduce((acc, el) => acc.concat(el), []))
 
             // Publish the flattened list to all subscribers