Minor improvements

@@ -72,7 +72,7 @@ export class AlarmService {
 
 
   public getHighestAlarmSeverity(entityId: EntityId, alarmSearchStatus: AlarmSearchStatus, alarmStatus: AlarmStatus,
   public getHighestAlarmSeverity(entityId: EntityId, alarmSearchStatus: AlarmSearchStatus, alarmStatus: AlarmStatus,
                                  config?: RequestConfig): Observable<AlarmSeverity> {
                                  config?: RequestConfig): Observable<AlarmSeverity> {
-    let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.entityType}`;
+    let url = `/api/alarm/highestSeverity/${entityId.entityType}/${entityId.id}`;
     if (alarmSearchStatus) {
     if (alarmSearchStatus) {
       url += `?searchStatus=${alarmSearchStatus}`;
       url += `?searchStatus=${alarmSearchStatus}`;
     } else if (alarmStatus) {
     } else if (alarmStatus) {

@@ -108,7 +108,7 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
   }
   }
 
 
   fetchAlarms(pageLink: TimePageLink): Observable<PageData<AlarmInfo>> {
   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);
     return this.alarmService.getAlarms(query);
   }
   }
 
 

@@ -201,17 +201,15 @@ export class AlarmQuery {
   searchStatus: AlarmSearchStatus;
   searchStatus: AlarmSearchStatus;
   status: AlarmStatus;
   status: AlarmStatus;
   fetchOriginator: boolean;
   fetchOriginator: boolean;
-  offset: string;
 
 
   constructor(entityId: EntityId, pageLink: TimePageLink,
   constructor(entityId: EntityId, pageLink: TimePageLink,
               searchStatus: AlarmSearchStatus, status: AlarmStatus,
               searchStatus: AlarmSearchStatus, status: AlarmStatus,
-              fetchOriginator: boolean, offset: string) {
+              fetchOriginator: boolean) {
     this.affectedEntityId = entityId;
     this.affectedEntityId = entityId;
     this.pageLink = pageLink;
     this.pageLink = pageLink;
     this.searchStatus = searchStatus;
     this.searchStatus = searchStatus;
     this.status = status;
     this.status = status;
     this.fetchOriginator = fetchOriginator;
     this.fetchOriginator = fetchOriginator;
-    this.offset = offset;
   }
   }
 
 
   public toQuery(): string {
   public toQuery(): string {
@@ -225,9 +223,6 @@ export class AlarmQuery {
     if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) {
     if (typeof this.fetchOriginator !== 'undefined' && this.fetchOriginator !== null) {
       query += `&fetchOriginator=${this.fetchOriginator}`;
       query += `&fetchOriginator=${this.fetchOriginator}`;
     }
     }
-    if (isString(this.offset) && this.offset.length) {
-      query += `&offset=${this.offset}`;
-    }
     return query;
     return query;
   }
   }
 
 

@@ -506,6 +506,7 @@ export interface DeviceProfile extends BaseData<DeviceProfileId> {
 export interface DeviceProfileInfo extends EntityInfoData {
 export interface DeviceProfileInfo extends EntityInfoData {
   type: DeviceProfileType;
   type: DeviceProfileType;
   transportType: DeviceTransportType;
   transportType: DeviceTransportType;
+  image?: string;
 }
 }
 
 
 export interface DefaultDeviceConfiguration {
 export interface DefaultDeviceConfiguration {