@nuskin/cs-product-lib 1.2.0 → 1.3.0-brw-4716.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.2.0",
+  "version": "1.3.0-brw-4716.1",
   "description": "Library for pulling and parsing product content (and applying business logic) retrieved from Contentstack",
   "main": "src/index.js",
   "scripts": {
@@ -40,6 +40,7 @@
   ],
   "dependencies": {
     "@contentstack/json-rte-serializer": "2.0.1",
+    "@nuskin/configuration-sdk": "3.0.0",
     "@nuskin/ns-common-lib": "1.4.5",
     "axios": "1.3.0",
     "axios-retry": "3.4.0",

package/src/csProduct.js

@@ -14,10 +14,12 @@ const { formatDiscounts } = require('./helpers/formatDiscounts');
 const validateConfig = (props) => {
     if (!props) {
         throw new Error(
-            `This will not work without a valid configuration {apiKey, environment, deliveryToken, homeUrl, awsBase, clientId}.`
+            `This will not work without a valid configuration {apiKey, environment, deliveryToken, homeUrl, awsBase, clientId, useDAT}.`
         )
     }
 
+    props.useDAT = !!props.useDAT
+
     const requiredProps = [
         'apiKey',
         'environment',
@@ -31,7 +33,7 @@ const validateConfig = (props) => {
         if (!props[prop]) {
             throw new Error(`Missing required property ${prop} in config.`)
         }
-    })
+    })    
 }
 
 /* istanbul ignore next */
@@ -75,7 +77,8 @@ const csProduct = (props) => {
         deliveryToken,
         homeUrl,
         awsBase,
-        clientId
+        clientId,
+        useDAT
     } = props
     const axios = deliveryAxios({ apiKey, deliveryToken })
 
@@ -345,6 +348,7 @@ const csProduct = (props) => {
                     }
                 }
                 if (products[p].product_bundle?.length > 0) {
+                    products[p].product_bundle.useDAT = products[p].useDAT
                     products[p].bundle = formatKitWithSchema(
                         products[p].product_bundle,
                         noFormat
@@ -405,6 +409,11 @@ const csProduct = (props) => {
 
     const queryProducts = async (query, locale) => {
         const products = await getEntriesByQuery({ query, locale })
+        if (products.length > 0) {
+            for (const product of products) {
+                product.useDAT = useDAT
+            }
+        }
         return products
     }
 
@@ -621,7 +630,8 @@ const csProduct = (props) => {
         getBundle,
         getBundles,
         getCategoryPageTranslations,
-        formatProductWithSchema
+        formatProductWithSchema,
+        getUseDATFromConfig : helpers.getUseDATFromConfig
     }
 }
 

package/src/formatProduct.js

@@ -21,7 +21,7 @@ const formatProduct = (parent, homeUrl) => {
         features: helpers?.mapFeatures(parent),
         productDetails: helpers?.mapProductDetails(parent),
         benefitsMedia: {
-            image: helpers?.mapImage(parent?.benefits_media?.image, true, null, 460, 95),
+            image: helpers?.mapImage(parent?.benefits_media?.image, true, null, 460, 95, parent?.useDAT),
             youTubeVideoId: parent?.benefits_media?.youtube_video_id
         },
         benefits: helpers?.mapBenefits(parent),
@@ -43,7 +43,8 @@ const formatProduct = (parent, homeUrl) => {
         })),
         ingredients: helpers?.mapIngredients(
             parent?.ingredients,
-            parent?.legacy_ingredients
+            parent?.legacy_ingredients,
+            parent?.useDAT
         ),
         legacyBenefits: parent?.legacy_benefits,
         legacyLongDescription: parent?.legacy_long_description,
@@ -54,7 +55,8 @@ const formatProduct = (parent, homeUrl) => {
         legacyYouTube: parent?.legacy_youtube_video,
         disclaimers: parent?.disclaimers || [],
         disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-            parent?.disclaimer_warnings 
+            parent?.disclaimer_warnings,
+            parent?.useDAT
         ),
         seoInformation: helpers?.mapSeoInformation(parent, homeUrl),
         variants: helpers?.mapVariants(parent),

package/src/formatVariant.js

@@ -57,7 +57,8 @@ const formatVariant = (parent) => {
         productDetails: helpers?.mapProductDetails(parent),
         ingredients: helpers?.mapIngredients(
             parent.ingredients_override,
-            parent.legacy_ingredients
+            parent.legacy_ingredients,
+            parent.useDAT
         ),
         benefitsAndFeatures: helpers?.mapBenefitsAndFeatures(parent),
         results: helpers?.mapResults(parent),
@@ -66,7 +67,8 @@ const formatVariant = (parent) => {
         faqs: helpers?.mapFaqs(parent),
         disclaimers: parent?.disclaimers || [],
         disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-            parent.disclaimer_warnings
+            parent.disclaimer_warnings,
+            parent?.useDAT
         ),
         matchingVariant: 
             parent.sap_data?.sku_data?.findIndex((s) =>

package/src/helpers.js

@@ -9,12 +9,40 @@ const templateSettings = require('lodash/templateSettings')
 // const config = require('config')
 const _ = require('lodash')
 const { isNullOrEmpty } = require('@nuskin/ns-common-lib')
+const { getPartialConfig } = require('@nuskin/configuration-sdk')
 
 // CONSTS for helpers
 const TEXT_COLOR = 'textColor';
 const BACKGROUND_COLOR = 'backgroundColor';
 const ALL = 'all';
 
+let datConfigValue = null
+
+const getUseDATFromConfig = async (environment, client_id) => {
+    environment = environment || 'public-dev'
+    if (!client_id) {
+        return false
+    }
+    const env = environment.replace('public-', '')
+    if (datConfigValue === null) {
+        //get config value
+        const options = {
+            country: 'US',
+            environment: env,
+            clientId: client_id
+        }   
+        const { use_dat_images } = (
+            await getPartialConfig({
+                Product_Graphql: ['use_dat_images']
+            },
+            options
+            )
+        ).Product_Graphql
+        datConfigValue = use_dat_images
+    }
+    return datConfigValue
+}
+
 function mapBrandStyle(feature, type) {
     if (!feature)
         return null
@@ -131,7 +159,7 @@ function mapSubscriptions(subscriptions) {
 /* istanbul ignore next */
 function mapProductImages(parent) {
     if ((parent?.product_images_bynder || []).length) {
-        return parent?.product_images_bynder.map((img) => mapImage(img, true, 600, 600, 95))
+        return parent?.product_images_bynder.map((img) => mapImage(img, true, 600, 600, 95, null, parent?.useDAT))
     }
     if ((parent?.product_images || []).length) {
         return parent?.product_images.map((img) => mapImage(img))
@@ -254,7 +282,7 @@ function mapCsStatus(variant) {
 const getProductImages = (parent = {}) => {
     const { product_images_bynder = [], product_images = [] } = parent
     if (product_images_bynder?.length)
-        return product_images_bynder?.map((img) => mapImage(img, true, 600, 600, 95))
+        return product_images_bynder?.map((img) => mapImage(img, true, 600, 600, 95, null, parent?.useDAT))
 
     return product_images?.map((img) => mapImage(img))
 }
@@ -317,7 +345,8 @@ function mapVariants(parent) {
                 : [(parent?.product_details || {}).long_description],
             status: variant.status || {},
             marketData: variant.marketData
-        }
+        },
+        useDAT: parent?.useDAT
     }))
     return _variants
 }
@@ -498,10 +527,15 @@ function mapPoints(parent) {
 }
 
 /* istanbul ignore next */
-function mapImage(image, useWebp = false, width, height, quality = 100, transform = 'fit') {
+function mapImage(image, useWebp, width, height, quality, transform, useDAT) {
     if (Array.isArray(image)) {
         image = image[0]
     }
+    useWebp = !!useWebp
+    quality = quality || 100
+    transform = transform || 'fit'
+    useDAT = !!useDAT
+
     if ((image || {}).type) {
         if (image.type === 'VIDEO') {
             const derivatives = image.derivatives || {}
@@ -527,7 +561,7 @@ function mapImage(image, useWebp = false, width, height, quality = 100, transfor
         let thumbnail = derivatives.thumbnail
         if (isSvg) {
             imgURL = derivatives.original
-        } else if (derivatives.transformBaseUrl) {
+        } else if (derivatives.transformBaseUrl && useDAT) {
             imgURL = thumbnail = `${derivatives.transformBaseUrl}${useWebp ? '.webp' : ''}`
             if (width || height) {
                 imgURL += `?quality=${quality}&io=transform:${transform}${width ? `,width:${width}` : ''}${height ? `,height:${height}` : ''}`
@@ -600,7 +634,7 @@ function mapProductDetails(productOrVariant) {
     const includedItems = productDetails.included_items
     const highlights = (productDetails.highlights || []).map((highlight) => ({
         iconUrl: !isNullOrEmpty(highlight.icon_bynder)
-            ? (mapImage(highlight.icon_bynder, true, 60, 60, 95) || {}).url
+            ? (mapImage(highlight.icon_bynder, true, 60, 60, 95, null, productOrVariant?.useDAT) || {}).url
             : (highlight.icon || {}).url,
         label: highlight.text
     }))
@@ -631,7 +665,7 @@ function featureImage(feature) {
 function mapFeatures(productOrVariant) {
     return ((productOrVariant || {}).features || []).map((feature = {}) => ({
         // eslint-disable-next-line no-nested-ternary
-        image: mapImage(featureImage(feature), true, null, 455, 95),
+        image: mapImage(featureImage(feature), true, null, 455, 95, null, productOrVariant?.useDAT),
         subtitle: feature.header,
         features: feature.features,
         backgroundColor: mapBrandStyle(feature, BACKGROUND_COLOR),
@@ -723,7 +757,7 @@ function mapBenefitsAndFeatures(productOrVariant) {
             : jsonBenefits
 
     return {
-        image: mapImage(benefitsMedia.image, true, null, 460, 95),
+        image: mapImage(benefitsMedia.image, true, null, 460, 95, null, productOrVariant?.useDAT),
         youTubeVideoId: benefitsMedia.youTubeVideoId,
         benefits: benefitsToMarkdown(legacyBenefits, jsonBenefits),
         backgroundColor: productOrVariant?.background_color,
@@ -746,8 +780,8 @@ function mapResults(productOrVariant) {
         },
         image: mapImage(
             (Array.isArray(results.image_or_video) &&
-                results.image_or_video.length > 0) ||
-                results.image, true, null, 460, 95
+                results.image_or_video.length > 0) ? results.image_or_video :
+                results.image, true, null, 460, 95, null, productOrVariant?.useDAT
         ),
         youTubeVideoId: results.youtube_video_id
     }
@@ -759,7 +793,7 @@ function mapSustainability(product) {
     const image = mapImage(
         Array.isArray(sustainability.image)
             ? sustainability.image[0]
-            : sustainability.image, true, null, 460, 95
+            : sustainability.image, true, null, 460, 95, null, product?.useDAT
     )
     const richText = sustainability.description
     const description = hasRichTextContent(richText)
@@ -769,7 +803,7 @@ function mapSustainability(product) {
         image: mapImage(
             Array.isArray(highlight.image)
                 ? highlight.image[0]
-                : highlight.image, true, 60, 60, 95
+                : highlight.image, true, 60, 60, 95, null, product?.useDAT
         ),
         description: hasRichTextContent(highlight.description)
             ? createMarkdown(highlight.description)
@@ -794,7 +828,7 @@ function mapUsage(productOrVariant, legacyUsage) {
         recommendations: decodeHTML(usage.recommendations),
         warnings: decodeHTML(usage.warnings),
         additionalText: usage.additional_text,
-        image: mapImage(usage.image_or_video || usage.image, true, null, 460, 95),
+        image: mapImage(usage.image_or_video || usage.image, true, null, 460, 95, null, productOrVariant?.useDAT),
         youTubeVideoId: usage.youtube_video_id,
         markdown: legacyUsage ? htmlToMarkdown(legacyUsage) : null
     }
@@ -857,13 +891,13 @@ function mapResources(productOrVariant) {
 }
 
 /* istanbul ignore next */
-function mapIngredients(ings, legacyIngredients) {
+function mapIngredients(ings, legacyIngredients, useDAT) {
     if (Array.isArray(ings)) {
         return ings.map((ingredients) => ({
             keyIngredients: ((ingredients || {}).key_ingredients || []).map(
                 (keyIngredient) => ({
                     image: !isNullOrEmpty(keyIngredient.icon_bynder)
-                        ? mapImage(keyIngredient.icon_bynder, true, 100, 100, 95)
+                        ? mapImage(keyIngredient.icon_bynder, true, 100, 100, 95, null, useDAT)
                         : {
                             url: (keyIngredient.icon || {}).url,
                             alt: (keyIngredient.icon || {}).title
@@ -875,7 +909,7 @@ function mapIngredients(ings, legacyIngredients) {
             nutritionInformationImage: !isNullOrEmpty(
                 (ingredients || {}).nutrition_information_image_bynder
             )
-                ? mapImage(ingredients.nutrition_information_image_bynder, true, null, 1200, 95)
+                ? mapImage(ingredients.nutrition_information_image_bynder, true, null, 1200, 95, null, useDAT)
                 : (ingredients || {}).nutrition_information_image
                     ? {
                         url: ingredients.nutrition_information_image.url,
@@ -901,7 +935,7 @@ function mapIngredients(ings, legacyIngredients) {
             {
                 keyIngredients: keyIngredients.map((keyIngredient) => ({
                     image: !isNullOrEmpty(keyIngredient.icon_bynder)
-                        ? mapImage(keyIngredient.icon_bynder, true, 100, 100, 95)
+                        ? mapImage(keyIngredient.icon_bynder, true, 100, 100, 95, null, useDAT)
                         : {
                             url: (keyIngredient.icon || {}).url,
                             alt: (keyIngredient.icon || {}).title
@@ -912,7 +946,7 @@ function mapIngredients(ings, legacyIngredients) {
                 nutritionInformationImage: !isNullOrEmpty(
                     (ings || {}).nutrition_information_image_bynder
                 )
-                    ? mapImage(ings.nutrition_information_image_bynder, true, null, 1200, 95)
+                    ? mapImage(ings.nutrition_information_image_bynder, true, null, 1200, 95, null, useDAT)
                     : (ings || {}).nutrition_information_image
                         ? {
                             url: ings.nutrition_information_image.url,
@@ -951,7 +985,7 @@ function mapSalesDisclaimer(salesDisclaimer) {
     }
 }
 
-function mapDisclaimerWarnings(disclaimerWarnings) {
+function mapDisclaimerWarnings(disclaimerWarnings, useDAT) {
     disclaimerWarnings = disclaimerWarnings || []
     return disclaimerWarnings
         .map((disclaimerWarning) => {
@@ -960,7 +994,7 @@ function mapDisclaimerWarnings(disclaimerWarnings) {
             if (!text && !hasRichTextContent(richText)) {
                 return null
             }
-            const icon = mapImage(disclaimerWarning.icon, true, 25, 25, 85)
+            const icon = mapImage(disclaimerWarning.icon, true, 25, 25, 85, null, useDAT)
             const boldText = disclaimerWarning.bold_text || ''
             const link = mapLink(disclaimerWarning.link)
             const markdownText = createMarkdown(richText, text, boldText, link)
@@ -1220,5 +1254,6 @@ module.exports = {
     mapFaqs,
     createMarkdownFromRTE,
     benefitsToMarkdown,
-    mapActiveEventDisclaimer
+    mapActiveEventDisclaimer,
+    getUseDATFromConfig
 }

package/src/transformBundle.js

@@ -22,14 +22,15 @@ const transformBundle = (parent, homeUrl) => ({
     salesLabel: parent?.sales_label,
     salesText: parent?.sales_text,
     features: {
-        image: helpers?.mapImage(parent?.features?.image, true, null, 455, 95),
+        image: helpers?.mapImage(parent?.features?.image, true, null, 455, 95, null, parent?.useDAT),
         subtitle: parent?.features?.header,
         features: parent?.features?.features,
         backgroundColor: parent?.features?.background_color
     },
     disclaimers: parent?.disclaimers || [],
     disclaimerWarnings: helpers?.mapDisclaimerWarnings(
-        parent?.disclaimer_warnings
+        parent?.disclaimer_warnings,
+        parent?.useDAT
     ),
     seoInformation: helpers?.mapSeoInformation(parent, homeUrl),
     resources: helpers?.mapResources(parent),