Merge pull request #3883 from thematters/hotfix/prefer-id-over-hash

[hotfix - master] feat(article): prefer id over hash
thematters · Oct 10, 2023 · 6c9fd67 · 6c9fd67
2 parents 0323eda + e5fb6bb
commit 6c9fd67
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
@@ -380,7 +380,11 @@ const ArticleDetail = ({
   /**
    * fetch public data
    */
-  const isQueryByHash = !!(mediaHash && isMediaHashPossiblyValid(mediaHash))
+  const isQueryByHash = !!(
+    mediaHash &&
+    isMediaHashPossiblyValid(mediaHash) &&
+    !articleId
+  )
 
   // backward compatible with:
   // - `/:username:/:articleId:-:slug:-:mediaHash`
@@ -607,7 +611,12 @@ const ArticleDetailOuter = () => {
   const articleId =
     (router.query.mediaHash as string)?.match(/^(\d+)/)?.[1] || ''
 
-  const isQueryByHash = !!(mediaHash && isMediaHashPossiblyValid(mediaHash))
+  const isQueryByHash = !!(
+    mediaHash &&
+    isMediaHashPossiblyValid(mediaHash) &&
+    !articleId
+  )
+
   const resultByHash = usePublicQuery<ArticleAvailableTranslationsQuery>(
     ARTICLE_AVAILABLE_TRANSLATIONS,
     { variables: { mediaHash }, skip: !isQueryByHash }