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

UI: added acknowldged and cleared properties to alarm ts model

Browse Source
This commit is contained in:
rusikv 2023-11-07 12:13:04 +02:00
parent 15703a7c01
commit 19fe327cab
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
View File

@ -319,9 +319,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
if ($event) {
$event.stopPropagation();
}
const unacknowledgedAlarms = alarms.filter(alarm => {
return alarm.status === AlarmStatus.CLEARED_UNACK || alarm.status === AlarmStatus.ACTIVE_UNACK;
})
const unacknowledgedAlarms = alarms.filter(alarm => !alarm.acknowledged);
let title = '';
let content = '';
if (!unacknowledgedAlarms.length) {
@ -356,9 +354,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
if ($event) {
$event.stopPropagation();
}
const activeAlarms = alarms.filter(alarm => {
return alarm.status === AlarmStatus.ACTIVE_ACK || alarm.status === AlarmStatus.ACTIVE_UNACK;
})
const activeAlarms = alarms.filter(alarm => !alarm.cleared);
let title = '';
let content = '';
if (!activeAlarms.length) {

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

@ -889,8 +889,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
}
if (this.alarmsDatasource.selection.hasValue()) {
const unacknowledgedAlarms = this.alarmsDatasource.selection.selected.filter(
(alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.CLEARED_UNACK ||
alarm.status === AlarmStatus.ACTIVE_UNACK)
alarm => alarm.id.id !== NULL_UUID && !alarm.acknowledged
);
let title = '';
let content = '';
@ -953,8 +952,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
}
if (this.alarmsDatasource.selection.hasValue()) {
const activeAlarms = this.alarmsDatasource.selection.selected.filter(
(alarm) => alarm.id.id !== NULL_UUID && (alarm.status === AlarmStatus.ACTIVE_ACK ||
alarm.status === AlarmStatus.ACTIVE_UNACK)
alarm => alarm.id.id !== NULL_UUID && !alarm.cleared
);
let title = '';
let content = '';

4
ui-ngx/src/app/shared/models/alarm.models.ts
View File

@ -102,6 +102,8 @@ export interface Alarm extends BaseData<AlarmId> {
originator: EntityId;
severity: AlarmSeverity;
status: AlarmStatus;
acknowledged: boolean;
cleared: boolean;
startTs: number;
endTs: number;
ackTs: number;
@ -181,6 +183,8 @@ export const simulatedAlarm: AlarmInfo = {
type: 'TEMPERATURE',
severity: AlarmSeverity.MAJOR,
status: AlarmStatus.ACTIVE_UNACK,
acknowledged: false,
cleared: false,
details: {
message: 'Temperature is high!'
},