Merge branch 'master' of code-repo.d4science.org:MaDgIK/openaire-library

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) {

sharedComponents/navigationBar.component.html

@@ -241,6 +241,57 @@
 
                 </li>
               </ng-container>
+							<!-- Custom menu items -->
+							<ng-container *ngIf="customMenuItems?.length > 0 && properties.environment == 'development'">
+								<ng-container *ngFor="let menu of customMenuItems">
+									<li class="uk-parent">
+										<!-- INTERNAL ROOT-->
+										<a *ngIf="menu.type == 'internal' && menu.route && isEnabled([menu.route], showPage)" routerLinkActive="uk-link"
+												routerLink="{{menu.route}}"
+												[queryParams]="menu.params"
+												[fragment]="menu.fragment">
+											{{menu.title}}
+										</a>
+										<!-- EXTERNAL ROOT-->
+										<a *ngIf="menu.type == 'external' && menu.url"
+												href="{{menu.url}}"
+												target="_blank">
+											{{menu.title}}
+										</a>
+										<!-- NO ACTION ROOT-->
+										<a *ngIf="menu.type == 'noAction'">
+											{{menu.title}}
+										</a>
+										<div *ngIf="menu.items.length > 0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left"
+											style="top: 80px; left: 0px;" id="{{menu._id}}" uk-toggle>
+											<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
+												<div class="uk-first-column uk-height-max-medium uk-overflow-auto">
+													<ul class="uk-nav uk-navbar-dropdown-nav">
+														<ng-container *ngFor="let submenu of menu.items">
+															<li>
+																<!-- INTERNAL CHILD -->
+																<a *ngIf="submenu.type == 'internal' && submenu.route && isEnabled([submenu.route], showPage)" routerLinkActive="uk-link"
+																		routerLink="{{submenu.route}}"
+																		[queryParams]="submenu.params"
+																		[fragment]="submenu.fragment"
+																		[class.uk-active]="isTheActiveMenuItem(submenu)">
+																	{{submenu.title}}
+																</a>
+																<!-- EXTERNAL CHILD -->
+																<a *ngIf="submenu.type == 'external' && submenu.url" routerLinkActive="uk-link"
+																		href="{{submenu.url}}"
+																		target="_blank">
+																	{{submenu.title}}
+																</a>
+															</li>
+														</ng-container>
+													</ul>
+												</div>
+											</div>
+										</div>
+									</li>
+								</ng-container>
+							</ng-container>
 
             </ul>
             <!-- </div> -->

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)
+				)
+			);
+		}
   }
   
   

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
     ]