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

Fixed clear state params for change dashboardId

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-08-27 17:01:47 +03:00
parent 0a53e2ff97
commit bdd4c30fc0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui-ngx/src/app/modules/home/pages/dashboard/states/state-controller.component.ts
View File

@ -100,7 +100,7 @@ export abstract class StateControllerComponent implements IStateControllerCompon
this.rxSubscriptions.push(this.route.queryParamMap.subscribe((paramMap) => { this.rxSubscriptions.push(this.route.queryParamMap.subscribe((paramMap) => {
const dashboardId = this.route.snapshot.params.dashboardId; const dashboardId = this.route.snapshot.params.dashboardId;
if (this.dashboardId === dashboardId) { if (this.dashboardId === dashboardId) {
const newState = decodeURIComponent(paramMap.get('state')); const newState = this.decodeStateParam(paramMap.get('state'));
if (this.currentState !== newState) { if (this.currentState !== newState) {
this.currentState = newState; this.currentState = newState;
if (this.inited) { if (this.inited) {
@ -147,10 +147,15 @@ export abstract class StateControllerComponent implements IStateControllerCompon
} }
public reInit() { public reInit() {
this.currentState = decodeURIComponent(this.route.snapshot.queryParamMap.get('state')); this.preservedState = null;
this.currentState = this.decodeStateParam(this.route.snapshot.queryParamMap.get('state'));
this.init(); this.init();
} }
private decodeStateParam(stateURI: string): string{
return stateURI !== null ? decodeURIComponent(stateURI) : null;
}
protected abstract init(); protected abstract init();
protected abstract onMobileChanged(); protected abstract onMobileChanged();