feat(new-article-path): Revise pathname of article detail page #4196

for #4196
thematters · Mar 6, 2024 · df6f23e · df6f23e
1 parent d1683e5
commit df6f23e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/pages/p/[shortHash].tsx b/src/pages/p/[shortHash].tsx
@@ -0,0 +1,3 @@
+import { ArticleDetail } from '~/views/ArticleDetail'
+
+export default ArticleDetail
diff --git a/src/views/ArticleDetail/gql.ts b/src/views/ArticleDetail/gql.ts
@@ -19,6 +19,7 @@ const articlePublicFragment = gql`
     title
     slug
     mediaHash
+    shortHash
     state
     cover
     summary
@@ -115,12 +116,13 @@ export const ARTICLE_AVAILABLE_TRANSLATIONS_BY_NODE_ID = gql`
 
 export const ARTICLE_DETAIL_PUBLIC = gql`
   query ArticleDetailPublic(
-    $mediaHash: String!
+    $mediaHash: String
+    $shortHash: String
     $language: UserLanguage!
     $includeTranslation: Boolean = false
     $includeCanSuperLike: Boolean = true
   ) {
-    article(input: { mediaHash: $mediaHash }) {
+    article(input: { mediaHash: $mediaHash, shortHash: $shortHash }) {
       ...ArticlePublicArticle
     }
   }

diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
@@ -507,14 +507,16 @@ const BaseArticleDetail = ({
   )
 }
 
-const ArticleDetail = ({
+export const ArticleDetail = ({
   includeTranslation,
 }: {
   includeTranslation: boolean
 }) => {
   const { getQuery, router, routerLang } = useRoute()
   const [needRefetchData, setNeedRefetchData] = useState(false)
-  const mediaHash = getQuery('mediaHash')
+
+  const shortHash = getQuery('shortHash')
+  const mediaHash = getQuery('mediaHash') // will delete by mediaHash & by articleId logic in later PR
   const articleId =
     (router.query.mediaHash as string)?.match(/^(\d+)/)?.[1] || ''
   const viewer = useContext(ViewerContext)
@@ -524,8 +526,8 @@ const ArticleDetail = ({
    */
   const isQueryByHash = !!(
     mediaHash &&
-    isMediaHashPossiblyValid(mediaHash) &&
-    !articleId
+    isMediaHashPossiblyValid(mediaHash)
+    // && !articleId
   )
 
   // backward compatible with:
@@ -537,6 +539,7 @@ const ArticleDetail = ({
     {
       variables: {
         mediaHash,
+        shortHash,
         language: routerLang || UserLanguage.ZhHant,
         includeTranslation,
       },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { ArticleDetail } from '~/views/ArticleDetail'

		export default ArticleDetail