From 9ba0176b3c0f644f2e65ca07dad9bed7538370aa Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 4 Jan 2017 16:11:31 -0500
Subject: [PATCH] Seperating username and bio flags

---
 client/coral-admin/src/components/UserAction.js | 2 +-
 client/coral-admin/src/reducers/actions.js      | 7 +++++--
 client/coral-plugin-flags/FlagButton.js         | 2 +-
 models/action.js                                | 3 ---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/components/UserAction.js b/client/coral-admin/src/components/UserAction.js
index 8617562c9..7c072f3b1 100644
--- a/client/coral-admin/src/components/UserAction.js
+++ b/client/coral-admin/src/components/UserAction.js
@@ -53,7 +53,7 @@ const UserAction = props => {
         </div>
       }
       <div className={styles.flagCount}>
-        {`${action.count} ${lang.t('user.bio_flags')}`}
+        {`${action.count} ${action.action_type === 'flag_bio' ? lang.t('user.bio_flags') : lang.t('user.username_flags')}`}
       </div>
     </li>
   );
diff --git a/client/coral-admin/src/reducers/actions.js b/client/coral-admin/src/reducers/actions.js
index e6878b50f..284e41c72 100644
--- a/client/coral-admin/src/reducers/actions.js
+++ b/client/coral-admin/src/reducers/actions.js
@@ -15,9 +15,12 @@ export default (state = initialState, action) => {
 };
 
 const addActions = (state, action) => {
-  const ids = action.actions.map(action => action.item_id);
+  
+  // Make ids that are unique by item_id and by action type
+  const typeId = (action) => `${action.action_type}_${action.item_id}`;
+  const ids = action.actions.map(action => typeId(action));
   const map = action.actions.reduce((memo, action) => {
-    memo[action.item_id] = action;
+    memo[typeId(action)] = action;
     return memo;
   }, {});
   return state.set('byId', fromJS(map)).set('ids', new Set(ids));
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index 097ac9d5b..3adfc5d92 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -52,7 +52,7 @@ class FlagButton extends Component {
         break;
       }
       const action = {
-        action_type: 'flag',
+        action_type: `flag_${field}`,
         metadata: {
           field,
           reason,
diff --git a/models/action.js b/models/action.js
index 0778e2820..476e4de95 100644
--- a/models/action.js
+++ b/models/action.js
@@ -134,9 +134,6 @@ ActionSchema.statics.getActionSummaries = function(item_ids, current_user_id = '
         item_type: {
           $last: '$item_type'
         },
-        metadata: {
-          $push: '$metadata'
-        },
         created_at: {
           $min: '$created_at'
         },