From 3fa2af975c327ec21832d80489a91356911b3f6b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 26 Jan 2018 17:28:21 +0100
Subject: [PATCH] Bug fixes

---
 client/coral-admin/src/containers/Header.js           |  9 +++++++--
 .../src/routes/Moderation/containers/Indicator.js     |  5 ++++-
 client/coral-admin/src/routes/Moderation/graphql.js   | 11 -----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/containers/Header.js b/client/coral-admin/src/containers/Header.js
index dd16c17c6..d3be66764 100644
--- a/client/coral-admin/src/containers/Header.js
+++ b/client/coral-admin/src/containers/Header.js
@@ -7,11 +7,16 @@ import { getDefinitionName } from 'coral-framework/utils';
 
 export default withQuery(
   gql`
-    query TalkAdmin_Header {
+    query TalkAdmin_Header($nullID: ID) {
       ...${getDefinitionName(ModerationIndicator.fragments.root)}
       ...${getDefinitionName(CommunityIndicator.fragments.root)}
     }
     ${ModerationIndicator.fragments.root}
     ${CommunityIndicator.fragments.root}
-  `
+  `,
+  {
+    options: {
+      variables: { nullID: null },
+    },
+  }
 )(Header);
diff --git a/client/coral-admin/src/routes/Moderation/containers/Indicator.js b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
index 359a2cd5d..1475b6e2d 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Indicator.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Indicator.js
@@ -188,11 +188,14 @@ const enhance = compose(
   withFragments({
     root: gql`
       fragment TalkAdmin_Moderation_Indicator_root on RootQuery {
-        premodCount: commentCount(query: { statuses: [PREMOD] })
+        premodCount: commentCount(
+          query: { statuses: [PREMOD], asset_id: $nullID }
+        )
         reportedCount: commentCount(
           query: {
             statuses: [NONE, PREMOD, SYSTEM_WITHHELD]
             action_type: FLAG
+            asset_id: $nullID
           }
         )
       }
diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index 44b4f6108..c542b8f84 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -112,23 +112,12 @@ function getOlderDate(a, b) {
 function determineLatestChange(comment) {
   let lc = null;
 
-  // Skip it when comment itself was not updated.
-  // We'll use the one from the status_history instead
-  // as they might diverge a little bit (status_history item is created
-  // before the comment itself)
-  if (comment.createdAt !== comment.updatedAt) {
-    lc = getOlderDate(lc, comment.createdAt);
-    lc = getOlderDate(lc, comment.updatedAt);
-  }
-
   comment.status_history.forEach(item => {
     lc = getOlderDate(lc, item.created_at);
-    lc = getOlderDate(lc, item.updated_at);
   });
 
   comment.actions.forEach(item => {
     lc = getOlderDate(lc, item.created_at);
-    lc = getOlderDate(lc, item.updated_at);
   });
 
   return lc;