Merge pull request #245 from thematters/fix/comment-count

fix comment count
thematters · Apr 30, 2019 · a63cdb8 · a63cdb8
2 parents 351a7af + 071bc77
commit a63cdb8
Show file tree

Hide file tree

Showing 4 changed files with 555 additions and 547 deletions.
diff --git a/common/utils/connections.ts b/common/utils/connections.ts
@@ -17,8 +17,10 @@ export const mergeConnections = ({
   const { edges: newEdges, pageInfo: newPageInfo } = _get(newData, path)
 
   const result = oldData
+
   if (newPageInfo.endCursor !== oldPageInfo.endCursor) {
-    _set(result, path, {
+    const copy = JSON.parse(JSON.stringify(result))
+    return _set(copy, path, {
       ...rest,
       pageInfo: newPageInfo,
       edges: [...oldEdges, ...newEdges]

diff --git a/components/ArticleDigest/Actions/CommentCount.tsx b/components/ArticleDigest/Actions/CommentCount.tsx
@@ -4,19 +4,19 @@ import Link from 'next/link'
 
 import { Icon, TextIcon } from '~/components'
 
-import { numAbbr, toPath } from '~/common/utils'
+import { ANALYTICS_EVENTS } from '~/common/enums'
+import { analytics, numAbbr, toPath } from '~/common/utils'
 import ICON_COMMENT_SM from '~/static/icons/comment-small.svg?sprite'
 
 import { CommentCountArticle } from './__generated__/CommentCountArticle'
 
 const fragments = {
   article: gql`
     fragment CommentCountArticle on Article {
+      id
       slug
       mediaHash
-      comments(input: { first: 0 }) {
-        totalCount
-      }
+      commentCount
       author {
         userName
       }
@@ -47,7 +47,14 @@ const CommentCount = ({
 
   return (
     <Link {...path}>
-      <a>
+      <a
+        onClick={() => {
+          analytics.trackEvent(ANALYTICS_EVENTS.OPEN_COMMENTS, {
+            entrance: article.id,
+            type: 'article-digest'
+          })
+        }}
+      >
         <TextIcon
           icon={
             <Icon
@@ -58,7 +65,7 @@ const CommentCount = ({
           }
           color="grey"
           weight="medium"
-          text={numAbbr(_get(article, 'comments.totalCount', 0))}
+          text={numAbbr(_get(article, 'commentCount', 0))}
           size={size === 'default' ? 'sm' : 'xs'}
           spacing="xxtight"
         />