feat(article): query article version

thematters · Feb 28, 2024 · b7e34be · b7e34be
1 parent 99fe901
commit b7e34be
Show file tree

Hide file tree

Showing 20 changed files with 432 additions and 254 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -468,6 +468,9 @@
     "defaultMessage": "Followed",
     "description": "src/components/Buttons/FollowUser/Unfollow.tsx"
   },
+  "99OtWT": {
+    "defaultMessage": "Pending..."
+  },
   "9Fpc9S": {
     "defaultMessage": "Bug Report"
   },

diff --git a/lang/en.json b/lang/en.json
@@ -468,6 +468,9 @@
     "defaultMessage": "Followed",
     "description": "src/components/Buttons/FollowUser/Unfollow.tsx"
   },
+  "99OtWT": {
+    "defaultMessage": "Pending..."
+  },
   "9Fpc9S": {
     "defaultMessage": "Bug Report"
   },

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -468,6 +468,9 @@
     "defaultMessage": "已追踪",
     "description": "src/components/Buttons/FollowUser/Unfollow.tsx"
   },
+  "99OtWT": {
+    "defaultMessage": "写入中…"
+  },
   "9Fpc9S": {
     "defaultMessage": "漏洞报告"
   },

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -468,6 +468,9 @@
     "defaultMessage": "已追蹤",
     "description": "src/components/Buttons/FollowUser/Unfollow.tsx"
   },
+  "99OtWT": {
+    "defaultMessage": "寫入中…"
+  },
   "9Fpc9S": {
     "defaultMessage": "漏洞提報"
   },

diff --git a/src/common/utils/route.ts b/src/common/utils/route.ts
@@ -45,6 +45,7 @@ type ToPathArgs =
       page: 'articleDetail'
       article: ArticleArgs
       collectionId?: string
+      versionId?: string
     }
   | {
       page:
@@ -116,7 +117,9 @@ export const toPath = (
             mediaHash ? '-' + mediaHash : ''
           }`
         }
-        if (!!args.collectionId) {
+        if (!!args.versionId) {
+          href = `${href}/revision?version=${args.versionId}`
+        } else if (!!args.collectionId) {
           href = `${href}?collection=${args.collectionId}`
         }
       } catch (err) {

diff --git a/src/views/ArticleDetail/Content/index.tsx b/src/views/ArticleDetail/Content/index.tsx
@@ -6,7 +6,7 @@ import { useContext, useEffect, useRef, useState } from 'react'
 import { TEST_ID } from '~/common/enums'
 import { captureClicks, initAudioPlayers, optimizeEmbed } from '~/common/utils'
 import { useMutation, ViewerContext } from '~/components'
-import { ContentArticleFragment, ReadArticleMutation } from '~/gql/graphql'
+import { ReadArticleMutation } from '~/gql/graphql'
 
 import styles from './styles.module.css'
 
@@ -19,11 +19,11 @@ const READ_ARTICLE = gql`
 `
 
 const Content = ({
-  article,
+  articleId,
   content,
   translating,
 }: {
-  article: ContentArticleFragment
+  articleId: string
   content: string
   translating?: boolean
 }) => {
@@ -88,12 +88,12 @@ const Content = ({
 
         // if user is logged in, ReadArticle mutation will be invoked multiple times
         if (viewer.isAuthed && isReading()) {
-          read({ variables: { id: article.id } })
+          read({ variables: { id: articleId } })
         }
 
         // if visitor, invoke ReadArticle mutation only once
         if (!viewer.isAuthed && !visitorReadRef.current) {
-          read({ variables: { id: article.id } })
+          read({ variables: { id: articleId } })
           visitorReadRef.current = true
         }
         return heartbeat
@@ -125,15 +125,4 @@ const Content = ({
   )
 }
 
-Content.fragments = {
-  article: gql`
-    fragment ContentArticle on Article {
-      id
-      contents {
-        html
-      }
-    }
-  `,
-}
-
 export default Content
diff --git a/src/views/ArticleDetail/MetaInfo/gql.ts b/src/views/ArticleDetail/MetaInfo/gql.ts
@@ -9,6 +9,13 @@ export const fragments = {
       access {
         type
       }
+      language
+      slug
+      mediaHash
+      author {
+        id
+        userName
+      }
       ...FingerprintArticle
     }
     ${FingerprintButton.fragments.article}

diff --git a/src/views/ArticleDetail/MetaInfo/index.tsx b/src/views/ArticleDetail/MetaInfo/index.tsx
@@ -14,15 +14,15 @@ import {
   UserDigest,
   ViewerContext,
 } from '~/components'
-import { ArticleDetailPublicQuery } from '~/gql/graphql'
+import { MetaInfoArticleFragment } from '~/gql/graphql'
 
 import FingerprintButton from './FingerprintButton'
 import { fragments } from './gql'
 import styles from './styles.module.css'
 import TranslationButton from './TranslationButton'
 
 type MetaInfoProps = {
-  article: NonNullable<ArticleDetailPublicQuery['article']>
+  article: MetaInfoArticleFragment
   translated: boolean
   canTranslate: boolean
   toggleTranslate: () => any

diff --git a/src/views/ArticleDetail/Revision/InfoHeader/gql.ts b/src/views/ArticleDetail/Revision/InfoHeader/gql.ts
@@ -4,20 +4,28 @@ import { UserDigest } from '~/components'
 
 export const fragments = {
   article: gql`
-    fragment InfoHeader on Article {
+    fragment InfoHeaderArticle on Article {
       id
       author {
         id
         ...UserDigestMiniUser
       }
-      mediaHash
-      dataHash
       iscnId
-      createdAt
       access {
         type
+        secret
       }
     }
     ${UserDigest.Mini.fragments.user}
   `,
+  articleVersion: gql`
+    fragment InfoHeaderArticleVersion on ArticleVersion {
+      id
+      dataHash
+      mediaHash
+      summary
+      createdAt
+      description
+    }
+  `,
 }