fix: resources table issues.

This commit is contained in:
a.bouhuolia
2021-02-21 16:03:17 +02:00
parent 350a148747
commit f96166514b
13 changed files with 68 additions and 29 deletions

View File

@@ -7,6 +7,7 @@ import ManualJournalsEmptyStatus from './ManualJournalsEmptyStatus';
import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
import withManualJournals from './withManualJournals';
import withManualJournalsActions from './withManualJournalsActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
@@ -26,6 +27,9 @@ function ManualJournalsDataTable({
// #withAlertsActions
openAlert,
// #withManualJournals
manualJournalsTableState,
// #ownProps
onSelectedRowsChange,
}) {
@@ -80,6 +84,7 @@ function ManualJournalsDataTable({
noInitialFetch={true}
columns={columns}
data={manualJournals}
initialState={manualJournalsTableState}
manualSortBy={true}
selectionColumn={true}
expandable={true}
@@ -106,5 +111,8 @@ function ManualJournalsDataTable({
export default compose(
withManualJournalsActions,
withManualJournals(({ manualJournalsTableState }) => ({
manualJournalsTableState,
})),
withAlertsActions,
)(ManualJournalsDataTable);

View File

@@ -1,5 +1,4 @@
import React, { useEffect } from 'react';
import { useIntl } from 'react-intl';
import React from 'react';
import { DashboardContentTable, DashboardPageContent } from 'components';
@@ -9,7 +8,6 @@ import ManualJournalsViewTabs from './ManualJournalsViewTabs';
import ManualJournalsDataTable from './ManualJournalsDataTable';
import ManualJournalsActionsBar from './ManualJournalActionsBar';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withManualJournals from './withManualJournals';
import { transformTableStateToQuery, compose } from 'utils';
@@ -20,19 +18,9 @@ import 'style/pages/ManualJournal/List.scss';
* Manual journals table.
*/
function ManualJournalsTable({
// #withDashboardActions
changePageTitle,
// #withManualJournals
journalsTableState,
}) {
const { formatMessage } = useIntl();
// Handle update the page title.
useEffect(() => {
changePageTitle(formatMessage({ id: 'manual_journals' }));
}, [changePageTitle, formatMessage]);
return (
<ManualJournalsListProvider
query={transformTableStateToQuery(journalsTableState)}
@@ -53,7 +41,6 @@ function ManualJournalsTable({
}
export default compose(
withDashboardActions,
withManualJournals(({ manualJournalsTableState }) => ({
journalsTableState: manualJournalsTableState,
})),