fix: Save form values if they are not mandatory when isBusiness pro…

…ps is `true`. Resolve #412.
commercelayer · Sep 21, 2023 · cd03feb · cd03feb
1 parent 49e6725
commit cd03feb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/packages/react-components/src/components/addresses/BillingAddressForm.tsx b/packages/react-components/src/components/addresses/BillingAddressForm.tsx
@@ -7,10 +7,8 @@ import BillingAddressFormContext, {
 } from '#context/BillingAddressFormContext'
 import isEmpty from 'lodash/isEmpty'
 import { type BaseError, type CodeErrorType } from '#typings/errors'
-import type { AddressInputName } from '#typings'
 import OrderContext from '#context/OrderContext'
 import { getSaveBillingAddressToAddressBook } from '#utils/localStorage'
-import { businessMandatoryField } from '#utils/validateFormFields'
 
 type Props = {
   children: ReactNode
@@ -78,12 +76,6 @@ export function BillingAddressForm(props: Props): JSX.Element {
       setAddressErrors([], 'billing_address')
       for (const name in values) {
         const field = values[name]
-        const mandatory = businessMandatoryField(
-          name as AddressInputName,
-          isBusiness
-        )
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        if (!mandatory) delete values[name]
         if (
           field?.value ||
           (field?.required === false && field?.type !== 'checkbox')
@@ -116,12 +108,12 @@ export function BillingAddressForm(props: Props): JSX.Element {
         // @ts-expect-error no type no types
       )?.checked || getSaveBillingAddressToAddressBook()
     if (reset && (!isEmpty(values) || !isEmpty(errors) || checkboxChecked)) {
-      // if (saveAddressToCustomerAddressBook) {
-      //   saveAddressToCustomerAddressBook({
-      //     type: 'billing_address',
-      //     value: false
-      //   })
-      // }
+      if (saveAddressToCustomerAddressBook) {
+        saveAddressToCustomerAddressBook({
+          type: 'billing_address',
+          value: false
+        })
+      }
       if (ref) {
         ref.current?.reset()
         resetForm({ target: ref.current } as any)

diff --git a/packages/react-components/src/components/addresses/ShippingAddressForm.tsx b/packages/react-components/src/components/addresses/ShippingAddressForm.tsx
@@ -4,10 +4,8 @@ import { type ReactNode, useContext, useEffect, useRef } from 'react'
 import ShippingAddressFormContext from '#context/ShippingAddressFormContext'
 import isEmpty from 'lodash/isEmpty'
 import { type BaseError, type CodeErrorType } from '#typings/errors'
-import { type AddressInputName } from '#typings'
 import OrderContext from '#context/OrderContext'
 import { getSaveShippingAddressToAddressBook } from '#utils/localStorage'
-import { businessMandatoryField } from '#utils/validateFormFields'
 
 interface Props extends Omit<JSX.IntrinsicElements['form'], 'onSubmit'> {
   children: ReactNode
@@ -74,12 +72,6 @@ export function ShippingAddressForm(props: Props): JSX.Element {
       setAddressErrors([], 'shipping_address')
       for (const name in values) {
         const field = values[name]
-        const mandatory = businessMandatoryField(
-          name as AddressInputName,
-          isBusiness
-        )
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        if (!mandatory) delete values[name]
         if (
           field?.value ||
           (field?.required === false && field?.type !== 'checkbox')

diff --git a/packages/react-components/src/reducers/AddressReducer.ts b/packages/react-components/src/reducers/AddressReducer.ts
@@ -180,6 +180,8 @@ export async function saveAddresses({
     const sdk = getSdk(config)
     if (order) {
       const currentBillingAddressRef = order?.billing_address?.reference
+      console.log('billingAddress', billingAddress)
+      console.log('shippingAddress', shippingAddress)
       const orderAttributes: OrderUpdate = {
         id: order?.id,
         _billing_address_clone_id: billingAddressId,