@graphcommerce/magento-cart 4.3.4 → 4.4.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Change Log
 
+## 4.4.1
+
+### Patch Changes
+
+- [#1499](https://github.com/graphcommerce-org/graphcommerce/pull/1499) [`d205b037f`](https://github.com/graphcommerce-org/graphcommerce/commit/d205b037fee82b8c03993f2c586f477e826093bf) Thanks [@paales](https://github.com/paales)! - Unified and simplified the customer authentication error handling
+
+- Updated dependencies [[`d205b037f`](https://github.com/graphcommerce-org/graphcommerce/commit/d205b037fee82b8c03993f2c586f477e826093bf)]:
+  - @graphcommerce/magento-customer@4.5.1
+
+## 4.4.0
+
+### Minor Changes
+
+- [#1492](https://github.com/graphcommerce-org/graphcommerce/pull/1492) [`bed806ddd`](https://github.com/graphcommerce-org/graphcommerce/commit/bed806dddd7e025806a69798ef9587aa165d392f) Thanks [@mikekeehnen](https://github.com/mikekeehnen)! - Removed useExtractCustomerErrors hook and implemented error handling via HttpLink Error
+
+### Patch Changes
+
+- Updated dependencies [[`ffec8800a`](https://github.com/graphcommerce-org/graphcommerce/commit/ffec8800a50ff2fe9b9fc5feeb5a0a878b573f0e), [`bed806ddd`](https://github.com/graphcommerce-org/graphcommerce/commit/bed806dddd7e025806a69798ef9587aa165d392f)]:
+  - @graphcommerce/react-hook-form@3.2.1
+  - @graphcommerce/graphql@3.2.0
+  - @graphcommerce/magento-customer@4.5.0
+  - @graphcommerce/ecommerce-ui@1.0.17
+  - @graphcommerce/magento-graphql@3.0.13
+  - @graphcommerce/magento-store@4.2.8
+
 ## 4.3.4
 
 ### Patch Changes

package/components/ApolloCartError/ApolloCartErrorAlert.tsx

@@ -1,46 +1,32 @@
-import { ApolloErrorAlert, ApolloErrorAlertProps } from '@graphcommerce/ecommerce-ui'
-import { useCustomerSession } from '@graphcommerce/magento-customer'
+import {
+  ApolloCustomerErrorAlert,
+  ApolloCustomerErrorAlertProps,
+} from '@graphcommerce/magento-customer'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
-import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
-import Link from 'next/link'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
-export type ApolloCartErrorAlertProps = ApolloErrorAlertProps
+export type ApolloCartErrorAlertProps = ApolloCustomerErrorAlertProps
 
 export function ApolloCartErrorAlert(props: ApolloCartErrorAlertProps) {
-  const { error } = props
+  const { error, graphqlErrorAlertProps } = props
   const clear = useClearCurrentCartId()
-  const { token } = useCustomerSession()
-
-  let action: JSX.Element | undefined
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  action = noSuchEntity ? (
-    <Button onClick={clear}>
-      <Trans id='Reset Cart' />
-    </Button>
-  ) : undefined
-
-  const [, authorizationError] = graphqlErrorByCategory({
-    category: 'graphql-authorization',
-    error,
-    mask: token
-      ? i18n._(/* i18n */ `Please reauthenticate and try again`)
-      : i18n._(/* i18n */ `You must sign in to continue`),
-  })
-
-  action =
-    authorizationError && clear ? (
-      <Link href='/account/signin' passHref>
-        <Button>
-          <Trans id='Sign in' />
-        </Button>
-      </Link>
-    ) : (
-      action
-    )
 
-  return <ApolloErrorAlert {...props} graphqlErrorAlertProps={{ action }} />
+  return (
+    <ApolloCustomerErrorAlert
+      {...props}
+      graphqlErrorAlertProps={{
+        action: noSuchEntity ? (
+          <Button onClick={clear}>
+            <Trans id='Reset Cart' />
+          </Button>
+        ) : (
+          graphqlErrorAlertProps?.action
+        ),
+      }}
+    />
+  )
 }

package/components/ApolloCartError/ApolloCartErrorFullPage.tsx

@@ -1,29 +1,34 @@
-import { ApolloErrorFullPage, ApolloErrorFullPageProps } from '@graphcommerce/ecommerce-ui'
+import {
+  ApolloCustomerErrorFullPage,
+  ApolloCustomerErrorFullPageProps,
+} from '@graphcommerce/magento-customer'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { iconSadFace, IconSvg } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
-export type ApolloCartErrorFullPageProps = Omit<ApolloErrorFullPageProps, 'icon'>
+export type ApolloCartErrorFullPageProps = Omit<ApolloCustomerErrorFullPageProps, 'icon'>
 
 export function ApolloCartErrorFullPage(props: ApolloCartErrorFullPageProps) {
-  const { error, ...passedProps } = props
+  const { error, button } = props
   const clear = useClearCurrentCartId()
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  const action = noSuchEntity ? (
-    <Button onClick={clear}>
-      <Trans id='Reset Cart' />
-    </Button>
-  ) : undefined
 
   return (
-    <ApolloErrorFullPage
-      error={error}
+    <ApolloCustomerErrorFullPage
+      {...props}
       icon={<IconSvg src={iconSadFace} size='xxl' />}
-      button={action}
-      {...passedProps}
+      button={
+        noSuchEntity ? (
+          <Button onClick={clear}>
+            <Trans id='Reset Cart' />
+          </Button>
+        ) : (
+          button
+        )
+      }
     />
   )
 }

package/components/ApolloCartError/ApolloCartErrorSnackbar.tsx

@@ -1,22 +1,32 @@
-import { ApolloErrorSnackbarProps, ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
+import {
+  ApolloCustomerErrorSnackbar,
+  ApolloCustomerErrorSnackbarProps,
+} from '@graphcommerce/magento-customer'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
-import React from 'react'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
-export type ApolloCartErrorSnackbarProps = Omit<ApolloErrorSnackbarProps, 'action'>
+export type ApolloCartErrorSnackbarProps = ApolloCustomerErrorSnackbarProps
 
 export function ApolloCartErrorSnackbar(props: ApolloCartErrorSnackbarProps) {
-  const { error, ...passedProps } = props
+  const { error, action } = props
   const clear = useClearCurrentCartId()
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  const action = noSuchEntity ? (
-    <Button onClick={clear} variant='pill' color='secondary'>
-      <Trans id='Reset Cart' />
-    </Button>
-  ) : undefined
 
-  return <ApolloErrorSnackbar error={error} action={action} {...passedProps} />
+  return (
+    <ApolloCustomerErrorSnackbar
+      {...props}
+      action={
+        noSuchEntity ? (
+          <Button onClick={clear} variant='pill' color='secondary'>
+            <Trans id='Reset Cart' />
+          </Button>
+        ) : (
+          action
+        )
+      }
+    />
+  )
 }

package/hooks/useMergeCustomerCart.ts

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from '@graphcommerce/graphql'
-import { useCustomerSession, useExtractCustomerErrors } from '@graphcommerce/magento-customer'
+import { useCustomerSession } from '@graphcommerce/magento-customer'
 import { useEffect } from 'react'
 import { CustomerCartDocument } from './CustomerCart.gql'
 import { UseMergeCustomerCartDocument } from './UseMergeCustomerCart.gql'
@@ -15,9 +15,8 @@ import { useCurrentCartId } from './useCurrentCartId'
 export function useMergeCustomerCart() {
   const sourceCartId = useCurrentCartId()
   const assignCurrentCartId = useAssignCurrentCartId()
-  const [merge, { error }] = useMutation(UseMergeCustomerCartDocument, { errorPolicy: 'all' })
+  const [merge] = useMutation(UseMergeCustomerCartDocument, { errorPolicy: 'all' })
 
-  useExtractCustomerErrors({ error })
   const { loggedIn } = useCustomerSession()
   const destinationCartId = useQuery(CustomerCartDocument, {
     skip: !loggedIn,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.3.4",
+  "version": "4.4.1",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -18,16 +18,16 @@
     "@playwright/test": "^1.21.1"
   },
   "dependencies": {
-    "@graphcommerce/ecommerce-ui": "1.0.16",
+    "@graphcommerce/ecommerce-ui": "1.0.17",
     "@graphcommerce/framer-next-pages": "3.2.2",
     "@graphcommerce/framer-scroller": "2.1.14",
-    "@graphcommerce/graphql": "3.1.3",
+    "@graphcommerce/graphql": "3.2.0",
     "@graphcommerce/image": "3.1.6",
-    "@graphcommerce/magento-customer": "4.4.2",
-    "@graphcommerce/magento-graphql": "3.0.12",
-    "@graphcommerce/magento-store": "4.2.7",
+    "@graphcommerce/magento-customer": "4.5.1",
+    "@graphcommerce/magento-graphql": "3.0.13",
+    "@graphcommerce/magento-store": "4.2.8",
     "@graphcommerce/next-ui": "4.8.3",
-    "@graphcommerce/react-hook-form": "3.2.0"
+    "@graphcommerce/react-hook-form": "3.2.1"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",