From 4e40009ba01bf2204e502b4c4c4e03c6eee123ac Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Wed, 21 Feb 2024 20:16:57 +0200 Subject: [PATCH] revert: form changes --- .../EstimateForm/EstimateFloatingActions.tsx | 2 +- .../Estimates/EstimateForm/EstimateForm.tsx | 13 +----------- .../InvoiceForm/InvoiceFloatingActions.tsx | 8 +++---- .../Invoices/InvoiceForm/InvoiceForm.tsx | 18 ++-------------- .../Receipts/ReceiptForm/ReceiptForm.tsx | 21 +++++-------------- .../ReceiptFormFloatingActions.tsx | 2 +- 6 files changed, 14 insertions(+), 50 deletions(-) diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFloatingActions.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFloatingActions.tsx index 474730d93f..df212c38ce 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFloatingActions.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFloatingActions.tsx @@ -29,7 +29,7 @@ export default function EstimateFloatingActions() { // Handle submit & deliver button click. const handleSubmitDeliverBtnClick = (event) => { - setSubmitPayload({ redirect: false, deliverViaMail: true }); + setSubmitPayload({ redirect: true, deliver: true }); submitForm(); }; diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx index b1e665d3d6..aff0888d65 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx @@ -36,16 +36,11 @@ import { handleErrors, resetFormState, } from './utils'; -import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; /** * Estimate form. */ function EstimateForm({ - // #withDialogActions - openDialog, - // #withSettings estimateNextNumber, estimateNumberPrefix, @@ -113,7 +108,7 @@ function EstimateForm({ delivered: submitPayload.deliver, }; // Handle the request success. - const onSuccess = (res) => { + const onSuccess = (response) => { AppToaster.show({ message: intl.get( isNewMode @@ -131,11 +126,6 @@ function EstimateForm({ if (submitPayload.resetForm) { resetFormState({ resetForm, initialValues, values }); } - if (submitPayload.deliverViaMail) { - openDialog(DialogsName.EstimateFormMailDeliver, { - estimateId: res.data.id, - }); - } }; // Handle the request error. const onError = ({ @@ -190,7 +180,6 @@ function EstimateForm({ } export default compose( - withDialogActions, withSettings(({ estimatesSettings }) => ({ estimateNextNumber: estimatesSettings?.nextNumber, estimateNumberPrefix: estimatesSettings?.numberPrefix, diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.tsx index 0a9a729137..e212c8b7d2 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFloatingActions.tsx @@ -30,19 +30,19 @@ export default function InvoiceFloatingActions() { const { setSubmitPayload, invoice } = useInvoiceFormContext(); // Handle submit & deliver button click. - const handleSubmitDeliverBtnClick = () => { - setSubmitPayload({ redirectToEdit: true, deliverViaMail: true }); + const handleSubmitDeliverBtnClick = (event) => { + setSubmitPayload({ redirect: true, deliver: true }); submitForm(); }; // Handle submit, deliver & new button click. - const handleSubmitDeliverAndNewBtnClick = () => { + const handleSubmitDeliverAndNewBtnClick = (event) => { setSubmitPayload({ redirect: false, deliver: true, resetForm: true }); submitForm(); }; // Handle submit, deliver & continue editing button click. - const handleSubmitDeliverContinueEditingBtnClick = () => { + const handleSubmitDeliverContinueEditingBtnClick = (event) => { setSubmitPayload({ redirect: false, deliver: true }); submitForm(); }; diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx index c47f7bc539..6b9f234ac2 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx @@ -34,20 +34,12 @@ import { transformValueToRequest, resetFormState, } from './utils'; -import { - InvoiceExchangeRateSync, - InvoiceNoSyncSettingsToForm, -} from './components'; -import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { InvoiceExchangeRateSync, InvoiceNoSyncSettingsToForm } from './components'; /** * Invoice form. */ function InvoiceForm({ - // #withDialogActions - openDialog, - // #withSettings invoiceNextNumber, invoiceNumberPrefix, @@ -119,7 +111,7 @@ function InvoiceForm({ from_estimate_id: estimateId, }; // Handle the request success. - const onSuccess = (res) => { + const onSuccess = () => { AppToaster.show({ message: intl.get( isNewMode @@ -131,11 +123,6 @@ function InvoiceForm({ }); setSubmitting(false); - if (submitPayload.deliverViaMail) { - openDialog(DialogsName.InvoiceFormMailDeliver, { - invoiceId: res.data.id, - }); - } if (submitPayload.redirect) { history.push('/invoices'); } @@ -214,5 +201,4 @@ export default compose( invoiceTermsConditions: invoiceSettings?.termsConditions, })), withCurrentOrganization(), - withDialogActions, )(InvoiceForm); diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx index d7010d2ae4..62206bdbf1 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx @@ -34,20 +34,12 @@ import { transformFormValuesToRequest, resetFormState, } from './utils'; -import { - ReceiptSyncAutoExRateToForm, - ReceiptSyncIncrementSettingsToForm, -} from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import { DialogsName } from '@/constants/dialogs'; +import { ReceiptSyncAutoExRateToForm, ReceiptSyncIncrementSettingsToForm } from './components'; /** * Receipt form. */ function ReceiptForm({ - // #withDialogActions - openDialog, - // #withSettings receiptNextNumber, receiptNumberPrefix, @@ -92,7 +84,10 @@ function ReceiptForm({ }), }; // Handle the form submit. - const handleFormSubmit = (values, { setErrors, setSubmitting }) => { + const handleFormSubmit = ( + values, + { setErrors, setSubmitting, resetForm }, + ) => { const entries = values.entries.filter( (item) => item.item_id && item.quantity, ); @@ -129,11 +124,6 @@ function ReceiptForm({ if (submitPayload.resetForm) { resetFormState(); } - if (submitPayload.deliverMail) { - openDialog(DialogsName.ReceiptFormMailDeliver, { - receiptId: response.data.id, - }); - } }; // Handle the request error. @@ -189,7 +179,6 @@ function ReceiptForm({ } export default compose( - withDialogActions, withDashboardActions, withSettings(({ receiptSettings }) => ({ receiptNextNumber: receiptSettings?.nextNumber, diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.tsx index 4db00c3aeb..d8d83dfb52 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFloatingActions.tsx @@ -33,7 +33,7 @@ export default function ReceiptFormFloatingActions() { // Handle submit & close button click. const handleSubmitCloseBtnClick = (event) => { - setSubmitPayload({ redirect: false, deliverMail: true, status: true }); + setSubmitPayload({ redirect: true, status: true }); submitForm(); };