@nuskin/cs-product-lib 1.4.3-pa-192.1 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.4.3-pa-192.1",
+  "version": "1.4.4",
   "description": "Library for pulling and parsing product content (and applying business logic) retrieved from Contentstack",
   "main": "src/index.js",
   "scripts": {

package/src/helpers.js

@@ -569,6 +569,25 @@ function mapLink(link) {
     return (link || {}).href ? { url: link.href, text: link.title || '' } : null
 }
 
+function convertDescription(description) {
+    if (description?.uid && !(description?.children && description?.type)) {
+        description = null
+    } else {
+        description = createMarkdown(
+            description && description.type ? description : null,
+            description
+        )
+    }
+    description =
+        description?.type ||
+        description === '' ||
+        description === 'undefined' ||
+        description === null
+            ? null
+            : [description]
+    return description
+}
+
 function mapProductDetails(productOrVariant) {
     const productDetails = (productOrVariant || {}).product_details || {}
     if ((productOrVariant?.long_description_override || []).length > 0) {
@@ -578,24 +597,10 @@ function mapProductDetails(productOrVariant) {
     if ((productOrVariant?.included_items_override || []).length > 0) {
         productDetails.included_items = productOrVariant?.included_items_override
     }
-    let description = productDetails.long_description
-    if (!Array.isArray(description)) {
-        if (description?.uid && !(description?.children && description?.type)) {
-            description = null
-        } else {
-            description = createMarkdown(
-                description && description.type ? description : null,
-                description
-            )
-        }
-        description =
-            description?.type ||
-            description === '' ||
-            description === 'undefined' ||
-            description === null
-                ? []
-                : [description]
-    }
+    let longDescription = productDetails.long_description
+    if (!Array.isArray(longDescription)) { longDescription = convertDescription(longDescription) }
+    let description = convertDescription(productDetails.description)    
+
     const includedItems = productDetails.included_items
     const highlights = (productDetails.highlights || []).map((highlight) => ({
         iconUrl: !isNullOrEmpty(highlight?.icon_bynder)
@@ -607,7 +612,7 @@ function mapProductDetails(productOrVariant) {
     const importer = productDetails.importer
     const warnings = productDetails.warnings
     return {
-        description: decodeHTML(description),
+        description: decodeHTML(description || longDescription || []),
         includedItems: decodeHTML(includedItems),
         highlights,
         originCountry,