Meny corrections

Author: jgauffin

src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts

@@ -238,7 +238,7 @@ export class MyIncidents {
 
 
 
-        if (incidentId === this.selectedIncident.incidentId) {
+        if (this.selectedIncident == null || incidentId === this.selectedIncident.incidentId) {
             this.getNextIncident();
         }
     }

src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/search.ts

@@ -1,4 +1,4 @@
-import { PubSubService } from "../../../services/PubSub";
+import { PubSubService, MessageContext } from "../../../services/PubSub";
 import * as MenuApi from "../../../services/menu/MenuApi";
 import { FindIncidents, FindIncidentsResult, IncidentOrder } from "../../../dto/Core/Incidents";
 import { GetTags, TagDTO } from "../../../dto/Modules/Tagging";
@@ -62,18 +62,7 @@ export default class IncidentSearchComponent extends Vue {
     currentIncidentId = 0;
 
     created() {
-        PubSubService.Instance.subscribe(MenuApi.MessagingTopics.ApplicationChanged, ctx => {
-            var body = <MenuApi.ApplicationChanged>ctx.message.body;
-            if (body.applicationId == null) {
-                this.activeApplications = [];
-                this.showApplicationColumn = true;
-            } else {
-                this.activeApplications = [body.applicationId];
-                this.showApplicationColumn = false;
-            }
-            
-            this.search();
-        });
+        PubSubService.Instance.subscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
 
         //fetch in created since we do not need the DOM
         var promise = new Promise<any>(resolve => {
@@ -113,6 +102,10 @@ export default class IncidentSearchComponent extends Vue {
         }
     }
 
+    destroyed() {
+        PubSubService.Instance.unsubscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
+    }
+
     mounted() {
 
         var readyPromise = AppRoot.Instance.loadState('incident-search', this);
@@ -276,6 +269,21 @@ export default class IncidentSearchComponent extends Vue {
 
     }
 
+    private onApplicationChangedInNavMenu(ctx: MessageContext) {
+        if (this.$route.name !== 'findIncidents') {
+            return;
+        }
+        var body = <MenuApi.ApplicationChanged>ctx.message.body;
+        if (body.applicationId == null) {
+            this.activeApplications = [];
+            this.showApplicationColumn = true;
+        } else {
+            this.activeApplications = [body.applicationId];
+            this.showApplicationColumn = false;
+        }
+            
+        this.search();
+    }
     private drawSearchUi() {
         var els = document.querySelectorAll('.search-head th i');
         for (var i = 0; i < els.length; i++) {

src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts

@@ -30,6 +30,8 @@ export default class NavMenuComponent extends Vue {
 
     onboarding: boolean = false;
 
+    discoverLink: string = '/discover/';
+
     @Watch('$route.params.applicationId')
     onApplicationChanged(value: string, oldValue: string) {
         if (!value) {
@@ -80,6 +82,7 @@ export default class NavMenuComponent extends Vue {
     }
 
     changeApplication(applicationId: number) {
+        console.log('changing app: ' + applicationId);
         if (applicationId == null) {
             this.updateCurrent(0);
         } else {
@@ -144,6 +147,7 @@ export default class NavMenuComponent extends Vue {
         if (applicationId === 0) {
             this.currentApplicationName = "All applications";
             this.currentApplicationId = null;
+            this.discoverLink = '/discover/';
             return;
         }
 
@@ -155,6 +159,7 @@ export default class NavMenuComponent extends Vue {
             title = title.substr(0, 15) + '[...]';
         }
         this.currentApplicationName = title;
+        this.discoverLink = '/discover/' + applicationId;
     }
 
 

src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.vue.html

@@ -30,7 +30,7 @@
                         </div>
                     </li>
                     <li class="nav-item">
-                        <router-link class="nav-link" :to="'/discover/' + currentApplicationId">
+                        <router-link class="nav-link" :to="discoverLink">
                             <span class="fa fa-binoculars"></span> Discover
                         </router-link>
                     </li>
@@ -53,7 +53,7 @@
                             </router-link>
                         </li>
                         <li class="nav-item">
-                            <router-link :to="{ name:'manageHome' }" class="nav-link" title="System administration">
+                            <router-link :to="{ name:'manageHome', params: {applicationId: currentApplicationId }}" class="nav-link" title="System administration">
                                 <i class="fa fa-cog"></i>
                             </router-link>
                         </li>

src/Server/Coderr.Server.Web/ClientApp/components/manage/application/app.ts

@@ -1,5 +1,7 @@
+import { PubSubService, MessageContext } from "../../../services/PubSub";
+import * as MenuApi from "../../../services/menu/MenuApi";
 import Vue from 'vue';
-import { Component } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
 
 @Component({
     components: {
@@ -8,6 +10,20 @@ import { Component } from 'vue-property-decorator';
 })
 export default class ManageComponent extends Vue {
     created() {
+        PubSubService.Instance.subscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
     }
 
+    destroyed() {
+        PubSubService.Instance.unsubscribe(MenuApi.MessagingTopics.ApplicationChanged, this.onApplicationChangedInNavMenu);
+    }
+
+    private onApplicationChangedInNavMenu(ctx: MessageContext) {
+        if (this.$route.path.indexOf('/manage/') === -1) {
+            return;
+        }
+        var body = <MenuApi.ApplicationChanged>ctx.message.body;
+        if (body.applicationId == null) {
+            this.$router.push({ name: 'manageHome' });
+        }
+    }
 }

src/Server/Coderr.Server.Web/ClientApp/components/manage/application/settings/settings.ts

@@ -22,6 +22,7 @@ export default class ManageAppSettingsComponent extends Vue {
 
     @Watch('$route.params.applicationId')
     onApplicationChanged(value: string, oldValue: string) {
+        console.log(value);
         this.load();
     }
 

src/Server/Coderr.Server.Web/ClientApp/components/manage/system/home/home.ts

@@ -8,6 +8,12 @@ export default class ManageHomeComponent extends Vue {
 
 
     created() {
+        if (this.$route.params.applicationId) {
+            this.$router.push({
+                name: 'manageAppSettings',
+                params: { applicationId: this.$route.params.applicationId }
+            });
+        }
     }