Browse Source

Do not handle dashboard state name from dialog by mobile app

pull/5252/head
Igor Kulikov 5 years ago
parent
commit
5ed505d271
  1. 2
      ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts
  2. 4
      ui-ngx/src/app/modules/home/components/dashboard-page/states/entity-state-controller.component.ts

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

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

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

@ -277,7 +277,9 @@ export class EntityStateControllerComponent extends StateControllerComponent imp
private gotoState(stateId: string, update: boolean, openRightLayout?: boolean) { private gotoState(stateId: string, update: boolean, openRightLayout?: boolean) {
const isStateIdChanged = this.dashboardCtrl.dashboardCtx.state !== stateId; const isStateIdChanged = this.dashboardCtrl.dashboardCtx.state !== stateId;
this.dashboardCtrl.openDashboardState(stateId, openRightLayout); 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) { if (update) {
this.updateLocation(isStateIdChanged); this.updateLocation(isStateIdChanged);
} }

Loading…
Cancel
Save