@nuskin/product-components 3.6.4 → 3.6.5

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.6.5](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.6.4...v3.6.5) (2023-06-06)
+
+
+### Fix
+
+* use recommended product API (CX16-9278) ([28a5f29](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/28a5f296474ac0bae22de726dcd39afae9b771a0))
+
 ## [3.6.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.6.3...v3.6.4) (2023-06-06)
 
 

package/components/NuHomeCloneProductCarousel/NuHomeCloneProductCarousel.vue

@@ -118,7 +118,7 @@ import Product from "../../models/product";
 import Price from "./Price.vue";
 import get from "lodash/get";
 import {
-  findProductsByAnyId,
+  findProductsById,
   getProductTranslations
 } from "../../services/NsProductContentService";
 
@@ -340,9 +340,10 @@ export default {
       this.loading = true;
 
       try {
-        const products = await findProductsByAnyId(
+        const products = await findProductsById(
           sliderProductIds,
-          this.country + "-" + this.language
+          this.country,
+          this.language
         );
 
         this.products = sliderProductIds
@@ -381,10 +382,7 @@ export default {
     },
 
     initProductTranslations() {
-      getProductTranslations(
-        ["addToCartButton"],
-        this.country + "-" + this.language
-      )
+      getProductTranslations(["addToCartButton"], this.country, this.language)
         .then(translations => {
           this.translations = translations;
         })

package/cyclonedx-npm-yarn.json

@@ -1,10 +1,10 @@
 {
   "bomFormat": "CycloneDX",
   "specVersion": "1.4",
-  "serialNumber": "urn:uuid:485ea4e5-23b9-4ca8-a800-f9d5d9c534d5",
+  "serialNumber": "urn:uuid:e2145c59-f65d-4d51-a466-361d36d2bed4",
   "version": 1,
   "metadata": {
-    "timestamp": "2023-06-06T20:35:01Z",
+    "timestamp": "2023-06-06T22:53:20Z",
     "tools": [
       {
         "vendor": "GitLab",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {

package/services/NsProductContentService.js

@@ -33,52 +33,47 @@ import { RunConfigService } from "@nuskin/ns-util";
  * @property {string} [status.backorderedAvailableDate]
  */
 
-const productFields = `
-id
-title
-productImages {
-  url
-  alt
-}
-slug
-salesLabel
-variants {
-  sku
-  variantLabel
-  isExclusive
-  availableQuantity
-  productImages {
-    url
-    alt
-  }
-  pricingJson
-  price {
-    currencyCode
-    retail
-    retailSales
-    retailSubscription
-    wholesale
-    wholesaleSales
-    wholesaleSubscription
-  }
-  status {
-    status
-    isBackordered
-    backorderedAvailableDate
-  }
-  primaryBrand
-}
-`;
-
-const CombinedIdsProductsQuery = `
-  query CombinedIdsProductsQuery($uids: [String!]!, $skus: [String!]!, $locale: String) {
-    productsBySku(skus: $skus, locale: $locale) {
-      ${productFields}
-    }
-    productsByUid(uids: $uids, locale: $locale) {
-      ${productFields}
+const ProductsByIdQuery = `
+query ProductsById($ids: [String!]!, $market: String, $language: String) {
+  productsById(ids: $ids, market: $market, language: $language, quantity: 1) {
+    products {
+      id
+      title
+      productImages {
+        url
+        alt
+      }
+      slug
+      salesLabel
+      variants {
+        sku
+        variantLabel
+        isExclusive
+        availableQuantity
+        productImages {
+          url
+          alt
+        }
+        pricingJson
+        price {
+          currencyCode
+          retail
+          retailSales
+          retailSubscription
+          wholesale
+          wholesaleSales
+          wholesaleSubscription
+        }
+        status {
+          status
+          isBackordered
+          backorderedAvailableDate
+        }
+        primaryBrand
+      }
     }
   }
+}
 `;
 
 /**
@@ -86,8 +81,8 @@ const CombinedIdsProductsQuery = `
  * @returns {string}
  */
 const productTranslationsQuery = fields => `
-  query ProductTranslationsQuery($locale: String) {
-    productTranslations(locale: $locale) {
+  query ProductTranslationsQuery($market: String, $language: String) {
+    pdpStrings(market: $market, language: $language) {
       ${fields.join("\n")}
     }
   }
@@ -99,55 +94,54 @@ function getProductGraphqlUrl() {
 
   switch (env) {
     case "dev":
-      return "https://devapi.cloud.nuskin.com/cs-product-graphql/v1";
+      return "https://test.nuskin.com/product-api/graphql";
     case "stage":
     case "test":
-      return "https://testapi.cloud.nuskin.com/cs-product-graphql/v1";
+      return "https://test.nuskin.com/product-api/graphql";
     case "unknown":
     case "prod":
     default:
-      return "https://api.cloud.nuskin.com/cs-product-graphql/v1";
+      return "https://www.nuskin.com/product-api/graphql";
   }
 }
 
 /**
  * Retrieves product data for the given SKUs and/or product UIDs
  * @param {string[]} ids Product IDs; can be SKUs and/or UIDs
- * @param {string} csLocale Contentstack locale code (e.g. "US-en")
+ * @param {string} market Market country code
+ * @param {string} language Market language code
  * @return {Promise<ProductData[]>}
  */
-export async function findProductsByAnyId(ids, csLocale) {
+export async function findProductsById(ids, market, language) {
   const url = getProductGraphqlUrl();
 
-  const skus = ids.filter(id => /^\d{8}$/.test(id));
-  const uids = ids.filter(id => /^blt[0-9a-f]{16}$/.test(id));
-
   const response = await axios.post(url, {
-    query: CombinedIdsProductsQuery,
-    variables: { uids, skus, locale: csLocale }
+    query: ProductsByIdQuery,
+    variables: { ids, market, language }
   });
 
-  if (!response.data) return [];
-
-  const uidProducts = response.data.data.productsByUid || [];
-  const skuProducts = response.data.data.productsBySku || [];
+  if (!response.data || !response.data.data) return [];
 
-  return uidProducts.concat(skuProducts);
+  return response.data.data.productsById.products;
 }
 
 /**
  * @param {string[]} fields Product string fields to get
- * @param {string} csLocale Contentstack locale code (e.g. "US-en")
+ * @param {string} market Market country code
+ * @param {string} language Market language code
  */
-export async function getProductTranslations(fields, csLocale) {
+export async function getProductTranslations(fields, market, language) {
+  // If no fields are specified, don't bother attempting an API query
+  if (fields.length === 0) return {};
+
   const url = getProductGraphqlUrl();
   const query = productTranslationsQuery(fields);
 
   const response = await axios.post(url, {
     query,
-    variables: { locale: csLocale }
+    variables: { market, language }
   });
 
   if (!response.data || !response.data.data) return {};
-  return response.data.data.productTranslations || {};
+  return response.data.data.pdpStrings || {};
 }