update

packages/app/src/components/PageAlert/OldRevisionAlert.tsx

@@ -19,7 +19,7 @@ export const OldRevisionAlert = (): JSX.Element => {
   return (
     <div className="alert alert-warning">
       <strong>{ t('Warning') }: </strong> { t('page_page.notice.version') }
-      <Link href={`/${page._id}?revisionId=${page.revision._id}`}>
+      <Link href={`/${page._id}`}>
         <a><i className="icon-fw icon-arrow-right-circle"></i>{ t('Show latest') }</a>
       </Link>
     </div>

packages/app/src/components/PageHistory/RevisionDiff.tsx

@@ -4,6 +4,7 @@ import { IRevisionHasPageId } from '@growi/core';
 import { createPatch } from 'diff';
 import { html, Diff2HtmlConfig } from 'diff2html';
 import { useTranslation } from 'next-i18next';
+import Link from 'next/link';
 
 import UserDate from '../User/UserDate';
 
@@ -46,16 +47,19 @@ export const RevisionDiff = (props: RevisioinDiffProps): JSX.Element => {
           <div className="row">
             <div className="col comparison-source-wrapper pt-1 px-0">
               <span className="comparison-source pr-3">{t('page_history.comparing_source')}</span><UserDate dateTime={previousRevision.createdAt} />
-              <a href={`?revisionId=${previousRevision._id}`} className="ml-3">
-                <i className="icon-login"></i>
-              </a>
-
+              <Link href={`?revisionId=${previousRevision._id}`}>
+                <a className="ml-3">
+                  <i className="icon-login"></i>
+                </a>
+              </Link>
             </div>
             <div className="col comparison-target-wrapper pt-1">
               <span className="comparison-target pr-3">{t('page_history.comparing_target')}</span><UserDate dateTime={currentRevision.createdAt} />
-              <a href={`?revisionId=${currentRevision._id}`} className="ml-3">
-                <i className="icon-login"></i>
-              </a>
+              <Link href={`?revisionId=${currentRevision._id}`}>
+                <a className="ml-3">
+                  <i className="icon-login"></i>
+                </a>
+              </Link>
             </div>
           </div>
         </div>

packages/app/src/pages/[[...path]].page.tsx

@@ -418,7 +418,7 @@ async function injectPageData(context: GetServerSidePropsContext, props: Props):
   }
 
   if (typeof revisionId === 'string' || typeof revisionId === 'undefined') {
-    props.currentRevisionId = revisionId;
+    props.currentRevisionId = props.isLatestRevision && page.latestRevision != null ? page.latestRevision.toString() : revisionId;
   }
 
   props.pageWithMeta = pageWithMeta;