From e1f56c873beb7cce3c458d21a00b8decf112795e Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Mon, 1 Jun 2020 19:21:47 +0200 Subject: [PATCH] Fix & connectors folder --- client/src/components/App.js | 2 - .../components/Dashboard/DashboardTopbar.js | 4 +- client/src/connectors/Accounts.connector.js | 108 ++++---- client/src/connectors/Dashboard.connector.js | 40 +-- client/src/connectors/Dialog.connector.js | 20 +- .../connectors/GeneralLedgerSheet.connect.js | 34 +-- .../src/connectors/ItemFormDialog.connect.js | 39 ++- client/src/connectors/Items.connect.js | 94 +++---- .../src/connectors/ItemsCategory.connect.js | 58 ++-- client/src/connectors/Media.connect.js | 24 +- client/src/connectors/Resource.connector.js | 38 +-- client/src/connectors/Search.connect.js | 22 +- client/src/connectors/Settings.connect.js | 30 +- .../connectors/TrialBalanceSheet.connect.js | 38 +-- .../connectors/UserFormDialog.connector.js | 30 -- client/src/connectors/UsersList.connector.js | 44 --- .../connectors/UsersPreferences.connector.js | 18 +- .../Accounting/MakeJournalEntriesForm.js | 4 +- .../Accounting/ManualJournalActionsBar.js | 5 +- .../Accounting/ManualJournalsDataTable.js | 4 +- .../containers/Accounts/AccountsActionsBar.js | 91 +++--- .../containers/Accounts/AccountsDataTable.js | 5 +- .../Dialogs/AccountFormDialog.container.js | 11 +- .../src/containers/Dialogs/CurrencyDialog.js | 5 +- .../Dialogs/ExchangeRateDialog.container.js | 4 +- .../containers/Dialogs/InviteUserDialog.js | 6 +- .../containers/Dialogs/ItemCategoryDialog.js | 4 +- .../src/containers/Dialogs/ItemFromDialog.js | 262 +++++++++--------- .../Dialogs/UserFormDialog.connector.js | 19 ++ .../src/containers/Dialogs/UserFormDialog.js | 7 +- .../Dialogs/UsersListDialog.connector.js | 22 ++ client/src/containers/Dialogs/withDialog.js | 13 + .../ExchangeRates/ExchangeRateActionsBar.js | 2 +- .../ExchangeRates/ExchangeRateTable.js | 4 +- .../BalanceSheet/BalanceSheetTable.js | 4 +- .../GeneralLedger/GeneralLedgerHeader.js | 5 +- .../FinancialStatements/Journal/Journal.js | 5 +- .../ProfitLossSheet/ProfitLossSheet.js | 7 +- client/src/containers/GeneralSearch/Search.js | 6 +- .../containers/GeneralSearch/withSearch.js | 15 + .../containers/Items/ItemCategoriesList.js | 45 ++- .../src/containers/Items/ItemsActionsBar.js | 4 +- .../Items/ItemsCategoryActionsBar.js | 50 ++-- .../Preferences/Currencies/Currencies.js | 6 +- .../Currencies/CurrenciesActions.js | 4 +- .../Preferences/Currencies/CurrenciesList.js | 6 +- .../src/containers/Preferences/Users/Users.js | 4 +- .../Preferences/Users/UsersActions.js | 4 +- .../containers/Preferences/Users/UsersList.js | 5 +- .../Preferences/Users/withUserPreferences.js | 13 + .../src/containers/Users/withUsersActions.js | 3 + 51 files changed, 665 insertions(+), 632 deletions(-) delete mode 100644 client/src/connectors/UserFormDialog.connector.js delete mode 100644 client/src/connectors/UsersList.connector.js create mode 100644 client/src/containers/Dialogs/UserFormDialog.connector.js create mode 100644 client/src/containers/Dialogs/UsersListDialog.connector.js create mode 100644 client/src/containers/Dialogs/withDialog.js create mode 100644 client/src/containers/GeneralSearch/withSearch.js create mode 100644 client/src/containers/Preferences/Users/withUserPreferences.js diff --git a/client/src/components/App.js b/client/src/components/App.js index 7d6496314..e68fd59db 100644 --- a/client/src/components/App.js +++ b/client/src/components/App.js @@ -9,7 +9,6 @@ import PrivateRoute from 'components/PrivateRoute'; import Authentication from 'components/Authentication'; import Dashboard from 'components/Dashboard/Dashboard'; import GlobalErrors from 'containers/GlobalErrors/GlobalErrors'; -import AuthenticationDialogs from 'containers/Authentication/AuthenticationDialogs'; import messages from 'lang/en'; import 'style/App.scss'; @@ -30,7 +29,6 @@ function App({ locale }) { - diff --git a/client/src/components/Dashboard/DashboardTopbar.js b/client/src/components/Dashboard/DashboardTopbar.js index 0dbb29003..78972ccb4 100644 --- a/client/src/components/Dashboard/DashboardTopbar.js +++ b/client/src/components/Dashboard/DashboardTopbar.js @@ -11,7 +11,7 @@ import { FormattedMessage as T } from 'react-intl'; import DashboardTopbarUser from 'components/Dashboard/TopbarUser'; import DashboardBreadcrumbs from 'components/Dashboard/DashboardBreadcrumbs'; -import SearchConnect from 'connectors/Search.connect'; +import withSearch from 'containers/GeneralSearch/withSearch' import Icon from 'components/Icon'; import { compose } from 'utils'; @@ -113,6 +113,6 @@ const mapStateToProps = (state) => ({ }); export default compose( - SearchConnect, + withSearch, connect(mapStateToProps) )(DashboardTopbar); diff --git a/client/src/connectors/Accounts.connector.js b/client/src/connectors/Accounts.connector.js index 6d2e6802c..8b4e3bdf8 100644 --- a/client/src/connectors/Accounts.connector.js +++ b/client/src/connectors/Accounts.connector.js @@ -1,60 +1,60 @@ -import { connect } from 'react-redux'; -import t from 'store/types'; -import { - fetchAccountTypes, - fetchAccountsList, - deleteAccount, - inactiveAccount, - fetchAccountsTable, - submitAccount, - fetchAccount, - deleteBulkAccounts, -} from 'store/accounts/accounts.actions'; -import { - getAccountsItems, -} from 'store/accounts/accounts.selectors'; -import { - getResourceViews, -} from 'store/customViews/customViews.selectors'; -import { - getItemById -} from 'store/selectors'; +// import { connect } from 'react-redux'; +// import t from 'store/types'; +// import { +// fetchAccountTypes, +// fetchAccountsList, +// deleteAccount, +// inactiveAccount, +// fetchAccountsTable, +// submitAccount, +// fetchAccount, +// deleteBulkAccounts, +// } from 'store/accounts/accounts.actions'; +// import { +// getAccountsItems, +// } from 'store/accounts/accounts.selectors'; +// import { +// getResourceViews, +// } from 'store/customViews/customViews.selectors'; +// import { +// getItemById +// } from 'store/selectors'; -const mapStateToProps = (state, props) => ({ - views: getResourceViews(state, 'accounts'), - accounts: getAccountsItems(state, state.accounts.currentViewId), - accountsTypes: state.accounts.accountsTypes, +// const mapStateToProps = (state, props) => ({ +// views: getResourceViews(state, 'accounts'), +// accounts: getAccountsItems(state, state.accounts.currentViewId), +// accountsTypes: state.accounts.accountsTypes, - tableQuery: state.accounts.tableQuery, - accountsLoading: state.accounts.loading, - accountErrors: state.accounts.errors, +// tableQuery: state.accounts.tableQuery, +// accountsLoading: state.accounts.loading, +// accountErrors: state.accounts.errors, - getAccountById: (id) => getItemById(state.accounts.items, id), -}); +// getAccountById: (id) => getItemById(state.accounts.items, id), +// }); -const mapActionsToProps = (dispatch) => ({ - requestFetchAccounts: (query) => dispatch(fetchAccountsList({ query })), - requestFetchAccountTypes: () => dispatch(fetchAccountTypes()), - requestSubmitAccount: ({ form }) => dispatch(submitAccount({ form })), - requestDeleteAccount: (id) => dispatch(deleteAccount({ id })), - requestInactiveAccount: (id) => dispatch(inactiveAccount({ id })), - requestFetchAccount: (id) => dispatch(fetchAccount({ id })), - requestFetchAccountsTable: (query = {}) => dispatch(fetchAccountsTable({ query: { ...query } })), - requestDeleteBulkAccounts: (ids) => dispatch(deleteBulkAccounts({ ids })), +// const mapActionsToProps = (dispatch) => ({ +// requestFetchAccounts: (query) => dispatch(fetchAccountsList({ query })), +// requestFetchAccountTypes: () => dispatch(fetchAccountTypes()), +// requestSubmitAccount: ({ form }) => dispatch(submitAccount({ form })), +// requestDeleteAccount: (id) => dispatch(deleteAccount({ id })), +// requestInactiveAccount: (id) => dispatch(inactiveAccount({ id })), +// requestFetchAccount: (id) => dispatch(fetchAccount({ id })), +// requestFetchAccountsTable: (query = {}) => dispatch(fetchAccountsTable({ query: { ...query } })), +// requestDeleteBulkAccounts: (ids) => dispatch(deleteBulkAccounts({ ids })), - changeCurrentView: (id) => dispatch({ - type: t.ACCOUNTS_SET_CURRENT_VIEW, - currentViewId: parseInt(id, 10), - }), - setAccountsTableQuery: (key, value) => dispatch({ - type: 'ACCOUNTS_TABLE_QUERY_SET', key, value, - }), - addAccountsTableQueries: (queries) => dispatch({ - type: 'ACCOUNTS_TABLE_QUERIES_ADD', queries, - }), - setSelectedRowsAccounts: (ids) => dispatch({ - type: t.ACCOUNTS_SELECTED_ROWS_SET, payload: { ids }, - }), -}); +// changeCurrentView: (id) => dispatch({ +// type: t.ACCOUNTS_SET_CURRENT_VIEW, +// currentViewId: parseInt(id, 10), +// }), +// setAccountsTableQuery: (key, value) => dispatch({ +// type: 'ACCOUNTS_TABLE_QUERY_SET', key, value, +// }), +// addAccountsTableQueries: (queries) => dispatch({ +// type: 'ACCOUNTS_TABLE_QUERIES_ADD', queries, +// }), +// setSelectedRowsAccounts: (ids) => dispatch({ +// type: t.ACCOUNTS_SELECTED_ROWS_SET, payload: { ids }, +// }), +// }); -export default connect(mapStateToProps, mapActionsToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapActionsToProps); \ No newline at end of file diff --git a/client/src/connectors/Dashboard.connector.js b/client/src/connectors/Dashboard.connector.js index 6c3ce2bf9..546dc5f2e 100644 --- a/client/src/connectors/Dashboard.connector.js +++ b/client/src/connectors/Dashboard.connector.js @@ -1,27 +1,27 @@ -import { connect } from 'react-redux'; -import t from 'store/types'; +// import { connect } from 'react-redux'; +// import t from 'store/types'; -const mapActionsToProps = (dispatch) => ({ - changePageTitle: (pageTitle) => dispatch({ - type: t.CHANGE_DASHBOARD_PAGE_TITLE, pageTitle - }), +// const mapActionsToProps = (dispatch) => ({ +// changePageTitle: (pageTitle) => dispatch({ +// type: t.CHANGE_DASHBOARD_PAGE_TITLE, pageTitle +// }), - changePageSubtitle: (pageSubtitle) => dispatch({ - type: t.ALTER_DASHBOARD_PAGE_SUBTITLE, pageSubtitle, - }), +// changePageSubtitle: (pageSubtitle) => dispatch({ +// type: t.ALTER_DASHBOARD_PAGE_SUBTITLE, pageSubtitle, +// }), - setTopbarEditView: (id) => dispatch({ - type: t.SET_TOPBAR_EDIT_VIEW, id, - }), +// setTopbarEditView: (id) => dispatch({ +// type: t.SET_TOPBAR_EDIT_VIEW, id, +// }), - setDashboardRequestLoading: () => dispatch({ - type: t.SET_DASHBOARD_REQUEST_LOADING, - }), +// setDashboardRequestLoading: () => dispatch({ +// type: t.SET_DASHBOARD_REQUEST_LOADING, +// }), - setDashboardRequestCompleted: () => dispatch({ - type: t.SET_DASHBOARD_REQUEST_COMPLETED, - }), -}); +// setDashboardRequestCompleted: () => dispatch({ +// type: t.SET_DASHBOARD_REQUEST_COMPLETED, +// }), +// }); -export default connect(null, mapActionsToProps); \ No newline at end of file +// export default connect(null, mapActionsToProps); \ No newline at end of file diff --git a/client/src/connectors/Dialog.connector.js b/client/src/connectors/Dialog.connector.js index 2e0699206..2b6e78611 100644 --- a/client/src/connectors/Dialog.connector.js +++ b/client/src/connectors/Dialog.connector.js @@ -1,13 +1,13 @@ -import { connect } from 'react-redux'; -import t from 'store/types'; +// import { connect } from 'react-redux'; +// import t from 'store/types'; -export const mapStateToProps = (state, props) => { - return {}; -}; +// export const mapStateToProps = (state, props) => { +// return {}; +// }; -export const mapDispatchToProps = (dispatch) => ({ - openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }), - closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }), +// closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/connectors/GeneralLedgerSheet.connect.js b/client/src/connectors/GeneralLedgerSheet.connect.js index b2dce1895..1b72266b9 100644 --- a/client/src/connectors/GeneralLedgerSheet.connect.js +++ b/client/src/connectors/GeneralLedgerSheet.connect.js @@ -1,20 +1,20 @@ -import {connect} from 'react-redux'; -import { - fetchGeneralLedger, -} from 'store/financialStatement/financialStatements.actions'; -import { - getFinancialSheetIndexByQuery, - getFinancialSheet, -} from 'store/financialStatement/financialStatements.selectors'; +// import {connect} from 'react-redux'; +// import { +// fetchGeneralLedger, +// } from 'store/financialStatement/financialStatements.actions'; +// import { +// getFinancialSheetIndexByQuery, +// getFinancialSheet, +// } from 'store/financialStatement/financialStatements.selectors'; -export const mapStateToProps = (state, props) => ({ - getGeneralLedgerSheetIndex: (query) => getFinancialSheetIndexByQuery(state.financialStatements.generalLedger.sheets, query), - getGeneralLedgerSheet: (index) => getFinancialSheet(state.financialStatements.generalLedger.sheets, index), - generalLedgerSheetLoading: state.financialStatements.generalLedger.loading, -}); +// export const mapStateToProps = (state, props) => ({ +// getGeneralLedgerSheetIndex: (query) => getFinancialSheetIndexByQuery(state.financialStatements.generalLedger.sheets, query), +// getGeneralLedgerSheet: (index) => getFinancialSheet(state.financialStatements.generalLedger.sheets, index), +// generalLedgerSheetLoading: state.financialStatements.generalLedger.loading, +// }); -export const mapDispatchToProps = (dispatch) => ({ - fetchGeneralLedger: (query = {}) => dispatch(fetchGeneralLedger({ query })), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// fetchGeneralLedger: (query = {}) => dispatch(fetchGeneralLedger({ query })), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/connectors/ItemFormDialog.connect.js b/client/src/connectors/ItemFormDialog.connect.js index 14cf851bf..e5e73f139 100644 --- a/client/src/connectors/ItemFormDialog.connect.js +++ b/client/src/connectors/ItemFormDialog.connect.js @@ -1,24 +1,23 @@ -//FIXME: FIX Later Need More Work -import { connect } from 'react-redux'; -import { - submitItemCategory, - submitCategory, - fetchCategory -} from 'store/itemCategories/itemsCategory.actions'; +// import { connect } from 'react-redux'; +// import { +// submitItemCategory, +// submitCategory, +// fetchCategory +// } from 'store/itemCategories/itemsCategory.actions'; -export const mapStateToProps = (state, props) => { - return { - category: state.category, - name: 'item-form', - payload: { action: 'new', id: null } - }; -}; +// export const mapStateToProps = (state, props) => { +// return { +// category: state.category, +// name: 'item-form', +// payload: { action: 'new', id: null } +// }; +// }; -export const mapDispatchToProps = dispatch => ({ - submitItemCategory: form => dispatch(submitItemCategory({ form })), - submitCategory: form => dispatch(submitCategory({ form })), - fetchCategory: () => dispatch(fetchCategory()) -}); +// export const mapDispatchToProps = dispatch => ({ +// submitItemCategory: form => dispatch(submitItemCategory({ form })), +// submitCategory: form => dispatch(submitCategory({ form })), +// fetchCategory: () => dispatch(fetchCategory()) +// }); -export default connect(mapStateToProps, mapDispatchToProps); +// export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/Items.connect.js b/client/src/connectors/Items.connect.js index 3a483f39f..96660cb0e 100644 --- a/client/src/connectors/Items.connect.js +++ b/client/src/connectors/Items.connect.js @@ -1,53 +1,51 @@ +// import {connect} from 'react-redux'; +// import { +// fetchItems, +// deleteItem, +// submitItem, +// } from 'store/items/items.actions'; +// import { +// getResourceViews, +// getViewPages, +// } from 'store/customViews/customViews.selectors' +// import { +// getCurrentPageResults +// } from 'store/selectors'; +// import t from 'store/types'; +// export const mapStateToProps = (state, props) => { +// const viewPages = getViewPages(state.items.views, state.items.currentViewId); -import {connect} from 'react-redux'; -import { - fetchItems, - deleteItem, - submitItem, -} from 'store/items/items.actions'; -import { - getResourceViews, - getViewPages, -} from 'store/customViews/customViews.selectors' -import { - getCurrentPageResults -} from 'store/selectors'; -import t from 'store/types'; +// return { +// views: getResourceViews(state, 'items'), +// currentPageItems: getCurrentPageResults( +// state.items.items, +// viewPages, +// state.items.currentPage, +// ), +// bulkSelected: state.items.bulkActions, +// itemsTableLoading: state.items.loading, +// }; +// }; -export const mapStateToProps = (state, props) => { - const viewPages = getViewPages(state.items.views, state.items.currentViewId); +// export const mapDispatchToProps = (dispatch) => ({ +// requestFetchItems: (query) => dispatch(fetchItems({ query })), +// requestDeleteItem: (id) => dispatch(deleteItem({ id })), +// requestSubmitItem: (form) => dispatch(submitItem({ form })), +// addBulkActionItem: (id) => dispatch({ +// type: t.ITEM_BULK_ACTION_ADD, itemId: id +// }), +// removeBulkActionItem: (id) => dispatch({ +// type: t.ITEM_BULK_ACTION_REMOVE, itemId: id, +// }), - return { - views: getResourceViews(state, 'items'), - currentPageItems: getCurrentPageResults( - state.items.items, - viewPages, - state.items.currentPage, - ), - bulkSelected: state.items.bulkActions, - itemsTableLoading: state.items.loading, - }; -}; +// setItemsTableQuery: (key, value) => dispatch({ +// type: t.ITEMS_TABLE_QUERY_SET, key, value, +// }), +// addItemsTableQueries: (queries) => +// dispatch({ +// type: t.ITEMS_TABLE_QUERIES_ADD, queries, +// }), +// }); -export const mapDispatchToProps = (dispatch) => ({ - requestFetchItems: (query) => dispatch(fetchItems({ query })), - requestDeleteItem: (id) => dispatch(deleteItem({ id })), - requestSubmitItem: (form) => dispatch(submitItem({ form })), - addBulkActionItem: (id) => dispatch({ - type: t.ITEM_BULK_ACTION_ADD, itemId: id - }), - removeBulkActionItem: (id) => dispatch({ - type: t.ITEM_BULK_ACTION_REMOVE, itemId: id, - }), - - setItemsTableQuery: (key, value) => dispatch({ - type: t.ITEMS_TABLE_QUERY_SET, key, value, - }), - addItemsTableQueries: (queries) => - dispatch({ - type: t.ITEMS_TABLE_QUERIES_ADD, queries, - }), -}); - -export default connect(mapStateToProps, mapDispatchToProps); +// export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/ItemsCategory.connect.js b/client/src/connectors/ItemsCategory.connect.js index d56e1fb1a..a82c4f494 100644 --- a/client/src/connectors/ItemsCategory.connect.js +++ b/client/src/connectors/ItemsCategory.connect.js @@ -1,32 +1,32 @@ -import { connect } from 'react-redux'; -import { - fetchItemCategories, - submitItemCategory, - deleteItemCategory, - editItemCategory, -} from 'store/itemCategories/itemsCategory.actions'; -import { getDialogPayload } from 'store/dashboard/dashboard.reducer'; -import { getCategoryId } from 'store/itemCategories/itemsCategory.reducer'; +// import { connect } from 'react-redux'; +// import { +// fetchItemCategories, +// submitItemCategory, +// deleteItemCategory, +// editItemCategory, +// } from 'store/itemCategories/itemsCategory.actions'; +// import { getDialogPayload } from 'store/dashboard/dashboard.reducer'; +// import { getCategoryId } from 'store/itemCategories/itemsCategory.reducer'; -export const mapStateToProps = (state, props) => { - const dialogPayload = getDialogPayload(state, 'item-form'); +// export const mapStateToProps = (state, props) => { +// const dialogPayload = getDialogPayload(state, 'item-form'); - return { - categories: Object.values(state.itemCategories.categories), - name: 'item-form', - payload: { action: 'new', id: null }, - editItemCategory: - dialogPayload && dialogPayload.action === 'edit' - ? state.itemCategories.categories[dialogPayload.id] - : {}, - getCategoryId: (id) => getCategoryId(state, id), - }; -}; -export const mapDispatchToProps = (dispatch) => ({ - requestSubmitItemCategory: (form) => dispatch(submitItemCategory({ form })), - requestFetchItemCategories: () => dispatch(fetchItemCategories()), - requestDeleteItemCategory: (id) => dispatch(deleteItemCategory(id)), - requestEditItemCategory: (id, form) => dispatch(editItemCategory(id, form)), -}); +// return { +// categories: Object.values(state.itemCategories.categories), +// name: 'item-form', +// payload: { action: 'new', id: null }, +// editItemCategory: +// dialogPayload && dialogPayload.action === 'edit' +// ? state.itemCategories.categories[dialogPayload.id] +// : {}, +// getCategoryId: (id) => getCategoryId(state, id), +// }; +// }; +// export const mapDispatchToProps = (dispatch) => ({ +// requestSubmitItemCategory: (form) => dispatch(submitItemCategory({ form })), +// requestFetchItemCategories: () => dispatch(fetchItemCategories()), +// requestDeleteItemCategory: (id) => dispatch(deleteItemCategory(id)), +// requestEditItemCategory: (id, form) => dispatch(editItemCategory(id, form)), +// }); -export default connect(mapStateToProps, mapDispatchToProps); +// export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/Media.connect.js b/client/src/connectors/Media.connect.js index aa8430f2e..739b216b3 100644 --- a/client/src/connectors/Media.connect.js +++ b/client/src/connectors/Media.connect.js @@ -1,16 +1,16 @@ -import {connect} from 'react-redux'; -import { - submitMedia, - deleteMedia, -} from 'store/media/media.actions'; +// import {connect} from 'react-redux'; +// import { +// submitMedia, +// deleteMedia, +// } from 'store/media/media.actions'; -export const mapStateToProps = (state, props) => ({ +// export const mapStateToProps = (state, props) => ({ -}); +// }); -export const mapDispatchToProps = (dispatch) => ({ - requestSubmitMedia: (form, config) => dispatch(submitMedia({ form, config })), - requestDeleteMedia: (ids) => dispatch(deleteMedia({ ids })), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// requestSubmitMedia: (form, config) => dispatch(submitMedia({ form, config })), +// requestDeleteMedia: (ids) => dispatch(deleteMedia({ ids })), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/connectors/Resource.connector.js b/client/src/connectors/Resource.connector.js index b6fb00d56..8c3a2545d 100644 --- a/client/src/connectors/Resource.connector.js +++ b/client/src/connectors/Resource.connector.js @@ -1,28 +1,28 @@ -import {connect} from 'react-redux'; -import { - fetchResourceColumns, - fetchResourceFields, -} from 'store/resources/resources.actions'; -import { - getResourceColumns, - getResourceFields, - getResourceColumn, - getResourceField, - getResourceMetadata, -} from 'store/resources/resources.reducer'; +// import {connect} from 'react-redux'; +// import { +// fetchResourceColumns, +// fetchResourceFields, +// } from 'store/resources/resources.actions'; +// import { +// getResourceColumns, +// getResourceFields, +// getResourceColumn, +// getResourceField, +// getResourceMetadata, +// } from 'store/resources/resources.reducer'; -export const mapStateToProps = (state, props) => ({ +// export const mapStateToProps = (state, props) => ({ // getResourceColumns: (resourceSlug) => getResourceColumns(state, resourceSlug), // getResourceFields: (resourceSlug) => getResourceFields(state, resourceSlug), // getResourceMetadata: (resourceSlug) => getResourceMetadata(state, resourceSlug), // getResourceColumn: (columnId) => getResourceColumn(state, columnId), // getResourceField: (fieldId) => getResourceField(state, fieldId), -}); +// }); -export const mapDispatchToProps = (dispatch) => ({ - requestFetchResourceFields: (resourceSlug) => dispatch(fetchResourceFields({ resourceSlug })), - requestFetchResourceColumns: (resourceSlug) => dispatch(fetchResourceColumns({ resourceSlug })), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// requestFetchResourceFields: (resourceSlug) => dispatch(fetchResourceFields({ resourceSlug })), +// requestFetchResourceColumns: (resourceSlug) => dispatch(fetchResourceColumns({ resourceSlug })), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/connectors/Search.connect.js b/client/src/connectors/Search.connect.js index 9845c4fbf..34502dd51 100644 --- a/client/src/connectors/Search.connect.js +++ b/client/src/connectors/Search.connect.js @@ -1,14 +1,14 @@ -import { connect } from 'react-redux'; -import t from 'store/types'; +// import { connect } from 'react-redux'; +// import t from 'store/types'; -export const mapStateToProps = (state, props) => ({ - resultSearch: state.globalSearch.searches, - globalSearchShow: state.globalSearch.isOpen, -}); +// export const mapStateToProps = (state, props) => ({ +// resultSearch: state.globalSearch.searches, +// globalSearchShow: state.globalSearch.isOpen, +// }); -export const mapDispatchToProps = (dispatch) => ({ - openGlobalSearch: (result) => dispatch({ type: t.OPEN_SEARCH, }), - closeGlobalSearch: (result) => dispatch({ type: t.CLOSE_SEARCH }), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// openGlobalSearch: (result) => dispatch({ type: t.OPEN_SEARCH, }), +// closeGlobalSearch: (result) => dispatch({ type: t.CLOSE_SEARCH }), +// }); -export default connect(mapStateToProps, mapDispatchToProps); +// export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/Settings.connect.js b/client/src/connectors/Settings.connect.js index b4b1d35b8..b09a8a1bc 100644 --- a/client/src/connectors/Settings.connect.js +++ b/client/src/connectors/Settings.connect.js @@ -1,19 +1,19 @@ -import { connect } from 'react-redux'; -import { - FetchOptions, - submitOptions, -} from 'store/settings/settings.actions'; +// import { connect } from 'react-redux'; +// import { +// FetchOptions, +// submitOptions, +// } from 'store/settings/settings.actions'; -export const mapStateToProps = (state, props) => { - return { - organizationSettings: state.settings.data.organization, - }; -}; +// export const mapStateToProps = (state, props) => { +// return { +// organizationSettings: state.settings.data.organization, +// }; +// }; -export const mapDispatchToProps = (dispatch) => ({ - requestSubmitOptions: (form) => dispatch(submitOptions({ form })), - requestFetchOptions: () => dispatch(FetchOptions({})), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// requestSubmitOptions: (form) => dispatch(submitOptions({ form })), +// requestFetchOptions: () => dispatch(FetchOptions({})), +// }); -export default connect(mapStateToProps, mapDispatchToProps); +// export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/TrialBalanceSheet.connect.js b/client/src/connectors/TrialBalanceSheet.connect.js index a37049ad6..9bede2e0d 100644 --- a/client/src/connectors/TrialBalanceSheet.connect.js +++ b/client/src/connectors/TrialBalanceSheet.connect.js @@ -1,24 +1,24 @@ -import {connect} from 'react-redux'; -import { - fetchTrialBalanceSheet -} from 'store/financialStatement/financialStatements.actions'; -import { - getFinancialSheetIndexByQuery, - getFinancialSheetAccounts, - getFinancialSheetQuery, -} from 'store/financialStatement/financialStatements.selectors'; +// import {connect} from 'react-redux'; +// import { +// fetchTrialBalanceSheet +// } from 'store/financialStatement/financialStatements.actions'; +// import { +// getFinancialSheetIndexByQuery, +// getFinancialSheetAccounts, +// getFinancialSheetQuery, +// } from 'store/financialStatement/financialStatements.selectors'; -export const mapStateToProps = (state, props) => ({ - getTrialBalanceSheetIndex: (query) => getFinancialSheetIndexByQuery(state.financialStatements.trialBalance.sheets, query), - getTrialBalanceAccounts: (sheetIndex) => getFinancialSheetAccounts(state.financialStatements.trialBalance.sheets, sheetIndex), - getTrialBalanceQuery: (sheetIndex) => getFinancialSheetQuery(state.financialStatements.trialBalance.sheets, sheetIndex), +// export const mapStateToProps = (state, props) => ({ +// getTrialBalanceSheetIndex: (query) => getFinancialSheetIndexByQuery(state.financialStatements.trialBalance.sheets, query), +// getTrialBalanceAccounts: (sheetIndex) => getFinancialSheetAccounts(state.financialStatements.trialBalance.sheets, sheetIndex), +// getTrialBalanceQuery: (sheetIndex) => getFinancialSheetQuery(state.financialStatements.trialBalance.sheets, sheetIndex), - trialBalanceSheetLoading: state.financialStatements.trialBalance.loading, -}); +// trialBalanceSheetLoading: state.financialStatements.trialBalance.loading, +// }); -export const mapDispatchToProps = (dispatch) => ({ - fetchTrialBalanceSheet: (query = {}) => dispatch(fetchTrialBalanceSheet({ query })), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// fetchTrialBalanceSheet: (query = {}) => dispatch(fetchTrialBalanceSheet({ query })), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/connectors/UserFormDialog.connector.js b/client/src/connectors/UserFormDialog.connector.js deleted file mode 100644 index ddd66652f..000000000 --- a/client/src/connectors/UserFormDialog.connector.js +++ /dev/null @@ -1,30 +0,0 @@ -import { connect } from 'react-redux'; -import { submitInvite, editUser, fetchUser } from 'store/users/users.actions'; -import { getUserDetails } from 'store/users/users.reducer'; -import { getDialogPayload } from 'store/dashboard/dashboard.reducer'; -import t from 'store/types'; - -export const mapStateToProps = (state, props) => { - const dialogPayload = getDialogPayload(state, 'user-form'); - - return { - name: 'user-form', - payload: { action: 'new', id: null }, - userDetails: - dialogPayload.action === 'edit' - ? getUserDetails(state, dialogPayload.user.id) - : {}, - }; -}; - -export const mapDispatchToProps = (dispatch) => ({ - openDialog: (name, payload) => - dispatch({ type: t.OPEN_DIALOG, name, payload }), - closeDialog: (name, payload) => - dispatch({ type: t.CLOSE_DIALOG, name, payload }), - requestSubmitInvite: (form) => dispatch(submitInvite({ form })), - requestEditUser: (id, form) => dispatch(editUser({ form, id })), - requestFetchUser: (id) => dispatch(fetchUser({ id })), -}); - -export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/UsersList.connector.js b/client/src/connectors/UsersList.connector.js deleted file mode 100644 index 3811999a2..000000000 --- a/client/src/connectors/UsersList.connector.js +++ /dev/null @@ -1,44 +0,0 @@ -import { connect } from 'react-redux'; -import { - fetchUsers, - fetchUser, - deleteUser, - inactiveUser, - editUser, -} from 'store/users/users.actions'; -import t from 'store/types'; -import { getUserDetails } from 'store/users/users.reducer'; -import { getDialogPayload } from 'store/dashboard/dashboard.reducer'; - -export const mapStateToProps = (state, props) => { - const dialogPayload = getDialogPayload(state, 'userList-form'); - - return { - name: 'userList-form', - payload: { action: 'new', id: null }, - userDetails: - dialogPayload.action === 'edit' - ? getUserDetails(state, dialogPayload.user.id) - : {}, - editUser: - dialogPayload && dialogPayload.action === 'edit' - ? state.users.list.results[dialogPayload.user.id] - : {}, - usersList: state.users.list.results, - }; -}; - -export const mapDispatchToProps = (dispatch) => ({ - openDialog: (name, payload) => - dispatch({ type: t.OPEN_DIALOG, name, payload }), - closeDialog: (name, payload) => - dispatch({ type: t.CLOSE_DIALOG, name, payload }), - - requestFetchUsers: () => dispatch(fetchUsers({})), - requestFetchUser: (id) => dispatch(fetchUser({ id })), - requestDeleteUser: (id) => dispatch(deleteUser({ id })), - requestInactiveUser: (id) => dispatch(inactiveUser({ id })), - requestEditUser: (id, form) => dispatch(editUser({ form, id })), -}); - -export default connect(mapStateToProps, mapDispatchToProps); diff --git a/client/src/connectors/UsersPreferences.connector.js b/client/src/connectors/UsersPreferences.connector.js index bcf813dc0..8244a2df5 100644 --- a/client/src/connectors/UsersPreferences.connector.js +++ b/client/src/connectors/UsersPreferences.connector.js @@ -1,13 +1,13 @@ -import {connect} from 'react-redux'; -import t from 'store/types'; +// import {connect} from 'react-redux'; +// import t from 'store/types'; -export const mapStateToProps = (state, props) => { +// export const mapStateToProps = (state, props) => { -}; +// }; -export const mapDispatchToProps = (dispatch) => ({ - openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }), - closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }), -}); +// export const mapDispatchToProps = (dispatch) => ({ +// openDialog: (name, payload) => dispatch({ type: t.OPEN_DIALOG, name, payload }), +// closeDialog: (name, payload) => dispatch({ type: t.CLOSE_DIALOG, name, payload }), +// }); -export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file +// export default connect(mapStateToProps, mapDispatchToProps); \ No newline at end of file diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js index 0aa08f529..f6924adba 100644 --- a/client/src/containers/Accounting/MakeJournalEntriesForm.js +++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js @@ -17,7 +17,7 @@ import withDashboardActions from 'containers/Dashboard/withDashboard'; import AppToaster from 'components/AppToaster'; import Dragzone from 'components/Dragzone'; -import MediaConnect from 'connectors/Media.connect'; +import withMediaActions from 'containers/Media/withMediaActions'; import useMedia from 'hooks/useMedia'; import {compose} from 'utils'; @@ -271,5 +271,5 @@ export default compose( withManualJournalDetail, withAccountsActions, withDashboardActions, - MediaConnect, + withMediaActions, )(MakeJournalEntriesForm); \ No newline at end of file diff --git a/client/src/containers/Accounting/ManualJournalActionsBar.js b/client/src/containers/Accounting/ManualJournalActionsBar.js index 43fc278b8..94ce55210 100644 --- a/client/src/containers/Accounting/ManualJournalActionsBar.js +++ b/client/src/containers/Accounting/ManualJournalActionsBar.js @@ -19,7 +19,8 @@ import { FormattedMessage as T } from 'react-intl'; import FilterDropdown from 'components/FilterDropdown'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; -import DialogConnect from 'connectors/Dialog.connector'; +import withDialog from 'containers/Dialogs/withDialog'; + import { If } from 'components'; import withResourceDetail from 'containers/Resources/withResourceDetails'; @@ -137,7 +138,7 @@ function ManualJournalActionsBar({ } export default compose( - DialogConnect, + withDialog, withResourceDetail(({ resourceFields }) => ({ resourceFields, })), diff --git a/client/src/containers/Accounting/ManualJournalsDataTable.js b/client/src/containers/Accounting/ManualJournalsDataTable.js index e2c6e11f8..50d5985d6 100644 --- a/client/src/containers/Accounting/ManualJournalsDataTable.js +++ b/client/src/containers/Accounting/ManualJournalsDataTable.js @@ -19,7 +19,7 @@ import { compose } from 'utils'; import moment from 'moment'; import LoadingIndicator from 'components/LoadingIndicator'; -import DialogConnect from 'connectors/Dialog.connector'; +import withDialog from 'containers/Dialogs/withDialog'; import { useUpdateEffect } from 'hooks'; import DataTable from 'components/DataTable'; @@ -251,7 +251,7 @@ function ManualJournalsDataTable({ } export default compose( - DialogConnect, + withDialog, withDashboardActions, withManualJournalsActions, withManualJournals(({ manualJournals, manualJournalsLoading, }) => ({ diff --git a/client/src/containers/Accounts/AccountsActionsBar.js b/client/src/containers/Accounts/AccountsActionsBar.js index 881060e5e..06b5780a1 100644 --- a/client/src/containers/Accounts/AccountsActionsBar.js +++ b/client/src/containers/Accounts/AccountsActionsBar.js @@ -19,7 +19,7 @@ import { FormattedMessage as T } from 'react-intl'; import { If } from 'components'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; -import DialogConnect from 'connectors/Dialog.connector'; +import withDialog from 'containers/Dialogs/withDialog'; import FilterDropdown from 'components/FilterDropdown'; @@ -27,8 +27,7 @@ import withResourceDetail from 'containers/Resources/withResourceDetails'; import withAccountsTableActions from 'containers/Accounts/withAccountsTableActions'; import withAccounts from 'containers/Accounts/withAccounts'; -import {compose} from 'utils'; - +import { compose } from 'utils'; function AccountsActionsBar({ openDialog, @@ -45,28 +44,31 @@ function AccountsActionsBar({ onBulkDelete, onBulkArchive, onBulkActivate, - onBulkInactive + onBulkInactive, }) { const history = useHistory(); const [filterCount, setFilterCount] = useState(0); - const onClickNewAccount = () => { openDialog('account-form', {}); }; + const onClickNewAccount = () => { + openDialog('account-form', {}); + }; const onClickViewItem = (view) => { - history.push(view - ? `/accounts/${view.id}/custom_view` : '/accounts'); + history.push(view ? `/accounts/${view.id}/custom_view` : '/accounts'); }; const viewsMenuItems = accountsViews.map((view) => { - return ( onClickViewItem(view)} text={view.name} />); + return onClickViewItem(view)} text={view.name} />; }); - const hasSelectedRows = useMemo(() => selectedRows.length > 0, [selectedRows]); - + const hasSelectedRows = useMemo(() => selectedRows.length > 0, [ + selectedRows, + ]); + const filterDropdown = FilterDropdown({ fields: resourceFields, onFilterChange: (filterConditions) => { setFilterCount(filterConditions.length || 0); addAccountsTableQueries({ - filter_roles: filterConditions || '', + filter_roles: filterConditions || '', }); onFilterChanged && onFilterChanged(filterConditions); }, @@ -77,19 +79,16 @@ function AccountsActionsBar({ // }, [onBulkArchive, selectedRows]); const handleBulkDelete = useCallback(() => { - onBulkDelete && onBulkDelete(selectedRows.map(r => r.id)); + onBulkDelete && onBulkDelete(selectedRows.map((r) => r.id)); }, [onBulkDelete, selectedRows]); - const handelBulkActivate =useCallback(()=>{ + const handelBulkActivate = useCallback(() => { + onBulkActivate && onBulkActivate(selectedRows.map((r) => r.id)); + }, [onBulkActivate, selectedRows]); - onBulkActivate && onBulkActivate(selectedRows.map(r=>r.id)) - },[onBulkActivate,selectedRows]) - -const handelBulkInactive =useCallback(()=>{ - -onBulkInactive && onBulkInactive(selectedRows.map(r=>r.id)) - -},[onBulkInactive,selectedRows]) + const handelBulkInactive = useCallback(() => { + onBulkInactive && onBulkInactive(selectedRows.map((r) => r.id)); + }, [onBulkInactive, selectedRows]); return ( @@ -102,8 +101,8 @@ onBulkInactive && onBulkInactive(selectedRows.map(r=>r.id)) >