@nuskin/ns-product-lib 2.5.0-cx24-refactor.1 → 2.5.0-cx24-2179.2.18

package/CHANGELOG.md

@@ -1,9 +1,17 @@
-# [2.5.0-cx24-refactor.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.17...v2.5.0-cx24-refactor.1) (2023-01-26)
+# [2.5.0-cx24-2179.2.18](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.17...v2.5.0-cx24-2179.2.18) (2023-01-26)
 
 
 ### Update
 
-* refactoring getConfiguration ([76c54aa](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/76c54aa7b3a9a81c56e701314e6515edac451fe2))
+* dynamically select environment (CX24-2556) ([03af29f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/03af29ffa8be3dca1b6df0b15094fe91bfd27d08))
+
+# [2.5.0-cx24-2556.10.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.17...v2.5.0-cx24-2556.10.1) (2023-01-26)
+
+
+### Update
+
+* dynamically select environment (CX24-2556) ([3ba9fea](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3ba9fea8a3e308b25f8dea39572af59f86b4d2b8))
+* dynamically select environment (CX24-2556) ([4729d82](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4729d82e49c9a21d17f3e6a619b25fe0aa51dc88))
 
 # [2.5.0-cx24-2179.2.17](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.16...v2.5.0-cx24-2179.2.17) (2023-01-24)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.5.0-cx24-refactor.1",
+  "version": "2.5.0-cx24-2179.2.18",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/contentstack/contentstack.js

@@ -130,100 +130,6 @@ async function getAEMConfig() {
   }
 }
 
-/**
- * getEquinoxMarkets will get the list of Equinox-enabled markets from contentstack
- *
- * @typedef EquinoxEnabledMarket
- * @property {string} market_name
- * @property {string} country_code
- * @property {string} store_id
- *
- * @typedef EquinoxEnabledMarkets
- * @property {EquinoxEnabledMarket[]} [dev_markets]
- * @property {EquinoxEnabledMarket[]} [test_markets]
- * @property {EquinoxEnabledMarket[]} [staging_markets]
- * @property {EquinoxEnabledMarket[]} [prod_markets]
- *
- * @export
- * @return {Promise<EquinoxEnabledMarkets>}
- */
-async function getEquinoxMarkets() {
-  try {
-    if (isCacheExpired(cacheKeys.equinoxMarkets)) {
-      const marketConfig = `${platform.env}_markets`;
-      const variables = { uid: 'blt5633ff9e560f14ef' };
-      const query = `query EquinoxMarketsByUid($uid: String!) {
-        equinox_markets(uid: $uid) {
-            ${marketConfig} {
-              market_name
-              country_code
-              store_id
-          }
-        }
-      }`;
-
-      const { data } = await contentstackService({
-        data: { variables, query }
-      });
-
-      setCachedData(cacheKeys.equinoxMarkets, data.equinox_markets[marketConfig]);
-    }
-
-    return getCachedData(cacheKeys.equinoxMarkets);
-  } catch (error) {
-    console.error(error);
-    return [];
-  }
-}
-
-/**getKongUrl gets the URL for Kong in contentstack
- *
- * @returns {string}
-*/
-async function getKongUrl() {
-  try {
-    if (isCacheExpired(cacheKeys.kongUrl)) {
-      const variables = { uid: 'blt5633ff9e560f14ef' };
-      const query = `query KongUrlByUid($uid: String!) {
-          equinox_markets(uid: $uid) {
-              kong_urls {
-                ${platform.env}
-            }
-          }
-        }`;
-
-      const { data } = await contentstackService({
-        data: { variables, query }
-      });
-
-      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[platform.env]);
-    }
-
-    return getCachedData(cacheKeys.kongUrl);
-  } catch (error) {
-    console.error(error);
-    return [];
-  }
-}
-
-/**
- * isMarketEnabled checks is the given market is in the list
- * of equinox-enabled markets.
- *
- * @param {string} market
- * @returns {EquinoxEnabledMarket|null}
- */
-async function isMarketEnabled(market) {
-  const markets = await getEquinoxMarkets();
-  const currentMarket = markets.filter(m => m.country_code.toLowerCase() === market.toLowerCase());
-
-  if (currentMarket.length > 0) {
-    return currentMarket[0];
-  }
-
-  return null;
-}
-
 /**
  * Contentstack HTTP - axios wrapper for contentstack request
  *
@@ -243,8 +149,5 @@ async function contentstackService(config) {
 }
 
 module.exports = {
-  getAEMConfig,
-  getEquinoxMarkets,
-  isMarketEnabled,
-  getKongUrl
-}
+  getAEMConfig
+}

package/src/productData.js

@@ -1,16 +1,14 @@
 "use strict";
 const { getConfiguration } = require('@nuskin/configuration-sdk');
-// import { ConfigService } from '@nuskin/ns-util';
+const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const axios = require("axios");
 const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
-const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
-
 /** @type {*} */
 const ProductData = {
-  /**
+  /** 
    * @param {string[]} skus
    * @param {string} locale
    * @param {string} market
@@ -18,16 +16,12 @@ const ProductData = {
    */
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
     const localeMarket = `${locale}_${market}`;
-    let env = 'test';
-    if (typeof window !== 'undefined') {
-      env = getEnvironmentFromUrl(window.location.host);
-    } 
-    console.log(`ENV is ${env}`)
+
     if (isEquinoxEnabled) {
       let config = (await getConfiguration({
         configMapNames: ['Equinox_Markets'],
         country: market,
-        environment: env,
+        environment: contentstackEnv(),
         clientId: '735b1eb810304bba966af0891ab54053'
       }));
 
@@ -152,7 +146,77 @@ const ProductData = {
       "salesEventText": "",
       "contentSection": [
         {
-          "sectionContent": "<div class=\"contentSections\"><div class=\"contentSection section\"><div>\n<h3>BENEFITS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>Green tea has been used in China for thousands of years for its health-preserving and revitalizing power. Modern science has identified powerful antioxidants in green tea called polyphenols. One group of polyphenols called catechins is particularly potent and is highly effective at neutralizing free radicals at the cellular level. Catechins support healthy cell function while providing antioxidant protection to critical cell structures such as DNA. Clinical studies show catechins interfere with the production of certain enzymes involved in cell damage. Additionally, catechins have been demonstrated to cause a thermogenic effect that enhances the body s metabolic rate. Tegreen 97<sup>®</sup> from Pharmanex is a proprietary, highly concentrated extract of the catechins found in green tea. Tegreen 97<sup>®</sup> is one of the most potent antioxidant supplements on the market with a 97 percent polyphenol content, 65% catechins. Each Tegreen 97<sup>®</sup> capsule contains the catechin equivalent of approximately seven cups of green tea and is 99.5 percent caffeine free.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>USAGE</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>As a dietary supplement, take one (1) to four (4) capsules daily; preferably one (1) to two (2) each morning and evening with food. Store in a cool, dry place.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>INGREDIENTS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<table border=\"1\" cellspacing=\"1\" cellpadding=\"0\" width=\"360\"><tbody>\r\n<tr>\r\n<td><b>Nutritional Facts</b></td>\r\n<td><b>Amount</b></td>\r\n<td><b>% Daily Value</b></td>\r\n</tr>\r\n<tr>\r\n<td colspan=\"3\"><b>Serving Size: 1 Capsule<br>\r\nServings Per Container: 120</b></td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\">Green tea leaf (20:1) Extract (<i>Camellia sinensis</i></td>\r\n<td width=\"20%\">250 mg</td>\r\n<td width=\"25%\">&nbsp;</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\">* Daily Value not established</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\"><b>Other Ingredients: Gelatin, Silicon Dioxide, Microcrystalline Cellulose, Magnesium Stearate.</b></td>\r\n</tr>\r\n</tbody>\r\n</table>\r\n<p>&nbsp;</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n</div>\n"
+          "sectionContent": `<div class="contentSections">
+            <div class="contentSection section">
+              <div>\n<h3>BENEFITS</h3>\n
+                <div>\n
+                  <div class="sectionContent parsys">
+                    <div class="text parbase section">\n
+                      <p>
+                        Green tea has been used in China for thousands of years for its health-preserving and 
+                        revitalizing power. Modern science has identified powerful antioxidants in green tea 
+                        called polyphenols. One group of polyphenols called catechins is particularly potent 
+                        and is highly effective at neutralizing free radicals at the cellular level. Catechins 
+                        support healthy cell function while providing antioxidant protection to critical cell 
+                        structures such as DNA. Clinical studies show catechins interfere with the production 
+                        of certain enzymes involved in cell damage. Additionally, catechins have been demonstrated 
+                        to cause a thermogenic effect that enhances the body s metabolic rate. Tegreen 97<sup>®</sup> 
+                        from Pharmanex is a proprietary, highly concentrated extract of the catechins found 
+                        in green tea. Tegreen 97<sup>®</sup> is one of the most potent antioxidant supplements 
+                        on the market with a 97 percent polyphenol content, 65% catechins. Each Tegreen 97<sup>®</sup> 
+                        capsule contains the catechin equivalent of approximately seven cups of green tea and is 
+                        99.5 percent caffeine free.
+                      </p>\r\n\n
+                    </div>\n\n
+                  </div>\n\n
+                </div>\n
+              </div>\n
+            </div>\n
+            <div class="contentSection section">
+              <div>\n<h3>USAGE</h3>\n
+                <div>\n
+                  <div class="sectionContent parsys">
+                    <div class="text parbase section">\n
+                      <p>As a dietary supplement, take one (1) to four (4) capsules daily; preferably one (1) 
+                      to two (2) each morning and evening with food. Store in a cool, dry place.</p>\r\n\n
+                    </div>\n\n
+                  </div>\n\n
+                </div>\n
+              </div>\n
+            </div>\n
+            <div class="contentSection section">
+              <div>\n<h3>INGREDIENTS</h3>\n
+                <div>\n
+                  <div class="sectionContent parsys">
+                    <div class="text parbase section">\n
+                      <table border="1" cellspacing="1" cellpadding="0" width="360">
+                        <tbody>\r\n
+                          <tr>\r\n
+                            <td><b>Nutritional Facts</b></td>\r\n
+                            <td><b>Amount</b></td>\r\n<td><b>% Daily Value</b></td>\r\n
+                          </tr>\r\n
+                          <tr>\r\n
+                            <td colspan="3"><b>Serving Size: 1 Capsule<br>\r\nServings Per Container: 120</b></td>\r\n
+                          </tr>\r\n
+                          <tr>\r\n
+                            <td width="55%">Green tea leaf (20:1) Extract (<i>Camellia sinensis</i></td>\r\n
+                            <td width="20%">250 mg</td>\r\n<td width="25%">&nbsp;</td>\r\n
+                          </tr>\r\n
+                          <tr>\r\n<td width="55%" colspan="3">* Daily Value not established</td>\r\n</tr>\r\n
+                          <tr>\r\n
+                            <td width="55%" colspan="3">
+                              <b>Other Ingredients: Gelatin, Silicon Dioxide, 
+                              Microcrystalline Cellulose, Magnesium Stearate.</b>
+                            </td>\r\n</tr>\r\n
+                        </tbody>\r\n
+                      </table>\r\n
+                      <p>&nbsp;</p>\r\n\n
+                      </div>\n\n
+                    </div>\n\n
+                  </div>\n
+                </div>\n
+              </div>\n
+            </div>\n`
         }
       ],
       "scanQualified": eqVariant.properties.scanQualifiedCount,
@@ -234,7 +298,9 @@ const ProductData = {
     }
 
     const defaultProductPrice = product.totalValue ?  product.totalValue.originalPrice : 0;
-    const computedPrice =  product.totalValue && product.totalValue.priceAfterDiscount ? product.totalValue.priceAfterDiscount : 0;
+    const computedPrice =  product.totalValue && product.totalValue.priceAfterDiscount
+      ? product.totalValue.priceAfterDiscount
+      : 0;
     let eventName = "";
     const eventLabels = [];
 
@@ -276,7 +342,12 @@ const ProductData = {
         });
       }
 
-      const { eventName, eventLabels, computedPrice, defaultProductPrice} = this.getEqProductPromotions(data.sku[count]);
+      const {
+        eventName,
+        eventLabels,
+        computedPrice,
+        defaultProductPrice
+      } = this.getEqProductPromotions(data.sku[count]);
       const productPrice = eventName ? defaultProductPrice : data.sku[count].priceFacets["Regular Price"];
       const discountedPrice = eventName ? computedPrice : data.sku[count].priceFacets["Regular Price"];
 
@@ -530,4 +601,12 @@ const ProductData = {
   }
 }
 
+function contentstackEnv() {
+  if (typeof window === 'undefined') {
+    return 'test';
+  }
+
+  return getEnvironmentFromUrl(window.location.host);
+}
+
 module.exports = ProductData;