Browse Source

Fixed startTs, endTs in deleteEntityTimeseries

pull/5026/head
Kalutka Zhenya 5 years ago
parent
commit
b8a3b8ae14
  1. 16
      ui-ngx/src/app/core/http/attribute.service.ts

16
ui-ngx/src/app/core/http/attribute.service.ts

@ -50,11 +50,17 @@ export class AttributeService {
} }
public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false, public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false,
config?: RequestConfig): Observable<any> { startTs?: number, endTs?: number, config?: RequestConfig): Observable<any> {
const keys = timeseries.map(attribute => encodeURI(attribute.key)).join(','); const keys = timeseries.map(attribute => encodeURI(attribute.key)).join(',');
return this.http.delete(`/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` + let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` +
`?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}`, `?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}`;
defaultHttpOptionsFromConfig(config)); if (startTs) {
url += `&startTs=${startTs}`;
}
if (endTs) {
url += `&endTs=${endTs}`;
}
return this.http.delete(url, defaultHttpOptionsFromConfig(config));
} }
public saveEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>, public saveEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>,
@ -97,7 +103,7 @@ export class AttributeService {
}); });
let deleteEntityTimeseriesObservable: Observable<any>; let deleteEntityTimeseriesObservable: Observable<any>;
if (deleteTimeseries.length) { if (deleteTimeseries.length) {
deleteEntityTimeseriesObservable = this.deleteEntityTimeseries(entityId, deleteTimeseries, true, config); deleteEntityTimeseriesObservable = this.deleteEntityTimeseries(entityId, deleteTimeseries, true, null, null, config);
} else { } else {
deleteEntityTimeseriesObservable = of(null); deleteEntityTimeseriesObservable = of(null);
} }

Loading…
Cancel
Save