Move previous suspendUser feature to rejectUsername

client/coral-admin/src/containers/Community/CommunityContainer.js

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {compose} from 'react-apollo';
 
 import {modUserFlaggedQuery} from 'coral-admin/src/graphql/queries';
-import {banUser, setUserStatus, suspendUser} from 'coral-admin/src/graphql/mutations';
+import {banUser, setUserStatus, rejectUsername} from 'coral-admin/src/graphql/mutations';
 
 import {
   fetchAccounts,
@@ -113,7 +113,7 @@ class CommunityContainer extends Component {
           error={data.error}
           showBanUserDialog={props.showBanUserDialog}
           approveUser={props.approveUser}
-          suspendUser={props.suspendUser}
+          rejectUsername={props.rejectUsername}
           showSuspendUserDialog={props.showSuspendUserDialog}
         />
         <BanUserDialog
@@ -126,7 +126,7 @@ class CommunityContainer extends Component {
           open={community.suspendDialog}
           handleClose={props.hideSuspendUserDialog}
           user={community.user}
-          suspendUser={props.suspendUser}
+          rejectUsername={props.rejectUsername}
         />
       </div>
     );
@@ -165,5 +165,5 @@ export default compose(
   modUserFlaggedQuery,
   banUser,
   setUserStatus,
-  suspendUser
+  rejectUsername
 )(CommunityContainer);

client/coral-admin/src/containers/Community/components/SuspendUserDialog.js

@@ -34,7 +34,7 @@ class SuspendUserDialog extends Component  {
   static propTypes = {
     stage: PropTypes.number,
     handleClose: PropTypes.func.isRequired,
-    suspendUser: PropTypes.func.isRequired
+    rejectUsername: PropTypes.func.isRequired
   }
 
   componentDidMount() {
@@ -46,13 +46,13 @@ class SuspendUserDialog extends Component  {
   * handles the possible actions for that dialog.
   */
   onActionClick = (stage, menuOption) => () => {
-    const {suspendUser, user} = this.props;
+    const {rejectUsername, user} = this.props;
     const {stage} = this.state;
 
     const cancel = this.props.handleClose;
     const next = () => this.setState({stage: stage + 1});
     const suspend = () => {
-      suspendUser({id: user.user.id, message: this.state.email, mustChangeUsername: true})
+      rejectUsername({id: user.user.id, message: this.state.email})
       .then(() => {
         this.props.handleClose();
       });

client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js

@@ -10,7 +10,7 @@ import translations from 'coral-admin/src/translations';
 import I18n from 'coral-framework/modules/i18n/i18n';
 
 import {modQueueQuery, getQueueCounts} from '../../graphql/queries';
-import {banUser, setCommentStatus} from '../../graphql/mutations';
+import {banUser, setCommentStatus, suspendUser} from '../../graphql/mutations';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
@@ -211,14 +211,24 @@ class ModerationContainer extends Component {
         <SuspendUserDialog
           open={moderation.suspendUserDialog.show}
           username={moderation.suspendUserDialog.username}
+          userId={moderation.suspendUserDialog.userId}
           onCancel={props.hideSuspendUserDialog}
-          onPerform={(result) => {
-            toast(
-              lang.t('suspenduser.notify_suspend_until',
-                moderation.suspendUserDialog.username,
-                lang.timeago(result.until)),
-              {type: 'success'}
-            );
+          onPerform={(args) => {
+            props.suspendUser(args)
+              .then(() => {
+                toast(
+                  lang.t('suspenduser.notify_suspend_until',
+                    moderation.suspendUserDialog.username,
+                    lang.timeago(args.until)),
+                  {type: 'success'}
+                );
+              })
+              .catch((err) => {
+                toast(
+                  err,
+                  {type: 'error'}
+                );
+              });
             props.hideSuspendUserDialog();
           }}
         />
@@ -238,7 +248,7 @@ const mapStateToProps = (state) => ({
   assets: state.assets.get('assets')
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   onClose: () => dispatch(toggleModal(false)),
   hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
   ...bindActionCreators({
@@ -257,6 +267,7 @@ export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   setCommentStatus,
   getQueueCounts,
+  banUser,
+  suspendUser,
   modQueueQuery,
-  banUser
 )(ModerationContainer);

client/coral-admin/src/containers/ModerationQueue/components/SuspendUserDialog.js

@@ -40,8 +40,9 @@ class SuspendUserDialog extends React.Component {
 
   handlePerform = () => {
     this.props.onPerform({
-      until: dateAdd(new Date(), 'hour', this.state.duration),
+      id: this.props.userId,
       message: this.state.message,
+      until: dateAdd(new Date(), 'hour', this.state.duration),
     });
   };
 

client/coral-admin/src/graphql/mutations/index.js

@@ -2,6 +2,7 @@ import {graphql} from 'react-apollo';
 import SET_USER_STATUS from './setUserStatus.graphql';
 import SET_COMMENT_STATUS from './setCommentStatus.graphql';
 import SUSPEND_USER from './suspendUser.graphql';
+import REJECT_USERNAME from './rejectUsername.graphql';
 
 export const banUser = graphql(SET_USER_STATUS, {
   props: ({mutate}) => ({
@@ -43,6 +44,19 @@ export const suspendUser = graphql(SUSPEND_USER, {
   })
 });
 
+export const rejectUsername = graphql(REJECT_USERNAME, {
+  props: ({mutate}) => ({
+    rejectUsername: (input) => {
+      return mutate({
+        variables: {
+          input,
+        },
+        refetchQueries: ['Users']
+      });
+    }
+  })
+});
+
 const views = ['all', 'premod', 'flagged', 'accepted', 'rejected'];
 export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
   props: ({mutate}) => ({

client/coral-admin/src/graphql/mutations/rejectUsername.graphql

@@ -0,0 +1,7 @@
+mutation rejectUsername($input: RejectUsernameInput!) {
+  rejectUsername(input: $input) {
+    errors {
+      translation_key
+    }
+  }
+}

client/coral-admin/src/reducers/moderation.js

@@ -38,6 +38,7 @@ export default function moderation (state = initialState, action) {
       .mergeDeep({
         suspendUserDialog: {
           show: true,
+          userId: action.userId,
           username: action.username,
           commentId: action.commentId,
           commentStatus: action.commentStatus,

client/coral-framework/actions/auth.js

@@ -196,8 +196,8 @@ export const facebookCallback = (err, data) => (dispatch, getState) => {
     dispatch(handleAuthToken(data.token));
     dispatch(signInFacebookSuccess(data.user));
     dispatch(hideSignInDialog());
-    const {user: {canEditName, suspension}} = getState().auth.toJS();
-    if (canEditName && !suspension.mustChangeUsername) {
+    const {user: {canEditName, status}} = getState().auth.toJS();
+    if (canEditName && status !== 'BANNED') {
       dispatch(showCreateUsernameDialog());
     }
   } catch (err) {