Merge branch 'master' into mod-queue-sort

client/coral-embed-stream/src/Comment.js

@@ -90,6 +90,7 @@ class Comment extends React.Component {
       showSignInDialog,
       postLike,
       postFlag,
+      postDontAgree,
       loadMore,
       setActiveReplyBox,
       activeReplyBox,
@@ -98,6 +99,7 @@ class Comment extends React.Component {
 
     const like = getActionSummary('LikeActionSummary', comment);
     const flag = getActionSummary('FlagActionSummary', comment);
+    const dontagree = getActionSummary('DontAgreeActionSummary', comment);
 
     return (
       <div
@@ -129,10 +131,11 @@ class Comment extends React.Component {
         <div className="commentActionsRight">
           <PermalinkButton articleURL={asset.url} commentId={comment.id} />
           <FlagComment
-            flag={flag}
+            flag={flag && flag.current_user ? flag : dontagree}
             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

@@ -13,7 +13,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 {updateCountCache} from 'coral-framework/actions/asset';
 import {Notification, notificationActions, authActions, assetActions, pym} from 'coral-framework';
@@ -175,6 +175,7 @@ class Embed extends Component {
               currentUser={user}
               postLike={this.props.postLike}
               postFlag={this.props.postFlag}
+              postDontAgree={this.props.postDontAgree}
               getCounts={this.props.getCounts}
               updateCountCache={this.props.updateCountCache}
               loadMore={this.props.loadMore}
@@ -248,6 +249,7 @@ export default compose(
   postComment,
   postFlag,
   postLike,
+  postDontAgree,
   deleteAction,
   queryStream
 )(Embed);

client/coral-embed-stream/src/Stream.js

@@ -60,6 +60,7 @@ class Stream extends React.Component {
       addNotification,
       postFlag,
       postLike,
+      postDontAgree,
       loadMore,
       deleteAction,
       showSignInDialog,
@@ -81,6 +82,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';
@@ -100,6 +101,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,31 @@ 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,
+        reason: null,
         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') {
+            this.setState({localPost: data.createDontAgree.dontagree.id});
+          }
+        });
+      } else {
+        postFlag({...action, reason})
+        .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')}
     ]
     : [