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

Merge pull request #8269 from ChantsovaEkaterina/improvement/originator-label-in-alarm-widget-actions

Browse Source 
Add originator label in alarm widget actions
This commit is contained in:
Igor Kulikov 2023-03-28 19:55:37 +03:00 committed by GitHub
commit 97b16ea6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/core/api/widget-subscription.ts
View File

@ -582,12 +582,9 @@ export class WidgetSubscription implements IWidgetSubscription {
const data = this.alarms.data[0]; const data = this.alarms.data[0];
entityId = data.originator; entityId = data.originator;
entityName = data.originatorName; entityName = data.originatorName;
entityLabel = data.originatorLabel;
if (data.latest && data.latest[EntityKeyType.ENTITY_FIELD]) { if (data.latest && data.latest[EntityKeyType.ENTITY_FIELD]) {
const entityFields = data.latest[EntityKeyType.ENTITY_FIELD]; const entityFields = data.latest[EntityKeyType.ENTITY_FIELD];
const labelValue = entityFields.label;
if (labelValue) {
entityLabel = labelValue.value;
}
const additionalInfoValue = entityFields.additionalInfo; const additionalInfoValue = entityFields.additionalInfo;
if (additionalInfoValue) { if (additionalInfoValue) {
const additionalInfo = additionalInfoValue.value; const additionalInfo = additionalInfoValue.value;

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

@ -804,11 +804,13 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
if (descriptors.length) { if (descriptors.length) {
let entityId; let entityId;
let entityName; let entityName;
let entityLabel;
if (alarm && alarm.originator) { if (alarm && alarm.originator) {
entityId = alarm.originator; entityId = alarm.originator;
entityName = alarm.originatorName; entityName = alarm.originatorName;
entityLabel = alarm.originatorLabel;
} }
this.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, {alarm}); this.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, {alarm}, entityLabel);
} }
} }
@ -827,11 +829,13 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
} }
let entityId; let entityId;
let entityName; let entityName;
let entityLabel;
if (alarm && alarm.originator) { if (alarm && alarm.originator) {
entityId = alarm.originator; entityId = alarm.originator;
entityName = alarm.originatorName; entityName = alarm.originatorName;
entityLabel = alarm.originatorLabel;
} }
this.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, {alarm}); this.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, {alarm}, entityLabel);
} }
} }