fix: AR aging summary report.

client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js

@@ -1,6 +1,5 @@
-import React, { useEffect, useCallback, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import moment from 'moment';
-import { useIntl } from 'react-intl';
 
 import 'style/pages/FinancialStatements/GeneralLedger.scss';
 
@@ -12,28 +11,21 @@ import GeneralLedgerActionsBar from './GeneralLedgerActionsBar';
 import { GeneralLedgerProvider } from './GeneralLedgerProvider';
 
 import withGeneralLedgerActions from './withGeneralLedgerActions';
-import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withSettings from 'containers/Settings/withSettings';
 
-import { compose } from 'utils';
-
 import { transformFilterFormToQuery } from 'containers/FinancialStatements/common';
+import { compose } from 'utils';
 
 /**
  * General Ledger (GL) sheet.
  */
 function GeneralLedger({
-  // #withDashboardActions
-  changePageTitle,
-  setDashboardBackLink,
-
   // #withGeneralLedgerActions
   refreshGeneralLedgerSheet,
 
   // #withSettings
   organizationName,
 }) {
-  const { formatMessage } = useIntl();
   const [filter, setFilter] = useState({
     fromDate: moment().startOf('year').format('YYYY-MM-DD'),
     toDate: moment().endOf('year').format('YYYY-MM-DD'),
@@ -41,21 +33,6 @@ function GeneralLedger({
     accountsFilter: 'with-transactions',
   });
 
-  // Change page title of the dashboard.
-  useEffect(() => {
-    changePageTitle(formatMessage({ id: 'general_ledger' }));
-  }, [changePageTitle, formatMessage]);
-
-  useEffect(() => {
-    // Show the back link on dashboard topbar.
-    setDashboardBackLink(true);
-
-    return () => {
-      // Hide the back link on dashboard topbar.
-      setDashboardBackLink(false);
-    };
-  });
-  
   // Handle financial statement filter change.
   const handleFilterSubmit = useCallback(
     (filter) => {
@@ -71,7 +48,7 @@ function GeneralLedger({
   );
 
   return (
-    <GeneralLedgerProvider query={filter}>
+    <GeneralLedgerProvider query={transformFilterFormToQuery(filter)}>
       <GeneralLedgerActionsBar />
 
       <DashboardPageContent>
@@ -95,7 +72,6 @@ function GeneralLedger({
 
 export default compose(
   withGeneralLedgerActions,
-  withDashboardActions,
   withSettings(({ organizationSettings }) => ({
     organizationName: organizationSettings.name,
   })),

client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeaderGeneralPane.js

@@ -5,7 +5,6 @@ import {
 } from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 import classNames from 'classnames';
-import { compose } from 'redux';
 
 import { AccountsMultiSelect, Row, Col } from 'components';
 
@@ -13,17 +12,15 @@ import FinancialStatementDateRange from 'containers/FinancialStatements/Financia
 import RadiosAccountingBasis from '../RadiosAccountingBasis';
 import FinancialAccountsFilter from '../FinancialAccountsFilter';
 
-import withAccounts from 'containers/Accounts/withAccounts';
-
 import { filterAccountsOptions } from './common';
+import { useGeneralLedgerContext } from './GeneralLedgerProvider'
 
 /**
  * General ledger (GL) - Header - General panel.
  */
-function GeneralLedgerHeaderGeneralPane({
-  // #withAccounts
-  accountsList,
-}) {
+export default function GeneralLedgerHeaderGeneralPane() {
+  const { accounts } = useGeneralLedgerContext();
+
   return (
     <div>
       <FinancialStatementDateRange />
@@ -37,7 +34,7 @@ function GeneralLedgerHeaderGeneralPane({
             label={<T id={'specific_accounts'} />}
             className={classNames('form-group--select-list', Classes.FILL)}
           >
-            <AccountsMultiSelect accounts={accountsList} />
+            <AccountsMultiSelect accounts={accounts} />
           </FormGroup>
         </Col>
       </Row>
@@ -45,8 +42,4 @@ function GeneralLedgerHeaderGeneralPane({
       <RadiosAccountingBasis key={'basis'} />
     </div>
   );
-}
-
-export default compose(withAccounts(({ accountsList }) => ({ accountsList })))(
-  GeneralLedgerHeaderGeneralPane,
-);
+}

client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerProvider.js

@@ -1,14 +1,14 @@
 import React, { createContext, useContext } from 'react';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
 import { useGeneralLedgerSheet, useAccounts } from 'hooks/query';
-import { transformFilterFormToQuery } from '../common';
 
 const GeneralLedgerContext = createContext();
 
+/**
+ * General ledger provider.
+ */
 function GeneralLedgerProvider({ query, ...props }) {
-  const { data: generalLedger, isFetching, refetch } = useGeneralLedgerSheet({
-    ...transformFilterFormToQuery(query),
-  });
+  const { data: generalLedger, isFetching, refetch } = useGeneralLedgerSheet(query);
 
   // Accounts list.
   const { data: accounts, isFetching: isAccountsLoading } = useAccounts();