Merge remote-tracking branch 'origin/fix_connectors'

client/src/containers/Preferences/Currencies/Currencies.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Button, Intent } from '@blueprintjs/core';
 import { compose } from 'utils';
-import DialogConnect from 'connectors/Dialog.connector';
-import CurrencyFromDialogConnect from 'connectors/CurrencyFromDialog.connect';
+import withDialogActions from 'containers/Dialog/withDialogActions';
+
 function Currencies({ openDialog }) {
   const onClickNewCurrency = () => {
     openDialog('currency-form',{});
@@ -17,4 +17,4 @@ function Currencies({ openDialog }) {
   );
 }
 
-export default compose(DialogConnect, CurrencyFromDialogConnect)(Currencies);
+export default compose(withDialogActions)(Currencies);

client/src/containers/Preferences/Currencies/CurrenciesActions.js

@@ -4,7 +4,7 @@ import {
   Intent,
 } from '@blueprintjs/core';
 import Icon from 'components/Icon';
-import DialogConnect from 'connectors/Dialog.connector';
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import {compose} from 'utils';
 
 function CurrenciesActions({
@@ -27,5 +27,5 @@ function CurrenciesActions({
 }
 
 export default compose(
-  DialogConnect,
+  withDialogActions,
 )(CurrenciesActions);

client/src/containers/Preferences/Currencies/CurrenciesList.js

@@ -23,7 +23,7 @@ import AppToaster from 'components/AppToaster';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withCurrencies from 'containers/Currencies/withCurrencies';
 import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
-import DialogConnect from 'connectors/Dialog.connector';
+import withDialogActions from 'containers/Dialog/withDialogActions';
 
 import { compose } from 'utils';
 
@@ -36,7 +36,7 @@ function CurrenciesList({
   requestDeleteCurrency,
   requestFetchCurrencies,
 
-  // #withDialog
+  // #withDialogActions
   openDialog,
 
   // #withDashboardActions
@@ -178,10 +178,10 @@ function CurrenciesList({
 }
 
 export default compose(
-  DialogConnect,
   withDashboardActions,
   withCurrencies(({ currenciesList }) => ({
     currenciesList,
   })),
   withCurrenciesActions,
+  withDialogActions,
 )(CurrenciesList);

client/src/containers/Preferences/Users/Users.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Tabs, Tab } from '@blueprintjs/core';
 import PreferencesSubContent from 'components/Preferences/PreferencesSubContent';
-import connector from 'connectors/UsersPreferences.connector';
+import withUserPreferences from 'containers/Preferences/Users/withUserPreferences'
 
 function UsersPreferences({ openDialog }) {
   const onChangeTabs = (currentTabId) => {};
@@ -19,4 +19,4 @@ function UsersPreferences({ openDialog }) {
   );
 }
 
-export default connector(UsersPreferences);
+export default withUserPreferences(UsersPreferences);

client/src/containers/Preferences/Users/UsersActions.js

@@ -3,8 +3,10 @@ import {
   Button,
   Intent,
 } from '@blueprintjs/core';
+import { FormattedMessage as T, useIntl } from 'react-intl';
+
 import Icon from 'components/Icon';
-import DialogConnect from 'connectors/Dialog.connector';
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import {compose} from 'utils';
 
 function UsersActions({
@@ -21,18 +23,18 @@ function UsersActions({
         icon={<Icon icon='plus' iconSize={12} />}
         onClick={onClickNewUser}
         intent={Intent.PRIMARY}>
-        Invite User
+        <T id={'invite_user'} />
       </Button>
 
       <Button
         icon={<Icon icon='plus' iconSize={12} />}
         onClick={onClickNewUser}>
-        New Role
+        <T id={'new_role'} />
       </Button>
     </div>
   );
 }
 
 export default compose(
-  DialogConnect,
+  withDialogActions,
 )(UsersActions);

client/src/containers/Preferences/Users/UsersList.js

@@ -25,13 +25,14 @@ import { If } from 'components';
 
 import AppToaster from 'components/AppToaster';
 
-import DialogConnect from 'connectors/Dialog.connector';
+import withDialogActions from 'containers/Dialog/withDialogActions';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withUsers from 'containers/Users/withUsers';
 import withUsersActions from 'containers/Users/withUsersActions';
 
 import { compose } from 'utils';
 
+
 function UsersListPreferences({
   // #withDialog
   openDialog,
@@ -258,7 +259,7 @@ function UsersListPreferences({
 }
 
 export default compose(
-  DialogConnect,
+  withDialogActions,
   withDashboardActions,
   withUsers,
   withUsersActions,

client/src/containers/Preferences/Users/withUserPreferences.js

@@ -0,0 +1,13 @@
+import {connect} from 'react-redux';
+import t from 'store/types';
+
+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 default connect(null, mapDispatchToProps);