@graphcommerce/magento-customer 9.0.0-canary.78 → 9.0.0-canary.80

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 9.0.0-canary.80
+
+### Minor Changes
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`1d6512d`](https://github.com/graphcommerce-org/graphcommerce/commit/1d6512d4118cfb46602aa1f2432c3566fdb3261d) - Rename experimental_useV2 prop to deprecated_useV1 in useFromGql and enable it by default ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+### Patch Changes
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`cc1c6e8`](https://github.com/graphcommerce-org/graphcommerce/commit/cc1c6e8c857c12f2d38d7283a250e3b77bd885f4) - The AddressCountryRegion select would show a warning if the countries weren't loaded yet. It will now show a readonly field with the country code. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+- [#2341](https://github.com/graphcommerce-org/graphcommerce/pull/2341) [`b8b621a`](https://github.com/graphcommerce-org/graphcommerce/commit/b8b621a4a7549cae4ac56fee76773443a0d55504) - The CompanyFields toggle wouldn't be valid when Private was selected and would only validate if Business was selected. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 9.0.0-canary.79
+
 ## 9.0.0-canary.78
 
 ### Patch Changes

package/components/AccountSignInUpForm/AccountSignInUpForm.tsx

@@ -1,13 +1,7 @@
-import {
-  EmailElement,
-  FormAutoSubmit,
-  TextFieldElement,
-  emailPattern,
-} from '@graphcommerce/ecommerce-ui'
+import { ActionCardListForm, EmailElement, FormAutoSubmit } from '@graphcommerce/ecommerce-ui'
 import { useApolloClient } from '@graphcommerce/graphql'
 import {
   ActionCard,
-  ActionCardListForm,
   Button,
   FormActions,
   FormDiv,

package/components/AddressFields/AddressCountryRegion.tsx

@@ -1,4 +1,10 @@
-import { SelectElement, FieldValues, FieldPath, useWatch } from '@graphcommerce/ecommerce-ui'
+import {
+  SelectElement,
+  FieldValues,
+  FieldPath,
+  useWatch,
+  TextFieldElement,
+} from '@graphcommerce/ecommerce-ui'
 import { useQuery } from '@graphcommerce/graphql'
 import { CountryRegionsDocument } from '@graphcommerce/magento-store'
 import { FormRow, filterNonNullableKeys } from '@graphcommerce/next-ui'
@@ -35,7 +41,7 @@ export function useAddressCountryRegion<
     [country, countryList],
   )
 
-  return { ...form, country, countryList, regionList }
+  return { ...form, country, countryList, regionList, loading: countryQuery.loading }
 }
 
 export function AddressCountryRegion<
@@ -43,7 +49,22 @@ export function AddressCountryRegion<
   TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
 >(props: AddressFieldsOptions<TFieldValues, TName>) {
   const form = useAddressCountryRegion<TFieldValues, TName>(props)
-  const { control, name, readOnly, required, countryList, regionList } = form
+  const { control, name, readOnly, required, countryList, regionList, loading } = form
+
+  if (loading) {
+    return (
+      <FormRow>
+        <TextFieldElement
+          label={<Trans id='Country' />}
+          control={control}
+          required={required[name.countryCode]}
+          name={name.countryCode}
+          showValid
+          InputProps={{ readOnly }}
+        />
+      </FormRow>
+    )
+  }
 
   return (
     <FormRow>
@@ -66,7 +87,6 @@ export function AddressCountryRegion<
         <SelectElement
           control={control}
           name={name.regionId}
-          // SelectProps={{ native: true, displayEmpty: true }}
           variant='outlined'
           label={<Trans id='Region' />}
           required

package/components/CompanyFields/CompanyFields.tsx

@@ -1,11 +1,5 @@
-import { FieldPath, FieldValues, useWatch } from '@graphcommerce/ecommerce-ui'
-import {
-  ActionCard,
-  ActionCardListForm,
-  ActionCardProps,
-  FormRow,
-  useStorefrontConfig,
-} from '@graphcommerce/next-ui'
+import { ActionCardListForm, FieldPath, FieldValues, useWatch } from '@graphcommerce/ecommerce-ui'
+import { ActionCard, ActionCardProps, FormRow, useStorefrontConfig } from '@graphcommerce/next-ui'
 import { t } from '@lingui/macro'
 import { CompanyName } from './CompanyName'
 import { CompanyVAT } from './CompanyVAT'
@@ -43,7 +37,7 @@ export function CompanyFields<
           layout='inline'
           variant='outlined'
           color='secondary'
-          required
+          rules={{ validate: (value) => value !== null }}
           items={[
             { value: false, title: t`Private` },
             { value: true, title: t`Business` },

package/components/ContactForm/ContactForm.tsx

@@ -38,7 +38,6 @@ function findTelephone(data: CustomerQuery): string | undefined {
 
 export function ContactForm() {
   const form = useFormGqlMutation(ContactUsDocument, {
-    experimental_useV2: true,
     onComplete: (result) => {
       if (result.errors) return
       form.resetField('input.comment')

package/components/SignUpForm/SignUpForm.tsx

@@ -27,7 +27,6 @@ export function SignUpForm(props: SignUpFormProps) {
     {
       defaultValues: { email },
       onBeforeSubmit: (values) => ({ ...values, email }),
-      experimental_useV2: true,
       onComplete: async (result, variables) => {
         if (!result.errors && !storeConfig.data?.storeConfig?.create_account_confirmation) {
           signIn.setValue('email', variables.email)

package/hooks/useAccountSignInUpForm.tsx

@@ -33,7 +33,6 @@ export function useAccountSignInUpForm(props: UseFormIsEmailAvailableProps = {})
   >(
     IsEmailAvailableDocument,
     {
-      experimental_useV2: true,
       mode: 'onBlur',
       values: { email: cachedEmail ?? '' },
       defaultValues: { requestedMode: 'signin' },

package/hooks/useCustomerSession.ts

@@ -1,6 +1,4 @@
 import { QueryResult, useQuery } from '@graphcommerce/graphql'
-import { removeCssFlag, setCssFlag } from '@graphcommerce/next-ui'
-import { useEffect } from 'react'
 import {
   CustomerTokenDocument,
   CustomerTokenQuery,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-customer",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.78",
+  "version": "9.0.0-canary.80",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,19 +12,19 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^9.0.0-canary.78",
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.78",
-    "@graphcommerce/framer-next-pages": "^9.0.0-canary.78",
-    "@graphcommerce/framer-utils": "^9.0.0-canary.78",
-    "@graphcommerce/graphql": "^9.0.0-canary.78",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.78",
-    "@graphcommerce/image": "^9.0.0-canary.78",
-    "@graphcommerce/magento-graphql": "^9.0.0-canary.78",
-    "@graphcommerce/magento-store": "^9.0.0-canary.78",
-    "@graphcommerce/next-ui": "^9.0.0-canary.78",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.78",
-    "@graphcommerce/react-hook-form": "^9.0.0-canary.78",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.78",
+    "@graphcommerce/ecommerce-ui": "^9.0.0-canary.80",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.80",
+    "@graphcommerce/framer-next-pages": "^9.0.0-canary.80",
+    "@graphcommerce/framer-utils": "^9.0.0-canary.80",
+    "@graphcommerce/graphql": "^9.0.0-canary.80",
+    "@graphcommerce/graphql-mesh": "^9.0.0-canary.80",
+    "@graphcommerce/image": "^9.0.0-canary.80",
+    "@graphcommerce/magento-graphql": "^9.0.0-canary.80",
+    "@graphcommerce/magento-store": "^9.0.0-canary.80",
+    "@graphcommerce/next-ui": "^9.0.0-canary.80",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.80",
+    "@graphcommerce/react-hook-form": "^9.0.0-canary.80",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.80",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",