From d5ff9d3eeb1dbd8a6027bda80a6872d9a8e7e2fd Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Fri, 14 Apr 2017 15:32:06 -0600
Subject: [PATCH] show the details

---
 .gitignore                                    |  1 -
 .../ModerationQueue/components/Comment.js     |  2 +-
 .../ModerationQueue/components/FlagBox.css    | 14 ++++++
 .../ModerationQueue/components/FlagBox.js     | 49 +++++++++++++------
 .../src/graphql/fragments/commentView.graphql |  3 ++
 5 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index a160b7f6e..f4014b561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,5 @@ coverage/
 plugins.json
 plugins/*
 !plugins/coral-plugin-facebook-auth
-**/node_modules/*
 !plugins/coral-plugin-respect
 **/node_modules/*
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 6a4b8d36b..a31fbd313 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -20,7 +20,7 @@ const lang = new I18n(translations);
 const Comment = ({actions = [], comment, ...props}) => {
   const links = linkify.getMatches(comment.body);
   const linkText = links ? links.map(link => link.raw) : [];
-  const actionSummaries = comment.action_summaries;
+  const actionSummaries = comment.action_summaries.filter(a => a.__typename === 'FlagActionSummary');
   const flagActions = comment.actions.filter(a => a.__typename === 'FlagAction');
 
   return (
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
index fa7bb0cca..5b8ea4f91 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.css
@@ -53,3 +53,17 @@
     font-size: 12px;
   }
 }
+
+.lessDetail {
+  display: inline-block;
+  margin-right: 10px;
+}
+
+.subDetail {
+  font-weight: normal;
+  color: #888;
+
+  span {
+    color: black;
+  }
+}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index 3b1843629..6068f76b5 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -4,7 +4,8 @@ import styles from './FlagBox.css';
 
 const shortReasons = {
   'This comment is offensive': 'Offensive',
-  'This looks like an ad/marketing': 'Spam/Ads'
+  'This looks like an ad/marketing': 'Spam/Ads',
+  'Other': 'other'
 };
 
 class FlagBox extends Component {
@@ -29,26 +30,42 @@ class FlagBox extends Component {
   }
 
   render() {
-    const {props} = this;
+    const {actionSummaries, actions} = this.props;
+    const {showDetail} = this.state;
+
     return (
       <div className={styles.flagBox}>
         <div className={styles.container}>
           <div className={styles.header}>
-            <Icon name='flag'/><h3>Flags ({props.actionSummaries.length}):</h3>
-            <div>
-              {props.actionSummaries.map((action, i) =>
-                <span key={i}>{this.reasonMap(action.reason)} (<strong>{action.count}</strong>)</span>
+            <Icon name='flag'/><h3>Flags ({actionSummaries.length}):</h3>
+            <ul>
+              {actionSummaries.map((action, i) =>
+                <li key={i} className={styles.lessDetail}>{this.reasonMap(action.reason)} (<strong>{action.count}</strong>)</li>
               )}
-            </div>
-            <a onClick={this.toggleDetail} className={styles.moreDetail}>More detail</a>
+            </ul>
+            <a onClick={this.toggleDetail} className={styles.moreDetail}>{showDetail ? 'Less' : 'More'} detail</a>
           </div>
-          {this.state.showDetail && (<div className={styles.detail}>
-          <ul>
-            {props.actionSummaries.map((action, i) =>
-              <li key={i}>{this.reasonMap(action.reason)} (<strong>{action.count}</strong>)</li>
-            )}
-          </ul>
-          </div>)}
+          {showDetail && (
+            <div className={styles.detail}>
+              <ul>
+                {actionSummaries.map((summary, i) => {
+
+                  const actionList = actions.filter(a => a.reason === summary.reason);
+
+                  return (
+                    <li key={i}>
+                      {this.reasonMap(summary.reason)} (<strong>{summary.count}</strong>)
+                      <ul>
+                        {
+                          actionList.map((action, j) => <li key={`${i}_${j}`} className={styles.subDetail}><span>{action.user.username}</span> {action.message}</li>)
+                        }
+                      </ul>
+                    </li>
+                  );
+                })}
+              </ul>
+            </div>
+          )}
         </div>
       </div>
     );
@@ -59,7 +76,7 @@ FlagBox.propTypes = {
   actionSummaries: PropTypes.arrayOf(PropTypes.shape({
 
   })).isRequired,
-  flagActions: PropTypes.arrayOf(PropTypes.shape({
+  actions: PropTypes.arrayOf(PropTypes.shape({
 
   })).isRequired
 };
diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql
index 36943602e..8c7310bdf 100644
--- a/client/coral-admin/src/graphql/fragments/commentView.graphql
+++ b/client/coral-admin/src/graphql/fragments/commentView.graphql
@@ -16,6 +16,9 @@ fragment commentView on Comment {
       ... on FlagAction {
         reason
         message
+        user {
+          username
+        }
       }
     }
 }