From 06331d3c079669e79f6badadef5538ab94c33132 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 26 Jan 2017 15:31:15 -0500
Subject: [PATCH] Updating bio moderation to graphQL architecture.

---
 client/coral-admin/src/components/BanUserDialog.js       | 2 +-
 client/coral-admin/src/components/Comment.js             | 2 +-
 client/coral-admin/src/components/ModerationList.js      | 6 +++---
 client/coral-admin/src/components/UserAction.js          | 4 ++--
 .../src/containers/ModerationQueue/ModerationQueue.js    | 9 +++++++++
 client/coral-plugin-flags/FlagButton.js                  | 6 ++++--
 graph/mutators/action.js                                 | 9 +++++++--
 7 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index c393df21d..0ad149fbe 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -35,7 +35,7 @@ const BanUserDialog = ({open, handleClose, onClickBanUser, user = {}}) => (
         <Button cStyle="cancel" className={styles.cancel} onClick={() => handleClose()} raised>
           {lang.t('bandialog.cancel')}
         </Button>
-        <Button cStyle="black" className={styles.ban} onClick={() => onClickBanUser(user.userId, user.commentId)} raised>
+        <Button cStyle="black" className={styles.ban} onClick={() => onClickBanUser('BANNED', user.userId, user.commentId)} raised>
           {lang.t('bandialog.yes_ban_user')}
         </Button>
       </div>
diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js
index bbc6078b7..52b37af09 100644
--- a/client/coral-admin/src/components/Comment.js
+++ b/client/coral-admin/src/components/Comment.js
@@ -61,7 +61,7 @@ const getActionButton = (option, i, props) => {
   }
   if (option === 'ban') {
     return (
-      <div className={styles.ban}>
+      <div className={styles.ban} key={i}>
         <Button
           className={`ban ${styles.banButton}`}
           cStyle='darkGrey'
diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js
index b9e4db84d..9dec94587 100644
--- a/client/coral-admin/src/components/ModerationList.js
+++ b/client/coral-admin/src/components/ModerationList.js
@@ -130,15 +130,15 @@ export default class ModerationList extends React.Component {
     }
 
     // Update the status right away if this is a comment
-    if (action.item_type === 'comments') {
+    if (action.item_type === 'COMMENTS') {
       this.props.updateCommentStatus(menuOption, id);
-    } else if (action.item_type === 'users') {
+    } else if (action.item_type === 'USERS') {
 
       // If a user bio or name is rejected, bring up a dialog before suspending them.
       if (menuOption === 'rejected') {
         this.setState({suspendUserModal: action});
       } else if (menuOption === 'accepted') {
-        this.props.userStatusUpdate('active', action.item_id);
+        this.props.userStatusUpdate('ACTIVE', action.item_id);
       }
     }
   }
diff --git a/client/coral-admin/src/components/UserAction.js b/client/coral-admin/src/components/UserAction.js
index 6f883d788..5cb33bb09 100644
--- a/client/coral-admin/src/components/UserAction.js
+++ b/client/coral-admin/src/components/UserAction.js
@@ -20,7 +20,7 @@ const UserAction = props => {
 
   // Do not display unless the user status is 'pending' or 'banned'.
   // This means that they have already been reviewed and approved.
-  return (userStatus === 'pending' ||  userStatus === 'banned') &&
+  return (userStatus === 'PENDING' ||  userStatus === 'BANNED') &&
     <li tabIndex={props.index} className={`${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
       <div className={styles.itemHeader}>
         <div className={styles.author}>
@@ -66,7 +66,7 @@ export default UserAction;
 const getActionButton = (option, i, props) => {
   const {user, onClickShowBanDialog, onClickAction, menuOptionsMap, action} = props;
   const status = user.status;
-  const banned = (user.status === 'banned');
+  const banned = (user.status === 'BANNED');
 
   if (option === 'flag' && status) {
     return null;
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 3d4451efe..90cd0560c 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -14,6 +14,15 @@ export default (props) => (
   <div>
     <div className='mdl-tabs'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
+        <a href='#all'
+           onClick={(e) => {
+             e.preventDefault();
+             props.onTabClick('all');
+           }}
+           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'all' ? styles.active : ''}`}
+        >
+          {lang.t('modqueue.all')}
+        </a>
         <a href='#pending'
            onClick={(e) => {
              e.preventDefault();
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index e376d8ff5..ec62f5396 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -14,6 +14,7 @@ class FlagButton extends Component {
     reason: '',
     note: '',
     step: 0,
+    posted: false,
     localPost: null,
     localDelete: false
   }
@@ -38,7 +39,7 @@ class FlagButton extends Component {
 
   onPopupContinue = () => {
     const {postAction, id, author_id} = this.props;
-    const {itemType, reason, step, localPost} = this.state;
+    const {itemType, reason, step, posted} = this.state;
 
     // Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -48,7 +49,8 @@ class FlagButton extends Component {
     }
 
     // If itemType and reason are both set, post the action
-    if (itemType && reason && !localPost) {
+    if (itemType && reason && !posted) {
+      this.setState({posted: true});
 
       // Set the text from the "other" field if it exists.
       let item_id;
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index cf80c496d..5e1db3fd8 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -1,8 +1,10 @@
 const ActionModel = require('../../models/action');
 const ActionsService = require('../../services/actions');
+const UsersService = require('../../services/users');
 
 /**
- * Creates an action on a item.
+ * Creates an action on a item. If the item is a user flag, sets the user's status to
+ * pending.
  * @param  {Object} user        the user performing the request
  * @param  {String} item_id     id of the item to add the action to
  * @param  {String} item_type   type of the item
@@ -16,7 +18,10 @@ const createAction = ({user = {}}, {item_id, item_type, action_type, metadata =
     user_id: user.id,
     action_type,
     metadata
-  });
+  }).then((result) =>
+    item_type === 'USERS' && action_type === 'FLAG' ?
+    UsersService.setStatus(user.id, 'PENDING').then(() => result)
+    : result);
 };
 
 /**