dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop/3.4' into feature/entities-version-control

Browse Source
This commit is contained in:
Andrii Shvaika 2022-06-13 16:28:01 +03:00
commit 43cc99b9aa
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
View File

@ -290,9 +290,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
debounceTime(150), debounceTime(150),
distinctUntilChanged(), distinctUntilChanged(),
tap(() => { tap(() => {
if (this.displayPagination) { this.resetPageIndex();
this.paginator.pageIndex = 0;
}
this.updateData(); this.updateData();
}) })
) )
@ -556,6 +554,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
this.ctx.detectChanges(); this.ctx.detectChanges();
} }
private resetPageIndex(): void {
if (this.displayPagination) {
this.paginator.pageIndex = 0;
}
}
private editAlarmFilter($event: Event) { private editAlarmFilter($event: Event) {
if ($event) { if ($event) {
$event.stopPropagation(); $event.stopPropagation();
@ -600,6 +604,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
this.pageLink.statusList = result.statusList; this.pageLink.statusList = result.statusList;
this.pageLink.severityList = result.severityList; this.pageLink.severityList = result.severityList;
this.pageLink.typeList = result.typeList; this.pageLink.typeList = result.typeList;
this.resetPageIndex();
this.updateData(); this.updateData();
} }
}); });
@ -620,9 +625,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
exitFilterMode() { exitFilterMode() {
this.textSearchMode = false; this.textSearchMode = false;
this.pageLink.textSearch = null; this.pageLink.textSearch = null;
if (this.displayPagination) { this.resetPageIndex();
this.paginator.pageIndex = 0;
}
this.updateData(); this.updateData();
this.ctx.hideTitlePanel = false; this.ctx.hideTitlePanel = false;
this.ctx.detectChanges(true); this.ctx.detectChanges(true);
@ -959,7 +962,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
} else if (alarmField.value === alarmFields.severity.value) { } else if (alarmField.value === alarmFields.severity.value) {
return this.translate.instant(alarmSeverityTranslations.get(value)); return this.translate.instant(alarmSeverityTranslations.get(value));
} else if (alarmField.value === alarmFields.status.value) { } else if (alarmField.value === alarmFields.status.value) {
return this.translate.instant(alarmStatusTranslations.get(value)); return alarmStatusTranslations.get(value) ? this.translate.instant(alarmStatusTranslations.get(value)) : value;
} else if (alarmField.value === alarmFields.originatorType.value) { } else if (alarmField.value === alarmFields.originatorType.value) {
return this.translate.instant(entityTypeTranslations.get(value).type); return this.translate.instant(entityTypeTranslations.get(value).type);
} else { } else {