Commit 27775ca39e210c08ca47b8c3158215fd13c5e4b3

Authored by Vladyslav_Prykhodko
Committed by Andrew Shvayka
1 parent 25a6927b

Fix delete timeseries data

... ... @@ -277,7 +277,7 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
277 277 }
278 278 var deleteEntityTimeseriesPromise;
279 279 if (deleteTimeseries.length) {
280   - deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config);
  280 + deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config, true);
281 281 }
282 282 if (Object.keys(timeseriesData).length) {
283 283 var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/' + timeseriesScope;
... ... @@ -331,8 +331,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
331 331 return deferred.promise;
332 332 }
333 333
334   - function deleteEntityTimeseries(entityType, entityId, timeseries, config) {
  334 + function deleteEntityTimeseries(entityType, entityId, timeseries, config, deleteAllDataForKeys) {
335 335 config = config || {};
  336 + deleteAllDataForKeys = deleteAllDataForKeys || false;
336 337 var deferred = $q.defer();
337 338 var keys = '';
338 339 for (var i = 0; i < timeseries.length; i++) {
... ... @@ -341,7 +342,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
341 342 }
342 343 keys += timeseries[i].key;
343 344 }
344   - var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/delete' + '?keys=' + keys;
  345 + var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/delete' +
  346 + '?keys=' + keys
  347 + + '&deleteAllDataForKeys=' + deleteAllDataForKeys;
345 348 $http.delete(url, config).then(function success() {
346 349 deferred.resolve();
347 350 }, function fail() {
... ... @@ -350,4 +353,4 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
350 353 return deferred.promise;
351 354 }
352 355
353   -}
\ No newline at end of file
  356 +}
... ...