From 952eb283b3eaaf307b864706de90e9bf94222805 Mon Sep 17 00:00:00 2001
From: Paladox none <thomasmulhall410@yahoo.com>
Date: Fri, 30 Mar 2018 21:06:02 +0000
Subject: [PATCH] Fix repo dashboard to use gr-navigation

Change-Id: I9d488999009bfdf05f763d95f0484bf17178ee06
---
 .../admin/gr-repo-dashboards/gr-repo-dashboards.html  |  3 ++-
 .../admin/gr-repo-dashboards/gr-repo-dashboards.js    |  6 ++++++
 .../gr-repo-dashboards/gr-repo-dashboards_test.html   | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.html b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.html
index fdbc23937d..f3892ea325 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.html
@@ -16,6 +16,7 @@ limitations under the License.
 -->
 <link rel="import" href="../../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../../styles/shared-styles.html">
+<link rel="import" href="../../core/gr-navigation/gr-navigation.html">
 <link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
 
 <dom-module id="gr-repo-dashboards">
@@ -52,7 +53,7 @@ limitations under the License.
           </tr>
           <template is="dom-repeat" items="[[item.dashboards]]">
             <tr class="table">
-              <td class="name"><a href$="[[item.url]]">[[item.path]]</a></td>
+              <td class="name"><a href$="[[_getUrl(item.url)]]">[[item.path]]</a></td>
               <td class="title">[[item.title]]</td>
               <td class="desc">[[item.description]]</td>
               <td class="inherited">[[_computeInheritedFrom(item.project, item.defining_project)]]</td>
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.js b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.js
index a4c2c03d4f..a852533032 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards.js
@@ -68,6 +68,12 @@
       });
     },
 
+    _getUrl(url) {
+      if (!url) { return ''; }
+
+      return Gerrit.Nav.navigateToRelativeUrl(url);
+    },
+
     _computeLoadingClass(loading) {
       return loading ? 'loading' : '';
     },
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.html b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.html
index bd4019ebcd..ab57ba5dbf 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.html
@@ -243,6 +243,17 @@ limitations under the License.
       });
     });
 
+    suite('test url', () => {
+      test('_getUrl', () => {
+        sandbox.stub(Gerrit.Nav, 'navigateToRelativeUrl',
+            () => '/r/dashboard/test');
+
+        assert.equal(element._getUrl('/dashboard/test'), '/r/dashboard/test');
+
+        assert.equal(element._getUrl(undefined), '');
+      });
+    });
+
     suite('404', () => {
       test('fires page-error', done => {
         const response = {status: 404};