feat: journal number setting dialog.

client/src/containers/Dialogs/JournalNumberDailog.js

@@ -1,71 +0,0 @@
-import React, { useEffect, useCallback, useMemo } from 'react';
-import { FormattedMessage as T, useIntl } from 'react-intl';
-import { useQuery, queryCache } from 'react-query';
-import { Dialog } from 'components';
-import withDialogActions from 'containers/Dialog/withDialogActions';
-import withDialogRedux from 'components/DialogReduxConnect';
-import withSettingsActions from 'containers/Settings/withSettingsActions';
-import withSettings from 'containers/Settings/withSettings';
-import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-import { compose, optionsMapToArray } from 'utils';
-
-function JournalNumberDailog({
-  dialogName,
-  payload,
-  isOpen,
-
-  // #withSettingsActions
-  requestSubmitOptions,
-
-  // #withDialogActions
-  closeDialog,
-}) {
-  // Handles dialog close.
-  const handleClose = useCallback(() => {
-    closeDialog(dialogName);
-  }, [closeDialog, dialogName]);
-
-  const handleSubmitForm = useCallback(() => {});
-
-  // Handle dialog on closed.
-  // const onDialogClosed = useCallback(() => {
-  //   resetForm();
-  // }, [resetForm]);
-
-  return (
-    <Dialog
-      name={dialogName}
-      // isLoading={}
-      title={<T id={'journal_number_settings'} />}
-      autoFocus={true}
-      canEscapeKeyClose={true}
-      isOpen={isOpen}
-      onClose={handleClose}
-    >
-      <ReferenceNumberForm
-        onSubmit={handleSubmitForm}
-        initialNumber={'1000'}
-        initialPrefix={'A'}
-        onClose={handleClose}
-        groupName={'manual_journals'}
-      />
-    </Dialog>
-  );
-}
-
-const mapStateToProps = (state, props) => ({
-  dialogName: 'journalNumber-form',
-  journalNumberId: props?.payload?.id || null,
-});
-
-const withJournalNumberDailog = connect(mapStateToProps);
-
-export default compose(
-  withDialogRedux(null, 'journalNumber-form'),
-  withJournalNumberDailog,
-  withDialogActions,
-  withSettingsActions,
-)(JournalNumberDailog);

client/src/containers/Dialogs/JournalNumberDialog/JournalNumberDialogContent.js

@@ -0,0 +1,76 @@
+import React from 'react';
+import { DialogContent } from 'components';
+import { useQuery, queryCache } from 'react-query';
+
+import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
+import withSettingsActions from 'containers/Settings/withSettingsActions';
+import withSettings from 'containers/Settings/withSettings';
+import withManualJournalsActions from 'containers/Accounting/withManualJournalsActions';
+
+import { compose, optionsMapToArray } from 'utils';
+
+/**
+ * Journal number dialog's content.
+ */
+function JournalNumberDialogContent({
+  // #withSettings
+  nextNumber,
+  numberPrefix,
+
+  // #withSettingsActions
+  requestFetchOptions,
+  requestSubmitOptions,
+
+  // #withDialogActions
+  closeDialog,
+
+  // #withManualJournalsActions
+  setJournalNumberChanged,
+}) {
+  const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
+
+  const handleSubmitForm = (values, { setSubmitting }) => {
+    const options = optionsMapToArray(values).map((option) => {
+      return { key: option.key, ...option, group: 'manual_journals' };
+    });
+
+    requestSubmitOptions({ options }).then(() => {
+      setSubmitting(false);
+      closeDialog('journal-number-form');
+      setJournalNumberChanged(true);
+
+      setTimeout(() => {
+        queryCache.invalidateQueries('settings');
+      }, 250);
+    }).catch(() => {
+      setSubmitting(false);
+    });
+  };
+
+  const handleClose = () => {
+    closeDialog('journal-number-form');
+  };
+
+  return (
+    <DialogContent isLoading={fetchSettings.isFetching}>
+      <ReferenceNumberForm
+        initialNumber={nextNumber}
+        initialPrefix={numberPrefix}
+        onSubmit={handleSubmitForm}
+        onClose={handleClose}
+      />
+    </DialogContent>
+  )
+}
+
+export default compose(
+  withDialogActions,
+  withSettingsActions,
+  withSettings(({ manualJournalsSettings }) => ({
+    nextNumber: manualJournalsSettings?.next_number,
+    numberPrefix: manualJournalsSettings?.number_prefix,
+  })),
+  withManualJournalsActions,
+)(JournalNumberDialogContent);

client/src/containers/Dialogs/JournalNumberDialog/index.js

@@ -0,0 +1,35 @@
+import React, { lazy } from 'react';
+import { FormattedMessage as T } from 'react-intl';
+import { Dialog, DialogSuspense } from 'components';
+import withDialogRedux from 'components/DialogReduxConnect';
+import { compose } from 'utils';
+
+const JournalNumberDialogContent = lazy(() => import('./JournalNumberDialogContent'));
+
+function JournalNumberDialog({
+  dialogName,
+  payload = { id: null },
+  isOpen,
+}) {
+  return (
+    <Dialog
+      name={dialogName}
+      title={<T id={'journal_number_settings'} />}
+      autoFocus={true}
+      canEscapeKeyClose={true}
+      isOpen={isOpen}
+      className={'dialog--journal-number-settings'}
+    >
+      <DialogSuspense>
+        <JournalNumberDialogContent
+          journalNumberId={payload.id}
+        />
+      </DialogSuspense>
+    </Dialog>
+  );
+}
+
+
+export default compose(
+  withDialogRedux(),
+)(JournalNumberDialog);