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 4733ac2eb [bugfix] fix monitor search sync error (#2546)
4733ac2eb is described below
commit 4733ac2eba905b62247f73f86d5f7c972b9e2590
Author: aias00 <[email protected]>
AuthorDate: Sat Aug 17 17:38:21 2024 +0800
[bugfix] fix monitor search sync error (#2546)
Co-authored-by: YuLuo <[email protected]>
---
.../monitor/monitor-list/monitor-list.component.ts | 42 +++++++++++-----------
1 file changed, 22 insertions(+), 20 deletions(-)
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 ad3b36a26..6169fe880 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
@@ -179,26 +179,28 @@ export class MonitorListComponent implements OnInit,
OnDestroy {
loadMonitorTable(sortField?: string | null, sortOrder?: string | null) {
this.tableLoading = true;
- let monitorInit$ = this.monitorSvc.getMonitors(this.app, this.tag,
this.pageIndex - 1, this.pageSize, sortField, sortOrder).subscribe(
- message => {
- this.tableLoading = false;
- this.checkedAll = false;
- this.checkedMonitorIds.clear();
- if (message.code === 0) {
- let page = message.data;
- this.monitors = page.content;
- this.pageIndex = page.number + 1;
- this.total = page.totalElements;
- } else {
- console.warn(message.msg);
+ let monitorInit$ = this.monitorSvc
+ .searchMonitors(this.app, this.tag, this.filterContent,
this.filterStatus, this.pageIndex - 1, this.pageSize, sortField, sortOrder)
+ .subscribe(
+ message => {
+ this.tableLoading = false;
+ this.checkedAll = false;
+ this.checkedMonitorIds.clear();
+ if (message.code === 0) {
+ let page = message.data;
+ this.monitors = page.content;
+ this.pageIndex = page.number + 1;
+ this.total = page.totalElements;
+ } else {
+ console.warn(message.msg);
+ }
+ monitorInit$.unsubscribe();
+ },
+ error => {
+ this.tableLoading = false;
+ monitorInit$.unsubscribe();
}
- monitorInit$.unsubscribe();
- },
- error => {
- this.tableLoading = false;
- monitorInit$.unsubscribe();
- }
- );
+ );
}
changeMonitorTable(sortField?: string | null, sortOrder?: string | null) {
this.tableLoading = true;
@@ -504,7 +506,7 @@ export class MonitorListComponent implements OnInit,
OnDestroy {
const currentSort = sort.find(item => item.value !== null);
const sortField = (currentSort && currentSort.key) || null;
const sortOrder = (currentSort && currentSort.value) || null;
- this.changeMonitorTable(sortField, sortOrder);
+ // this.changeMonitorTable(sortField, sortOrder);
}
// begin: app type search filter
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
