@nuskin/ns-product-lib 2.4.1-cx24-2612.1 → 2.5.0-fix.1

package/CHANGELOG.md

@@ -1,12 +1,21 @@
-## [2.4.1-cx24-2612.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.4.1-cx24-2612.1) (2022-11-03)
+# [2.5.0-fix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.5.0-fix.1) (2022-11-04)
 
 
 ### Fix
 
-* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([767efcd](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/767efcd821764a83212321707f1f1db64527e48e))
-* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([bfbb4a4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bfbb4a4902faa5a17904e47d37aa935199a78d2e))
+* use platform-specific values when initialized ([04d9c5e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/04d9c5eb555b6a8304329ac63f1304dd61e5ecd2))
+
+### New
+
+* added support for inventory label (#CX24-2186) ([78e9385](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/78e9385432b6c8245061a450021fe9dd9da9b840)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([78b03b1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/78b03b1c22a09c29c39b926696f2e2141a1ecd1e))
 
 # [2.4.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.4.0) (2022-10-26)
+## [2.3.1-fix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.3.1-fix.1) (2022-11-04)
+# [2.4.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.4.0) (2022-10-26)
 
 
 ### Fix
@@ -24,6 +33,22 @@
 
 ### Update
 
+* added support for variant and price (#CX24-2186) ([e0bf8f2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e0bf8f280a838dfa4cc613e5bc34d254dbdc8e1a)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* added variant label (#CX24-2186) ([4c223b3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c223b34438ed73cb824716cacb93482486f8195)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* use platform-specific values when initialized ([18de006](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/18de006211ab396f4d7fa40d0089c8e185d9cee9))
+* To make multiple products work (#CX24-2444) ([ce4c483](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ce4c483b7fbb0527e60045d8174fd503a67e63fa)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+
+### New
+
+* added support for inventory label (#CX24-2186) ([3e27481](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3e2748106cd6098086dbd6b738964deabacc875d)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([8f75316](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8f75316b692ddccda5b7bea830ee6dc625b942c7))
+* Automated changes by GitLab pipeline [skip ci] ([36dca5b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/36dca5b92285ae6d8ae96345256df92102efad8e))
+
+### Update
+
 * added support for variant and price (#CX24-2186) ([e0bf8f2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e0bf8f280a838dfa4cc613e5bc34d254dbdc8e1a)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
 * added variant label (#CX24-2186) ([4c223b3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c223b34438ed73cb824716cacb93482486f8195)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.4.1-cx24-2612.1",
+  "version": "2.5.0-fix.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -19,13 +19,14 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/blob/master/README.md",
   "devDependencies": {
+    "axios-mock-adapter": "1.21.2",
     "eslint": "5.16.0",
     "eslint-config-google": "0.14.0",
     "eslint-config-prettier": "4.1.0",
     "eslint-plugin-json": "2.1.1",
     "eslint-plugin-prettier": "3.1.2",
-    "axios-mock-adapter": "1.18.2",
-    "jest": "25.1.0",
+    "jest": "29.2.2",
+    "jest-environment-jsdom": "29.2.2",
     "jest-sonar-reporter": "2.0.0",
     "prettier": "1.19.1"
   },

package/src/contentstack/contentstack.js

@@ -4,14 +4,51 @@ const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const config = require('./environment');
 
 // contentstack HTTP service
-const env = getEnvironmentFromUrl(window.location.host);
-const envConfig = config.getCredentials(env);
-const baseURL = `${envConfig.url}/stacks/${envConfig.apiKey}?environment=${envConfig.env}`;
-const headers = {
-  'access_token': `${envConfig.accessToken}`,
-  'Content-Type': 'application/json'
-};
-const http = axios.create({ baseURL, headers });
+const platform = usePlatformSpecificVariables();
+const http = axios.create({ baseURL: platform.baseURL, headers: platform.headers });
+
+// usePlatformVariables returns an object with platform-specific values; defaults to Lambda environment
+function usePlatformSpecificVariables() {
+  if (typeof window !== 'undefined') {
+    return useWebEnvironment();
+  }
+
+  if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
+    return useMobileEnvironment();
+  }
+
+  return useLambdaEnvironment();
+}
+
+function useWebEnvironment() {
+  console.log('web');
+  const env = getEnvironmentFromUrl(window.location.host);
+  const envConfig = config.getCredentials(env);
+  const baseURL = `${envConfig.url}/stacks/${envConfig.apiKey}?environment=${envConfig.env}`;
+  const headers = {
+    'access_token': `${envConfig.accessToken}`,
+    'Content-Type': 'application/json'
+  };
+
+  return { baseURL, env, headers }
+}
+
+function useMobileEnvironment() {
+  // ...
+}
+
+function useLambdaEnvironment() {
+  console.log('lambda');
+  const env = {};
+  const baseURL = `contentstack-call-for-lambda`;
+  const headers = {
+    'access_token': `contentstack-access-token-for-lambda`,
+    'Content-Type': 'application/json'
+  };
+
+  return { baseURL, env, headers }
+}
+
 
 // in-memory caching
 const cacheKeys = { aemConfig: 'aemConfig', equinoxMarkets: 'equinoxMarkets', kongUrl: 'kongUrl' };
@@ -19,7 +56,7 @@ const cacheTTLInSeconds = 30 * 1000;
 const cache = {
   [cacheKeys.aemConfig]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
   [cacheKeys.equinoxMarkets]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
-  [cacheKeys.kongUrl]: { data: null, ttl: Date.now() + cacheTTLInSeconds}
+  [cacheKeys.kongUrl]: { data: null, ttl: Date.now() + cacheTTLInSeconds }
 };
 
 /**
@@ -67,7 +104,7 @@ function getCachedData(key) {
 async function getAEMConfig() {
   try {
     if (isCacheExpired(cacheKeys.aemConfig)) {
-      const marketConfig = `market_config_${env}`;
+      const marketConfig = `market_config_${platform.env}`;
       const variables = { uid: 'blt52b0b83a89763791' };
       const query = `query AemConfigByUid($uid: String!) {
         aem_config(uid: $uid) {
@@ -114,7 +151,7 @@ async function getAEMConfig() {
 async function getEquinoxMarkets() {
   try {
     if (isCacheExpired(cacheKeys.equinoxMarkets)) {
-      const marketConfig = `${env}_markets`;
+      const marketConfig = `${platform.env}_markets`;
       const variables = { uid: 'blt5633ff9e560f14ef' };
       const query = `query EquinoxMarketsByUid($uid: String!) {
         equinox_markets(uid: $uid) {
@@ -151,7 +188,7 @@ async function getKongUrl() {
       const query = `query KongUrlByUid($uid: String!) {
           equinox_markets(uid: $uid) {
               kong_urls {
-                ${env}
+                ${platform.env}
             }
           }
         }`;
@@ -160,9 +197,9 @@ async function getKongUrl() {
         data: { variables, query }
       });
 
-      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[env]);
+      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[platform.env]);
     }
-    
+
     return getCachedData(cacheKeys.kongUrl);
   } catch (error) {
     console.error(error);
@@ -199,6 +236,7 @@ async function contentstackService(config) {
 
   try {
     const response = await http.post('', data);
+    console.log(response);
     return response.data
   } catch (error) {
     console.error(error.response.data.errors);

package/src/productData.js

@@ -43,7 +43,7 @@ const ProductData = {
     });
 
     if (response.data.product) {
-      return this.eqProductMapper(response.data.product, skus);
+      return this.eqProductMapper(response.data.product);
     }
 
     return {
@@ -210,7 +210,7 @@ const ProductData = {
     };
   },
 
-  eqProductMapper: function (productDataResponse, skus) {
+  eqProductMapper: function (productDataResponse) {
     let prod = [];
     let count = 0;
     let variants = {};
@@ -336,7 +336,7 @@ const ProductData = {
         },
         "restrictedMarkets": [],
         "addOns": [],
-        "inventory": data.sku[count].inventory || "" //inventory label
+        "inventoryLabel": data.sku[count].inventory || ""
 
       };
       let newProduct = new Product(prod);
@@ -344,7 +344,7 @@ const ProductData = {
     })
 
     let data = {
-      products: this._sortProductsBySku(skus, prodArr),
+      products: prodArr,
       count: productDataResponse.length
     };
     return {
@@ -395,26 +395,6 @@ const ProductData = {
     if (custType.includes('Preferred Customer/Member'))
       newCustType.push(30)
     return newCustType.toString()
-  },
-
-  /**
-   * Sorts the product by sku
-   * @param {Array} skus - the skus arrangment which the sorting will base out of
-   * @param {Array} products - this products to be sorted
-   */
-
-  _sortProductsBySku: function (skus, products) {
-
-    if(!skus || !products || products.length === 1) {
-      return products
-    }
-
-    const sortedProducts = products.sort(function (a, b) {
-      return skus.indexOf(a.sku) - skus.indexOf(b.sku);
-    });
-
-    return sortedProducts
-
   }
 }