added function

Author: Frieda-Hentschel

Phonebook.Frontend/src/app/app-routing.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { DashboardComponent } from 'src/app/pages/dashboard/components/overview/dashboard.component';
+import { DashboardComponent } from 'src/app/pages/dashboard/components/dashboard/dashboard.component';
 import { SettingsComponent } from 'src/app/pages/settings/settings.component';
 import { environment } from 'src/environments/environment';
 import { TeamComponent } from './pages/dashboard/components/team/team.component';

Phonebook.Frontend/src/app/modules/organigram/pages/organigram/organigram.component.ts

@@ -13,7 +13,7 @@ export class OrganigramComponent implements OnInit {
   constructor(private organigramService: OrganigramService) {}
 
   public ngOnInit() {
-    this.organigramService.getOrganigram().subscribe((organigram) => {
+    this.organigramService.getOrganigramTree().subscribe((organigram) => {
       this.nodes = organigram;
     });
   }

…onents/overview/dashboard.component.html …nents/dashboard/dashboard.component.htmlPhonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.html renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.html Phonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.html renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.html

@@ -1,12 +1,10 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Select, Store } from '@ngxs/store';
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Person, PhonebookSortDirection } from 'src/app/shared/models';
-import { BookmarksState, AppState } from 'src/app/shared/states';
-import { OrganigramService, UnitTreeNode } from 'src/app/services/api/organigram.service';
+import { Observable } from 'rxjs';
+import { Person } from 'src/app/shared/models';
+import { AppState } from 'src/app/shared/states';
+import { OrganigramService } from 'src/app/services/api/organigram.service';
 import { CurrentUserService } from 'src/app/services/api/current-user.service';
-import { untilComponentDestroyed } from 'ng2-rx-componentdestroyed';
 import { Router } from '@angular/router';
 import { Layout } from 'src/app/shared/models/enumerables/Layout';
 
@@ -26,14 +24,12 @@ export class TeamComponent implements OnInit, OnDestroy {
   public layout: typeof Layout = Layout;
 
   constructor(
-    private store: Store,
-    private organigramService: OrganigramService,
-    private currentUserService: CurrentUserService,
-    private router: Router
+    private organigramService: OrganigramService
   ) {}
 
   public ngOnInit() {
-    this.organigramService.getNodeForCurrentUser().subscribe((node) => {
+    if (this.currentUser != null) {
+    this.organigramService.getOrganigramById(this.currentUser.Id).subscribe((node) => {
       if (node != null) {
         this.teamPersons = [
           ...node.supervisors,
@@ -44,6 +40,7 @@ export class TeamComponent implements OnInit, OnDestroy {
       }
     });
   }
+  }
 
   public ngOnDestroy(): void {}
 }

…onents/overview/dashboard.component.scss …nents/dashboard/dashboard.component.scssPhonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.scss renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.scss Phonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.scss renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.scss

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { DashboardComponent } from 'src/app/pages/dashboard/components/overview/dashboard.component';
+import { DashboardComponent } from 'src/app/pages/dashboard/components/dashboard/dashboard.component';
 import { BookmarkedComponent } from 'src/app/pages/dashboard/components/bookmarked/bookmarked.component';
 import { TeamComponent } from 'src/app/pages/dashboard/components/team/team.component';
 import { HasBookmarksGuard } from 'src/app/pages/dashboard/has-bookmarks.guard';

…mponents/overview/dashboard.component.ts …ponents/dashboard/dashboard.component.tsPhonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.ts renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.ts Phonebook.Frontend/src/app/pages/dashboard/components/overview/dashboard.component.ts renamed to Phonebook.Frontend/src/app/pages/dashboard/components/dashboard/dashboard.component.ts

@@ -1,6 +1,6 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { NgModule } from '@angular/core';
-import { DashboardComponent } from 'src/app/pages/dashboard/components/overview/dashboard.component';
+import { DashboardComponent } from 'src/app/pages/dashboard/components/dashboard/dashboard.component';
 import { UserModule } from 'src/app/shared/components/user/user.module';
 import { MaterialModule } from 'src/app/shared/material.module';
 import { BookmarkedComponent } from 'src/app/pages/dashboard/components/bookmarked/bookmarked.component';

Phonebook.Frontend/src/app/pages/dashboard/components/team/team.component.ts

@@ -14,19 +14,44 @@ export class OrganigramService {
     private currentUserService: CurrentUserService
   ) {}
   public organigram: Observable<UnitTreeNode[]>;
+  public orgUnits: Observable<OrgUnit[]>;
   public team: UnitTreeNode;
 
-  public getOrganigram(): Observable<UnitTreeNode[]> {
+  public getOrgUnits(): Observable<OrgUnit[]> {
+    if (this.orgUnits != null) {
+      return this.orgUnits;
+    }
+    this.orgUnits = this.http.get<OrgUnit[]>('/api/OrgUnit').pipe(
+      publishReplay(1), // this tells Rx to cache the latest emitted
+      refCount()
+    );
+    return this.orgUnits;
+  }
+
+  public getOrganigramTree(): Observable<UnitTreeNode[]> {
     if (this.organigram != null) {
       return this.organigram;
     }
-    this.organigram = this.http.get<OrgUnit[]>('/api/OrgUnit').pipe(
+    this.organigram = this.getOrgUnits().pipe(
       flatMap((d) => this.ConvertOrgUnitsToUnitTree(d)),
       publishReplay(1), // this tells Rx to cache the latest emitted
       refCount()
     );
     return this.organigram;
   }
+  public getOrganigramById(id: string): Observable<UnitTreeNode | null> {
+    return this.getOrganigramTree().pipe(
+      map((orgUnitArray) => {
+        const orgUnit = orgUnitArray.find((x) => {
+          return x.id === id;
+        });
+        if (orgUnit === undefined) {
+          return null;
+        }
+        return orgUnit;
+      })
+    );
+  }
   private ConvertOrgUnitsToUnitTree(
     orgUnits: OrgUnit[],
     depth: number = 0
@@ -67,7 +92,7 @@ export class OrganigramService {
   }
 
   public getNodeForCurrentUser(): Observable<UnitTreeNode | null> {
-    return combineLatest([this.currentUserService.getCurrentUser(), this.getOrganigram()]).pipe(
+    return combineLatest([this.currentUserService.getCurrentUser(), this.getOrganigramTree()]).pipe(
       map(([user, organigram]) => {
         if (user === null) {
           return null;