diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js index bcbfa7354..ff5093e0d 100644 --- a/client/src/containers/Accounting/MakeJournalEntriesForm.js +++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js @@ -270,7 +270,7 @@ function MakeJournalEntriesForm({ export default compose( withJournalsActions, - withManualJournalDetail, + withManualJournalDetail(), withAccountsActions, withDashboardActions, withMediaActions, diff --git a/client/src/containers/Accounting/withManualJournalDetail.js b/client/src/containers/Accounting/withManualJournalDetail.js index 1faeec322..a51f1ef5a 100644 --- a/client/src/containers/Accounting/withManualJournalDetail.js +++ b/client/src/containers/Accounting/withManualJournalDetail.js @@ -1,8 +1,11 @@ import { connect } from 'react-redux'; -import { getManualJournal } from 'store/manualJournals/manualJournals.reducers'; +import { getManualJournalByIdFactory } from 'store/manualJournals/manualJournals.selectors'; -const mapStateToProps = (state, props) => ({ - manualJournal: getManualJournal(state, props.manualJournalId), -}); +export default () => { + const getManualJournalById = getManualJournalByIdFactory(); -export default connect(mapStateToProps); + const mapStateToProps = (state, props) => ({ + manualJournal: getManualJournalById(state, props), + }); + return connect(mapStateToProps); +}; \ No newline at end of file diff --git a/client/src/store/manualJournals/manualJournals.selectors.js b/client/src/store/manualJournals/manualJournals.selectors.js index 30eb44a7c..987207bf7 100644 --- a/client/src/store/manualJournals/manualJournals.selectors.js +++ b/client/src/store/manualJournals/manualJournals.selectors.js @@ -1,7 +1,12 @@ import { createSelector } from 'reselect'; -import { pickItemsFromIds, paginationLocationQuery, defaultPaginationMeta } from 'store/selectors'; +import { + pickItemsFromIds, + paginationLocationQuery, + defaultPaginationMeta, +} from 'store/selectors'; -const manualJournalsCurrentViewIdSelector = (state) => state.manualJournals.currentViewId; +const manualJournalsCurrentViewIdSelector = (state) => + state.manualJournals.currentViewId; const manualJournalsPageSelector = (state) => { const viewId = state.manualJournals.currentViewId; @@ -18,7 +23,7 @@ const manualJournalsPaginationSelector = (state, props) => { const manualJournalsTableQuery = (state) => state.manualJournals.tableQuery; const manualJournalsDataSelector = (state) => state.manualJournals.items; - +const manualJournalByIdSelector = (state, props) => state.manualJournals.items[props.manualJournalId]; // Retrieve manual jounral current page results. export const getManualJournalsItems = createSelector( @@ -55,10 +60,12 @@ export const getManualJournalsTableQuery = createSelector( ); // Retrieve manual journals current view id. -export const getManualJournalsCurrentViewIdFactory = () => - createSelector( - manualJournalsCurrentViewIdSelector, - (currentViewId) => { - return currentViewId; - }, - ); \ No newline at end of file +export const getManualJournalsCurrentViewIdFactory = () => + createSelector(manualJournalsCurrentViewIdSelector, (currentViewId) => { + return currentViewId; + }); + +export const getManualJournalByIdFactory = () => + createSelector(manualJournalByIdSelector, (manualJournal) => { + return manualJournal; + });