Merge branch 'master'

Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js

client/coral-admin/src/actions/comments.js

@@ -1,30 +1,69 @@
+import coralApi from '../../../coral-framework/helpers/response';
+import * as commentActions from '../constants/comments';
+
+// Get comments to fill each of the three lists on the mod queue
+export const fetchModerationQueueComments = () => {
+  return dispatch => {
+    dispatch({type: commentActions.COMMENTS_MODERATION_QUEUE_FETCH});
+    return Promise.all([
+      coralApi('/queue/comments/pending'),
+      coralApi('/comments?status=rejected'),
+      coralApi('/comments?action_type=flag')
+    ])
+    .then(([pending, rejected, flagged]) => {
+
+      /* Combine seperate calls into a single object */
+      flagged.comments.forEach(comment => comment.flagged = true);
+      return {
+        comments: [...pending.comments, ...rejected.comments, ...flagged.comments],
+        users: [...pending.users, ...rejected.users, ...flagged.users],
+        actions: [...pending.actions, ...rejected.actions, ...flagged.actions]
+      };
+    })
+    .then(({comments, users}) => {
+
+      /* Post comments and users to redux store. Actions will be posted when they are needed. */
+      dispatch({type: commentActions.USERS_MODERATION_QUEUE_FETCH_SUCCESS, users});
+      dispatch({type: commentActions.COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS, comments});
+
+    });
+  };
+};
+
+// Create a new comment
+export const createComment = (name, body) => {
+  return dispatch => {
+    const comment = {body, name};
+    return coralApi('/comments', {method: 'POST', comment})
+      .then(res => dispatch({type: commentActions.COMMENT_CREATE_SUCCESS, comment: res}))
+      .catch(error => dispatch({type: commentActions.COMMENT_CREATE_FAILED, error}));
+  };
+};
+
 /**
  * Action disptacher related to comments
  */
 
-export const updateStatus = (status, id) => (dispatch, getState) => {
-  dispatch({type: 'COMMENT_STATUS_UPDATE', id, status});
-  dispatch({type: 'COMMENT_UPDATE', comment: getState().comments.get('byId').get(id)});
+// Update a comment. Now to update a comment we need to send back the whole object
+export const updateStatus = (status, comment) => {
+  return dispatch => {
+    dispatch({type: commentActions.COMMENT_STATUS_UPDATE, id: comment.id, status});
+    return coralApi(`/comments/${comment.id}/status`, {method: 'PUT', body: {status}})
+      .then(res => dispatch({type: commentActions.COMMENT_UPDATE_SUCCESS, res}))
+      .catch(error => dispatch({type: commentActions.COMMENT_UPDATE_FAILED, error}));
+  };
 };
 
 export const flagComment = id => (dispatch, getState) => {
-  dispatch({type: 'COMMENT_FLAG', id});
+  dispatch({type: commentActions.COMMENT_FLAG, id});
   dispatch({type: 'COMMENT_UPDATE', comment: getState().comments.get('byId').get(id)});
 };
 
-export const createComment = (name, body) => dispatch => {
-  dispatch({type: 'COMMENT_CREATE', name, body});
-};
-
 // Dialog Actions
 export const showBanUserDialog = (userId, userName, commentId) => {
-  return dispatch => {
-    dispatch({type: 'SHOW_BANUSER_DIALOG', userId, userName, commentId});
-  };
+  return {type: commentActions.SHOW_BANUSER_DIALOG, userId, userName, commentId};
 };
 
 export const hideBanUserDialog = (showDialog) => {
-  return dispatch => {
-    dispatch({type: 'HIDE_BANUSER_DIALOG', showDialog});
-  };
+  return {type: commentActions.HIDE_BANUSER_DIALOG, showDialog};
 };

client/coral-admin/src/actions/users.js

@@ -1,14 +1,15 @@
+import coralApi from '../../../coral-framework/helpers/response';
+import * as actions from '../constants/user';
 
 /**
  * Action disptacher related to users
  */
-//
-// export const banUser = (status, author_id) => (dispatch) => {
-//   dispatch({type: 'USER_STATUS_UPDATE', author_id, status});
-// };
-export const banUser = (status, userId, commentId) => {
+// change status of a user
+export const userStatusUpdate = (status, userId, commentId) => {
   return dispatch => {
-    dispatch({type: 'USER_BAN', status, userId, commentId});
-    dispatch({type: 'COMMENTS_MODERATION_QUEUE_FETCH'});
+    dispatch({type: actions.UPDATE_STATUS_REQUEST});
+    return coralApi(`/users/${userId}/status`, {method: 'POST', body: {status: status, comment_id: commentId}})
+      .then(res => dispatch({type: actions.UPDATE_STATUS_SUCCESS, res}))
+      .catch(error => dispatch({type: actions.UPDATE_STATUS_FAILURE, error}));
   };
 };