From 7e907e18f268bb910396001e8bf68321803781d6 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 1 Feb 2017 16:19:42 -0500
Subject: [PATCH] Enabling canEditName when suspending user.

---
 client/coral-admin/src/actions/users.js       |  8 ++++++
 .../src/components/ModerationList.js          |  4 +--
 .../src/components/{UserAction.js => User.js} | 25 ++-----------------
 client/coral-admin/src/constants/users.js     |  1 +
 .../ModerationQueue/ModerationContainer.js    |  3 ++-
 .../graphql/fragments/commentView.graphql     |  3 ---
 6 files changed, 15 insertions(+), 29 deletions(-)
 rename client/coral-admin/src/components/{UserAction.js => User.js} (75%)

diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js
index 44f0325d9..954d89820 100644
--- a/client/coral-admin/src/actions/users.js
+++ b/client/coral-admin/src/actions/users.js
@@ -21,3 +21,11 @@ export const sendNotificationEmail = (userId, subject, body) => {
       .catch(error => dispatch({type: userTypes.USER_EMAIL_FAILURE, error}));
   };
 };
+
+// let a user edit their username
+export const enableUsernameEdit = (userId) => {
+  return (dispatch) => {
+    return coralApi(`/users/${userId}/username-enable`, {method: 'POST'})
+      .catch(error => dispatch({type: userTypes.USERNAME_ENABLE_FAILURE, error}));
+  };
+};
diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js
index c1df40d31..c2ecab9a2 100644
--- a/client/coral-admin/src/components/ModerationList.js
+++ b/client/coral-admin/src/components/ModerationList.js
@@ -3,7 +3,7 @@ import styles from './ModerationList.css';
 import key from 'keymaster';
 import Hammer from 'hammerjs';
 import Comment from './Comment';
-import UserAction from './UserAction';
+import User from './User';
 import SuspendUserModal from './SuspendUserModal';
 
 // Each action has different meaning and configuration
@@ -177,7 +177,7 @@ export default class ModerationList extends React.Component {
 
       // If the item is an action...
       const user = users[item.item_id];
-      modItem = user && <UserAction
+      modItem = user && <User
         suspectWords={suspectWords}
         action={item}
         user={user}
diff --git a/client/coral-admin/src/components/UserAction.js b/client/coral-admin/src/components/User.js
similarity index 75%
rename from client/coral-admin/src/components/UserAction.js
rename to client/coral-admin/src/components/User.js
index 88694e6aa..c8a056699 100644
--- a/client/coral-admin/src/components/UserAction.js
+++ b/client/coral-admin/src/components/User.js
@@ -7,13 +7,12 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations.json';
 
 import {Icon} from 'react-mdl';
-import Highlighter from 'react-highlight-words';
 import ActionButton from './ActionButton';
 
 const linkify = new Linkify();
 
 // Render a single comment for the list
-const UserAction = props => {
+const User = props => {
   const {action, user} = props;
   let userStatus = user.status;
   const links = user.settings.bio ? linkify.getMatches(user.settings.bio) : [];
@@ -48,32 +47,12 @@ const UserAction = props => {
           <span className={styles.banned}><Icon name='error_outline'/> {lang.t('comment.banned_user')}</span> : null}
         </div>
       </div>
-      {
-        user.settings.bio &&
-        <div>
-          <div className={styles.itemBody}>
-            <div>{lang.t('user.user_bio')}:</div>
-            <span className={styles.body}>
-              <Linkify  component='span' properties={{style: linkStyles}}>
-                <Highlighter
-                  searchWords={props.suspectWords}
-                  textToHighlight={user.settings.bio} />
-              </Linkify>
-            </span>
-          </div>
-        </div>
-      }
       <div className={styles.flagCount}>
         {`${action.count} ${action.action_type === 'flag_bio' ? lang.t('user.bio_flags') : lang.t('user.username_flags')}`}
       </div>
     </li>;
 };
 
-export default UserAction;
-
-const linkStyles = {
-  backgroundColor: 'rgb(255, 219, 135)',
-  padding: '1px 2px'
-};
+export default User;
 
 const lang = new I18n(translations);
diff --git a/client/coral-admin/src/constants/users.js b/client/coral-admin/src/constants/users.js
index 3cd5e5b4b..9cd7e2093 100644
--- a/client/coral-admin/src/constants/users.js
+++ b/client/coral-admin/src/constants/users.js
@@ -2,4 +2,5 @@ export const UPDATE_STATUS_REQUEST = 'UPDATE_STATUS_REQUEST';
 export const UPDATE_STATUS_SUCCESS = 'UPDATE_STATUS_SUCCESS';
 export const UPDATE_STATUS_FAILURE = 'UPDATE_STATUS_FAILURE';
 export const USER_EMAIL_FAILURE = 'USER_EMAIL_FAILURE';
+export const USERNAME_ENABLE_FAILURE = 'USERNAME_ENABLE_FAILURE';
 export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index aa754b4ac..4f56a6c69 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -11,7 +11,7 @@ import {
   fetchFlaggedQueue,
   fetchModerationQueueComments,
 } from 'actions/comments';
-import {userStatusUpdate, sendNotificationEmail} from 'actions/users';
+import {userStatusUpdate, sendNotificationEmail, enableUsernameEdit} from 'actions/users';
 import {fetchSettings} from 'actions/settings';
 
 import ModerationQueue from './ModerationQueue';
@@ -119,6 +119,7 @@ const mapDispatchToProps = dispatch => {
       dispatch(fetchModerationQueueComments());
     }),
     suspendUser: (userId, subject, text) => dispatch(userStatusUpdate('BANNED', userId))
+    .then(() => dispatch(enableUsernameEdit(userId)))
     .then(() => dispatch(sendNotificationEmail(userId, subject, text)))
     .then(() => dispatch(fetchModerationQueueComments()))
     ,
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index fb8051155..29f9b3bfe 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -6,9 +6,6 @@ fragment commentView on Comment {
     user {
         id
         name: displayName
-        settings {
-            bio
-        }
     }
     actions {
         type: action_type