From b6b7570bcc57477226bbd6553c42e57f04db1a63 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 2 Aug 2017 18:14:52 +0700 Subject: [PATCH] Remove subscription code --- .../Moderation/containers/Moderation.js | 29 ++----------------- graph/mutators/tag.js | 4 --- graph/resolvers/subscription.js | 3 -- graph/subscriptions.js | 11 ------- graph/typeDefs.graphql | 4 --- perms/constants.js | 1 - perms/subscriptionReducer.js | 2 -- .../client/containers/ModTag.js | 1 + 8 files changed, 4 insertions(+), 51 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 41f95e2e0..f02c148cf 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -38,7 +38,7 @@ function prepareNotificationText(text) { class ModerationContainer extends Component { subscriptions = []; - get activeTab() { + get activeTab() { const {root: {asset, settings}, router, route} = this.props; @@ -47,7 +47,7 @@ class ModerationContainer extends Component { const queue = isPremod(premod) ? 'premod' : 'new'; const activeTab = route.path && route.path !== ':id' ? route.path : queue; - + return activeTab; } @@ -115,21 +115,7 @@ class ModerationContainer extends Component { }, }); - const sub5 = this.props.data.subscribeToMore({ - document: COMMENT_FEATURED_SUBSCRIPTION, - variables, - updateQuery: (prev, {subscriptionData: {data: {commentFeatured: comment}}}) => { - const sort = this.props.moderation.sortOrder; - const notify = { - activeQueue: this.activeTab, - text: 'New Featured Comment', - anyQueue: true, - }; - return handleCommentChange(prev, comment, sort, notify); - }, - }); - - this.subscriptions.push(sub1, sub2, sub3, sub4, sub5); + this.subscriptions.push(sub1, sub2, sub3, sub4); } unsubscribe() { @@ -248,15 +234,6 @@ class ModerationContainer extends Component { } } -const COMMENT_FEATURED_SUBSCRIPTION = gql` - subscription CommentFeatured($asset_id: ID){ - commentFeatured(asset_id: $asset_id){ - ...${getDefinitionName(Comment.fragments.comment)} - } - } - ${Comment.fragments.comment} -`; - const COMMENT_EDITED_SUBSCRIPTION = gql` subscription CommentEdited($asset_id: ID){ commentEdited(asset_id: $asset_id){ diff --git a/graph/mutators/tag.js b/graph/mutators/tag.js index b37c79a11..6ce43c772 100644 --- a/graph/mutators/tag.js +++ b/graph/mutators/tag.js @@ -7,10 +7,6 @@ const {ADD_COMMENT_TAG, REMOVE_COMMENT_TAG} = require('../../perms/constants'); */ const modify = async ({user, loaders: {Tags}, pubsub}, operation, {name, id, item_type, asset_id}) => { - if (operation.name === 'add') { - pubsub.publish('commentFeatured', {}); - } - // Get the global list of tags from the dataloader. const tags = await Tags.getAll.load({id, item_type, asset_id}); diff --git a/graph/resolvers/subscription.js b/graph/resolvers/subscription.js index e86b9cea4..f6da9fb54 100644 --- a/graph/resolvers/subscription.js +++ b/graph/resolvers/subscription.js @@ -14,9 +14,6 @@ const Subscription = { commentFlagged(comment) { return comment; }, - commentFeatured(comment) { - return comment; - }, userBanned(user) { return user; }, diff --git a/graph/subscriptions.js b/graph/subscriptions.js index 26199dc24..adac849e0 100644 --- a/graph/subscriptions.js +++ b/graph/subscriptions.js @@ -24,7 +24,6 @@ const { SUBSCRIBE_ALL_USER_SUSPENDED, SUBSCRIBE_ALL_USER_BANNED, SUBSCRIBE_ALL_USERNAME_REJECTED, - SUBSCRIBE_COMMENT_FEATURED } = require('../perms/constants'); /** @@ -87,16 +86,6 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu } }, }), - commentFeatured: (options, args) => ({ - commentFeatured: { - filter: (comment, context) => { - if (!args.asset_id && (!context.user || !context.user.can(SUBSCRIBE_COMMENT_FEATURED))) { - return false; - } - return !args.asset_id || comment.asset_id === args.asset_id; - } - }, - }), userSuspended: (options, args) => ({ userSuspended: { filter: (user, context) => { diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql index dc34ffa40..999aea51c 100644 --- a/graph/typeDefs.graphql +++ b/graph/typeDefs.graphql @@ -1046,10 +1046,6 @@ type Subscription { # Requires the `ADMIN` or `MODERATOR` role. commentFlagged(asset_id: ID): Comment - # Get an update whenever a comment is featured. - # Requires the `ADMIN` or `MODERATOR` role. - commentFeatured(asset_id: ID): Comment - # Get an update whenever a comment has been accepted. # Requires the `ADMIN` or `MODERATOR` role. commentAccepted(asset_id: ID): Comment diff --git a/perms/constants.js b/perms/constants.js index f05540d2b..383f36daf 100644 --- a/perms/constants.js +++ b/perms/constants.js @@ -37,5 +37,4 @@ module.exports = { SUBSCRIBE_ALL_USER_SUSPENDED: 'SUBSCRIBE_ALL_USER_SUSPENDED', SUBSCRIBE_ALL_USER_BANNED: 'SUBSCRIBE_ALL_USER_BANNED', SUBSCRIBE_ALL_USERNAME_REJECTED: 'SUBSCRIBE_ALL_USERNAME_REJECTED', - SUBSCRIBE_COMMENT_FEATURED: 'SUBSCRIBE_COMMENT_FEATURED' }; diff --git a/perms/subscriptionReducer.js b/perms/subscriptionReducer.js index a88bec66c..e0f73526a 100644 --- a/perms/subscriptionReducer.js +++ b/perms/subscriptionReducer.js @@ -19,8 +19,6 @@ module.exports = (user, perm) => { return check(user, ['ADMIN', 'MODERATOR']); case types.SUBSCRIBE_ALL_USERNAME_REJECTED: return check(user, ['ADMIN', 'MODERATOR']); - case types.SUBSCRIBE_COMMENT_FEATURED: - return check(user, ['ADMIN', 'MODERATOR']); default: break; } diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModTag.js b/plugins/talk-plugin-featured-comments/client/containers/ModTag.js index 978700275..3b564d127 100644 --- a/plugins/talk-plugin-featured-comments/client/containers/ModTag.js +++ b/plugins/talk-plugin-featured-comments/client/containers/ModTag.js @@ -2,3 +2,4 @@ import ModTag from '../components/ModTag'; import {withTags} from 'plugin-api/beta/client/hocs'; export default withTags('featured')(ModTag); +