From 918d7ca782aac0270af519ea14eda4ba3844bee4 Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Wed, 8 May 2019 18:24:30 +0300
Subject: [PATCH] sidebar changes

---
 .../src/app/ui/sidebar/sidebar.component.html | 24 +++++++------
 .../src/app/ui/sidebar/sidebar.component.ts   | 36 +++++++------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
index d49636556..fa2f48777 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html
@@ -45,18 +45,20 @@
 	<!-- END OF MOBILE MENU -->
 
 	<!-- Sidebar Menu -->
-	<ul class="nav" *ngFor="let groupMenuItem of getMenuItems(); last as isLast; first as isFirst">
-		<div class="sidebarSubtitle">
-			<p>{{groupMenuItem.title | translate}}</p>
+	<ul class="nav" *ngFor="let groupMenuItem of groupMenuItems; last as isLast; first as isFirst">
+		<div *ngIf="isAuthenticated() || !groupMenuItem.requiresAuthentication">
+			<div class="sidebarSubtitle">
+				<p>{{groupMenuItem.title | translate}}</p>
+			</div>
+			<li routerLinkActive="active" *ngFor="let groupMenuRoute of groupMenuItem.routes" class="{{groupMenuRoute.class}} nav-item">
+				<a class="nav-link" [routerLink]="[groupMenuRoute.path]">
+					<i *ngIf="isFirst" class="material-icons">{{ groupMenuRoute.icon }}</i>
+					<i *ngIf="!isFirst" class="material-icons-outlined">{{ groupMenuRoute.icon }}</i>
+					<p>{{groupMenuRoute.title | translate}}</p>
+				</a>
+			</li>
+			<hr *ngIf="!isLast">
 		</div>
-		<li routerLinkActive="active" *ngFor="let groupMenuRoute of groupMenuItem.routes" class="{{groupMenuRoute.class}} nav-item">
-			<a class="nav-link" [routerLink]="[groupMenuRoute.path]">
-				<i *ngIf="isFirst" class="material-icons">{{ groupMenuRoute.icon }}</i>
-				<i *ngIf="!isFirst" class="material-icons-outlined">{{ groupMenuRoute.icon }}</i>
-				<p>{{groupMenuRoute.title | translate}}</p>
-			</a>
-		</li>
-		<hr *ngIf="!isLast">
 	</ul>
 	<!-- Sidebar Footer -->
 	<div class="sidebar-footer">
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
index 2f118cf89..094c35d8a 100644
--- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts
@@ -8,28 +8,28 @@ declare interface RouteInfo {
 	path: string;
 	title: string;
 	icon: string;
-	requiresAuthentication: boolean;
 }
 declare interface GroupMenuItem {
 	title: string;
 	routes: RouteInfo[];
+	requiresAuthentication: boolean;
 }
 
 export const GENERAL_ROUTES: RouteInfo[] = [
-	{ path: '/home', title: 'SIDE-BAR.DASHBOARD', icon: 'dashboard', requiresAuthentication: true }
+	{ path: '/home', title: 'SIDE-BAR.DASHBOARD', icon: 'dashboard' }
 ];
 export const DMP_ROUTES: RouteInfo[] = [
-	{ path: '/plans', title: 'SIDE-BAR.MY-DMPS', icon: 'view_agenda', requiresAuthentication: true },
-	{ path: '/datasets', title: 'SIDE-BAR.MY-DATASET-DESC', icon: 'library_books', requiresAuthentication: true },
-	{ path: '/projects', title: 'SIDE-BAR.MY-PROJECTS', icon: 'work_outline', requiresAuthentication: true }
+	{ path: '/plans', title: 'SIDE-BAR.MY-DMPS', icon: 'view_agenda' },
+	{ path: '/datasets', title: 'SIDE-BAR.MY-DATASET-DESC', icon: 'library_books' },
+	{ path: '/projects', title: 'SIDE-BAR.MY-PROJECTS', icon: 'work_outline' }
 ];
 // export const HISTORY_ROUTES: RouteInfo[] = [
 //   { path: '/typography', title: 'SIDE-BAR.HISTORY-VISITED',  icon: 'visibility'},
 //   { path: '/icons', title: 'SIDE-BAR.HISTORY-EDITED',  icon: 'edit'}
 // ];
 export const PUBLIC_ROUTES: RouteInfo[] = [
-	{ path: '/explore', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'public', requiresAuthentication: false },
-	{ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'public', requiresAuthentication: false }
+	{ path: '/explore', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'public', },
+	{ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'public', }
 ];
 
 @Component({
@@ -49,13 +49,15 @@ export class SidebarComponent implements OnInit {
 	ngOnInit() {
 		this.generalItems = {
 			title: 'SIDE-BAR.GENERAL',
-			routes: GENERAL_ROUTES
+			routes: GENERAL_ROUTES,
+			requiresAuthentication: true
 		}
 		this.groupMenuItems.push(this.generalItems);
 
 		this.dmpItems = {
 			title: 'SIDE-BAR.DMP',
-			routes: DMP_ROUTES
+			routes: DMP_ROUTES,
+			requiresAuthentication: true
 		}
 		this.groupMenuItems.push(this.dmpItems);
 
@@ -67,7 +69,8 @@ export class SidebarComponent implements OnInit {
 
 		this.publicItems = {
 			title: 'SIDE-BAR.PUBLIC',
-			routes: PUBLIC_ROUTES
+			routes: PUBLIC_ROUTES,
+			requiresAuthentication: false
 		}
 		this.groupMenuItems.push(this.publicItems);
 	}
@@ -84,19 +87,6 @@ export class SidebarComponent implements OnInit {
 		return !(!this.authentication.current());
 	}
 
-	public getMenuItems() {
-
-		if (this.isAuthenticated()) {
-			return this.groupMenuItems;
-		} else {
-			const groupMenuItems = this.groupMenuItems.filter(x => x);
-			groupMenuItems.forEach(group => {
-				group.routes = group.routes.filter(y => !y.requiresAuthentication);
-			});
-			return groupMenuItems.filter(x => x.routes.length > 0);
-		}
-	}
-
 	openProfile() {
 		const dialogRef = this.dialog.open(UserDialogComponent, {
 			hasBackdrop: true,