Corrected navigation on the analyze page.

Author: jgauffin

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

@@ -1,21 +1,33 @@
-import { MyIncidents, IMyIncident } from "../myincidents";
+import { MyIncidents, IMyIncident, IIncidentListChangedContext } from "../myincidents";
 import Vue from "vue";
 import { Component } from "vue-property-decorator";
 
+
 @Component
 export default class AnalyzeHomeComponent extends Vue {
     showWelcome: boolean = false;
 
     created() {
-        MyIncidents.Instance.subscribeOnSelectedIncident(x => {
-            this.showWelcome = x == null;
-        });
-        MyIncidents.Instance.subscribeOnListChanges(x => {
-            this.showWelcome = MyIncidents.Instance.myIncidents.length === 0;
-        });
+        MyIncidents.Instance.subscribeOnSelectedIncident(x => this.onIncidentSelected(x));
+        MyIncidents.Instance.subscribeOnListChanges(x => this.onIncidentListChanged(x));
         MyIncidents.Instance.ready()
-            .then(x => {
-                this.showWelcome = MyIncidents.Instance.myIncidents.length === 0;
-            });
+            .then(() => this.onReady());
+    }
+
+    destroyed() {
+        MyIncidents.Instance.unsubscribe(this.onIncidentSelected);
+        MyIncidents.Instance.unsubscribe(this.onIncidentListChanged);
+    }
+
+    private onIncidentSelected(incident?: IMyIncident) {
+        this.showWelcome = incident == null;
+    }
+
+    private onIncidentListChanged(incident?: IIncidentListChangedContext) {
+        this.showWelcome = MyIncidents.Instance.myIncidents.length === 0;
+    }
+
+    private onReady() {
+        this.showWelcome = MyIncidents.Instance.myIncidents.length === 0;
     }
 }

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

@@ -82,7 +82,7 @@ export class MyIncidents {
         this.triggerIncidentListCallbacks();
 
         if (this.selectedIncident) {
-            if (this.selectedIncident.applicationId === applicationId || this.selectedApplicationId == null) {
+            if (this.selectedIncident.applicationId === applicationId) {
                 return;
             }
         }

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

@@ -79,7 +79,6 @@ export default class NavMenuComponent extends Vue {
             }
         });
         PubSubService.Instance.subscribe(MenuApi.MessagingTopics.SetApplication, ctx => {
-            console.log('SET', ctx.message)
             var msg = <MenuApi.SetApplication>ctx.message.body;
             this.changeApplication(msg.applicationId);
         });
@@ -111,9 +110,10 @@ export default class NavMenuComponent extends Vue {
             }
         }
 
+        const appIdStr = applicationId == null ? null : applicationId.toString();
         if (currentRoute.path.indexOf('/manage/') !== -1) {
             if (applicationId) {
-                const route = { name: 'manageAppSettings', params: { applicationId: applicationId.toString() } };
+                const route = { name: 'manageAppSettings', params: { applicationId: appIdStr } };
                 this.$router.push(route);
             } else {
                 const route = { name: 'manageHome' };
@@ -129,11 +129,15 @@ export default class NavMenuComponent extends Vue {
             }
             return;
         } else if (currentRoute.path.indexOf('/discover') === 0) {
-            this.$router.push({ name: 'discover', params: { applicationId: applicationId.toString() } });
+            this.$router.push({ name: 'discover', params: { applicationId: appIdStr } });
         } else if (currentRoute.path.indexOf('/analyze') === 0) {
-            this.$router.push({ name: 'analyzeHome', params: { applicationId: applicationId.toString() } });
+            if (applicationId == null) {
+                this.$router.push({ name: 'analyzeHome' });
+            } else {
+                this.$router.push({ name: 'analyzeHome', params: { applicationId: appIdStr } });
+            }
         } else  {
-            const route = { name: currentRoute.name, params: { applicationId: applicationId.toString() } };
+            const route = { name: currentRoute.name, params: { applicationId: appIdStr } };
             this.$router.push(route);
         }
 

src/Server/Coderr.Server.Web/ClientApp/services/AppRoot.ts

@@ -124,7 +124,7 @@ export class AppRoot {
                 localForage.getItem(options.name);
             })
             .catch(reason => {
-                console.log('ERRROR', reason);
+                console.log('ERROR', reason);
             });
     }