From 1b583fb945ed205c389add9aa65a7ca69b5aa131 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 28 Jul 2017 15:51:21 -0300 Subject: [PATCH] Reported has priority over premod queue or new queue --- .../src/routes/Moderation/components/Moderation.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 7a4130f70..6cb4cf743 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -20,12 +20,14 @@ export default class Moderation extends Component { } componentWillMount() { - const {router, root: {settings}} = this.props; + const {router, root: {settings, reportedCount}} = this.props; // Will update the URL to premod or new based on the moderation of All Streams - if (!router.params.id) { + // If there is a reported comments, reported queue has priority! + if (!router.params.id) { + const queue = isPremod(settings.moderation) ? 'premod' : 'new'; router.push( - getModPath(isPremod(settings.moderation) ? 'premod' : 'new') + getModPath(reportedCount ? 'reported' : queue) ); } @@ -41,12 +43,14 @@ export default class Moderation extends Component { } componentWillUpdate() { - const {router, route, root: {asset}} = this.props; + const {router, route, root: {asset, reportedCount}} = this.props; // Will update the URL to premod or new based on the moderation of the *asset* + // If there is a reported comments, reported queue has priority! if (route.path === ':id') { + const queue = isPremod(asset.settings.moderation) ? 'premod' : 'new'; router.push( - getModPath(isPremod(asset.settings.moderation) ? 'premod' : 'new', asset.id) + getModPath(reportedCount ? 'reported' : queue, asset.id) ); } }