diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout')
-rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html | 8 | ||||
-rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.ts | 15 |
2 files changed, 18 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html index 2ae6c463..02ae5daa 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.html @@ -4,10 +4,12 @@ </section> </div> -<section class="main-container" [ngClass]="{'collapsed': collapedSideBar , 'remove-header': showHeader == false }"> +<section class="main-container" [ngClass]="{'collapsed': collapedSideBar , 'remove-header': showHeader == false}"> <app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar> - - <router-outlet></router-outlet> + <ng-container *ngIf="loadingRouteConfig">Loading route config...</ng-container> + <span *ngIf="loadingRouteConfig" class="ecomp-spinner"></span> + <router-outlet> + </router-outlet> </section> <section > diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.ts index 12617548..f1c6a269 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.component.ts @@ -38,6 +38,8 @@ import { Component, OnInit } from '@angular/core'; import { MatDialog, MatDialogConfig} from '@angular/material'; import { CookieService } from 'ngx-cookie-service'; +import {RouteConfigLoadEnd, RouteConfigLoadStart, Router} from '@angular/router'; + @Component({ selector: 'app-layout', templateUrl: './layout.component.html', @@ -47,13 +49,22 @@ export class LayoutComponent implements OnInit { collapedSideBar: boolean; showHeader:boolean = true; + loadingRouteConfig = false; - constructor(private dialog:MatDialog,public cookieService: CookieService) {} + constructor(private dialog:MatDialog,public cookieService: CookieService, private router: Router) {} ngOnInit() { if(this.cookieService.get('show_app_header') == 'false'){ this.showHeader = false; - } + } + + this.router.events.subscribe(event => { + if (event instanceof RouteConfigLoadStart) { + this.loadingRouteConfig = true; + } else if (event instanceof RouteConfigLoadEnd) { + this.loadingRouteConfig = false; + } + }); } receiveCollapsed($event) { |