From f140efe1bd6ae026be33f652b3cf438c5251e587 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 31 Aug 2017 11:10:28 -0300 Subject: [PATCH 1/7] Premod and New Queue Edge Case --- .../src/routes/Moderation/containers/Moderation.js | 11 ++++++++--- .../coral-admin/src/routes/Moderation/queueConfig.js | 10 +++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 722faaaa3..336ec1770 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -215,11 +215,16 @@ class ModerationContainer extends Component { } const premodEnabled = assetId ? isPremod(asset.settings.moderation) : isPremod(settings.moderation); + const currentQueueConfig = Object.assign({}, this.props.queueConfig); + + if (premodEnabled) { - delete currentQueueConfig.new; - } else { - delete currentQueueConfig.premod; + delete currentQueueConfig.new + } + + if (!root.premodCount || premodEnabled) { + delete currentQueueConfig.premod } return Date: Thu, 31 Aug 2017 11:30:11 -0300 Subject: [PATCH 2/7] premod and new --- .../src/routes/Moderation/containers/Moderation.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 336ec1770..523e5bf3f 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -218,13 +218,13 @@ class ModerationContainer extends Component { const currentQueueConfig = Object.assign({}, this.props.queueConfig); + console.log('premodEnabled', premodEnabled); + console.log('root.premodCount', root.premodCount) if (premodEnabled) { - delete currentQueueConfig.new - } - - if (!root.premodCount || premodEnabled) { - delete currentQueueConfig.premod + delete currentQueueConfig.new; + } else if (root.premodCount === 0) { + delete currentQueueConfig.premod; } return Date: Thu, 31 Aug 2017 11:41:20 -0300 Subject: [PATCH 3/7] Grabbing settings from the store --- .../src/routes/Moderation/containers/Moderation.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 523e5bf3f..a128af456 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -190,7 +190,7 @@ class ModerationContainer extends Component { }; render () { - const {root, root: {asset, settings}, data} = this.props; + const {root, root: {asset}, data, settings} = this.props; const assetId = getAssetId(this.props); if (data.error) { @@ -208,19 +208,17 @@ 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); - console.log('premodEnabled', premodEnabled); - console.log('root.premodCount', root.premodCount) - if (premodEnabled) { delete currentQueueConfig.new; } else if (root.premodCount === 0) { From 23c8e2a0e6d69b82ee8c9bcb63c9795830366aa1 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 31 Aug 2017 12:53:47 -0300 Subject: [PATCH 4/7] Refetching settings :) --- .../src/routes/Moderation/containers/Moderation.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index a128af456..a4770e28d 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -190,7 +190,7 @@ class ModerationContainer extends Component { }; render () { - const {root, root: {asset}, data, settings} = this.props; + const {root, root: {asset, settings}, data} = this.props; const assetId = getAssetId(this.props); if (data.error) { @@ -358,8 +358,9 @@ const withModQueueQuery = withQuery(({queueConfig}) => gql` variables: { asset_id: id, sortOrder: props.moderation.sortOrder, - allAssets: id === null - } + allAssets: id === null, + }, + fetchPolicy: 'network-only' }; }, }); From af0e9bc880a4876b1bd6246fd6404bc66ba587de Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 31 Aug 2017 13:02:07 -0300 Subject: [PATCH 5/7] New Queue should appear if there are comments with `NONE` status --- .../coral-admin/src/routes/Moderation/containers/Moderation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index a4770e28d..b266fe190 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -219,7 +219,7 @@ class ModerationContainer extends Component { const currentQueueConfig = Object.assign({}, this.props.queueConfig); - if (premodEnabled) { + if (premodEnabled && root.newCount === 0) { delete currentQueueConfig.new; } else if (root.premodCount === 0) { delete currentQueueConfig.premod; From 99235df5669c8fa5df0afbe41ef76cbb0e426136 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 31 Aug 2017 13:17:34 -0300 Subject: [PATCH 6/7] No premod status to the New Queue --- client/coral-admin/src/routes/Moderation/queueConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/queueConfig.js b/client/coral-admin/src/routes/Moderation/queueConfig.js index bf3caf823..86a622177 100644 --- a/client/coral-admin/src/routes/Moderation/queueConfig.js +++ b/client/coral-admin/src/routes/Moderation/queueConfig.js @@ -2,7 +2,7 @@ import t from 'coral-framework/services/i18n'; export default { new: { - statuses: ['NONE', 'PREMOD'], + statuses: ['NONE'], icon: 'question_answer', name: t('modqueue.new'), }, From 36c4c6a59f4be731380d3ff6b5285868e21793a1 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 31 Aug 2017 14:22:59 -0300 Subject: [PATCH 7/7] Ready --- .../src/routes/Moderation/containers/Moderation.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index b266fe190..2ff6b6732 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -221,7 +221,9 @@ class ModerationContainer extends Component { if (premodEnabled && root.newCount === 0) { delete currentQueueConfig.new; - } else if (root.premodCount === 0) { + } + + if (!premodEnabled && root.premodCount === 0) { delete currentQueueConfig.premod; }