@nuskin/ns-product-lib 2.7.0-cx24-3682.2 → 2.7.0-cx24-3682.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.7.0-cx24-3682.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.2...v2.7.0-cx24-3682.3) (2023-03-24)
+
+
+### New
+
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([3ce010e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3ce010e162034d2cc49619f553baf7b8b7fcd4e0)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+
 # [2.7.0-cx24-3682.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.1...v2.7.0-cx24-3682.2) (2023-03-24)
 
 

package/package.json

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

package/src/equinox-helpers/index.js

@@ -15,6 +15,11 @@
  * @property {Inventory} [inventory]
  *
  * ---
+ * 
+ * @description This model represents the response.
+ * @typedef EquinoxResponse
+ * @type {object}
+ * @property {EquinoxProduct} product
  *
  * @description This model represents a product within an Equinox response.
  * @typedef EquinoxProduct

package/src/equinox-helpers/interceptors/index.js

@@ -0,0 +1,5 @@
+const productNotFound = require('./productNotFound');
+
+module.exports = {
+  productNotFoundInterceptor: productNotFound
+}

package/src/equinox-helpers/interceptors/productNotFound.js

@@ -0,0 +1,50 @@
+// httpStatus codes
+const httpStatus = { notFound: 404 };
+
+/**
+ * productNotFoundInterceptor is called when an equinox product is not found
+ * Note: Do not polute this file. Create a new file for new interceptor.
+ *
+ * @param {import('axios').AxiosError} error 
+ * @returns {import('../').EquinoxResponse}
+*/
+function productNotFoundInterceptor(error) {
+  const segments = 'catalogs/search';
+  const { config, status } = error;
+
+  if (status === httpStatus.notFound && config.url.includes(segments)) {
+    const params = new URLSearchParams(config.url);
+    const filterParam = Array.from(params.values())[0];
+    const sku = getSKU(filterParam);
+
+    if (sku === null) {
+      console.error('Unable to find SKU', error);
+      return Promise.reject(error);
+    }
+
+    return {
+      product: {
+        sku
+      }
+    }
+  }
+
+  return Promise.reject(error);
+}
+
+/**
+ * getSKU returns the SKU from the given parameter.
+ * @param {string} param '\\''index_key_productId="02010489" OR index_key_skuId="02010489"'''
+ * @returns {string|null} SKU 
+ */
+function getSKU(param) {
+  const result = param.match(/\d{8}/);
+
+  if (result === null) {
+    return null;
+  }
+
+  return result[0];
+}
+
+module.exports = productNotFoundInterceptor;

package/src/productData.js

@@ -6,10 +6,7 @@ const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
 const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
-const {
-  productFoundInterceptor,
-  productNotFoundInterceptor
-} = require('./equinox-helpers/interceptors/product');
+const productNotFoundInterceptor = require('./equinox-helpers/interceptors');
 
 const productTypes = {
   kit: 'kit'
@@ -38,7 +35,6 @@ const ProductData = {
 
   getProductFromEquinox: async function (skus, locale, config) {
     const response = await this.searchEquinoxProduct(skus, locale, config);
-    console.log(response);
 
     if (response.data.product) {
       return await this.eqProductMapper(response.data.product, skus);
@@ -75,7 +71,7 @@ const ProductData = {
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
-    axios.interceptors.response.use(productFoundInterceptor, productNotFoundInterceptor);
+    axios.interceptors.response.use((res) => res, productNotFoundInterceptor);
     const response = await axios.request({
       method: 'get',
       url: href,
@@ -88,7 +84,6 @@ const ProductData = {
       withCredentials: true
     });
 
-    axios.interceptors.response.eject(productFoundInterceptor);
     axios.interceptors.response.eject(productNotFoundInterceptor);
     return response;
   },

package/src/equinox-helpers/interceptors/product.js

@@ -1,19 +0,0 @@
-/**
- * productFoundInterceptor is executed when an equinox product is found
- * @param {import('axios').AxiosResponse} response 
- */
-function productFoundInterceptor(response) {
-  console.log('productFoundInterceptor', response);
-  return response;
-}
-
-/**
- * productNotFoundInterceptor is called when an equinox product is not found
- * @param {import('axios').AxiosError} error 
-*/
-function productNotFoundInterceptor(error) {
-  console.log('productNotFoundInterceptor', error);
-  return Promise.reject(error);
-}
-
-module.exports = { productFoundInterceptor, productNotFoundInterceptor };