From a21d73dcad5c7285adf6ce7b13c5263d013c88c1 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Wed, 26 Apr 2017 08:26:29 -0600 Subject: [PATCH 1/6] accepted queue --- client/coral-admin/src/AppRouter.js | 3 +++ .../containers/ModerationQueue/ModerationContainer.js | 4 ++++ .../ModerationQueue/components/ModerationMenu.js | 8 +++++++- .../src/graphql/queries/modQueueQuery.graphql | 11 +++++++++++ client/coral-admin/src/translations.json | 3 +++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index bfb2e197c..af3423acc 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -42,6 +42,9 @@ const routes = ( + + + diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index dffa4de26..eb59f369e 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -138,6 +138,9 @@ class ModerationContainer extends Component { case 'all': activeTabCount = data.allCount; break; + case 'accepted': + activeTabCount = data.acceptedCount; + break; case 'premod': activeTabCount = data.premodCount; break; @@ -155,6 +158,7 @@ class ModerationContainer extends Component { { function getPath (type) { @@ -28,6 +28,12 @@ const ModerationMenu = ( activeClassName={styles.active}> {lang.t('modqueue.all')} + + {lang.t('modqueue.accepted')} + Date: Wed, 26 Apr 2017 08:45:37 -0600 Subject: [PATCH 2/6] accepted => approved --- .../containers/ModerationQueue/components/ModerationMenu.js | 2 +- client/coral-admin/src/translations.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 5234c7bb3..39594274e 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -32,7 +32,7 @@ const ModerationMenu = ( to={getPath('accepted')} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}> - {lang.t('modqueue.accepted')} + {lang.t('modqueue.approved')} Date: Wed, 26 Apr 2017 09:20:23 -0600 Subject: [PATCH 3/6] =?UTF-8?q?espa=C3=B1ol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/coral-admin/src/translations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 7cea2e653..38adf2596 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -227,7 +227,7 @@ }, "modqueue": { "all": "todos", - "approved": "approved", + "approved": "aprobado", "likes": "gustos", "premod": "pre-mod", "rejected": "rechazado", From d5b800f59050ad2180ba70c306f398334926e8d4 Mon Sep 17 00:00:00 2001 From: riley Date: Thu, 27 Apr 2017 11:17:53 -0600 Subject: [PATCH 4/6] add accepted rejected aciton buttons --- client/coral-admin/src/components/ActionButton.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/ActionButton.js b/client/coral-admin/src/components/ActionButton.js index 1fcafeac0..ae75b829e 100644 --- a/client/coral-admin/src/components/ActionButton.js +++ b/client/coral-admin/src/components/ActionButton.js @@ -6,6 +6,13 @@ import {menuActionsMap} from '../containers/ModerationQueue/helpers/moderationQu const ActionButton = ({type = '', status, ...props}) => { const typeName = type.toLowerCase(); const active = ((type === 'REJECT' && status === 'REJECTED') || (type === 'APPROVE' && status === 'ACCEPTED')); + let text = menuActionsMap[type].text; + + if (text === 'Approve' && active) { + text = 'Approved'; + } else if (text === 'Reject' && active) { + text = 'Rejected'; + } return ( + >{text} ); }; From f6cede3fdadcb4ac2da9cdd74ef2971dc07e328a Mon Sep 17 00:00:00 2001 From: riley Date: Thu, 27 Apr 2017 11:23:27 -0600 Subject: [PATCH 5/6] add accepted to propTypes --- .../src/containers/ModerationQueue/components/LoadMore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js index 71b6b9e37..f16635486 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js @@ -23,7 +23,7 @@ LoadMore.propTypes = { comments: PropTypes.array.isRequired, loadMore: PropTypes.func.isRequired, sort: PropTypes.oneOf(['CHRONOLOGICAL', 'REVERSE_CHRONOLOGICAL']).isRequired, - tab: PropTypes.oneOf(['rejected', 'premod', 'flagged', 'all']).isRequired, + tab: PropTypes.oneOf(['rejected', 'premod', 'flagged', 'all', 'accepted']).isRequired, assetId: PropTypes.string, showLoadMore: PropTypes.bool.isRequired }; From a3ec23c27349cfab390fc3fe16c5d22f3be2de16 Mon Sep 17 00:00:00 2001 From: riley Date: Thu, 27 Apr 2017 13:09:00 -0600 Subject: [PATCH 6/6] mange counts and such for all queue --- client/coral-admin/src/graphql/mutations/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js index 7ca1b078f..364243cb1 100644 --- a/client/coral-admin/src/graphql/mutations/index.js +++ b/client/coral-admin/src/graphql/mutations/index.js @@ -54,20 +54,26 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { }, updateQueries: { ModQueue: (oldData) => { + const comment = oldData.all.find(c => c.id === commentId); + comment.status = 'ACCEPTED'; const premod = oldData.premod.filter(c => c.id !== commentId); const flagged = oldData.flagged.filter(c => c.id !== commentId); + const accepted = [comment].concat(oldData.accepted); const rejected = oldData.rejected.filter(c => c.id !== commentId); const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount; const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount; const rejectedCount = rejected.length < oldData.rejected.length ? oldData.rejectedCount - 1 : oldData.rejectedCount; + const acceptedCount = oldData.acceptedCount + 1; return { ...oldData, premodCount, flaggedCount, + acceptedCount, rejectedCount, premod, flagged, + accepted, rejected, }; } @@ -82,21 +88,26 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { }, updateQueries: { ModQueue: (oldData) => { - const comment = oldData.premod.concat(oldData.flagged).filter(c => c.id === commentId)[0]; + const comment = oldData.all.find(c => c.id === commentId); + comment.status = 'REJECTED'; const rejected = [comment].concat(oldData.rejected); const premod = oldData.premod.filter(c => c.id !== commentId); const flagged = oldData.flagged.filter(c => c.id !== commentId); + const accepted = oldData.accepted.filter(c => c.id !== commentId); const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount; const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount; const rejectedCount = oldData.rejectedCount + 1; + const acceptedCount = accepted.length < oldData.accepted.length ? oldData.acceptedCount - 1 : oldData.acceptedCount; return { ...oldData, premodCount, flaggedCount, + acceptedCount, rejectedCount, premod, flagged, + accepted, rejected }; }