@graphcommerce/magento-category 9.1.0-canary.48 → 9.1.0-canary.50

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.1.0-canary.50
+
+### Patch Changes
+
+- [#2535](https://github.com/graphcommerce-org/graphcommerce/pull/2535) [`bb728e9`](https://github.com/graphcommerce-org/graphcommerce/commit/bb728e960d8beedc35aad0ab7f1f8ce214467bc1) - Fix bug where allName would not be translated when switching stores ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 9.1.0-canary.49
+
+### Patch Changes
+
+- [#2533](https://github.com/graphcommerce-org/graphcommerce/pull/2533) [`45c2fbb`](https://github.com/graphcommerce-org/graphcommerce/commit/45c2fbbed55e3ba42f1ecc45e80039977b6ffe7c) - Solve issue where in some cases a second ProductList query was made because the category used an `eq` filter instead of an `in` filter. ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.48
 
 ## 9.1.0-canary.47

package/components/CategoryChildren/CategoryChildren.tsx

@@ -25,7 +25,7 @@ export function CategoryChildren(props: CategoryChildrenProps) {
         ...params,
         currentPage: 0,
         url: category.url_path,
-        filters: { category_uid: { eq: category.uid } },
+        filters: { category_uid: { in: [category.uid] } },
       }),
       active: params.url === category.url_path,
     }),

package/components/CategoryHeroNav/CategoryHeroNav.tsx

@@ -94,7 +94,7 @@ export const CategoryHeroNav = React.memo<CategoryHeroNavProps>(
               color='textPrimary'
               href={productListLink({
                 url: category.url_path,
-                filters: { category_uid: { eq: category.uid } },
+                filters: { category_uid: { in: [category.uid] } },
                 sort: {},
               })}
               key={category.uid}

package/components/CategoryMeta/CategoryMeta.tsx

@@ -1,4 +1,4 @@
-import type { ProductListParams } from '@graphcommerce/magento-product'
+import { hasUserFilterActive, type ProductListParams } from '@graphcommerce/magento-product'
 import { PageMeta } from '@graphcommerce/magento-store'
 import type { PageMetaProps } from '@graphcommerce/next-ui'
 import { i18n } from '@lingui/core'
@@ -25,8 +25,7 @@ export function CategoryMeta(props: CategoryMetaProps) {
 
   if (params?.url && !canonical) canonical = `/${params.url}`
 
-  const anyFilterActive =
-    Object.keys(params?.filters ?? {}).filter((k) => k !== 'category_uid').length > 0
+  const anyFilterActive = hasUserFilterActive(params)
 
   const sortActive = params?.sort && Object.keys(params?.sort).length !== 0
   const limitAcitve = !!params?.pageSize

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-category",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.48",
+  "version": "9.1.0-canary.50",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,14 +12,15 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.48",
-    "@graphcommerce/framer-scroller": "^9.1.0-canary.48",
-    "@graphcommerce/graphql": "^9.1.0-canary.48",
-    "@graphcommerce/image": "^9.1.0-canary.48",
-    "@graphcommerce/magento-store": "^9.1.0-canary.48",
-    "@graphcommerce/next-ui": "^9.1.0-canary.48",
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.48",
-    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.48",
+    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.50",
+    "@graphcommerce/framer-scroller": "^9.1.0-canary.50",
+    "@graphcommerce/graphql": "^9.1.0-canary.50",
+    "@graphcommerce/image": "^9.1.0-canary.50",
+    "@graphcommerce/magento-product": "^9.1.0-canary.50",
+    "@graphcommerce/magento-store": "^9.1.0-canary.50",
+    "@graphcommerce/next-ui": "^9.1.0-canary.50",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.50",
+    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.50",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/utils/magentoMenuToNavigation.tsx

@@ -4,13 +4,15 @@ import type {
   NavigationNodeHref,
 } from '@graphcommerce/next-ui'
 import { NavigationNodeType, nonNullable } from '@graphcommerce/next-ui'
-import { i18n } from '@lingui/core'
+import { Trans } from '@lingui/macro'
 import type { MenuQueryFragment } from '../queries/MenuQueryFragment.gql'
 import type { NavigationItemFragment } from '../queries/NavigationItem.gql'
 
 type Item = NonNullable<NonNullable<NonNullable<MenuQueryFragment['menu']>['items']>[0]>
 
-export type MagentoNavigationItemProps = NavigationItemFragment
+export type MagentoNavigationItemProps = Omit<NavigationItemFragment, 'name'> & {
+  name?: React.ReactNode
+}
 
 function categoryToNav(
   props: Item | null | undefined,
@@ -21,7 +23,7 @@ function categoryToNav(
 
   if (!uid || include_in_menu !== 1 || !name) return undefined
 
-  const allName = i18n._(/* i18n */ 'All {name}', { name })
+  const allName = <Trans>All {name}</Trans>
   // If we've got children we make a button that navigates to childitems.
   if (children && children.length > 0) {
     const button: NavigationNodeButton = {