summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Bekhet <mark.bekhet@ericsson.com>2021-03-15 16:02:21 -0400
committerMark Bekhet <mark.bekhet@ericsson.com>2021-03-15 16:02:21 -0400
commit4050ed9f4c7b646b813f0b137869aee8c69a6f51 (patch)
tree33095899a6b810058297c96e7880af3a04693dcd
parent35b01a608cccebc5a407f8f21803a9a5d797b12c (diff)
parent19d1f3d45d6816d6540b6bcbde97bfb2f6b24b75 (diff)
Merge branch 'stable-3.1' into stable-3.2
* stable-3.1: Apply a second filter after receiving the initial repo list Change-Id: I089efbe31c722e1753dad4942070adcab1cfbf05
-rw-r--r--polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js2
-rw-r--r--polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
index 59abb720af..1f33b250a6 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.js
@@ -152,7 +152,7 @@ class GrRepoList extends mixinBehaviors( [
.then(repos => {
// Late response.
if (filter !== this._filter || !repos) { return; }
- this._repos = repos;
+ this._repos = repos.filter(repo => repo.name.includes(filter));
this._loading = false;
});
}
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
index 96cb9fff30..e848980e84 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.html
@@ -41,6 +41,7 @@ let counter;
const repoGenerator = () => {
return {
id: `test${++counter}`,
+ name: `test`,
state: 'ACTIVE',
web_links: [
{