refactoring: account form.

refactoring: expense form.
refactoring: manual journal form.
refactoring: invoice form.

client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js

@@ -1,9 +1,8 @@
-import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import React, { useMemo } from 'react';
 import { Formik, Form } from 'formik';
-import moment from 'moment';
 import { Intent } from '@blueprintjs/core';
 import { useIntl } from 'react-intl';
-import { pick, defaultTo } from 'lodash';
+import { defaultTo, isEmpty } from 'lodash';
 import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 
@@ -15,56 +14,30 @@ import {
 import MakeJournalEntriesHeader from './MakeJournalEntriesHeader';
 import MakeJournalFormFloatingActions from './MakeJournalFormFloatingActions';
 import MakeJournalEntriesField from './MakeJournalEntriesField';
-import MakeJournalNumberWatcher from './MakeJournalNumberWatcher';
 import MakeJournalFormFooter from './MakeJournalFormFooter';
 
-import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withSettings from 'containers/Settings/withSettings';
 
 import AppToaster from 'components/AppToaster';
 import withMediaActions from 'containers/Media/withMediaActions';
+import { compose, orderingLinesIndexes, transactionNumber } from 'utils';
 import {
-  compose,
-  repeatValue,
-  orderingLinesIndexes,
-  defaultToTransform,
-  transactionNumber,
-} from 'utils';
-import { transformErrors } from './utils';
+  transformErrors,
+  transformToEditForm,
+  defaultManualJournal,
+} from './utils';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
 
-const defaultEntry = {
-  index: 0,
-  account_id: '',
-  credit: '',
-  debit: '',
-  contact_id: '',
-  note: '',
-};
-const defaultInitialValues = {
-  journal_number: '',
-  journal_type: 'Journal',
-  date: moment(new Date()).format('YYYY-MM-DD'),
-  description: '',
-  reference: '',
-  currency_code: '',
-  publish: '',
-  entries: [...repeatValue(defaultEntry, 4)],
-};
-
 /**
  * Journal entries form.
  */
 function MakeJournalEntriesForm({
-  // #withDashboard
-  changePageTitle,
-  changePageSubtitle,
-
   // #withSettings
   journalNextNumber,
   journalNumberPrefix,
   baseCurrency,
 }) {
+  // Journal form context.
   const {
     createJournalMutate,
     editJournalMutate,
@@ -81,58 +54,23 @@ function MakeJournalEntriesForm({
     journalNumberPrefix,
     journalNextNumber,
   );
-  // Changes the page title based on the form in new and edit mode.
-  useEffect(() => {
-    const transactionNumber = manualJournal
-      ? manualJournal.journal_number
-      : journalNumber;
-
-    if (isNewMode) {
-      changePageTitle(formatMessage({ id: 'new_journal' }));
-    } else {
-      changePageTitle(formatMessage({ id: 'edit_journal' }));
-    }
-    changePageSubtitle(
-      defaultToTransform(transactionNumber, `No. ${transactionNumber}`, ''),
-    );
-  }, [
-    changePageTitle,
-    changePageSubtitle,
-    journalNumber,
-    manualJournal,
-    formatMessage,
-    isNewMode,
-  ]);
-
+  // Form initial values.
   const initialValues = useMemo(
     () => ({
-      ...(manualJournal
+      ...(!isEmpty(manualJournal)
         ? {
-            ...pick(manualJournal, Object.keys(defaultInitialValues)),
-            entries: manualJournal.entries.map((entry) => ({
-              ...pick(entry, Object.keys(defaultEntry)),
-            })),
+            ...transformToEditForm(manualJournal),
           }
         : {
-            ...defaultInitialValues,
+            ...defaultManualJournal,
             journal_number: defaultTo(journalNumber, ''),
             currency_code: defaultTo(baseCurrency, ''),
-            entries: orderingLinesIndexes(defaultInitialValues.entries),
+            entries: orderingLinesIndexes(defaultManualJournal.entries),
           }),
     }),
     [manualJournal, baseCurrency, journalNumber],
   );
 
-  // Handle journal number field change.
-  const handleJournalNumberChanged = useCallback(
-    (journalNumber) => {
-      changePageSubtitle(
-        defaultToTransform(journalNumber, `No. ${journalNumber}`, ''),
-      );
-    },
-    [changePageSubtitle],
-  );
-
   // Handle the form submiting.
   const handleSubmit = (values, { setErrors, setSubmitting, resetForm }) => {
     setSubmitting(true);
@@ -170,8 +108,12 @@ function MakeJournalEntriesForm({
     const form = { ...values, publish: submitPayload.publish, entries };
 
     // Handle the request error.
-    const handleError = (error) => {
-      transformErrors(error, { setErrors });
+    const handleError = ({
+      response: {
+        data: { errors },
+      },
+    }) => {
+      transformErrors(errors, { setErrors });
       setSubmitting(false);
     };
 
@@ -201,7 +143,7 @@ function MakeJournalEntriesForm({
     if (isNewMode) {
       createJournalMutate(form).then(handleSuccess).catch(handleError);
     } else {
-      editJournalMutate(manualJournal.id, form)
+      editJournalMutate([manualJournal.id, form])
         .then(handleSuccess)
         .catch(handleError);
     }
@@ -221,11 +163,8 @@ function MakeJournalEntriesForm({
         onSubmit={handleSubmit}
       >
         <Form>
-          <MakeJournalEntriesHeader
-            onJournalNumberChanged={handleJournalNumberChanged}
-          />
-          <MakeJournalNumberWatcher journalNumber={journalNumber} />
-          <MakeJournalEntriesField defaultRow={defaultEntry} />
+          <MakeJournalEntriesHeader />
+          <MakeJournalEntriesField />
           <MakeJournalFormFooter />
           <MakeJournalFormFloatingActions />
         </Form>
@@ -235,7 +174,6 @@ function MakeJournalEntriesForm({
 }
 
 export default compose(
-  withDashboardActions,
   withMediaActions,
   withSettings(({ manualJournalsSettings, organizationSettings }) => ({
     journalNextNumber: parseInt(manualJournalsSettings?.nextNumber, 10),