Some 'project' to 'repo' renaming
The term 'project' is legacy. We should try to use it as little as
possible. It was replaced by 'repo' or 'repository' a long while ago.
During router refactoring I was asked about renaming 'project' to
'repo', so I wanted to follow up accordingly.
Release-Notes: skip
Change-Id: I8efca30543d4cf06be8c918b0a156221767e34fb
diff --git a/polygerrit-ui/app/api/rest-api.ts b/polygerrit-ui/app/api/rest-api.ts
index 3c06eb0..b52e9ae 100644
--- a/polygerrit-ui/app/api/rest-api.ts
+++ b/polygerrit-ui/app/api/rest-api.ts
@@ -142,9 +142,9 @@
}
/**
- * The state of the projects
+ * The state of the repository
*/
-export enum ProjectState {
+export enum RepoState {
ACTIVE = 'ACTIVE',
READ_ONLY = 'READ_ONLY',
HIDDEN = 'HIDDEN',
@@ -489,7 +489,7 @@
/**
* The ConfigInfo entity contains information about the effective
- * project configuration.
+ * repository configuration.
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#config-info
*/
export declare interface ConfigInfo {
@@ -508,7 +508,7 @@
default_submit_type: SubmitTypeInfo;
submit_type: SubmitType;
match_author_to_committer_date?: InheritedBooleanInfo;
- state?: ProjectState;
+ state?: RepoState;
commentlinks: CommentLinks;
plugin_config?: PluginNameToPluginParametersMap;
actions?: {[viewName: string]: ActionInfo};
@@ -740,7 +740,7 @@
export type LabelNameToLabelTypeInfoMap = {[labelName: string]: LabelTypeInfo};
/**
- * The LabelTypeInfo entity contains metadata about the labels that a project
+ * The LabelTypeInfo entity contains metadata about the labels that a repository
* has.
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#label-type-info
*/
@@ -756,7 +756,7 @@
/**
* The MaxObjectSizeLimitInfo entity contains information about the max object
- * size limit of a project.
+ * size limit of a repository.
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#max-object-size-limit-info
*/
export declare interface MaxObjectSizeLimitInfo {
@@ -835,23 +835,23 @@
}
/**
- * The ProjectInfo entity contains information about a project
+ * The ProjectInfo entity contains information about a repository
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#project-info
*/
export declare interface ProjectInfo {
id: UrlEncodedRepoName;
- // name is not set if returned in a map where the project name is used as
+ // name is not set if returned in a map where the repo name is used as
// map key
name?: RepoName;
- // ?-<n> if the parent project is not visible (<n> is a number which
- // is increased for each non-visible project).
+ // ?-<n> if the parent repository is not visible (<n> is a number which
+ // is increased for each non-visible repository).
parent?: RepoName;
description?: string;
- state?: ProjectState;
+ state?: RepoState;
branches?: {[branchName: string]: CommitId};
- // labels is filled for Create Project and Get Project calls.
+ // labels is filled for Create Repo and Get Repo calls.
labels?: LabelNameToLabelTypeInfoMap;
- // Links to the project in external sites
+ // Links to the repository in external sites
web_links?: WebLinkInfo[];
}
@@ -1005,8 +1005,8 @@
// where "'ffffffffff'" represents nanoseconds.
/**
- * Information about the default submittype of a project, taking into account
- * project inheritance.
+ * Information about the default submittype of a repository, taking into account
+ * repository inheritance.
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#submit-type-info
*/
export declare interface SubmitTypeInfo {
@@ -1169,7 +1169,7 @@
/**
* The label is required for submission, but is impossible to complete.
* The likely cause is access has not been granted correctly by the
- * project owner or site administrator.
+ * repository owner or site administrator.
*/
IMPOSSIBLE = 'IMPOSSIBLE',
OPTIONAL = 'OPTIONAL',
diff --git a/polygerrit-ui/app/constants/constants.ts b/polygerrit-ui/app/constants/constants.ts
index bb7b313..89c7622 100644
--- a/polygerrit-ui/app/constants/constants.ts
+++ b/polygerrit-ui/app/constants/constants.ts
@@ -22,7 +22,7 @@
InheritedBooleanInfoConfiguredValue,
MergeabilityComputationBehavior,
ProblemInfoStatus,
- ProjectState,
+ RepoState,
RequirementStatus,
ReviewerState,
RevisionKind,
@@ -41,7 +41,7 @@
InheritedBooleanInfoConfiguredValue,
MergeabilityComputationBehavior,
ProblemInfoStatus,
- ProjectState,
+ RepoState,
RequirementStatus,
ReviewerState,
RevisionKind,
diff --git a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts
index d5a83a7..ce0ea02 100644
--- a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts
+++ b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section.ts
@@ -16,7 +16,7 @@
import {
EditablePermissionInfo,
PermissionAccessSection,
- EditableProjectAccessGroups,
+ EditableRepoAccessGroups,
} from '../gr-repo-access/gr-repo-access-interfaces';
import {
CapabilityInfoMap,
@@ -68,7 +68,7 @@
section?: PermissionAccessSection;
@property({type: Object})
- groups?: EditableProjectAccessGroups;
+ groups?: EditableRepoAccessGroups;
@property({type: Object})
labels?: LabelNameToLabelTypeInfoMap;
diff --git a/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog.ts b/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog.ts
index 158419e..c88b1c5 100644
--- a/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog.ts
+++ b/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog.ts
@@ -204,11 +204,11 @@
}
private async getRepoSuggestions(input: string) {
- const response = await this.restApiService.getSuggestedProjects(input);
+ const response = await this.restApiService.getSuggestedRepos(input);
const repos = [];
- for (const [name, project] of Object.entries(response ?? {})) {
- repos.push({name, value: project.id});
+ for (const [name, repo] of Object.entries(response ?? {})) {
+ repos.push({name, value: repo.id});
}
return repos;
}
diff --git a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts
index 35e50ad..49fa99f 100644
--- a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts
+++ b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts
@@ -31,7 +31,7 @@
import {
EditablePermissionInfo,
EditablePermissionRuleInfo,
- EditableProjectAccessGroups,
+ EditableRepoAccessGroups,
} from '../gr-repo-access/gr-repo-access-interfaces';
import {getAppContext} from '../../../services/app-context';
import {fire, fireEvent} from '../../../utils/event-util';
@@ -88,7 +88,7 @@
permission?: PermissionArrayItem<EditablePermissionInfo>;
@property({type: Object})
- groups?: EditableProjectAccessGroups;
+ groups?: EditableRepoAccessGroups;
@property({type: String})
section?: GitRef;
@@ -458,7 +458,7 @@
}
computeGroupName(
- groups: EditableProjectAccessGroups | undefined,
+ groups: EditableRepoAccessGroups | undefined,
groupId: GitRef
) {
return groups && groups[groupId] && groups[groupId].name
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access-interfaces.ts b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access-interfaces.ts
index c7bd36fe..e9396b9 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access-interfaces.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access-interfaces.ts
@@ -66,6 +66,6 @@
export interface NewlyAddedGroupInfo {
name: string;
}
-export type EditableProjectAccessGroups = {
+export type EditableRepoAccessGroups = {
[uuid: string]: GroupInfo | NewlyAddedGroupInfo;
};
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access.ts b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access.ts
index 21ab184..27deb82 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access.ts
@@ -15,7 +15,7 @@
ProjectAccessInput,
GitRef,
UrlEncodedRepoName,
- ProjectAccessGroups,
+ RepoAccessGroups,
} from '../../../types/common';
import {GrButton} from '../../shared/gr-button/gr-button';
import {GrAccessSection} from '../gr-access-section/gr-access-section';
@@ -79,7 +79,7 @@
@state() capabilities?: CapabilityInfoMap;
// private but used in test
- @state() groups?: ProjectAccessGroups;
+ @state() groups?: RepoAccessGroups;
// private but used in test
@state() inheritsFrom?: ProjectInfo;
@@ -318,7 +318,7 @@
this.editing = false;
- // Always reset sections when a project changes.
+ // Always reset sections when a repo changes.
this.sections = [];
const sectionsPromises = this.restApiService
.getRepoAccessRights(repo, errFn)
@@ -399,17 +399,17 @@
return this.restApiService
.getRepos(this.inheritFromFilter, MAX_AUTOCOMPLETE_RESULTS)
.then(response => {
- const projects: AutocompleteSuggestion[] = [];
+ const repos: AutocompleteSuggestion[] = [];
if (!response) {
- return projects;
+ return repos;
}
for (const item of response) {
- projects.push({
+ repos.push({
name: item.name,
value: item.id,
});
}
- return projects;
+ return repos;
});
}
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.ts b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.ts
index 85d5c21..2204400 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.ts
@@ -303,7 +303,7 @@
};
await element.updateComplete;
- // When there is a parent project, the link should be displayed.
+ // When there is a parent repo, the link should be displayed.
assert.notEqual(
getComputedStyle(
queryAndAssert<HTMLHeadingElement>(element, '#inheritsFrom')
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands.ts b/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands.ts
index 93f9159..3cc1784 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands.ts
@@ -290,7 +290,7 @@
this.getNavigation().setUrl(
createEditUrl({
changeNum: change._number,
- project: change.project,
+ repo: change.project,
path: CONFIG_PATH,
patchNum: INITIAL_PATCHSET,
})
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts
index 13f6b2b..8212344 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.ts
@@ -20,8 +20,8 @@
GitRef,
GroupId,
GroupName,
- ProjectAccessGroups,
- ProjectAccessInfoMap,
+ RepoAccessGroups,
+ RepoAccessInfoMap,
RepoName,
TagInfo,
Timestamp,
@@ -2103,10 +2103,10 @@
url: 'test',
name: 'test' as GroupName,
},
- } as ProjectAccessGroups,
+ } as RepoAccessGroups,
config_web_links: [{name: 'gitiles', url: 'test'}],
},
- } as ProjectAccessInfoMap)
+ } as RepoAccessInfoMap)
);
await element.determineIfOwner('test' as RepoName);
assert.equal(element.isOwner, false);
@@ -2157,10 +2157,10 @@
url: 'test',
name: 'test' as GroupName,
},
- } as ProjectAccessGroups,
+ } as RepoAccessGroups,
config_web_links: [{name: 'gitiles', url: 'test'}],
},
- } as ProjectAccessInfoMap)
+ } as RepoAccessInfoMap)
);
const handleSaveRevisionStub = sinon.stub(
element,
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.ts b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.ts
index f0bd520..4865aa6 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.ts
@@ -14,7 +14,7 @@
WebLinkInfo,
} from '../../../types/common';
import {GrCreateRepoDialog} from '../gr-create-repo-dialog/gr-create-repo-dialog';
-import {ProjectState, SHOWN_ITEMS_COUNT} from '../../../constants/constants';
+import {RepoState, SHOWN_ITEMS_COUNT} from '../../../constants/constants';
import {fireTitleChange} from '../../../utils/event-util';
import {getAppContext} from '../../../services/app-context';
import {encodeURL, getBaseUrl} from '../../../utils/url-util';
@@ -164,7 +164,7 @@
<a href=${this.computeChangesLink(item.name)}>view all</a>
</td>
<td class="readOnly">
- ${item.state === ProjectState.READ_ONLY ? 'Y' : ''}
+ ${item.state === RepoState.READ_ONLY ? 'Y' : ''}
</td>
<td class="description">${item.description}</td>
</tr>
@@ -215,7 +215,7 @@
}
private computeChangesLink(name: string) {
- return createSearchUrl({project: name as RepoName});
+ return createSearchUrl({repo: name as RepoName});
}
private async getCreateRepoCapability() {
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.ts b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.ts
index 29d378d..15e5e96 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.ts
@@ -17,7 +17,7 @@
ProjectInfoWithName,
RepoName,
} from '../../../types/common';
-import {ProjectState, SHOWN_ITEMS_COUNT} from '../../../constants/constants';
+import {RepoState, SHOWN_ITEMS_COUNT} from '../../../constants/constants';
import {GerritView} from '../../../services/router/router-model';
import {GrOverlay} from '../../shared/gr-overlay/gr-overlay';
import {GrDialog} from '../../shared/gr-dialog/gr-dialog';
@@ -29,7 +29,7 @@
return {
id: `${name}${counter}` as UrlEncodedRepoName,
name: `${name}` as RepoName,
- state: 'ACTIVE' as ProjectState,
+ state: 'ACTIVE' as RepoState,
web_links: [
{
name: 'diffusion',
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
index 01d452a..b7b0c6b 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
@@ -22,7 +22,7 @@
} from '../../../types/common';
import {
InheritedBooleanInfoConfiguredValue,
- ProjectState,
+ RepoState,
SubmitType,
} from '../../../constants/constants';
import {hasOwnProperty} from '../../../utils/common-util';
@@ -42,9 +42,9 @@
import {createSearchUrl} from '../../../models/views/search';
const STATES = {
- active: {value: ProjectState.ACTIVE, label: 'Active'},
- readOnly: {value: ProjectState.READ_ONLY, label: 'Read Only'},
- hidden: {value: ProjectState.HIDDEN, label: 'Hidden'},
+ active: {value: RepoState.ACTIVE, label: 'Active'},
+ readOnly: {value: RepoState.READ_ONLY, label: 'Read Only'},
+ hidden: {value: RepoState.HIDDEN, label: 'Hidden'},
};
const SUBMIT_TYPES = {
@@ -1098,7 +1098,7 @@
private computeChangesUrl(name?: RepoName) {
if (!name) return '';
- return createSearchUrl({project: name});
+ return createSearchUrl({repo: name});
}
// private but used in test
@@ -1130,7 +1130,7 @@
if (!this.repoConfig || this.loading) return;
this.repoConfig = {
...this.repoConfig,
- state: e.detail.value as ProjectState,
+ state: e.detail.value as RepoState,
};
this.requestUpdate();
}
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
index 38c4a5d..c013c9e 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
@@ -25,14 +25,14 @@
InheritedBooleanInfo,
MaxObjectSizeLimitInfo,
PluginParameterToConfigParameterInfoMap,
- ProjectAccessGroups,
- ProjectAccessInfoMap,
+ RepoAccessGroups,
+ RepoAccessInfoMap,
RepoName,
} from '../../../types/common';
import {
ConfigParameterInfoType,
InheritedBooleanInfoConfiguredValue,
- ProjectState,
+ RepoState,
SubmitType,
} from '../../../constants/constants';
import {
@@ -52,7 +52,7 @@
let repoStub: sinon.SinonStub;
const repoConf: ConfigInfo = {
- description: 'Access inherited by all other projects.',
+ description: 'Access inherited by all other repositories.',
use_contributor_agreements: {
value: false,
configured_value: InheritedBooleanInfoConfiguredValue.FALSE,
@@ -534,10 +534,10 @@
url: 'test',
name: 'test' as GroupName,
},
- } as ProjectAccessGroups,
+ } as RepoAccessGroups,
config_web_links: [{name: 'gitiles', url: 'test'}],
},
- } as ProjectAccessInfoMap)
+ } as RepoAccessInfoMap)
);
await element.loadRepo();
assert.isTrue(element.readOnly);
@@ -652,10 +652,10 @@
url: 'test',
name: 'test' as GroupName,
},
- } as ProjectAccessGroups,
+ } as RepoAccessGroups,
config_web_links: [{name: 'gitiles', url: 'test'}],
},
- } as ProjectAccessInfoMap)
+ } as RepoAccessInfoMap)
);
});
@@ -671,10 +671,10 @@
test('state gets set correctly', async () => {
await element.loadRepo();
- assert.equal(element.repoConfig!.state, ProjectState.ACTIVE);
+ assert.equal(element.repoConfig!.state, RepoState.ACTIVE);
assert.equal(
queryAndAssert<GrSelect>(element, '#stateSelect').bindValue,
- ProjectState.ACTIVE
+ RepoState.ACTIVE
);
});
@@ -707,7 +707,7 @@
reject_empty_commit: InheritedBooleanInfoConfiguredValue.TRUE,
max_object_size_limit: '10' as MaxObjectSizeLimitInfo,
submit_type: SubmitType.FAST_FORWARD_ONLY,
- state: ProjectState.READ_ONLY,
+ state: RepoState.READ_ONLY,
enable_reviewer_by_email: InheritedBooleanInfoConfiguredValue.TRUE,
};
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
index 04f282a..cd7aa9d 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.ts
@@ -671,14 +671,14 @@
private computeRepoUrl() {
if (!this.change) return '';
- return createSearchUrl({project: this.change.project, statuses: ['open']});
+ return createSearchUrl({repo: this.change.project, statuses: ['open']});
}
private computeRepoBranchURL() {
if (!this.change) return '';
return createSearchUrl({
branch: this.change.branch,
- project: this.change.project,
+ repo: this.change.project,
});
}
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
index d178880..6fc2374 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.ts
@@ -330,8 +330,8 @@
}
// private but used in test
- getProjectDashboard(
- project: RepoName,
+ getRepositoryDashboard(
+ repo: RepoName,
dashboard?: DashboardId
): Promise<UserDashboard | undefined> {
const errFn = (response?: Response | null) => {
@@ -339,7 +339,7 @@
};
assertIsDefined(dashboard, 'project dashboard must have id');
return this.restApiService
- .getDashboard(project, dashboard, errFn)
+ .getDashboard(repo, dashboard, errFn)
.then(response => {
if (!response) {
return;
@@ -352,7 +352,7 @@
name: section.name,
query: (section.query + suffix).replace(
PROJECT_PLACEHOLDER_PATTERN,
- project
+ repo
),
};
}),
@@ -379,7 +379,7 @@
const {project, dashboard, title, user, sections} = this.viewState;
const dashboardPromise: Promise<UserDashboard | undefined> = project
- ? this.getProjectDashboard(project, dashboard)
+ ? this.getRepositoryDashboard(project, dashboard)
: Promise.resolve(
getUserDashboard(user, sections, title || this.computeTitle(user))
);
diff --git a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.ts b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.ts
index 7889e20..052c82f 100644
--- a/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.ts
+++ b/polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.ts
@@ -397,7 +397,7 @@
],
})
);
- const dashboard = await element.getProjectDashboard(
+ const dashboard = await element.getRepositoryDashboard(
'project' as RepoName,
'' as DashboardId
);
@@ -429,7 +429,7 @@
],
})
);
- const dashboard = await element.getProjectDashboard(
+ const dashboard = await element.getRepositoryDashboard(
'project' as RepoName,
'' as DashboardId
);
diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.ts b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.ts
index 81245cc..18c1455 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.ts
@@ -891,14 +891,14 @@
private computeProjectUrl(project?: RepoName) {
if (!project) return '';
- return createSearchUrl({project});
+ return createSearchUrl({repo: project});
}
private computeBranchUrl(project?: RepoName, branch?: BranchName) {
if (!project || !branch || !this.change || !this.change.status) return '';
return createSearchUrl({
branch,
- project,
+ repo: project,
statuses:
this.change.status === ChangeStatus.NEW
? ['open']
@@ -916,7 +916,7 @@
}
return createChangeUrl({
changeNum: change,
- project,
+ repo: project,
usp: 'metadata',
patchNum: patchset,
});
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 d6e1958..535ba6f 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
@@ -2152,10 +2152,10 @@
return;
}
- if (this.viewState.changeNum && this.viewState.project) {
+ if (this.viewState.changeNum && this.viewState.repo) {
this.restApiService.setInProjectLookup(
this.viewState.changeNum,
- this.viewState.project
+ this.viewState.repo
);
}
@@ -3223,7 +3223,7 @@
this.getNavigation().setUrl(
createEditUrl({
changeNum: this.change._number,
- project: this.change.project,
+ repo: this.change.project,
path,
patchNum: this.patchRange.patchNum,
})
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 f3017f8..77f080d 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
@@ -368,7 +368,7 @@
element.viewState = {
view: GerritView.CHANGE,
changeNum: TEST_NUMERIC_CHANGE_ID,
- project: 'gerrit' as RepoName,
+ repo: 'gerrit' as RepoName,
};
await element.updateComplete.then(() => {
assertIsDefined(element.actions);
@@ -2461,7 +2461,7 @@
element.viewState = {
...createChangeViewState(),
changeNum: TEST_NUMERIC_CHANGE_ID,
- project: TEST_PROJECT_NAME,
+ repo: TEST_PROJECT_NAME,
};
element.getChangeModel().setState({
loadingStatus: LoadingStatus.LOADED,
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
index 3e8530c..d21f5a9 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
@@ -2108,14 +2108,14 @@
if (this.editMode && path !== SpecialFilePath.MERGE_LIST) {
return createEditUrl({
changeNum: this.change._number,
- project: this.change.project,
+ repo: this.change.project,
path,
patchNum: this.patchRange.patchNum,
});
}
return createDiffUrl({
changeNum: this.change._number,
- project: this.change.project,
+ repo: this.change.project,
path,
patchNum: this.patchRange.patchNum,
basePatchNum: this.patchRange.basePatchNum,
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
index 11fe0e2..bdb95ea 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.ts
@@ -225,7 +225,7 @@
.href=${change?._change_number
? createChangeUrl({
changeNum: change._change_number,
- project: change.project,
+ repo: change.project,
usp: 'related-change',
patchNum: change._revision_number as RevisionPatchSetNum,
})
diff --git a/polygerrit-ui/app/elements/checks/gr-checks-results.ts b/polygerrit-ui/app/elements/checks/gr-checks-results.ts
index 848948f..ddd9b25 100644
--- a/polygerrit-ui/app/elements/checks/gr-checks-results.ts
+++ b/polygerrit-ui/app/elements/checks/gr-checks-results.ts
@@ -711,7 +711,7 @@
tooltip: `${path}${rangeText}`,
url: createDiffUrl({
changeNum: change._number,
- project: change.project,
+ repo: change.project,
path,
patchNum: patchset,
lineNum: line,
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 2bda156..a145b96 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts
@@ -1396,7 +1396,7 @@
// Parameter order is based on the regex group number matched.
const changeNum = Number(ctx.params[1]) as NumericChangeId;
const state: ChangeViewState = {
- project: ctx.params[0] as RepoName,
+ repo: ctx.params[0] as RepoName,
changeNum,
basePatchNum: convertToPatchSetNum(ctx.params[4]) as BasePatchSetNum,
patchNum: convertToPatchSetNum(ctx.params[6]) as RevisionPatchSetNum,
@@ -1422,8 +1422,8 @@
const selected = queryMap.get('checksRunsSelected');
if (selected) state.checksRunsSelected = new Set(selected.split(','));
- assertIsDefined(state.project, 'project');
- this.reporting.setRepoName(state.project);
+ assertIsDefined(state.repo, 'project');
+ this.reporting.setRepoName(state.repo);
this.reporting.setChangeId(changeNum);
this.normalizePatchRangeParams(state);
// Note that router model view must be updated before view models.
@@ -1434,13 +1434,13 @@
handleCommentRoute(ctx: PageContext) {
const changeNum = Number(ctx.params[1]) as NumericChangeId;
const state: DiffViewState = {
- project: ctx.params[0] as RepoName,
+ repo: ctx.params[0] as RepoName,
changeNum,
commentId: ctx.params[2] as UrlEncodedCommentId,
view: GerritView.DIFF,
commentLink: true,
};
- this.reporting.setRepoName(state.project ?? '');
+ this.reporting.setRepoName(state.repo ?? '');
this.reporting.setChangeId(changeNum);
this.normalizePatchRangeParams(state);
// Note that router model view must be updated before view models.
@@ -1451,13 +1451,13 @@
handleCommentsRoute(ctx: PageContext) {
const changeNum = Number(ctx.params[1]) as NumericChangeId;
const state: ChangeViewState = {
- project: ctx.params[0] as RepoName,
+ repo: ctx.params[0] as RepoName,
changeNum,
commentId: ctx.params[2] as UrlEncodedCommentId,
view: GerritView.CHANGE,
};
- assertIsDefined(state.project);
- this.reporting.setRepoName(state.project);
+ assertIsDefined(state.repo);
+ this.reporting.setRepoName(state.repo);
this.reporting.setChangeId(changeNum);
this.normalizePatchRangeParams(state);
// Note that router model view must be updated before view models.
@@ -1469,7 +1469,7 @@
const changeNum = Number(ctx.params[1]) as NumericChangeId;
// Parameter order is based on the regex group number matched.
const state: DiffViewState = {
- project: ctx.params[0] as RepoName,
+ repo: ctx.params[0] as RepoName,
changeNum,
basePatchNum: convertToPatchSetNum(ctx.params[4]) as BasePatchSetNum,
patchNum: convertToPatchSetNum(ctx.params[6]) as RevisionPatchSetNum,
@@ -1481,7 +1481,7 @@
state.leftSide = address.leftSide;
state.lineNum = address.lineNum;
}
- this.reporting.setRepoName(state.project ?? '');
+ this.reporting.setRepoName(state.repo ?? '');
this.reporting.setChangeId(changeNum);
this.normalizePatchRangeParams(state);
// Note that router model view must be updated before view models.
@@ -1515,7 +1515,7 @@
const project = ctx.params[0] as RepoName;
const changeNum = Number(ctx.params[1]) as NumericChangeId;
const state: EditViewState = {
- project,
+ repo: project,
changeNum,
// for edit view params, patchNum cannot be undefined
patchNum: convertToPatchSetNum(ctx.params[2]) as RevisionPatchSetNum,
@@ -1537,7 +1537,7 @@
const changeNum = Number(ctx.params[1]) as NumericChangeId;
const queryMap = new URLSearchParams(ctx.querystring);
const state: ChangeViewState = {
- project,
+ repo: project,
changeNum,
patchNum: convertToPatchSetNum(ctx.params[3]) as RevisionPatchSetNum,
view: GerritView.CHANGE,
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 d1d0c86..76265fb 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
@@ -1135,7 +1135,7 @@
const ctx = makeParams('', '');
assertctxToParams(ctx, 'handleChangeRoute', {
view: GerritView.CHANGE,
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
basePatchNum: 4 as BasePatchSetNum,
patchNum: 7 as RevisionPatchSetNum,
@@ -1155,7 +1155,7 @@
ctx.querystring = queryMap.toString();
assertctxToParams(ctx, 'handleChangeRoute', {
view: GerritView.CHANGE,
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
basePatchNum: 4 as BasePatchSetNum,
patchNum: 7 as RevisionPatchSetNum,
@@ -1195,7 +1195,7 @@
const ctx = makeParams('foo/bar/baz', 'b44');
assertctxToParams(ctx, 'handleDiffRoute', {
view: GerritView.DIFF,
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
basePatchNum: 4 as BasePatchSetNum,
patchNum: 7 as RevisionPatchSetNum,
@@ -1218,7 +1218,7 @@
{params: groups!.slice(1)} as any,
'handleCommentRoute',
{
- project: 'gerrit' as RepoName,
+ repo: 'gerrit' as RepoName,
changeNum: 264833 as NumericChangeId,
commentId: '00049681_f34fd6a9' as UrlEncodedCommentId,
commentLink: true,
@@ -1239,7 +1239,7 @@
{params: groups!.slice(1)} as any,
'handleCommentsRoute',
{
- project: 'gerrit' as RepoName,
+ repo: 'gerrit' as RepoName,
changeNum: 264833 as NumericChangeId,
commentId: '00049681_f34fd6a9' as UrlEncodedCommentId,
view: GerritView.CHANGE,
@@ -1261,7 +1261,7 @@
},
};
const appParams: EditViewState = {
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
view: GerritView.EDIT,
path: 'foo/bar/baz',
@@ -1287,7 +1287,7 @@
},
};
const appParams: EditViewState = {
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
view: GerritView.EDIT,
path: 'foo/bar/baz',
@@ -1312,7 +1312,7 @@
},
};
const appParams: ChangeViewState = {
- project: 'foo/bar' as RepoName,
+ repo: 'foo/bar' as RepoName,
changeNum: 1234 as NumericChangeId,
view: GerritView.CHANGE,
patchNum: 3 as RevisionPatchSetNum,
diff --git a/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search.ts b/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search.ts
index 13116fd..5bcef11 100644
--- a/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search.ts
+++ b/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search.ts
@@ -98,7 +98,7 @@
expression: string
): Promise<AutocompleteSuggestion[]> {
return this.restApiService
- .getSuggestedProjects(expression, MAX_AUTOCOMPLETE_RESULTS)
+ .getSuggestedRepos(expression, MAX_AUTOCOMPLETE_RESULTS)
.then(projects => {
if (!projects) {
return [];
diff --git a/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search_test.ts b/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search_test.ts
index a0d49c8..7e3b896 100644
--- a/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search_test.ts
+++ b/polygerrit-ui/app/elements/core/gr-smart-search/gr-smart-search_test.ts
@@ -94,7 +94,7 @@
});
test('Autocompletes projects', () => {
- stubRestApi('getSuggestedProjects').callsFake(() =>
+ stubRestApi('getSuggestedRepos').callsFake(() =>
Promise.resolve({Polygerrit: {id: 'test' as UrlEncodedRepoName}})
);
return element.fetchProjects('project', 'pol').then(s => {
diff --git a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
index 7570ac5..26043b32 100644
--- a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
+++ b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api.ts
@@ -234,8 +234,6 @@
*
* @param patchRange The patch-range object containing patchNum
* and basePatchNum properties to represent the range.
- * @param projectConfig Optional project config object to
- * include in the meta sub-object.
*/
getCommentsForPath(path: string, patchRange: PatchRange): CommentInfo[] {
let comments: CommentInfo[] = [];
@@ -373,8 +371,6 @@
*
* @param patchRange The patch-range object containing patchNum
* and basePatchNum properties to represent the range.
- * @param projectConfig Optional project config object to
- * include in the meta sub-object.
*/
getCommentsForFile(
file: PatchSetFile,
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
index 6ad8e2f..75117f9 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
@@ -1405,7 +1405,7 @@
const cursorAddress = this.cursor?.getAddress();
const editUrl = createEditUrl({
changeNum: this.change._number,
- project: this.change.project,
+ repo: this.change.project,
path: this.path,
patchNum: this.patchRange.patchNum,
lineNum: cursorAddress?.number,
@@ -1523,7 +1523,7 @@
if (!this.path) return;
const url = createDiffUrl({
changeNum: this.changeNum,
- project: this.change.project,
+ repo: this.change.project,
path: this.path,
patchNum: this.patchRange.patchNum,
basePatchNum: this.patchRange.basePatchNum,
@@ -1653,10 +1653,10 @@
this.commitRange = undefined;
this.focusLineNum = undefined;
- if (viewState.changeNum && viewState.project) {
+ if (viewState.changeNum && viewState.repo) {
this.restApiService.setInProjectLookup(
viewState.changeNum,
- viewState.project
+ viewState.repo
);
}
@@ -1786,7 +1786,7 @@
if (!change || !patchRange || !path) return '';
return createDiffUrl({
changeNum: change._number,
- project: change.project,
+ repo: change.project,
path,
patchNum: patchRange.patchNum,
basePatchNum: patchRange.basePatchNum,
@@ -1994,7 +1994,7 @@
// Private but used in tests.
computeDownloadFileLink(
- project: RepoName,
+ repo: RepoName,
changeNum: NumericChangeId,
patchRange: PatchRange,
path: string,
@@ -2013,7 +2013,7 @@
}
}
let url =
- changeBaseURL(project, changeNum, patchNum) +
+ changeBaseURL(repo, changeNum, patchNum) +
`/files/${encodeURIComponent(path)}/download`;
if (parent) url += `?parent=${parent}`;
@@ -2022,12 +2022,12 @@
// Private but used in tests.
computeDownloadPatchLink(
- project: RepoName,
+ repo: RepoName,
changeNum: NumericChangeId,
patchRange: PatchRange,
path: string
) {
- let url = changeBaseURL(project, changeNum, patchRange.patchNum);
+ let url = changeBaseURL(repo, changeNum, patchRange.patchNum);
url += '/patch?zip&path=' + encodeURIComponent(path);
return url;
}
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 b6e26ab..a611361 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
@@ -421,7 +421,7 @@
element.viewState = {
view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
- project: 'p' as RepoName,
+ repo: 'p' as RepoName,
commentId: 'c1' as UrlEncodedCommentId,
commentLink: true,
};
@@ -1677,7 +1677,7 @@
element.viewState = {
view: GerritView.DIFF,
changeNum: 42 as NumericChangeId,
- project: 'test' as RepoName,
+ repo: 'test' as RepoName,
};
await element.updateComplete;
@@ -2367,7 +2367,7 @@
view: GerritView.DIFF,
patchNum: 1 as RevisionPatchSetNum,
changeNum: 101 as NumericChangeId,
- project: 'test-project' as RepoName,
+ repo: 'test-project' as RepoName,
path: 'file1',
};
element.patchRange = {
@@ -2392,7 +2392,7 @@
view: GerritView.DIFF,
patchNum: 1 as RevisionPatchSetNum,
changeNum: 101 as NumericChangeId,
- project: 'test-project' as RepoName,
+ repo: 'test-project' as RepoName,
path: 'file2',
};
element.patchRange = {
diff --git a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts
index a273a3e..2dbe6fa 100644
--- a/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts
+++ b/polygerrit-ui/app/elements/edit/gr-edit-controls/gr-edit-controls.ts
@@ -429,7 +429,7 @@
assertIsDefined(this.patchNum, 'patchset number');
const url = createEditUrl({
changeNum: this.change._number,
- project: this.change.project,
+ repo: this.change.project,
path: this.path,
patchNum: this.patchNum,
});
diff --git a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts
index fb38b59..15ec512 100644
--- a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts
+++ b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts
@@ -193,12 +193,12 @@
// private but used in tests.
getProjectSuggestions(input: string) {
- return this.restApiService.getSuggestedProjects(input).then(response => {
- const projects: AutocompleteSuggestion[] = [];
- for (const [name, project] of Object.entries(response ?? {})) {
- projects.push({name, value: project.id});
+ return this.restApiService.getSuggestedRepos(input).then(response => {
+ const repos: AutocompleteSuggestion[] = [];
+ for (const [name, repo] of Object.entries(response ?? {})) {
+ repos.push({name, value: repo.id});
}
- return projects;
+ return repos;
});
}
diff --git a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.ts b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.ts
index 1280d6e..c608656 100644
--- a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.ts
+++ b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_test.ts
@@ -44,7 +44,7 @@
] as ProjectWatchInfo[];
stubRestApi('getWatchedProjects').returns(Promise.resolve(projects));
- suggestionStub = stubRestApi('getSuggestedProjects').callsFake(input => {
+ suggestionStub = stubRestApi('getSuggestedRepos').callsFake(input => {
if (input.startsWith('th')) {
return Promise.resolve({
'the project': {
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
index 9dfbc04..d02801a 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
@@ -741,7 +741,7 @@
if (this.isNewThread()) return undefined;
return createDiffUrl({
changeNum: this.changeNum,
- project: this.repoName,
+ repo: this.repoName,
path: this.thread.path,
patchNum: this.thread.patchNum,
});
@@ -770,7 +770,7 @@
assertIsDefined(this.rootId, 'rootId of comment thread');
return createDiffUrl({
changeNum: this.changeNum,
- project: this.repoName,
+ repo: this.repoName,
commentId: this.rootId,
});
}
@@ -784,13 +784,13 @@
if (this.isPatchsetLevel()) {
url = createChangeUrl({
changeNum: this.changeNum,
- project: this.repoName,
+ repo: this.repoName,
commentId: comment.id,
});
} else {
url = createDiffUrl({
changeNum: this.changeNum,
- project: this.repoName,
+ repo: this.repoName,
commentId: comment.id,
});
}
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
index ef67ae8..00c2d12 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
@@ -949,7 +949,7 @@
if (!comment.id) throw new Error('comment must have an id');
return createDiffUrl({
changeNum: this.changeNum,
- project: this.repoName,
+ repo: this.repoName,
commentId: comment.id,
});
}
diff --git a/polygerrit-ui/app/models/views/change.ts b/polygerrit-ui/app/models/views/change.ts
index 100c46b..31d511a 100644
--- a/polygerrit-ui/app/models/views/change.ts
+++ b/polygerrit-ui/app/models/views/change.ts
@@ -30,7 +30,7 @@
view: GerritView.CHANGE;
changeNum: NumericChangeId;
- project: RepoName;
+ repo: RepoName;
edit?: boolean;
patchNum?: RevisionPatchSetNum;
basePatchNum?: BasePatchSetNum;
@@ -70,7 +70,7 @@
*/
export type CreateChangeUrlObject = Omit<
ChangeViewState,
- 'view' | 'changeNum' | 'project'
+ 'view' | 'changeNum' | 'repo'
> & {
change: Pick<ChangeInfo, '_number' | 'project'>;
};
@@ -89,7 +89,7 @@
...obj,
view: GerritView.CHANGE,
changeNum: obj.change._number,
- project: obj.change.project,
+ repo: obj.change.project,
};
}
return {...obj, view: GerritView.CHANGE};
@@ -144,8 +144,8 @@
if (state.messageHash) {
suffix += state.messageHash;
}
- if (state.project) {
- const encodedProject = encodeURL(state.project, true);
+ if (state.repo) {
+ const encodedProject = encodeURL(state.repo, true);
return `${getBaseUrl()}/c/${encodedProject}/+/${state.changeNum}${suffix}`;
} else {
return `${getBaseUrl()}/c/${state.changeNum}${suffix}`;
diff --git a/polygerrit-ui/app/models/views/change_test.ts b/polygerrit-ui/app/models/views/change_test.ts
index 24ced82..b34a1ba 100644
--- a/polygerrit-ui/app/models/views/change_test.ts
+++ b/polygerrit-ui/app/models/views/change_test.ts
@@ -17,7 +17,7 @@
const STATE: ChangeViewState = {
view: GerritView.CHANGE,
changeNum: 1234 as NumericChangeId,
- project: 'test' as RepoName,
+ repo: 'test' as RepoName,
};
suite('change view state tests', () => {
@@ -71,7 +71,7 @@
const state: ChangeViewState = {
view: GerritView.CHANGE,
changeNum: 1234 as NumericChangeId,
- project: 'x+/y+/z+/w' as RepoName,
+ repo: 'x+/y+/z+/w' as RepoName,
};
assert.equal(createChangeUrl(state), '/c/x%252B/y%252B/z%252B/w/+/1234');
});
diff --git a/polygerrit-ui/app/models/views/diff.ts b/polygerrit-ui/app/models/views/diff.ts
index 3cc107a..34f4ee7 100644
--- a/polygerrit-ui/app/models/views/diff.ts
+++ b/polygerrit-ui/app/models/views/diff.ts
@@ -24,7 +24,7 @@
export interface DiffViewState extends ViewState {
view: GerritView.DIFF;
changeNum: NumericChangeId;
- project?: RepoName;
+ repo?: RepoName;
commentId?: UrlEncodedCommentId;
path?: string;
patchNum?: RevisionPatchSetNum;
@@ -60,7 +60,7 @@
...obj,
view: GerritView.DIFF,
changeNum: obj.change._number,
- project: obj.change.project,
+ repo: obj.change.project,
};
}
return {...obj, view: GerritView.DIFF};
@@ -87,8 +87,8 @@
suffix = `/comment/${state.commentId}` + suffix;
}
- if (state.project) {
- const encodedProject = encodeURL(state.project, true);
+ if (state.repo) {
+ const encodedProject = encodeURL(state.repo, true);
return `${getBaseUrl()}/c/${encodedProject}/+/${state.changeNum}${suffix}`;
} else {
return `${getBaseUrl()}/c/${state.changeNum}${suffix}`;
diff --git a/polygerrit-ui/app/models/views/diff_test.ts b/polygerrit-ui/app/models/views/diff_test.ts
index b0f91bb..7fab2a4 100644
--- a/polygerrit-ui/app/models/views/diff_test.ts
+++ b/polygerrit-ui/app/models/views/diff_test.ts
@@ -21,7 +21,7 @@
changeNum: 42 as NumericChangeId,
path: 'x+y/path.cpp' as RepoName,
patchNum: 12 as RevisionPatchSetNum,
- project: '' as RepoName,
+ repo: '' as RepoName,
};
assert.equal(createDiffUrl(params), '/c/42/12/x%252By/path.cpp');
@@ -29,7 +29,7 @@
assert.equal(createDiffUrl(params).substring(0, 5), '/base');
window.CANONICAL_PATH = undefined;
- params.project = 'test' as RepoName;
+ params.repo = 'test' as RepoName;
assert.equal(createDiffUrl(params), '/c/test/+/42/12/x%252By/path.cpp');
params.basePatchNum = 6 as BasePatchSetNum;
@@ -57,7 +57,7 @@
changeNum: 42 as NumericChangeId,
path: 'x+y/path.cpp',
patchNum: 12 as RevisionPatchSetNum,
- project: 'x+/y' as RepoName,
+ repo: 'x+/y' as RepoName,
};
assert.equal(createDiffUrl(params), '/c/x%252B/y/+/42/12/x%252By/path.cpp');
});
diff --git a/polygerrit-ui/app/models/views/edit.ts b/polygerrit-ui/app/models/views/edit.ts
index c63c8ce..3893576 100644
--- a/polygerrit-ui/app/models/views/edit.ts
+++ b/polygerrit-ui/app/models/views/edit.ts
@@ -22,7 +22,7 @@
export interface EditViewState extends ViewState {
view: GerritView.EDIT;
changeNum: NumericChangeId;
- project: RepoName;
+ repo: RepoName;
path: string;
patchNum: RevisionPatchSetNum;
lineNum?: number;
@@ -43,8 +43,8 @@
suffix += state.lineNum;
}
- if (state.project) {
- const encodedProject = encodeURL(state.project, true);
+ if (state.repo) {
+ const encodedProject = encodeURL(state.repo, true);
return `${getBaseUrl()}/c/${encodedProject}/+/${state.changeNum}${suffix}`;
} else {
return `${getBaseUrl()}/c/${state.changeNum}${suffix}`;
diff --git a/polygerrit-ui/app/models/views/edit_test.ts b/polygerrit-ui/app/models/views/edit_test.ts
index 2912063..00bc805 100644
--- a/polygerrit-ui/app/models/views/edit_test.ts
+++ b/polygerrit-ui/app/models/views/edit_test.ts
@@ -18,7 +18,7 @@
const params: EditViewState = {
view: GerritView.EDIT,
changeNum: 42 as NumericChangeId,
- project: 'test-project' as RepoName,
+ repo: 'test-project' as RepoName,
path: 'x+y/path.cpp' as RepoName,
patchNum: 12 as RevisionPatchSetNum,
lineNum: 31,
diff --git a/polygerrit-ui/app/models/views/search.ts b/polygerrit-ui/app/models/views/search.ts
index 78f2d8f..ff77414 100644
--- a/polygerrit-ui/app/models/views/search.ts
+++ b/polygerrit-ui/app/models/views/search.ts
@@ -71,7 +71,7 @@
export interface SearchUrlOptions {
query?: string;
offset?: number;
- project?: RepoName;
+ repo?: RepoName;
branch?: BranchName;
topic?: TopicName;
statuses?: string[];
@@ -93,8 +93,8 @@
if (params.owner) {
operators.push('owner:' + encodeURL(params.owner, false));
}
- if (params.project) {
- operators.push('project:' + encodeURL(params.project, false));
+ if (params.repo) {
+ operators.push('project:' + encodeURL(params.repo, false));
}
if (params.branch) {
operators.push('branch:' + encodeURL(params.branch, false));
diff --git a/polygerrit-ui/app/models/views/search_test.ts b/polygerrit-ui/app/models/views/search_test.ts
index 9017f2e..3c7f5d3 100644
--- a/polygerrit-ui/app/models/views/search_test.ts
+++ b/polygerrit-ui/app/models/views/search_test.ts
@@ -31,7 +31,7 @@
test('createSearchUrl', () => {
let options: SearchUrlOptions = {
owner: 'a%b',
- project: 'c%d' as RepoName,
+ repo: 'c%d' as RepoName,
branch: 'e%f' as BranchName,
topic: 'g%h' as TopicName,
statuses: ['op%en'],
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
index 841d22e..66498d1 100644
--- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
+++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api-impl.ts
@@ -100,7 +100,7 @@
PreferencesInfo,
PreferencesInput,
ProjectAccessInfo,
- ProjectAccessInfoMap,
+ RepoAccessInfoMap,
ProjectAccessInput,
ProjectInfo,
ProjectInfoWithName,
@@ -350,13 +350,13 @@
}) as Promise<ConfigInfo | undefined>;
}
- getRepoAccess(repo: RepoName): Promise<ProjectAccessInfoMap | undefined> {
+ getRepoAccess(repo: RepoName): Promise<RepoAccessInfoMap | undefined> {
// TODO(kaspern): Rename rest api from /projects/ to /repos/ once backend
// supports it.
return this._fetchSharedCacheURL({
url: '/access/?project=' + encodeURIComponent(repo),
anonymizedUrl: '/access/?project=*',
- }) as Promise<ProjectAccessInfoMap | undefined>;
+ }) as Promise<RepoAccessInfoMap | undefined>;
}
getRepoDashboards(
@@ -1631,7 +1631,7 @@
}) as Promise<GroupNameToGroupInfoMap | undefined>;
}
- getSuggestedProjects(
+ getSuggestedRepos(
inputVal: string,
n?: number
): Promise<NameToProjectInfoMap | undefined> {
@@ -1773,7 +1773,7 @@
}
getChangeCherryPicks(
- project: RepoName,
+ repo: RepoName,
changeID: ChangeId,
changeNum: NumericChangeId
): Promise<ChangeInfo[] | undefined> {
@@ -1782,7 +1782,7 @@
ListChangesOption.CURRENT_COMMIT
);
const query = [
- `project:${project}`,
+ `project:${repo}`,
`change:${changeID}`,
`-change:${changeNum}`,
'-is:abandoned',
@@ -1929,7 +1929,7 @@
}
createChange(
- project: RepoName,
+ repo: RepoName,
branch: BranchName,
subject: string,
topic?: string,
@@ -1942,7 +1942,7 @@
method: HttpMethod.POST,
url: '/changes/',
body: {
- project,
+ project: repo,
branch,
subject,
topic,
@@ -2638,13 +2638,13 @@
}
getCommitInfo(
- project: RepoName,
+ repo: RepoName,
commit: CommitId
): Promise<CommitInfo | undefined> {
return this._restApiHelper.fetchJSON({
url:
'/projects/' +
- encodeURIComponent(project) +
+ encodeURIComponent(repo) +
'/commits/' +
encodeURIComponent(commit),
anonymizedUrl: '/projects/*/comments/*',
@@ -3224,13 +3224,13 @@
}
getDashboard(
- project: RepoName,
+ repo: RepoName,
dashboard: DashboardId,
errFn?: ErrorCallback
): Promise<DashboardInfo | undefined> {
const url =
'/projects/' +
- encodeURIComponent(project) +
+ encodeURIComponent(repo) +
'/dashboards/' +
encodeURIComponent(dashboard);
return this._fetchSharedCacheURL({
diff --git a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts
index f0a7377..984efa9 100644
--- a/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts
+++ b/polygerrit-ui/app/services/gr-rest-api/gr-rest-api.ts
@@ -70,7 +70,7 @@
PreferencesInfo,
PreferencesInput,
ProjectAccessInfo,
- ProjectAccessInfoMap,
+ RepoAccessInfoMap,
ProjectAccessInput,
ProjectInfo,
ProjectInfoWithName,
@@ -287,7 +287,7 @@
errFn?: ErrorCallback
): Promise<DashboardInfo[] | undefined>;
- getRepoAccess(repo: RepoName): Promise<ProjectAccessInfoMap | undefined>;
+ getRepoAccess(repo: RepoName): Promise<RepoAccessInfoMap | undefined>;
getProjectConfig(
repo: RepoName,
@@ -370,7 +370,7 @@
): Promise<string>;
createChange(
- project: RepoName,
+ repo: RepoName,
branch: BranchName,
subject: string,
topic?: string,
@@ -513,7 +513,7 @@
deleteWatchedProjects(projects: ProjectWatchInfo[]): Promise<Response>;
- getSuggestedProjects(
+ getSuggestedRepos(
inputVal: string,
n?: number
): Promise<NameToProjectInfoMap | undefined>;
@@ -640,7 +640,7 @@
): Promise<ChangeInfo[] | undefined>;
getChangeCherryPicks(
- project: RepoName,
+ repo: RepoName,
changeID: ChangeId,
changeNum: NumericChangeId
): Promise<ChangeInfo[] | undefined>;
@@ -764,7 +764,7 @@
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#get-dashboard
*/
getDashboard(
- project: RepoName,
+ repo: RepoName,
dashboard: DashboardId,
errFn?: ErrorCallback
): Promise<DashboardInfo | undefined>;
@@ -802,7 +802,7 @@
getTopMenus(): Promise<TopMenuEntryInfo[] | undefined>;
- setInProjectLookup(changeNum: NumericChangeId, project: RepoName): void;
+ setInProjectLookup(changeNum: NumericChangeId, repo: RepoName): void;
getMergeable(changeNum: NumericChangeId): Promise<MergeableInfo | undefined>;
putChangeCommitMessage(
diff --git a/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts b/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
index 492bd8d..a5bc4bf 100644
--- a/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
+++ b/polygerrit-ui/app/test/mocks/gr-rest-api_mock.ts
@@ -30,7 +30,7 @@
ConfigInfo,
EditInfo,
DashboardInfo,
- ProjectAccessInfoMap,
+ RepoAccessInfoMap,
IncludedInInfo,
CommentInfo,
PathToCommentsInfoMap,
@@ -376,7 +376,7 @@
name: repo,
});
},
- getRepoAccess(): Promise<ProjectAccessInfoMap | undefined> {
+ getRepoAccess(): Promise<RepoAccessInfoMap | undefined> {
return Promise.resolve({});
},
getRepoAccessRights(): Promise<ProjectAccessInfo | undefined> {
@@ -412,7 +412,7 @@
getSuggestedGroups(): Promise<GroupNameToGroupInfoMap | undefined> {
return Promise.resolve({});
},
- getSuggestedProjects(): Promise<NameToProjectInfoMap | undefined> {
+ getSuggestedRepos(): Promise<NameToProjectInfoMap | undefined> {
return Promise.resolve({});
},
getTopMenus(): Promise<TopMenuEntryInfo[] | undefined> {
diff --git a/polygerrit-ui/app/test/test-data-generators.ts b/polygerrit-ui/app/test/test-data-generators.ts
index ab3064f..38bf329 100644
--- a/polygerrit-ui/app/test/test-data-generators.ts
+++ b/polygerrit-ui/app/test/test-data-generators.ts
@@ -698,7 +698,7 @@
return {
view: GerritView.CHANGE,
changeNum: TEST_NUMERIC_CHANGE_ID,
- project: TEST_PROJECT_NAME,
+ repo: TEST_PROJECT_NAME,
};
}
@@ -718,7 +718,7 @@
changeNum: TEST_NUMERIC_CHANGE_ID,
patchNum: EDIT,
path: 'foo/bar.baz',
- project: TEST_PROJECT_NAME,
+ repo: TEST_PROJECT_NAME,
};
}
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 008a8de..93a3f2a 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -6,7 +6,7 @@
import {CommentRange} from '../api/core';
import {
ChangeStatus,
- ProjectState,
+ RepoState,
SubmitType,
InheritedBooleanInfoConfiguredValue,
PermissionAction,
@@ -769,13 +769,13 @@
can_add?: boolean;
can_add_tags?: boolean;
config_visible?: boolean;
- groups: ProjectAccessGroups;
+ groups: RepoAccessGroups;
config_web_links: WebLinkInfo[];
}
-export type ProjectAccessInfoMap = {[projectName: string]: ProjectAccessInfo};
+export type RepoAccessInfoMap = {[projectName: string]: ProjectAccessInfo};
export type LocalAccessSectionInfo = {[ref: string]: AccessSectionInfo};
-export type ProjectAccessGroups = {[uuid: string]: GroupInfo};
+export type RepoAccessGroups = {[uuid: string]: GroupInfo};
/**
* The AccessSectionInfo describes the access rights that are assigned on a ref.
@@ -858,7 +858,7 @@
reject_empty_commit?: InheritedBooleanInfoConfiguredValue;
max_object_size_limit?: MaxObjectSizeLimitInfo;
submit_type?: SubmitType;
- state?: ProjectState;
+ state?: RepoState;
plugin_config_values?: PluginNameToPluginParametersMap;
commentlinks?: ConfigInfoCommentLinks;
}
@@ -907,13 +907,13 @@
* https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#project-access-input
*/
export interface ProjectAccessInput {
- remove?: RefToProjectAccessInfoMap;
- add?: RefToProjectAccessInfoMap;
+ remove?: RefToRepoAccessInfoMap;
+ add?: RefToRepoAccessInfoMap;
message?: string;
parent?: string;
}
-export type RefToProjectAccessInfoMap = {[refName: string]: ProjectAccessInfo};
+export type RefToRepoAccessInfoMap = {[refName: string]: ProjectAccessInfo};
/**
* Represent a file in a base64 encoding
diff --git a/polygerrit-ui/app/utils/change-util.ts b/polygerrit-ui/app/utils/change-util.ts
index 9062ac7..aa54318 100644
--- a/polygerrit-ui/app/utils/change-util.ts
+++ b/polygerrit-ui/app/utils/change-util.ts
@@ -109,11 +109,11 @@
}
export function changeBaseURL(
- project: string,
+ repo: string,
changeNum: NumericChangeId,
patchNum: PatchSetNum
): string {
- let v = `${getBaseUrl()}/changes/${encodeURIComponent(project)}~${changeNum}`;
+ let v = `${getBaseUrl()}/changes/${encodeURIComponent(repo)}~${changeNum}`;
if (patchNum) {
v += `/revisions/${patchNum}`;
}
