Support updating layout settings after page navigation is completed

saas/axops/src/ui/src/app/views/layout/layout.component.ts

@@ -1,6 +1,6 @@
 import * as moment from 'moment';
 import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
-import { RouterOutlet, Router, NavigationEnd, ActivatedRoute } from '@angular/router';
+import { RouterOutlet, Router, ActivatedRoute } from '@angular/router';
 import { Subject, Subscription, Observable } from 'rxjs';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 
@@ -69,7 +69,6 @@ export class LayoutComponent implements OnInit, OnDestroy {
     public jiraIssueCreatorPanelComponent: JiraIssueCreatorPanelComponent;
     @ViewChild(JiraIssuesPanelComponent)
     public jiraIssuesPanelComponent: JiraIssuesPanelComponent;
-    public layoutSettings: LayoutSettings = {};
     public globalSearch: GlobalSearchSetting;
     public hiddenScrollbar: boolean;
     public openedPanelOffCanvas: boolean;
@@ -107,13 +106,6 @@ export class LayoutComponent implements OnInit, OnDestroy {
             secret: new FormControl('', Validators.required),
         });
 
-        this.subscriptions.push(router.events.subscribe(event => {
-            if (event instanceof NavigationEnd) {
-                let component: any = this.routerOutlet.component;
-                this.layoutSettings = component ? component.layoutSettings || {} : {};
-            }
-        }));
-
         this.subscriptions.push(this.slidingPanelService.panelOpened.subscribe(
             isHidden => setTimeout(() => this.hiddenScrollbar = isHidden)));
 
@@ -185,6 +177,11 @@ export class LayoutComponent implements OnInit, OnDestroy {
         }));
     }
 
+    public get layoutSettings(): LayoutSettings {
+        let component: any = this.routerOutlet.isActivated ? this.routerOutlet.component : null;
+        return component ? component.layoutSettings || {} : {};
+    }
+
     public ngOnInit() {
         this.launchPanelService.initPanel(this.multipleServiceLaunchPanel);
     }