Revize 405b9b17

Menu component correctly chooses menu item to highlight

webapp/src/app/menu/menu.component.ts

@@ -19 +19 @@
   ngOnInit() {
     this.menuService.getMenuItems()
       .subscribe((data: MenuItem[]) => {
-        this.setMenuItems(data);
+        this._menuItems = data;
+        this._selectedMenuItem = this._menuItems[0];
+        const path = this.location.path().split('/');
+        const endOfPath = path[path.length - 1];
+
+        this.setCorrectItemMenu(endOfPath);
       });
   }
 
   onSelect(menuItem: MenuItem): void {
-    this._selectedMenuItem = menuItem;
     this.menuService.getMenuItems(true)
-      .subscribe((menuItems: MenuItem[]) => this.setMenuItems(menuItems));
+      .subscribe((menuItems: MenuItem[]) => {
+        this._menuItems = menuItems;
+        this.setCorrectItemMenu(menuItem.routePath);
+      });
   }
 
-  private setMenuItems(data: MenuItem[]) {
-    this._menuItems = data;
-
-    this._selectedMenuItem = this._menuItems[0];
-    const path = this.location.path().split('/');
-    const endOfPath = path[path.length - 1];
-
+  private setCorrectItemMenu(routePath: string) {
     for (const item of this._menuItems) {
-      if (item.routePath === endOfPath) {
+      if (item.routePath === routePath) {
         this._selectedMenuItem = item;
       }
     }