Merge pull request #4965 from thematters/fix/remove-unused-tag-count

src/components/GQL/updates/index.ts

@@ -6,7 +6,6 @@ export * from './circleFollowers'
 export * from './commentDetail'
 export * from './draftAssets'
 export * from './momentDetail'
-export * from './tagArticlesCount'
 export * from './userCollectionDetail'
 export * from './userCollections'
 export * from './userCollectionsArticles'

src/components/Tag/ArticleTag/index.tsx

@@ -59,7 +59,6 @@ ArticleTag.fragments = {
       id
       content
       numArticles
-      numAuthors
     }
   `,
 }

src/components/Tag/InlineTag/index.tsx

@@ -75,7 +75,6 @@ InlineTag.fragments = {
       id
       content
       numArticles
-      numAuthors
     }
   `,
 }

src/components/Tag/ListTag/index.tsx

@@ -81,7 +81,6 @@ ListTag.fragments = {
       id
       content
       numArticles
-      numAuthors
     }
   `,
 }

src/components/Tag/PlainTag/index.tsx

@@ -52,7 +52,6 @@ PlainTag.fragments = {
       id
       content
       numArticles
-      numAuthors
     }
   `,
 }

src/components/TagDigest/Feed/index.tsx

@@ -19,7 +19,6 @@ const fragments = {
       id
       content
       numArticles
-      numAuthors
     }
   `,
 }

src/views/Home/Sidebar/Tags/index.tsx

@@ -5,7 +5,6 @@ import { useContext } from 'react'
 import { analytics } from '~/common/utils'
 import {
   List,
-  ListTag,
   QueryError,
   ShuffleButton,
   SpinnerBlock,
@@ -33,14 +32,14 @@ const SIDEBAR_TAGS = gql`
             cursor
             node {
               id
-              ...DigestTag
+              ...TagDigestSidebarTag
             }
           }
         }
       }
     }
   }
-  ${ListTag.fragments.tag}
+  ${TagDigest.Sidebar.fragments.tag}
 `
 
 const Tags = () => {

src/views/TagDetail/ArticlesCount/index.tsx

@@ -1,17 +1,15 @@
 import { FormattedMessage } from 'react-intl'
 
 import { numAbbr } from '~/common/utils'
-import tagFragments from '~/components/GQL/fragments/tag'
-import { ArticleCountTagFragment } from '~/gql/graphql'
 
 import styles from './styles.module.css'
 
 interface ArticlesCountProps {
-  tag: ArticleCountTagFragment
+  tag: { numArticles: number }
 }
 
 const ArticlesCount = ({ tag }: ArticlesCountProps) => {
-  const { totalCount } = tag.articles || { totalCount: 0 }
+  const totalCount = tag.numArticles
 
   return (
     <section className={styles.container}>
@@ -30,8 +28,4 @@ const ArticlesCount = ({ tag }: ArticlesCountProps) => {
   )
 }
 
-ArticlesCount.fragments = {
-  tag: tagFragments.articleCount,
-}
-
 export default ArticlesCount

src/views/TagDetail/gql.ts

@@ -2,18 +2,14 @@ import gql from 'graphql-tag'
 
 import { TagBookmarkButton } from '~/components'
 
-import ArticlesCount from './ArticlesCount'
-
 const tagFragment = gql`
   fragment TagFragment on Tag {
     id
     content
     numArticles
-    numAuthors
     selectedArticles: articles(input: { first: 0 }) {
       totalCount
     }
-    ...ArticleCountTag
     ...TagBookmarkButtonTagPrivate
     hottestArticles: articles(input: { first: 0, sortBy: byHottestDesc }) {
       totalCount
@@ -25,12 +21,10 @@ const tagFragment = gql`
           id
           content
           numArticles
-          numAuthors
         }
       }
     }
   }
-  ${ArticlesCount.fragments.tag}
   ${TagBookmarkButton.fragments.tag.private}
 `
 

src/views/Tags/Feed.tsx

@@ -1,5 +1,4 @@
 import _get from 'lodash/get'
-import { useEffect } from 'react'
 
 import { analytics, mergeConnections } from '~/common/utils'
 import {
@@ -12,7 +11,7 @@ import {
 } from '~/components'
 import { AllTagsHottestQuery } from '~/gql/graphql'
 
-import { ALL_TAGS_HOTTEST, TAG_REACTIVE_DATA } from './gql'
+import { ALL_TAGS_HOTTEST } from './gql'
 
 export type FeedType = 'recommended' | 'hottest'
 
@@ -27,28 +26,7 @@ const Feed = ({ type }: Props) => {
 
   const query = ALL_TAGS_HOTTEST
 
-  const { data, loading, error, fetchMore, client } =
-    usePublicQuery<FeedQuery>(query)
-
-  // fetch the latest tag data
-  const loadTagReactiveData = (publicData?: FeedQuery) => {
-    const publicEdges = publicData?.viewer?.recommendation.tags.edges || []
-    const publicIds = publicEdges.map(({ node }) => node.id)
-
-    if (publicIds.length <= 0) {
-      return
-    }
-
-    client.query({
-      query: TAG_REACTIVE_DATA,
-      fetchPolicy: 'network-only',
-      variables: { ids: publicIds },
-    })
-  }
-
-  useEffect(() => {
-    loadTagReactiveData(data)
-  }, [data])
+  const { data, loading, error, fetchMore } = usePublicQuery<FeedQuery>(query)
 
   if (loading) {
     return <SpinnerBlock />

src/views/Tags/gql.ts

@@ -27,14 +27,3 @@ export const ALL_TAGS_HOTTEST = gql`
   }
   ${TagDigest.Feed.fragments.tag}
 `
-
-export const TAG_REACTIVE_DATA = gql`
-  query TagReactiveData($ids: [ID!]!) {
-    nodes(input: { ids: $ids }) {
-      id
-      ... on Tag {
-        numArticles
-      }
-    }
-  }
-`