From 0f41165751ffd681c4153b8debe5b8d6a999b96c Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 28 Jul 2017 11:16:49 -0300 Subject: [PATCH] New Queue names --- client/coral-admin/src/AppRouter.js | 1 - client/coral-admin/src/graphql/utils.js | 17 ++++++++++++----- .../routes/Moderation/containers/Moderation.js | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index f0e94f1ad..789aa4bd8 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -61,7 +61,6 @@ const routes = ( ); const AppRouter = () => browserHistory)({ - basename: '/talk/' })} routes={routes}/>; export default AppRouter; diff --git a/client/coral-admin/src/graphql/utils.js b/client/coral-admin/src/graphql/utils.js index 331fd876a..eeb58ab4a 100644 --- a/client/coral-admin/src/graphql/utils.js +++ b/client/coral-admin/src/graphql/utils.js @@ -1,7 +1,7 @@ import update from 'immutability-helper'; import * as notification from 'coral-admin/src/services/notification'; -const queues = ['all', 'premod', 'flagged', 'accepted', 'rejected']; +const queues = ['all', 'premod', 'reported', 'approved', 'rejected', 'new']; const limit = 10; const ascending = (a, b) => { @@ -66,21 +66,27 @@ function addCommentToQueue(root, queue, comment, sort) { function getCommentQueues(comment) { const queues = ['all']; + if (comment.status === 'ACCEPTED') { queues.push('accepted'); } else if (comment.status === 'REJECTED') { queues.push('rejected'); } - else if (comment.status === 'PREMOD') { - queues.push('premod'); - } - if ( + else if ( ['NONE', 'PREMOD'].indexOf(comment.status) >= 0 && comment.actions && comment.actions.some((a) => a.__typename === 'FlagAction') ) { queues.push('flagged'); } + else if (comment.status === 'PREMOD') { + queues.push('premod'); + queues.push('new'); + } + if (comment.status === 'NONE') { + queues.push('new'); + } + return queues; } @@ -98,6 +104,7 @@ function getCommentQueues(comment) { */ export function handleCommentChange(root, comment, sort, notify) { let next = root; + const nextQueues = getCommentQueues(comment); let notificationShown = false; diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index bfb3599cd..bd33519ce 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -154,6 +154,9 @@ class ModerationContainer extends Component { case 'all': variables.statuses = null; break; + case 'new': + variables.statuses = ['NONE', 'PREMOD']; + break; case 'approved': variables.statuses = ['ACCEPTED']; break;