Merge pull request #14924 from thingsboard/lts-4.3

LTS to RC

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

@@ -27,7 +27,8 @@ import { AlarmCommentId } from '@shared/models/id/alarm-comment-id';
 import { UserId } from '@shared/models/id/user-id';
 import { AlarmFilter } from '@shared/models/query/query.models';
 import { HasTenantId } from '@shared/models/entity.models';
-import { isNotEmptyStr } from '@core/utils';
+import { isDefinedAndNotNull, isNotEmptyStr } from '@core/utils';
+import { defaults } from 'lodash';
 
 export enum AlarmsMode {
   ALL,
@@ -391,18 +392,20 @@ export class AlarmQueryV2 {
 
 export const getUserDisplayName = (alarmAssignee: AlarmAssignee |  AlarmCommentInfo) => {
   let displayName = '';
-  if (isNotEmptyStr(alarmAssignee.firstName) || isNotEmptyStr(alarmAssignee.lastName)) {
+  if (isDefinedAndNotNull(alarmAssignee)) {
-    if (alarmAssignee.firstName) {
+   if (isNotEmptyStr(alarmAssignee.firstName) || isNotEmptyStr(alarmAssignee.lastName)) {
-      displayName += alarmAssignee.firstName;
+      if (alarmAssignee.firstName) {
-    }
+       displayName += alarmAssignee.firstName;
-    if (alarmAssignee.lastName) {
+      }
-      if (displayName.length > 0) {
+      if (alarmAssignee.lastName) {
-        displayName += ' ';
+        if (displayName.length > 0) {
+          displayName += ' ';
+        }
+        displayName += alarmAssignee.lastName;
       }
-      displayName += alarmAssignee.lastName;
+    }   else {
+      displayName = alarmAssignee.email;
     }
-  } else {
-    displayName = alarmAssignee.email;
   }
   return displayName;
 };