summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Bekhet <mark.bekhet@ericsson.com>2021-03-16 08:27:33 -0400
committerMark Bekhet <mark.bekhet@ericsson.com>2021-03-16 08:27:33 -0400
commite897cd9b251695c42adfa7e4ee5dbe5daef77d9a (patch)
tree50c6be4f3823f9077a816bf843ad963ba46129e3
parentc9d204be0bec69d14b7828ff8573be5ee4f004ef (diff)
parent4050ed9f4c7b646b813f0b137869aee8c69a6f51 (diff)
Merge branch 'stable-3.2' into stable-3.3
* stable-3.2: Apply a second filter after receiving the initial repo list Change-Id: I5b082a816abc62b8a65dbd54b3dd36ecc5e59a69
-rw-r--r--polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list.ts2
-rw-r--r--polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js1
2 files changed, 2 insertions, 1 deletions
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 ba2d850a5e..854d1f014d 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
@@ -151,7 +151,7 @@ export class GrRepoList extends ListViewMixin(
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.js b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js
index e2a29f2aee..78b9606356 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js
@@ -26,6 +26,7 @@ let counter;
const repoGenerator = () => {
return {
id: `test${++counter}`,
+ name: `test`,
state: 'ACTIVE',
web_links: [
{