From 1b6c7f06def2713df227f86b56767bb445f1a4cb Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Thu, 13 Jan 2022 14:09:10 +0200 Subject: [PATCH] add custom menu items in the navbar for community gateways - dev only --- connect/connectHelper.ts | 2 +- sharedComponents/navigationBar.component.html | 51 +++++++++++++++++++ sharedComponents/navigationBar.component.ts | 17 ++++++- sharedComponents/navigationBar.module.ts | 3 +- 4 files changed, 69 insertions(+), 4 deletions(-) diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 8c44de5f..7d9df3ff 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -6,7 +6,7 @@ export class ConnectHelper { public static getCommunityFromDomain(domain: string): string{ if(properties.environment == "development") { - domain = "aginfra.openaire.eu"; //for testing + domain = "covid-19.openaire.eu"; //for testing } domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix if (domain.indexOf('openaire.eu') === -1) { diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 7053eac6..1f4d71e9 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -241,6 +241,57 @@ + + + +
  • + + + {{menu.title}} + + + + {{menu.title}} + + + + {{menu.title}} + + +
  • +
    +
    diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts index 7ae98b83..2b357877 100644 --- a/sharedComponents/navigationBar.component.ts +++ b/sharedComponents/navigationBar.component.ts @@ -5,6 +5,7 @@ import {ConfigurationService} from '../utils/configuration/configuration.service import {MenuItem, RootMenuItem} from './menu'; import {EnvProperties} from '../utils/properties/env-properties'; import {Subscription} from 'rxjs'; +import {HelpContentService} from '../services/help-content.service'; export interface Header { route?: string, @@ -49,12 +50,14 @@ export class NavigationBarComponent implements OnInit, OnDestroy { showPage = {}; specialAnnouncementContent: string = null; + public customMenuItems: MenuItem[] = []; constructor(private router: Router, private route: ActivatedRoute, - private config: ConfigurationService) { + private config: ConfigurationService, + private _helpContentService: HelpContentService) { } - + ngOnInit() { this.initialize(); } @@ -100,6 +103,16 @@ export class NavigationBarComponent implements OnInit, OnDestroy { this.handleError('Error getting community information (e.g. pages,entities) for community with id: ' + this.communityId, error); })); } + if(this.portal != 'connect') { + this.subs.push( + this._helpContentService.getMenuItems(this.portal).subscribe( + data => { + this.customMenuItems = data; + }, + error => this.handleError("Server error fetching custom menu items", error) + ) + ); + } } diff --git a/sharedComponents/navigationBar.module.ts b/sharedComponents/navigationBar.module.ts index 8fe20f36..f302555b 100644 --- a/sharedComponents/navigationBar.module.ts +++ b/sharedComponents/navigationBar.module.ts @@ -8,6 +8,7 @@ import { NavigationBarComponent} from './navigationBar.component'; import { UserMiniModule} from '../login/userMiniModule.module'; import {SearchBarModule} from "./searchBar/searchBar.module"; +import {HelpContentService} from '../services/help-content.service'; @NgModule({ imports: [ @@ -19,7 +20,7 @@ import {SearchBarModule} from "./searchBar/searchBar.module"; declarations: [ NavigationBarComponent ], - providers:[], + providers:[HelpContentService], exports: [ NavigationBarComponent ]