From f140efe1bd6ae026be33f652b3cf438c5251e587 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 31 Aug 2017 11:10:28 -0300
Subject: [PATCH] Premod and New Queue Edge Case

---
 .../src/routes/Moderation/containers/Moderation.js    | 11 ++++++++---
 .../coral-admin/src/routes/Moderation/queueConfig.js  | 10 +++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 722faaaa3..336ec1770 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -215,11 +215,16 @@ class ModerationContainer extends Component {
     }
 
     const premodEnabled = assetId ? isPremod(asset.settings.moderation) : isPremod(settings.moderation);
+
     const currentQueueConfig = Object.assign({}, this.props.queueConfig);
+
+
     if (premodEnabled) {
-      delete currentQueueConfig.new;
-    } else {
-      delete currentQueueConfig.premod;
+      delete currentQueueConfig.new
+    } 
+    
+    if (!root.premodCount || premodEnabled) {
+      delete currentQueueConfig.premod
     }
 
     return <Moderation
diff --git a/client/coral-admin/src/routes/Moderation/queueConfig.js b/client/coral-admin/src/routes/Moderation/queueConfig.js
index 9a23ccc6c..bf3caf823 100644
--- a/client/coral-admin/src/routes/Moderation/queueConfig.js
+++ b/client/coral-admin/src/routes/Moderation/queueConfig.js
@@ -1,16 +1,16 @@
 import t from 'coral-framework/services/i18n';
 
 export default {
-  premod: {
-    statuses: ['PREMOD'],
-    icon: 'access_time',
-    name: t('modqueue.premod'),
-  },
   new: {
     statuses: ['NONE', 'PREMOD'],
     icon: 'question_answer',
     name: t('modqueue.new'),
   },
+  premod: {
+    statuses: ['PREMOD'],
+    icon: 'access_time',
+    name: t('modqueue.premod'),
+  },
   reported: {
     action_type: 'FLAG',
     statuses: ['NONE', 'PREMOD'],