From 26abd02032c4d8fcf613a018713426c8cf73fed7 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 11 Dec 2017 08:49:22 -0300 Subject: [PATCH] Updated with User-Status-Refactor API --- client/coral-admin/src/components/UserDetail.js | 10 +++++++--- client/coral-admin/src/containers/UserDetail.js | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index a8aea0e3d..374959225 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -121,7 +121,9 @@ class UserDetail extends React.Component { hideUserDetail, viewUserDetail, loadMore, - toggleSelectAll + toggleSelectAll, + unBanUser, + unSuspendUser, } = this.props; let rejectedPercent = (rejectedComments / totalComments) * 100; @@ -156,7 +158,7 @@ class UserDetail extends React.Component { label={this.getActionMenuLabel()}> {suspended ? + onClick={() => unSuspendUser({id: user.id})}> Remove Suspension : @@ -164,7 +166,7 @@ class UserDetail extends React.Component { } {banned ? + onClick={() => unBanUser({id: user.id})}> Remove Ban : @@ -348,6 +350,8 @@ UserDetail.propTypes = { notify: PropTypes.func.isRequired, showSuspendUserDialog: PropTypes.func, showBanUserDialog: PropTypes.func, + unBanUser: PropTypes.func.isRequired, + unSuspendUser: PropTypes.func.isRequired, }; export default UserDetail; diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js index 7a88b383e..e436cfa90 100644 --- a/client/coral-admin/src/containers/UserDetail.js +++ b/client/coral-admin/src/containers/UserDetail.js @@ -14,7 +14,7 @@ import { toggleSelectCommentInUserDetail, toggleSelectAllCommentInUserDetail } from 'coral-admin/src/actions/userDetail'; -import {withSetCommentStatus} from 'coral-framework/graphql/mutations'; +import {withSetCommentStatus, withUnBanUser, withUnSuspendUser} from 'coral-framework/graphql/mutations'; import UserDetailComment from './UserDetailComment'; import update from 'immutability-helper'; import {notify} from 'coral-framework/actions/notification'; @@ -137,6 +137,8 @@ UserDetailContainer.propTypes = { setCommentStatus: PropTypes.func, clearUserDetailSelections: PropTypes.func, selectedCommentIds: PropTypes.array, + unBanUser: PropTypes.func.isRequired, + unSuspendUser: PropTypes.func.isRequired, }; const LOAD_MORE_QUERY = gql` @@ -245,4 +247,6 @@ export default compose( connect(mapStateToProps, mapDispatchToProps), withUserDetailQuery, withSetCommentStatus, + withUnBanUser, + withUnSuspendUser, )(UserDetailContainer);