Revize c335ea37

Clicking on menu item refreshes logged user profile data in profile service

webapp/src/app/app-routing.module.ts

@@ -7 +7 @@
 import {DashboardComponentGuard} from './auth/dashboard-component.guard';
 
 const routes: Routes = [
-  { path: 'employees', component: EmployeesListComponent, canActivate: [EmployeeComponentGuard] },
-  { path: 'dashboard', component: DashboardComponent, canActivate: [DashboardComponentGuard] },
+  { path: 'employees', component: EmployeesListComponent, canActivate: [EmployeeComponentGuard], runGuardsAndResolvers: 'always'},
+  { path: 'dashboard', component: DashboardComponent, canActivate: [DashboardComponentGuard], runGuardsAndResolvers: 'always'},
   { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
   { path: '**', component: PageNotFoundComponent }
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, {onSameUrlNavigation: 'reload'})],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

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

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

webapp/src/app/services/util/menu.service.ts

@@ -3 +3 @@
 import {UserProfile} from '../../models/user.model';
 import {MenuItem} from '../../models/menu-item.model';
 import {UserType} from '../../enums/common.enum';
-import {Observable} from 'rxjs';
+import {Observable, of} from 'rxjs';
+import {ProfileService} from './profile.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class MenuService {
 
-  constructor(private userService: UserService) {
+  constructor(private profileService: ProfileService) {
   }
 
-  getMenuItems() {
-    const menuItems: MenuItem[] = [];
+  getMenuItems(cached?: boolean) {
+    if (cached) {
+      this.profileService.getLoggedUser(true)
+        .subscribe((profile: UserProfile) => {
+          return of(this.createAppropriateMenuForUser(profile));
+        });
+    }
 
     return new Observable((observer) => {
-      this.userService.getLoggedUserProfile()
+      this.profileService.getLoggedUser()
         .subscribe((profile: UserProfile) => {
-            menuItems.push({name: 'Dashboard', routePath: 'dashboard'});
-            if (profile.role === UserType.EMPLOYER) {
-              menuItems.push({name: 'Zaměstnanci', routePath: 'employees'});
-            }
-
-            observer.next(menuItems);
+            observer.next(this.createAppropriateMenuForUser(profile));
             observer.complete();
           },
           () => {
-            observer.next(menuItems);
+            observer.next([]);
             observer.complete();
           });
     });
   }
+
+  private createAppropriateMenuForUser(profile: UserProfile): MenuItem[] {
+    const menuItems: MenuItem[] = [];
+    menuItems.push({name: 'Dashboard', routePath: 'dashboard'});
+    if (profile.role === UserType.EMPLOYER) {
+      menuItems.push({name: 'Zaměstnanci', routePath: 'employees'});
+    }
+
+    return menuItems;
+  }
 }

webapp/src/app/services/util/profile.service.ts

@@ -1 +1 @@
 import {Injectable} from '@angular/core';
 import {UserService} from '../api/user.service';
 import {UserProfile} from '../../models/user.model';
-import {Observable} from 'rxjs';
+import {Observable, of} from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -22 +22 @@
    * the changes to logged user would not be seen until
    * the user logged off and then logged back in
    */
-  public getLoggedUser() {
+  public getLoggedUser(cached?: boolean) {
+    if (cached && this.isUserLogged()) {
+      return of(this.profile);
+    }
+
     return new Observable<UserProfile>((obs) => {
       this.userService.getLoggedUserProfile()
         .subscribe((userProfile: UserProfile) => {