Remove GerritView.ROOT It is not a view, just a URL or a route. Release-Notes: skip Google-Bug-Id: b/244279450 Change-Id: Id8659d93ed3eeaa8c9a065446163f3dabc664aed
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts index a4348a9..93d5d1f 100644 --- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts +++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.ts
@@ -104,6 +104,7 @@ import {customElement, property, query, state} from 'lit/decorators.js'; import {ifDefined} from 'lit/directives/if-defined.js'; import {assertIsDefined, queryAll} from '../../../utils/common-util'; +import {rootUrl} from '../../../utils/router-util'; const ERR_BRANCH_EMPTY = 'The destination branch can’t be empty.'; const ERR_COMMIT_EMPTY = 'The commit message can’t be empty.'; @@ -1844,7 +1845,7 @@ } case ChangeActions.DELETE: if (action.__type === ActionType.CHANGE) { - GerritNav.navigateToRelativeUrl(GerritNav.getUrlForRoot()); + GerritNav.navigateToRelativeUrl(rootUrl()); } break; case ChangeActions.WIP:
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts index dbd8011..5d82daf 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
@@ -182,6 +182,7 @@ import {CopyLink, GrCopyLinks} from '../gr-copy-links/gr-copy-links'; import {KnownExperimentId} from '../../../services/flags/flags'; import {ChangeViewState} from '../../../models/views/change'; +import {rootUrl} from '../../../utils/router-util'; const MIN_LINES_FOR_COMMIT_COLLAPSE = 18; @@ -2592,7 +2593,7 @@ private determinePageBack() { // Default backPage to root if user came to change view page // via an email link, etc. - GerritNav.navigateToRelativeUrl(this.backPage || GerritNav.getUrlForRoot()); + GerritNav.navigateToRelativeUrl(this.backPage || rootUrl()); } private handleLabelRemoved(
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts index a4b185a..cb9f5dc 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
@@ -99,6 +99,7 @@ import {GrButton} from '../../shared/gr-button/gr-button'; import {GrCopyLinks} from '../gr-copy-links/gr-copy-links'; import {ChangeViewState} from '../../../models/views/change'; +import {rootUrl} from '../../../utils/router-util'; suite('gr-change-view tests', () => { let element: GrChangeView; @@ -811,9 +812,7 @@ const relativeNavStub = sinon.stub(GerritNav, 'navigateToRelativeUrl'); pressKey(element, 'u'); assert.isTrue(relativeNavStub.called); - assert.isTrue( - relativeNavStub.lastCall.calledWithExactly(GerritNav.getUrlForRoot()) - ); + assert.isTrue(relativeNavStub.lastCall.calledWithExactly(rootUrl())); }); test('U should navigate to backPage if set', () => {
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 9d01e00..2b74e97 100644 --- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts +++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
@@ -604,12 +604,6 @@ }); }, - getUrlForRoot() { - return this._getUrlFor({ - view: GerritView.ROOT, - }); - }, - /** * @param repo The name of the repo. * @param dashboard The ID of the dashboard, in the form of '<ref>:<path>'.
diff --git a/polygerrit-ui/app/services/router/router-model.ts b/polygerrit-ui/app/services/router/router-model.ts index fbf1fa7..8b3b0b8 100644 --- a/polygerrit-ui/app/services/router/router-model.ts +++ b/polygerrit-ui/app/services/router/router-model.ts
@@ -24,7 +24,6 @@ GROUP = 'group', PLUGIN_SCREEN = 'plugin-screen', REPO = 'repo', - ROOT = 'root', SEARCH = 'search', SETTINGS = 'settings', }
diff --git a/polygerrit-ui/app/utils/router-util.ts b/polygerrit-ui/app/utils/router-util.ts index 240f7e3..7539931 100644 --- a/polygerrit-ui/app/utils/router-util.ts +++ b/polygerrit-ui/app/utils/router-util.ts
@@ -75,10 +75,6 @@ lineNum?: number | string; } -export interface GenerateUrlRootViewParameters { - view: GerritView.ROOT; -} - export interface GenerateUrlSettingsViewParameters { view: GerritView.SETTINGS; } @@ -104,7 +100,6 @@ | DashboardViewState | GroupViewState | GenerateUrlEditViewParameters - | GenerateUrlRootViewParameters | GenerateUrlSettingsViewParameters | GenerateUrlDiffViewParameters; @@ -130,6 +125,10 @@ getPatchRangeExpression, }; +export function rootUrl() { + return `${getBaseUrl()}/`; +} + export function generateUrl(params: GenerateUrlParameters) { const base = getBaseUrl(); let url = ''; @@ -149,8 +148,6 @@ url = generateGroupUrl(params); } else if (params.view === GerritView.REPO) { url = generateRepoUrl(params); - } else if (params.view === GerritView.ROOT) { - url = '/'; } else if (params.view === GerritView.SETTINGS) { url = generateSettingsUrl(); } else {