From 0ea71ad361ba03c1c45f89aeaa7372ae5d928b69 Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Wed, 4 Dec 2019 14:36:42 +0000
Subject: [PATCH] [Monitor Dashboard]: Fix a bug on menu item of sidebar

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57811 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../sharedComponents/sidebar/sideBar.component.html       | 4 ++--
 .../library/sharedComponents/sidebar/sideBar.component.ts | 8 +++-----
 src/assets/theme-assets/dashboard-custom.css              | 1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.html b/src/app/library/sharedComponents/sidebar/sideBar.component.html
index 65d9631..c25c0b2 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.html
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.html
@@ -24,8 +24,8 @@
             </a>
             <ul [style.display]="(item.open?'block':'none')">
               <ng-template ngFor [ngForOf]="item.items" let-subItem let-j="index">
-                <li *ngIf="subItem.route" [class.act_item]="isTheActiveMenuItem(subItem, true)">
-                  <a [routerLink]="!isTheActiveMenuItem(subItem, true)?subItem.route:null">
+                <li *ngIf="subItem.route" [class.act_item]="isTheActiveMenuItem(item, subItem)">
+                  <a [routerLink]="!isTheActiveMenuItem(item, subItem)?subItem.route:null">
                     <span *ngIf="subItem.icon" class="menu_icon"><i class="material-icons">{{subItem.icon}}</i></span>
                     <span class="menu_title">{{subItem.name}}</span>
                   </a>
diff --git a/src/app/library/sharedComponents/sidebar/sideBar.component.ts b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
index 202f03c..10e7b8b 100644
--- a/src/app/library/sharedComponents/sidebar/sideBar.component.ts
+++ b/src/app/library/sharedComponents/sidebar/sideBar.component.ts
@@ -1,5 +1,4 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {Router} from "@angular/router";
 import {Header, Item} from "../../../utils/entities/sidebar";
 
 @Component({
@@ -13,15 +12,14 @@ export class SideBarComponent implements OnInit {
   @Input() activeItem: string = '';
   @Input() activeSubItem: string = '';
 
-  constructor(private router: Router) {
-  }
+  constructor() {}
 
   ngOnInit(): void {
   }
 
 
-  isTheActiveMenuItem(item: Item, subItem = false): boolean {
+  isTheActiveMenuItem(item: Item, subItem: Item = null): boolean {
     return  (!subItem && this.activeItem === item.id) ||
-        (subItem && this.activeSubItem === item.id);
+        (subItem && this.activeItem === item.id && this.activeSubItem === subItem.id);
   }
 }
diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css
index bd17ad3..c27be13 100644
--- a/src/assets/theme-assets/dashboard-custom.css
+++ b/src/assets/theme-assets/dashboard-custom.css
@@ -44,6 +44,7 @@ html .dashboard {
 
 .dashboard #sidebar_main .menu_section > ul li > a {
   font-size: var(--sidebar-font-size);
+  line-height: 19px;
   color: rgba(0, 0, 0, 0.7);
 }