Renaming flag by reported

client/coral-admin/src/AppRouter.js

@@ -46,7 +46,7 @@ const routes = (
         <Route path='rejected' components={Moderation}>
           <Route path=':id' components={Moderation} />
         </Route>
-        <Route path='flagged' components={Moderation}>
+        <Route path='reported' components={Moderation}>
           <Route path=':id' components={Moderation} />
         </Route>
         <Redirect from=':id' to='all/:id' />

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

@@ -0,0 +1,13 @@
+import React from 'react';
+
+class Moderate extends React.Component {
+  render() {
+    return (
+      <div>
+        Moderate
+      </div>
+    );
+  }
+}
+
+export default Moderate;

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

@@ -0,0 +1,23 @@
+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/ModerationMenu.js

@@ -7,9 +7,17 @@ import {Link} from 'react-router';
 
 import t from 'coral-framework/services/i18n';
 
-const ModerationMenu = (
-  {asset, allCount, acceptedCount, premodCount, rejectedCount, flaggedCount, selectSort, sort}
-) => {
+const ModerationMenu = ({
+  asset, 
+  allCount,
+  acceptedCount,
+  premodCount,
+  newCount,
+  rejectedCount,
+  reportedCount,
+  selectSort,
+  sort
+}) => {
 
   function getPath (type) {
     return asset ? `/admin/moderate/${type}/${asset.id}` : `/admin/moderate/${type}`;
@@ -26,6 +34,12 @@ const ModerationMenu = (
             activeClassName={styles.active}>
             <Icon name='question_answer' className={styles.tabIcon} /> {t('modqueue.all')} <CommentCount count={allCount} />
           </Link>
+          <Link
+            to={getPath('new')}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
+            <Icon name='question_answer' className={styles.tabIcon} /> {t('modqueue.new')} <CommentCount count={newCount} />
+          </Link>
           <Link
             to={getPath('premod')}
             className={`mdl-tabs__tab ${styles.tab}`}
@@ -33,10 +47,10 @@ const ModerationMenu = (
             <Icon name='access_time' className={styles.tabIcon} /> {t('modqueue.premod')} <CommentCount count={premodCount} />
           </Link>
           <Link
-            to={getPath('flagged')}
+            to={getPath('reported')}
             className={`mdl-tabs__tab ${styles.tab}`}
             activeClassName={styles.active}>
-            <Icon name='flag' className={styles.tabIcon} /> {t('modqueue.flagged')} <CommentCount count={flaggedCount} />
+            <Icon name='flag' className={styles.tabIcon} /> {t('modqueue.reported')} <CommentCount count={reportedCount} />
           </Link>
           <Link
             to={getPath('accepted')}

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

@@ -305,6 +305,13 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
+    new: comments(query: {
+      statuses: [NONE, PREMOD],
+      asset_id: $asset_id,
+      sort: $sort
+    }) {
+      ...CoralAdmin_Moderation_CommentConnection
+    }
     accepted: comments(query: {
       statuses: [ACCEPTED],
       asset_id: $asset_id,
@@ -342,6 +349,10 @@ const withModQueueQuery = withQuery(gql`
     allCount: commentCount(query: {
       asset_id: $asset_id
     })
+    newCount: commentCount(query: {
+      statuses: [NONE, PREMOD],
+      asset_id: $asset_id
+    })
     acceptedCount: commentCount(query: {
       statuses: [ACCEPTED],
       asset_id: $asset_id
@@ -381,6 +392,10 @@ const withQueueCountPolling = withQuery(gql`
     allCount: commentCount(query: {
       asset_id: $asset_id
     })
+    newCount: commentCount(query: {
+      statuses: [NONE, PREMOD],
+      asset_id: $asset_id
+    })
     acceptedCount: commentCount(query: {
       statuses: [ACCEPTED],
       asset_id: $asset_id

locales/en.yml

@@ -262,6 +262,7 @@ en:
     dont_like_username: "Don't like username"
     empty_queue: "No more comments to moderate! You're all caught up. Go have some ☕️"
     flagged: flagged
+    reported: reported
     impersonating: Impersonating
     less_detail: "Less detail"
     likes: likes