From f6cf3c7f5c6a658e428af338d9f0138d6517efd7 Mon Sep 17 00:00:00 2001 From: yunfan24 Date: Wed, 8 Jan 2025 22:59:19 +0800 Subject: [PATCH 1/5] [bugfix] Fix filter change in monitor center not resetting page to 1. --- .../app/routes/monitor/monitor-list/monitor-list.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts index 2ba5a76ebab..7d921d6603e 100644 --- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts +++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts @@ -130,6 +130,7 @@ export class MonitorListComponent implements OnInit, OnDestroy { onFilterSearchMonitors() { this.tableLoading = true; + this.pageIndex = 1; let filter$ = this.monitorSvc .searchMonitors(this.app, this.labels, this.filterContent, this.filterStatus, this.pageIndex - 1, this.pageSize) .subscribe( From 95c989d1ce6cac7b84c7b5d92d643057ca808a1c Mon Sep 17 00:00:00 2001 From: yunfan24 Date: Wed, 8 Jan 2025 23:10:27 +0800 Subject: [PATCH 2/5] [bugfix] Fix filter change in alert-setting not resetting page to 1. --- .../routes/alert/alert-setting/alert-setting.component.html | 2 +- .../app/routes/alert/alert-setting/alert-setting.component.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html index d07b75ce2fd..473b64f8766 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html @@ -69,7 +69,7 @@ groupStyle="width: 250px;" [placeholder]="'alert.setting.search' | i18n" [(value)]="search" - (keydown.enter)="loadAlertDefineTable()" + (keydown.enter)="onFilterChange()" /> diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts index ceb0c75e953..8f04c5c4643 100644 --- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts +++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts @@ -1170,4 +1170,8 @@ export class AlertSettingComponent implements OnInit { }); this.isConnectModalVisible = true; } + onFilterChange(): void { + this.pageIndex = 1; + this.loadAlertDefineTable(); + } } From 9a57691c9fda971cc34973468074a4cdf3789e65 Mon Sep 17 00:00:00 2001 From: yunfan24 Date: Wed, 8 Jan 2025 23:13:02 +0800 Subject: [PATCH 3/5] [bugfix] Fix filter change in alert-group not resetting page to 1. --- .../alert/alert-group/alert-group-converge.component.html | 2 +- .../alert/alert-group/alert-group-converge.component.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html b/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html index 32c82438398..2580fa2834a 100644 --- a/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html +++ b/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.html @@ -54,7 +54,7 @@ groupStyle="width: 250px;" [placeholder]="'alert.group-converge.name' | i18n" [(value)]="search" - (valueChange)="loadGroupConvergeTable()" + (valueChange)="onFilterChange()" /> diff --git a/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.ts b/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.ts index dd1b2874057..8d67bdbe057 100644 --- a/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.ts +++ b/web-app/src/app/routes/alert/alert-group/alert-group-converge.component.ts @@ -307,4 +307,8 @@ export class AlertGroupConvergeComponent implements OnInit { ); } } + onFilterChange(): void { + this.pageIndex = 1; + this.loadGroupConvergeTable(); + } } From 56bc9cc6a4e16f13aa14791b06c527f9d46a0341 Mon Sep 17 00:00:00 2001 From: yunfan24 Date: Wed, 8 Jan 2025 23:41:00 +0800 Subject: [PATCH 4/5] [bugfix] Fix filter change in alert-silence not resetting page to 1. --- .../routes/alert/alert-silence/alert-silence.component.html | 2 +- .../app/routes/alert/alert-silence/alert-silence.component.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html index 68ccef7a75f..d83ffa90e54 100755 --- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html +++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html @@ -54,7 +54,7 @@ groupStyle="width: 250px;" [placeholder]="'alert.silence.name' | i18n" [(value)]="search" - (valueChange)="loadAlertSilenceTable()" + (valueChange)="onFilterChange()" /> diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts index 31900fef7c9..4c3b1bcbc69 100644 --- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts +++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts @@ -341,4 +341,8 @@ export class AlertSilenceComponent implements OnInit { ); } } + onFilterChange(): void { + this.pageIndex = 1; + this.loadAlertSilenceTable(); + } } From c6c22b786741139cf5c4d9d31f81c7ff8345003a Mon Sep 17 00:00:00 2001 From: yunfan24 Date: Wed, 8 Jan 2025 23:41:14 +0800 Subject: [PATCH 5/5] [bugfix] Fix filter change in alert-inhibt not resetting page to 1. --- .../routes/alert/alert-inhibit/alert-inhibit.component.html | 2 +- .../app/routes/alert/alert-inhibit/alert-inhibit.component.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html b/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html index 2bde53f214b..540c7391bb9 100644 --- a/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html +++ b/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.html @@ -54,7 +54,7 @@ groupStyle="width: 250px;" [placeholder]="'alert.inhibit.name' | i18n" [(value)]="search" - (valueChange)="loadInhibitTable()" + (valueChange)="onFilterChange()" /> diff --git a/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts b/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts index b4516f3ea40..5e5ecfa0f5f 100644 --- a/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts +++ b/web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts @@ -302,4 +302,8 @@ export class AlertInhibitComponent implements OnInit { ); } } + onFilterChange(): void { + this.pageIndex = 1; + this.loadInhibitTable(); + } }