From dd8167a204dc2a80b27d2c22782f09d9b711bc80 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 27 Jul 2017 14:42:36 -0300
Subject: [PATCH] Check premod by asset

---
 .../Moderation/components/Moderation.js       |  3 ++
 .../Moderation/components/ModerationMenu.js   | 34 ++++++++++++-------
 .../Moderation/containers/Moderation.js       |  7 ++--
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js
index 9032bfe46..66c45b961 100644
--- a/client/coral-admin/src/routes/Moderation/components/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js
@@ -9,6 +9,8 @@ import ModerationKeysModal from '../../../components/ModerationKeysModal';
 import UserDetail from '../containers/UserDetail';
 import StorySearch from '../containers/StorySearch';
 
+const preModEnabled = (moderationSetting) => moderationSetting === "PRE" 
+
 export default class Moderation extends Component {
   constructor() {
     super();
@@ -148,6 +150,7 @@ export default class Moderation extends Component {
           reportedCount={root.reportedCount}
           selectSort={this.props.setSortOrder}
           sort={this.props.moderation.sortOrder}
+          premodEnabled={assetId ? preModEnabled(root.asset.settings.moderation) : preModEnabled(settings.moderation)}
         />
         <ModerationQueue
           data={this.props.data}
diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
index a1c0b018c..7c50abc1d 100644
--- a/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
+++ b/client/coral-admin/src/routes/Moderation/components/ModerationMenu.js
@@ -16,7 +16,8 @@ const ModerationMenu = ({
   rejectedCount,
   reportedCount,
   selectSort,
-  sort
+  sort,
+  premodEnabled
 }) => {
 
   function getPath (type) {
@@ -28,18 +29,25 @@ const ModerationMenu = ({
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
         <div className={styles.tabBarPadding} />
         <div>
-          <Link
-            to={getPath('premod')}
-            className={`mdl-tabs__tab ${styles.tab}`}
-            activeClassName={styles.active}>
-            <Icon name='access_time' className={styles.tabIcon} /> {t('modqueue.premod')} <CommentCount count={premodCount} />
-          </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>
+
+          {
+            premodEnabled ? (
+              <Link
+                to={getPath('premod')}
+                className={`mdl-tabs__tab ${styles.tab}`}
+                activeClassName={styles.active}>
+                <Icon name='access_time' className={styles.tabIcon} /> {t('modqueue.premod')} <CommentCount count={premodCount} />
+              </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('reported')}
             className={`mdl-tabs__tab ${styles.tab}`}
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 54e6fe34d..bfb3599cd 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -154,7 +154,7 @@ class ModerationContainer extends Component {
     case 'all':
       variables.statuses = null;
       break;
-    case 'accepted':
+    case 'approved':
       variables.statuses = ['ACCEPTED'];
       break;
     case 'premod':
@@ -312,7 +312,7 @@ const withModQueueQuery = withQuery(gql`
     }) {
       ...CoralAdmin_Moderation_CommentConnection
     }
-    accepted: comments(query: {
+    approved: comments(query: {
       statuses: [ACCEPTED],
       asset_id: $asset_id,
       sort: $sort
@@ -345,6 +345,9 @@ const withModQueueQuery = withQuery(gql`
       id
       title
       url
+      settings {
+        moderation
+      }
     }
     allCount: commentCount(query: {
       asset_id: $asset_id