From 984042d73a377f0bce9704b66bf49541f589c5ab Mon Sep 17 00:00:00 2001
From: Jason Ma <wo.0@live.cn>
Date: Wed, 15 Nov 2017 14:03:13 +0800
Subject: [PATCH] fix bug. menu title should be changed follow the app
 selected.

---
 .../app/shell/pages/internal/apps-menu.component.html  |  8 ++++----
 .../app/shell/pages/internal/apps-menu.component.ts    | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
index 27315a568..bc4084681 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
@@ -1,6 +1,6 @@
 <ul class="nav navbar-nav" *ngIf="apps">
     <li class="nav-item dropdown">
-        <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{ctx.app ? ctx.app.name : 'Apps Overview'}}</span>
+        <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{selectedApp ? selectedApp.name : 'Apps Overview'}}</span>
 
         <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" @fade>
             <a class="dropdown-item all-apps" routerLink="/app">
@@ -22,12 +22,12 @@
         </div>
     </li>
 
-    <li class="nav-item" *ngIf="ctx.app && ctx.app.planUpgrade && ctx.app.planName && ctx.app.permission === 'Owner'">
+    <li class="nav-item" *ngIf="selectedApp && selectedApp.planUpgrade && selectedApp.planName && selectedApp.permission === 'Owner'">
         <div class="btn-group app-upgrade">
             <button type="button" class="btn btn-primary">
-                You are on the <strong>{{ctx.app.planName}}</strong> plan.
+                You are on the <strong>{{selectedApp.planName}}</strong> plan.
             </button>
-            <button type="button" class="btn btn-warning" [routerLink]="['/app', ctx.app.name, 'settings', 'plans']">
+            <button type="button" class="btn btn-warning" [routerLink]="['/app', selectedApp.name, 'settings', 'plans']">
                 Upgrade!
             </button>
         </div>
diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
index 340739279..f7d3dc85d 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
@@ -29,19 +29,22 @@ import {
 })
 export class AppsMenuComponent implements OnDestroy, OnInit {
     private appsSubscription: Subscription;
+    private appSubscription: Subscription;
 
     public modalMenu = new ModalView(false, true);
     public modalDialog = new ModalView();
 
     public apps: AppDto[] = [];
+    public selectedApp: AppDto;
 
-    constructor(public readonly ctx: AppContext,
+    constructor(
         private readonly appsStore: AppsStoreService
     ) {
     }
 
     public ngOnDestroy() {
         this.appsSubscription.unsubscribe();
+        this.appSubscription.unsubscribe();
     }
 
     public ngOnInit() {
@@ -49,6 +52,11 @@ export class AppsMenuComponent implements OnDestroy, OnInit {
             this.appsStore.apps.subscribe(apps => {
                 this.apps = apps;
             });
+
+        this.appSubscription =
+            this.appsStore.selectedApp.subscribe(app => {
+                this.selectedApp = app;
+            });
     }
 
     public createApp() {