From 1d8ce1ae340680c7d46a6b1add71b592281456a7 Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 21 Feb 2017 14:41:33 -0500 Subject: [PATCH] Posting DontAgree actions. --- client/coral-embed-stream/src/Comment.js | 2 ++ client/coral-embed-stream/src/Embed.js | 4 ++- client/coral-embed-stream/src/Stream.js | 2 ++ .../graphql/mutations/index.js | 12 +++++++ .../graphql/mutations/postDontAgree.graphql | 10 ++++++ client/coral-plugin-flags/FlagBio.js | 35 ------------------- client/coral-plugin-flags/FlagButton.js | 29 ++++++++++----- client/coral-plugin-flags/FlagComment.js | 2 +- graph/resolvers/action.js | 2 ++ graph/resolvers/action_summary.js | 2 ++ graph/resolvers/dont_agree_action.js | 9 +++++ graph/resolvers/dont_agree_action_summary.js | 7 ++++ graph/resolvers/index.js | 4 +++ graph/resolvers/root_mutation.js | 3 ++ graph/typeDefs.graphql | 10 +++--- 15 files changed, 82 insertions(+), 51 deletions(-) create mode 100644 client/coral-framework/graphql/mutations/postDontAgree.graphql delete mode 100644 client/coral-plugin-flags/FlagBio.js create mode 100644 graph/resolvers/dont_agree_action.js create mode 100644 graph/resolvers/dont_agree_action_summary.js diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js index 034c44f6a..c2737b275 100644 --- a/client/coral-embed-stream/src/Comment.js +++ b/client/coral-embed-stream/src/Comment.js @@ -90,6 +90,7 @@ class Comment extends React.Component { showSignInDialog, postLike, postFlag, + postDontAgree, loadMore, setActiveReplyBox, activeReplyBox, @@ -133,6 +134,7 @@ class Comment extends React.Component { id={comment.id} author_id={comment.user.id} postFlag={postFlag} + postDontAgree={postDontAgree} deleteAction={deleteAction} showSignInDialog={showSignInDialog} currentUser={currentUser} /> diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index f15def5d3..d3747fbe0 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -10,7 +10,7 @@ const {addNotification, clearNotification} = notificationActions; const {fetchAssetSuccess} = assetActions; import {queryStream} from 'coral-framework/graphql/queries'; -import {postComment, postFlag, postLike, deleteAction} from 'coral-framework/graphql/mutations'; +import {postComment, postFlag, postLike, postDontAgree, deleteAction} from 'coral-framework/graphql/mutations'; import {editName} from 'coral-framework/actions/user'; import {Notification, notificationActions, authActions, assetActions, pym} from 'coral-framework'; @@ -156,6 +156,7 @@ class Embed extends Component { currentUser={user} postLike={this.props.postLike} postFlag={this.props.postFlag} + postDontAgree={this.props.postDontAgree} loadMore={this.props.loadMore} deleteAction={this.props.deleteAction} showSignInDialog={this.props.showSignInDialog} @@ -226,6 +227,7 @@ export default compose( postComment, postFlag, postLike, + postDontAgree, deleteAction, queryStream )(Embed); diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js index 2f0f4b01b..59f1e4179 100644 --- a/client/coral-embed-stream/src/Stream.js +++ b/client/coral-embed-stream/src/Stream.js @@ -39,6 +39,7 @@ class Stream extends React.Component { addNotification, postFlag, postLike, + postDontAgree, loadMore, deleteAction, showSignInDialog, @@ -60,6 +61,7 @@ class Stream extends React.Component { currentUser={currentUser} postLike={postLike} postFlag={postFlag} + postDontAgree={postDontAgree} loadMore={loadMore} deleteAction={deleteAction} showSignInDialog={showSignInDialog} diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js index 40ca0a7a3..d757923ee 100644 --- a/client/coral-framework/graphql/mutations/index.js +++ b/client/coral-framework/graphql/mutations/index.js @@ -2,6 +2,7 @@ import {graphql} from 'react-apollo'; import POST_COMMENT from './postComment.graphql'; import POST_FLAG from './postFlag.graphql'; import POST_LIKE from './postLike.graphql'; +import POST_DONT_AGREE from './postDontAgree.graphql'; import DELETE_ACTION from './deleteAction.graphql'; import commentView from '../fragments/commentView.graphql'; @@ -44,6 +45,17 @@ export const postFlag = graphql(POST_FLAG, { }}), }); +export const postDontAgree = graphql(POST_DONT_AGREE, { + props: ({mutate}) => ({ + postDontAgree: (dontagree) => { + return mutate({ + variables: { + dontagree + } + }); + }}), +}); + export const deleteAction = graphql(DELETE_ACTION, { props: ({mutate}) => ({ deleteAction: (id) => { diff --git a/client/coral-framework/graphql/mutations/postDontAgree.graphql b/client/coral-framework/graphql/mutations/postDontAgree.graphql new file mode 100644 index 000000000..6e36d48b8 --- /dev/null +++ b/client/coral-framework/graphql/mutations/postDontAgree.graphql @@ -0,0 +1,10 @@ +mutation CreateDontAgree($dontagree: CreateDontAgreeInput!) { + createDontAgree(dontagree:$dontagree) { + dontagree { + id + } + errors { + translation_key + } + } +} diff --git a/client/coral-plugin-flags/FlagBio.js b/client/coral-plugin-flags/FlagBio.js deleted file mode 100644 index 2639ab8cf..000000000 --- a/client/coral-plugin-flags/FlagBio.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react'; -import FlagButton from './FlagButton'; -import {I18n} from '../coral-framework'; -import translations from './translations.json'; - -const FlagBio = (props) => ; - -const getPopupMenu = [ - () => { - return { - header: lang.t('step-2-header'), - itemType: 'USERS', - field: 'bio', - options: [ - {val: 'This bio is offensive', text: lang.t('bio-offensive')}, - {val: 'I don\'t like this bio', text: lang.t('no-like-bio')}, - {val: 'This looks like an ad/marketing', text: lang.t('marketing')}, - {val: 'other', text: lang.t('other')} - ], - button: lang.t('continue'), - sets: 'reason' - }; - }, - () => { - return { - header: lang.t('step-3-header'), - text: lang.t('thank-you'), - button: lang.t('done'), - }; - } -]; - -export default FlagBio; - -const lang = new I18n(translations); diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index e94dfc5fc..53ca3cebe 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -38,7 +38,7 @@ class FlagButton extends Component { } onPopupContinue = () => { - const {postFlag, id, author_id} = this.props; + const {postFlag, postDontAgree, id, author_id} = this.props; const {itemType, reason, step, posted, message} = this.state; // Proceed to the next step or close the menu if we've reached the end @@ -52,7 +52,6 @@ class FlagButton extends Component { if (itemType && reason && !posted) { this.setState({posted: true}); - // Set the text from the "other" field if it exists. let item_id; switch(itemType) { case 'COMMENTS': @@ -63,20 +62,32 @@ class FlagButton extends Component { break; } - // Note: Action metadata has been temporarily removed. if (itemType === 'COMMENTS') { this.setState({localPost: 'temp'}); } - postFlag({ + + let action = { item_id, item_type: itemType, reason, message - }).then(({data}) => { - if (itemType === 'COMMENTS') { - this.setState({localPost: data.createFlag.flag.id}); - } - }); + }; + if (reason === 'I don\'t agree with this comment') { + postDontAgree(action) + .then(({data}) => { + if (itemType === 'COMMENTS') { + console.log('data', data); + this.setState({localPost: data.createDontAgree.dontagree.id}); + } + }); + } else { + postFlag(action) + .then(({data}) => { + if (itemType === 'COMMENTS') { + this.setState({localPost: data.createFlag.flag.id}); + } + }); + } } } diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js index bf3fca286..24fde6b0f 100644 --- a/client/coral-plugin-flags/FlagComment.js +++ b/client/coral-plugin-flags/FlagComment.js @@ -20,9 +20,9 @@ const getPopupMenu = [ (itemType) => { const options = itemType === 'COMMENTS' ? [ - {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')}, {val: 'This comment is offensive', text: lang.t('comment-offensive')}, {val: 'This looks like an ad/marketing', text: lang.t('marketing')}, + {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')}, {val: 'other', text: lang.t('other')} ] : [ diff --git a/graph/resolvers/action.js b/graph/resolvers/action.js index 0962f59af..1bb8d077e 100644 --- a/graph/resolvers/action.js +++ b/graph/resolvers/action.js @@ -1,6 +1,8 @@ const Action = { __resolveType({action_type}) { switch (action_type) { + case 'DONTAGREE': + return 'DontAgreeAction'; case 'FLAG': return 'FlagAction'; case 'LIKE': diff --git a/graph/resolvers/action_summary.js b/graph/resolvers/action_summary.js index 93848d285..1986a0648 100644 --- a/graph/resolvers/action_summary.js +++ b/graph/resolvers/action_summary.js @@ -5,6 +5,8 @@ const ActionSummary = { return 'FlagActionSummary'; case 'LIKE': return 'LikeActionSummary'; + case 'DONTAGREE': + return 'DontAgreeActionSummary'; } }, }; diff --git a/graph/resolvers/dont_agree_action.js b/graph/resolvers/dont_agree_action.js new file mode 100644 index 000000000..25dc02503 --- /dev/null +++ b/graph/resolvers/dont_agree_action.js @@ -0,0 +1,9 @@ +const DontAgreeAction = { + + // Stored in the metadata, extract and return. + reason({metadata: {reason}}) { + return reason; + } +}; + +module.exports = DontAgreeAction; diff --git a/graph/resolvers/dont_agree_action_summary.js b/graph/resolvers/dont_agree_action_summary.js new file mode 100644 index 000000000..520fdce3b --- /dev/null +++ b/graph/resolvers/dont_agree_action_summary.js @@ -0,0 +1,7 @@ +const DontAgreeActionSummary = { + reason({group_id}) { + return group_id; + } +}; + +module.exports = DontAgreeActionSummary; diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js index 65461dc76..3bd8c571d 100644 --- a/graph/resolvers/index.js +++ b/graph/resolvers/index.js @@ -6,6 +6,8 @@ const Comment = require('./comment'); const Date = require('./date'); const FlagActionSummary = require('./flag_action_summary'); const FlagAction = require('./flag_action'); +const DontAgreeAction = require('./dont_agree_action'); +const DontAgreeActionSummary = require('./dont_agree_action_summary'); const GenericUserError = require('./generic_user_error'); const LikeAction = require('./like_action'); const RootMutation = require('./root_mutation'); @@ -24,6 +26,8 @@ module.exports = { Date, FlagActionSummary, FlagAction, + DontAgreeAction, + DontAgreeActionSummary, GenericUserError, LikeAction, RootMutation, diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js index 4285f900d..51b200a2d 100644 --- a/graph/resolvers/root_mutation.js +++ b/graph/resolvers/root_mutation.js @@ -24,6 +24,9 @@ const RootMutation = { createFlag(_, {flag: {item_id, item_type, reason, message}}, {mutators: {Action}}) { return wrapResponse('flag')(Action.create({item_id, item_type, action_type: 'FLAG', group_id: reason, metadata: {message}})); }, + createDontAgree(_, {dontagree: {item_id, item_type, reason, message}}, {mutators: {Action}}) { + return wrapResponse('dontagee')(Action.create({item_id, item_type, action_type: 'DONTAGREE', group_id: reason, metadata: {message}})); + }, deleteAction(_, {id}, {mutators: {Action}}) { return wrapResponse(null)(Action.delete({id})); }, diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql index 04fc5ed70..30bb79262 100644 --- a/graph/typeDefs.graphql +++ b/graph/typeDefs.graphql @@ -480,18 +480,18 @@ type RootQuery { # Response defines what can be expected from any response to a mutation action. interface Response { - # An array of errors relating to the mutation that occured. + # An array of errors relating to the mutation that occurred. errors: [UserError] } # CreateCommentResponse is returned with the comment that was created and any -# errors that may have occured in the attempt to create it. +# errors that may have occurred in the attempt to create it. type CreateCommentResponse implements Response { # The comment that was created. comment: Comment - # An array of errors relating to the mutation that occured. + # An array of errors relating to the mutation that occurred. errors: [UserError] } @@ -593,7 +593,7 @@ type DeleteActionResponse implements Response { # relating to the delete action attempt. type SetUserStatusResponse implements Response { - # An array of errors relating to the mutation that occured. + # An array of errors relating to the mutation that occurred. errors: [UserError] } @@ -601,7 +601,7 @@ type SetUserStatusResponse implements Response { # relating to the delete action attempt. type SetCommentStatusResponse implements Response { - # An array of errors relating to the mutation that occured. + # An array of errors relating to the mutation that occurred. errors: [UserError] }