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(); + } } 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(); + } } 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(); + } } 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(); + } } 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(