Merge pull request #31 from adobe-rnd/price-undef

fix: handle null prices on complex product

Author: maxakuru

src/content/queries/cs-product.js

@@ -17,10 +17,14 @@ import { gql } from '../../utils/product.js';
  * @returns {Product}
  */
 export const adapter = (productData) => {
-  const minPrice = productData.priceRange?.minimum ?? productData.price;
-  const maxPrice = productData.priceRange?.maximum ?? productData.price;
+  let minPrice = productData.priceRange?.minimum ?? productData.price;
+  let maxPrice = productData.priceRange?.maximum ?? productData.price;
 
-  console.debug('[cs-product] minPrice, maxPrice: ', minPrice, maxPrice);
+  if (minPrice == null) {
+    minPrice = maxPrice;
+  } else if (maxPrice == null) {
+    maxPrice = minPrice;
+  }
 
   /** @type {Product} */
   const product = {
@@ -65,7 +69,7 @@ export const adapter = (productData) => {
         isDefault: value.isDefault,
       })),
     })),
-    prices: {
+    prices: (minPrice && maxPrice) ? {
       regular: {
         // TODO: determine whether to use min or max
         amount: minPrice.regular.amount.value,
@@ -83,7 +87,7 @@ export const adapter = (productData) => {
         // TODO: add variant?
       },
       visible: minPrice.roles?.includes('visible'),
-    },
+    } : null,
   };
 
   return product;

src/content/queries/cs-variants.js

@@ -20,8 +20,6 @@ export const adapter = (variants) => variants.map(({ selections, product }) => {
   const minPrice = product.priceRange?.minimum ?? product.price;
   const maxPrice = product.priceRange?.maximum ?? product.price;
 
-  console.debug('[cs-variant] minPrice, maxPrice: ', minPrice, maxPrice);
-
   /** @type {Variant} */
   const variant = {
     name: product.name,

src/templates/html.js

@@ -155,24 +155,26 @@ ${v.images?.map((img) => `\
                 </picture>`).join('\n')}
               </div>
               <div>${v.selections?.join(', ')}</div>
-            </div>`).join('\n')};
+            </div>`).join('\n')}
           </div>
-        <div class="variant-attributes">
-          ${variants?.map((v) => `\
+
+          <div class="variant-attributes">
+${variants?.map((v) => `\
             <div>
               <div>sku</div>
               <div>${v.sku}</div>
               <div></div>
               <div></div>
             </div>
-            ${v.attributes?.map((attribute) => `\
+${v.attributes?.map((attribute) => `\
               <div>
                 <div>attribute</div>
                 <div>${attribute.name}</div>
                 <div>${attribute.label}</div>
                 <div>${attribute.value}</div>
               </div>`).join('\n')}`).join('\n')}
           </div>
+        </div>
       </main>
       <footer></footer>
     </body>

src/templates/json-ld.js

@@ -44,15 +44,15 @@ export default (product, variants) => {
     image,
     productID: sku,
     offers: [
-      {
+      prices ? ({
         '@type': 'Offer',
         sku,
         url,
         image,
         availability: inStock ? 'InStock' : 'OutOfStock',
         price: prices?.final?.amount,
         priceCurrency: prices?.final?.currency,
-      },
+      }) : undefined,
       ...variants.map((v) => ({
         '@type': 'Offer',
         sku: v.sku,
@@ -62,7 +62,7 @@ export default (product, variants) => {
         price: v.prices?.final?.amount,
         priceCurrency: v.prices?.final?.currency,
 
-      })),
+      })).filter(Boolean),
     ],
     ...(brandName
       ? {