Merge branch 'rc'

application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java

@@ -19,12 +19,13 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
@@ -54,6 +55,7 @@ import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LI
 @RequiredArgsConstructor
 @RequestMapping("/api")
 public class AlarmCommentController extends BaseController {
+
     public static final String ALARM_ID = "alarmId";
     public static final String ALARM_COMMENT_ID = "commentId";
 
@@ -68,8 +70,7 @@ public class AlarmCommentController extends BaseController {
                     "\n\n If comment type is not specified the default value 'OTHER' will be saved. If 'alarmId' or 'userId' specified in body it will be ignored." +
                     TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.POST)
+    @PostMapping(value = "/alarm/{alarmId}/comment")
-    @ResponseBody
     public AlarmComment saveAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                                          @PathVariable(ALARM_ID) String strAlarmId, @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
@@ -82,8 +83,7 @@ public class AlarmCommentController extends BaseController {
     @ApiOperation(value = "Delete Alarm comment (deleteAlarmComment)",
             notes = "Deletes the Alarm comment. Referencing non-existing Alarm comment Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/comment/{commentId}", method = RequestMethod.DELETE)
+    @DeleteMapping(value = "/alarm/{alarmId}/comment/{commentId}")
-    @ResponseBody
     public void deleteAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId, @Parameter(description = ALARM_COMMENT_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_COMMENT_ID) String strCommentId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -98,8 +98,7 @@ public class AlarmCommentController extends BaseController {
             notes = "Returns a page of alarm comments for specified alarm. " +
                     PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/{alarmId}/comment")
-    @ResponseBody
     public PageData<AlarmCommentInfo> getAlarmComments(
             @Parameter(description = ALARM_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ALARM_ID) String strAlarmId,
@@ -118,4 +117,5 @@ public class AlarmCommentController extends BaseController {
         PageLink pageLink = createPageLink(pageSize, page, null, sortProperty, sortOrder);
         return checkNotNull(alarmCommentService.findAlarmComments(alarm.getTenantId(), alarmId, pageLink));
     }
+
 }

application/src/main/java/org/thingsboard/server/controller/AlarmController.java

@@ -21,12 +21,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.EntitySubtype;
@@ -58,7 +59,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_INFO_DESCRIPTION;
@@ -104,8 +104,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Get Alarm (getAlarmById)",
             notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/{alarmId}")
-    @ResponseBody
     public Alarm getAlarmById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                               @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
@@ -117,8 +116,7 @@ public class AlarmController extends BaseController {
             notes = "Fetch the Alarm Info object based on the provided Alarm Id. " +
                     ALARM_SECURITY_CHECK + ALARM_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/info/{alarmId}", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/info/{alarmId}")
-    @ResponseBody
     public AlarmInfo getAlarmInfoById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                                       @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
@@ -136,11 +134,9 @@ public class AlarmController extends BaseController {
                     "If the user tries to create 'HighTemperature' alarm for the same device again, the previous alarm will be updated (the 'end_ts' will be set to current timestamp). " +
                     "If the user clears the alarm (see 'Clear Alarm(clearAlarm)'), than new alarm with the same type and same device may be created. " +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Alarm entity. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
-            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm", method = RequestMethod.POST)
+    @PostMapping(value = "/alarm")
-    @ResponseBody
     public Alarm saveAlarm(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
         alarm.setTenantId(getTenantId());
         checkNotNull(alarm.getOriginator());
@@ -155,8 +151,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Delete Alarm (deleteAlarm)",
             notes = "Deletes the Alarm. Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.DELETE)
+    @DeleteMapping(value = "/alarm/{alarmId}")
-    @ResponseBody
     public boolean deleteAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -169,7 +164,7 @@ public class AlarmController extends BaseController {
                     "Once acknowledged, the 'ack_ts' field will be set to current timestamp and special rule chain event 'ALARM_ACK' will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/ack", method = RequestMethod.POST)
+    @PostMapping(value = "/alarm/{alarmId}/ack")
     @ResponseStatus(value = HttpStatus.OK)
     public AlarmInfo ackAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
@@ -184,7 +179,7 @@ public class AlarmController extends BaseController {
                     "Once cleared, the 'clear_ts' field will be set to current timestamp and special rule chain event 'ALARM_CLEAR' will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/clear", method = RequestMethod.POST)
+    @PostMapping(value = "/alarm/{alarmId}/clear")
     @ResponseStatus(value = HttpStatus.OK)
     public AlarmInfo clearAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
@@ -200,7 +195,7 @@ public class AlarmController extends BaseController {
                     "(or ALARM_REASSIGNED in case of assigning already assigned alarm) will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/assign/{assigneeId}", method = RequestMethod.POST)
+    @PostMapping(value = "/alarm/{alarmId}/assign/{assigneeId}")
     @ResponseStatus(value = HttpStatus.OK)
     public Alarm assignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                              @PathVariable(ALARM_ID) String strAlarmId,
@@ -221,7 +216,7 @@ public class AlarmController extends BaseController {
                     "Once unassigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_UNASSIGNED' will be generated. " +
                     "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{alarmId}/assign", method = RequestMethod.DELETE)
+    @DeleteMapping(value = "/alarm/{alarmId}/assign")
     @ResponseStatus(value = HttpStatus.OK)
     public Alarm unassignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                                @PathVariable(ALARM_ID) String strAlarmId
@@ -236,8 +231,7 @@ public class AlarmController extends BaseController {
             notes = "Returns a page of alarms for the selected entity. Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
                     PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/{entityType}/{entityId}")
-    @ResponseBody
     public PageData<AlarmInfo> getAlarms(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
@@ -265,7 +259,7 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) Long endTime,
             @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
             @RequestParam(required = false) Boolean fetchOriginator
-    ) throws ThingsboardException, ExecutionException, InterruptedException {
+    ) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
         EntityId entityId = EntityIdFactory.getByTypeAndId(strEntityType, strEntityId);
@@ -292,8 +286,7 @@ public class AlarmController extends BaseController {
                     "Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
                     PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarms", method = RequestMethod.GET)
+    @GetMapping(value = "/alarms")
-    @ResponseBody
     public PageData<AlarmInfo> getAllAlarms(
             @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String searchStatus,
@@ -317,7 +310,7 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) Long endTime,
             @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
             @RequestParam(required = false) Boolean fetchOriginator
-    ) throws ThingsboardException, ExecutionException, InterruptedException {
+    ) throws ThingsboardException {
         AlarmSearchStatus alarmSearchStatus = StringUtils.isEmpty(searchStatus) ? null : AlarmSearchStatus.valueOf(searchStatus);
         AlarmStatus alarmStatus = StringUtils.isEmpty(status) ? null : AlarmStatus.valueOf(status);
         if (alarmSearchStatus != null && alarmStatus != null) {
@@ -341,8 +334,7 @@ public class AlarmController extends BaseController {
             notes = "Returns a page of alarms for the selected entity. " +
                     PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/v2/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
+    @GetMapping(value = "/v2/alarm/{entityType}/{entityId}")
-    @ResponseBody
     public PageData<AlarmInfo> getAlarmsV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
@@ -370,7 +362,7 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) Long startTime,
             @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime
-    ) throws ThingsboardException, ExecutionException, InterruptedException {
+    ) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
         EntityId entityId = EntityIdFactory.getByTypeAndId(strEntityType, strEntityId);
@@ -407,8 +399,7 @@ public class AlarmController extends BaseController {
                     "If the user has the authority of 'Customer User', the server returns alarms that belongs to the customer of current user. " +
                     PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/v2/alarms", method = RequestMethod.GET)
+    @GetMapping(value = "/v2/alarms")
-    @ResponseBody
     public PageData<AlarmInfo> getAllAlarmsV2(
             @Parameter(description = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, array = @ArraySchema(schema = @Schema(type = "string", allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"})))
             @RequestParam(required = false) String[] statusList,
@@ -432,7 +423,7 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) Long startTime,
             @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime
-    ) throws ThingsboardException, ExecutionException, InterruptedException {
+    ) throws ThingsboardException {
         List<AlarmSearchStatus> alarmStatusList = new ArrayList<>();
         if (statusList != null) {
             for (String strStatus : statusList) {
@@ -465,11 +456,9 @@ public class AlarmController extends BaseController {
 
     @ApiOperation(value = "Get Highest Alarm Severity (getHighestAlarmSeverity)",
             notes = "Search the alarms by originator ('entityType' and entityId') and optional 'status' or 'searchStatus' filters and returns the highest AlarmSeverity(CRITICAL, MAJOR, MINOR, WARNING or INDETERMINATE). " +
-                    "Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
+                    "Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
-            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/highestSeverity/{entityType}/{entityId}", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/highestSeverity/{entityType}/{entityId}")
-    @ResponseBody
     public AlarmSeverity getHighestAlarmSeverity(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
@@ -499,8 +488,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Get Alarm Types (getAlarmTypes)",
             notes = "Returns a set of unique alarm types based on alarms that are either owned by the tenant or assigned to the customer which user is performing the request.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/alarm/types", method = RequestMethod.GET)
+    @GetMapping(value = "/alarm/types")
-    @ResponseBody
     public PageData<EntitySubtype> getAlarmTypes(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                  @RequestParam int pageSize,
                                                  @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
@@ -508,7 +496,7 @@ public class AlarmController extends BaseController {
                                                  @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
                                                  @RequestParam(required = false) String textSearch,
                                                  @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
-                                                 @RequestParam(required = false) String sortOrder) throws ThingsboardException, ExecutionException, InterruptedException {
+                                                 @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, "type", sortOrder);
         return checkNotNull(alarmService.findAlarmTypesByTenantId(getTenantId(), pageLink));
     }

application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java

@@ -32,7 +32,7 @@ import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
 @Service
 @AllArgsConstructor
-public class DefaultTbAlarmCommentService extends AbstractTbEntityService implements TbAlarmCommentService{
+public class DefaultTbAlarmCommentService extends AbstractTbEntityService implements TbAlarmCommentService {
 
     @Autowired
     private AlarmCommentService alarmCommentService;
@@ -68,4 +68,5 @@ public class DefaultTbAlarmCommentService extends AbstractTbEntityService implem
             throw new ThingsboardException("System comment could not be deleted", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
     }
+
 }

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java

@@ -43,33 +43,30 @@ public class AlarmsDeletionTaskProcessor extends HousekeeperTaskProcessor<Alarms
         EntityType entityType = entityId.getEntityType();
         TenantId tenantId = task.getTenantId();
 
-        if (entityType == EntityType.DEVICE || entityType == EntityType.ASSET) {
+        if (task.getAlarms() == null) {
-            if (task.getAlarms() == null) {
+            AlarmId lastId = null;
-                AlarmId lastId = null;
+            long lastCreatedTime = 0;
-                long lastCreatedTime = 0;
+            while (true) {
-                while (true) {
+                List<TbPair<UUID, Long>> alarms = alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, lastCreatedTime, lastId, 128);
-                    List<TbPair<UUID, Long>> alarms = alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, lastCreatedTime, lastId, 128);
+                if (alarms.isEmpty()) {
-                    if (alarms.isEmpty()) {
+                    break;
-                        break;
+                }
-                    }
 
-                    housekeeperClient.submitTask(new AlarmsDeletionHousekeeperTask(tenantId, entityId, alarms.stream().map(TbPair::getFirst).toList()));
+                housekeeperClient.submitTask(new AlarmsDeletionHousekeeperTask(tenantId, entityId, alarms.stream().map(TbPair::getFirst).toList()));
 
-                    TbPair<UUID, Long> last = alarms.get(alarms.size() - 1);
+                TbPair<UUID, Long> last = alarms.get(alarms.size() - 1);
-                    lastId = new AlarmId(last.getFirst());
+                lastId = new AlarmId(last.getFirst());
-                    lastCreatedTime = last.getSecond();
+                lastCreatedTime = last.getSecond();
-                    log.debug("[{}][{}][{}] Submitted task for deleting {} alarms", tenantId, entityType, entityId, alarms.size());
+                log.debug("[{}][{}][{}] Submitted task for deleting {} alarms", tenantId, entityType, entityId, alarms.size());
-                }
-            } else {
-                for (UUID alarmId : task.getAlarms()) {
-                    alarmService.delAlarm(tenantId, new AlarmId(alarmId));
-                }
-                log.debug("[{}][{}][{}] Deleted {} alarms", tenantId, entityType, entityId, task.getAlarms().size());
             }
+            int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
+            log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
+        } else {
+            for (UUID alarmId : task.getAlarms()) {
+                alarmService.delAlarm(tenantId, new AlarmId(alarmId));
+            }
+            log.debug("[{}][{}][{}] Deleted {} alarms", tenantId, entityType, entityId, task.getAlarms().size());
         }
-
-        int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
-        log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
     }
 
     @Override

application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java

@@ -31,6 +31,8 @@ import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EventInfo;
 import org.thingsboard.server.common.data.StringUtils;
@@ -77,6 +79,8 @@ import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.entity.EntityServiceRegistry;
 import org.thingsboard.server.dao.event.EventService;
 import org.thingsboard.server.dao.relation.RelationService;
@@ -145,6 +149,10 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
     private ApiUsageStateDao apiUsageStateDao;
     @Autowired
     private EntityServiceRegistry entityServiceRegistry;
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private DashboardService dashboardService;
     @SpyBean
     private TsHistoryDeletionTaskProcessor tsHistoryDeletionTaskProcessor;
 
@@ -238,11 +246,67 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
 
         doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
 
-        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             verifyNoAlarms(device.getId());
         });
     }
 
+    @Test
+    public void whenAssetIsDeleted_thenDeleteAllAlarms() throws Exception {
+        Asset asset = createAsset();
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(asset.getId());
+        }
+
+        doDelete("/api/asset/" + asset.getId()).andExpect(status().isOk());
+
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(asset.getId());
+        });
+    }
+
+    @Test
+    public void whenDashboardIsDeleted_thenDeleteAllAlarms() throws Exception {
+        Dashboard dashboard = createDashboard();
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(dashboard.getId());
+        }
+
+        doDelete("/api/dashboard/" + dashboard.getId()).andExpect(status().isOk());
+
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(dashboard.getId());
+        });
+    }
+
+    @Test
+    public void whenCustomerIsDeleted_thenDeleteAllAlarms() throws Exception {
+        Customer customer = createCustomer();
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(customer.getId());
+        }
+
+        doDelete("/api/customer/" + customer.getId()).andExpect(status().isOk());
+
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(customer.getId());
+        });
+    }
+
+    @Test
+    public void whenUserIsDeleted_thenDeleteAllAlarms() throws Exception {
+        UserId userId = customerUserId;
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(userId);
+        }
+
+        doDelete("/api/user/" + userId).andExpect(status().isOk());
+
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(userId);
+        });
+    }
+
     @Test
     public void whenTenantIsDeleted_thenDeleteAllEntitiesAndCleanUpRelatedData() throws Exception {
         loginDifferentTenant();
@@ -335,7 +399,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
 
         int attempts = 2;
-        await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
             for (int i = 0; i <= attempts; i++) {
                 int attempt = i;
                 verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
@@ -345,7 +409,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
 
         assertThat(getTimeseriesHistory(device.getId())).isNotEmpty();
         doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
-        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(getTimeseriesHistory(device.getId())).isEmpty();
         });
     }
@@ -379,7 +443,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
 
         int attempts = 2;
-        await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
             for (int i = 0; i <= attempts; i++) {
                 int attempt = i;
                 verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
@@ -393,7 +457,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
         someExecutor.shutdown();
 
-        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(getTimeseriesHistory(device.getId())).isEmpty();
         });
     }
@@ -409,7 +473,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
 
         int maxAttempts = 5;
-        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             for (int i = 1; i <= maxAttempts; i++) {
                 verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, i);
             }
@@ -479,7 +543,6 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         eventService.saveAsync(event);
         await().atMost(10, TimeUnit.SECONDS)
                 .until(() -> !getEvents(entityId).isEmpty());
-
     }
 
     private void createRelation(DeviceId to, AssetId from) {
@@ -502,14 +565,14 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
     }
 
-    private void createAlarm(DeviceId deviceId) {
+    private void createAlarm(EntityId entityId) {
-        Alarm alarm = doPost("/api/alarm", Alarm.builder()
+        doPost("/api/alarm", Alarm.builder()
                 .tenantId(tenantId)
-                .originator(deviceId)
+                .originator(entityId)
                 .severity(AlarmSeverity.CRITICAL)
-                .type("test alarm for " + deviceId + " " + RandomStringUtils.randomAlphabetic(10))
+                .type("test alarm for " + entityId + " " + RandomStringUtils.randomAlphabetic(10))
                 .build(), Alarm.class);
-        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, 0, null, 10)).isNotEmpty();
     }
 
     private TsKvEntry getLatestTelemetry(EntityId entityId) throws Exception {
@@ -534,6 +597,20 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         return doPost("/api/asset", asset, Asset.class);
     }
 
+    private Customer createCustomer() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle(StringUtils.randomAlphabetic(10));
+        return customerService.saveCustomer(customer);
+    }
+
+    private Dashboard createDashboard() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTenantId(tenantId);
+        dashboard.setTitle(StringUtils.randomAlphabetic(10));
+        return dashboardService.saveDashboard(dashboard);
+    }
+
     private RuleChainMetaData createRuleChain() {
         RuleChain ruleChain = new RuleChain();
         ruleChain.setTenantId(tenantId);

common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java

@@ -37,13 +37,11 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+import java.io.Serial;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-/**
- * Created by ashvayka on 11.05.17.
- */
 @Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -52,6 +50,9 @@ import java.util.UUID;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, HasCustomerId {
 
+    @Serial
+    private static final long serialVersionUID = -1935800187424953611L;
+
     @Schema(description = "JSON object with Tenant Id", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
 

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java

@@ -30,11 +30,17 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+import java.io.Serial;
+
 @Schema
 @Data
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
+
+    @Serial
+    private static final long serialVersionUID = -5454905526404017592L;
+
     @Schema(description = "JSON object with Alarm id.", accessMode = Schema.AccessMode.READ_ONLY)
     private AlarmId alarmId;
     @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
@@ -85,4 +91,5 @@ public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
         this.comment = alarmComment.getComment();
         this.userId = alarmComment.getUserId();
     }
+
 }

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java

@@ -22,9 +22,6 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.TimePageLink;
 
-/**
- * Created by ashvayka on 11.05.17.
- */
 @Data
 @Builder
 @AllArgsConstructor

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java

@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-/**
- * Created by ashvayka on 11.05.17.
- */
 public enum AlarmSeverity {
 
     CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE;

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java

@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-/**
- * Created by ashvayka on 11.05.17.
- */
 public enum AlarmStatus {
 
     ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK;

dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.dao.alarm;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Function;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
@@ -68,7 +67,6 @@ import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.ConstraintValidator;
-import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.tenant.TenantService;
 
 import java.util.ArrayList;
@@ -98,7 +96,6 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     private final TenantService tenantService;
     private final AlarmDao alarmDao;
     private final EntityService entityService;
-    private final DataValidator<Alarm> alarmDataValidator;
 
     @TransactionalEventListener(classes = AlarmTypesCacheEvictEvent.class)
     @Override
@@ -444,12 +441,6 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
         }
     }
 
-    private <T> T getAndUpdate(TenantId tenantId, AlarmId alarmId, Function<Alarm, T> function) {
-        validateId(alarmId, "Alarm id should be specified!");
-        Alarm entity = alarmDao.findAlarmById(tenantId, alarmId.getId());
-        return function.apply(entity);
-    }
-
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findAlarmById(tenantId, new AlarmId(entityId.getId())));

dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java

@@ -32,9 +32,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-/**
- * Created by Valerii Sosliuk on 5/21/2017.
- */
 public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
 
     @Query("SELECT a FROM AlarmEntity a WHERE a.originatorId = :originatorId AND a.type = :alarmType ORDER BY a.startTs DESC")

pom.xml

@@ -38,8 +38,7 @@
         <pkg.implementationTitle>${project.name}</pkg.implementationTitle>
         <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <spring-boot.version>3.4.7</spring-boot.version>
+        <spring-boot.version>3.4.8</spring-boot.version>
-        <tomcat.version>10.1.43</tomcat.version> <!-- to fix CVE-2025-52520 and CVE-2025-53506. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jedis.version>5.1.5</jedis.version>
         <jjwt.version>0.12.5</jjwt.version>
@@ -52,6 +51,7 @@
         <commons-io.version>2.16.1</commons-io.version>
         <commons-logging.version>1.3.1</commons-logging.version>
         <commons-csv.version>1.10.0</commons-csv.version>
+        <nimbus-jose-jwt.version>10.0.2</nimbus-jose-jwt.version> <!-- to fix CVE-2023-52428, CVE-2025-53864. TODO: remove when fixed in spring-security-oauth2-client and mockserver-netty   -->
         <apache-httpclient.version>4.5.14</apache-httpclient.version>
         <joda-time.version>2.12.7</joda-time.version>
         <auth0-jwt.version>4.4.0</auth0-jwt.version>
@@ -121,7 +121,6 @@
         <dbunit.version>2.7.3</dbunit.version>
         <java-websocket.version>1.5.6</java-websocket.version>
         <mock-server.version>5.15.0</mock-server.version>
-        <nimbus-jose-jwt.version>9.37.2</nimbus-jose-jwt.version> <!-- to fix CVE-2023-52428. TODO: remove when fixed in mockserver-netty  -->
         <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version> <!-- 2016 -->
         <takari-cpsuite.version>1.2.7</takari-cpsuite.version> <!-- 2015 -->
         <jeasy.version>5.0.0</jeasy.version>
@@ -1131,21 +1130,6 @@
                 <artifactId>jaxb-api</artifactId>
                 <version>${javax.xml.bind-api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-el</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-websocket</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-test</artifactId>
@@ -1782,7 +1766,6 @@
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
                 <version>${nimbus-jose-jwt.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mock-server</groupId>

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java

@@ -42,9 +42,6 @@ import org.thingsboard.server.common.data.query.AlarmDataQuery;
 
 import java.util.Collection;
 
-/**
- * Created by ashvayka on 02.04.18.
- */
 public interface RuleEngineAlarmService {
 
     /*

rule-engine/rule-engine-components/pom.xml

@@ -144,11 +144,6 @@
             <artifactId>mockserver-netty</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>

ui-ngx/src/app/core/auth/auth.actions.ts

@@ -18,6 +18,7 @@ import { Action } from '@ngrx/store';
 import { AuthUser, User } from '@shared/models/user.model';
 import { AuthPayload } from '@core/auth/auth.models';
 import { UserSettings } from '@shared/models/user-settings.models';
+import { TrendzSettings } from "@shared/models/trendz-settings.models";
 
 export enum AuthActionTypes {
   AUTHENTICATED = '[Auth] Authenticated',
@@ -31,6 +32,7 @@ export enum AuthActionTypes {
   UPDATE_OPENED_MENU_SECTION = '[Preferences] Update Opened Menu Section',
   PUT_USER_SETTINGS = '[Preferences] Put user settings',
   DELETE_USER_SETTINGS = '[Preferences] Delete user settings',
+  UPDATE_TRENDZ_SETTINGS = '[Auth] Update Trendz Settings',
 }
 
 export class ActionAuthAuthenticated implements Action {
@@ -97,7 +99,13 @@ export class ActionPreferencesDeleteUserSettings implements Action {
   constructor(readonly payload: Array<NestedKeyOf<UserSettings>>) {}
 }
 
+export class ActionAuthUpdateTrendzSettings implements Action {
+  readonly type = AuthActionTypes.UPDATE_TRENDZ_SETTINGS;
+
+  constructor(readonly payload: TrendzSettings) {}
+}
+
 export type AuthActions = ActionAuthAuthenticated | ActionAuthUnauthenticated |
   ActionAuthLoadUser | ActionAuthUpdateUserDetails | ActionAuthUpdateLastPublicDashboardId | ActionAuthUpdateHasRepository |
   ActionPreferencesUpdateOpenedMenuSection | ActionPreferencesPutUserSettings | ActionPreferencesDeleteUserSettings |
-  ActionAuthUpdateAuthUser | ActionUpdateMobileQrCodeEnabled;
+  ActionAuthUpdateAuthUser | ActionUpdateMobileQrCodeEnabled | ActionAuthUpdateTrendzSettings;

ui-ngx/src/app/core/auth/auth.reducer.ts

@@ -99,6 +99,9 @@ export const authReducer = (
       action.payload.forEach(path => unset(userSettings, path));
       return { ...state, ...{ userSettings }};
 
+    case AuthActionTypes.UPDATE_TRENDZ_SETTINGS:
+      return { ...state, trendzSettings: action.payload };
+
     default:
       return state;
   }

ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.ts

@@ -179,7 +179,7 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
         renderer: this.renderer,
         componentType: CalculatedFieldArgumentPanelComponent,
         hostView: this.viewContainerRef,
-        preferredPlacement: isExists ? 'left' : 'right',
+        preferredPlacement: isExists ? ['left', 'leftTop', 'leftBottom'] : ['topRight', 'right', 'rightTop'],
         context: ctx,
         isModal: true
       });

ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts

@@ -1187,8 +1187,9 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
   }
 
   openAlarmAssigneePanel($event: Event, entity: AlarmInfo) {
-    if ($event) {
+    $event?.stopPropagation();
-      $event.stopPropagation();
+    if (entity.id.id === NULL_UUID) {
+      return
     }
     const target = $event.target || $event.currentTarget;
     const config = new OverlayConfig();

ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.scss

@@ -41,9 +41,9 @@ $switchColorDisabled: var(--tb-single-switch-color-disabled, #D5D7E5);
   }
   > div.tb-single-switch-title-panel {
     position: absolute;
-    top: 12px;
+    top: 0;
-    left: 12px;
+    left: 0;
-    right: 12px;
+    right: 0;
     z-index: 2;
   }
   .tb-single-switch-content {

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.html

@@ -74,8 +74,7 @@
         </div>
         <ng-template #searchNotEmpty>
           <span>
-            {{ translate.get('entity.no-alias-matching',
+            {{ 'entity.no-alias-matching' | translate : {alias: (searchText | truncate: true: 6: &apos;...&apos;)} }}
-              {alias: truncate.transform(searchText, true, 6, &apos;...&apos;)}) | async }}
           </span>
         </ng-template>
         <span>

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts

@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, ElementRef, forwardRef, Input, OnInit, SkipSelf, ViewChild } from '@angular/core';
+import { Component, DestroyRef, ElementRef, forwardRef, Input, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import {
   ControlValueAccessor,
   FormBuilder,
@@ -26,18 +26,17 @@ import {
 } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 import { map, mergeMap, share, tap } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
 import { EntityType } from '@shared/models/entity-type.models';
 import { EntityService } from '@core/http/entity.service';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { EntityAlias } from '@shared/models/alias.models';
 import { IAliasController } from '@core/api/widget-api.models';
-import { TruncatePipe } from '@shared/pipe/truncate.pipe';
+import { MatAutocomplete } from '@angular/material/autocomplete';
-import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { EntityAliasSelectCallbacks } from './entity-alias-select.component.models';
 import { ENTER } from '@angular/cdk/keycodes';
 import { ErrorStateMatcher } from '@angular/material/core';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'tb-entity-alias-select',
@@ -47,11 +46,7 @@ import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-
     provide: NG_VALUE_ACCESSOR,
     useExisting: forwardRef(() => EntityAliasSelectComponent),
     multi: true
-  }/*,
+  }]
-  {
-    provide: ErrorStateMatcher,
-    useExisting: EntityAliasSelectComponent
-  }*/]
 })
 export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit, ErrorStateMatcher {
 
@@ -72,7 +67,6 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
   showLabel: boolean;
 
   @ViewChild('entityAliasAutocomplete') entityAliasAutocomplete: MatAutocomplete;
-  @ViewChild('autocomplete', { read: MatAutocompleteTrigger }) autoCompleteTrigger: MatAutocompleteTrigger;
 
   @Input()
   @coerceBoolean()
@@ -93,21 +87,18 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
 
   @ViewChild('entityAliasInput', {static: true}) entityAliasInput: ElementRef;
 
-  entityAliasList: Array<EntityAlias> = [];
-
   filteredEntityAliases: Observable<Array<EntityAlias>>;
 
   searchText = '';
 
   private dirty = false;
-
+  private entityAliasList: Array<EntityAlias> = [];
   private propagateChange = (_v: any) => { };
 
   constructor(@SkipSelf() private errorStateMatcher: ErrorStateMatcher,
               private entityService: EntityService,
-              public translate: TranslateService,
+              private fb: FormBuilder,
-              public truncate: TruncatePipe,
+              private destroyRef: DestroyRef) {
-              private fb: FormBuilder) {
     this.selectEntityAliasFormGroup = this.fb.group({
       entityAlias: [null]
     });
@@ -121,15 +112,7 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
   }
 
   ngOnInit() {
-    const entityAliases = this.aliasController.getEntityAliases();
+    this.loadEntityAliases();
-    for (const aliasId of Object.keys(entityAliases)) {
-      if (this.allowedEntityTypes && this.allowedEntityTypes.length) {
-        if (!this.entityService.filterAliasByEntityTypes(entityAliases[aliasId], this.allowedEntityTypes)) {
-          continue;
-        }
-      }
-      this.entityAliasList.push(entityAliases[aliasId]);
-    }
 
     this.filteredEntityAliases = this.selectEntityAliasFormGroup.get('entityAlias').valueChanges
       .pipe(
@@ -149,6 +132,12 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
         mergeMap(name => this.fetchEntityAliases(name) ),
         share()
       );
+
+    this.aliasController.entityAliasesChanged.pipe(
+      takeUntilDestroyed(this.destroyRef),
+    ).subscribe(() => {
+      this.loadEntityAliases();
+    });
   }
 
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -271,4 +260,18 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
       );
     }
   }
+
+  private loadEntityAliases(): void {
+    this.entityAliasList = [];
+    const entityAliases = this.aliasController.getEntityAliases();
+    for (const aliasId of Object.keys(entityAliases)) {
+      if (this.allowedEntityTypes?.length) {
+        if (!this.entityService.filterAliasByEntityTypes(entityAliases[aliasId], this.allowedEntityTypes)) {
+          continue;
+        }
+      }
+      this.entityAliasList.push(entityAliases[aliasId]);
+    }
+    this.dirty = true;
+  }
 }

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/filter/filter-select.component.html

@@ -66,8 +66,7 @@
         </div>
         <ng-template #searchNotEmpty>
           <span>
-            {{ translate.get('filter.no-filter-matching',
+            {{ 'filter.no-filter-matching' | translate : {filter: (searchText | truncate: true: 6: &apos;...&apos;)} }}
-            {filter: truncate.transform(searchText, true, 6, &apos;...&apos;)}) | async }}
           </span>
         </ng-template>
         <span>

ui-ngx/src/app/modules/home/components/widget/lib/settings/common/filter/filter-select.component.ts

@@ -14,31 +14,27 @@
 /// limitations under the License.
 ///
 
-import { AfterViewInit, Component, ElementRef, forwardRef, Input, OnInit, SkipSelf, ViewChild } from '@angular/core';
+import { Component, DestroyRef, ElementRef, forwardRef, Input, OnInit, SkipSelf, ViewChild } from '@angular/core';
 import {
   ControlValueAccessor,
-  UntypedFormBuilder,
-  UntypedFormControl,
-  UntypedFormGroup,
   FormGroupDirective,
   NG_VALUE_ACCESSOR,
-  NgForm
+  NgForm,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup
 } from '@angular/forms';
 import { Observable, of } from 'rxjs';
 import { map, mergeMap, share, tap } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
-import { AppState } from '@app/core/core.state';
-import { TranslateService } from '@ngx-translate/core';
-import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { IAliasController } from '@core/api/widget-api.models';
-import { TruncatePipe } from '@shared/pipe/truncate.pipe';
+import { MatAutocomplete } from '@angular/material/autocomplete';
-import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { ENTER } from '@angular/cdk/keycodes';
 import { ErrorStateMatcher } from '@angular/material/core';
 import { FilterSelectCallbacks } from './filter-select.component.models';
 import { Filter } from '@shared/models/query/query.models';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'tb-filter-select',
@@ -54,7 +50,7 @@ import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-
       useExisting: FilterSelectComponent
     }]
 })
-export class FilterSelectComponent implements ControlValueAccessor, OnInit, AfterViewInit, ErrorStateMatcher {
+export class FilterSelectComponent implements ControlValueAccessor, OnInit, ErrorStateMatcher {
 
   selectFilterFormGroup: UntypedFormGroup;
 
@@ -81,40 +77,27 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
   subscriptSizing: SubscriptSizing = 'fixed';
 
   @ViewChild('filterAutocomplete') filterAutocomplete: MatAutocomplete;
-  @ViewChild('autocomplete', { read: MatAutocompleteTrigger }) autoCompleteTrigger: MatAutocompleteTrigger;
 
-
-  private requiredValue: boolean;
-  get tbRequired(): boolean {
-    return this.requiredValue;
-  }
   @Input()
-  set tbRequired(value: boolean) {
+  @coerceBoolean()
-    this.requiredValue = coerceBooleanProperty(value);
+  tbRequired: boolean;
-  }
 
   @Input()
   disabled: boolean;
 
   @ViewChild('filterInput', {static: true}) filterInput: ElementRef;
 
-  filterList: Array<Filter> = [];
-
   filteredFilters: Observable<Array<Filter>>;
 
   searchText = '';
 
   private dirty = false;
+  private filterList: Array<Filter> = [];
+  private propagateChange = (_v: any) => { };
 
-  private creatingFilter = false;
+  constructor(@SkipSelf() private errorStateMatcher: ErrorStateMatcher,
-
+              private fb: UntypedFormBuilder,
-  private propagateChange = (v: any) => { };
+              private destroyRef: DestroyRef) {
-
-  constructor(private store: Store<AppState>,
-              @SkipSelf() private errorStateMatcher: ErrorStateMatcher,
-              public translate: TranslateService,
-              public truncate: TruncatePipe,
-              private fb: UntypedFormBuilder) {
     this.selectFilterFormGroup = this.fb.group({
       filter: [null]
     });
@@ -124,19 +107,16 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
     this.propagateChange = fn;
   }
 
-  registerOnTouched(fn: any): void {
+  registerOnTouched(_fn: any): void {
   }
 
   ngOnInit() {
-    const filters = this.aliasController.getFilters();
+    this.loadFilters();
-    for (const filterId of Object.keys(filters)) {
-      this.filterList.push(filters[filterId]);
-    }
 
     this.filteredFilters = this.selectFilterFormGroup.get('filter').valueChanges
       .pipe(
         tap(value => {
-          let modelValue;
+          let modelValue: Filter;
           if (typeof value === 'string' || !value) {
             modelValue = null;
           } else {
@@ -151,6 +131,12 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
         mergeMap(name => this.fetchFilters(name) ),
         share()
       );
+
+    this.aliasController.filtersChanged.pipe(
+      takeUntilDestroyed(this.destroyRef),
+    ).subscribe(() => {
+      this.loadFilters();
+    });
   }
 
   isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -159,8 +145,6 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
     return originalErrorState || customErrorState;
   }
 
-  ngAfterViewInit(): void {}
-
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
     if (this.disabled) {
@@ -227,7 +211,7 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
   }
 
   textIsNotEmpty(text: string): boolean {
-    return (text && text != null && text.length > 0) ? true : false;
+    return text?.length > 0;
   }
 
   filterEnter($event: KeyboardEvent) {
@@ -242,7 +226,6 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
   createFilter($event: Event, filter: string, focusOnCancel = true) {
     $event.preventDefault();
     $event.stopPropagation();
-    this.creatingFilter = true;
     if (this.callbacks && this.callbacks.createFilter) {
       this.callbacks.createFilter(filter).subscribe((newFilter) => {
           if (!newFilter) {
@@ -253,7 +236,6 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
               }, 0);
             }
           } else {
-            this.filterList.push(newFilter);
             this.modelValue = newFilter.id;
             this.selectFilterFormGroup.get('filter').patchValue(newFilter, {emitEvent: true});
             this.propagateChange(this.modelValue);
@@ -262,4 +244,13 @@ export class FilterSelectComponent implements ControlValueAccessor, OnInit, Afte
       );
     }
   }
+
+  private loadFilters(): void {
+    this.filterList = [];
+    const filters = this.aliasController.getFilters();
+    for (const filterId of Object.keys(filters)) {
+      this.filterList.push(filters[filterId]);
+    }
+    this.dirty = true;
+  }
 }

ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain.component.html

@@ -34,7 +34,7 @@
   <div class="tb-form-row tb-standard-fields no-border no-padding">
     <mat-form-field class="flex">
       <mat-label translate>admin.oauth2.redirect-url-template</mat-label>
-      <input matInput [value]="redirectURI()" readonly>
+      <input matInput [value]="redirectURI()" readonly [disabled]="!isEdit && !isAdd">
       <tb-copy-button
         matSuffix
         miniButton="false"

ui-ngx/src/app/modules/home/pages/admin/trendz-settings.component.ts

@@ -21,6 +21,9 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { TrendzSettingsService } from '@core/http/trendz-settings.service';
 import { TrendzSettings } from '@shared/models/trendz-settings.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Store } from "@ngrx/store";
+import { AppState } from "@core/core.state";
+import { ActionAuthUpdateTrendzSettings } from "@core/auth/auth.actions";
 
 @Component({
   selector: 'tb-trendz-settings',
@@ -31,7 +34,8 @@ export class TrendzSettingsComponent extends PageComponent implements OnInit, Ha
 
   trendzSettingsForm: FormGroup;
 
-  constructor(private fb: FormBuilder,
+  constructor(protected store: Store<AppState>,
+              private fb: FormBuilder,
               private trendzSettingsService: TrendzSettingsService,
               private destroyRef: DestroyRef) {
     super();
@@ -93,6 +97,7 @@ export class TrendzSettingsComponent extends PageComponent implements OnInit, Ha
     this.trendzSettingsService.saveTrendzSettings(trendzSettings)
       .subscribe(() => {
         this.setTrendzSettings(trendzSettings);
+        this.store.dispatch(new ActionAuthUpdateTrendzSettings(trendzSettings))
       })
   }
 }

ui-ngx/src/app/shared/components/json-object-edit.component.scss

@@ -16,7 +16,7 @@
 .tb-json-object {
   position: relative;
 
-  .fill-height {
+  &.fill-height {
     height: 100%;
   }