Merge branch 'canary' into feature/gallery-thumbnails-with-hover

graphcommerce-org · Nov 8, 2023 · 3bd5b73 · 3bd5b73
2 parents 7a644dc + bd36fc0
commit 3bd5b73
Show file tree

Hide file tree

Showing 166 changed files with 1,321 additions and 1,111 deletions.
diff --git a/.changeset/curvy-hairs-suffer.md b/.changeset/curvy-hairs-suffer.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-customer': patch
+---
+
+Update OrderDetails and styling
diff --git a/.changeset/friendly-dogs-shop.md b/.changeset/friendly-dogs-shop.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/docs': minor
+---
+
+Split off Magento known issues to separate page
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -78,7 +78,9 @@
   "changesets": [
     "brown-planes-retire",
     "curvy-grapes-accept",
+    "curvy-hairs-suffer",
     "forty-rocks-bow",
+    "friendly-dogs-shop",
     "friendly-islands-cough",
     "fuzzy-clocks-hug",
     "itchy-snakes-film",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 7.1.0-canary.32
+
+## 7.1.0-canary.31
+
+### Minor Changes
+
+- [#2106](https://github.com/graphcommerce-org/graphcommerce/pull/2106) [`9f8c3cac2`](https://github.com/graphcommerce-org/graphcommerce/commit/9f8c3cac214006315055f37cf8d4a783eb99a7ec) - Split off Magento known issues to separate page ([@hnsr](https://github.com/hnsr))
+
 ## 7.1.0-canary.30
 
 ## 7.1.0-canary.29

diff --git a/docs/magento/known-issues.md b/docs/magento/known-issues.md
@@ -0,0 +1,54 @@
+---
+menu: Known issues
+---
+
+# Known issues
+
+An overview of bugs and limitations you may run into with Magento's GraphQL API:
+
+## Cart-related mutations result in `Can not find cart with ID` or `Cart isn't active` errors
+
+Affected Magento versions:
+
+- `2.4.7`: only `2.4.7-beta1`
+- `2.4.6`: all versions
+
+This is caused by a regression which results in some GraphQL errors no longer
+getting a category extension string (such as `graphql-no-such-entity`).
+Normally, these errors are handling by automatically creating a new cart, but
+without the proper error category this error-handling logic is nog triggered.
+
+As a workaround, you can apply
+[cart-error-category.patch](./patches/cart-error-category.patch).
+
+See also
+https://github.com/magento/magento2/commit/49cbe774020d3dfa6ee2b8702376a947801c9971
+
+## Customer is forced to sign up, even if already registered
+
+Affected Magento versions:
+
+- `2.4.7` and all future release series
+- `2.4.6`: `2.4.6-p1` and up
+- `2.4.5`: `2.4.5-p3` and up
+- `2.4.4`: `2.4.4-p4` and up
+
+During customer login, GraphCommerce queries Magento to determine whether the
+customer account already exists or not. If not, the sign-up form is shown
+instead.
+
+In affected Magento versions, the behavior of the `isEmailAvailable` query that
+is used to do this was made dependent on the `Enable Guest Checkout Login`
+configuration setting. If disabled, this query will always return `true`,
+resulting in the sign-up form always being shown, even if the customer already
+exists.
+
+To solve this, the following setting must be set to `Yes`:
+`Stores -> Configuration -> Sales -> Checkout -> Checkout Options -> Enable Guest Checkout Login`
+
+See also
+https://developer.adobe.com/commerce/php/development/backward-incompatible-changes/highlights/#isemailavailable-api
+
+## Next steps
+
+- [Overview](./readme)
diff --git a/docs/magento/readme.md b/docs/magento/readme.md
@@ -7,6 +7,12 @@ menu: Overview
 To integrate with Magento, most of the functionality should work out-of-the box
 if Magento exposes a working GraphQL API.
 
+Some additional configuration may be required, which is documented below.
+
+Currently, the GraphQL API also has some bugs and limitations which in some
+cases requires a patch to work around, please see
+[Known issues](./known-issues.md)
+
 ## Magento configuration
 
 ### Configure Base Link Url to get emails working
@@ -64,16 +70,6 @@ Remove the URL suffixes from products and categories. (default is `.html`)
 `Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -> Product URL Suffix`
 `Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -> Category URL Suffix`
 
-### Enable guest checkout login
-
-During customer login, GraphCommerce queries Magento to determine whether the
-customer account already exists. To do this the following setting must be set to
-Yes:
-`Stores -> Configuration -> Sales -> Checkout -> Checkout Options -> Enable Guest Checkout Login`
-
-If this is not set correctly, customers will not be able to log in, since they
-will always be prompted to create a new account.
-
 ## Optional packages
 
 - [Store Pickup / MSI](https://github.com/graphcommerce-org/graphcommerce/tree/main/packages/magento-cart-pickup)
@@ -92,22 +88,4 @@ will always be prompted to create a new account.
 
 - [Full feature list](../feature-list.md)
 - [SEO Migration](./seo-migration.md)
-
-## Known issues
-
-An overview of bugs and limitations you may run into with Magento's GraphQL API:
-
-### Cart-related mutations result `Can not find cart with ID` or `Cart isn't active` errors
-
-This is caused by a regression in Magento 2.4.6, which results in some GraphQL
-errors no longer getting a category extension string (such as
-`graphql-no-such-entity`). Normally, these errors are handling by automatically
-creating a new cart, but without the proper error category this error-handling
-logic is nog triggered.
-
-As a workaround, you can apply
-[cart-error-category.patch](./patches/cart-error-category.patch). This
-regression is fixed as of Magento 2.4.7-beta2.
-
-See also
-https://github.com/magento/magento2/commit/49cbe774020d3dfa6ee2b8702376a947801c9971
+- [Known issues](./known-issues.md)
diff --git a/docs/package.json b/docs/package.json
@@ -2,10 +2,10 @@
   "name": "@graphcommerce/docs",
   "homepage": "https://www.graphcommerce.org/docs",
   "repository": "github:graphcommerce-org/graphcommerce/docs",
-  "version": "7.1.0-canary.30",
+  "version": "7.1.0-canary.32",
   "sideEffects": true,
   "devDependencies": {
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.30"
+    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.32"
   },
   "prettier": "@graphcommerce/prettier-config-pwa"
 }
diff --git a/examples/magento-graphcms/CHANGELOG.md b/examples/magento-graphcms/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 7.1.0-canary.32
+
+## 7.1.0-canary.31
+
 ## 7.1.0-canary.30
 
 ## 7.1.0-canary.29

diff --git a/examples/magento-graphcms/locales/de.po b/examples/magento-graphcms/locales/de.po
@@ -418,6 +418,9 @@ msgstr "Bestellung #{orderId}"
 msgid "Order before 22:00"
 msgstr "Bestellen Sie vor 22:00 Uhr"
 
+msgid "Order date"
+msgstr "Auftragsdatum"
+
 msgid "Order not found"
 msgstr "Bestellung nicht gefunden"
 

diff --git a/examples/magento-graphcms/locales/en.po b/examples/magento-graphcms/locales/en.po
@@ -418,6 +418,9 @@ msgstr "Order #{orderId}"
 msgid "Order before 22:00"
 msgstr "Order before 22:00"
 
+msgid "Order date"
+msgstr "Order date"
+
 msgid "Order not found"
 msgstr "Order not found"
 

diff --git a/examples/magento-graphcms/locales/es.po b/examples/magento-graphcms/locales/es.po
@@ -418,8 +418,11 @@ msgstr "Pedido #{orderId}"
 msgid "Order before 22:00"
 msgstr "Pedido antes de las 22:00"
 
+msgid "Order date"
+msgstr "Besteldatum"
+
 msgid "Order not found"
-msgstr "Pedido no encontrado"
+msgstr "fecha de orden"
 
 msgid "Order number"
 msgstr "Número de pedido"

diff --git a/examples/magento-graphcms/locales/fr.po b/examples/magento-graphcms/locales/fr.po
@@ -418,6 +418,9 @@ msgstr "Commande #{orderId}"
 msgid "Order before 22:00"
 msgstr "Commandez avant 22:00"
 
+msgid "Order date"
+msgstr "Date de commande"
+
 msgid "Order not found"
 msgstr "Commande non trouvée"
 

diff --git a/examples/magento-graphcms/locales/it.po b/examples/magento-graphcms/locales/it.po
@@ -418,6 +418,9 @@ msgstr "Ordine #{orderId}"
 msgid "Order before 22:00"
 msgstr "Ordina prima delle 22:00"
 
+msgid "Order date"
+msgstr "data dell'ordine"
+
 msgid "Order not found"
 msgstr "Ordine non trovato"
 

diff --git a/examples/magento-graphcms/locales/nl.po b/examples/magento-graphcms/locales/nl.po
@@ -418,6 +418,9 @@ msgstr "Bestelling #{orderId}"
 msgid "Order before 22:00"
 msgstr "Bestel voor 22:00"
 
+msgid "Order date"
+msgstr "Besteldatum"
+
 msgid "Order not found"
 msgstr "Bestelling niet gevonden"
 

diff --git a/examples/magento-graphcms/package.json b/examples/magento-graphcms/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-graphcms",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "7.1.0-canary.30",
+  "version": "7.1.0-canary.32",
   "private": true,
   "sideEffects": false,
   "engines": {
@@ -20,51 +20,51 @@
   },
   "dependencies": {
     "@ducanh2912/next-pwa": "9.5.0",
-    "@graphcommerce/cli": "7.1.0-canary.30",
-    "@graphcommerce/demo-magento-graphcommerce": "7.1.0-canary.30",
-    "@graphcommerce/ecommerce-ui": "7.1.0-canary.30",
-    "@graphcommerce/framer-next-pages": "7.1.0-canary.30",
-    "@graphcommerce/framer-scroller": "7.1.0-canary.30",
-    "@graphcommerce/framer-utils": "7.1.0-canary.30",
-    "@graphcommerce/googleanalytics": "7.1.0-canary.30",
-    "@graphcommerce/googlerecaptcha": "7.1.0-canary.30",
-    "@graphcommerce/googletagmanager": "7.1.0-canary.30",
-    "@graphcommerce/graphcms-ui": "7.1.0-canary.30",
-    "@graphcommerce/graphql": "7.1.0-canary.30",
-    "@graphcommerce/graphql-mesh": "7.1.0-canary.30",
-    "@graphcommerce/hygraph-cli": "7.1.0-canary.30",
-    "@graphcommerce/hygraph-dynamic-rows": "7.1.0-canary.30",
-    "@graphcommerce/image": "7.1.0-canary.30",
-    "@graphcommerce/lingui-next": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-billing-address": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-checkout": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-coupon": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-email": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-items": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-payment-method": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-shipping-address": "7.1.0-canary.30",
-    "@graphcommerce/magento-cart-shipping-method": "7.1.0-canary.30",
-    "@graphcommerce/magento-category": "7.1.0-canary.30",
-    "@graphcommerce/magento-cms": "7.1.0-canary.30",
-    "@graphcommerce/magento-compare": "7.1.0-canary.30",
-    "@graphcommerce/magento-customer": "7.1.0-canary.30",
-    "@graphcommerce/magento-graphql": "7.1.0-canary.30",
-    "@graphcommerce/magento-newsletter": "7.1.0-canary.30",
-    "@graphcommerce/magento-payment-included": "7.1.0-canary.30",
-    "@graphcommerce/magento-product": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-bundle": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-configurable": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-downloadable": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-grouped": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-simple": "7.1.0-canary.30",
-    "@graphcommerce/magento-product-virtual": "7.1.0-canary.30",
-    "@graphcommerce/magento-review": "7.1.0-canary.30",
-    "@graphcommerce/magento-search": "7.1.0-canary.30",
-    "@graphcommerce/magento-store": "7.1.0-canary.30",
-    "@graphcommerce/magento-wishlist": "7.1.0-canary.30",
-    "@graphcommerce/next-config": "7.1.0-canary.30",
-    "@graphcommerce/next-ui": "7.1.0-canary.30",
+    "@graphcommerce/cli": "7.1.0-canary.32",
+    "@graphcommerce/demo-magento-graphcommerce": "7.1.0-canary.32",
+    "@graphcommerce/ecommerce-ui": "7.1.0-canary.32",
+    "@graphcommerce/framer-next-pages": "7.1.0-canary.32",
+    "@graphcommerce/framer-scroller": "7.1.0-canary.32",
+    "@graphcommerce/framer-utils": "7.1.0-canary.32",
+    "@graphcommerce/googleanalytics": "7.1.0-canary.32",
+    "@graphcommerce/googlerecaptcha": "7.1.0-canary.32",
+    "@graphcommerce/googletagmanager": "7.1.0-canary.32",
+    "@graphcommerce/graphcms-ui": "7.1.0-canary.32",
+    "@graphcommerce/graphql": "7.1.0-canary.32",
+    "@graphcommerce/graphql-mesh": "7.1.0-canary.32",
+    "@graphcommerce/hygraph-cli": "7.1.0-canary.32",
+    "@graphcommerce/hygraph-dynamic-rows": "7.1.0-canary.32",
+    "@graphcommerce/image": "7.1.0-canary.32",
+    "@graphcommerce/lingui-next": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-billing-address": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-checkout": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-coupon": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-email": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-items": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-payment-method": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-shipping-address": "7.1.0-canary.32",
+    "@graphcommerce/magento-cart-shipping-method": "7.1.0-canary.32",
+    "@graphcommerce/magento-category": "7.1.0-canary.32",
+    "@graphcommerce/magento-cms": "7.1.0-canary.32",
+    "@graphcommerce/magento-compare": "7.1.0-canary.32",
+    "@graphcommerce/magento-customer": "7.1.0-canary.32",
+    "@graphcommerce/magento-graphql": "7.1.0-canary.32",
+    "@graphcommerce/magento-newsletter": "7.1.0-canary.32",
+    "@graphcommerce/magento-payment-included": "7.1.0-canary.32",
+    "@graphcommerce/magento-product": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-bundle": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-configurable": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-downloadable": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-grouped": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-simple": "7.1.0-canary.32",
+    "@graphcommerce/magento-product-virtual": "7.1.0-canary.32",
+    "@graphcommerce/magento-review": "7.1.0-canary.32",
+    "@graphcommerce/magento-search": "7.1.0-canary.32",
+    "@graphcommerce/magento-store": "7.1.0-canary.32",
+    "@graphcommerce/magento-wishlist": "7.1.0-canary.32",
+    "@graphcommerce/next-config": "7.1.0-canary.32",
+    "@graphcommerce/next-ui": "7.1.0-canary.32",
     "@lingui/core": "4.4.2",
     "@lingui/macro": "4.4.2",
     "@lingui/react": "4.4.2",
@@ -89,9 +89,9 @@
     "graphql-jit": "0.8.2"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.1.0-canary.30",
-    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.30",
-    "@graphcommerce/typescript-config-pwa": "7.1.0-canary.30",
+    "@graphcommerce/eslint-config-pwa": "7.1.0-canary.32",
+    "@graphcommerce/prettier-config-pwa": "7.1.0-canary.32",
+    "@graphcommerce/typescript-config-pwa": "7.1.0-canary.32",
     "@lingui/cli": "4.4.2",
     "@playwright/test": "1.37.1",
     "@types/node": "^16",

diff --git a/examples/magento-graphcms/pages/account/index.tsx b/examples/magento-graphcms/pages/account/index.tsx
@@ -97,20 +97,7 @@ function AccountIndexPage() {
                       <TimeAgo date={latestOrderDate} locale={locale} />
                     </time>
                     {', '}
-                    {latestOrder?.items && (
-                      <OrderStateLabelInline
-                        items={latestOrder?.items}
-                        renderer={{
-                          Ordered: () => <Trans id='processed' />,
-                          Invoiced: () => <Trans id='invoiced' />,
-                          Shipped: () => <Trans id='shipped' />,
-                          Refunded: () => <Trans id='refunded' />,
-                          Canceled: () => <Trans id='canceled' />,
-                          Returned: () => <Trans id='returned' />,
-                          Partial: () => <Trans id='partially processed' />,
-                        }}
-                      />
-                    )}
+                    {latestOrder?.items && <OrderStateLabelInline items={latestOrder?.items} />}
                   </>
                 ) : undefined
               }