From 2e7061260e348e39127d45172f578e904637767c Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 12 Feb 2022 18:12:08 +0200 Subject: [PATCH] refactor((CustomerTransaction). refactor(VendorTransaction). refactor(VendorBalanceSummary). refactor(CustomerBalanceSummary) --- .../CustomerBalanceSummaryBody.js | 35 ++++++++++++++++++ .../CustomersBalanceSummary.js | 29 +++++---------- .../CustomersTransactions.js | 28 ++++---------- .../CustomersTransactionsBody.js | 36 ++++++++++++++++++ .../VendorsBalanceSummary.js | 28 ++++---------- .../VendorsBalanceSummaryBody.js | 37 +++++++++++++++++++ .../VendorsBalanceSummaryTable.js | 10 ++--- .../VendorsTransactions.js | 27 ++++---------- .../VendorsTransactionsBody.js | 37 +++++++++++++++++++ .../VendorsTransactionsTable.js | 11 ++---- 10 files changed, 182 insertions(+), 96 deletions(-) create mode 100644 src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.js create mode 100644 src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.js create mode 100644 src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.js create mode 100644 src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.js diff --git a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.js b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.js new file mode 100644 index 000000000..5020bece8 --- /dev/null +++ b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.js @@ -0,0 +1,35 @@ +import React from 'react'; +import * as R from 'ramda'; + +import { FinancialReportBody } from '../FinancialReportPage'; +import CustomersBalanceSummaryTable from './CustomersBalanceSummaryTable'; +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; +import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider'; +import withCurrentOrganization from '../../Organization/withCurrentOrganization'; + +/** + * Customer balance summary body. + * @returns {JSX.Element} + */ +function CustomerBalanceSummaryBodyJSX({ + // #withPreferences + organizationName, +}) { + const { isCustomersBalanceLoading } = useCustomersBalanceSummaryContext(); + + return ( + + {isCustomersBalanceLoading ? ( + + ) : ( + + )} + + ); +} + +export const CustomerBalanceSummaryBody = R.compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(CustomerBalanceSummaryBodyJSX); diff --git a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js index 253ec5ac7..be5ed1903 100644 --- a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js +++ b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js @@ -8,12 +8,11 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import CustomersBalanceSummaryActionsBar from './CustomersBalanceSummaryActionsBar'; import CustomersBalanceSummaryHeader from './CustomersBalanceSummaryHeader'; -import CustomersBalanceSummaryTable from './CustomersBalanceSummaryTable'; +import { CustomerBalanceSummaryBody } from './CustomerBalanceSummaryBody'; import { CustomersBalanceLoadingBar } from './components'; import { CustomersBalanceSummaryProvider } from './CustomersBalanceSummaryProvider'; import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions'; -import withCurrentOrganization from '../../Organization/withCurrentOrganization'; import { compose } from 'redux'; @@ -21,9 +20,6 @@ import { compose } from 'redux'; * Customers Balance summary. */ function CustomersBalanceSummary({ - // #withPreferences - organizationName, - // #withCustomersBalanceSummaryActions toggleCustomerBalanceFilterDrawer, }) { @@ -66,23 +62,16 @@ function CustomersBalanceSummary({ -
- -
- -
-
+ + ); } -export default compose( - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), - withCustomersBalanceSummaryActions, -)(CustomersBalanceSummary); +export default compose(withCustomersBalanceSummaryActions)( + CustomersBalanceSummary, +); diff --git a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.js b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.js index 4d928e7dc..fe504afb8 100644 --- a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.js +++ b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.js @@ -6,11 +6,10 @@ import { FinancialStatement } from 'components'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import CustomersTransactionsHeader from './CustomersTransactionsHeader'; -import CustomersTransactionsTable from './CustomersTransactionsTable'; import CustomersTransactionsActionsBar from './CustomersTransactionsActionsBar'; +import { CustomersTransactionsBody } from './CustomersTransactionsBody'; import withCustomersTransactionsActions from './withCustomersTransactionsActions'; -import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; import { CustomersTransactionsLoadingBar } from './components'; import { CustomersTransactionsProvider } from './CustomersTransactionsProvider'; @@ -20,9 +19,6 @@ import { compose } from 'utils'; * Customers transactions. */ function CustomersTransactions({ - // #withPreferences - organizationName, - //#withCustomersTransactionsActions toggleCustomersTransactionsFilterDrawer, }) { @@ -66,24 +62,14 @@ function CustomersTransactions({ -
- - -
- -
-
+ + ); } -export default compose( - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), - withCustomersTransactionsActions, -)(CustomersTransactions); +export default compose(withCustomersTransactionsActions)(CustomersTransactions); diff --git a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.js b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.js new file mode 100644 index 000000000..e324b53a8 --- /dev/null +++ b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.js @@ -0,0 +1,36 @@ +import React from 'react'; +import * as R from 'ramda'; + +import withCurrentOrganization from 'containers/Organization/withCurrentOrganization'; + +import CustomersTransactionsTable from './CustomersTransactionsTable'; +import { FinancialReportBody } from '../FinancialReportPage'; +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; + +import { useCustomersTransactionsContext } from './CustomersTransactionsProvider'; + +/** + * Customers transactions body. + */ +function CustomersTransactionsBodyJSX({ + // #withCurrentOrganization + organizationName, +}) { + const { isCustomersTransactionsLoading } = useCustomersTransactionsContext(); + + return ( + + {isCustomersTransactionsLoading ? ( + + ) : ( + + )} + + ); +} + +export const CustomersTransactionsBody = R.compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(CustomersTransactionsBodyJSX); diff --git a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.js b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.js index 894279804..ff2fcd34e 100644 --- a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.js +++ b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.js @@ -8,23 +8,18 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import VendorsBalanceSummaryActionsBar from './VendorsBalanceSummaryActionsBar'; import VendorsBalanceSummaryHeader from './VendorsBalanceSummaryHeader'; -import VendorsBalanceSummaryTable from './VendorsBalanceSummaryTable'; import { VendorsBalanceSummaryProvider } from './VendorsBalanceSummaryProvider'; import { VendorsSummarySheetLoadingBar } from './components'; import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions'; -import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; - import { compose } from 'utils'; +import { VendorBalanceSummaryBody } from './VendorsBalanceSummaryBody'; /** * Vendors Balance summary. */ function VendorsBalanceSummary({ - // #withPreferences - organizationName, - // #withVendorsBalanceSummaryActions toggleVendorSummaryFilterDrawer, }) { @@ -67,24 +62,15 @@ function VendorsBalanceSummary({ -
- -
- -
-
+ + ); } -export default compose( - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), - withVendorsBalanceSummaryActions, -)(VendorsBalanceSummary); +export default compose(withVendorsBalanceSummaryActions)(VendorsBalanceSummary); diff --git a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.js b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.js new file mode 100644 index 000000000..8244c8107 --- /dev/null +++ b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.js @@ -0,0 +1,37 @@ +import React from 'react'; +import * as R from 'ramda'; + +import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; +import VendorsBalanceSummaryTable from './VendorsBalanceSummaryTable'; +import { FinancialReportBody } from '../FinancialReportPage'; + +import withCurrentOrganization from 'containers/Organization/withCurrentOrganization'; + +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; + +/** + * Vendor balance summary body. + * @returns {JSX.Element} + */ +function VendorsBalanceSummaryBodyJSX({ + // #withCurrentOrganization + organizationName, +}) { + const { isVendorsBalanceLoading } = useVendorsBalanceSummaryContext(); + + return ( + + {isVendorsBalanceLoading ? ( + + ) : ( + + )} + + ); +} + +export const VendorBalanceSummaryBody = R.compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(VendorsBalanceSummaryBodyJSX); diff --git a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js index 0717b0cbd..2c8fec324 100644 --- a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js +++ b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js @@ -6,6 +6,8 @@ import { DataTable, FinancialSheet } from 'components'; import { useVendorsBalanceColumns } from './components'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; +import { tableRowTypesToClassnames } from 'utils'; + /** * Vendors balance summary table. */ @@ -15,29 +17,23 @@ export default function VendorsBalanceSummaryTable({ }) { const { VendorBalanceSummary: { table }, - isVendorsBalanceLoading, } = useVendorsBalanceSummaryContext(); // vendors balance summary columns. const columns = useVendorsBalanceColumns(); - const rowClassNames = (row) => { - return [`row-type--${row.original.row_types}`]; - }; - return ( diff --git a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.js b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.js index f28fb6313..c658cc29a 100644 --- a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.js +++ b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.js @@ -7,10 +7,9 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import VendorsTransactionsHeader from './VendorsTransactionsHeader'; import VendorsTransactionsActionsBar from './VendorsTransactionsActionsBar'; -import VendorsTransactionsTable from './VendorsTransactionsTable'; +import { VendorsTransactionsBody } from './VendorsTransactionsBody'; import withVendorsTransactionsActions from './withVendorsTransactionsActions'; -import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; import { VendorsTransactionsProvider } from './VendorsTransactionsProvider'; import { VendorsTransactionsLoadingBar } from './components'; @@ -21,9 +20,6 @@ import { compose } from 'utils'; * Vendors transactions. */ function VendorsTransactions({ - // #withPreferences - organizationName, - //#withVendorsTransactionsActions toggleVendorsTransactionsFilterDrawer, }) { @@ -67,23 +63,14 @@ function VendorsTransactions({ -
- -
- -
-
+ + ); } -export default compose( - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), - withVendorsTransactionsActions, -)(VendorsTransactions); +export default compose(withVendorsTransactionsActions)(VendorsTransactions); diff --git a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.js b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.js new file mode 100644 index 000000000..447356b6a --- /dev/null +++ b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.js @@ -0,0 +1,37 @@ +import React from 'react'; +import * as R from 'ramda'; + +import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; + +import { FinancialReportBody } from '../FinancialReportPage'; +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; +import VendorsTransactionsTable from './VendorsTransactionsTable'; + +import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; + +/** + * Vendors transactions body. + * @returns {JSX.Element} + */ +function VendorsTransactionsBodyJSX({ + // #withPreferences + organizationName, +}) { + const { isVendorsTransactionsLoading } = useVendorsTransactionsContext(); + + return ( + + {isVendorsTransactionsLoading ? ( + + ) : ( + + )} + + ); +} + +export const VendorsTransactionsBody = R.compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(VendorsTransactionsBodyJSX); diff --git a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js index af549d401..737861626 100644 --- a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js +++ b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js @@ -6,7 +6,8 @@ import { DataTable, FinancialSheet } from 'components'; import { useVendorsTransactionsColumns } from './components'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; -import { defaultExpanderReducer } from 'utils'; +import { defaultExpanderReducer, tableRowTypesToClassnames } from 'utils'; +import { TableStyle } from 'common'; /** * Vendors transactions table. @@ -31,10 +32,6 @@ export default function VendorsTransactionsTable({ [tableRows], ); - const rowClassNames = (row) => { - return [`row-type--${row.original.row_types}`]; - }; - return ( );