From df8c9cecaecda12a08372a4de59ffe8e3a2a3507 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 6 May 2021 20:14:34 +0300
Subject: [PATCH] Minor improvements

---
 ui-ngx/src/app/core/http/alarm.service.ts                  | 2 +-
 .../modules/home/components/alarm/alarm-table-config.ts    | 2 +-
 ui-ngx/src/app/shared/models/alarm.models.ts               | 7 +------
 ui-ngx/src/app/shared/models/device.models.ts              | 1 +
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/src/app/core/http/alarm.service.ts b/ui-ngx/src/app/core/http/alarm.service.ts
index ab35c49b01..dc5771e31b 100644
--- a/ui-ngx/src/app/core/http/alarm.service.ts
+++ b/ui-ngx/src/app/core/http/alarm.service.ts
@@ -72,7 +72,7 @@ export class AlarmService {
 
   public getHighestAlarmSeverity(entityId: EntityId, alarmSearchStatus: AlarmSearchStatus, alarmStatus: AlarmStatus,
                                  config?: RequestConfig): Observable<AlarmSeverity> {
-    let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.entityType}`;
+    let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.id}`;
     if (alarmSearchStatus) {
       url += `?searchStatus=${alarmSearchStatus}`;
     } else if (alarmStatus) {
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
index 743b49c286..2bff69a53e 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
@@ -108,7 +108,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
   }
 
   fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> {
-    const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true, null);
+    const query = new AlarmQuery(this.entityId, pageLink, this.searchStatus, null, true);
     return this.alarmService.getAlarms(query);
   }
 
diff --git a/ui-ngx/src/app/shared/models/alarm.models.ts b/ui-ngx/src/app/shared/models/alarm.models.ts
index a76bf1b425..c79935f23d 100644
--- a/ui-ngx/src/app/shared/models/alarm.models.ts
+++ b/ui-ngx/src/app/shared/models/alarm.models.ts
@@ -201,17 +201,15 @@ export class AlarmQuery {
   searchStatus: AlarmSearchStatus;
   status: AlarmStatus;
   fetchOriginator: boolean;
-  offset: string;
 
   constructor(entityId: EntityId, pageLink: TimePageLink,
               searchStatus: AlarmSearchStatus, status: AlarmStatus,
-              fetchOriginator: boolean, offset: string) {
+              fetchOriginator: boolean) {
     this.affectedEntityId = entityId;
     this.pageLink = pageLink;
     this.searchStatus = searchStatus;
     this.status = status;
     this.fetchOriginator = fetchOriginator;
-    this.offset = offset;
   }
 
   public toQuery(): string {
@@ -225,9 +223,6 @@ export class AlarmQuery {
     if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) {
       query += `&fetchOriginator=${this.fetchOriginator}`;
     }
-    if (isString(this.offset) && this.offset.length) {
-      query += `&offset=${this.offset}`;
-    }
     return query;
   }
 
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index 81fdb7a8fd..5e5418fa4d 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -506,6 +506,7 @@ export interface DeviceProfile extends BaseData<DeviceProfileId> {
 export interface DeviceProfileInfo extends EntityInfoData {
   type: DeviceProfileType;
   transportType: DeviceTransportType;
+  image?: string;
 }
 
 export interface DefaultDeviceConfiguration {