diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index 88b90d5e5..2cb4efcb6 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -35,7 +35,9 @@ const routes = ( {/* Moderation Routes */} - + + + diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 917061681..7c0c20f2c 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -83,14 +83,7 @@ export default class Moderation extends Component { } getComments = () => { - const {root, root: {asset, settings}, router, route} = this.props; - - // Grab premod from asset or from settings - const premod = !router.params.id ? settings.moderation : asset.settings.moderation; - - const queue = isPremod(premod) ? 'premod' : 'new'; - const activeTab = router.params.id ? queue : route.path; - + const {activeTab} = this.props; return root[activeTab].nodes; } diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 92ce5f733..eb453f69c 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -8,7 +8,7 @@ import t from 'coral-framework/services/i18n'; import update from 'immutability-helper'; import truncate from 'lodash/truncate'; import NotFoundAsset from '../components/NotFoundAsset'; -import {getModPath} from '../../../utils'; +import {isPremod, getModPath} from '../../../utils'; import {withSetCommentStatus} from 'coral-framework/graphql/mutations'; import {handleCommentChange} from '../../../graphql/utils'; @@ -39,8 +39,16 @@ class ModerationContainer extends Component { subscriptions = []; get activeTab() { - const {route} = this.props; - return route.path === ':id' ? 'new' : route.path; + + const {root: {asset, settings}, router, route} = this.props; + + // Grab premod from asset or from settings + const premod = !router.params.id ? settings.moderation : asset.settings.moderation; + + const queue = isPremod(premod) ? 'premod' : 'new'; + const activeTab = router.params.id ? queue : route.path; + + return activeTab; } subscribeToUpdates(variables = this.props.data.variables) {