From 2ce065b70e2ef503e0a6317eeb8210fcae1003c3 Mon Sep 17 00:00:00 2001
From: Argiro Kokogiannaki <argirok@di.uoa.gr>
Date: Thu, 5 Nov 2020 16:50:06 +0000
Subject: [PATCH] [Monitor Dashboard | Trunk]

-call setSidebar when stakeholder is already available from admin
-hide section title when there are no indicators
-


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59789 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.html                            |  3 ++-
 src/app/app.component.ts                              |  4 ++--
 .../manageStakeholders.component.css                  |  2 +-
 .../manageStakeholders.component.html                 |  2 +-
 src/app/monitor/monitor.component.html                |  5 +++--
 src/app/monitor/monitor.component.ts                  | 11 ++++++++++-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 08ade81..fba1e15 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -17,7 +17,8 @@
                        'monitor.openaire.eu'" queryParamsHandling="preserve"
     ></dashboard-sidebar>
     <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" headerName="Admin"
-                       headerDashboard="Administration Panel" [headerUrl]="properties.domain + properties.baseLink"
+                       headerDashboard="Administration Panel" [headerUrl]="'https://' + (properties.environment == 'beta' ? 'beta.' : '') +
+                       'monitor.openaire.eu'"
                        [specialMenuItem]="specialSideBarMenuItem"
     ></dashboard-sidebar>
     <router-outlet></router-outlet>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 32797b7..4410dc3 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -124,7 +124,7 @@ export class AppComponent implements OnInit, OnDestroy {
                 } else {
                   this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
                 }
-                // this.setSideBar();
+                this.setSideBar();
                 this.loading = false;
               } else {
                 LinksResolver.resetProperties();
@@ -147,6 +147,7 @@ export class AppComponent implements OnInit, OnDestroy {
             } else {
               this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
             }
+            this.setSideBar();
             this.loading = false;
           }
         } else {
@@ -226,7 +227,6 @@ export class AppComponent implements OnInit, OnDestroy {
     }
     if (this.stakeholder) {
       if (this.isFrontPage) {
-        this.setSideBar();
         this.menuHeader = {
           route: "/" + this.stakeholder.alias,
           url: null,
diff --git a/src/app/manageStakeholders/manageStakeholders.component.css b/src/app/manageStakeholders/manageStakeholders.component.css
index d658426..3d36bda 100644
--- a/src/app/manageStakeholders/manageStakeholders.component.css
+++ b/src/app/manageStakeholders/manageStakeholders.component.css
@@ -1,5 +1,5 @@
 .uk-card {
-  min-height: 270px;
+  min-height: 150px;
 }
 
 .uk-card-body {
diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html
index 37f9ca3..809fb66 100644
--- a/src/app/manageStakeholders/manageStakeholders.component.html
+++ b/src/app/manageStakeholders/manageStakeholders.component.html
@@ -124,7 +124,7 @@
       <div class="uk-text-small uk-text-muted">
         {{text}}
       </div>
-      <div class="uk-margin-medium-top">
+      <div class="uk-margin-medium-top uk-margin-small-bottom">
         <span class="uk-text-secondary">
           <icon name="add" [ratio]="3"></icon>
         </span>
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index f422551..de2485e 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -123,7 +123,7 @@
         <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-margin-top"
              uk-height-match="target: div.uk-card">
           <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
-            <h4 class="uk-width-1-1">{{number.title}}</h4>
+            <h4 *ngIf="countIndicatorsToShow(number.indicators)> 0 " class="uk-width-1-1">{{number.title}}</h4>
             <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
               <div *ngIf="isPublicOrIsMember(indicator.visibility)"
                    [class.uk-width-1-3@m]="indicator.width === 'small'"
@@ -153,7 +153,8 @@
                class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
                uk-height-match="target: div > div > .chartTitle">
 
-            <h3 *ngIf="chart.title && chart.title.length > 0" class="uk-width-1-1 uk-margin-top">{{chart.title}}</h3>
+            <h3 *ngIf="chart.title && chart.title.length > 0 && countIndicatorsToShow(chart.indicators) > 0 "
+                class="uk-width-1-1 uk-margin-top">{{chart.title}}</h3>
             <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
               <div
                   *ngIf="isPublicOrIsMember(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index f47cbf5..5c8d6c9 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -11,7 +11,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
 import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
 import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
 import {
-  Category,
+  Category, Indicator,
   IndicatorPath,
   Stakeholder,
   SubCategory,
@@ -450,6 +450,15 @@ export class MonitorComponent implements OnInit, OnDestroy {
     }
     return counter;
   }
+  public countIndicatorsToShow(indicators:Indicator[]): number {
+    let counter = 0;
+    for (let i of indicators) {
+      if(this.isPublicOrIsMember(i.visibility)) {
+        counter++;
+      }
+    }
+    return counter;
+  }
   /*
   Feedback mail
    */