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

UI: Fixed notification action open dashboard with state params

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-04-13 16:47:55 +03:00
parent d7c0acb4f4
commit 96ec9a133a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/shared/components/notification/notification.component.ts
View File

@ -97,7 +97,8 @@ export class NotificationComponent implements OnInit {
let link: string; let link: string;
if (this.notification.additionalConfig.actionButtonConfig.linkType === ActionButtonLinkType.DASHBOARD) { if (this.notification.additionalConfig.actionButtonConfig.linkType === ActionButtonLinkType.DASHBOARD) {
let state = null; let state = null;
if (this.notification.additionalConfig.actionButtonConfig.dashboardState) { if (this.notification.additionalConfig.actionButtonConfig.dashboardState ||
this.notification.additionalConfig.actionButtonConfig.setEntityIdInState) {
const stateObject: StateObject = {}; const stateObject: StateObject = {};
if (this.notification.additionalConfig.actionButtonConfig.setEntityIdInState) { if (this.notification.additionalConfig.actionButtonConfig.setEntityIdInState) {
stateObject.params = { stateObject.params = {
@ -106,7 +107,9 @@ export class NotificationComponent implements OnInit {
} else { } else {
stateObject.params = {}; stateObject.params = {};
} }
stateObject.id = this.notification.additionalConfig.actionButtonConfig.dashboardState; if (this.notification.additionalConfig.actionButtonConfig.dashboardState) {
stateObject.id = this.notification.additionalConfig.actionButtonConfig.dashboardState;
}
state = objToBase64URI([ stateObject ]); state = objToBase64URI([ stateObject ]);
} }
link = `/dashboards/${this.notification.additionalConfig.actionButtonConfig.dashboardId}`; link = `/dashboards/${this.notification.additionalConfig.actionButtonConfig.dashboardId}`;