Merge remote-tracking branch 'origin/feature/exchange_rates'

client/src/containers/Accounting/ManualJournalsList.js

@@ -3,6 +3,7 @@ import { Route, Switch, useHistory } from 'react-router-dom';
 import { useQuery } from 'react-query';
 import { Alert, Intent } from '@blueprintjs/core';
 import AppToaster from 'components/AppToaster';
+import { FormattedMessage as T, useIntl } from 'react-intl';
 
 import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
@@ -17,7 +18,6 @@ import withViewsActions from 'containers/Views/withViewsActions';
 
 import { compose } from 'utils';
 
-
 /**
  * Manual journals table.
  */
@@ -39,22 +39,26 @@ function ManualJournalsTable({
   const [deleteManualJournal, setDeleteManualJournal] = useState(false);
   const [selectedRows, setSelectedRows] = useState([]);
   const [bulkDelete, setBulkDelete] = useState(false);
-
+  const { formatMessage } = useIntl();
   const fetchViews = useQuery('journals-resource-views', () => {
     return requestFetchResourceViews('manual_journals');
   });
 
-  const fetchManualJournals = useQuery('manual-journals-table', () => 
-    requestFetchManualJournalsTable());
+  const fetchManualJournals = useQuery('manual-journals-table', () =>
+    requestFetchManualJournalsTable()
+  );
 
   useEffect(() => {
-    changePageTitle('Manual Journals');
+    changePageTitle(formatMessage({id:'manual_journals'}));
   }, [changePageTitle]);
 
   // Handle delete manual journal click.
-  const handleDeleteJournal = useCallback((journal) => {
-    setDeleteManualJournal(journal);
-  }, [setDeleteManualJournal]);
+  const handleDeleteJournal = useCallback(
+    (journal) => {
+      setDeleteManualJournal(journal);
+    },
+    [setDeleteManualJournal]
+  );
 
   // Handle cancel delete manual journal.
   const handleCancelManualJournalDelete = useCallback(() => {
@@ -69,30 +73,35 @@ function ManualJournalsTable({
     });
   }, [deleteManualJournal, requestDeleteManualJournal]);
 
-  const handleBulkDelete = useCallback((accountsIds) => {
-    setBulkDelete(accountsIds);
-  }, [setBulkDelete]);
+  const handleBulkDelete = useCallback(
+    (accountsIds) => {
+      setBulkDelete(accountsIds);
+    },
+    [setBulkDelete]
+  );
 
   const handleConfirmBulkDelete = useCallback(() => {
-    requestDeleteBulkManualJournals(bulkDelete).then(() => {
-      setBulkDelete(false);
-      AppToaster.show({ message: 'the_accounts_have_been_deleted' });
-    }).catch((error) => {
-      setBulkDelete(false);
-    });
-  }, [
-    requestDeleteBulkManualJournals,
-    bulkDelete,
-  ]);
+    requestDeleteBulkManualJournals(bulkDelete)
+      .then(() => {
+        setBulkDelete(false);
+        AppToaster.show({ message: 'the_accounts_have_been_deleted' });
+      })
+      .catch((error) => {
+        setBulkDelete(false);
+      });
+  }, [requestDeleteBulkManualJournals, bulkDelete]);
 
   const handleCancelBulkDelete = useCallback(() => {
     setBulkDelete(false);
   }, []);
 
-  const handleEditJournal = useCallback((journal) => {
-    history.push(`/dashboard/accounting/manual-journals/${journal.id}/edit`);
-  }, [history]);
-  
+  const handleEditJournal = useCallback(
+    (journal) => {
+      history.push(`/dashboard/accounting/manual-journals/${journal.id}/edit`);
+    },
+    [history]
+  );
+
   // Handle filter change to re-fetch data-table.
   const handleFilterChanged = useCallback(() => {
     fetchManualJournals.refetch();
@@ -104,36 +113,49 @@ function ManualJournalsTable({
   }, [fetchManualJournals]);
 
   // Handle fetch data of manual jouranls datatable.
-  const handleFetchData = useCallback(({ pageIndex, pageSize, sortBy }) => {
-    addManualJournalsTableQueries({
-      ...(sortBy.length > 0) ? {
-        column_sort_by: sortBy[0].id,
-        sort_order: sortBy[0].desc ? 'desc' : 'asc',
-      } : {},
-    });
-  }, [
-    addManualJournalsTableQueries,
-  ]);
+  const handleFetchData = useCallback(
+    ({ pageIndex, pageSize, sortBy }) => {
+      addManualJournalsTableQueries({
+        ...(sortBy.length > 0
+          ? {
+              column_sort_by: sortBy[0].id,
+              sort_order: sortBy[0].desc ? 'desc' : 'asc',
+            }
+          : {}),
+      });
+    },
+    [addManualJournalsTableQueries]
+  );
 
-  const handlePublishJournal = useCallback((journal) => {
-    requestPublishManualJournal(journal.id).then(() => {
-      AppToaster.show({ message: 'the_manual_journal_id_has_been_published' });
-    })
-  }, [requestPublishManualJournal]);
+  const handlePublishJournal = useCallback(
+    (journal) => {
+      requestPublishManualJournal(journal.id).then(() => {
+        AppToaster.show({
+          message: 'the_manual_journal_id_has_been_published',
+        });
+      });
+    },
+    [requestPublishManualJournal]
+  );
 
   // Handle selected rows change.
-  const handleSelectedRowsChange = useCallback((accounts) => {
-    setSelectedRows(accounts);
-  }, [setSelectedRows]);
+  const handleSelectedRowsChange = useCallback(
+    (accounts) => {
+      setSelectedRows(accounts);
+    },
+    [setSelectedRows]
+  );
 
   return (
     <DashboardInsider
       loading={fetchViews.isFetching || fetchManualJournals.isFetching}
-      name={'manual-journals'}>
+      name={'manual-journals'}
+    >
       <ManualJournalsActionsBar
         onBulkDelete={handleBulkDelete}
         selectedRows={selectedRows}
-        onFilterChanged={handleFilterChanged} />
+        onFilterChanged={handleFilterChanged}
+      />
 
       <DashboardPageContent>
         <Switch>
@@ -142,8 +164,7 @@ function ManualJournalsTable({
             path={[
               '/dashboard/accounting/manual-journals/:custom_view_id/custom_view',
               '/dashboard/accounting/manual-journals',
-            ]}>
-            
+            ]}> 
           </Route>
         </Switch>
 
@@ -152,11 +173,12 @@ function ManualJournalsTable({
           onFetchData={handleFetchData}
           onEditJournal={handleEditJournal}
           onPublishJournal={handlePublishJournal}
-          onSelectedRowsChange={handleSelectedRowsChange} />
+          onSelectedRowsChange={handleSelectedRowsChange}
+        />
 
         <Alert
-          cancelButtonText='Cancel'
-          confirmButtonText='Move to Trash'
+          cancelButtonText={<T id={'cancel'} />}
+          confirmButtonText={<T id={'move_to_trash'} />}
           icon='trash'
           intent={Intent.DANGER}
           isOpen={deleteManualJournal}
@@ -170,8 +192,8 @@ function ManualJournalsTable({
         </Alert>
 
         <Alert
-          cancelButtonText='Cancel'
-          confirmButtonText='Move to Trash'
+          cancelButtonText={<T id={'cancel'} />}
+          confirmButtonText={<T id={'move_to_trash'} />}
           icon='trash'
           intent={Intent.DANGER}
           isOpen={bulkDelete}
@@ -191,5 +213,5 @@ function ManualJournalsTable({
 export default compose(
   withDashboardActions,
   withManualJournalsActions,
-  withViewsActions,
+  withViewsActions
 )(ManualJournalsTable);