From dff84134042fd47323f37393539f6b9732cdc123 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Mon, 19 Dec 2016 20:34:27 -0500
Subject: [PATCH] Adding pending users and actions to moderation queue call.

---
 client/coral-admin/src/actions/users.js             |  2 +-
 .../containers/ModerationQueue/ModerationQueue.js   |  2 +-
 client/coral-admin/src/reducers/comments.js         |  2 +-
 client/coral-admin/src/services/talk-adapter.js     | 13 ++++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/actions/users.js b/client/coral-admin/src/actions/users.js
index f2ff37cbd..eb5a02a55 100644
--- a/client/coral-admin/src/actions/users.js
+++ b/client/coral-admin/src/actions/users.js
@@ -9,6 +9,6 @@
 export const banUser = (status, userId, commentId) => {
   return dispatch => {
     dispatch({type: 'USER_BAN', status, userId, commentId});
-    dispatch({type: 'COMMENTS_MODERATION_QUEUE_FETCH'});
+    dispatch({type: 'MODERATION_QUEUE_FETCH'});
   };
 };
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index a76652b18..fd52fefc6 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -32,7 +32,7 @@ class ModerationQueue extends React.Component {
 
   // Fetch comments and bind singleView key before render
   componentWillMount () {
-    this.props.dispatch({type: 'COMMENTS_MODERATION_QUEUE_FETCH'});
+    this.props.dispatch({type: 'MODERATION_QUEUE_FETCH'});
     key('s', () => this.setState({singleView: !this.state.singleView}));
     key('shift+/', () => this.setState({modalOpen: true}));
     key('esc', () => this.setState({modalOpen: false}));
diff --git a/client/coral-admin/src/reducers/comments.js b/client/coral-admin/src/reducers/comments.js
index dca726b5e..ec316ba52 100644
--- a/client/coral-admin/src/reducers/comments.js
+++ b/client/coral-admin/src/reducers/comments.js
@@ -23,7 +23,7 @@ const initialState = Map({
 // Handle the comment actions
 export default (state = initialState, action) => {
   switch (action.type) {
-  case 'COMMENTS_MODERATION_QUEUE_FETCH': return state.set('loading', true);
+  case 'MODERATION_QUEUE_FETCH': return state.set('loading', true);
   case 'COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS': return replaceComments(action, state);
   case 'COMMENTS_MODERATION_QUEUE_FAILED': return state.set('loading', false);
   case 'COMMENT_STATUS_UPDATE': return updateStatus(state, action);
diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js
index 7c9bc968f..f509c8270 100644
--- a/client/coral-admin/src/services/talk-adapter.js
+++ b/client/coral-admin/src/services/talk-adapter.js
@@ -12,7 +12,7 @@ import coralApi from '../../../coral-framework/helpers/response';
 export default store => next => action => {
 
   switch (action.type) {
-  case 'COMMENTS_MODERATION_QUEUE_FETCH':
+  case 'MODERATION_QUEUE_FETCH':
     fetchModerationQueueComments(store);
     break;
   case 'COMMENT_UPDATE':
@@ -34,23 +34,26 @@ const fetchModerationQueueComments = store =>
 
 Promise.all([
   coralApi('/queue/comments/pending'),
+  coralApi('/queue/users/pending'),
   coralApi('/comments?status=rejected'),
   coralApi('/comments?action_type=flag')
 ])
-.then(([pending, rejected, flagged]) => {
+.then(([pendingComments, pendingUsers, rejected, flagged]) => {
 
   /* Combine seperate calls into a single object */
   let all = {};
-  all.comments = pending.comments
+  all.comments = pendingComments.comments
     .concat(rejected.comments)
     .concat(flagged.comments.map(comment => {
       comment.flagged = true;
       return comment;
     }));
-  all.users = pending.users
+  all.users = pendingComments.users
+    .concat(pendingUsers.users)
     .concat(rejected.users)
     .concat(flagged.users);
-  all.actions = pending.actions
+  all.actions = pendingComments.actions
+    .concat(pendingUsers.actions)
     .concat(rejected.actions)
     .concat(flagged.actions);
   return all;