From 4b7cc4571dbe91d27cb0428d09b90603ae70410c Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 12 Jul 2023 19:48:25 +0200
Subject: [PATCH 01/11] added deleteLatest api

---
 .../controller/TelemetryController.java       |  74 ++++++++--
 .../DefaultTelemetrySubscriptionService.java  |   7 +
 .../server/controller/AbstractWebTest.java    |  13 ++
 .../controller/TelemetryControllerTest.java   | 137 ++++++++++++++++++
 .../common/data/kv/BaseDeleteTsKvQuery.java   |  10 +-
 .../common/data/kv/DeleteTsKvQuery.java       |   2 +
 .../dao/timeseries/BaseTimeseriesService.java |   4 +-
 .../thingsboard/rest/client/RestClient.java   |  22 ++-
 .../api/RuleEngineTelemetryService.java       |   2 +
 9 files changed, 257 insertions(+), 14 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 05f56e93bd..8d94fb22cf 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -201,7 +201,7 @@ public class TelemetryController extends BaseController {
             @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
             @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-                    (result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
+                (result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
     }
 
     @ApiOperation(value = "Get attributes (getAttributes)",
@@ -219,9 +219,9 @@ public class TelemetryController extends BaseController {
             @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
             @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
             @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
-            SecurityUser user = getCurrentUser();
+        SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-                    (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
+                (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
     }
 
 
@@ -245,7 +245,7 @@ public class TelemetryController extends BaseController {
             @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-                    (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
+                (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
     }
 
     @ApiOperation(value = "Get time-series keys (getTimeseriesKeys)",
@@ -259,7 +259,7 @@ public class TelemetryController extends BaseController {
             @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
             @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
-                    (result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
+                (result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
     }
 
     @ApiOperation(value = "Get latest time-series value (getLatestTimeseries)",
@@ -487,13 +487,15 @@ public class TelemetryController extends BaseController {
             @ApiParam(value = "A long value representing the end timestamp of removal time range in milliseconds.")
             @RequestParam(name = "endTs", required = false) Long endTs,
             @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
-            @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted) throws ThingsboardException {
+            @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted,
+            @ApiParam(value = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
+            @RequestParam(name = "deleteLatest", required = false, defaultValue = "true") boolean deleteLatest) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-        return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted);
+        return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
     }
 
     private DeferredResult<ResponseEntity> deleteTimeseries(EntityId entityIdStr, String keysStr, boolean deleteAllDataForKeys,
-                                                            Long startTs, Long endTs, boolean rewriteLatestIfDeleted) throws ThingsboardException {
+                                                            Long startTs, Long endTs, boolean rewriteLatestIfDeleted, boolean deleteLatest) throws ThingsboardException {
         List<String> keys = toKeysList(keysStr);
         if (keys.isEmpty()) {
             return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
@@ -517,7 +519,7 @@ public class TelemetryController extends BaseController {
         return accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entityIdStr, (result, tenantId, entityId) -> {
             List<DeleteTsKvQuery> deleteTsKvQueries = new ArrayList<>();
             for (String key : keys) {
-                deleteTsKvQueries.add(new BaseDeleteTsKvQuery(key, deleteFromTs, deleteToTs, rewriteLatestIfDeleted));
+                deleteTsKvQueries.add(new BaseDeleteTsKvQuery(key, deleteFromTs, deleteToTs, rewriteLatestIfDeleted, deleteLatest));
             }
             tsSubService.deleteTimeseriesAndNotify(tenantId, entityId, keys, deleteTsKvQueries, new FutureCallback<>() {
                 @Override
@@ -535,6 +537,55 @@ public class TelemetryController extends BaseController {
         });
     }
 
+    @ApiOperation(value = "Delete entity latest time-series data (deleteEntityLatestTimeseries)",
+            notes = "Delete latest time-series for selected entity based on entity id, entity type and keys. " +
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Timeseries for the selected keys in the request was removed. " +
+                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED'."),
+            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys list is empty."),
+            @ApiResponse(code = 401, message = "User is not authorized to delete entity latest timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED' that includes an error stacktrace."),
+    })
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/{entityType}/{entityId}/timeseries/latest/delete", method = RequestMethod.DELETE)
+    @ResponseBody
+    public DeferredResult<ResponseEntity> deleteEntityLatestTimeseries(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+                                                                       @PathVariable("entityType") String entityType,
+                                                                       @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+                                                                       @PathVariable("entityId") String entityIdStr,
+                                                                       @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true)
+                                                                       @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return deleteLatestTimeseries(entityId, keysStr);
+    }
+
+    private DeferredResult<ResponseEntity> deleteLatestTimeseries(EntityId entityIdStr, String keysStr) throws ThingsboardException {
+        List<String> keys = toKeysList(keysStr);
+        if (keys.isEmpty()) {
+            return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
+        }
+        SecurityUser user = getCurrentUser();
+
+        return accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entityIdStr, (result, tenantId, entityId) ->
+                tsSubService.deleteLatestAndNotify(tenantId, entityId, keys, new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        logLatestTimeseriesDeleted(user, entityId, keys, null);
+                        result.setResult(new ResponseEntity<>(HttpStatus.OK));
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                        logLatestTimeseriesDeleted(user, entityId, keys, t);
+                        result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                    }
+                })
+        );
+    }
+
     @ApiOperation(value = "Delete device attributes (deleteDeviceAttributes)",
             notes = "Delete device attributes using provided Device Id, scope and a list of keys. " +
                     "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
@@ -827,6 +878,11 @@ public class TelemetryController extends BaseController {
                 toException(e), keys, startTs, endTs);
     }
 
+    private void logLatestTimeseriesDeleted(SecurityUser user, EntityId entityId, List<String> keys, Throwable e) {
+        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
+                toException(e), keys);
+    }
+
     private void logTelemetryUpdated(SecurityUser user, EntityId entityId, List<TsKvEntry> telemetry, Throwable e) {
         notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
                 toException(e), telemetry);
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
index 3f5e52796a..40f4e3415b 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
@@ -316,6 +316,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
     }
 
+    @Override
+    public void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
+        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys);
+        addVoidCallback(deleteFuture, callback);
+        addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
+    }
+
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 7f57fbbb3f..b448e4fdb8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -792,6 +792,10 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         return readResponse(doDelete(urlTemplate, params).andExpect(status().isOk()), responseClass);
     }
 
+    protected <T> T doDeleteAsync(String urlTemplate, Class<T> responseClass, String... params) throws Exception {
+        return readResponse(doDeleteAsync(urlTemplate, DEFAULT_TIMEOUT, params).andExpect(status().isOk()), responseClass);
+    }
+
     protected ResultActions doPost(String urlTemplate, String... params) throws Exception {
         MockHttpServletRequestBuilder postRequest = post(urlTemplate);
         setJwtToken(postRequest);
@@ -824,6 +828,15 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         return mockMvc.perform(deleteRequest);
     }
 
+    protected ResultActions doDeleteAsync(String urlTemplate, Long timeout, String... params) throws Exception {
+        MockHttpServletRequestBuilder deleteRequest = delete(urlTemplate, params);
+        setJwtToken(deleteRequest);
+//        populateParams(deleteRequest, params);
+        MvcResult result = mockMvc.perform(deleteRequest).andReturn();
+        result.getAsyncResult(timeout);
+        return mockMvc.perform(asyncDispatch(result));
+    }
+
     protected void populateParams(MockHttpServletRequestBuilder request, String... params) {
         if (params != null && params.length > 0) {
             Assert.assertEquals(0, params.length % 2);
diff --git a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
index 47cac1b549..2fdab098e4 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
@@ -15,14 +15,21 @@
  */
 package org.thingsboard.server.controller;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Assert;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.List;
+
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.query.EntityKeyType.TIME_SERIES;
 
 @DaoSqlTest
 public class TelemetryControllerTest extends AbstractControllerTest {
@@ -39,6 +46,136 @@ public class TelemetryControllerTest extends AbstractControllerTest {
         doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
     }
 
+    @Test
+    public void testDeleteLatest() throws Exception {
+        loginTenantAdmin();
+        Device device = createDevice();
+
+        SingleEntityFilter filter = new SingleEntityFilter();
+        filter.setSingleEntity(device.getId());
+
+        getWsClient().subscribeLatestUpdate(List.of(new EntityKey(TIME_SERIES, "data")), filter);
+
+        getWsClient().registerWaitForUpdate(1);
+
+        long startTs = System.currentTimeMillis();
+
+        String testBody = "{\"data\": \"value\"}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", testBody, String.class, status().isOk());
+
+        long endTs = System.currentTimeMillis();
+
+        ObjectNode latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertNotNull(latest);
+        var data = latest.get("data");
+        Assert.assertNotNull(data);
+
+        Assert.assertEquals("value", data.get(0).get("value").asText());
+
+        ObjectNode timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertNotNull(timeseries);
+
+        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
+
+        doDeleteAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/latest/delete?keys=data", String.class);
+
+        latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertTrue(latest.get("data").get(0).get("value").isNull());
+
+        timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
+    }
+
+    @Test
+    public void testDeleteAllTelemetryWithLatest() throws Exception {
+        loginTenantAdmin();
+        Device device = createDevice();
+
+        SingleEntityFilter filter = new SingleEntityFilter();
+        filter.setSingleEntity(device.getId());
+
+        getWsClient().subscribeLatestUpdate(List.of(new EntityKey(TIME_SERIES, "data")), filter);
+
+        getWsClient().registerWaitForUpdate(1);
+
+        long startTs = System.currentTimeMillis();
+
+        String testBody = "{\"data\": \"value\"}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", testBody, String.class, status().isOk());
+
+        long endTs = System.currentTimeMillis();
+
+        ObjectNode latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertNotNull(latest);
+        var data = latest.get("data");
+        Assert.assertNotNull(data);
+
+        Assert.assertEquals("value", data.get(0).get("value").asText());
+
+        ObjectNode timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertNotNull(timeseries);
+
+        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
+
+        doDeleteAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/delete?keys=data&deleteAllDataForKeys=true", String.class);
+
+        latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertTrue(latest.get("data").get(0).get("value").isNull());
+
+        timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertTrue(timeseries.isEmpty());
+    }
+
+    @Test
+    public void testDeleteAllTelemetryWithoutLatest() throws Exception {
+        loginTenantAdmin();
+        Device device = createDevice();
+
+        SingleEntityFilter filter = new SingleEntityFilter();
+        filter.setSingleEntity(device.getId());
+
+        getWsClient().subscribeLatestUpdate(List.of(new EntityKey(TIME_SERIES, "data")), filter);
+
+        getWsClient().registerWaitForUpdate(1);
+
+        long startTs = System.currentTimeMillis();
+
+        String testBody = "{\"data\": \"value\"}";
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", testBody, String.class, status().isOk());
+
+        long endTs = System.currentTimeMillis();
+
+        ObjectNode latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertNotNull(latest);
+
+        Assert.assertEquals("value", latest.get("data").get(0).get("value").asText());
+
+        ObjectNode timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertNotNull(timeseries);
+
+        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
+
+        doDeleteAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/delete?keys=data&deleteAllDataForKeys=true&deleteLatest=false", String.class);
+
+        latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
+
+        Assert.assertEquals("value", latest.get("data").get(0).get("value").asText());
+
+        timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
+
+        Assert.assertTrue(timeseries.isEmpty());
+    }
+
     private Device createDevice() throws Exception {
         String testToken = "TEST_TOKEN";
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
index dee0e7aa9b..a97cc8f834 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
@@ -21,14 +21,20 @@ import lombok.Data;
 public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
 
     private final Boolean rewriteLatestIfDeleted;
+    private final Boolean deleteLatest;
 
-    public BaseDeleteTsKvQuery(String key, long startTs, long endTs, boolean rewriteLatestIfDeleted) {
+    public BaseDeleteTsKvQuery(String key, long startTs, long endTs, boolean rewriteLatestIfDeleted, boolean deleteLatest) {
         super(key, startTs, endTs);
         this.rewriteLatestIfDeleted = rewriteLatestIfDeleted;
+        this.deleteLatest = deleteLatest;
+    }
+
+    public BaseDeleteTsKvQuery(String key, long startTs, long endTs, boolean rewriteLatestIfDeleted) {
+        this(key, startTs, endTs, rewriteLatestIfDeleted, true);
     }
 
     public BaseDeleteTsKvQuery(String key, long startTs, long endTs) {
-        this(key, startTs, endTs, false);
+        this(key, startTs, endTs, false, true);
     }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DeleteTsKvQuery.java
index 7b9b4ad16f..b2f41fffb4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DeleteTsKvQuery.java
@@ -19,4 +19,6 @@ public interface DeleteTsKvQuery extends TsKvQuery {
 
     Boolean getRewriteLatestIfDeleted();
 
+    Boolean getDeleteLatest();
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
index 34bcd15c0a..6b8bfa9d64 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
@@ -275,7 +275,9 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     private void deleteAndRegisterFutures(TenantId tenantId, List<ListenableFuture<TsKvLatestRemovingResult>> futures, EntityId entityId, DeleteTsKvQuery query) {
         futures.add(Futures.transform(timeseriesDao.remove(tenantId, entityId, query), v -> null, MoreExecutors.directExecutor()));
-        futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
+        if (query.getDeleteLatest()) {
+            futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
+        }
     }
 
     private static void validate(EntityId entityId) {
diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
index 51eb446d70..8c8829a727 100644
--- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
@@ -2364,7 +2364,8 @@ public class RestClient implements Closeable {
                                           boolean deleteAllDataForKeys,
                                           Long startTs,
                                           Long endTs,
-                                          boolean rewriteLatestIfDeleted) {
+                                          boolean rewriteLatestIfDeleted,
+                                          boolean deleteLatest) {
         Map<String, String> params = new HashMap<>();
         params.put("entityType", entityId.getEntityType().name());
         params.put("entityId", entityId.getId().toString());
@@ -2373,17 +2374,34 @@ public class RestClient implements Closeable {
         params.put("startTs", startTs.toString());
         params.put("endTs", endTs.toString());
         params.put("rewriteLatestIfDeleted", String.valueOf(rewriteLatestIfDeleted));
+        params.put("deleteLatest", String.valueOf(deleteLatest));
 
         return restTemplate
                 .exchange(
-                        baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/timeseries/delete?keys={keys}&deleteAllDataForKeys={deleteAllDataForKeys}&startTs={startTs}&endTs={endTs}&rewriteLatestIfDeleted={rewriteLatestIfDeleted}",
+                        baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/timeseries/delete?keys={keys}&deleteAllDataForKeys={deleteAllDataForKeys}&startTs={startTs}&endTs={endTs}&rewriteLatestIfDeleted={rewriteLatestIfDeleted}&deleteLatest={deleteLatest}",
                         HttpMethod.DELETE,
                         HttpEntity.EMPTY,
                         Object.class,
                         params)
                 .getStatusCode()
                 .is2xxSuccessful();
+    }
 
+    public boolean deleteEntityLatestTimeseries(EntityId entityId, List<String> keys) {
+        Map<String, String> params = new HashMap<>();
+        params.put("entityType", entityId.getEntityType().name());
+        params.put("entityId", entityId.getId().toString());
+        params.put("keys", listToString(keys));
+
+        return restTemplate
+                .exchange(
+                        baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/timeseries/latest/delete?keys={keys}",
+                        HttpMethod.DELETE,
+                        HttpEntity.EMPTY,
+                        Object.class,
+                        params)
+                .getStatusCode()
+                .is2xxSuccessful();
     }
 
     public boolean deleteEntityAttributes(DeviceId deviceId, String scope, List<String> keys) {
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
index a61e83f48f..9acd03f665 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
@@ -71,4 +71,6 @@ public interface RuleEngineTelemetryService {
     void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback);
 
     void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback);
+
+    void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
 }

From 2f1290e7e1be7b01c76b2f1a0da911fa03b171b6 Mon Sep 17 00:00:00 2001
From: Ruslan Vasylkiv <87172504+rusikv@users.noreply.github.com>
Date: Thu, 13 Jul 2023 15:24:45 +0300
Subject: [PATCH 02/11] Delete timeseries UI implementation (#8932)

---
 ui-ngx/src/app/core/http/attribute.service.ts |  14 ++-
 .../attribute/attribute-table.component.html  |  12 +++
 .../attribute/attribute-table.component.ts    |  83 ++++++++++++++-
 .../delete-timeseries-panel.component.html    |  74 +++++++++++++
 .../delete-timeseries-panel.component.scss    |  28 +++++
 .../delete-timeseries-panel.component.ts      | 100 ++++++++++++++++++
 .../home/components/home-components.module.ts |   2 +
 .../models/telemetry/telemetry.models.ts      |  18 +++-
 .../assets/locale/locale.constant-ca_ES.json  |   2 +-
 .../assets/locale/locale.constant-cs_CZ.json  |   2 +-
 .../assets/locale/locale.constant-da_DK.json  |   2 +-
 .../assets/locale/locale.constant-de_DE.json  |   2 +-
 .../assets/locale/locale.constant-el_GR.json  |   2 +-
 .../assets/locale/locale.constant-en_US.json  |  15 ++-
 .../assets/locale/locale.constant-es_ES.json  |   2 +-
 .../assets/locale/locale.constant-fa_IR.json  |   2 +-
 .../assets/locale/locale.constant-fr_FR.json  |   2 +-
 .../assets/locale/locale.constant-it_IT.json  |   2 +-
 .../assets/locale/locale.constant-ja_JP.json  |   2 +-
 .../assets/locale/locale.constant-ka_GE.json  |   2 +-
 .../assets/locale/locale.constant-ko_KR.json  |   2 +-
 .../assets/locale/locale.constant-lv_LV.json  |   2 +-
 .../assets/locale/locale.constant-pt_BR.json  |   2 +-
 .../assets/locale/locale.constant-ro_RO.json  |   2 +-
 .../assets/locale/locale.constant-sl_SI.json  |   2 +-
 .../assets/locale/locale.constant-tr_TR.json  |   2 +-
 .../assets/locale/locale.constant-uk_UA.json  |   2 +-
 .../assets/locale/locale.constant-zh_CN.json  |   2 +-
 .../assets/locale/locale.constant-zh_TW.json  |   2 +-
 29 files changed, 357 insertions(+), 29 deletions(-)
 create mode 100644 ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
 create mode 100644 ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
 create mode 100644 ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index 67132d8983..b772cd63e6 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -50,10 +50,11 @@ export class AttributeService {
   }
 
   public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false,
-                                startTs?: number, endTs?: number, config?: RequestConfig): Observable<any> {
+                                startTs?: number, endTs?: number, rewriteLatestIfDeleted = false, deleteLatest = false,
+                                config?: RequestConfig): Observable<any> {
     const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
     let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` +
-      `?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}`;
+      `?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}&rewriteLatestIfDeleted=${rewriteLatestIfDeleted}&deleteLatest=${deleteLatest}`;
     if (isDefinedAndNotNull(startTs)) {
       url += `&startTs=${startTs}`;
     }
@@ -63,6 +64,12 @@ export class AttributeService {
     return this.http.delete(url, defaultHttpOptionsFromConfig(config));
   }
 
+  public deleteEntityLatestTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, config?: RequestConfig): Observable<any> {
+    const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
+    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/latest/delete?keys=${keys}`;
+    return this.http.delete(url, defaultHttpOptionsFromConfig(config));
+  }
+
   public saveEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>,
                               config?: RequestConfig): Observable<any> {
     const attributesData: {[key: string]: any} = {};
@@ -103,7 +110,8 @@ export class AttributeService {
     });
     let deleteEntityTimeseriesObservable: Observable<any>;
     if (deleteTimeseries.length) {
-      deleteEntityTimeseriesObservable = this.deleteEntityTimeseries(entityId, deleteTimeseries, true, null, null, config);
+      deleteEntityTimeseriesObservable = this.deleteEntityTimeseries(entityId, deleteTimeseries, true,
+        null, null, false, false, config);
     } else {
       deleteEntityTimeseriesObservable = of(null);
     }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 32ebb28ae9..1def300b78 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -93,6 +93,14 @@
                 (click)="deleteAttributes($event)">
           <mat-icon>delete</mat-icon>
         </button>
+        <button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY && dataSource.selection.selected.length > 1"
+                class="button-widget-action"
+                mat-icon-button [disabled]="isLoading$ | async"
+                matTooltip="{{ 'action.delete' | translate }}"
+                matTooltipPosition="above"
+                (click)="deleteTimeseries($event)">
+          <mat-icon>delete</mat-icon>
+        </button>
         <button mat-raised-button color="accent"
                 class="button-widget-action"
                 [disabled]="isLoading$ | async"
@@ -198,6 +206,10 @@
               <span [fxShow]="!isClientSideTelemetryTypeMap.get(attributeScope)">
                 <mat-icon>edit</mat-icon>
               </span>
+              <button mat-icon-button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
+                      (click)="deleteTimeseries($event, attribute)">
+                <mat-icon>delete</mat-icon>
+              </button>
             </div>
           </mat-cell>
         </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index e9d67a3fdd..13a7ef0a70 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -38,7 +38,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { MatDialog } from '@angular/material/dialog';
 import { DialogService } from '@core/services/dialog.service';
 import { Direction, SortOrder } from '@shared/models/page/sort-order';
-import { fromEvent, merge } from 'rxjs';
+import { fromEvent, merge, Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { EntityId } from '@shared/models/id/entity-id';
 import {
@@ -48,7 +48,7 @@ import {
   isClientSideTelemetryType,
   LatestTelemetry,
   TelemetryType,
-  telemetryTypeTranslations,
+  telemetryTypeTranslations, TimeseriesDeleteStrategy,
   toTelemetryType
 } from '@shared/models/telemetry/telemetry.models';
 import { AttributeDatasource } from '@home/models/datasource/attribute-datasource';
@@ -82,10 +82,14 @@ import {
   AddWidgetToDashboardDialogComponent,
   AddWidgetToDashboardDialogData
 } from '@home/components/attribute/add-widget-to-dashboard-dialog.component';
-import { deepClone } from '@core/utils';
+import { deepClone, isUndefinedOrNull } from '@core/utils';
 import { Filters } from '@shared/models/query/query.models';
 import { hidePageSizePixelValue } from '@shared/models/constants';
 import { ResizeObserver } from '@juggle/resize-observer';
+import {
+  DELETE_TIMESERIES_PANEL_DATA,
+  DeleteTimeseriesPanelComponent, DeleteTimeseriesPanelData
+} from '@home/components/attribute/delete-timeseries-panel.component';
 
 
 @Component({
@@ -378,6 +382,79 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     });
   }
 
+  deleteTimeseries($event: Event, attribute?: AttributeData) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const isMultipleDeletion = isUndefinedOrNull(attribute);
+    const target = $event.target || $event.srcElement || $event.currentTarget;
+    const config = new OverlayConfig();
+    config.backdropClass = 'cdk-overlay-transparent-backdrop';
+    config.hasBackdrop = true;
+    const connectedPosition: ConnectedPosition = {
+      originX: 'start',
+      originY: 'top',
+      overlayX: 'end',
+      overlayY: 'top'
+    };
+    config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement)
+      .withPositions([connectedPosition]);
+    config.maxWidth = '488px';
+    config.width = '100%';
+    const overlayRef = this.overlay.create(config);
+    overlayRef.backdropClick().subscribe(() => {
+      overlayRef.dispose();
+    });
+
+    const providers: StaticProvider[] = [
+      {
+        provide: DELETE_TIMESERIES_PANEL_DATA,
+        useValue: {
+          isMultipleDeletion: isMultipleDeletion
+        } as DeleteTimeseriesPanelData
+      },
+      {
+        provide: OverlayRef,
+        useValue: overlayRef
+      }
+    ];
+    const injector = Injector.create({parent: this.viewContainerRef.injector, providers});
+    const componentRef = overlayRef.attach(new ComponentPortal(DeleteTimeseriesPanelComponent,
+      this.viewContainerRef, injector));
+    componentRef.onDestroy(() => {
+      if (componentRef.instance.result !== null) {
+        const strategy = componentRef.instance.result;
+        const timeseries = isMultipleDeletion ? this.dataSource.selection.selected : [attribute];
+        let deleteAllDataForKeys = false;
+        let rewriteLatestIfDeleted = false;
+        let startTs = null;
+        let endTs = null;
+        let deleteLatest = false;
+        let task: Observable<any>;
+        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY) {
+          deleteAllDataForKeys = true;
+          deleteLatest = true;
+        }
+        if (strategy === TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE) {
+          deleteAllDataForKeys = true;
+        }
+        if (strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
+          task = this.attributeService.deleteEntityLatestTimeseries(this.entityIdValue, timeseries);
+        }
+        if (strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD) {
+          startTs = componentRef.instance.startDateTime.getTime();
+          endTs = componentRef.instance.endDateTime.getTime();
+          rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
+        }
+        if (!task) {
+          task = this.attributeService.deleteEntityTimeseries(this.entityIdValue, timeseries, deleteAllDataForKeys,
+            startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
+        }
+        task.subscribe(() => this.reloadAttributes());
+      }
+    });
+  }
+
   deleteAttributes($event: Event) {
     if ($event) {
       $event.stopPropagation();
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
new file mode 100644
index 0000000000..e164cb56ed
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -0,0 +1,74 @@
+<!--
+
+    Copyright © 2016-2023 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<div class="mat-elevation-z1" style="max-width: 488px">
+  <mat-toolbar>
+    <h2>{{ "attribute.delete-timeseries.delete-strategy" | translate }}</h2>
+    <span fxFlex></span>
+    <button mat-icon-button
+            (click)="cancel()"
+            type="button">
+      <mat-icon class="material-icons">close</mat-icon>
+    </button>
+  </mat-toolbar>
+  <div style="padding: 16px; min-height: 188px">
+    <mat-form-field fxFlex class="mat-block">
+      <mat-label translate>attribute.delete-timeseries.strategy</mat-label>
+      <mat-select [(ngModel)]="strategy">
+        <mat-option *ngFor="let strategy of strategiesTranslationsMap.keys()" [value]="strategy">
+          {{ strategiesTranslationsMap.get(strategy) | translate }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <div *ngIf="isPeriodStrategy()">
+      <div fxLayout="row" fxLayoutGap="22px" fxLayout.xs="column" fxLayoutGap.xs="8px">
+        <mat-form-field class="mat-block">
+          <mat-label translate>attribute.delete-timeseries.start-time</mat-label>
+          <mat-datetimepicker-toggle [for]="startDateTimePicker" matPrefix></mat-datetimepicker-toggle>
+          <mat-datetimepicker #startDateTimePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
+          <input required matInput [(ngModel)]="startDateTime" [matDatetimepicker]="startDateTimePicker"
+                 (ngModelChange)="onStartDateTimeChange($event)">
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label translate>attribute.delete-timeseries.ends-on</mat-label>
+          <mat-datetimepicker-toggle [for]="endDatePicker" matPrefix></mat-datetimepicker-toggle>
+          <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
+          <input required matInput [(ngModel)]="endDateTime" [matDatetimepicker]="endDatePicker"
+                 (ngModelChange)="onEndDateTimeChange($event)">
+        </mat-form-field>
+      </div>
+      <mat-slide-toggle [(ngModel)]="rewriteLatestIfDeleted">
+        {{ "attribute.delete-timeseries.rewrite-latest-value-if-deleted" | translate }}
+      </mat-slide-toggle>
+    </div>
+  </div>
+  <div fxLayout="row" class="tb-panel-actions">
+    <span fxFlex></span>
+    <button mat-button color="primary"
+            type="button"
+            (click)="cancel()" cdkFocusInitial>
+      {{ 'action.cancel' | translate }}
+    </button>
+    <button mat-button mat-raised-button color="primary"
+            type="submit"
+            (click)="delete()">
+      {{ 'action.apply' | translate }}
+    </button>
+  </div>
+</div>
+
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
new file mode 100644
index 0000000000..c0f26644d5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+:host {
+  width: 100%;
+  background-color: #fff;
+  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3), 0px 2px 6px 2px rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+}
+
+:host ::ng-deep{
+  div .mat-toolbar {
+    background: none;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
new file mode 100644
index 0000000000..914e5246f7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -0,0 +1,100 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Inject, InjectionToken, OnInit } from '@angular/core';
+import { OverlayRef } from '@angular/cdk/overlay';
+import {
+  TimeseriesDeleteStrategy,
+  timeseriesDeleteStrategyTranslations
+} from '@shared/models/telemetry/telemetry.models';
+import { MINUTE } from '@shared/models/time/time.models';
+
+export const DELETE_TIMESERIES_PANEL_DATA = new InjectionToken<any>('DeleteTimeseriesPanelData');
+
+export interface DeleteTimeseriesPanelData {
+  isMultipleDeletion: boolean;
+}
+
+@Component({
+  selector: 'tb-delete-timeseries-panel',
+  templateUrl: './delete-timeseries-panel.component.html',
+  styleUrls: ['./delete-timeseries-panel.component.scss']
+})
+export class DeleteTimeseriesPanelComponent implements OnInit {
+
+  strategy: string = TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY;
+
+  result: string = null;
+
+  startDateTime: Date;
+
+  endDateTime: Date;
+
+  rewriteLatestIfDeleted: boolean = false;
+
+  strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
+
+  multipleDeletionStrategies = [
+    TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY,
+    TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE
+  ];
+
+  constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) public data: DeleteTimeseriesPanelData,
+              public overlayRef: OverlayRef) { }
+
+  ngOnInit(): void {
+    let today = new Date();
+    this.startDateTime = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
+    this.endDateTime = today;
+    if (this.data.isMultipleDeletion) {
+      this.strategiesTranslationsMap = new Map(Array.from(this.strategiesTranslationsMap.entries())
+        .filter(([strategy]) => {
+          return this.multipleDeletionStrategies.includes(strategy);
+      }))
+    }
+  }
+
+  delete(): void {
+    this.result = this.strategy;
+    this.overlayRef.dispose();
+  }
+
+  cancel(): void {
+    this.overlayRef.dispose();
+  }
+
+  isPeriodStrategy(): boolean {
+    return this.strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD;
+  }
+
+  onStartDateTimeChange(newStartDateTime: Date) {
+    const endDateTimeTs = this.endDateTime.getTime();
+    if (newStartDateTime.getTime() >= endDateTimeTs) {
+      this.startDateTime = new Date(endDateTimeTs - MINUTE);
+    } else {
+      this.startDateTime = newStartDateTime;
+    }
+  }
+
+  onEndDateTimeChange(newEndDateTime: Date) {
+    const startDateTimeTs = this.startDateTime.getTime();
+    if (newEndDateTime.getTime() <= startDateTimeTs) {
+      this.endDateTime = new Date(startDateTimeTs + MINUTE);
+    } else {
+      this.endDateTime = newEndDateTime;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts
index a6e2cc03dc..a18f785b35 100644
--- a/ui-ngx/src/app/modules/home/components/home-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts
@@ -177,6 +177,7 @@ import {
 } from '@home/components/widget/action/manage-widget-actions-dialog.component';
 import { WidgetConfigComponentsModule } from '@home/components/widget/config/widget-config-components.module';
 import { BasicWidgetConfigModule } from '@home/components/widget/config/basic/basic-widget-config.module';
+import { DeleteTimeseriesPanelComponent } from '@home/components/attribute/delete-timeseries-panel.component';
 
 @NgModule({
   declarations:
@@ -205,6 +206,7 @@ import { BasicWidgetConfigModule } from '@home/components/widget/config/basic/ba
       AttributeTableComponent,
       AddAttributeDialogComponent,
       EditAttributeValuePanelComponent,
+      DeleteTimeseriesPanelComponent,
       AliasesEntitySelectPanelComponent,
       AliasesEntitySelectComponent,
       AliasesEntityAutocompleteComponent,
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 50cbef2f8b..76f6b0f247 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -61,6 +61,13 @@ export enum TelemetryFeature {
   TIMESERIES = 'TIMESERIES'
 }
 
+export enum TimeseriesDeleteStrategy {
+  DELETE_ALL_DATA_INCLUDING_KEY = 'DELETE_ALL_DATA_INCLUDING_KEY',
+  DELETE_OLD_DATA_EXCEPT_LATEST_VALUE = 'DELETE_OLD_DATA_EXCEPT_LATEST_VALUE',
+  DELETE_LATEST_VALUE = 'DELETE_LATEST_VALUE',
+  DELETE_DATA_FOR_TIME_PERIOD = 'DELETE_DATA_FOR_TIME_PERIOD'
+}
+
 export type TelemetryType = LatestTelemetry | AttributeScope;
 
 export const toTelemetryType = (val: string): TelemetryType => {
@@ -73,7 +80,7 @@ export const toTelemetryType = (val: string): TelemetryType => {
 
 export const telemetryTypeTranslations = new Map<TelemetryType, string>(
   [
-    [LatestTelemetry.LATEST_TELEMETRY, 'attribute.scope-latest-telemetry'],
+    [LatestTelemetry.LATEST_TELEMETRY, 'attribute.scope-telemetry'],
     [AttributeScope.CLIENT_SCOPE, 'attribute.scope-client'],
     [AttributeScope.SERVER_SCOPE, 'attribute.scope-server'],
     [AttributeScope.SHARED_SCOPE, 'attribute.scope-shared']
@@ -89,6 +96,15 @@ export const isClientSideTelemetryType = new Map<TelemetryType, boolean>(
   ]
 );
 
+export const timeseriesDeleteStrategyTranslations = new Map<TimeseriesDeleteStrategy, string>(
+  [
+    [TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY, 'attribute.delete-timeseries.all-data-including-key'],
+    [TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE, 'attribute.delete-timeseries.old-data-except-latest'],
+    [TimeseriesDeleteStrategy.DELETE_LATEST_VALUE, 'attribute.delete-timeseries.latest-value'],
+    [TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD, 'attribute.delete-timeseries.data-for-time-period']
+  ]
+)
+
 export interface AttributeData {
   lastUpdateTs?: number;
   key: string;
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 349d13da2c..edb406d9cb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -632,7 +632,7 @@
         "attributes": "Atributs",
         "latest-telemetry": "Última telemetria",
         "attributes-scope": "Abast dels atributs del dispositiu",
-        "scope-latest-telemetry": "Última telemetria",
+        "scope-telemetry": "Telemetria",
         "scope-client": "Atributs del Client",
         "scope-server": "Atributs del Servidor",
         "scope-shared": "Atributs Compartits",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index 52873b4d70..5697486e37 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -445,7 +445,7 @@
         "attributes": "Atributy",
         "latest-telemetry": "Poslední telemetrie",
         "attributes-scope": "Rozsah atributů entity",
-        "scope-latest-telemetry": "Poslední telemetrie",
+        "scope-telemetry": "Telemetrie",
         "scope-client": "Atributy klienta",
         "scope-server": "Atributy serveru",
         "scope-shared": "Sdílené atributy",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index 2c1df70902..1486870a7a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -453,7 +453,7 @@
     "attributes": "Attributter",
     "latest-telemetry": "Seneste telemetri",
     "attributes-scope": "Omfang af entitetsattributter",
-    "scope-latest-telemetry": "Seneste telemetri",
+    "scope-telemetry": "Telemetri",
     "scope-client": "Klientattributter",
     "scope-server": "Serverattributter",
     "scope-shared": "Delte attributter",
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
index ed73ad25cf..c27d63f4fb 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -324,7 +324,7 @@
     "attributes": "Eigenschaften",
     "latest-telemetry": "Neueste Telemetrie",
     "attributes-scope": "Entitätseigenschaftsbereich",
-    "scope-latest-telemetry": "Neueste Telemetrie",
+    "scope-telemetry": "Telemetrie",
     "scope-client": "Client Eigenschaften",
     "scope-server": "Server Eigenschaften",
     "scope-shared": "Gemeinsame Eigenschaften",
diff --git a/ui-ngx/src/assets/locale/locale.constant-el_GR.json b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
index 453b5dd83c..36e8e4e000 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -291,7 +291,7 @@
     "attributes": "Χαρακτηριστικά",
     "latest-telemetry": "Τελευταία τηλεμετρία",
     "attributes-scope": "Πεδίο εφαρμογής Χαρακτηριστικών Οντότητας",
-    "scope-latest-telemetry": "Τελευταία τηλεμετρία",
+    "scope-telemetry": "Τηλεμετρία",
     "scope-client": "Χαρακτηριστικά Client",
     "scope-server": "Χαρακτηριστικά Server",
     "scope-shared": "Κοινόχρηστα Χαρακτηριστικά",
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 82f10b7f4c..091ee1e3bf 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -691,7 +691,7 @@
         "attributes": "Attributes",
         "latest-telemetry": "Latest telemetry",
         "attributes-scope": "Entity attributes scope",
-        "scope-latest-telemetry": "Latest telemetry",
+        "scope-telemetry": "Telemetry",
         "scope-client": "Client attributes",
         "scope-server": "Server attributes",
         "scope-shared": "Shared attributes",
@@ -717,7 +717,18 @@
         "no-attributes-text": "No attributes found",
         "no-telemetry-text": "No telemetry found",
         "copy-key": "Copy key",
-        "copy-value": "Copy value"
+        "copy-value": "Copy value",
+        "delete-timeseries": {
+            "start-time": "Start time",
+            "ends-on": "Ends on",
+            "strategy": "Strategy",
+            "delete-strategy": "Delete strategy",
+            "all-data-including-key": "Delete all data including key",
+            "old-data-except-latest": "Delete old data except latest value",
+            "latest-value": "Delete latest value",
+            "data-for-time-period": "Delete data for time period",
+            "rewrite-latest-value-if-deleted": "Rewrite latest value if deleted"
+        }
     },
     "api-usage": {
         "api-features": "API features",
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 6518e03f58..62152e998d 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -667,7 +667,7 @@
         "attributes": "Atributos",
         "latest-telemetry": "Última telemetría",
         "attributes-scope": "Alcance de los atributos del dispositivo",
-        "scope-latest-telemetry": "Última telemetría",
+        "scope-telemetry": "Telemetría",
         "scope-client": "Atributos de Cliente",
         "scope-server": "Atributos de Servidor",
         "scope-shared": "Atributos Compartidos",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
index 6e5026b011..da841a6e53 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
@@ -254,7 +254,7 @@
         "attributes": "ويژگي ها",
         "latest-telemetry": "آخرين سنجش",
         "attributes-scope": "حوزه ويژگي هاي موجودي",
-        "scope-latest-telemetry": "آخرين سنجش",
+        "scope-telemetry": "تله متری",
         "scope-client": "ويژگي هاي مشتري",
         "scope-server": "ويژگي هاي سِروِر",
         "scope-shared": "ويژگي هاي مشترک",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index 19f92e5a7c..a929477d5e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -459,7 +459,7 @@
         "next-widget": "Widget suivant",
         "prev-widget": "Widget précédent",
         "scope-client": "Attributs du client",
-        "scope-latest-telemetry": "Dernière télémétrie",
+        "scope-telemetry": "Télémétrie",
         "scope-server": "Attributs du serveur",
         "scope-shared": "Attributs partagés",
         "selected-attributes": "{count, plural, =1 {1 attribut} other {# attributs} } sélectionnés",
diff --git a/ui-ngx/src/assets/locale/locale.constant-it_IT.json b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
index 94acd17f82..2c093e76a9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -276,7 +276,7 @@
         "attributes": "Attributi",
         "latest-telemetry": "Ultima telemetria",
         "attributes-scope": "Visibilità attributi entità",
-        "scope-latest-telemetry": "Ultima telemetria",
+        "scope-telemetry": "Telemetria",
         "scope-client": "Attributi client",
         "scope-server": "Attributi server",
         "scope-shared": "Attributi condivisi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
index f63a6681a2..23145c1f89 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -244,7 +244,7 @@
 		"attributes": "属性",
 		"latest-telemetry": "最新テレメトリ",
 		"attributes-scope": "エンティティ属性のスコープ",
-		"scope-latest-telemetry": "最新テレメトリ",
+		"scope-telemetry": "テレメトリー",
 		"scope-client": "クライアントの属性",
 		"scope-server": "サーバーの属性",
 		"scope-shared": "共有属性",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
index a6c5a6576d..89d25703e3 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
@@ -290,7 +290,7 @@
     "attributes": "ატრიბუტები",
     "latest-telemetry": "უახლესი ტელემეტრია",
     "attributes-scope": "ობიექტის ატრიბუტების ფარგლები",
-    "scope-latest-telemetry": "უახლესი ტელემეტრია",
+    "scope-telemetry": "ტელემეტრია",
     "scope-client": "კლიენტის ატრიბუტები",
     "scope-server": "სერვერის ატრიბუტები",
     "scope-shared": "ატრიბუტების გაზიარება",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index 758482f578..3da051ec1a 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -408,7 +408,7 @@
         "attributes": "속성",
         "latest-telemetry": "최근 데이터",
         "attributes-scope": "장치 속성 범위",
-        "scope-latest-telemetry": "최근 데이터",
+        "scope-telemetry": "원격 측정",
         "scope-client": "클라이언트 속성",
         "scope-server": "서버 속성",
         "scope-shared": "공유 속성",
diff --git a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
index d584f2da96..f4f5befc14 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
@@ -256,7 +256,7 @@
         "attributes": "Attribūti",
         "latest-telemetry": "Jaunākā telemetrija",
         "attributes-scope": "Vienības atribūtu darbības joma",
-        "scope-latest-telemetry": "Jaunākā telemetrija",
+        "scope-telemetry": "Telemetrija",
         "scope-client": "Klientu atribūti",
         "scope-server": "Servera atribūti",
         "scope-shared": "Dalītie atribūti",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
index 2bba0338d2..28c7082df9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -309,7 +309,7 @@
     "attributes": "Atributos",
     "latest-telemetry": "Última telemetria",
     "attributes-scope": "Escopo de atributos de entidade",
-    "scope-latest-telemetry": "Última telemetria",
+    "scope-telemetry": "Telemetria",
     "scope-client": "Atributos do cliente",
     "scope-server": "Atributos do servidor",
     "scope-shared": "Atributos compartilhados",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
index fa5cee48c9..da0012e6f6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
@@ -285,7 +285,7 @@
         "attributes": "Atribute",
         "latest-telemetry": "Ultimele Date Telemetrice",
         "attributes-scope": "Scop Atribute Entitate",
-        "scope-latest-telemetry": "Ultimele Date Telemetrice",
+        "scope-telemetry": "Telemetrie",
         "scope-client": "Atribute Client",
         "scope-server": "Atribute Server",
         "scope-shared": "Atribute Partajate",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index 8aced0ddc6..e53e4fc7c0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -408,7 +408,7 @@
     "attributes": "Lastnosti",
     "latest-telemetry": "Najnovejša telemetrija",
     "attributes-scope": "Obseg atributov entitete",
-    "scope-latest-telemetry": "Najnovejša telemetrija",
+    "scope-telemetry": "Telemetrija",
     "scope-client": "Atributi odjemalca",
     "scope-server": "Atributi strežnika",
     "scope-shared": "Skupni atributi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index b175a2d51a..ae79f0c81c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -445,7 +445,7 @@
     "attributes": "Öznitelikler",
     "latest-telemetry": "Son telemetri",
     "attributes-scope": "Varlık öznitelik kapsamı",
-    "scope-latest-telemetry": "Son telemetri",
+    "scope-telemetry": "telemetri",
     "scope-client": "İstemci öznitelikler",
     "scope-server": "Sunucu öznitelikler",
     "scope-shared": "Paylaşılan öznitelikler",
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index 7aa541e57f..bd608cd709 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -342,7 +342,7 @@
         "attributes": "Атрибути",
         "latest-telemetry": "Остання телеметрія",
         "attributes-scope": "Область видимості атрибутів",
-        "scope-latest-telemetry": "Остання телеметрія",
+        "scope-telemetry": "Телеметрія",
         "scope-client": "Клієнтські атрибути",
         "scope-server": "Серверні атрибути",
         "scope-shared": "Спільні атрибути",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index b39e10e46c..4c33ac46a2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -590,7 +590,7 @@
         "attributes": "属性",
         "latest-telemetry": "最新遥测数据",
         "attributes-scope": "设备属性范围",
-        "scope-latest-telemetry": "最新遥测数据",
+        "scope-telemetry": "遥测",
         "scope-client": "客户端属性",
         "scope-server": "服务端属性",
         "scope-shared": "共享属性",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index f2cce81824..3a1c4edd83 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -519,7 +519,7 @@
         "attributes": "屬性",
         "latest-telemetry": "最新遙測",
         "attributes-scope": "設備屬性範圍",
-        "scope-latest-telemetry": "最新遙測",
+        "scope-telemetry": "遙測",
         "scope-client": "客戶端屬性",
         "scope-server": "服務端屬性",
         "scope-shared": "共享屬性",

From 32c2d44b0cd664aa832c4471c976690208dfa2be Mon Sep 17 00:00:00 2001
From: Ruslan Vasylkiv <87172504+rusikv@users.noreply.github.com>
Date: Fri, 14 Jul 2023 12:37:40 +0300
Subject: [PATCH 03/11] added rewrite param to delete latest timeseries,
 enabled single selection deletion (#8933)

---
 ui-ngx/src/app/core/http/attribute.service.ts         | 10 ++++++----
 .../attribute/attribute-table.component.html          |  2 +-
 .../components/attribute/attribute-table.component.ts | 11 ++++++-----
 .../attribute/delete-timeseries-panel.component.html  |  2 ++
 .../attribute/delete-timeseries-panel.component.ts    |  6 +++++-
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index b772cd63e6..cc20069e04 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -50,7 +50,7 @@ export class AttributeService {
   }
 
   public deleteEntityTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, deleteAllDataForKeys = false,
-                                startTs?: number, endTs?: number, rewriteLatestIfDeleted = false, deleteLatest = false,
+                                startTs?: number, endTs?: number, rewriteLatestIfDeleted = false, deleteLatest = true,
                                 config?: RequestConfig): Observable<any> {
     const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
     let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` +
@@ -64,9 +64,11 @@ export class AttributeService {
     return this.http.delete(url, defaultHttpOptionsFromConfig(config));
   }
 
-  public deleteEntityLatestTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, config?: RequestConfig): Observable<any> {
+  public deleteEntityLatestTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, rewrite = true,
+                                      config?: RequestConfig): Observable<any> {
     const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
-    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/latest/delete?keys=${keys}`;
+    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/latest/delete?keys=${keys}` +
+        `$rewrite=${rewrite}`;
     return this.http.delete(url, defaultHttpOptionsFromConfig(config));
   }
 
@@ -111,7 +113,7 @@ export class AttributeService {
     let deleteEntityTimeseriesObservable: Observable<any>;
     if (deleteTimeseries.length) {
       deleteEntityTimeseriesObservable = this.deleteEntityTimeseries(entityId, deleteTimeseries, true,
-        null, null, false, false, config);
+        null, null, false, true, config);
     } else {
       deleteEntityTimeseriesObservable = of(null);
     }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 1def300b78..95ade10645 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -93,7 +93,7 @@
                 (click)="deleteAttributes($event)">
           <mat-icon>delete</mat-icon>
         </button>
-        <button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY && dataSource.selection.selected.length > 1"
+        <button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
                 class="button-widget-action"
                 mat-icon-button [disabled]="isLoading$ | async"
                 matTooltip="{{ 'action.delete' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 13a7ef0a70..2969feea76 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -386,7 +386,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     if ($event) {
       $event.stopPropagation();
     }
-    const isMultipleDeletion = isUndefinedOrNull(attribute);
+    const isMultipleDeletion = isUndefinedOrNull(attribute) &&  this.dataSource.selection.selected.length > 1;
     const target = $event.target || $event.srcElement || $event.currentTarget;
     const config = new OverlayConfig();
     config.backdropClass = 'cdk-overlay-transparent-backdrop';
@@ -424,22 +424,23 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     componentRef.onDestroy(() => {
       if (componentRef.instance.result !== null) {
         const strategy = componentRef.instance.result;
-        const timeseries = isMultipleDeletion ? this.dataSource.selection.selected : [attribute];
+        const timeseries = attribute ? [attribute]: this.dataSource.selection.selected;
         let deleteAllDataForKeys = false;
         let rewriteLatestIfDeleted = false;
         let startTs = null;
         let endTs = null;
-        let deleteLatest = false;
+        let deleteLatest = true;
         let task: Observable<any>;
         if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY) {
           deleteAllDataForKeys = true;
-          deleteLatest = true;
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE) {
           deleteAllDataForKeys = true;
+          deleteLatest = false;
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
-          task = this.attributeService.deleteEntityLatestTimeseries(this.entityIdValue, timeseries);
+          rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
+          task = this.attributeService.deleteEntityLatestTimeseries(this.entityIdValue, timeseries, rewriteLatestIfDeleted);
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD) {
           startTs = componentRef.instance.startDateTime.getTime();
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
index e164cb56ed..0bd9ac21ef 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -52,6 +52,8 @@
                  (ngModelChange)="onEndDateTimeChange($event)">
         </mat-form-field>
       </div>
+    </div>
+    <div *ngIf="isPeriodStrategy() || isDeleteLatestStrategy()">
       <mat-slide-toggle [(ngModel)]="rewriteLatestIfDeleted">
         {{ "attribute.delete-timeseries.rewrite-latest-value-if-deleted" | translate }}
       </mat-slide-toggle>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 914e5246f7..2bf6b44859 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -43,7 +43,7 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
 
   endDateTime: Date;
 
-  rewriteLatestIfDeleted: boolean = false;
+  rewriteLatestIfDeleted: boolean = true;
 
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
 
@@ -80,6 +80,10 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
     return this.strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD;
   }
 
+  isDeleteLatestStrategy(): boolean {
+    return this.strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
+  }
+
   onStartDateTimeChange(newStartDateTime: Date) {
     const endDateTimeTs = this.endDateTime.getTime();
     if (newStartDateTime.getTime() >= endDateTimeTs) {

From f9aa9b6a92b0522517ecc7b898951e2e7599094a Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 14 Jul 2023 14:43:32 +0200
Subject: [PATCH 04/11] added ability to rewrite latest

---
 .../controller/TelemetryController.java       | 10 +++---
 .../DefaultTelemetrySubscriptionService.java  |  4 +--
 .../dao/timeseries/TimeseriesService.java     |  2 ++
 .../dao/timeseries/BaseTimeseriesService.java | 33 ++++++++++++++++---
 .../api/RuleEngineTelemetryService.java       |  2 +-
 ui-ngx/src/app/core/http/attribute.service.ts |  2 +-
 6 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 8d94fb22cf..449e82fc41 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -557,12 +557,14 @@ public class TelemetryController extends BaseController {
                                                                        @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
                                                                        @PathVariable("entityId") String entityIdStr,
                                                                        @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true)
-                                                                       @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+                                                                       @RequestParam(name = "keys") String keysStr,
+                                                                       @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
+                                                                       @RequestParam(name = "rewrite", defaultValue = "false") boolean rewrite) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-        return deleteLatestTimeseries(entityId, keysStr);
+        return deleteLatestTimeseries(entityId, keysStr, rewrite);
     }
 
-    private DeferredResult<ResponseEntity> deleteLatestTimeseries(EntityId entityIdStr, String keysStr) throws ThingsboardException {
+    private DeferredResult<ResponseEntity> deleteLatestTimeseries(EntityId entityIdStr, String keysStr, boolean rewrite) throws ThingsboardException {
         List<String> keys = toKeysList(keysStr);
         if (keys.isEmpty()) {
             return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
@@ -570,7 +572,7 @@ public class TelemetryController extends BaseController {
         SecurityUser user = getCurrentUser();
 
         return accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entityIdStr, (result, tenantId, entityId) ->
-                tsSubService.deleteLatestAndNotify(tenantId, entityId, keys, new FutureCallback<>() {
+                tsSubService.deleteLatestAndNotify(tenantId, entityId, keys, rewrite, new FutureCallback<>() {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                         logLatestTimeseriesDeleted(user, entityId, keys, null);
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
index 40f4e3415b..a97b7f386d 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
@@ -317,8 +317,8 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
     }
 
     @Override
-    public void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys);
+    public void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback) {
+        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys, rewrite);
         addVoidCallback(deleteFuture, callback);
         addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
     }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
index c2bc997235..06e42e09e7 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
@@ -58,6 +58,8 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
+    ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite);
+
     ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
index 6b8bfa9d64..d101e63a65 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
@@ -46,6 +46,7 @@ import org.thingsboard.server.dao.service.Validator;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -251,13 +252,37 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     @Override
     public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys) {
+        return removeLatest(tenantId, entityId, keys, false);
+    }
+
+    @Override
+    public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite) {
         validate(entityId);
         List<ListenableFuture<TsKvLatestRemovingResult>> futures = Lists.newArrayListWithExpectedSize(keys.size());
-        for (String key : keys) {
-            DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, 0, System.currentTimeMillis(), false);
-            futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
+
+        ListenableFuture<List<TsKvEntry>> latestFuture;
+
+        if (rewrite) {
+            latestFuture = findLatest(tenantId, entityId, keys);
+        } else {
+            latestFuture = Futures.immediateFuture(null);
         }
-        return Futures.allAsList(futures);
+
+        return Futures.transformAsync(latestFuture, latest -> {
+            Map<String, Long> keyTsMap;
+            if (latest != null) {
+                keyTsMap = latest.stream().collect(Collectors.toMap(TsKvEntry::getKey, TsKvEntry::getTs));
+            } else {
+                keyTsMap = Collections.emptyMap();
+            }
+
+            for (String key : keys) {
+                long startTs = keyTsMap.getOrDefault(key, 0L);
+                DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, startTs, System.currentTimeMillis(), rewrite);
+                futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
+            }
+            return Futures.allAsList(futures);
+        }, MoreExecutors.directExecutor());
     }
 
     @Override
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
index 9acd03f665..795eaeb785 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
@@ -72,5 +72,5 @@ public interface RuleEngineTelemetryService {
 
     void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback);
 
-    void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
+    void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback);
 }
diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index cc20069e04..f568758f41 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -68,7 +68,7 @@ export class AttributeService {
                                       config?: RequestConfig): Observable<any> {
     const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
     let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/latest/delete?keys=${keys}` +
-        `$rewrite=${rewrite}`;
+        `&rewrite=${rewrite}`;
     return this.http.delete(url, defaultHttpOptionsFromConfig(config));
   }
 

From 78235deb7db3ee76be5551ebf0fda676147f9f21 Mon Sep 17 00:00:00 2001
From: Ruslan Vasylkiv <87172504+rusikv@users.noreply.github.com>
Date: Mon, 17 Jul 2023 23:46:06 +0300
Subject: [PATCH 05/11] Removed deleteEntityLatestTimeseries, edited strategies
 names (#8948)

* added rewrite param to delete latest timeseries, enabled single selection deletion

* Removed deleteEntityLatestTimeseries, edited strategies names
---
 ui-ngx/src/app/core/http/attribute.service.ts |  8 -------
 .../attribute/attribute-table.component.ts    | 21 ++++++++-----------
 .../delete-timeseries-panel.component.html    |  2 +-
 .../delete-timeseries-panel.component.ts      |  8 +++----
 .../models/telemetry/telemetry.models.ts      | 12 +++++------
 .../assets/locale/locale.constant-en_US.json  |  8 +++----
 6 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index f568758f41..c810a0af22 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -64,14 +64,6 @@ export class AttributeService {
     return this.http.delete(url, defaultHttpOptionsFromConfig(config));
   }
 
-  public deleteEntityLatestTimeseries(entityId: EntityId, timeseries: Array<AttributeData>, rewrite = true,
-                                      config?: RequestConfig): Observable<any> {
-    const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
-    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/latest/delete?keys=${keys}` +
-        `&rewrite=${rewrite}`;
-    return this.http.delete(url, defaultHttpOptionsFromConfig(config));
-  }
-
   public saveEntityAttributes(entityId: EntityId, attributeScope: AttributeScope, attributes: Array<AttributeData>,
                               config?: RequestConfig): Observable<any> {
     const attributesData: {[key: string]: any} = {};
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 2969feea76..245411f2f9 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -386,7 +386,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     if ($event) {
       $event.stopPropagation();
     }
-    const isMultipleDeletion = isUndefinedOrNull(attribute) &&  this.dataSource.selection.selected.length > 1;
+    const isMultipleDeletion = isUndefinedOrNull(attribute) && this.dataSource.selection.selected.length > 1;
     const target = $event.target || $event.srcElement || $event.currentTarget;
     const config = new OverlayConfig();
     config.backdropClass = 'cdk-overlay-transparent-backdrop';
@@ -424,34 +424,31 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     componentRef.onDestroy(() => {
       if (componentRef.instance.result !== null) {
         const strategy = componentRef.instance.result;
-        const timeseries = attribute ? [attribute]: this.dataSource.selection.selected;
+        const deleteTimeseries = attribute ? [attribute]: this.dataSource.selection.selected;
         let deleteAllDataForKeys = false;
         let rewriteLatestIfDeleted = false;
         let startTs = null;
         let endTs = null;
         let deleteLatest = true;
-        let task: Observable<any>;
-        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY) {
+        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA) {
           deleteAllDataForKeys = true;
         }
-        if (strategy === TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE) {
+        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE) {
           deleteAllDataForKeys = true;
           deleteLatest = false;
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
           rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
-          task = this.attributeService.deleteEntityLatestTimeseries(this.entityIdValue, timeseries, rewriteLatestIfDeleted);
+          startTs = deleteTimeseries[0].lastUpdateTs;
+          endTs = startTs + 1;
         }
-        if (strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD) {
+        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
           startTs = componentRef.instance.startDateTime.getTime();
           endTs = componentRef.instance.endDateTime.getTime();
           rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
         }
-        if (!task) {
-          task = this.attributeService.deleteEntityTimeseries(this.entityIdValue, timeseries, deleteAllDataForKeys,
-            startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
-        }
-        task.subscribe(() => this.reloadAttributes());
+        this.attributeService.deleteEntityTimeseries(this.entityIdValue, deleteTimeseries, deleteAllDataForKeys,
+          startTs, endTs, rewriteLatestIfDeleted, deleteLatest).subscribe(() => this.reloadAttributes());
       }
     });
   }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
index 0bd9ac21ef..a49f89a6cc 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -55,7 +55,7 @@
     </div>
     <div *ngIf="isPeriodStrategy() || isDeleteLatestStrategy()">
       <mat-slide-toggle [(ngModel)]="rewriteLatestIfDeleted">
-        {{ "attribute.delete-timeseries.rewrite-latest-value-if-deleted" | translate }}
+        {{ "attribute.delete-timeseries.rewrite-latest-value" | translate }}
       </mat-slide-toggle>
     </div>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 2bf6b44859..364ecd2c9a 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -35,7 +35,7 @@ export interface DeleteTimeseriesPanelData {
 })
 export class DeleteTimeseriesPanelComponent implements OnInit {
 
-  strategy: string = TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY;
+  strategy: string = TimeseriesDeleteStrategy.DELETE_ALL_DATA;
 
   result: string = null;
 
@@ -48,8 +48,8 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
 
   multipleDeletionStrategies = [
-    TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY,
-    TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE
+    TimeseriesDeleteStrategy.DELETE_ALL_DATA,
+    TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE
   ];
 
   constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) public data: DeleteTimeseriesPanelData,
@@ -77,7 +77,7 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
   }
 
   isPeriodStrategy(): boolean {
-    return this.strategy === TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD;
+    return this.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD;
   }
 
   isDeleteLatestStrategy(): boolean {
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 76f6b0f247..d93dde4530 100644
--- a/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
+++ b/ui-ngx/src/app/shared/models/telemetry/telemetry.models.ts
@@ -62,10 +62,10 @@ export enum TelemetryFeature {
 }
 
 export enum TimeseriesDeleteStrategy {
-  DELETE_ALL_DATA_INCLUDING_KEY = 'DELETE_ALL_DATA_INCLUDING_KEY',
-  DELETE_OLD_DATA_EXCEPT_LATEST_VALUE = 'DELETE_OLD_DATA_EXCEPT_LATEST_VALUE',
+  DELETE_ALL_DATA = 'DELETE_ALL_DATA',
+  DELETE_ALL_DATA_EXCEPT_LATEST_VALUE = 'DELETE_ALL_DATA_EXCEPT_LATEST_VALUE',
   DELETE_LATEST_VALUE = 'DELETE_LATEST_VALUE',
-  DELETE_DATA_FOR_TIME_PERIOD = 'DELETE_DATA_FOR_TIME_PERIOD'
+  DELETE_ALL_DATA_FOR_TIME_PERIOD = 'DELETE_ALL_DATA_FOR_TIME_PERIOD'
 }
 
 export type TelemetryType = LatestTelemetry | AttributeScope;
@@ -98,10 +98,10 @@ export const isClientSideTelemetryType = new Map<TelemetryType, boolean>(
 
 export const timeseriesDeleteStrategyTranslations = new Map<TimeseriesDeleteStrategy, string>(
   [
-    [TimeseriesDeleteStrategy.DELETE_ALL_DATA_INCLUDING_KEY, 'attribute.delete-timeseries.all-data-including-key'],
-    [TimeseriesDeleteStrategy.DELETE_OLD_DATA_EXCEPT_LATEST_VALUE, 'attribute.delete-timeseries.old-data-except-latest'],
+    [TimeseriesDeleteStrategy.DELETE_ALL_DATA, 'attribute.delete-timeseries.all-data'],
+    [TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE, 'attribute.delete-timeseries.all-data-except-latest-value'],
     [TimeseriesDeleteStrategy.DELETE_LATEST_VALUE, 'attribute.delete-timeseries.latest-value'],
-    [TimeseriesDeleteStrategy.DELETE_DATA_FOR_TIME_PERIOD, 'attribute.delete-timeseries.data-for-time-period']
+    [TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD, 'attribute.delete-timeseries.all-data-for-time-period']
   ]
 )
 
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 091ee1e3bf..190a47788c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -723,11 +723,11 @@
             "ends-on": "Ends on",
             "strategy": "Strategy",
             "delete-strategy": "Delete strategy",
-            "all-data-including-key": "Delete all data including key",
-            "old-data-except-latest": "Delete old data except latest value",
+            "all-data": "Delete all data",
+            "all-data-except-latest-value": "Delete all data except latest value",
             "latest-value": "Delete latest value",
-            "data-for-time-period": "Delete data for time period",
-            "rewrite-latest-value-if-deleted": "Rewrite latest value if deleted"
+            "all-data-for-time-period": "Delete all data for time period",
+            "rewrite-latest-value": "Rewrite latest value"
         }
     },
     "api-usage": {

From 881861d80dee78e27fd3d16e69e6ea2739c440f7 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 19 Jul 2023 19:44:47 +0200
Subject: [PATCH 06/11] deleted 'remove latest api'

---
 .../controller/TelemetryController.java       | 56 -------------------
 .../DefaultTelemetrySubscriptionService.java  |  7 ---
 .../controller/TelemetryControllerTest.java   | 44 ---------------
 .../dao/timeseries/TimeseriesService.java     |  2 -
 .../dao/timeseries/BaseTimeseriesService.java | 33 ++---------
 .../api/RuleEngineTelemetryService.java       |  2 -
 6 files changed, 4 insertions(+), 140 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 449e82fc41..6937fa6c84 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -537,57 +537,6 @@ public class TelemetryController extends BaseController {
         });
     }
 
-    @ApiOperation(value = "Delete entity latest time-series data (deleteEntityLatestTimeseries)",
-            notes = "Delete latest time-series for selected entity based on entity id, entity type and keys. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Timeseries for the selected keys in the request was removed. " +
-                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED'."),
-            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys list is empty."),
-            @ApiResponse(code = 401, message = "User is not authorized to delete entity latest timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
-                    "Platform creates an audit log event about entity latest timeseries removal with action type 'TIMESERIES_DELETED' that includes an error stacktrace."),
-    })
-    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/{entityType}/{entityId}/timeseries/latest/delete", method = RequestMethod.DELETE)
-    @ResponseBody
-    public DeferredResult<ResponseEntity> deleteEntityLatestTimeseries(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
-                                                                       @PathVariable("entityType") String entityType,
-                                                                       @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
-                                                                       @PathVariable("entityId") String entityIdStr,
-                                                                       @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true)
-                                                                       @RequestParam(name = "keys") String keysStr,
-                                                                       @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
-                                                                       @RequestParam(name = "rewrite", defaultValue = "false") boolean rewrite) throws ThingsboardException {
-        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-        return deleteLatestTimeseries(entityId, keysStr, rewrite);
-    }
-
-    private DeferredResult<ResponseEntity> deleteLatestTimeseries(EntityId entityIdStr, String keysStr, boolean rewrite) throws ThingsboardException {
-        List<String> keys = toKeysList(keysStr);
-        if (keys.isEmpty()) {
-            return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
-        }
-        SecurityUser user = getCurrentUser();
-
-        return accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entityIdStr, (result, tenantId, entityId) ->
-                tsSubService.deleteLatestAndNotify(tenantId, entityId, keys, rewrite, new FutureCallback<>() {
-                    @Override
-                    public void onSuccess(@Nullable Void tmp) {
-                        logLatestTimeseriesDeleted(user, entityId, keys, null);
-                        result.setResult(new ResponseEntity<>(HttpStatus.OK));
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logLatestTimeseriesDeleted(user, entityId, keys, t);
-                        result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
-                    }
-                })
-        );
-    }
-
     @ApiOperation(value = "Delete device attributes (deleteDeviceAttributes)",
             notes = "Delete device attributes using provided Device Id, scope and a list of keys. " +
                     "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
@@ -880,11 +829,6 @@ public class TelemetryController extends BaseController {
                 toException(e), keys, startTs, endTs);
     }
 
-    private void logLatestTimeseriesDeleted(SecurityUser user, EntityId entityId, List<String> keys, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
-                toException(e), keys);
-    }
-
     private void logTelemetryUpdated(SecurityUser user, EntityId entityId, List<TsKvEntry> telemetry, Throwable e) {
         notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
                 toException(e), telemetry);
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
index a97b7f386d..3f5e52796a 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
@@ -316,13 +316,6 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
     }
 
-    @Override
-    public void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys, rewrite);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
-    }
-
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)
diff --git a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
index 2fdab098e4..d97937c684 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
@@ -46,50 +46,6 @@ public class TelemetryControllerTest extends AbstractControllerTest {
         doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
     }
 
-    @Test
-    public void testDeleteLatest() throws Exception {
-        loginTenantAdmin();
-        Device device = createDevice();
-
-        SingleEntityFilter filter = new SingleEntityFilter();
-        filter.setSingleEntity(device.getId());
-
-        getWsClient().subscribeLatestUpdate(List.of(new EntityKey(TIME_SERIES, "data")), filter);
-
-        getWsClient().registerWaitForUpdate(1);
-
-        long startTs = System.currentTimeMillis();
-
-        String testBody = "{\"data\": \"value\"}";
-        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", testBody, String.class, status().isOk());
-
-        long endTs = System.currentTimeMillis();
-
-        ObjectNode latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
-
-        Assert.assertNotNull(latest);
-        var data = latest.get("data");
-        Assert.assertNotNull(data);
-
-        Assert.assertEquals("value", data.get(0).get("value").asText());
-
-        ObjectNode timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
-
-        Assert.assertNotNull(timeseries);
-
-        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
-
-        doDeleteAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/latest/delete?keys=data", String.class);
-
-        latest = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data", ObjectNode.class);
-
-        Assert.assertTrue(latest.get("data").get(0).get("value").isNull());
-
-        timeseries = doGetAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/values/timeseries?keys=data&startTs={startTs}&endTs={endTs}", ObjectNode.class, startTs, endTs);
-
-        Assert.assertEquals("value", timeseries.get("data").get(0).get("value").asText());
-    }
-
     @Test
     public void testDeleteAllTelemetryWithLatest() throws Exception {
         loginTenantAdmin();
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
index 06e42e09e7..c2bc997235 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
@@ -58,8 +58,6 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
-    ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite);
-
     ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
index d101e63a65..6b8bfa9d64 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
@@ -46,7 +46,6 @@ import org.thingsboard.server.dao.service.Validator;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -252,37 +251,13 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     @Override
     public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys) {
-        return removeLatest(tenantId, entityId, keys, false);
-    }
-
-    @Override
-    public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys, boolean rewrite) {
         validate(entityId);
         List<ListenableFuture<TsKvLatestRemovingResult>> futures = Lists.newArrayListWithExpectedSize(keys.size());
-
-        ListenableFuture<List<TsKvEntry>> latestFuture;
-
-        if (rewrite) {
-            latestFuture = findLatest(tenantId, entityId, keys);
-        } else {
-            latestFuture = Futures.immediateFuture(null);
+        for (String key : keys) {
+            DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, 0, System.currentTimeMillis(), false);
+            futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
         }
-
-        return Futures.transformAsync(latestFuture, latest -> {
-            Map<String, Long> keyTsMap;
-            if (latest != null) {
-                keyTsMap = latest.stream().collect(Collectors.toMap(TsKvEntry::getKey, TsKvEntry::getTs));
-            } else {
-                keyTsMap = Collections.emptyMap();
-            }
-
-            for (String key : keys) {
-                long startTs = keyTsMap.getOrDefault(key, 0L);
-                DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, startTs, System.currentTimeMillis(), rewrite);
-                futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
-            }
-            return Futures.allAsList(futures);
-        }, MoreExecutors.directExecutor());
+        return Futures.allAsList(futures);
     }
 
     @Override
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
index 795eaeb785..a61e83f48f 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
@@ -71,6 +71,4 @@ public interface RuleEngineTelemetryService {
     void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback);
 
     void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback);
-
-    void deleteLatestAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, boolean rewrite, FutureCallback<Void> callback);
 }

From 165b1068bccb932e03e995187bcbe52cdbc335cb Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Tue, 1 Aug 2023 17:54:39 +0300
Subject: [PATCH 07/11] Refactoring

---
 .../attribute/attribute-table.component.html  | 12 +--
 .../attribute/attribute-table.component.ts    | 16 +++-
 .../delete-timeseries-panel.component.html    | 16 ++--
 .../delete-timeseries-panel.component.scss    |  2 +-
 .../delete-timeseries-panel.component.ts      | 92 +++++++++++++------
 5 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 95ade10645..788aeeaabc 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -85,20 +85,12 @@
                 'attribute.selected-telemetry' : 'attribute.selected-attributes') | translate:{count: dataSource.selection.selected.length} }}
         </span>
         <span fxFlex></span>
-        <button [fxShow]="!isClientSideTelemetryTypeMap.get(attributeScope)"
+        <button [fxShow]="!isClientSideTelemetryTypeMap.get(attributeScope) || attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
                 class="button-widget-action"
                 mat-icon-button [disabled]="isLoading$ | async"
                 matTooltip="{{ 'action.delete' | translate }}"
                 matTooltipPosition="above"
-                (click)="deleteAttributes($event)">
-          <mat-icon>delete</mat-icon>
-        </button>
-        <button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
-                class="button-widget-action"
-                mat-icon-button [disabled]="isLoading$ | async"
-                matTooltip="{{ 'action.delete' | translate }}"
-                matTooltipPosition="above"
-                (click)="deleteTimeseries($event)">
+                (click)="deleteTelemetry($event)">
           <mat-icon>delete</mat-icon>
         </button>
         <button mat-raised-button color="accent"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 245411f2f9..53d2907468 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -438,14 +438,14 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
           deleteLatest = false;
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
-          rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
+          rewriteLatestIfDeleted = componentRef.instance.getRewriteLatestFormControl().value;
           startTs = deleteTimeseries[0].lastUpdateTs;
           endTs = startTs + 1;
         }
         if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
-          startTs = componentRef.instance.startDateTime.getTime();
-          endTs = componentRef.instance.endDateTime.getTime();
-          rewriteLatestIfDeleted = componentRef.instance.rewriteLatestIfDeleted;
+          startTs = componentRef.instance.getStartDateTimeFormControl().value.getTime();
+          endTs = componentRef.instance.getEndDateTimeFormControl().value.getTime();
+          rewriteLatestIfDeleted = componentRef.instance.getRewriteLatestFormControl().value;
         }
         this.attributeService.deleteEntityTimeseries(this.entityIdValue, deleteTimeseries, deleteAllDataForKeys,
           startTs, endTs, rewriteLatestIfDeleted, deleteLatest).subscribe(() => this.reloadAttributes());
@@ -477,6 +477,14 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     }
   }
 
+  deleteTelemetry($event: Event) {
+    if (this.attributeScope === this.latestTelemetryTypes.LATEST_TELEMETRY) {
+      this.deleteTimeseries($event);
+    } else {
+      this.deleteAttributes($event);
+    }
+  }
+
   enterWidgetMode() {
     this.mode = 'widget';
     this.widgetsList = [];
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
index a49f89a6cc..53e871c41a 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -16,7 +16,7 @@
 
 -->
 
-<div class="mat-elevation-z1" style="max-width: 488px">
+<form class="mat-elevation-z1" [formGroup]="deleteTimeseriesFormGroup" (ngSubmit)="delete()" style="max-width: 488px">
   <mat-toolbar>
     <h2>{{ "attribute.delete-timeseries.delete-strategy" | translate }}</h2>
     <span fxFlex></span>
@@ -29,7 +29,7 @@
   <div style="padding: 16px; min-height: 188px">
     <mat-form-field fxFlex class="mat-block">
       <mat-label translate>attribute.delete-timeseries.strategy</mat-label>
-      <mat-select [(ngModel)]="strategy">
+      <mat-select formControlName="strategy">
         <mat-option *ngFor="let strategy of strategiesTranslationsMap.keys()" [value]="strategy">
           {{ strategiesTranslationsMap.get(strategy) | translate }}
         </mat-option>
@@ -41,20 +41,18 @@
           <mat-label translate>attribute.delete-timeseries.start-time</mat-label>
           <mat-datetimepicker-toggle [for]="startDateTimePicker" matPrefix></mat-datetimepicker-toggle>
           <mat-datetimepicker #startDateTimePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input required matInput [(ngModel)]="startDateTime" [matDatetimepicker]="startDateTimePicker"
-                 (ngModelChange)="onStartDateTimeChange($event)">
+          <input matInput formControlName="startDateTime" [matDatetimepicker]="startDateTimePicker">
         </mat-form-field>
         <mat-form-field class="mat-block">
           <mat-label translate>attribute.delete-timeseries.ends-on</mat-label>
           <mat-datetimepicker-toggle [for]="endDatePicker" matPrefix></mat-datetimepicker-toggle>
           <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input required matInput [(ngModel)]="endDateTime" [matDatetimepicker]="endDatePicker"
-                 (ngModelChange)="onEndDateTimeChange($event)">
+          <input matInput formControlName="endDateTime" [matDatetimepicker]="endDatePicker">
         </mat-form-field>
       </div>
     </div>
     <div *ngIf="isPeriodStrategy() || isDeleteLatestStrategy()">
-      <mat-slide-toggle [(ngModel)]="rewriteLatestIfDeleted">
+      <mat-slide-toggle formControlName="rewriteLatest">
         {{ "attribute.delete-timeseries.rewrite-latest-value" | translate }}
       </mat-slide-toggle>
     </div>
@@ -68,9 +66,9 @@
     </button>
     <button mat-button mat-raised-button color="primary"
             type="submit"
-            (click)="delete()">
+            [disabled]="isPeriodStrategy() && (!getStartDateTimeFormControl().value || !getEndDateTimeFormControl().value)">
       {{ 'action.apply' | translate }}
     </button>
   </div>
-</div>
+</form>
 
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
index c0f26644d5..d223b29b47 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
@@ -22,7 +22,7 @@
 }
 
 :host ::ng-deep{
-  div .mat-toolbar {
+  form .mat-toolbar {
     background: none;
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 364ecd2c9a..96eaa5aa1b 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -14,13 +14,15 @@
 /// limitations under the License.
 ///
 
-import { Component, Inject, InjectionToken, OnInit } from '@angular/core';
+import { Component, Inject, InjectionToken, OnDestroy, OnInit } from '@angular/core';
 import { OverlayRef } from '@angular/cdk/overlay';
 import {
   TimeseriesDeleteStrategy,
   timeseriesDeleteStrategyTranslations
 } from '@shared/models/telemetry/telemetry.models';
 import { MINUTE } from '@shared/models/time/time.models';
+import { AbstractControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Subscription } from 'rxjs';
 
 export const DELETE_TIMESERIES_PANEL_DATA = new InjectionToken<any>('DeleteTimeseriesPanelData');
 
@@ -33,18 +35,16 @@ export interface DeleteTimeseriesPanelData {
   templateUrl: './delete-timeseries-panel.component.html',
   styleUrls: ['./delete-timeseries-panel.component.scss']
 })
-export class DeleteTimeseriesPanelComponent implements OnInit {
+export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
 
-  strategy: string = TimeseriesDeleteStrategy.DELETE_ALL_DATA;
+  deleteTimeseriesFormGroup: UntypedFormGroup;
+
+  startDateTimeSubscription: Subscription;
+
+  endDateTimeSubscription: Subscription;
 
   result: string = null;
 
-  startDateTime: Date;
-
-  endDateTime: Date;
-
-  rewriteLatestIfDeleted: boolean = true;
-
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
 
   multipleDeletionStrategies = [
@@ -53,22 +53,40 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
   ];
 
   constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) public data: DeleteTimeseriesPanelData,
-              public overlayRef: OverlayRef) { }
+              public overlayRef: OverlayRef,
+              public fb: UntypedFormBuilder) { }
 
   ngOnInit(): void {
-    let today = new Date();
-    this.startDateTime = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
-    this.endDateTime = today;
+    const today = new Date();
     if (this.data.isMultipleDeletion) {
       this.strategiesTranslationsMap = new Map(Array.from(this.strategiesTranslationsMap.entries())
         .filter(([strategy]) => {
           return this.multipleDeletionStrategies.includes(strategy);
       }))
     }
+    this.deleteTimeseriesFormGroup = this.fb.group({
+      strategy: [TimeseriesDeleteStrategy.DELETE_ALL_DATA],
+      startDateTime: [new Date(today.getFullYear(), today.getMonth() - 1, today.getDate())],
+      endDateTime: [today],
+      rewriteLatest: [true]
+    })
+    this.startDateTimeSubscription = this.getStartDateTimeFormControl().valueChanges.subscribe(
+      value => this.onStartDateTimeChange(value)
+    )
+    this.endDateTimeSubscription = this.getEndDateTimeFormControl().valueChanges.subscribe(
+      value => this.onEndDateTimeChange(value)
+    )
+  }
+
+  ngOnDestroy(): void {
+    this.startDateTimeSubscription.unsubscribe();
+    this.startDateTimeSubscription = null;
+    this.endDateTimeSubscription.unsubscribe();
+    this.endDateTimeSubscription = null;
   }
 
   delete(): void {
-    this.result = this.strategy;
+    this.result = this.getStrategyFormControl().value;
     this.overlayRef.dispose();
   }
 
@@ -77,28 +95,50 @@ export class DeleteTimeseriesPanelComponent implements OnInit {
   }
 
   isPeriodStrategy(): boolean {
-    return this.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD;
+    return this.getStrategyFormControl().value === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD;
   }
 
   isDeleteLatestStrategy(): boolean {
-    return this.strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
+    return this.getStrategyFormControl().value === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
+  }
+
+  getStrategyFormControl(): AbstractControl {
+    return this.deleteTimeseriesFormGroup.get('strategy');
+  }
+
+  getStartDateTimeFormControl(): AbstractControl {
+    return this.deleteTimeseriesFormGroup.get('startDateTime');
+  }
+
+  getEndDateTimeFormControl(): AbstractControl {
+    return this.deleteTimeseriesFormGroup.get('endDateTime');
+  }
+
+  getRewriteLatestFormControl(): AbstractControl {
+    return this.deleteTimeseriesFormGroup.get('rewriteLatest');
   }
 
   onStartDateTimeChange(newStartDateTime: Date) {
-    const endDateTimeTs = this.endDateTime.getTime();
-    if (newStartDateTime.getTime() >= endDateTimeTs) {
-      this.startDateTime = new Date(endDateTimeTs - MINUTE);
-    } else {
-      this.startDateTime = newStartDateTime;
+    if (newStartDateTime) {
+      const endDateTimeTs = this.deleteTimeseriesFormGroup.get('endDateTime').value.getTime();
+      const startDateTimeControl = this.getStartDateTimeFormControl();
+      if (newStartDateTime.getTime() >= endDateTimeTs) {
+        startDateTimeControl.patchValue(new Date(endDateTimeTs - MINUTE), {onlySelf: true, emitEvent: false});
+      } else {
+        startDateTimeControl.patchValue(newStartDateTime, {onlySelf: true, emitEvent: false});
+      }
     }
   }
 
   onEndDateTimeChange(newEndDateTime: Date) {
-    const startDateTimeTs = this.startDateTime.getTime();
-    if (newEndDateTime.getTime() <= startDateTimeTs) {
-      this.endDateTime = new Date(startDateTimeTs + MINUTE);
-    } else {
-      this.endDateTime = newEndDateTime;
+    if (newEndDateTime) {
+      const startDateTimeTs = this.deleteTimeseriesFormGroup.get('startDateTime').value.getTime();
+      const endDateTimeControl = this.getEndDateTimeFormControl();
+      if (newEndDateTime.getTime() <= startDateTimeTs) {
+        endDateTimeControl.patchValue(new Date(startDateTimeTs + MINUTE), {onlySelf: true, emitEvent: false});
+      } else {
+        endDateTimeControl.patchValue(newEndDateTime, {onlySelf: true, emitEvent: false});
+      }
     }
   }
 }

From 12c8903ff559ed96ab741a0335e860cc3c62381f Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Wed, 2 Aug 2023 12:48:19 +0300
Subject: [PATCH 08/11] Delete timeseries panel form is builded by FormBuilder
 and is now FormGroup, result of panel is now in result field

---
 .../attribute/attribute-table.component.html  |  2 +-
 .../attribute/attribute-table.component.ts    | 19 ++++----
 .../delete-timeseries-panel.component.ts      | 44 ++++++++++---------
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 788aeeaabc..10a5b03dba 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -85,7 +85,7 @@
                 'attribute.selected-telemetry' : 'attribute.selected-attributes') | translate:{count: dataSource.selection.selected.length} }}
         </span>
         <span fxFlex></span>
-        <button [fxShow]="!isClientSideTelemetryTypeMap.get(attributeScope) || attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
+        <button [fxShow]="attributeScope !== attributeScopeTypes.CLIENT_SCOPE"
                 class="button-widget-action"
                 mat-icon-button [disabled]="isLoading$ | async"
                 matTooltip="{{ 'action.delete' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index 53d2907468..add0a5c1e0 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -104,6 +104,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
   isClientSideTelemetryTypeMap = isClientSideTelemetryType;
 
   latestTelemetryTypes = LatestTelemetry;
+  attributeScopeTypes = AttributeScope;
 
   mode: 'default' | 'widget' = 'default';
 
@@ -423,29 +424,29 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
       this.viewContainerRef, injector));
     componentRef.onDestroy(() => {
       if (componentRef.instance.result !== null) {
-        const strategy = componentRef.instance.result;
+        const result = componentRef.instance.result;
         const deleteTimeseries = attribute ? [attribute]: this.dataSource.selection.selected;
         let deleteAllDataForKeys = false;
         let rewriteLatestIfDeleted = false;
         let startTs = null;
         let endTs = null;
         let deleteLatest = true;
-        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA) {
+        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA) {
           deleteAllDataForKeys = true;
         }
-        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE) {
+        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE) {
           deleteAllDataForKeys = true;
           deleteLatest = false;
         }
-        if (strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
-          rewriteLatestIfDeleted = componentRef.instance.getRewriteLatestFormControl().value;
+        if (result.strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
+          rewriteLatestIfDeleted = result.rewriteLatest;
           startTs = deleteTimeseries[0].lastUpdateTs;
           endTs = startTs + 1;
         }
-        if (strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
-          startTs = componentRef.instance.getStartDateTimeFormControl().value.getTime();
-          endTs = componentRef.instance.getEndDateTimeFormControl().value.getTime();
-          rewriteLatestIfDeleted = componentRef.instance.getRewriteLatestFormControl().value;
+        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
+          startTs = result.startDateTime.getTime();
+          endTs = result.endDateTime.getTime();
+          rewriteLatestIfDeleted = result.rewriteLatest;
         }
         this.attributeService.deleteEntityTimeseries(this.entityIdValue, deleteTimeseries, deleteAllDataForKeys,
           startTs, endTs, rewriteLatestIfDeleted, deleteLatest).subscribe(() => this.reloadAttributes());
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 96eaa5aa1b..04db1ee223 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -21,8 +21,9 @@ import {
   timeseriesDeleteStrategyTranslations
 } from '@shared/models/telemetry/telemetry.models';
 import { MINUTE } from '@shared/models/time/time.models';
-import { AbstractControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { Subscription } from 'rxjs';
+import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
+import { Subject, Subscription } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
 export const DELETE_TIMESERIES_PANEL_DATA = new InjectionToken<any>('DeleteTimeseriesPanelData');
 
@@ -30,6 +31,13 @@ export interface DeleteTimeseriesPanelData {
   isMultipleDeletion: boolean;
 }
 
+export interface DeleteTimeseriesPanelResult {
+  strategy: TimeseriesDeleteStrategy;
+  startDateTime: Date;
+  endDateTime: Date;
+  rewriteLatest: boolean;
+}
+
 @Component({
   selector: 'tb-delete-timeseries-panel',
   templateUrl: './delete-timeseries-panel.component.html',
@@ -37,13 +45,13 @@ export interface DeleteTimeseriesPanelData {
 })
 export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
 
-  deleteTimeseriesFormGroup: UntypedFormGroup;
+  deleteTimeseriesFormGroup: FormGroup;
 
   startDateTimeSubscription: Subscription;
 
   endDateTimeSubscription: Subscription;
 
-  result: string = null;
+  result: DeleteTimeseriesPanelResult = null;
 
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
 
@@ -52,9 +60,11 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
     TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE
   ];
 
+  private destroy$ = new Subject<void>();
+
   constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) public data: DeleteTimeseriesPanelData,
               public overlayRef: OverlayRef,
-              public fb: UntypedFormBuilder) { }
+              public fb: FormBuilder) { }
 
   ngOnInit(): void {
     const today = new Date();
@@ -70,23 +80,21 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
       endDateTime: [today],
       rewriteLatest: [true]
     })
-    this.startDateTimeSubscription = this.getStartDateTimeFormControl().valueChanges.subscribe(
-      value => this.onStartDateTimeChange(value)
-    )
-    this.endDateTimeSubscription = this.getEndDateTimeFormControl().valueChanges.subscribe(
-      value => this.onEndDateTimeChange(value)
-    )
+    this.startDateTimeSubscription = this.getStartDateTimeFormControl().valueChanges.pipe(
+      takeUntil(this.destroy$)
+    ).subscribe(value => this.onStartDateTimeChange(value));
+    this.endDateTimeSubscription = this.getEndDateTimeFormControl().valueChanges.pipe(
+      takeUntil(this.destroy$)
+    ).subscribe(value => this.onEndDateTimeChange(value));
   }
 
   ngOnDestroy(): void {
-    this.startDateTimeSubscription.unsubscribe();
-    this.startDateTimeSubscription = null;
-    this.endDateTimeSubscription.unsubscribe();
-    this.endDateTimeSubscription = null;
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   delete(): void {
-    this.result = this.getStrategyFormControl().value;
+    this.result = this.deleteTimeseriesFormGroup.value;
     this.overlayRef.dispose();
   }
 
@@ -114,10 +122,6 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
     return this.deleteTimeseriesFormGroup.get('endDateTime');
   }
 
-  getRewriteLatestFormControl(): AbstractControl {
-    return this.deleteTimeseriesFormGroup.get('rewriteLatest');
-  }
-
   onStartDateTimeChange(newStartDateTime: Date) {
     if (newStartDateTime) {
       const endDateTimeTs = this.deleteTimeseriesFormGroup.get('endDateTime').value.getTime();

From 67938d9b2be77be60561dadbea64bb62c95ee7ce Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Wed, 2 Aug 2023 16:54:18 +0300
Subject: [PATCH 09/11] Add validation for time fields in delete timeseries
 panel form

---
 .../delete-timeseries-panel.component.html    | 38 +++++------
 .../delete-timeseries-panel.component.ts      | 68 ++++++++++---------
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
index 53e871c41a..aabac0bab4 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -16,13 +16,13 @@
 
 -->
 
-<form class="mat-elevation-z1" [formGroup]="deleteTimeseriesFormGroup" (ngSubmit)="delete()" style="max-width: 488px">
+<form [formGroup]="deleteTimeseriesFormGroup" style="max-width: 488px">
   <mat-toolbar>
     <h2>{{ "attribute.delete-timeseries.delete-strategy" | translate }}</h2>
     <span fxFlex></span>
     <button mat-icon-button
-            (click)="cancel()"
-            type="button">
+            type="button"
+            (click)="cancel()">
       <mat-icon class="material-icons">close</mat-icon>
     </button>
   </mat-toolbar>
@@ -41,13 +41,13 @@
           <mat-label translate>attribute.delete-timeseries.start-time</mat-label>
           <mat-datetimepicker-toggle [for]="startDateTimePicker" matPrefix></mat-datetimepicker-toggle>
           <mat-datetimepicker #startDateTimePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input matInput formControlName="startDateTime" [matDatetimepicker]="startDateTimePicker">
+          <input required matInput formControlName="startDateTime" [matDatetimepicker]="startDateTimePicker">
         </mat-form-field>
         <mat-form-field class="mat-block">
           <mat-label translate>attribute.delete-timeseries.ends-on</mat-label>
           <mat-datetimepicker-toggle [for]="endDatePicker" matPrefix></mat-datetimepicker-toggle>
           <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input matInput formControlName="endDateTime" [matDatetimepicker]="endDatePicker">
+          <input required matInput formControlName="endDateTime" [matDatetimepicker]="endDatePicker">
         </mat-form-field>
       </div>
     </div>
@@ -57,18 +57,18 @@
       </mat-slide-toggle>
     </div>
   </div>
-  <div fxLayout="row" class="tb-panel-actions">
-    <span fxFlex></span>
-    <button mat-button color="primary"
-            type="button"
-            (click)="cancel()" cdkFocusInitial>
-      {{ 'action.cancel' | translate }}
-    </button>
-    <button mat-button mat-raised-button color="primary"
-            type="submit"
-            [disabled]="isPeriodStrategy() && (!getStartDateTimeFormControl().value || !getEndDateTimeFormControl().value)">
-      {{ 'action.apply' | translate }}
-    </button>
-  </div>
 </form>
-
+<div fxLayout="row" class="tb-panel-actions">
+  <span fxFlex></span>
+  <button mat-button color="primary"
+          type="button"
+          (click)="cancel()" cdkFocusInitial>
+    {{ 'action.cancel' | translate }}
+  </button>
+  <button mat-button mat-raised-button color="primary"
+          type="button"
+          (click)="delete()"
+          [disabled]="deleteTimeseriesFormGroup.invalid">
+    {{ 'action.apply' | translate }}
+  </button>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 04db1ee223..8adb9bcd5a 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -21,8 +21,8 @@ import {
   timeseriesDeleteStrategyTranslations
 } from '@shared/models/telemetry/telemetry.models';
 import { MINUTE } from '@shared/models/time/time.models';
-import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms';
-import { Subject, Subscription } from 'rxjs';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 export const DELETE_TIMESERIES_PANEL_DATA = new InjectionToken<any>('DeleteTimeseriesPanelData');
@@ -47,10 +47,6 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
 
   deleteTimeseriesFormGroup: FormGroup;
 
-  startDateTimeSubscription: Subscription;
-
-  endDateTimeSubscription: Subscription;
-
   result: DeleteTimeseriesPanelResult = null;
 
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
@@ -76,14 +72,28 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
     }
     this.deleteTimeseriesFormGroup = this.fb.group({
       strategy: [TimeseriesDeleteStrategy.DELETE_ALL_DATA],
-      startDateTime: [new Date(today.getFullYear(), today.getMonth() - 1, today.getDate())],
-      endDateTime: [today],
+      startDateTime: [
+        { value: new Date(today.getFullYear(), today.getMonth() - 1, today.getDate()), disabled: true },
+        [Validators.required]
+      ],
+      endDateTime: [{ value: today, disabled: true }, [Validators.required]],
       rewriteLatest: [true]
     })
-    this.startDateTimeSubscription = this.getStartDateTimeFormControl().valueChanges.pipe(
+    this.deleteTimeseriesFormGroup.get('strategy').valueChanges.pipe(
+      takeUntil(this.destroy$)
+    ).subscribe(value => {
+      if (value === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
+        this.deleteTimeseriesFormGroup.get('startDateTime').enable({onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('endDateTime').enable({onlySelf: true, emitEvent: false});
+      } else {
+        this.deleteTimeseriesFormGroup.get('startDateTime').disable({onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('endDateTime').disable({onlySelf: true, emitEvent: false});
+      }
+    })
+    this.deleteTimeseriesFormGroup.get('startDateTime').valueChanges.pipe(
       takeUntil(this.destroy$)
     ).subscribe(value => this.onStartDateTimeChange(value));
-    this.endDateTimeSubscription = this.getEndDateTimeFormControl().valueChanges.pipe(
+    this.deleteTimeseriesFormGroup.get('endDateTime').valueChanges.pipe(
       takeUntil(this.destroy$)
     ).subscribe(value => this.onEndDateTimeChange(value));
   }
@@ -94,8 +104,12 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
   }
 
   delete(): void {
-    this.result = this.deleteTimeseriesFormGroup.value;
-    this.overlayRef.dispose();
+    if (this.deleteTimeseriesFormGroup.valid) {
+      this.result = this.deleteTimeseriesFormGroup.value;
+      this.overlayRef.dispose();
+    } else {
+      this.deleteTimeseriesFormGroup.markAllAsTouched();
+    }
   }
 
   cancel(): void {
@@ -103,33 +117,22 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
   }
 
   isPeriodStrategy(): boolean {
-    return this.getStrategyFormControl().value === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD;
+    return this.deleteTimeseriesFormGroup.get('strategy').value === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD;
   }
 
   isDeleteLatestStrategy(): boolean {
-    return this.getStrategyFormControl().value === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
-  }
-
-  getStrategyFormControl(): AbstractControl {
-    return this.deleteTimeseriesFormGroup.get('strategy');
-  }
-
-  getStartDateTimeFormControl(): AbstractControl {
-    return this.deleteTimeseriesFormGroup.get('startDateTime');
-  }
-
-  getEndDateTimeFormControl(): AbstractControl {
-    return this.deleteTimeseriesFormGroup.get('endDateTime');
+    return this.deleteTimeseriesFormGroup.get('strategy').value === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
   }
 
   onStartDateTimeChange(newStartDateTime: Date) {
     if (newStartDateTime) {
       const endDateTimeTs = this.deleteTimeseriesFormGroup.get('endDateTime').value.getTime();
-      const startDateTimeControl = this.getStartDateTimeFormControl();
       if (newStartDateTime.getTime() >= endDateTimeTs) {
-        startDateTimeControl.patchValue(new Date(endDateTimeTs - MINUTE), {onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('startDateTime')
+          .patchValue(new Date(endDateTimeTs - MINUTE), {onlySelf: true, emitEvent: false});
       } else {
-        startDateTimeControl.patchValue(newStartDateTime, {onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('startDateTime')
+          .patchValue(newStartDateTime, {onlySelf: true, emitEvent: false});
       }
     }
   }
@@ -137,11 +140,12 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
   onEndDateTimeChange(newEndDateTime: Date) {
     if (newEndDateTime) {
       const startDateTimeTs = this.deleteTimeseriesFormGroup.get('startDateTime').value.getTime();
-      const endDateTimeControl = this.getEndDateTimeFormControl();
       if (newEndDateTime.getTime() <= startDateTimeTs) {
-        endDateTimeControl.patchValue(new Date(startDateTimeTs + MINUTE), {onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('endDateTime')
+          .patchValue(new Date(startDateTimeTs + MINUTE), {onlySelf: true, emitEvent: false});
       } else {
-        endDateTimeControl.patchValue(newEndDateTime, {onlySelf: true, emitEvent: false});
+        this.deleteTimeseriesFormGroup.get('endDateTime')
+          .patchValue(newEndDateTime, {onlySelf: true, emitEvent: false});
       }
     }
   }

From a85f9fbabcf68da5319598174825c0d4d38fee97 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 4 Aug 2023 17:49:52 +0300
Subject: [PATCH 10/11] UI: Refactoring delete telemetry

---
 ui-ngx/src/app/core/http/attribute.service.ts | 12 +++-
 .../attribute/attribute-table.component.html  |  2 +-
 .../attribute/attribute-table.component.ts    | 65 +++++++++--------
 .../delete-timeseries-panel.component.html    | 72 +++++++++----------
 .../delete-timeseries-panel.component.scss    | 28 ++++++--
 .../delete-timeseries-panel.component.ts      | 25 ++++---
 6 files changed, 114 insertions(+), 90 deletions(-)

diff --git a/ui-ngx/src/app/core/http/attribute.service.ts b/ui-ngx/src/app/core/http/attribute.service.ts
index c810a0af22..9022a47eef 100644
--- a/ui-ngx/src/app/core/http/attribute.service.ts
+++ b/ui-ngx/src/app/core/http/attribute.service.ts
@@ -53,8 +53,16 @@ export class AttributeService {
                                 startTs?: number, endTs?: number, rewriteLatestIfDeleted = false, deleteLatest = true,
                                 config?: RequestConfig): Observable<any> {
     const keys = timeseries.map(attribute => encodeURIComponent(attribute.key)).join(',');
-    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete` +
-      `?keys=${keys}&deleteAllDataForKeys=${deleteAllDataForKeys}&rewriteLatestIfDeleted=${rewriteLatestIfDeleted}&deleteLatest=${deleteLatest}`;
+    let url = `/api/plugins/telemetry/${entityId.entityType}/${entityId.id}/timeseries/delete?keys=${keys}`;
+    if (isDefinedAndNotNull(deleteAllDataForKeys)) {
+      url += `&deleteAllDataForKeys=${deleteAllDataForKeys}`;
+    }
+    if (isDefinedAndNotNull(rewriteLatestIfDeleted)) {
+      url += `&rewriteLatestIfDeleted=${rewriteLatestIfDeleted}`;
+    }
+    if (isDefinedAndNotNull(deleteLatest)) {
+      url += `&deleteLatest=${deleteLatest}`;
+    }
     if (isDefinedAndNotNull(startTs)) {
       url += `&startTs=${startTs}`;
     }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 10a5b03dba..d94f08e29f 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -198,7 +198,7 @@
               <span [fxShow]="!isClientSideTelemetryTypeMap.get(attributeScope)">
                 <mat-icon>edit</mat-icon>
               </span>
-              <button mat-icon-button [fxShow]="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
+              <button mat-icon-button *ngIf="attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
                       (click)="deleteTimeseries($event, attribute)">
                 <mat-icon>delete</mat-icon>
               </button>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index add0a5c1e0..0da11767a2 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -38,7 +38,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { MatDialog } from '@angular/material/dialog';
 import { DialogService } from '@core/services/dialog.service';
 import { Direction, SortOrder } from '@shared/models/page/sort-order';
-import { fromEvent, merge, Observable } from 'rxjs';
+import { fromEvent, merge } from 'rxjs';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
 import { EntityId } from '@shared/models/id/entity-id';
 import {
@@ -48,7 +48,8 @@ import {
   isClientSideTelemetryType,
   LatestTelemetry,
   TelemetryType,
-  telemetryTypeTranslations, TimeseriesDeleteStrategy,
+  telemetryTypeTranslations,
+  TimeseriesDeleteStrategy,
   toTelemetryType
 } from '@shared/models/telemetry/telemetry.models';
 import { AttributeDatasource } from '@home/models/datasource/attribute-datasource';
@@ -88,7 +89,8 @@ import { hidePageSizePixelValue } from '@shared/models/constants';
 import { ResizeObserver } from '@juggle/resize-observer';
 import {
   DELETE_TIMESERIES_PANEL_DATA,
-  DeleteTimeseriesPanelComponent, DeleteTimeseriesPanelData
+  DeleteTimeseriesPanelComponent,
+  DeleteTimeseriesPanelData
 } from '@home/components/attribute/delete-timeseries-panel.component';
 
 
@@ -383,15 +385,19 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     });
   }
 
-  deleteTimeseries($event: Event, attribute?: AttributeData) {
+  deleteTimeseries($event: Event, telemetry?: AttributeData) {
     if ($event) {
       $event.stopPropagation();
     }
-    const isMultipleDeletion = isUndefinedOrNull(attribute) && this.dataSource.selection.selected.length > 1;
+    const isMultipleDeletion = isUndefinedOrNull(telemetry) && this.dataSource.selection.selected.length > 1;
     const target = $event.target || $event.srcElement || $event.currentTarget;
-    const config = new OverlayConfig();
-    config.backdropClass = 'cdk-overlay-transparent-backdrop';
-    config.hasBackdrop = true;
+    const config = new OverlayConfig({
+      panelClass: 'tb-filter-panel',
+      backdropClass: 'cdk-overlay-transparent-backdrop',
+      hasBackdrop: true,
+      maxWidth: 488,
+      width: '100%'
+    });
     const connectedPosition: ConnectedPosition = {
       originX: 'start',
       originY: 'top',
@@ -400,8 +406,6 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     };
     config.positionStrategy = this.overlay.position().flexibleConnectedTo(target as HTMLElement)
       .withPositions([connectedPosition]);
-    config.maxWidth = '488px';
-    config.width = '100%';
     const overlayRef = this.overlay.create(config);
     overlayRef.backdropClick().subscribe(() => {
       overlayRef.dispose();
@@ -411,7 +415,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
       {
         provide: DELETE_TIMESERIES_PANEL_DATA,
         useValue: {
-          isMultipleDeletion: isMultipleDeletion
+          isMultipleDeletion
         } as DeleteTimeseriesPanelData
       },
       {
@@ -425,31 +429,34 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
     componentRef.onDestroy(() => {
       if (componentRef.instance.result !== null) {
         const result = componentRef.instance.result;
-        const deleteTimeseries = attribute ? [attribute]: this.dataSource.selection.selected;
+        const deleteTimeseries = telemetry ? [telemetry]: this.dataSource.selection.selected;
         let deleteAllDataForKeys = false;
         let rewriteLatestIfDeleted = false;
         let startTs = null;
         let endTs = null;
         let deleteLatest = true;
-        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA) {
-          deleteAllDataForKeys = true;
-        }
-        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE) {
-          deleteAllDataForKeys = true;
-          deleteLatest = false;
-        }
-        if (result.strategy === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE) {
-          rewriteLatestIfDeleted = result.rewriteLatest;
-          startTs = deleteTimeseries[0].lastUpdateTs;
-          endTs = startTs + 1;
-        }
-        if (result.strategy === TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD) {
-          startTs = result.startDateTime.getTime();
-          endTs = result.endDateTime.getTime();
-          rewriteLatestIfDeleted = result.rewriteLatest;
+        switch (result.strategy) {
+          case TimeseriesDeleteStrategy.DELETE_ALL_DATA:
+            deleteAllDataForKeys = true;
+            break;
+          case TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE:
+            deleteAllDataForKeys = true;
+            deleteLatest = false;
+            break;
+          case TimeseriesDeleteStrategy.DELETE_LATEST_VALUE:
+            rewriteLatestIfDeleted = result.rewriteLatest;
+            startTs = deleteTimeseries[0].lastUpdateTs;
+            endTs = startTs + 1;
+            break;
+          case TimeseriesDeleteStrategy.DELETE_ALL_DATA_FOR_TIME_PERIOD:
+            startTs = result.startDateTime.getTime();
+            endTs = result.endDateTime.getTime();
+            rewriteLatestIfDeleted = result.rewriteLatest;
+            break;
         }
         this.attributeService.deleteEntityTimeseries(this.entityIdValue, deleteTimeseries, deleteAllDataForKeys,
-          startTs, endTs, rewriteLatestIfDeleted, deleteLatest).subscribe(() => this.reloadAttributes());
+                                                      startTs, endTs, rewriteLatestIfDeleted, deleteLatest)
+          .subscribe(() => this.reloadAttributes());
       }
     });
   }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
index aabac0bab4..5778fc6805 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.html
@@ -16,47 +16,41 @@
 
 -->
 
-<form [formGroup]="deleteTimeseriesFormGroup" style="max-width: 488px">
-  <mat-toolbar>
-    <h2>{{ "attribute.delete-timeseries.delete-strategy" | translate }}</h2>
-    <span fxFlex></span>
-    <button mat-icon-button
-            type="button"
-            (click)="cancel()">
-      <mat-icon class="material-icons">close</mat-icon>
-    </button>
-  </mat-toolbar>
-  <div style="padding: 16px; min-height: 188px">
-    <mat-form-field fxFlex class="mat-block">
-      <mat-label translate>attribute.delete-timeseries.strategy</mat-label>
-      <mat-select formControlName="strategy">
-        <mat-option *ngFor="let strategy of strategiesTranslationsMap.keys()" [value]="strategy">
-          {{ strategiesTranslationsMap.get(strategy) | translate }}
-        </mat-option>
-      </mat-select>
+<mat-toolbar>
+  <h2>{{ "attribute.delete-timeseries.delete-strategy" | translate }}</h2>
+  <span fxFlex></span>
+  <button mat-icon-button
+          type="button"
+          (click)="cancel()">
+    <mat-icon class="material-icons">close</mat-icon>
+  </button>
+</mat-toolbar>
+<form [formGroup]="deleteTimeseriesFormGroup" class="mat-content mat-padding tb-form-settings">
+  <mat-form-field class="mat-block" subscriptSizing="dynamic">
+    <mat-label translate>attribute.delete-timeseries.strategy</mat-label>
+    <mat-select formControlName="strategy">
+      <mat-option *ngFor="let strategy of strategiesTranslationsMap.keys()" [value]="strategy">
+        {{ strategiesTranslationsMap.get(strategy) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div *ngIf="isPeriodStrategy()" class="tb-select-interval">
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
+      <mat-label translate>attribute.delete-timeseries.start-time</mat-label>
+      <mat-datetimepicker-toggle [for]="startDateTimePicker" matPrefix></mat-datetimepicker-toggle>
+      <mat-datetimepicker #startDateTimePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
+      <input required matInput formControlName="startDateTime" [matDatetimepicker]="startDateTimePicker">
+    </mat-form-field>
+    <mat-form-field class="mat-block" subscriptSizing="dynamic">
+      <mat-label translate>attribute.delete-timeseries.ends-on</mat-label>
+      <mat-datetimepicker-toggle [for]="endDatePicker" matPrefix></mat-datetimepicker-toggle>
+      <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
+      <input required matInput formControlName="endDateTime" [matDatetimepicker]="endDatePicker">
     </mat-form-field>
-    <div *ngIf="isPeriodStrategy()">
-      <div fxLayout="row" fxLayoutGap="22px" fxLayout.xs="column" fxLayoutGap.xs="8px">
-        <mat-form-field class="mat-block">
-          <mat-label translate>attribute.delete-timeseries.start-time</mat-label>
-          <mat-datetimepicker-toggle [for]="startDateTimePicker" matPrefix></mat-datetimepicker-toggle>
-          <mat-datetimepicker #startDateTimePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input required matInput formControlName="startDateTime" [matDatetimepicker]="startDateTimePicker">
-        </mat-form-field>
-        <mat-form-field class="mat-block">
-          <mat-label translate>attribute.delete-timeseries.ends-on</mat-label>
-          <mat-datetimepicker-toggle [for]="endDatePicker" matPrefix></mat-datetimepicker-toggle>
-          <mat-datetimepicker #endDatePicker type="datetime" openOnFocus="true"></mat-datetimepicker>
-          <input required matInput formControlName="endDateTime" [matDatetimepicker]="endDatePicker">
-        </mat-form-field>
-      </div>
-    </div>
-    <div *ngIf="isPeriodStrategy() || isDeleteLatestStrategy()">
-      <mat-slide-toggle formControlName="rewriteLatest">
-        {{ "attribute.delete-timeseries.rewrite-latest-value" | translate }}
-      </mat-slide-toggle>
-    </div>
   </div>
+  <mat-slide-toggle class="tb-slide-toggle" formControlName="rewriteLatest" *ngIf="isPeriodStrategy() || isDeleteLatestStrategy()">
+    {{ "attribute.delete-timeseries.rewrite-latest-value" | translate }}
+  </mat-slide-toggle>
 </form>
 <div fxLayout="row" class="tb-panel-actions">
   <span fxFlex></span>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
index d223b29b47..c9a0e527f7 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.scss
@@ -13,16 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@import '../../../../../scss/constants';
 
 :host {
   width: 100%;
-  background-color: #fff;
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3), 0px 2px 6px 2px rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
-}
 
-:host ::ng-deep{
-  form .mat-toolbar {
+  .mat-toolbar {
     background: none;
   }
+
+  .tb-form-settings {
+    flex-direction: column;
+    gap: 16px;
+    padding-top: 0;
+  }
+
+  .tb-select-interval {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    @media #{$mat-xs} {
+      flex-direction: column;
+      gap: 0;
+    }
+  }
+
+  .tb-slide-toggle {
+    margin-bottom: 8px;
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
index 8adb9bcd5a..94c66b3734 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/delete-timeseries-panel.component.ts
@@ -51,34 +51,33 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
 
   strategiesTranslationsMap = timeseriesDeleteStrategyTranslations;
 
-  multipleDeletionStrategies = [
+  private multipleDeletionStrategies = new Set<TimeseriesDeleteStrategy>([
     TimeseriesDeleteStrategy.DELETE_ALL_DATA,
     TimeseriesDeleteStrategy.DELETE_ALL_DATA_EXCEPT_LATEST_VALUE
-  ];
+  ]);
 
   private destroy$ = new Subject<void>();
 
-  constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) public data: DeleteTimeseriesPanelData,
-              public overlayRef: OverlayRef,
-              public fb: FormBuilder) { }
+  constructor(@Inject(DELETE_TIMESERIES_PANEL_DATA) private data: DeleteTimeseriesPanelData,
+              private overlayRef: OverlayRef,
+              private fb: FormBuilder) { }
 
   ngOnInit(): void {
     const today = new Date();
     if (this.data.isMultipleDeletion) {
-      this.strategiesTranslationsMap = new Map(Array.from(this.strategiesTranslationsMap.entries())
-        .filter(([strategy]) => {
-          return this.multipleDeletionStrategies.includes(strategy);
-      }))
+      this.strategiesTranslationsMap = new Map(Array.from(this.strategiesTranslationsMap)
+        .filter(([strategy]) => this.multipleDeletionStrategies.has(strategy)))
     }
     this.deleteTimeseriesFormGroup = this.fb.group({
       strategy: [TimeseriesDeleteStrategy.DELETE_ALL_DATA],
       startDateTime: [
         { value: new Date(today.getFullYear(), today.getMonth() - 1, today.getDate()), disabled: true },
-        [Validators.required]
+        Validators.required
       ],
-      endDateTime: [{ value: today, disabled: true }, [Validators.required]],
+      endDateTime: [{ value: today, disabled: true }, Validators.required],
       rewriteLatest: [true]
     })
+
     this.deleteTimeseriesFormGroup.get('strategy').valueChanges.pipe(
       takeUntil(this.destroy$)
     ).subscribe(value => {
@@ -124,7 +123,7 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
     return this.deleteTimeseriesFormGroup.get('strategy').value === TimeseriesDeleteStrategy.DELETE_LATEST_VALUE;
   }
 
-  onStartDateTimeChange(newStartDateTime: Date) {
+  private onStartDateTimeChange(newStartDateTime: Date) {
     if (newStartDateTime) {
       const endDateTimeTs = this.deleteTimeseriesFormGroup.get('endDateTime').value.getTime();
       if (newStartDateTime.getTime() >= endDateTimeTs) {
@@ -137,7 +136,7 @@ export class DeleteTimeseriesPanelComponent implements OnInit, OnDestroy {
     }
   }
 
-  onEndDateTimeChange(newEndDateTime: Date) {
+  private onEndDateTimeChange(newEndDateTime: Date) {
     if (newEndDateTime) {
       const startDateTimeTs = this.deleteTimeseriesFormGroup.get('startDateTime').value.getTime();
       if (newEndDateTime.getTime() <= startDateTimeTs) {

From ba85007a2dab10ba2bb8c0839b551e07c6a2f747 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 9 Aug 2023 10:59:13 +0200
Subject: [PATCH 11/11] minor improvements

---
 .../server/controller/TelemetryController.java         | 10 ++++++----
 ui-ngx/src/assets/locale/locale.constant-ca_ES.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-cs_CZ.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-da_DK.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-de_DE.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-el_GR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-en_US.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-es_ES.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-fa_IR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-fr_FR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-it_IT.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-ja_JP.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-ka_GE.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-ko_KR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-lv_LV.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-pt_BR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-ro_RO.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-sl_SI.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-tr_TR.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-uk_UA.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-zh_CN.json    |  1 +
 ui-ngx/src/assets/locale/locale.constant-zh_TW.json    |  1 +
 22 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 6937fa6c84..2445ee9bb6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -462,7 +462,9 @@ public class TelemetryController extends BaseController {
             notes = "Delete time-series for selected entity based on entity id, entity type and keys." +
                     " Use 'deleteAllDataForKeys' to delete all time-series data." +
                     " Use 'startTs' and 'endTs' to specify time-range instead. " +
-                    " Use 'rewriteLatestIfDeleted' to rewrite latest value (stored in separate table for performance) after deletion of the time range. " +
+                    " Use 'deleteLatest' to delete latest value (stored in separate table for performance) if the value's timestamp matches the time-range. " +
+                    " Use 'rewriteLatestIfDeleted' to rewrite latest value (stored in separate table for performance) if the value's timestamp matches the time-range and 'deleteLatest' param is true." +
+                    " The replacement value will be fetched from the 'time-series' table, and its timestamp will be the most recent one before the defined time-range. " +
                     TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
             produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiResponses(value = {
@@ -486,10 +488,10 @@ public class TelemetryController extends BaseController {
             @RequestParam(name = "startTs", required = false) Long startTs,
             @ApiParam(value = "A long value representing the end timestamp of removal time range in milliseconds.")
             @RequestParam(name = "endTs", required = false) Long endTs,
-            @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
-            @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted,
             @ApiParam(value = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
-            @RequestParam(name = "deleteLatest", required = false, defaultValue = "true") boolean deleteLatest) throws ThingsboardException {
+            @RequestParam(name = "deleteLatest", required = false, defaultValue = "true") boolean deleteLatest,
+            @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
+            @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
     }
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index 103d55a79c..34735dc1c5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -633,6 +633,7 @@
         "latest-telemetry": "Última telemetria",
         "attributes-scope": "Abast dels atributs del dispositiu",
         "scope-telemetry": "Telemetria",
+        "scope-latest-telemetry": "Última telemetria",
         "scope-client": "Atributs del Client",
         "scope-server": "Atributs del Servidor",
         "scope-shared": "Atributs Compartits",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index 2a79340240..25325acab7 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -446,6 +446,7 @@
         "latest-telemetry": "Poslední telemetrie",
         "attributes-scope": "Rozsah atributů entity",
         "scope-telemetry": "Telemetrie",
+        "scope-latest-telemetry": "Poslední telemetrie",
         "scope-client": "Atributy klienta",
         "scope-server": "Atributy serveru",
         "scope-shared": "Sdílené atributy",
diff --git a/ui-ngx/src/assets/locale/locale.constant-da_DK.json b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
index 7389ef448d..1c26dd45a7 100644
--- a/ui-ngx/src/assets/locale/locale.constant-da_DK.json
+++ b/ui-ngx/src/assets/locale/locale.constant-da_DK.json
@@ -454,6 +454,7 @@
     "latest-telemetry": "Seneste telemetri",
     "attributes-scope": "Omfang af entitetsattributter",
     "scope-telemetry": "Telemetri",
+    "scope-latest-telemetry": "Seneste telemetri",
     "scope-client": "Klientattributter",
     "scope-server": "Serverattributter",
     "scope-shared": "Delte attributter",
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
index c27d63f4fb..d7b50d51c3 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -325,6 +325,7 @@
     "latest-telemetry": "Neueste Telemetrie",
     "attributes-scope": "Entitätseigenschaftsbereich",
     "scope-telemetry": "Telemetrie",
+    "scope-latest-telemetry": "Neueste Telemetrie",
     "scope-client": "Client Eigenschaften",
     "scope-server": "Server Eigenschaften",
     "scope-shared": "Gemeinsame Eigenschaften",
diff --git a/ui-ngx/src/assets/locale/locale.constant-el_GR.json b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
index 36e8e4e000..9c5ac0db54 100644
--- a/ui-ngx/src/assets/locale/locale.constant-el_GR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-el_GR.json
@@ -292,6 +292,7 @@
     "latest-telemetry": "Τελευταία τηλεμετρία",
     "attributes-scope": "Πεδίο εφαρμογής Χαρακτηριστικών Οντότητας",
     "scope-telemetry": "Τηλεμετρία",
+    "scope-latest-telemetry": "Τελευταία τηλεμετρία",
     "scope-client": "Χαρακτηριστικά Client",
     "scope-server": "Χαρακτηριστικά Server",
     "scope-shared": "Κοινόχρηστα Χαρακτηριστικά",
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 30c05e2edb..76484651b0 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -700,6 +700,7 @@
         "no-latest-telemetry": "No latest telemetry",
         "attributes-scope": "Entity attributes scope",
         "scope-telemetry": "Telemetry",
+        "scope-latest-telemetry": "Latest telemetry",
         "scope-client": "Client attributes",
         "scope-server": "Server attributes",
         "scope-shared": "Shared attributes",
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index ec4f93823b..cbbaf4b5a1 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -668,6 +668,7 @@
         "latest-telemetry": "Última telemetría",
         "attributes-scope": "Alcance de los atributos del dispositivo",
         "scope-telemetry": "Telemetría",
+        "scope-latest-telemetry": "Última telemetría",
         "scope-client": "Atributos de Cliente",
         "scope-server": "Atributos de Servidor",
         "scope-shared": "Atributos Compartidos",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
index da841a6e53..6ab40820ec 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fa_IR.json
@@ -255,6 +255,7 @@
         "latest-telemetry": "آخرين سنجش",
         "attributes-scope": "حوزه ويژگي هاي موجودي",
         "scope-telemetry": "تله متری",
+        "scope-latest-telemetry": "آخرين سنجش",
         "scope-client": "ويژگي هاي مشتري",
         "scope-server": "ويژگي هاي سِروِر",
         "scope-shared": "ويژگي هاي مشترک",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index c021784db7..3db8795df6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -460,6 +460,7 @@
         "prev-widget": "Widget précédent",
         "scope-client": "Attributs du client",
         "scope-telemetry": "Télémétrie",
+        "scope-latest-telemetry": "Dernière télémétrie",
         "scope-server": "Attributs du serveur",
         "scope-shared": "Attributs partagés",
         "selected-attributes": "{count, plural, =1 {1 attribut} other {# attributs} } sélectionnés",
diff --git a/ui-ngx/src/assets/locale/locale.constant-it_IT.json b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
index 2c093e76a9..61f6554049 100644
--- a/ui-ngx/src/assets/locale/locale.constant-it_IT.json
+++ b/ui-ngx/src/assets/locale/locale.constant-it_IT.json
@@ -277,6 +277,7 @@
         "latest-telemetry": "Ultima telemetria",
         "attributes-scope": "Visibilità attributi entità",
         "scope-telemetry": "Telemetria",
+        "scope-latest-telemetry": "Ultima telemetria",
         "scope-client": "Attributi client",
         "scope-server": "Attributi server",
         "scope-shared": "Attributi condivisi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
index 23145c1f89..56130aabc3 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ja_JP.json
@@ -245,6 +245,7 @@
 		"latest-telemetry": "最新テレメトリ",
 		"attributes-scope": "エンティティ属性のスコープ",
 		"scope-telemetry": "テレメトリー",
+		"scope-latest-telemetry": "最新テレメトリ",
 		"scope-client": "クライアントの属性",
 		"scope-server": "サーバーの属性",
 		"scope-shared": "共有属性",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
index 89d25703e3..55b6e85f66 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ka_GE.json
@@ -291,6 +291,7 @@
     "latest-telemetry": "უახლესი ტელემეტრია",
     "attributes-scope": "ობიექტის ატრიბუტების ფარგლები",
     "scope-telemetry": "ტელემეტრია",
+    "scope-latest-telemetry": "უახლესი ტელემეტრია",
     "scope-client": "კლიენტის ატრიბუტები",
     "scope-server": "სერვერის ატრიბუტები",
     "scope-shared": "ატრიბუტების გაზიარება",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
index c1be51d1db..ae53707a52 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ko_KR.json
@@ -409,6 +409,7 @@
         "latest-telemetry": "최근 데이터",
         "attributes-scope": "장치 속성 범위",
         "scope-telemetry": "원격 측정",
+        "scope-latest-telemetry": "최근 데이터",
         "scope-client": "클라이언트 속성",
         "scope-server": "서버 속성",
         "scope-shared": "공유 속성",
diff --git a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
index f4f5befc14..00e6be4714 100644
--- a/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
+++ b/ui-ngx/src/assets/locale/locale.constant-lv_LV.json
@@ -257,6 +257,7 @@
         "latest-telemetry": "Jaunākā telemetrija",
         "attributes-scope": "Vienības atribūtu darbības joma",
         "scope-telemetry": "Telemetrija",
+        "scope-latest-telemetry": "Jaunākā telemetrija",
         "scope-client": "Klientu atribūti",
         "scope-server": "Servera atribūti",
         "scope-shared": "Dalītie atribūti",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
index 28c7082df9..12ad7743c4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pt_BR.json
@@ -310,6 +310,7 @@
     "latest-telemetry": "Última telemetria",
     "attributes-scope": "Escopo de atributos de entidade",
     "scope-telemetry": "Telemetria",
+    "scope-latest-telemetry": "Última telemetria",
     "scope-client": "Atributos do cliente",
     "scope-server": "Atributos do servidor",
     "scope-shared": "Atributos compartilhados",
diff --git a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
index da0012e6f6..4b565d8311 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ro_RO.json
@@ -286,6 +286,7 @@
         "latest-telemetry": "Ultimele Date Telemetrice",
         "attributes-scope": "Scop Atribute Entitate",
         "scope-telemetry": "Telemetrie",
+        "scope-latest-telemetry": "Ultimele Date Telemetrice",
         "scope-client": "Atribute Client",
         "scope-server": "Atribute Server",
         "scope-shared": "Atribute Partajate",
diff --git a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
index 7875163b60..0515b5890e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
+++ b/ui-ngx/src/assets/locale/locale.constant-sl_SI.json
@@ -409,6 +409,7 @@
     "latest-telemetry": "Najnovejša telemetrija",
     "attributes-scope": "Obseg atributov entitete",
     "scope-telemetry": "Telemetrija",
+    "scope-latest-telemetry": "Najnovejša telemetrija",
     "scope-client": "Atributi odjemalca",
     "scope-server": "Atributi strežnika",
     "scope-shared": "Skupni atributi",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index c56be48c74..8590dd2768 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -446,6 +446,7 @@
     "latest-telemetry": "Son telemetri",
     "attributes-scope": "Varlık öznitelik kapsamı",
     "scope-telemetry": "telemetri",
+    "scope-latest-telemetry": "Son telemetri",
     "scope-client": "İstemci öznitelikler",
     "scope-server": "Sunucu öznitelikler",
     "scope-shared": "Paylaşılan öznitelikler",
diff --git a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
index bd608cd709..c7afaad234 100644
--- a/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
+++ b/ui-ngx/src/assets/locale/locale.constant-uk_UA.json
@@ -343,6 +343,7 @@
         "latest-telemetry": "Остання телеметрія",
         "attributes-scope": "Область видимості атрибутів",
         "scope-telemetry": "Телеметрія",
+        "scope-latest-telemetry": "Остання телеметрія",
         "scope-client": "Клієнтські атрибути",
         "scope-server": "Серверні атрибути",
         "scope-shared": "Спільні атрибути",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index 2fd73b32bd..6e5bf9a6b6 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -591,6 +591,7 @@
         "latest-telemetry": "最新遥测数据",
         "attributes-scope": "设备属性范围",
         "scope-telemetry": "遥测",
+        "scope-latest-telemetry": "最新遥测数据",
         "scope-client": "客户端属性",
         "scope-server": "服务端属性",
         "scope-shared": "共享属性",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
index 526597ad70..2b98451f20 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json
@@ -520,6 +520,7 @@
         "latest-telemetry": "最新遙測",
         "attributes-scope": "設備屬性範圍",
         "scope-telemetry": "遙測",
+        "scope-latest-telemetry": "最新遙測",
         "scope-client": "客戶端屬性",
         "scope-server": "服務端屬性",
         "scope-shared": "共享屬性",