New Queue

client/coral-admin/src/AppRouter.js

@@ -37,6 +37,9 @@ const routes = (
         <Route path='all' components={Moderation}>
           <Route path=':id' components={Moderation} />
         </Route>
+        <Route path='new' components={Moderation}>
+          <Route path=':id' components={Moderation} />
+        </Route>
         <Route path='accepted' components={Moderation}>
           <Route path=':id' components={Moderation} />
         </Route>

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

@@ -1,23 +0,0 @@
-import React from 'react';
-import {compose} from 'react-apollo';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-
-import Moderate from '../components/Moderate';
-
-class ModerateContainer extends React.Component {
-
-  render() {
-    return <Moderate />;
-  }
-}
-
-const mapStateToProps = (state) => ({});
-
-const mapDispatchToProps = (dispatch) =>
-  bindActionCreators({
-  }, dispatch);
-
-export default compose(
-  connect(mapStateToProps, mapDispatchToProps)
-)(ModerateContainer);

client/coral-admin/src/routes/Moderation/components/Moderation.js

@@ -113,14 +113,17 @@ export default class Moderation extends Component {
     case 'all':
       activeTabCount = root.allCount;
       break;
+    case 'new':
+      activeTabCount = root.newCount;
+      break;
     case 'accepted':
       activeTabCount = root.acceptedCount;
       break;
     case 'premod':
       activeTabCount = root.premodCount;
       break;
-    case 'flagged':
-      activeTabCount = root.flaggedCount;
+    case 'reported':
+      activeTabCount = root.reportedCount;
       break;
     case 'rejected':
       activeTabCount = root.rejectedCount;
@@ -138,10 +141,11 @@ export default class Moderation extends Component {
         <ModerationMenu
           asset={asset}
           allCount={root.allCount}
+          newCount={root.newCount}
           acceptedCount={root.acceptedCount}
           premodCount={root.premodCount}
           rejectedCount={root.rejectedCount}
-          flaggedCount={root.flaggedCount}
+          reportedCount={root.reportedCount}
           selectSort={this.props.setSortOrder}
           sort={this.props.moderation.sortOrder}
         />

client/coral-admin/src/routes/Moderation/components/ModerationMenu.js

@@ -82,7 +82,7 @@ ModerationMenu.propTypes = {
   allCount: PropTypes.number.isRequired,
   premodCount: PropTypes.number.isRequired,
   rejectedCount: PropTypes.number.isRequired,
-  flaggedCount: PropTypes.number.isRequired,
+  reportedCount: PropTypes.number.isRequired,
   asset: PropTypes.shape({
     id: PropTypes.string
   })

client/coral-admin/src/routes/Moderation/containers/Moderation.js

@@ -160,7 +160,7 @@ class ModerationContainer extends Component {
     case 'premod':
       variables.statuses = ['PREMOD'];
       break;
-    case 'flagged':
+    case 'reported':
       variables.statuses = ['NONE', 'PREMOD'];
       variables.action_type = 'FLAG';
       break;
@@ -326,7 +326,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    flagged: comments(query: {
+    reported: comments(query: {
         action_type: FLAG,
         asset_id: $asset_id,
         statuses: [NONE, PREMOD],
@@ -365,7 +365,7 @@ const withModQueueQuery = withQuery(gql`
        statuses: [REJECTED],
        asset_id: $asset_id
     })
-    flaggedCount: commentCount(query: {
+    reportedCount: commentCount(query: {
       action_type: FLAG,
       asset_id: $asset_id,
       statuses: [NONE, PREMOD]
@@ -408,7 +408,7 @@ const withQueueCountPolling = withQuery(gql`
        statuses: [REJECTED],
        asset_id: $asset_id
     })
-    flaggedCount: commentCount(query: {
+    reportedCount: commentCount(query: {
       action_type: FLAG,
       asset_id: $asset_id,
       statuses: [NONE, PREMOD]

locales/en.yml

@@ -270,6 +270,7 @@ en:
     mod_faster: "Moderate faster with keyboard shortcuts"
     moderate: "Moderate →"
     more_detail: "More detail"
+    new: New
     newest_first: "Newest First"
     navigation: Navigation
     next_comment: "Go to the next comment"

locales/es.yml

@@ -261,6 +261,7 @@ es:
     mod_faster: "Moderar más rápido con atajos de teclado"
     moderate: "Moderar →"
     more_detail: "Más detalles"
+    new: Nuevo
     newest_first: "Primero el más nuevo"
     navigation: Navegación
     next_comment: "Ir al siguiente comentario"