From 407dce69236cbde91e1392ba56fb8145480569f0 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Mon, 22 Mar 2021 20:07:02 +0200
Subject: [PATCH] fix(vendor &  customer): floting action.

---
 .../Customers/CustomerForm/CustomerForm.js      |  2 +-
 .../CustomerForm/CustomerFormProvider.js        |  1 -
 .../Vendors/VendorForm/VendorFloatingActions.js |  6 +++---
 .../containers/Vendors/VendorForm/VendorForm.js | 17 ++++++-----------
 .../Vendors/VendorForm/VendorFormProvider.js    | 16 ++++++++++------
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/client/src/containers/Customers/CustomerForm/CustomerForm.js b/client/src/containers/Customers/CustomerForm/CustomerForm.js
index 4417d13d8..5d194b604 100644
--- a/client/src/containers/Customers/CustomerForm/CustomerForm.js
+++ b/client/src/containers/Customers/CustomerForm/CustomerForm.js
@@ -84,7 +84,7 @@ function CustomerForm({
     () => ({
       ...defaultInitialValues,
       currency_code: baseCurrency,
-      ...transformToForm(customer || contactDuplicate, defaultInitialValues),
+      ...transformToForm(contactDuplicate || customer, defaultInitialValues),
     }),
     [customer, contactDuplicate, baseCurrency],
   );
diff --git a/client/src/containers/Customers/CustomerForm/CustomerFormProvider.js b/client/src/containers/Customers/CustomerForm/CustomerFormProvider.js
index 5dab5cfb0..64fa78685 100644
--- a/client/src/containers/Customers/CustomerForm/CustomerFormProvider.js
+++ b/client/src/containers/Customers/CustomerForm/CustomerFormProvider.js
@@ -57,7 +57,6 @@ function CustomerFormProvider({ customerId, ...props }) {
   return (
     <DashboardInsider
       loading={
-        isCustomerLoading ||
         isCustomerLoading ||
         isCurrenciesLoading ||
         isContactLoading
diff --git a/client/src/containers/Vendors/VendorForm/VendorFloatingActions.js b/client/src/containers/Vendors/VendorForm/VendorFloatingActions.js
index e06568673..0bb5f2f14 100644
--- a/client/src/containers/Vendors/VendorForm/VendorFloatingActions.js
+++ b/client/src/containers/Vendors/VendorForm/VendorFloatingActions.js
@@ -25,7 +25,7 @@ export default function VendorFloatingActions() {
   const { resetForm, isSubmitting, submitForm } = useFormikContext();
 
   // Vendor form context.
-  const { vendor, setSubmitPayload } = useVendorFormContext();
+  const { isNewMode, setSubmitPayload } = useVendorFormContext();
 
   // History.
   const history = useHistory();
@@ -62,7 +62,7 @@ export default function VendorFloatingActions() {
           intent={Intent.PRIMARY}
           type="submit"
           onClick={handleSubmitBtnClick}
-          text={vendor ? <T id={'edit'} /> : <T id={'save'} />}
+          text={!isNewMode ? <T id={'edit'} /> : <T id={'save'} />}
         />
         <Popover
           content={
@@ -89,7 +89,7 @@ export default function VendorFloatingActions() {
         className={'ml1'}
         disabled={isSubmitting}
         onClick={handleClearBtnClick}
-        text={vendor ? <T id={'reset'} /> : <T id={'clear'} />}
+        text={!isNewMode ? <T id={'reset'} /> : <T id={'clear'} />}
       />
       {/* ----------- Cancel  ----------- */}
       <Button
diff --git a/client/src/containers/Vendors/VendorForm/VendorForm.js b/client/src/containers/Vendors/VendorForm/VendorForm.js
index eeaf20a2b..a89bf6702 100644
--- a/client/src/containers/Vendors/VendorForm/VendorForm.js
+++ b/client/src/containers/Vendors/VendorForm/VendorForm.js
@@ -78,9 +78,10 @@ function VendorForm({
     editVendorMutate,
     setSubmitPayload,
     submitPayload,
+    isNewMode,
   } = useVendorFormContext();
 
-  const isNewMode = !vendorId;
+  // const isNewMode = !vendorId;
 
   // History context.
   const history = useHistory();
@@ -94,17 +95,11 @@ function VendorForm({
     () => ({
       ...defaultInitialValues,
       currency_code: baseCurrency,
-      ...transformToForm(vendor || contactDuplicate, defaultInitialValues),
+      ...transformToForm(contactDuplicate || vendor, defaultInitialValues),
     }),
     [vendor, contactDuplicate, baseCurrency],
   );
 
-  useEffect(() => {
-    !isNewMode
-      ? changePageTitle(formatMessage({ id: 'edit_vendor' }))
-      : changePageTitle(formatMessage({ id: 'new_vendor' }));
-  }, [changePageTitle, isNewMode, formatMessage]);
-
   // Handles the form submit.
   const handleFormSubmit = (
     values,
@@ -136,10 +131,10 @@ function VendorForm({
       setSubmitting(false);
     };
 
-    if (vendor && vendor.id) {
-      editVendorMutate([vendor.id, requestForm]).then(onSuccess).catch(onError);
-    } else {
+    if (isNewMode) {
       createVendorMutate(requestForm).then(onSuccess).catch(onError);
+    } else {
+      editVendorMutate([vendor.id, requestForm]).then(onSuccess).catch(onError);
     }
   };
 
diff --git a/client/src/containers/Vendors/VendorForm/VendorFormProvider.js b/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
index 555cf957a..107b86af5 100644
--- a/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
+++ b/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
@@ -19,6 +19,8 @@ const VendorFormContext = createContext();
 function VendorFormProvider({ vendorId, ...props }) {
   const { state } = useLocation();
 
+  const contactId = state?.action;
+
   // Handle fetch Currencies data table
   const { data: currencies, isLoading: isCurrenciesLoading } = useCurrencies();
 
@@ -27,13 +29,11 @@ function VendorFormProvider({ vendorId, ...props }) {
     enabled: !!vendorId,
   });
 
-  const contactId = state?.action;
-
   // Handle fetch contact duplicate details.
-  const { data: contactDuplicate, isLoading: isContactLoading } = useContact(
-    contactId,
-    { enabled: !!contactId },
-  );
+  const {
+    data: contactDuplicate,
+    isLoading: isContactLoading,
+  } = useContact(contactId, { enabled: !!contactId });
 
   // Create and edit vendor mutations.
   const { mutateAsync: createVendorMutate } = useCreateVendor();
@@ -42,12 +42,16 @@ function VendorFormProvider({ vendorId, ...props }) {
   // Form submit payload.
   const [submitPayload, setSubmitPayload] = useState({});
 
+  // determines whether the form new or duplicate mode.
+  const isNewMode = contactId || !vendorId;
+
   const provider = {
     vendorId,
     currencies,
     vendor,
     contactDuplicate: { ...omit(contactDuplicate, ['opening_balance_at']) },
     submitPayload,
+    isNewMode,
 
     createVendorMutate,
     editVendorMutate,