Posting DontAgree actions.

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} />

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);

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}

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) => {

client/coral-framework/graphql/mutations/postDontAgree.graphql

@@ -0,0 +1,10 @@
+mutation CreateDontAgree($dontagree: CreateDontAgreeInput!) {
+  createDontAgree(dontagree:$dontagree) {
+    dontagree {
+      id
+    }
+    errors {
+      translation_key
+    }
+  }
+}

client/coral-plugin-flags/FlagBio.js

@@ -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) => <FlagButton {...props} getPopupMenu={getPopupMenu} />;
-
-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);

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});
+          }
+        });
+      }
     }
   }
 

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')}
     ]
     : [

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':

graph/resolvers/action_summary.js

@@ -5,6 +5,8 @@ const ActionSummary = {
       return 'FlagActionSummary';
     case 'LIKE':
       return 'LikeActionSummary';
+    case 'DONTAGREE':
+      return 'DontAgreeActionSummary';
     }
   },
 };

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;

graph/resolvers/dont_agree_action_summary.js

@@ -0,0 +1,7 @@
+const DontAgreeActionSummary = {
+  reason({group_id}) {
+    return group_id;
+  }
+};
+
+module.exports = DontAgreeActionSummary;

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,

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}));
   },

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]
 }