Merge pull request #2184 from graphcommerce-org/fix/cart-recreation-p…

…revention

When a customer would return from a payment gateway and it would erroneously query the cart GraphCommerce would immediately create a new empty cart while it shouldn't.

.changeset/brown-apricots-hide.md

@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-cart": patch
+---
+
+When a customer would return from a payment gateway and it would erroneously query the cart GraphCommerce would immediately create a new empty cart while it shouldn't.

examples/magento-graphcms/pages/checkout/payment.tsx

@@ -58,7 +58,7 @@ function PaymentPage() {
         }
       >
         {billingPage.error && <ApolloCartErrorFullPage error={billingPage.error} />}
-        {!cartExists && <EmptyCart />}
+        {!billingPage.error && !cartExists && <EmptyCart />}
         {cartExists && !billingPage.error && (
           <>
             <LayoutHeader

packages/magento-cart/link/createCartErrorLink.ts

@@ -49,6 +49,11 @@ export const cartErrorLink = onError(({ graphQLErrors, operation, forward }) =>
 
   if (!cartErr) return undefined
 
+  if (globalThis.location?.search) {
+    const urlParams = new URLSearchParams(window.location.search)
+    if (urlParams.get('cart_id')) return forward(operation)
+  }
+
   return fromPromise(client?.mutate({ mutation: CreateEmptyCartDocument }))
     .filter((value) => Boolean(value))
     .flatMap((cartData) => {