diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dec0dbb..4dcc104 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -22,7 +22,12 @@ const routes: Routes = [ loadChildren: './login/libUser.module#LibUserModule', resolve: {envSpecific: EnvironmentSpecificResolver} }, - {path: 'error', component: OpenaireErrorPageComponent, resolve: {envSpecific: EnvironmentSpecificResolver}}, + { + path: 'error', + component: OpenaireErrorPageComponent, + resolve: {envSpecific: EnvironmentSpecificResolver}, + data: {hasSidebar: false} + }, { path: ':stakeholder', loadChildren: './home/home.module#HomeModule', @@ -37,7 +42,8 @@ const routes: Routes = [ path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent, - resolve: {envSpecific: EnvironmentSpecificResolver} + resolve: {envSpecific: EnvironmentSpecificResolver}, + data: {hasSidebar: false} } ]; diff --git a/src/app/error/errorPage.component.ts b/src/app/error/errorPage.component.ts index 2b36d72..1b95afc 100644 --- a/src/app/error/errorPage.component.ts +++ b/src/app/error/errorPage.component.ts @@ -1,5 +1,4 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; -import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.service"; +import {Component} from '@angular/core'; @Component({ selector: 'openaire-error', @@ -7,15 +6,7 @@ import {SideBarService} from "../library/sharedComponents/sidebar/sideBar.servic ` }) -export class OpenaireErrorPageComponent implements OnInit, OnDestroy{ +export class OpenaireErrorPageComponent { - constructor(private sidebarService: SideBarService) {} - - ngOnInit(): void { - this.sidebarService.setHasSidebar(false); - } - - ngOnDestroy(): void { - this.sidebarService.setHasSidebar(true); - } + constructor() {} } diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 5dcacc8..d31eac0 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -128,12 +128,6 @@ export class HomeComponent implements OnInit, OnDestroy { this.deleteTopicModal.open(); } - public navigateTo(alias: string) { - this.router.navigate(['./' + alias], { - relativeTo: this.route - }); - } - private save(message: string, element) { this.stakeholderService.saveStakeholder(this.properties.monitorServiceAPIURL, this.stakeholder).subscribe(stakeholder => { this.stakeholderService.setStakeholder(stakeholder); diff --git a/src/app/library/sharedComponents/sidebar/sideBar.service.ts b/src/app/library/sharedComponents/sidebar/sideBar.service.ts index 31c8114..1a47e62 100644 --- a/src/app/library/sharedComponents/sidebar/sideBar.service.ts +++ b/src/app/library/sharedComponents/sidebar/sideBar.service.ts @@ -1,5 +1,6 @@ import {Injectable} from "@angular/core"; import {BehaviorSubject, Observable} from "rxjs"; +import {ActivationStart, Router} from "@angular/router"; @Injectable({ providedIn: 'root' @@ -17,7 +18,20 @@ export class SideBarService { */ private hasSidebarSubject: BehaviorSubject = new BehaviorSubject(true); - constructor() {} + constructor(private router: Router) { + this.router.events.subscribe(event => { + if (event instanceof ActivationStart) { + let data = event.snapshot.data; + if (this.hasSidebarSubject.value === true && + data['hasSidebar'] !== undefined && + data['hasSidebar'] === false) { + this.setHasSidebar(false); + } else if (this.hasSidebarSubject.value === false) { + this.setHasSidebar(true); + } + } + }); + } get open(): boolean { return this.openSubject.getValue(); diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 937d593..ff56d00 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -92,7 +92,7 @@ more_vert -
{{indicator.name}}
+
{{indicator.name}}
diff --git a/src/app/topic/topic.component.ts b/src/app/topic/topic.component.ts index ad66990..9f1f770 100644 --- a/src/app/topic/topic.component.ts +++ b/src/app/topic/topic.component.ts @@ -72,7 +72,7 @@ export class TopicComponent implements OnInit, OnDestroy { if(this.topicIndex === -1) { this.navigateToError(); } else { - this.title.setTitle(stakeholder.index_name); + this.title.setTitle(stakeholder.index_shortName + ' | ' + this.stakeholder.topics[this.topicIndex].name); this.toggle = true; } }