Merge branch 'issue-89' into ban-user

client/coral-admin/src/AppRouter.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import {Router, Route, IndexRoute, browserHistory} from 'react-router';
 
-import ModerationQueue from 'containers/ModerationQueue';
-import CommentStream from 'containers/CommentStream';
-import Configure from 'containers/Configure';
+import ModerationQueue from 'containers/ModerationQueue/ModerationQueue';
+import CommentStream from 'containers/CommentStream/CommentStream';
+import Configure from 'containers/Configure/Configure';
 import CommunityContainer from 'containers/Community/CommunityContainer';
 import LayoutContainer from 'containers/LayoutContainer';
 

client/coral-admin/src/containers/CommentStream/CommentStream.js

@@ -31,7 +31,7 @@ class CommentStream extends React.Component {
 
   // The only action for now is flagging
   onClickAction (action, id) {
-    if (action === 'flagged') {
+    if (action === 'flag') {
       this.props.dispatch(flagComment(id));
       clearTimeout(this._snackTimeout);
       this.setState({snackbar: true, snackbarMsg: 'Thank you for reporting this comment. Our moderation team has been notified and will review it shortly.'});

client/coral-admin/src/containers/Configure/Configure.js

@@ -1,7 +1,6 @@
-
 import React from 'react';
 import {connect} from 'react-redux';
-import {fetchSettings, updateSettings, saveSettingsToServer} from '../actions/settings';
+import {fetchSettings, updateSettings, saveSettingsToServer} from '../../actions/settings';
 import {
   List,
   ListItem,
@@ -14,7 +13,7 @@ import {
 } from 'react-mdl';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../translations.json';
+import translations from '../../translations.json';
 
 class Configure extends React.Component {
   constructor (props) {
@@ -23,9 +22,13 @@ class Configure extends React.Component {
     this.state = {activeSection: 'comments', copied: false};
 
     this.copyToClipBoard = this.copyToClipBoard.bind(this);
+
+    // Update settings
     this.updateModeration = this.updateModeration.bind(this);
+    // InfoBox has two settings. Enable or not and the content of it if it is enable.
     this.updateInfoBoxEnable = this.updateInfoBoxEnable.bind(this);
     this.updateInfoBoxContent = this.updateInfoBoxContent.bind(this);
+
     this.saveSettings = this.saveSettings.bind(this);
   }
 

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

@@ -1,18 +1,22 @@
 import React from 'react';
 import {connect} from 'react-redux';
+import key from 'keymaster';
+
 import ModerationKeysModal from 'components/ModerationKeysModal';
 import CommentList from 'components/CommentList';
+
 import {updateStatus} from 'actions/comments';
 import {updateUserStatus} from 'actions/users';
 import styles from './ModerationQueue.css';
-import key from 'keymaster';
+
 import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../translations.json';
+import translations from '../../translations.json';
 
 /*
- * Renders the moderation queue as a tabbed layout with 3 moderation
- * queues filtered by status (Untouched, Rejected and Approved)
- * Pending queue also includes the comments that are flagged in the post-moderation setting.
+ * Renders the moderation queue as a tabbed layout with 3 moderation queues
+ * * pending: filtered by status Untouchedand comments that are flagged in the post-moderation setting.
+ * * rejected: filtered by status Rejected
+ * * flagged: with a flagged action on them
  */
 
 class ModerationQueue extends React.Component {

client/coral-admin/src/services/talk-adapter.js

@@ -37,7 +37,7 @@ const fetchModerationQueueComments = store =>
 Promise.all([
   fetch('/api/v1/queue/comments/pending'),
   fetch('/api/v1/comments?status=rejected'),
-  fetch('/api/v1/comments?action=flag')
+  fetch('/api/v1/comments?action_type=flag')
 ])
 .then(res => Promise.all(res.map(r => r.json())))
 .then(res => {