dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix delete timeseries data

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2019-11-11 18:22:22 +02:00 committed by Andrew Shvayka
parent 25a6927b6e
commit 27775ca39e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/app/api/attribute.service.js
View File

@ -277,7 +277,7 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
} }
var deleteEntityTimeseriesPromise; var deleteEntityTimeseriesPromise;
if (deleteTimeseries.length) { if (deleteTimeseries.length) {
deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config); deleteEntityTimeseriesPromise = deleteEntityTimeseries(entityType, entityId, deleteTimeseries, config, true);
} }
if (Object.keys(timeseriesData).length) { if (Object.keys(timeseriesData).length) {
var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/' + timeseriesScope; var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/' + timeseriesScope;
@ -331,8 +331,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
return deferred.promise; return deferred.promise;
} }
function deleteEntityTimeseries(entityType, entityId, timeseries, config) { function deleteEntityTimeseries(entityType, entityId, timeseries, config, deleteAllDataForKeys) {
config = config || {}; config = config || {};
deleteAllDataForKeys = deleteAllDataForKeys || false;
var deferred = $q.defer(); var deferred = $q.defer();
var keys = ''; var keys = '';
for (var i = 0; i < timeseries.length; i++) { for (var i = 0; i < timeseries.length; i++) {
@ -341,7 +342,9 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
} }
keys += timeseries[i].key; keys += timeseries[i].key;
} }
var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/delete' + '?keys=' + keys; var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/timeseries/delete' +
'?keys=' + keys
+ '&deleteAllDataForKeys=' + deleteAllDataForKeys;
$http.delete(url, config).then(function success() { $http.delete(url, config).then(function success() {
deferred.resolve(); deferred.resolve();
}, function fail() { }, function fail() {
@ -350,4 +353,4 @@ function AttributeService($http, $q, $filter, types, telemetryWebsocketService)
return deferred.promise; return deferred.promise;
} }
} }