Changes due to commits

application/src/main/java/org/thingsboard/server/controller/AlarmController.java

@@ -206,11 +206,7 @@ public class AlarmController extends BaseController {
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
         UserId assigneeId = new UserId(UUID.fromString(strAssigneeId));
-        User user = userService.findUserById(getCurrentUser().getTenantId(), assigneeId);
-        checkNotNull(user, "User with id [" + strAssigneeId + "] is not found");
-        if (!getTenantId().equals(user.getTenantId())) {
-            throw new ThingsboardException("User with id [" + strAssigneeId + "] is not found", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-        }
+        checkUserId(assigneeId, Operation.READ);
         return tbAlarmService.assign(alarm, getCurrentUser(), assigneeId);
     }
 

application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java

@@ -211,7 +211,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
     }
 
     private void sendWsMsg(String sessionId, AlarmSubscriptionUpdate subscriptionUpdate) {
-        AlarmInfo alarmInfo = subscriptionUpdate.getAlarmInfo();
+        AlarmInfo alarmInfo = subscriptionUpdate.getAlarm();
         AlarmId alarmId = alarmInfo.getId();
         if (subscriptionUpdate.isAlarmDeleted()) {
             Alarm deleted = alarmsMap.remove(alarmId);

application/src/main/java/org/thingsboard/server/service/telemetry/sub/AlarmSubscriptionUpdate.java

@@ -37,18 +37,18 @@ public class AlarmSubscriptionUpdate {
     @Getter
     private String errorMsg;
     @Getter
-    private AlarmInfo alarmInfo;
+    private AlarmInfo alarm;
     @Getter
     private boolean alarmDeleted;
 
-    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarmInfo) {
-        this(subscriptionId, alarmInfo, false);
+    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarm) {
+        this(subscriptionId, alarm, false);
     }
 
-    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarmInfo, boolean alarmDeleted) {
+    public AlarmSubscriptionUpdate(int subscriptionId, AlarmInfo alarm, boolean alarmDeleted) {
         super();
         this.subscriptionId = subscriptionId;
-        this.alarmInfo = alarmInfo;
+        this.alarm = alarm;
         this.alarmDeleted = alarmDeleted;
     }
 
@@ -66,6 +66,7 @@ public class AlarmSubscriptionUpdate {
     @Override
     public String toString() {
         return "AlarmUpdate [subscriptionId=" + subscriptionId + ", errorCode=" + errorCode + ", errorMsg=" + errorMsg +
-                ", alarmInfo=" + alarmInfo + "]";
+                ", alarm=" + alarm + "]";
     }
 }
+// TODO imbeacon Alarm instead of alarm info

ui-ngx/src/app/shared/models/alarm.models.ts

@@ -106,6 +106,7 @@ export interface Alarm extends BaseData<AlarmId> {
 
 export interface AlarmInfo extends Alarm {
   originatorName: string;
+  originatorLabel: string;
   assigneeFirstName: string;
   assigneeLastName: string;
   assigneeEmail: string;
@@ -129,6 +130,7 @@ export const simulatedAlarm: AlarmInfo = {
   clearTs: 0,
   assignTs: 0,
   originatorName: 'Simulated',
+  originatorLabel: 'Simulated',
   assigneeFirstName: "",
   assigneeLastName: "",
   assigneeEmail: "test@example.com",
@@ -194,6 +196,11 @@ export const alarmFields: {[fieldName: string]: AlarmField} = {
     value: 'originatorName',
     name: 'alarm.originator'
   },
+  originatorLabel: {
+    keyName: 'originatorLabel',
+    value: 'originatorLabel',
+    name: 'alarm.originator-label'
+  },
   originatorType: {
     keyName: 'originatorType',
     value: 'originator.entityType',

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -433,6 +433,7 @@
         "type": "Type",
         "severity": "Severity",
         "originator": "Originator",
+        "originator-label": "Originator label",
         "originator-type": "Originator type",
         "assignee-id": "Assignee id",
         "assignee-first-name": "Assignee first name",