@graphcommerce/algolia-products 9.1.0-canary.34 → 9.1.0-canary.36

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphcommerce/algolia-products
 
+## 9.1.0-canary.36
+
+### Patch Changes
+
+- [`90e8850`](https://github.com/graphcommerce-org/graphcommerce/commit/90e885059b0203a8802e5ab753ac061b079ebcd6) - Support multiple currency displays from algolia ([@paales](https://github.com/paales))
+
+## 9.1.0-canary.35
+
 ## 9.1.0-canary.34
 
 ### Patch Changes

package/mesh/algoliaHitToMagentoProduct.ts

@@ -33,17 +33,21 @@ function mapPriceRange(
   price: AlgoliaProductHitAdditionalProperties['price'],
   storeConfig: GetStoreConfigReturn,
   customerGroup = 0,
+  currencyHeader?: string,
 ): PriceRange {
   if (!storeConfig?.default_display_currency_code) throw new Error('Currency is required')
 
-  const key = storeConfig.default_display_currency_code as keyof AlgoliaPrice
-  const currency = storeConfig.default_display_currency_code as CurrencyEnum
+  const curr = currencyHeader ?? storeConfig.default_display_currency_code
 
-  const maxRegular = price?.[key]?.default_max ?? 0
-  const maxFinal = price?.[key]?.[`group_${customerGroup}_max`] ?? price?.[key]?.default_max ?? 0
+  const key = curr as keyof AlgoliaPrice
+  const itemPrice = price?.[key] ?? price?.[storeConfig.default_display_currency_code]
+  const currency = (price?.[key] ? key : storeConfig.default_display_currency_code) as CurrencyEnum
 
-  const minRegular = price?.[key]?.default ?? 0
-  const minFinal = price?.[key]?.[`group_${customerGroup}`] ?? price?.[key]?.default
+  const maxRegular = itemPrice?.default_max ?? 0
+  const maxFinal = itemPrice?.[`group_${customerGroup}_max`] ?? itemPrice?.default_max ?? 0
+
+  const minRegular = itemPrice?.default_max ?? 0
+  const minFinal = itemPrice?.[`group_${customerGroup}`] ?? itemPrice?.default
 
   return {
     maximum_price: {
@@ -65,7 +69,7 @@ function mapPriceRange(
     minimum_price: {
       regular_price: {
         currency,
-        value: price?.[key]?.default,
+        value: minRegular,
       },
       final_price: {
         currency,
@@ -145,6 +149,7 @@ export function algoliaHitToMagentoProduct(
   hit: Algoliahit,
   storeConfig: GetStoreConfigReturn,
   customerGroup: number,
+  currency: string | undefined,
 ): (ProductsItemsItem & { staged: boolean }) | null {
   const { objectID, additionalProperties } = hit
   if (!assertAdditional(additionalProperties)) return null
@@ -180,7 +185,7 @@ export function algoliaHitToMagentoProduct(
     uid: btoa(objectID),
     id: Number(objectID),
     sku: Array.isArray(sku) ? sku[0] : `${sku}`,
-    price_range: mapPriceRange(price, storeConfig, customerGroup),
+    price_range: mapPriceRange(price, storeConfig, customerGroup, currency),
     created_at: created_at ? new Date(created_at).toISOString() : null,
     stock_status: is_stock ? 'IN_STOCK' : 'OUT_OF_STOCK',
     review_count: 0,

package/mesh/getCurrency.ts

@@ -0,0 +1,7 @@
+import type { MeshContext } from '@graphcommerce/graphql-mesh'
+
+export function getCurrencyHeader(context: MeshContext) {
+  return (context as MeshContext & { headers: Record<string, string | undefined> }).headers?.[
+    'content-currency'
+  ]
+}

package/mesh/getSortedIndex.ts

@@ -25,7 +25,7 @@ export async function getSortedIndex(
 
   if (candidates.length === 0) {
     console.warn(
-      `[@graphcommerce/algolia-products] WARNING: Expecting virtual replica but couldn't find the expected index for attr ${attr} with ${dir}, please add to the Algolia settings in the Magento Admin Panel. Falling back to baseIndex.`,
+      `[@graphcommerce/algolia-products] WARNING: Expecting virtual replica but couldn't find the expected index for attr ${attr} with ${dir}, please add to the Algolia settings in the Magento Admin Panel. Falling back to baseIndex: ${baseIndex}.`,
     )
     return baseIndex
   }

package/mesh/resolvers.ts

@@ -1,4 +1,4 @@
-import type { AlgoliasearchResponse, Resolvers } from '@graphcommerce/graphql-mesh'
+import type { AlgoliasearchResponse, MeshContext, Resolvers } from '@graphcommerce/graphql-mesh'
 import { hasSelectionSetPath } from '@graphcommerce/graphql-mesh'
 import type { GraphQLError, GraphQLResolveInfo } from 'graphql'
 import { algoliaFacetsToAggregations, getCategoryList } from './algoliaFacetsToAggregations'
@@ -6,6 +6,7 @@ import type { ProductsItemsItem } from './algoliaHitToMagentoProduct'
 import { algoliaHitToMagentoProduct } from './algoliaHitToMagentoProduct'
 import { getAlgoliaSettings } from './getAlgoliaSettings'
 import { getAttributeList } from './getAttributeList'
+import { getCurrencyHeader } from './getCurrency'
 import { getFilterTypes } from './getFilterTypes'
 import { getGroupId } from './getGroupId'
 import { getIndexName } from './getIndexName'
@@ -92,9 +93,15 @@ export const resolvers: Resolvers = {
       const items: (ProductsItemsItem | null)[] = []
 
       const config = await getStoreConfig(context)
+
       for (const hit of root.algoliaSearchResults.hits) {
         if (hit?.objectID) {
-          const product = algoliaHitToMagentoProduct(hit, config, getGroupId(context))
+          const product = algoliaHitToMagentoProduct(
+            hit,
+            config,
+            getGroupId(context),
+            getCurrencyHeader(context),
+          )
           items.push(product)
         }
       }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/algolia-products",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.34",
+  "version": "9.1.0-canary.36",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -15,14 +15,14 @@
     "generate": "tsx scripts/generate-spec.mts"
   },
   "peerDependencies": {
-    "@graphcommerce/google-datalayer": "^9.1.0-canary.34",
-    "@graphcommerce/graphql": "^9.1.0-canary.34",
-    "@graphcommerce/graphql-mesh": "^9.1.0-canary.34",
-    "@graphcommerce/magento-customer": "^9.1.0-canary.34",
-    "@graphcommerce/magento-product": "^9.1.0-canary.34",
-    "@graphcommerce/magento-search": "^9.1.0-canary.34",
-    "@graphcommerce/next-config": "^9.1.0-canary.34",
-    "@graphcommerce/next-ui": "^9.1.0-canary.34",
+    "@graphcommerce/google-datalayer": "^9.1.0-canary.36",
+    "@graphcommerce/graphql": "^9.1.0-canary.36",
+    "@graphcommerce/graphql-mesh": "^9.1.0-canary.36",
+    "@graphcommerce/magento-customer": "^9.1.0-canary.36",
+    "@graphcommerce/magento-product": "^9.1.0-canary.36",
+    "@graphcommerce/magento-search": "^9.1.0-canary.36",
+    "@graphcommerce/next-config": "^9.1.0-canary.36",
+    "@graphcommerce/next-ui": "^9.1.0-canary.36",
     "react": "^18.2.0"
   },
   "devDependencies": {