From 6a06cb4684aec652a815ed58b6314a71d7e65f34 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Mon, 22 Jan 2018 22:42:17 +0100 Subject: [PATCH] Show notification when encountering an error in modqueue --- .../routes/Moderation/containers/Moderation.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index fd96c598b..c315cdca2 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -35,6 +35,7 @@ import { Spinner } from 'coral-ui'; import Moderation from '../components/Moderation'; import Comment from './Comment'; import baseQueueConfig from '../queueConfig'; +import { notifyOnMutationError } from 'coral-framework/hocs'; function prepareNotificationText(text) { return truncate(text, { length: 50 }).replace('\n', ' '); @@ -213,6 +214,16 @@ class ModerationContainer extends Component { ) { this.resubscribe(nextProps.data.variables); } + + // Notify on fetching errors. + if ( + (!this.props.data.error && nextProps.data.error) || + (this.props.data.error && + nextProps.data.error && + this.props.data.error.message !== nextProps.data.error.message) + ) { + return this.props.notify('error', nextProps.data.error.message); + } } cleanUpQueue = queue => { @@ -269,10 +280,6 @@ class ModerationContainer extends Component { const { root, root: { asset, settings }, data } = this.props; const assetId = getAssetId(this.props); - if (data.error) { - return
Error
; - } - if (assetId) { if (asset === null) { // Not found. @@ -534,5 +541,6 @@ export default compose( withQueueConfig(baseQueueConfig), connect(mapStateToProps, mapDispatchToProps), withSetCommentStatus, + notifyOnMutationError(['setCommentStatus']), withModQueueQuery )(ModerationContainer);