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

Do not handle dashboard state name from dialog by mobile app

Browse Source
This commit is contained in:
Igor Kulikov 2021-09-16 13:08:12 +03:00
parent 547055bb4e
commit 5ed505d271
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts
View File

@ -235,7 +235,7 @@ export class DefaultStateControllerComponent extends StateControllerComponent im
private gotoState(stateId: string, update: boolean, openRightLayout?: boolean) {
if (this.dashboardCtrl.dashboardCtx.state !== stateId) {
this.dashboardCtrl.openDashboardState(stateId, openRightLayout);
if (stateId && this.statesValue[stateId]) {
if (this.syncStateWithQueryParam && stateId && this.statesValue[stateId]) {
this.mobileService.handleDashboardStateName(this.getStateName(stateId, this.statesValue[stateId]));
}
if (update) {

4
ui-ngx/src/app/modules/home/components/dashboard-page/states/entity-state-controller.component.ts
View File

@ -277,7 +277,9 @@ export class EntityStateControllerComponent extends StateControllerComponent imp
private gotoState(stateId: string, update: boolean, openRightLayout?: boolean) {
const isStateIdChanged = this.dashboardCtrl.dashboardCtx.state !== stateId;
this.dashboardCtrl.openDashboardState(stateId, openRightLayout);
this.mobileService.handleDashboardStateName(this.getStateName(this.stateObject.length - 1));
if (this.syncStateWithQueryParam) {
this.mobileService.handleDashboardStateName(this.getStateName(this.stateObject.length - 1));
}
if (update) {
this.updateLocation(isStateIdChanged);
}