@nuskin/ns-product-lib 2.9.0-cx24-4460.2 → 2.9.0-mysitedomainfix.2

package/CHANGELOG.md

@@ -1,10 +1,27 @@
-# [2.9.0-cx24-4460.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-cx24-4460.1...v2.9.0-cx24-4460.2) (2023-06-21)
+# [2.9.0-mysitedomainfix.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-mysitedomainfix.1...v2.9.0-mysitedomainfix.2) (2023-06-21)
 
 
-### New
+### Fix
+
+* for PO use nuskin.com domain ([3596e90](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3596e902ef15e3f2d9d15242edfcc423571e6ca3))
+
+### Update
+
+* adjust unit testing for searchEquinoxProduct ([30c2732](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/30c2732d9e7dfc793493eb30594abff068ba0207))
+
+# [2.9.0-mysitedomainfix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-cx24-4460.1...v2.9.0-mysitedomainfix.1) (2023-06-20)
+
+
+### Fix
+
+* added the logic to change the domain using the shopping context. ([91449cb](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/91449cb1463eaacb0bc80ba4308c4c8fb6ace777))
+* changing the equinox api domain so that it stays on the same domain as the mysite domain ([b3e672a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b3e672a4dae57012cf61d9a1f4454eaab674c3e7))
+* Multiple variants add to cart not adding correct sku ([968ed05](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/968ed055b5f5024579ac256f26c0d58ba409fcb9))
+
+### Release
 
-* Change API Base URLs for My Site ([f6e2cbf](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f6e2cbf3ce9bcbd1c8fa85c53b8000de8048d3fc))
-* Change API Base URLs for My Site ([5621d64](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5621d64be86d75c91837e11ca8f4267c49707971))
+* Automated changes by GitLab pipeline [skip ci] ([679e474](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/679e474ad639ca2cf57652acc8fe71db85fac6fc))
+* Automated changes by GitLab pipeline [skip ci] ([5500a55](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5500a550253e487b79045a9b5f5403bc93c3ee5a))
 
 # [2.9.0-cx24-4460.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.0...v2.9.0-cx24-4460.1) (2023-06-20)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.9.0-cx24-4460.2",
+  "version": "2.9.0-mysitedomainfix.2",
   "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": {
+    "@babel/preset-env": "^7.22.5",
     "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",
-    "jest": "29.2.2",
+    "jest": "29.5.0",
     "jest-environment-jsdom": "29.2.2",
     "jest-sonar-reporter": "2.0.0",
     "prettier": "1.19.1"
@@ -33,7 +34,6 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "4.3.2",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/productData.js

@@ -57,6 +57,10 @@ const ProductData = {
   searchEquinoxProduct: async function (skus, locale, config) {
     let skuFilter = [];
 
+    if (window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext().context === 'storefront') {
+      config.API_Base_URLs = config.MySite_API_Base_URLs
+    }
+
     if (Array.isArray(skus)) {
       skus.forEach((sku) => {
         skuFilter.push(`index_key_productId="${sku}" OR index_key_skuId="${sku}"`)
@@ -68,10 +72,7 @@ const ProductData = {
 
     const filter = skuFilter.join(" OR ")
 
-    let url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    if (window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext().context === 'storefront') {
-      url = `${config.MySite_API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    }
+    const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
     axios.interceptors.response.use((res) => res, productNotFoundInterceptor);
     const response = await axios.request({
@@ -367,8 +368,9 @@ const ProductData = {
         let variants = {};
         let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
         let imageURL = product.properties.imageURL ? product.properties.imageURL : '';
-        let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
-
+        let thumbnailImage = imageURL ? imageURL + '?width=40' : '';
+        let productTitle = productData.properties.name;
+        let productSku = product.identifier
 
         if (productData.sku && productData.sku.length > 1) {
           // exclude base product from variants
@@ -376,6 +378,9 @@ const ProductData = {
             variants[variant.identifier] = this.eqProductVariantMapper(variant);
             return variant;
           });
+          const productArr = productData.sku.filter(p => p.default === true)
+          productTitle = productArr[0].properties.name;
+          productSku = productArr[0].identifier
         }
 
         const {
@@ -397,9 +402,9 @@ const ProductData = {
         product.availableQuantity = mapAvailableQuantity(product);
         product = {
           ...product,
-          "sku": product.identifier,
+          "sku": productSku,
           "globalProductID": productData.identifier,
-          "title": productData.properties.name,
+          "title": productTitle,
           "country": product.properties.market,
           "language": "en",
           "shortDescr": productData.properties.description,