Move enums out of GerritNav
Reference the enums directly. So just replace `GerritNav.something` by
`something`.
Release-Notes: skip
Change-Id: Ib3453bead87d9a9e721a5e5d671e21cfa5d3376f
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.ts b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.ts
index c4fad42..e37d5bf 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.ts
@@ -15,6 +15,7 @@
import {GroupId, GroupName, RepoName, Timestamp} from '../../../types/common';
import {GrDropdownList} from '../../shared/gr-dropdown-list/gr-dropdown-list';
import {GrGroup} from '../gr-group/gr-group';
+import {GroupDetailView, RepoDetailView} from '../../../utils/router-util';
const basicFixture = fixtureFromElement('gr-admin-view');
@@ -312,8 +313,8 @@
element.repoName = 'my-repo' as RepoName;
element.params = {
repo: 'my-repo' as RepoName,
- view: GerritNav.View.REPO,
- detail: GerritNav.RepoDetailView.ACCESS,
+ view: GerritView.REPO,
+ detail: RepoDetailView.ACCESS,
};
stubRestApi('getAccountCapabilities').returns(
Promise.resolve(createAdminCapabilities())
@@ -341,36 +342,36 @@
name: 'General',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.GENERAL,
+ detailType: RepoDetailView.GENERAL,
},
{
name: 'Access',
view: GerritView.REPO,
- detailType: GerritNav.RepoDetailView.ACCESS,
+ detailType: RepoDetailView.ACCESS,
url: '',
},
{
name: 'Commands',
view: GerritView.REPO,
- detailType: GerritNav.RepoDetailView.COMMANDS,
+ detailType: RepoDetailView.COMMANDS,
url: '',
},
{
name: 'Branches',
view: GerritView.REPO,
- detailType: GerritNav.RepoDetailView.BRANCHES,
+ detailType: RepoDetailView.BRANCHES,
url: '',
},
{
name: 'Tags',
view: GerritView.REPO,
- detailType: GerritNav.RepoDetailView.TAGS,
+ detailType: RepoDetailView.TAGS,
url: '',
},
{
name: 'Dashboards',
view: GerritView.REPO,
- detailType: GerritNav.RepoDetailView.DASHBOARDS,
+ detailType: RepoDetailView.DASHBOARDS,
url: '',
},
],
@@ -406,7 +407,7 @@
value: 'repogeneral',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.GENERAL,
+ detailType: RepoDetailView.GENERAL,
parent: 'my-repo' as RepoName,
},
{
@@ -414,7 +415,7 @@
value: 'repoaccess',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.ACCESS,
+ detailType: RepoDetailView.ACCESS,
parent: 'my-repo' as RepoName,
},
{
@@ -422,7 +423,7 @@
value: 'repocommands',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.COMMANDS,
+ detailType: RepoDetailView.COMMANDS,
parent: 'my-repo' as RepoName,
},
{
@@ -430,7 +431,7 @@
value: 'repobranches',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.BRANCHES,
+ detailType: RepoDetailView.BRANCHES,
parent: 'my-repo' as RepoName,
},
{
@@ -438,7 +439,7 @@
value: 'repotags',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.TAGS,
+ detailType: RepoDetailView.TAGS,
parent: 'my-repo' as RepoName,
},
{
@@ -446,7 +447,7 @@
value: 'repodashboards',
view: GerritView.REPO,
url: '',
- detailType: GerritNav.RepoDetailView.DASHBOARDS,
+ detailType: RepoDetailView.DASHBOARDS,
parent: 'my-repo' as RepoName,
},
];
@@ -491,7 +492,7 @@
assert.isTrue(element.selectedIsCurrentPage(selected));
selected.parent = 'my-second-repo' as RepoName;
assert.isFalse(element.selectedIsCurrentPage(selected));
- selected.detailType = GerritNav.RepoDetailView.GENERAL;
+ selected.detailType = RepoDetailView.GENERAL;
assert.isFalse(element.selectedIsCurrentPage(selected));
});
@@ -554,7 +555,7 @@
test('repo list', async () => {
element.params = {
- view: GerritNav.View.ADMIN,
+ view: GerritView.ADMIN,
adminView: 'gr-repo-list',
openCreateModal: false,
};
@@ -566,7 +567,7 @@
test('repo', async () => {
element.params = {
- view: GerritNav.View.REPO,
+ view: GerritView.REPO,
repo: 'foo' as RepoName,
};
element.repoName = 'foo' as RepoName;
@@ -579,8 +580,8 @@
test('repo access', async () => {
element.params = {
- view: GerritNav.View.REPO,
- detail: GerritNav.RepoDetailView.ACCESS,
+ view: GerritView.REPO,
+ detail: RepoDetailView.ACCESS,
repo: 'foo' as RepoName,
};
element.repoName = 'foo' as RepoName;
@@ -593,8 +594,8 @@
test('repo dashboards', async () => {
element.params = {
- view: GerritNav.View.REPO,
- detail: GerritNav.RepoDetailView.DASHBOARDS,
+ view: GerritView.REPO,
+ detail: RepoDetailView.DASHBOARDS,
repo: 'foo' as RepoName,
};
element.repoName = 'foo' as RepoName;
@@ -628,7 +629,7 @@
test('group list', async () => {
element.params = {
- view: GerritNav.View.ADMIN,
+ view: GerritView.ADMIN,
adminView: 'gr-admin-group-list',
openCreateModal: false,
};
@@ -640,7 +641,7 @@
test('internal group', async () => {
element.params = {
- view: GerritNav.View.GROUP,
+ view: GerritView.GROUP,
groupId: '1234' as GroupId,
};
element.groupName = 'foo' as GroupName;
@@ -665,7 +666,7 @@
})
);
element.params = {
- view: GerritNav.View.GROUP,
+ view: GerritView.GROUP,
groupId: '1234' as GroupId,
};
element.groupName = 'foo' as GroupName;
@@ -684,8 +685,8 @@
test('group members', async () => {
element.params = {
- view: GerritNav.View.GROUP,
- detail: GerritNav.GroupDetailView.MEMBERS,
+ view: GerritView.GROUP,
+ detail: GroupDetailView.MEMBERS,
groupId: '1234' as GroupId,
};
element.groupName = 'foo' as GroupName;
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.ts
index 14fd2e8..4585af7 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view_test.ts
@@ -24,6 +24,7 @@
} from '../../../api/rest-api.js';
import {tap} from '@polymer/iron-test-helpers/mock-interactions';
import {waitUntil} from '@open-wc/testing-helpers';
+import {GerritView} from '../../../services/router/router-model.js';
const basicFixture = fixtureFromElement('gr-change-list-view');
@@ -302,7 +303,7 @@
});
element.params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: CHANGE_ID,
offset: '',
};
@@ -320,7 +321,7 @@
promise.resolve();
});
- element.params = {view: GerritNav.View.SEARCH, query: '1', offset: ''};
+ element.params = {view: GerritView.SEARCH, query: '1', offset: ''};
await promise;
});
@@ -336,7 +337,7 @@
});
element.params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: COMMIT_HASH,
offset: '',
};
@@ -348,7 +349,7 @@
const stub = sinon.stub(GerritNav, 'navigateToChange');
element.params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: CHANGE_ID,
offset: '',
};
@@ -362,7 +363,7 @@
const stub = sinon.stub(GerritNav, 'navigateToChange');
element.params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: CHANGE_ID,
offset: '',
};
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 4bd6077..faa0d38 100644
--- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
+++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.ts
@@ -34,7 +34,7 @@
// Navigation parameters object format:
//
-// Each object has a `view` property with a value from GerritNav.View. The
+// 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.
@@ -235,14 +235,6 @@
// TODO(dmfilippov) Convert to class, extract consts, give better name and
// expose as a service from appContext
export const GerritNav = {
- View: GerritView,
-
- GroupDetailView,
-
- RepoDetailView,
-
- WeblinkType,
-
_navigate: uninitializedNavigate,
_generateUrl: uninitializedGenerateUrl,
@@ -671,7 +663,7 @@
return this._getUrlFor({
view: GerritView.REPO,
repoName,
- detail: GerritNav.RepoDetailView.BRANCHES,
+ detail: RepoDetailView.BRANCHES,
});
},
@@ -679,7 +671,7 @@
return this._getUrlFor({
view: GerritView.REPO,
repoName,
- detail: GerritNav.RepoDetailView.ACCESS,
+ detail: RepoDetailView.ACCESS,
});
},
@@ -687,7 +679,7 @@
return this._getUrlFor({
view: GerritView.REPO,
repoName,
- detail: GerritNav.RepoDetailView.COMMANDS,
+ detail: RepoDetailView.COMMANDS,
});
},
@@ -695,7 +687,7 @@
return this._getUrlFor({
view: GerritView.REPO,
repoName,
- detail: GerritNav.RepoDetailView.DASHBOARDS,
+ detail: RepoDetailView.DASHBOARDS,
});
},
@@ -710,7 +702,7 @@
return this._getUrlFor({
view: GerritView.GROUP,
groupId,
- detail: GerritNav.GroupDetailView.LOG,
+ detail: GroupDetailView.LOG,
});
},
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 8fd01de..71d3cc0 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -1420,7 +1420,7 @@
// standard queries gain the ability to search places like commit messages
// for change IDs.
this.setParams({
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: data.params[0],
});
}
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 241839c..02d312f 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
@@ -40,6 +40,7 @@
GroupDetailView,
GenerateUrlEditViewParameters,
GenerateUrlChangeViewParameters,
+ RepoDetailView,
} from '../../../utils/router-util';
suite('gr-router tests', () => {
@@ -404,16 +405,13 @@
const params = createPageContext();
router.handleNewAgreementsRoute(params);
assert.isTrue(setParamsStub.calledOnce);
- assert.equal(
- setParamsStub.lastCall.args[0].view,
- GerritNav.View.AGREEMENTS
- );
+ assert.equal(setParamsStub.lastCall.args[0].view, GerritView.AGREEMENTS);
});
test('handleSettingsLegacyRoute', () => {
const data = {...createPageContext(), params: {0: 'my-token'}};
assertDataToParams(data, 'handleSettingsLegacyRoute', {
- view: GerritNav.View.SETTINGS,
+ view: GerritView.SETTINGS,
emailToken: 'my-token',
});
});
@@ -421,7 +419,7 @@
test('handleSettingsLegacyRoute with +', () => {
const data = {...createPageContext(), params: {0: 'my-token test'}};
assertDataToParams(data, 'handleSettingsLegacyRoute', {
- view: GerritNav.View.SETTINGS,
+ view: GerritView.SETTINGS,
emailToken: 'my-token+test',
});
});
@@ -429,7 +427,7 @@
test('handleSettingsRoute', () => {
const data = createPageContext();
assertDataToParams(data, 'handleSettingsRoute', {
- view: GerritNav.View.SETTINGS,
+ view: GerritView.SETTINGS,
});
});
@@ -485,7 +483,7 @@
params: {0: 'project:foo/bar/baz'},
};
assertDataToParams(data, 'handleQueryRoute', {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: 'project:foo/bar/baz',
offset: undefined,
});
@@ -493,7 +491,7 @@
data.params[1] = '123';
data.params[2] = '123';
assertDataToParams(data, 'handleQueryRoute', {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: 'project:foo/bar/baz',
offset: '123',
});
@@ -512,7 +510,7 @@
params: {0: 'I0123456789abcdef0123456789abcdef01234567'},
};
assertDataToParams(data, 'handleChangeIdQueryRoute', {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
query: 'I0123456789abcdef0123456789abcdef01234567',
});
});
@@ -697,7 +695,7 @@
assert.isFalse(redirectStub.called);
assert.isTrue(setParamsStub.calledOnce);
assert.deepEqual(setParamsStub.lastCall.args[0], {
- view: GerritNav.View.DASHBOARD,
+ view: GerritView.DASHBOARD,
user: 'foo',
});
});
@@ -736,7 +734,7 @@
assert.isFalse(redirectStub.called);
assert.isTrue(setParamsStub.calledOnce);
assert.deepEqual(setParamsStub.lastCall.args[0], {
- view: GerritNav.View.DASHBOARD,
+ view: GerritView.DASHBOARD,
user: 'self',
sections: [
{name: 'a', query: 'b'},
@@ -760,7 +758,7 @@
assert.isFalse(redirectStub.called);
assert.isTrue(setParamsStub.calledOnce);
assert.deepEqual(setParamsStub.lastCall.args[0], {
- view: GerritNav.View.DASHBOARD,
+ view: GerritView.DASHBOARD,
user: 'self',
sections: [{name: 'a', query: 'b'}],
title: 't',
@@ -781,7 +779,7 @@
assert.isFalse(redirectStub.called);
assert.isTrue(setParamsStub.calledOnce);
assert.deepEqual(setParamsStub.lastCall.args[0], {
- view: GerritNav.View.DASHBOARD,
+ view: GerritView.DASHBOARD,
user: 'self',
sections: [{name: 'a', query: 'is:open b'}],
title: 'Custom Dashboard',
@@ -837,7 +835,7 @@
data.hash = 'create';
assertDataToParams(data, 'handleGroupListOffsetRoute', {
- view: GerritNav.View.ADMIN,
+ view: GerritView.ADMIN,
adminView: 'gr-admin-group-list',
offset: '42',
filter: null,
@@ -915,7 +913,7 @@
const data = {...createPageContext(), params: {0: '4321'}};
assertDataToParams(data, 'handleRepoGeneralRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.GENERAL,
+ detail: RepoDetailView.GENERAL,
repo: '4321' as RepoName,
});
});
@@ -924,7 +922,7 @@
const data = {...createPageContext(), params: {0: '4321'}};
assertDataToParams(data, 'handleRepoCommandsRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.COMMANDS,
+ detail: RepoDetailView.COMMANDS,
repo: '4321' as RepoName,
});
});
@@ -933,7 +931,7 @@
const data = {...createPageContext(), params: {0: '4321'}};
assertDataToParams(data, 'handleRepoAccessRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.ACCESS,
+ detail: RepoDetailView.ACCESS,
repo: '4321' as RepoName,
});
});
@@ -946,7 +944,7 @@
};
assertDataToParams(data, 'handleBranchListOffsetRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.BRANCHES,
+ detail: RepoDetailView.BRANCHES,
repo: '4321' as RepoName,
offset: 0,
filter: null,
@@ -955,7 +953,7 @@
data.params[2] = '42';
assertDataToParams(data, 'handleBranchListOffsetRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.BRANCHES,
+ detail: RepoDetailView.BRANCHES,
repo: '4321' as RepoName,
offset: '42',
filter: null,
@@ -969,7 +967,7 @@
};
assertDataToParams(data, 'handleBranchListFilterOffsetRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.BRANCHES,
+ detail: RepoDetailView.BRANCHES,
repo: '4321' as RepoName,
offset: '42',
filter: 'foo',
@@ -983,7 +981,7 @@
};
assertDataToParams(data, 'handleBranchListFilterRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.BRANCHES,
+ detail: RepoDetailView.BRANCHES,
repo: '4321' as RepoName,
filter: 'foo',
});
@@ -995,7 +993,7 @@
const data = {...createPageContext(), params: {0: '4321'}};
assertDataToParams(data, 'handleTagListOffsetRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.TAGS,
+ detail: RepoDetailView.TAGS,
repo: '4321' as RepoName,
offset: 0,
filter: null,
@@ -1009,7 +1007,7 @@
};
assertDataToParams(data, 'handleTagListFilterOffsetRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.TAGS,
+ detail: RepoDetailView.TAGS,
repo: '4321' as RepoName,
offset: '42',
filter: 'foo',
@@ -1023,7 +1021,7 @@
};
assertDataToParams(data, 'handleTagListFilterRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.TAGS,
+ detail: RepoDetailView.TAGS,
repo: '4321' as RepoName,
filter: null,
});
@@ -1031,7 +1029,7 @@
data.params.filter = 'foo';
assertDataToParams(data, 'handleTagListFilterRoute', {
view: GerritView.REPO,
- detail: GerritNav.RepoDetailView.TAGS,
+ detail: RepoDetailView.TAGS,
repo: '4321' as RepoName,
filter: 'foo',
});
@@ -1390,7 +1388,7 @@
const appParams: GenerateUrlEditViewParameters = {
project: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
- view: GerritNav.View.EDIT,
+ view: GerritView.EDIT,
path: 'foo/bar/baz',
patchNum: 3 as RevisionPatchSetNum,
lineNum: '',
@@ -1423,7 +1421,7 @@
const appParams: GenerateUrlEditViewParameters = {
project: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
- view: GerritNav.View.EDIT,
+ view: GerritView.EDIT,
path: 'foo/bar/baz',
patchNum: 3 as RevisionPatchSetNum,
lineNum: '4',
@@ -1473,7 +1471,7 @@
test('handlePluginScreen', () => {
const ctx = {...createPageContext(), params: {0: 'foo', 1: 'bar'}};
assertDataToParams(ctx, 'handlePluginScreen', {
- view: GerritNav.View.PLUGIN_SCREEN,
+ view: GerritView.PLUGIN_SCREEN,
plugin: 'foo',
screen: 'bar',
});
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
index 0c49c37..24e7d79 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host_test.ts
@@ -44,7 +44,7 @@
UrlEncodedCommentId,
} from '../../../types/common';
import {CoverageType} from '../../../types/types';
-import {GerritNav} from '../../core/gr-navigation/gr-navigation';
+import {GerritNav, WeblinkType} from '../../core/gr-navigation/gr-navigation';
import {GrDiffBuilderImage} from '../../../embed/diff/gr-diff-builder/gr-diff-builder-image';
import {GrDiffHost, LineInfo} from './gr-diff-host';
import {DiffInfo, DiffViewMode, IgnoreWhitespaceType} from '../../../api/diff';
@@ -196,7 +196,7 @@
weblinks: undefined,
},
repo: 'test-project' as RepoName,
- type: GerritNav.WeblinkType.EDIT,
+ type: WeblinkType.EDIT,
});
assert.deepEqual(element.editWeblinks, [
{
@@ -211,7 +211,7 @@
weblinks: undefined,
},
repo: 'test-project' as RepoName,
- type: GerritNav.WeblinkType.FILE,
+ type: WeblinkType.FILE,
});
assert.deepEqual(weblinksStub.thirdCall.args[0], {
commit: 'test-commit' as CommitId,
@@ -220,7 +220,7 @@
weblinks: undefined,
},
repo: 'test-project' as RepoName,
- type: GerritNav.WeblinkType.FILE,
+ type: WeblinkType.FILE,
});
assert.deepEqual(element.filesWeblinks, {
meta_a: [{name: 'stubb', url: '#s'}],
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts
index 6bf2470..54e1f6d 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts
@@ -159,7 +159,7 @@
sinon.stub(element, 'fetchFiles');
const paramsChangedSpy = sinon.spy(element, 'paramsChanged');
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
patchNum: 2 as RevisionPatchSetNum,
basePatchNum: 1 as BasePatchSetNum,
@@ -213,7 +213,7 @@
discardedDrafts: [],
});
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
commentLink: true,
commentId: 'c1' as UrlEncodedCommentId,
@@ -258,7 +258,7 @@
sinon.stub(element, 'initPatchRange');
sinon.stub(element, 'fetchFiles');
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
patchNum: 2 as RevisionPatchSetNum,
basePatchNum: 1 as BasePatchSetNum,
@@ -301,7 +301,7 @@
loadingStatus: LoadingStatus.LOADED,
});
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
path: '/COMMIT_MSG',
commentLink: true,
@@ -353,7 +353,7 @@
loadingStatus: LoadingStatus.LOADED,
});
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
path: '/COMMIT_MSG',
commentLink: true,
@@ -435,7 +435,7 @@
sinon.stub(element, 'isFileUnchanged').returns(false);
const toastStub = sinon.stub(element, 'displayDiffBaseAgainstLeftToast');
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
project: 'p' as RepoName,
commentId: 'c1' as UrlEncodedCommentId,
@@ -1765,14 +1765,14 @@
const callCount = saveReviewedStub.callCount;
element.params = {
- view: GerritNav.View.CHANGE,
+ view: GerritView.CHANGE,
changeNum: 42 as NumericChangeId,
project: 'test' as RepoName,
};
await element.updateComplete;
// saveReviewedState observer observes params, but should not fire when
- // view !== GerritNav.View.DIFF.
+ // view !== GerritView.DIFF.
assert.equal(saveReviewedStub.callCount, callCount);
});
@@ -1800,7 +1800,7 @@
element.loggedIn = true;
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
patchNum: 2 as RevisionPatchSetNum,
basePatchNum: 1 as BasePatchSetNum,
@@ -1888,7 +1888,7 @@
test('uses the patchNum and basePatchNum ', async () => {
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
patchNum: 4 as RevisionPatchSetNum,
basePatchNum: 2 as BasePatchSetNum,
@@ -1905,7 +1905,7 @@
test('uses the parent when there is no base patch num ', async () => {
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
patchNum: 5 as RevisionPatchSetNum,
path: '/COMMIT_MSG',
@@ -2457,7 +2457,7 @@
// Load file1
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
patchNum: 1 as RevisionPatchSetNum,
changeNum: 101 as NumericChangeId,
project: 'test-project' as RepoName,
@@ -2482,7 +2482,7 @@
// This is to mock the param change triggered by above navigate
element.params = {
- view: GerritNav.View.DIFF,
+ view: GerritView.DIFF,
patchNum: 1 as RevisionPatchSetNum,
changeNum: 101 as NumericChangeId,
project: 'test-project' as RepoName,
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
index e3314a2..6062f17 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
@@ -31,6 +31,7 @@
import {customElement, property, state} from 'lit/decorators.js';
import {subscribe} from '../../lit/subscription-controller';
import {GenerateUrlEditViewParameters} from '../../../utils/router-util';
+import {GerritView} from '../../../services/router/router-model';
const RESTORED_MESSAGE = 'Content restored from a previous edit.';
const SAVING_MESSAGE = 'Saving changes...';
@@ -293,7 +294,7 @@
paramsChanged() {
if (!this.params) return;
- if (this.params.view !== GerritNav.View.EDIT) {
+ if (this.params.view !== GerritView.EDIT) {
return;
}
diff --git a/polygerrit-ui/app/utils/admin-nav-util.ts b/polygerrit-ui/app/utils/admin-nav-util.ts
index 10d28c6..62f686d 100644
--- a/polygerrit-ui/app/utils/admin-nav-util.ts
+++ b/polygerrit-ui/app/utils/admin-nav-util.ts
@@ -149,23 +149,23 @@
const children: SubsectionInterface[] = [];
const subsection: SubsectionInterface = {
name: groupName,
- view: GerritNav.View.GROUP,
+ view: GerritView.GROUP,
url: GerritNav.getUrlForGroup(groupId),
children,
};
if (groupIsInternal) {
children.push({
name: 'Members',
- detailType: GerritNav.GroupDetailView.MEMBERS,
- view: GerritNav.View.GROUP,
+ detailType: GroupDetailView.MEMBERS,
+ view: GerritView.GROUP,
url: GerritNav.getUrlForGroupMembers(groupId),
});
}
if (groupIsInternal && (isAdmin || groupOwner)) {
children.push({
name: 'Audit Log',
- detailType: GerritNav.GroupDetailView.LOG,
- view: GerritNav.View.GROUP,
+ detailType: GroupDetailView.LOG,
+ view: GerritView.GROUP,
url: GerritNav.getUrlForGroupLog(groupId),
});
}
@@ -175,42 +175,42 @@
export function getRepoSubsections(repoName: RepoName) {
return {
name: repoName,
- view: GerritNav.View.REPO,
+ view: GerritView.REPO,
children: [
{
name: 'General',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.GENERAL,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.GENERAL,
url: GerritNav.getUrlForRepo(repoName),
},
{
name: 'Access',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.ACCESS,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.ACCESS,
url: GerritNav.getUrlForRepoAccess(repoName),
},
{
name: 'Commands',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.COMMANDS,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.COMMANDS,
url: GerritNav.getUrlForRepoCommands(repoName),
},
{
name: 'Branches',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.BRANCHES,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.BRANCHES,
url: GerritNav.getUrlForRepoBranches(repoName),
},
{
name: 'Tags',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.TAGS,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.TAGS,
url: GerritNav.getUrlForRepoTags(repoName),
},
{
name: 'Dashboards',
- view: GerritNav.View.REPO,
- detailType: GerritNav.RepoDetailView.DASHBOARDS,
+ view: GerritView.REPO,
+ detailType: RepoDetailView.DASHBOARDS,
url: GerritNav.getUrlForRepoDashboards(repoName),
},
],
diff --git a/polygerrit-ui/app/utils/router-util_test.ts b/polygerrit-ui/app/utils/router-util_test.ts
index e3a21df..7ca44d5 100644
--- a/polygerrit-ui/app/utils/router-util_test.ts
+++ b/polygerrit-ui/app/utils/router-util_test.ts
@@ -13,7 +13,6 @@
EDIT,
GroupId,
} from '../api/rest-api';
-import {GerritNav} from '../elements/core/gr-navigation/gr-navigation';
import {PatchRangeParams} from '../elements/core/gr-router/gr-router';
import {GerritView} from '../services/router/router-model';
import '../test/common-test-setup-karma';
@@ -63,7 +62,7 @@
assert.equal(generateUrl(params), '/q/foo%2524bar,100');
params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
statuses: ['a', 'b', 'c'],
};
assert.equal(
@@ -72,17 +71,17 @@
);
params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
topic: 'test' as TopicName,
};
assert.equal(generateUrl(params), '/q/topic:test');
params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
topic: 'test test' as TopicName,
};
assert.equal(generateUrl(params), '/q/topic:"test+test"');
params = {
- view: GerritNav.View.SEARCH,
+ view: GerritView.SEARCH,
topic: 'test:test' as TopicName,
};
assert.equal(generateUrl(params), '/q/topic:"test:test"');
