commit 8d399e0faf3be26e461b1b74c340b4acff8ab770
author Kasper Nilsson <kaspern@google.com> Tue Aug 29 11:19:04 2017 -0700
committer Kasper Nilsson <kaspern@google.com> Wed Aug 30 12:43:18 2017 -0700
tree 2929f2fb93731ef54033e47b51645a0394aca439
parent 87e2795867e8dffff8eb85e8fc59f9c4ca21f473

Support edit routes

GWTUI appends `,edit` to diff view pages to load an editor. In this
change, we handle this case and set the 'edit' flag in params.

Loading the editor will come in a later change.

Also fixes a typo.

Bug: Issue 4437
Change-Id: I363163d0a1cf7af1fba5b1845137e9ff0f685450

polygerrit-ui/app/elements/core/gr-router/gr-router.js

diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index c6509a3..f049c99 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -90,6 +90,11 @@
     // eslint-disable-next-line max-len
     CHANGE_OR_DIFF: /^\/c\/(.+)\/\+\/(\d+)(\/?((\d+|edit)(\.\.(\d+|edit))?(\/(.+))?))?\/?$/,
 
+    // Matches
+    //     /c/<project>/+/<changeNum>/[<basePatchNum>..]<patchNum>/<path>,edit
+    // eslint-disable-next-line max-len
+    DIFF_EDIT: /^\/c\/(.+)\/\+\/(\d+)(\/(((\d+|edit)\.\.)?(edit)(\/(.+)))),edit$/,
+
     // Matches /c/<changeNum>/[<basePatchNum>..]<patchNum>/<path>.
     DIFF_LEGACY: /^\/c\/(\d+)\/((\d+|edit)(\.\.(\d+|edit))?)\/(.+)/,
 
@@ -223,6 +228,9 @@
         } else {
           url = `/c/${params.changeNum}${suffix}`;
         }
+        if (params.edit) {
+          url += ',edit';
+        }
       } else {
         throw new Error('Can\'t generate');
       }
@@ -482,9 +490,11 @@
       this._mapRoute(RoutePattern.CHANGE_NUMBER_LEGACY,
           '_handleChangeNumberLegacyRoute');
 
+      this._mapRoute(RoutePattern.DIFF_EDIT, '_handleDiffEditRoute', true);
+
       this._mapRoute(RoutePattern.CHANGE_OR_DIFF, '_handleChangeOrDiffRoute');
 
-      this._mapRoute(RoutePattern.CHNAGE_LEGACY, '_handleChnageLegacyRoute');
+      this._mapRoute(RoutePattern.CHNAGE_LEGACY, '_handleChangeLegacyRoute');
 
       this._mapRoute(RoutePattern.DIFF_LEGACY, '_handleDiffLegacyRoute');
 
@@ -809,16 +819,10 @@
         }
       }
 
-      const needsRedirect = this._normalizePatchRangeParams(params);
-      if (needsRedirect) {
-        this._redirect(this._generateUrl(params));
-      } else {
-        this._setParams(params);
-        this._restAPI.setInProjectLookup(params.changeNum, params.project);
-      }
+      this._redirectOrNavigate(params);
     },
 
-    _handleChnageLegacyRoute(ctx) {
+    _handleChangeLegacyRoute(ctx) {
       // Parameter order is based on the regex group number matched.
       const params = {
         changeNum: ctx.params[0],
@@ -857,6 +861,35 @@
       this._normalizeLegacyRouteParams(params);
     },
 
+    _handleDiffEditRoute(ctx) {
+      // Parameter order is based on the regex group number matched.
+      this._redirectOrNavigate({
+        project: ctx.params[0],
+        changeNum: ctx.params[1],
+        basePatchNum: ctx.params[5],
+        patchNum: ctx.params[6],
+        path: ctx.params[8],
+        view: Gerrit.Nav.View.DIFF,
+        hash: ctx.hash,
+        edit: true,
+      });
+    },
+
+    /**
+     * Normalize the patch range params for a the change or diff view and
+     * redirect if URL upgrade is needed.
+     */
+    _redirectOrNavigate(params) {
+      const needsRedirect = this._normalizePatchRangeParams(params);
+      if (needsRedirect) {
+        this._redirect(this._generateUrl(params));
+      } else {
+        this._setParams(params);
+        this._restAPI.setInProjectLookup(params.changeNum,
+            params.project);
+      }
+    },
+
     _handleAgreementsRoute(data) {
       data.params.view = Gerrit.Nav.View.AGREEMENTS;
       this._setParams(data.params);