From e8179271d23576028f1281de885b671d7bf73d2a Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Thu, 27 Apr 2023 14:08:59 +0300 Subject: [PATCH] Change default entity action notification; fix default rules names --- .../notification/DefaultNotificationSettingsService.java | 2 +- .../server/dao/notification/DefaultNotifications.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java index 534e3136ca..4ca140e274 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java @@ -109,7 +109,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS defaultNotifications.create(tenantId, DefaultNotifications.newAlarm, tenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.alarmUpdate, tenantAdmins.getId()); - defaultNotifications.create(tenantId, DefaultNotifications.deviceAction, tenantAdmins.getId()); + defaultNotifications.create(tenantId, DefaultNotifications.entityAction, tenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.deviceActivity, tenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.alarmComment, tenantAdmins.getId()); defaultNotifications.create(tenantId, DefaultNotifications.alarmAssignment, affectedUser.getId()); diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java index b9ab9a322e..e5ab043f2d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java +++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java @@ -179,13 +179,13 @@ public class DefaultNotifications { .description("Send notification to tenant admins when any alarm is updated or cleared") .build()) .build(); - public static final DefaultNotification deviceAction = DefaultNotification.builder() - .name("Device action notification") + public static final DefaultNotification entityAction = DefaultNotification.builder() + .name("Entity action notification") .type(NotificationType.ENTITY_ACTION) .subject("${entityType} was ${actionType}") .text("${entityType} '${entityName}' was ${actionType} by user ${userEmail}") .icon("info").color(null) - .button("Go to device").link("/devices/${entityId}") + .button("Go to ${entityType:lowerCase}").link("/${entityType:lowerCase}s/${entityId}") .rule(DefaultRule.builder() .name("Device created") .triggerConfig(EntityActionNotificationRuleTriggerConfig.builder() @@ -341,7 +341,7 @@ public class DefaultNotifications { public NotificationRule toRule(NotificationTemplateId templateId, NotificationTargetId... targets) { DefaultRule defaultRule = this.rule; NotificationRule rule = new NotificationRule(); - rule.setName(name); + rule.setName(defaultRule.getName()); rule.setTemplateId(templateId); rule.setTriggerType(defaultRule.getTriggerConfig().getTriggerType()); rule.setTriggerConfig(defaultRule.getTriggerConfig());