Showing
4 changed files
with
12 additions
and
7 deletions
| @@ -524,7 +524,7 @@ public class DashboardController extends BaseController { | @@ -524,7 +524,7 @@ public class DashboardController extends BaseController { | ||
| 524 | JsonNode additionalInfo = tenant.getAdditionalInfo(); | 524 | JsonNode additionalInfo = tenant.getAdditionalInfo(); |
| 525 | DashboardId dashboardId = null; | 525 | DashboardId dashboardId = null; |
| 526 | boolean hideDashboardToolbar = true; | 526 | boolean hideDashboardToolbar = true; |
| 527 | - if (additionalInfo != null && additionalInfo.has(HOME_DASHBOARD_ID)) { | 527 | + if (additionalInfo != null && additionalInfo.has(HOME_DASHBOARD_ID) && !additionalInfo.get(HOME_DASHBOARD_ID).isNull()) { |
| 528 | String strDashboardId = additionalInfo.get(HOME_DASHBOARD_ID).asText(); | 528 | String strDashboardId = additionalInfo.get(HOME_DASHBOARD_ID).asText(); |
| 529 | dashboardId = new DashboardId(toUUID(strDashboardId)); | 529 | dashboardId = new DashboardId(toUUID(strDashboardId)); |
| 530 | if (additionalInfo.has(HOME_DASHBOARD_HIDE_TOOLBAR)) { | 530 | if (additionalInfo.has(HOME_DASHBOARD_HIDE_TOOLBAR)) { |
| @@ -566,7 +566,7 @@ public class DashboardController extends BaseController { | @@ -566,7 +566,7 @@ public class DashboardController extends BaseController { | ||
| 566 | 566 | ||
| 567 | private HomeDashboard extractHomeDashboardFromAdditionalInfo(JsonNode additionalInfo) { | 567 | private HomeDashboard extractHomeDashboardFromAdditionalInfo(JsonNode additionalInfo) { |
| 568 | try { | 568 | try { |
| 569 | - if (additionalInfo != null && additionalInfo.has(HOME_DASHBOARD_ID)) { | 569 | + if (additionalInfo != null && additionalInfo.has(HOME_DASHBOARD_ID) && !additionalInfo.get(HOME_DASHBOARD_ID).isNull()) { |
| 570 | String strDashboardId = additionalInfo.get(HOME_DASHBOARD_ID).asText(); | 570 | String strDashboardId = additionalInfo.get(HOME_DASHBOARD_ID).asText(); |
| 571 | DashboardId dashboardId = new DashboardId(toUUID(strDashboardId)); | 571 | DashboardId dashboardId = new DashboardId(toUUID(strDashboardId)); |
| 572 | Dashboard dashboard = checkDashboardId(dashboardId, Operation.READ); | 572 | Dashboard dashboard = checkDashboardId(dashboardId, Operation.READ); |
| @@ -223,6 +223,7 @@ export class MenuService { | @@ -223,6 +223,7 @@ export class MenuService { | ||
| 223 | name: 'home.home', | 223 | name: 'home.home', |
| 224 | type: 'link', | 224 | type: 'link', |
| 225 | path: '/home', | 225 | path: '/home', |
| 226 | + notExact: true, | ||
| 226 | icon: 'home' | 227 | icon: 'home' |
| 227 | }, | 228 | }, |
| 228 | { | 229 | { |
| @@ -409,6 +410,7 @@ export class MenuService { | @@ -409,6 +410,7 @@ export class MenuService { | ||
| 409 | name: 'home.home', | 410 | name: 'home.home', |
| 410 | type: 'link', | 411 | type: 'link', |
| 411 | path: '/home', | 412 | path: '/home', |
| 413 | + notExact: true, | ||
| 412 | icon: 'home' | 414 | icon: 'home' |
| 413 | }, | 415 | }, |
| 414 | { | 416 | { |
| @@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
| 49 | <tb-states-component fxFlex.lt-md | 49 | <tb-states-component fxFlex.lt-md |
| 50 | [statesControllerId]="isEdit ? 'default' : dashboardConfiguration.settings.stateControllerId" | 50 | [statesControllerId]="isEdit ? 'default' : dashboardConfiguration.settings.stateControllerId" |
| 51 | [dashboardCtrl]="this" | 51 | [dashboardCtrl]="this" |
| 52 | - [dashboardId]="dashboard.id ? dashboard.id.id : ''" | 52 | + [dashboardId]="(!embedded && dashboard.id) ? dashboard.id.id : ''" |
| 53 | [isMobile]="isMobile" | 53 | [isMobile]="isMobile" |
| 54 | [state]="dashboardCtx.state" | 54 | [state]="dashboardCtx.state" |
| 55 | [currentState]="currentState" | 55 | [currentState]="currentState" |
| @@ -78,7 +78,7 @@ | @@ -78,7 +78,7 @@ | ||
| 78 | (click)="isFullscreen = !isFullscreen"> | 78 | (click)="isFullscreen = !isFullscreen"> |
| 79 | <mat-icon>{{ isFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> | 79 | <mat-icon>{{ isFullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> |
| 80 | </button> | 80 | </button> |
| 81 | - <button [fxShow]="isEdit || displayExport()" mat-icon-button | 81 | + <button [fxShow]="currentDashboardId && (isEdit || displayExport())" mat-icon-button |
| 82 | matTooltip="{{'dashboard.export' | translate}}" | 82 | matTooltip="{{'dashboard.export' | translate}}" |
| 83 | matTooltipPosition="below" | 83 | matTooltipPosition="below" |
| 84 | (click)="exportDashboard($event)"> | 84 | (click)="exportDashboard($event)"> |
| @@ -118,7 +118,7 @@ | @@ -118,7 +118,7 @@ | ||
| 118 | (click)="openDashboardSettings($event)"> | 118 | (click)="openDashboardSettings($event)"> |
| 119 | <mat-icon>settings</mat-icon> | 119 | <mat-icon>settings</mat-icon> |
| 120 | </button> | 120 | </button> |
| 121 | - <tb-dashboard-select [fxShow]="!isEdit && !widgetEditMode && displayDashboardsSelect()" | 121 | + <tb-dashboard-select [fxShow]="!isEdit && !widgetEditMode && !embedded && displayDashboardsSelect()" |
| 122 | [(ngModel)]="currentDashboardId" | 122 | [(ngModel)]="currentDashboardId" |
| 123 | (ngModelChange)="currentDashboardIdChanged(currentDashboardId)" | 123 | (ngModelChange)="currentDashboardIdChanged(currentDashboardId)" |
| 124 | [customerId]="currentCustomerId" | 124 | [customerId]="currentCustomerId" |
| @@ -266,9 +266,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC | @@ -266,9 +266,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC | ||
| 266 | this.rxSubscriptions.push(this.route.data.subscribe( | 266 | this.rxSubscriptions.push(this.route.data.subscribe( |
| 267 | (data) => { | 267 | (data) => { |
| 268 | if (this.embedded) { | 268 | if (this.embedded) { |
| 269 | - data.dashboard = this.dashboard; | 269 | + data.dashboard = this.dashboardUtils.validateAndUpdateDashboard(this.dashboard); |
| 270 | + data.currentDashboardId = this.dashboard.id ? this.dashboard.id.id : null; | ||
| 270 | data.widgetEditMode = false; | 271 | data.widgetEditMode = false; |
| 271 | data.singlePageMode = false; | 272 | data.singlePageMode = false; |
| 273 | + } else { | ||
| 274 | + data.currentDashboardId = this.route.snapshot.params.dashboardId; | ||
| 272 | } | 275 | } |
| 273 | this.init(data); | 276 | this.init(data); |
| 274 | this.runChangeDetection(); | 277 | this.runChangeDetection(); |
| @@ -286,7 +289,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC | @@ -286,7 +289,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC | ||
| 286 | 289 | ||
| 287 | this.reset(); | 290 | this.reset(); |
| 288 | 291 | ||
| 289 | - this.currentDashboardId = this.route.snapshot.params.dashboardId; | 292 | + this.currentDashboardId = data.currentDashboardId; |
| 290 | 293 | ||
| 291 | if (this.route.snapshot.params.customerId) { | 294 | if (this.route.snapshot.params.customerId) { |
| 292 | this.currentCustomerId = this.route.snapshot.params.customerId; | 295 | this.currentCustomerId = this.route.snapshot.params.customerId; |