[MediaWiki-commits] [Gerrit] marvin[master]: Chore: improve page revision route typing

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383953 )

Change subject: Chore: improve page revision route typing
......................................................................

Chore: improve page revision route typing

Require page revisions to be a number internally and externally through
the API.

Change-Id: I7f58eae45144f2f7a2dd35980e10d4b8d68b398c
---
M src/common/pages/home.tsx
M src/common/pages/wiki.tsx
M src/common/routers/api.ts
M src/common/routers/route.ts
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/53/383953/1

diff --git a/src/common/pages/home.tsx b/src/common/pages/home.tsx
index f47042b..ee63b2a 100644
--- a/src/common/pages/home.tsx
+++ b/src/common/pages/home.tsx
@@ -50,7 +50,7 @@
     },
     {
       title: "Ice_cream_cake",
-      revision: "24242119",
+      revision: 24242119,
       text: "An arbitrary revision"
     }
   ];
@@ -88,7 +88,7 @@
               text
             }: {
               title: string;
-              revision?: string;
+              revision?: number;
               text: string;
             }) => (
               <li>
diff --git a/src/common/pages/wiki.tsx b/src/common/pages/wiki.tsx
index 3b008c0..167d4d6 100644
--- a/src/common/pages/wiki.tsx
+++ b/src/common/pages/wiki.tsx
@@ -16,7 +16,7 @@
    */
   title: PageTitleID | PageTitlePath;
 
-  revision?: string;
+  revision?: number;
 }
 
 export interface Props {
@@ -26,7 +26,7 @@
 export const getInitialProps = ({ title, revision }: Params): Promise<Props> =>
   requestPage({
     titlePath: title,
-    revision: (revision && parseInt(revision, 10)) || undefined
+    revision
   }).then(page => ({ page }));
 
 export const Component = ({ page }: Props): JSX.Element => (
diff --git a/src/common/routers/api.ts b/src/common/routers/api.ts
index de15682..7a02a95 100644
--- a/src/common/routers/api.ts
+++ b/src/common/routers/api.ts
@@ -26,7 +26,7 @@
 });
 
 export const wiki: Route<WikiParams, WikiProps> = newRoute({
-  path: "/wiki/:title/:revision?",
+  path: "/wiki/:title/:revision(\\d+)?",
   importModule: () =>
     import(/* webpackChunkName: "pages/wiki" */ "../pages/wiki"),
   chunkName: "pages/wiki"
diff --git a/src/common/routers/route.ts b/src/common/routers/route.ts
index c556ae8..bb00217 100644
--- a/src/common/routers/route.ts
+++ b/src/common/routers/route.ts
@@ -7,7 +7,7 @@
  * Route.url().
  */
 export interface RouteParams {
-  [name: string]: string | undefined;
+  [name: string]: string | number | undefined;
 }
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/383953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f58eae45144f2f7a2dd35980e10d4b8d68b398c
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits