From 0fe456f5743e71f07999d47d43362431c9d8ca99 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 2 Mar 2017 16:43:52 -0800 Subject: [PATCH] Fix suspend button. --- .../containers/Community/CommunityContainer.js | 8 ++++---- .../containers/Community/FlaggedAccounts.js | 1 + .../Community/components/SuspendUserDialog.js | 18 +++++++----------- .../containers/Community/components/User.js | 1 + 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js index d8b6dbcfc..1109d1551 100644 --- a/client/coral-admin/src/containers/Community/CommunityContainer.js +++ b/client/coral-admin/src/containers/Community/CommunityContainer.js @@ -94,7 +94,6 @@ class CommunityContainer extends Component { ); } - console.log('debug props', props); return (
@@ -112,9 +112,9 @@ class CommunityContainer extends Component { handleClose={props.hideBanUserDialog} handleBanUser={props.banUser} /> - @@ -146,7 +146,7 @@ const mapDispatchToProps = dispatch => ({ fetchAccounts: query => dispatch(fetchAccounts(query)), showBanUserDialog: (user) => dispatch(showBanUserDialog(user)), hideBanUserDialog: () => dispatch(hideBanUserDialog(false)), - showSuspendUserDialog: () => dispatch(showSuspendUserDialog()), + showSuspendUserDialog: (user) => dispatch(showSuspendUserDialog(user)), hideSuspendUserDialog: () => dispatch(hideSuspendUserDialog()) }); diff --git a/client/coral-admin/src/containers/Community/FlaggedAccounts.js b/client/coral-admin/src/containers/Community/FlaggedAccounts.js index 154e74ef0..525f575c3 100644 --- a/client/coral-admin/src/containers/Community/FlaggedAccounts.js +++ b/client/coral-admin/src/containers/Community/FlaggedAccounts.js @@ -29,6 +29,7 @@ const FlaggedAccounts = ({...props}) => { showBanUserDialog={props.showBanUserDialog} showSuspendUserDialog={props.showSuspendUserDialog} approveUser={props.approveUser} + suspendUser={props.suspendUser} />; }) : {lang.t('community.no-flagged-accounts')} diff --git a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js index 925d0a606..5749a47a5 100644 --- a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js +++ b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js @@ -33,7 +33,7 @@ class SuspendUserDialog extends Component { static propTypes = { stage: PropTypes.number, - onClose: PropTypes.func.isRequired, + handleClose: PropTypes.func.isRequired, suspendUser: PropTypes.func.isRequired } @@ -47,17 +47,14 @@ class SuspendUserDialog extends Component { */ onActionClick = (stage, menuOption) => () => { const {suspendUser, user} = this.props; - const {stage, email} = this.state; - - console.log('DEBUG props --> ', this.props); - console.log('DEBUG user', user); + const {stage} = this.state; const cancel = this.props.onClose; const next = () => this.setState({stage: stage + 1}); const suspend = () => { - suspendUser({userId: user.id, email}) + suspendUser({userId: user.user.id}) .then(() => { - this.props.onClose; + this.props.handleClose(); }); }; @@ -69,20 +66,19 @@ class SuspendUserDialog extends Component { } onEmailChange = (e) => { - console.log('debug emailchange', e.target); this.setState({email: e.target.value}); } render () { - const {open, onClose} = this.props; + const {open, handleClose} = this.props; const {stage} = this.state; return
{lang.t(stages[stage].title, lang.t('suspenduser.username'))} diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js index 3cadb819a..c0442362d 100644 --- a/client/coral-admin/src/containers/Community/components/User.js +++ b/client/coral-admin/src/containers/Community/components/User.js @@ -56,6 +56,7 @@ const User = props => { key={i} user={user} approveUser={props.approveUser} + suspendUser={props.suspendUser} showSuspendUserDialog={props.showSuspendUserDialog} />; }