@graphcommerce/magento-category 4.3.1 → 4.4.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 4.4.0
+
+### Minor Changes
+
+- [#1591](https://github.com/graphcommerce-org/graphcommerce/pull/1591) [`eee08c956`](https://github.com/graphcommerce-org/graphcommerce/commit/eee08c956fbcc4fe8d915b6fa8b399dafca69acd) Thanks [@ErwinOtten](https://github.com/ErwinOtten)! - Remove need for rootCategory query
+
+* [#1591](https://github.com/graphcommerce-org/graphcommerce/pull/1591) [`79f057889`](https://github.com/graphcommerce-org/graphcommerce/commit/79f057889847c61d75db7f567fd6575a57cf1022) Thanks [@ErwinOtten](https://github.com/ErwinOtten)! - Remove need for query rootCategory
+
+### Patch Changes
+
+- [#1596](https://github.com/graphcommerce-org/graphcommerce/pull/1596) [`3a619b70d`](https://github.com/graphcommerce-org/graphcommerce/commit/3a619b70d082804b8de46a8e8232f9431479a8b7) Thanks [@paales](https://github.com/paales)! - Make sure the canonical of a page doesn’t contain a double forward slash
+
+- Updated dependencies [[`43822fd61`](https://github.com/graphcommerce-org/graphcommerce/commit/43822fd61c949215b8ddce9fb37d09f29b638426), [`3a619b70d`](https://github.com/graphcommerce-org/graphcommerce/commit/3a619b70d082804b8de46a8e8232f9431479a8b7)]:
+  - @graphcommerce/next-ui@4.20.0
+  - @graphcommerce/framer-scroller@2.1.31
+  - @graphcommerce/magento-product@4.4.24
+  - @graphcommerce/magento-store@4.2.26
+
 ## 4.3.1
 
 ### Patch Changes

package/hooks/useMagentoMenuToNavigation.ts

@@ -13,7 +13,7 @@ export function categoryToNav(props: Item | null | undefined): NavigationNode |
   if (!props) return undefined
   const { uid, children, include_in_menu, name, url_path } = props
 
-  if (!uid || include_in_menu !== 1 || !url_path || !name) return undefined
+  if (!uid || include_in_menu !== 1 || !name) return undefined
 
   // If we've got children we make a button that navigates to childitems.
   if (children && children.length > 0) {
@@ -21,7 +21,15 @@ export function categoryToNav(props: Item | null | undefined): NavigationNode |
       name,
       id: uid,
       childItems: [
-        { name: i18n._(/* i18n */ 'All {name}', { name }), href: `/${url_path}`, id: `${uid}-all` },
+        ...(url_path
+          ? [
+              {
+                name: i18n._(/* i18n */ 'All {name}', { name }),
+                href: `/${url_path}`,
+                id: `${uid}-all`,
+              },
+            ]
+          : []),
         ...children.map(categoryToNav).filter(nonNullable),
       ],
     } as NavigationNodeButton
@@ -35,6 +43,8 @@ export function categoryToNav(props: Item | null | undefined): NavigationNode |
  * Converts the Magento GraphQL category tree to a NavigationNode tree, which can be used in the
  * Navigation component.
  */
-export function useMagentoMenuToNavigation(menu: MenuQueryFragment['menu']) {
-  return (menu?.items ?? []).map(categoryToNav).filter(nonNullable)
+export function useMagentoMenuToNavigation(menu: MenuQueryFragment['menu'], includeRoot: boolean) {
+  return ((includeRoot ? menu?.items : menu?.items?.[0]?.children) || [])
+    .map(categoryToNav)
+    .filter(nonNullable)
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-category",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -19,12 +19,12 @@
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/framer-scroller": "2.1.30",
+    "@graphcommerce/framer-scroller": "2.1.31",
     "@graphcommerce/graphql": "3.4.5",
     "@graphcommerce/image": "3.1.7",
-    "@graphcommerce/magento-product": "4.4.23",
-    "@graphcommerce/magento-store": "4.2.25",
-    "@graphcommerce/next-ui": "4.19.0"
+    "@graphcommerce/magento-product": "4.4.24",
+    "@graphcommerce/magento-store": "4.2.26",
+    "@graphcommerce/next-ui": "4.20.0"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",

package/queries/GetCategoryStaticPaths.graphql

@@ -1,5 +1,5 @@
-query GetCategoryStaticPaths($rootCategory: String!) {
-  categories(filters: { parent_category_uid: { eq: $rootCategory } }) {
+query GetCategoryStaticPaths {
+  categories {
     items {
       uid
       url_path

package/queries/MenuQueryFragment.graphql

@@ -1,6 +1,7 @@
 fragment MenuQueryFragment on Query {
-  menu: categories(filters: { parent_category_uid: { eq: $rootCategory } }) {
+  menu: categories {
     items {
+      uid
       ...NavigationItem
       children {
         uid
@@ -8,6 +9,10 @@ fragment MenuQueryFragment on Query {
         children {
           uid
           ...NavigationItem
+          children {
+            uid
+            ...NavigationItem
+          }
         }
       }
     }

package/queries/getCategoryStaticPaths.ts

@@ -12,12 +12,8 @@ const getCategoryStaticPaths = async (
   client: ApolloClient<NormalizedCacheObject>,
   locale: string,
 ) => {
-  const rootCategory =
-    (await client.query({ query: StoreConfigDocument })).data.storeConfig?.root_category_uid ?? ''
-
   const { data } = await client.query({
     query: GetCategoryStaticPathsDocument,
-    variables: { rootCategory },
   })
 
   const paths: StaticPathsResult['paths'] = []