commit ade94cbcb91370f2c8d60fecdc6028d327c9d4d3
author Ben Rohlfs <brohlfs@google.com> Wed Sep 14 19:59:42 2022 +0200
committer Ben Rohlfs <brohlfs@google.com> Wed Sep 14 19:59:42 2022 +0200
tree 067fd52f25cb9a7a52b6bf10887a38bd61319f15
parent 4bba31a4928b7e3de412cadf758b58fac272cfe9

Use view state objects in `GenerateUrlParameters`

Start with repo, group and dashboard.

Release-Notes: skip
Google-Bug-Id: b/244279450
Change-Id: Icfa8b8b0336d89a7494d86b72593951f97e91e02

polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts

diff --git a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
index 46cb2f0..9d01e00 100644
--- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
+++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
@@ -28,9 +28,9 @@
 import {
   DashboardSection,
   GenerateUrlParameters,
-  GroupDetailView,
-  RepoDetailView,
 } from '../../../utils/router-util';
+import {RepoDetailView} from '../../../models/views/repo';
+import {GroupDetailView} from '../../../models/views/group';
 
 // Navigation parameters object format:
 //
@@ -617,7 +617,7 @@
   getUrlForRepoDashboard(repo: RepoName, dashboard: DashboardId) {
     return this._getUrlFor({
       view: GerritView.DASHBOARD,
-      repo,
+      project: repo,
       dashboard,
     });
   },
@@ -632,11 +632,11 @@
     this._navigate(relativeUrl);
   },
 
-  getUrlForRepo(repoName: RepoName) {
+  getUrlForRepo(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
       detail: RepoDetailView.GENERAL,
-      repoName,
+      repo,
     });
   },
 
@@ -647,42 +647,42 @@
     this._navigate(this.getUrlForRepo(repoName));
   },
 
-  getUrlForRepoTags(repoName: RepoName) {
+  getUrlForRepoTags(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
-      repoName,
+      repo,
       detail: RepoDetailView.TAGS,
     });
   },
 
-  getUrlForRepoBranches(repoName: RepoName) {
+  getUrlForRepoBranches(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
-      repoName,
+      repo,
       detail: RepoDetailView.BRANCHES,
     });
   },
 
-  getUrlForRepoAccess(repoName: RepoName) {
+  getUrlForRepoAccess(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
-      repoName,
+      repo,
       detail: RepoDetailView.ACCESS,
     });
   },
 
-  getUrlForRepoCommands(repoName: RepoName) {
+  getUrlForRepoCommands(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
-      repoName,
+      repo,
       detail: RepoDetailView.COMMANDS,
     });
   },
 
-  getUrlForRepoDashboards(repoName: RepoName) {
+  getUrlForRepoDashboards(repo: RepoName) {
     return this._getUrlFor({
       view: GerritView.REPO,
-      repoName,
+      repo,
       detail: RepoDetailView.DASHBOARDS,
     });
   },

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

diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
index 804a2fd..9719c99 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -50,8 +50,6 @@
   GenerateUrlChangeViewParameters,
   GenerateUrlDiffViewParameters,
   GenerateUrlParameters,
-  GroupDetailView,
-  RepoDetailView,
 } from '../../../utils/router-util';
 import {
   LATEST_ATTEMPT,
@@ -59,6 +57,8 @@
 } from '../../../models/checks/checks-util';
 import {AdminChildView} from '../../../models/views/admin';
 import {AgreementViewState} from '../../../models/views/agreement';
+import {RepoDetailView} from '../../../models/views/repo';
+import {GroupDetailView} from '../../../models/views/group';
 
 const RoutePattern = {
   ROOT: '/',

polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts

diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
index af67b2a..5f8c278 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.ts
@@ -38,13 +38,13 @@
 import {AppElementParams} from '../../gr-app-types';
 import {
   GenerateUrlParameters,
-  GroupDetailView,
   GenerateUrlEditViewParameters,
   GenerateUrlChangeViewParameters,
-  RepoDetailView,
 } from '../../../utils/router-util';
 import {assert} from '@open-wc/testing';
 import {AdminChildView} from '../../../models/views/admin';
+import {RepoDetailView} from '../../../models/views/repo';
+import {GroupDetailView} from '../../../models/views/group';
 
 suite('gr-router tests', () => {
   let router: GrRouter;