From ae8686605f4dfe6d8a34dd877be124dbb7213021 Mon Sep 17 00:00:00 2001
From: Chantsova Ekaterina <chantsova.ekaterina@gmail.com>
Date: Mon, 9 Nov 2020 15:54:05 +0200
Subject: [PATCH] Refactoring

---
 ui-ngx/src/app/core/http/attribute.service.ts    |  7 ++-----
 .../shared/models/telemetry/telemetry.models.ts  | 16 +++++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index 1fce00290d..c9e4246d86 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -116,10 +116,7 @@ export class AttributeService {
                              limit: number = 100, agg: AggregationType = AggregationType.NONE, interval?: number,
                              orderBy: DataSortOrder = DataSortOrder.DESC, useStrictDataTypes: boolean = false,
                              config?: RequestConfig): Observable<TimeseriesData> {
-    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/values/timeseries`;
-    url += `?keys=${keys.join(',')}`;
-    url += `&startTs=${startTs}`;
-    url += `&endTs=${endTs}`;
+    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/values/timeseries?keys=${keys.join(',')}&startTs=${startTs}&endTs=${endTs}`;
     if (isDefinedAndNotNull(limit)) {
       url += `&limit=${limit}`;
     }
@@ -136,6 +133,6 @@ export class AttributeService {
       url += `&useStrictDataTypes=${useStrictDataTypes}`;
     }
 
-    return this.http.get<any>(url, defaultHttpOptionsFromConfig(config));
+    return this.http.get<TimeseriesData>(url, defaultHttpOptionsFromConfig(config));
   }
 }
diff --git a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
index 28a887fe9b..aa4fb51fd1 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -21,7 +21,14 @@ import { Observable, ReplaySubject, Subject } from 'rxjs';
 import { EntityId } from '@shared/models/id/entity-id';
 import { map } from 'rxjs/operators';
 import { NgZone } from '@angular/core';
-import { AlarmData, AlarmDataQuery, EntityData, EntityDataQuery, EntityKey } from '@shared/models/query/query.models';
+import {
+  AlarmData,
+  AlarmDataQuery,
+  EntityData,
+  EntityDataQuery,
+  EntityKey,
+  TsValue
+} from '@shared/models/query/query.models';
 import { PageData } from '@shared/models/page/page-data';
 
 export enum DataKeyType {
@@ -82,12 +89,7 @@ export interface AttributeData {
 }
 
 export interface TimeseriesData {
-  [key: string]: Array<TimeseriesKeyData>;
-}
-
-export interface TimeseriesKeyData {
-  value: any;
-  ts: number;
+  [key: string]: Array<TsValue>;
 }
 
 export enum DataSortOrder {