Merge "Merge branch 'stable-3.2' into stable-3.3" into stable-3.3
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 3c155f85..c52a04c 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
@@ -41,6 +41,7 @@
CapabilityInfoMap,
GitRef,
LabelNameToLabelTypeInfoMap,
+ RepoName,
} from '../../../types/common';
import {PolymerDomRepeatEvent} from '../../../types/types';
@@ -78,6 +79,9 @@
return htmlTemplate;
}
+ @property({type: String})
+ repo?: RepoName;
+
@property({type: Object})
capabilities?: CapabilityInfoMap;
diff --git a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_html.ts b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_html.ts
index 7c9f28b..4f5a06e 100644
--- a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_html.ts
+++ b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_html.ts
@@ -120,6 +120,7 @@
section="[[section.id]]"
editing="[[editing]]"
groups="[[groups]]"
+ repo="[[repo]]"
on-added-permission-removed="_handleAddedPermissionRemoved"
>
</gr-permission>
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 c998cd8..9caebde 100644
--- a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts
+++ b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts
@@ -43,6 +43,7 @@
ProjectAccessGroups,
GroupId,
GitRef,
+ RepoName,
} from '../../../types/common';
import {
AutocompleteQuery,
@@ -103,6 +104,9 @@
return htmlTemplate;
}
+ @property({type: String})
+ repo?: RepoName;
+
@property({type: Object})
labels?: LabelNameToLabelTypeInfoMap;
@@ -338,7 +342,11 @@
_getGroupSuggestions(): Promise<AutocompleteSuggestion[]> {
return this.$.restAPI
- .getSuggestedGroups(this._groupFilter || '', MAX_AUTOCOMPLETE_RESULTS)
+ .getSuggestedGroups(
+ this._groupFilter || '',
+ this.repo,
+ MAX_AUTOCOMPLETE_RESULTS
+ )
.then(response => {
const groups: GroupSuggestion[] = [];
for (const key in response) {
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_html.ts b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_html.ts
index 4e76360..2c21329 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_html.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_html.ts
@@ -112,6 +112,7 @@
editing="[[_editing]]"
owner-of="[[_ownerOf]]"
groups="[[_groups]]"
+ repo="[[repo]]"
on-added-section-removed="_handleAddedSectionRemoved"
></gr-access-section>
</template>
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 a818c59..6b20c28 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
@@ -126,7 +126,7 @@
return Promise.resolve([]);
}
return this.$.restAPI
- .getSuggestedGroups(expression, MAX_AUTOCOMPLETE_RESULTS)
+ .getSuggestedGroups(expression, undefined, MAX_AUTOCOMPLETE_RESULTS)
.then(groups => {
if (!groups) {
return [];
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
index 7dc794d..2c5fff6 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts
@@ -240,6 +240,7 @@
[paramName: string]: string | undefined | null | number;
s: string;
n?: number;
+ p?: string;
}
interface QuerySuggestedReviewersParams {
@@ -1897,6 +1898,7 @@
getSuggestedGroups(
inputVal: string,
+ project?: RepoName,
n?: number,
errFn?: ErrorCallback
): Promise<GroupNameToGroupInfoMap | undefined> {
@@ -1904,6 +1906,9 @@
if (n) {
params.n = n;
}
+ if (project) {
+ params.p = encodeURIComponent(project);
+ }
return this._restApiHelper.fetchJSON({
url: '/groups/',
errFn,
diff --git a/polygerrit-ui/app/services/services/gr-rest-api/gr-rest-api.ts b/polygerrit-ui/app/services/services/gr-rest-api/gr-rest-api.ts
index d3af224..6d65d4e 100644
--- a/polygerrit-ui/app/services/services/gr-rest-api/gr-rest-api.ts
+++ b/polygerrit-ui/app/services/services/gr-rest-api/gr-rest-api.ts
@@ -197,6 +197,7 @@
): Promise<AccountInfo[] | undefined>;
getSuggestedGroups(
input: string,
+ project?: RepoName,
n?: number,
errFn?: ErrorCallback
): Promise<GroupNameToGroupInfoMap | undefined>;
