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

Minor improvements for Teams notifications

Browse Source
This commit is contained in:
ViacheslavKlimov 2023-08-07 11:51:47 +03:00
parent 1a93db75e0
commit fb149b720c
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
View File

@ -88,7 +88,11 @@ public class MicrosoftTeamsNotificationChannel implements NotificationChannel<Mi
} }
state = Base64.encodeBase64String(JacksonUtil.OBJECT_MAPPER.writeValueAsBytes(List.of(stateObject))); state = Base64.encodeBase64String(JacksonUtil.OBJECT_MAPPER.writeValueAsBytes(List.of(stateObject)));
} }
uri = systemSecurityService.getBaseUrl(ctx.getTenantId(), null, null) + "/dashboards/" + button.getDashboardId(); String baseUrl = systemSecurityService.getBaseUrl(ctx.getTenantId(), null, null);
if (StringUtils.isEmpty(baseUrl)) {
throw new IllegalStateException("Failed to determine base url to construct dashboard link");
}
uri = baseUrl + "/dashboards/" + button.getDashboardId();
if (state != null) { if (state != null) {
uri += "?state=" + state; uri += "?state=" + state;
} }

2
application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
View File

@ -253,7 +253,7 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
baseUrl = generalSettings.getJsonValue().get("baseUrl").asText(); baseUrl = generalSettings.getJsonValue().get("baseUrl").asText();
} }
if (StringUtils.isEmpty(baseUrl)) { if (StringUtils.isEmpty(baseUrl) && httpServletRequest != null) {
baseUrl = MiscUtils.constructBaseUrl(httpServletRequest); baseUrl = MiscUtils.constructBaseUrl(httpServletRequest);
} }

4
application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
View File

@ -51,6 +51,7 @@ import org.thingsboard.server.common.data.notification.targets.slack.SlackNotifi
import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate; import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate; import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
import org.thingsboard.server.common.data.notification.template.MicrosoftTeamsDeliveryMethodNotificationTemplate; import org.thingsboard.server.common.data.notification.template.MicrosoftTeamsDeliveryMethodNotificationTemplate;
import org.thingsboard.server.common.data.notification.template.MicrosoftTeamsDeliveryMethodNotificationTemplate.Button.LinkType;
import org.thingsboard.server.common.data.notification.template.NotificationTemplate; import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig; import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
import org.thingsboard.server.common.data.notification.template.SlackDeliveryMethodNotificationTemplate; import org.thingsboard.server.common.data.notification.template.SlackDeliveryMethodNotificationTemplate;
@ -560,6 +561,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
var button = new MicrosoftTeamsDeliveryMethodNotificationTemplate.Button(); var button = new MicrosoftTeamsDeliveryMethodNotificationTemplate.Button();
button.setEnabled(true); button.setEnabled(true);
button.setText("Button: " + templateParams); button.setText("Button: " + templateParams);
button.setLinkType(LinkType.LINK);
button.setLink("https://" + templateParams); button.setLink("https://" + templateParams);
template.setButton(button); template.setButton(button);
NotificationTemplate notificationTemplate = new NotificationTemplate(); NotificationTemplate notificationTemplate = new NotificationTemplate();
@ -578,7 +580,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
.templateId(notificationTemplate.getId()) .templateId(notificationTemplate.getId())
.targets(List.of(target.getUuidId())) .targets(List.of(target.getUuidId()))
.info(EntityActionNotificationInfo.builder() .info(EntityActionNotificationInfo.builder()
.entityId(new DeviceId(UUID.randomUUID())) // to test templatization .entityId(new DeviceId(UUID.randomUUID()))
.actionType(ActionType.ADDED) .actionType(ActionType.ADDED)
.userId(tenantAdminUserId.getId()) .userId(tenantAdminUserId.getId())
.build()) .build())

5
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -3106,9 +3106,8 @@
"warning": "Warning", "warning": "Warning",
"webhook-url": "Webhook URL", "webhook-url": "Webhook URL",
"webhook-url-required": "Webhook URL is required", "webhook-url-required": "Webhook URL is required",
"channel-name": "Chanel name", "channel-name": "Channel name",
"channel-name-required": "Chanel name is required" "channel-name-required": "Channel name is required"
}, },
"ota-update": { "ota-update": {
"add": "Add package", "add": "Add package",