@nuskin/ns-product-lib 2.4.1-cx12-5910.1 → 2.4.1-cx24-2612.1

package/CHANGELOG.md

@@ -1,9 +1,10 @@
-## [2.4.1-cx12-5910.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.4.1-cx12-5910.1) (2022-10-26)
+## [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)
 
 
 ### Fix
 
-* try catch block for generating env (#CX12-5910) ([86930c3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/86930c31a70bfe35a5136bc338ec618e04d860eb)), closes [#CX12-5910](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX12-5910)
+* [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))
 
 # [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)
 

package/package.json

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

package/src/contentstack/contentstack.js

@@ -3,19 +3,8 @@ const axios = require('axios');
 const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const config = require('./environment');
 
-let env = 'unknown';
-
-// ns-product-lib should be multi-platform compatible i.e. lambda, web, or react native etc.
-try {
-  env = getEnvironmentFromUrl(window.location.host);
-} catch (error) {
-  console.log("getting env from url not supported. window is likely unavailable:");
-  console.log("Name: ", error.name);
-  console.log("Message: ", error.message);
-  console.log("Stack Trace: ", error.stack);
-}
-
 // 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 = {

package/src/productData.js

@@ -30,7 +30,6 @@ const ProductData = {
     axios.defaults.withCredentials = true;
 
     const url = await contentstack.getKongUrl() + `/orchestrationservices/storefront/catalogs/search/`;
-    console.log("Dynamic URL", url)
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
@@ -44,7 +43,7 @@ const ProductData = {
     });
 
     if (response.data.product) {
-      return this.eqProductMapper(response.data.product);
+      return this.eqProductMapper(response.data.product, skus);
     }
 
     return {
@@ -211,7 +210,7 @@ const ProductData = {
     };
   },
 
-  eqProductMapper: function (productDataResponse) {
+  eqProductMapper: function (productDataResponse, skus) {
     let prod = [];
     let count = 0;
     let variants = {};
@@ -345,7 +344,7 @@ const ProductData = {
     })
 
     let data = {
-      products: prodArr,
+      products: this._sortProductsBySku(skus, prodArr),
       count: productDataResponse.length
     };
     return {
@@ -396,6 +395,26 @@ 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
+
   }
 }