diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 59654f6..5c3b899 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -7,8 +7,6 @@ import {User} from './openaireLibrary/login/utils/helper.class'; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; import {SideBarService} from "./library/sharedComponents/sidebar/sideBar.service"; import {StakeholderService} from "./services/stakeholder.service"; -import {Stakeholder} from "./utils/entities/stakeholder"; -import {StakeholderCreator} from "./utils/entities/stakeholderCreator"; @Component({ selector: 'app-root', @@ -24,7 +22,7 @@ export class AppComponent { private propertiesService: EnvironmentSpecificService, private router: Router, private userManagementService: UserManagementService, - private sideBarService: SideBarService, + private sidebarService: SideBarService, private stakeholderService: StakeholderService, private cdr: ChangeDetectorRef) { } @@ -44,9 +42,8 @@ export class AppComponent { if(!this.stakeholderService.stakeholder || this.stakeholderService.stakeholder.alias !== params['stakeholder']) { this.stakeholderService.getStakeholder(this.properties.monitorServiceAPIURL, params['stakeholder']).subscribe(stakeholder => { - // stakeholder = Stakeholder.createECStakeholder(); - // stakeholder = StakeholderCreator.createFunderFromDefaultProfile("ec","funder","ec__________::EC","European Commission","EC",false,"ec",true,true); - this.stakeholderService.setStakeholder(stakeholder); + this.stakeholderService.setStakeholder(stakeholder); + this.sidebarService.setOpen(true); }); } } else { @@ -63,22 +60,22 @@ export class AppComponent { console.log(error); }); }); - this.sideBarService.hasSidebar.subscribe(hasSidebar => { + this.sidebarService.hasSidebar.subscribe(hasSidebar => { this.hasSidebar = hasSidebar; this.cdr.detectChanges(); }); } public get open() { - return this.sideBarService.open; + return this.sidebarService.open; } public toggleOpen(event = null) { if(!event) { - this.sideBarService.setOpen(!this.open); + this.sidebarService.setOpen(!this.open); } else if(event && event['value'] === true) { - this.sideBarService.setOpen(false); + this.sidebarService.setOpen(false); } } } diff --git a/src/app/error/errorPage.component.ts b/src/app/error/errorPage.component.ts index 71e252c..2b36d72 100644 --- a/src/app/error/errorPage.component.ts +++ b/src/app/error/errorPage.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {Component, OnDestroy, OnInit} from '@angular/core'; import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.service"; @Component({ @@ -7,11 +7,15 @@ import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.servic ` }) -export class OpenaireErrorPageComponent implements OnInit{ +export class OpenaireErrorPageComponent implements OnInit, OnDestroy{ constructor(private sidebarService: SideBarService) {} ngOnInit(): void { this.sidebarService.setHasSidebar(false); } + + ngOnDestroy(): void { + this.sidebarService.setHasSidebar(true); + } } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index b5f6f0e..8d365b2 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -2,8 +2,8 @@
-
{{stakeholder.index_name}}
-
Admin Dashboard
+

{{stakeholder.index_name}}

+ Admin Dashboard
@@ -19,21 +19,75 @@