diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js index 2fe40eb24..b84d99dc3 100644 --- a/client/coral-admin/src/actions/users.js +++ b/client/coral-admin/src/actions/users.js @@ -1,10 +1,15 @@ +import actions from '../constants/users'; /** * Action disptacher related to users */ - // Dialog Actions -export const showBanUserDialog = () => ({type: 'SHOW_BANUSER_DIALOG'}); -export const hideBanUserDialog = () => ({type: 'HIDE_BANUSER_DIALOG'}); +// Dialog Actions +export const showBanUserDialog = () => (dispatch) => { + dispatch({type: actions.SHOW_BANUSER_DIALOG}); +}; +export const hideBanUserDialog = () => (dispatch) => { + dispatch({type: actions.HIDE_BANUSER_DIALOG}); +}; export const banUser = (status, id, author_id) => (dispatch) => { dispatch({type: 'USER_STATUS_UPDATE', id, author_id, status}); diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index 4e6837acf..03ab9b2e2 100644 --- a/client/coral-admin/src/components/BanUserDialog.js +++ b/client/coral-admin/src/components/BanUserDialog.js @@ -4,11 +4,10 @@ import styles from './BanUserDialog.css'; import BanUserDialogContent from './BanUserDialogContent'; -const BanUserDialog = ({view, handleClose, ...props}) => ( - +const BanUserDialog = ({open, handleClose, ...props}) => ( + × - {view === 'Ban' && } + ); - export default BanUserDialog; diff --git a/client/coral-admin/src/components/BanUserDialogContent.js b/client/coral-admin/src/components/BanUserDialogContent.js index c36d1fd95..618e01eba 100644 --- a/client/coral-admin/src/components/BanUserDialogContent.js +++ b/client/coral-admin/src/components/BanUserDialogContent.js @@ -5,7 +5,7 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); -const BanUserDialogContent = ({...props}) => ( +export const BanUserDialogContent = ({...props}) => (

@@ -30,5 +30,3 @@ const BanUserDialogContent = ({...props}) => (

); - -export default BanUserDialogContent; diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index c0a65c6d0..b956fe362 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -6,14 +6,12 @@ import translations from '../translations.json'; import Linkify from 'react-linkify'; import {Icon} from 'react-mdl'; import {FabButton, Button} from 'coral-ui'; -import BanUserDialog from './BanUserDialog'; -// import {showBanUserDialog, hideBanUserDialog} from '../actions/users'; const linkify = new Linkify(); // // const mapDispatchToProps = dispatch => ({ -// showBanUserDialog: () => dispatch(showBanUserDialog()), -// handleClose: () => dispatch(hideBanUserDialog()), +// showBanUserDialog: () => actions.dispatch(showBanUserDialog(), +// handleClose: () => actions.hideBanUserDialog(), // }); // handleClose() { @@ -73,18 +71,14 @@ const getActionButton = (action, i, props) => { // {...props.author.get('status') === 'banned' ? 'disabled' : 'raised'} // key={i} // onClick={() => props.onClickAction(props.actionsMap[action].status, props.comment.get('id'), props.author.get('id'))}>{lang.t('comment.ban_user')} -
- -
); }