diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 722faaaa3..2ff6b6732 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -208,17 +208,22 @@ class ModerationContainer extends Component { // Still loading. return ; } - } else if(asset !== undefined || !('premodCount' in root)) { + } else if (asset !== undefined || !('premodCount' in root)) { // loading. return ; } - const premodEnabled = assetId ? isPremod(asset.settings.moderation) : isPremod(settings.moderation); + const premodEnabled = assetId ? isPremod(asset.settings.moderation) : + isPremod(settings.moderation); + const currentQueueConfig = Object.assign({}, this.props.queueConfig); - if (premodEnabled) { + + if (premodEnabled && root.newCount === 0) { delete currentQueueConfig.new; - } else { + } + + if (!premodEnabled && root.premodCount === 0) { delete currentQueueConfig.premod; } @@ -355,8 +360,9 @@ const withModQueueQuery = withQuery(({queueConfig}) => gql` variables: { asset_id: id, sortOrder: props.moderation.sortOrder, - allAssets: id === null - } + allAssets: id === null, + }, + fetchPolicy: 'network-only' }; }, }); diff --git a/client/coral-admin/src/routes/Moderation/queueConfig.js b/client/coral-admin/src/routes/Moderation/queueConfig.js index 9a23ccc6c..86a622177 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 { + new: { + statuses: ['NONE'], + icon: 'question_answer', + name: t('modqueue.new'), + }, premod: { statuses: ['PREMOD'], icon: 'access_time', name: t('modqueue.premod'), }, - new: { - statuses: ['NONE', 'PREMOD'], - icon: 'question_answer', - name: t('modqueue.new'), - }, reported: { action_type: 'FLAG', statuses: ['NONE', 'PREMOD'],