Remove the remains of URL creation from router and navigation
Release-Notes: skip
Google-Bug-Id: b/244279450
Change-Id: I8553df13b0e1d46b7b1f88a495e95b17649cf457
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 2bd6940..22fe35b 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,8 +104,8 @@
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';
import {Interaction} from '../../../constants/reporting';
+import {rootUrl} from '../../../utils/url-util';
const ERR_BRANCH_EMPTY = 'The destination branch can’t be empty.';
const ERR_COMMIT_EMPTY = 'The commit message can’t be empty.';
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 5dc7010..2bd217a 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,7 +182,7 @@
import {CopyLink, GrCopyLinks} from '../gr-copy-links/gr-copy-links';
import {KnownExperimentId} from '../../../services/flags/flags';
import {ChangeViewState, createChangeUrl} from '../../../models/views/change';
-import {rootUrl} from '../../../utils/router-util';
+import {rootUrl} from '../../../utils/url-util';
import {createEditUrl} from '../../../models/views/edit';
const MIN_LINES_FOR_COMMIT_COLLAPSE = 18;
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 7b6bf2d..8bb937f 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,7 +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';
+import {rootUrl} from '../../../utils/url-util';
suite('gr-change-view tests', () => {
let element: GrChangeView;
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 51418e4..4780a53 100644
--- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
+++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
@@ -15,7 +15,6 @@
ServerInfo,
} from '../../../types/common';
import {ParsedChangeInfo} from '../../../types/types';
-import {GenerateUrlParameters} from '../../../utils/router-util';
import {createRepoUrl} from '../../../models/views/repo';
import {createSearchUrl} from '../../../models/views/search';
import {createDiffUrl} from '../../../models/views/diff';
@@ -25,12 +24,6 @@
} from '../../../models/views/dashboard';
import {createChangeUrl} from '../../../models/views/change';
-// Navigation parameters object format:
-//
-// Each object has a `view` property with a value from GerritView. The
-// remaining properties depend on the value used for view.
-// GenerateUrlParameters lists all the possible view parameters.
-
const uninitialized = () => {
console.warn('Use of uninitialized routing');
};
@@ -40,11 +33,6 @@
return '';
};
-const uninitializedGenerateUrl: GenerateUrlCallback = () => {
- uninitialized();
- return '';
-};
-
const uninitializedGenerateWebLinks: GenerateWebLinksCallback = () => {
uninitialized();
return [];
@@ -179,7 +167,6 @@
| GenerateWebLinksChangeParameters;
export type NavigateCallback = (target: string, redirect?: boolean) => void;
-export type GenerateUrlCallback = (params: GenerateUrlParameters) => string;
// TODO: Refactor to return only GeneratedWebLink[]
export type GenerateWebLinksCallback = (
params: GenerateWebLinksParameters
@@ -221,8 +208,6 @@
export const GerritNav = {
_navigate: uninitializedNavigate,
- _generateUrl: uninitializedGenerateUrl,
-
_generateWeblinks: uninitializedGenerateWebLinks,
mapCommentlinks: uninitializedMapCommentLinks,
@@ -260,19 +245,16 @@
*/
setup(
navigate: NavigateCallback,
- generateUrl: GenerateUrlCallback,
generateWeblinks: GenerateWebLinksCallback,
mapCommentlinks: MapCommentLinksCallback
) {
this._navigate = navigate;
- this._generateUrl = generateUrl;
this._generateWeblinks = generateWeblinks;
this.mapCommentlinks = mapCommentlinks;
},
destroy() {
this._navigate = uninitializedNavigate;
- this._generateUrl = uninitializedGenerateUrl;
this._generateWeblinks = uninitializedGenerateWebLinks;
this.mapCommentlinks = uninitializedMapCommentLinks;
},
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 50b4792..bac054f 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -46,7 +46,6 @@
toSearchParams,
} from '../../../utils/url-util';
import {Execution, LifeCycle, Timing} from '../../../constants/reporting';
-import {generateUrl, GenerateUrlParameters} from '../../../utils/router-util';
import {
LATEST_ATTEMPT,
stringToAttemptChoice,
@@ -315,10 +314,6 @@
page.redirect(url);
}
- generateUrl(params: GenerateUrlParameters) {
- return generateUrl(params);
- }
-
generateWeblinks(
params: GenerateWebLinksParameters
): GeneratedWebLink[] | GeneratedWebLink {
@@ -567,7 +562,6 @@
page.show(url);
}
},
- params => generateUrl(params),
params => this.generateWeblinks(params),
x => x
);
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 2fdda8d..da57994 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
@@ -35,7 +35,6 @@
createServerInfo,
} from '../../../test/test-data-generators';
import {AppElementParams} from '../../gr-app-types';
-import {GenerateUrlParameters} from '../../../utils/router-util';
import {assert} from '@open-wc/testing';
import {AdminChildView} from '../../../models/views/admin';
import {RepoDetailView} from '../../../models/views/repo';
@@ -353,7 +352,7 @@
function assertDataToParams(
data: PageContextWithQueryMap,
methodName: string,
- params: AppElementParams | GenerateUrlParameters
+ params: AppElementParams
) {
(router as any)[methodName](data);
assert.deepEqual(setParamsStub.lastCall.args[0], params);
@@ -1218,7 +1217,6 @@
});
test('change view', () => {
- sinon.stub(router, 'generateUrl').returns('foo');
const ctx = makeParams('', '');
assertDataToParams(ctx, 'handleChangeRoute', {
view: GerritView.CHANGE,
@@ -1231,7 +1229,6 @@
});
test('params', () => {
- sinon.stub(router, 'generateUrl').returns('foo');
const ctx = makeParams('', '');
ctx.queryMap.set('tab', 'checks');
ctx.queryMap.set('filter', 'fff');
@@ -1277,7 +1274,6 @@
});
test('diff view', () => {
- sinon.stub(router, 'generateUrl').returns('foo');
const ctx = makeParams('foo/bar/baz', 'b44');
assertDataToParams(ctx, 'handleDiffRoute', {
view: GerritView.DIFF,
diff --git a/polygerrit-ui/app/test/test-router.ts b/polygerrit-ui/app/test/test-router.ts
index 4920108..942a41a 100644
--- a/polygerrit-ui/app/test/test-router.ts
+++ b/polygerrit-ui/app/test/test-router.ts
@@ -9,7 +9,6 @@
() => {
/* noop */
},
- () => '',
() => [],
() => {
return {};
diff --git a/polygerrit-ui/app/utils/router-util.ts b/polygerrit-ui/app/utils/router-util.ts
deleted file mode 100644
index 0dd89ad..0000000
--- a/polygerrit-ui/app/utils/router-util.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import {getBaseUrl} from './url-util';
-import {assertNever} from './common-util';
-import {GerritView} from '../services/router/router-model';
-import {createEditUrl, EditViewState} from '../models/views/edit';
-import {createDiffUrl, DiffViewState} from '../models/views/diff';
-
-export type GenerateUrlParameters = EditViewState | DiffViewState;
-
-export function rootUrl() {
- return `${getBaseUrl()}/`;
-}
-
-export function generateUrl(params: GenerateUrlParameters) {
- const base = getBaseUrl();
- let url = '';
-
- if (params.view === GerritView.DIFF) {
- url = createDiffUrl(params);
- } else if (params.view === GerritView.EDIT) {
- url = createEditUrl(params);
- } else {
- assertNever(params, "Can't generate");
- }
-
- return base + url;
-}
diff --git a/polygerrit-ui/app/utils/router-util_test.ts b/polygerrit-ui/app/utils/router-util_test.ts
deleted file mode 100644
index ae90c40..0000000
--- a/polygerrit-ui/app/utils/router-util_test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import {assert} from '@open-wc/testing';
-import {
- RepoName,
- NumericChangeId,
- RevisionPatchSetNum,
- EDIT,
-} from '../api/rest-api';
-import {EditViewState} from '../models/views/edit';
-import {GerritView} from '../services/router/router-model';
-import '../test/common-test-setup';
-import {generateUrl} from './router-util';
-
-suite('router-util tests', () => {
- suite('generateUrl', () => {
- test(EDIT, () => {
- const params: EditViewState = {
- view: GerritView.EDIT,
- changeNum: 42 as NumericChangeId,
- project: 'test' as RepoName,
- path: 'x+y/path.cpp',
- patchNum: EDIT as RevisionPatchSetNum,
- };
- assert.equal(
- generateUrl(params),
- '/c/test/+/42/edit/x%252By/path.cpp,edit'
- );
- });
- });
-});
diff --git a/polygerrit-ui/app/utils/url-util.ts b/polygerrit-ui/app/utils/url-util.ts
index afa7d18..54a6838 100644
--- a/polygerrit-ui/app/utils/url-util.ts
+++ b/polygerrit-ui/app/utils/url-util.ts
@@ -3,7 +3,6 @@
* Copyright 2020 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
-
import {
BasePatchSetNum,
PARENT,
@@ -26,6 +25,10 @@
basePatchNum?: BasePatchSetNum;
}
+export function rootUrl() {
+ return `${getBaseUrl()}/`;
+}
+
/**
* Given an object of parameters, potentially including a `patchNum` or a
* `basePatchNum` or both, return a string representation of that range. If
