This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new e905f36de2 [bugfix] Fix the search functionality issue. (#2970)
e905f36de2 is described below
commit e905f36de2004f871a5ae71abdfd6771689e44d1
Author: yunfan24 <[email protected]>
AuthorDate: Fri Jan 10 19:36:22 2025 +0800
[bugfix] Fix the search functionality issue. (#2970)
Co-authored-by: aias00 <[email protected]>
---
.../app/routes/alert/alert-group/alert-group-converge.component.html | 2 +-
.../app/routes/alert/alert-group/alert-group-converge.component.ts | 4 ++++
.../src/app/routes/alert/alert-inhibit/alert-inhibit.component.html | 2 +-
web-app/src/app/routes/alert/alert-inhibit/alert-inhibit.component.ts | 4 ++++
.../src/app/routes/alert/alert-setting/alert-setting.component.html | 2 +-
web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts | 4 ++++
.../src/app/routes/alert/alert-silence/alert-silence.component.html | 2 +-
web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts | 4 ++++
web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts | 1 +
9 files changed, 21 insertions(+), 4 deletions(-)
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 32c8243839..2580fa2834 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()"
/>
</ng-template>
</app-toolbar>
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 dd1b287405..8d67bdbe05 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 2bde53f214..540c7391bb 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()"
/>
</ng-template>
</app-toolbar>
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 b4516f3ea4..5e5ecfa0f5 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 d07b75ce2f..473b64f876 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()"
/>
</ng-template>
</app-toolbar>
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 ceb0c75e95..8f04c5c464 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 68ccef7a75..d83ffa90e5 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()"
/>
</ng-template>
</app-toolbar>
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 31900fef7c..4c3b1bcbc6 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 2ba5a76eba..7d921d6603 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(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
