Commit 27775ca39e210c08ca47b8c3158215fd13c5e4b3
Committed by
Andrew Shvayka
1 parent
25a6927b
Fix delete timeseries data
Showing
1 changed file
with
7 additions
and
4 deletions
@@ -277,7 +277,7 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | @@ -277,7 +277,7 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | ||
277 | } | 277 | } |
278 | var deleteEntityTimeseriesPromise; | 278 | var deleteEntityTimeseriesPromise; |
279 | if (deleteTimeseries.length) { | 279 | if (deleteTimeseries.length) { |
280 | - deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config); | 280 | + deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config, true); |
281 | } | 281 | } |
282 | if (Object.keys(timeseriesData).length) { | 282 | if (Object.keys(timeseriesData).length) { |
283 | var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/' + timeseriesScope; | 283 | var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/' + timeseriesScope; |
@@ -331,8 +331,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | @@ -331,8 +331,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | ||
331 | return deferred.promise; | 331 | return deferred.promise; |
332 | } | 332 | } |
333 | 333 | ||
334 | - function deleteEntityTimeseries(entityType, entityId, timeseries, config) { | 334 | + function deleteEntityTimeseries(entityType, entityId, timeseries, config, deleteAllDataForKeys) { |
335 | config = config || {}; | 335 | config = config || {}; |
336 | + deleteAllDataForKeys = deleteAllDataForKeys || false; | ||
336 | var deferred = $q.defer(); | 337 | var deferred = $q.defer(); |
337 | var keys = ''; | 338 | var keys = ''; |
338 | for (var i = 0; i < timeseries.length; i++) { | 339 | for (var i = 0; i < timeseries.length; i++) { |
@@ -341,7 +342,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | @@ -341,7 +342,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | ||
341 | } | 342 | } |
342 | keys += timeseries[i].key; | 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 | $http.delete(url, config).then(function success() { | 348 | $http.delete(url, config).then(function success() { |
346 | deferred.resolve(); | 349 | deferred.resolve(); |
347 | }, function fail() { | 350 | }, function fail() { |
@@ -350,4 +353,4 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | @@ -350,4 +353,4 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService) | ||
350 | return deferred.promise; | 353 | return deferred.promise; |
351 | } | 354 | } |
352 | 355 | ||
353 | -} | ||
356 | +} |