From 49a41627b19871badc164a169cb01ea9552b19bd Mon Sep 17 00:00:00 2001
From: Argiro Kokogiannaki <argirok@di.uoa.gr>
Date: Mon, 13 Jul 2020 09:23:04 +0000
Subject: [PATCH] [Monitor|Dashboard | Trunk]

Sidebar menu: add link to search research outcomes - build parameters for each stakeholder


Search pages:
	add isHidden = false for the custom filter
	remove openaireSearchLink

CSS:
	-add css for mini_title of sidebar
	-add selectedFilters css



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59079 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/app.component.html                    |  3 +-
 src/app/app.component.ts                      | 14 +++++++
 src/app/monitor/monitor.component.html        |  4 +-
 .../advanced/searchDataproviders.component.ts |  2 +-
 .../advanced/searchProjects.component.ts      |  3 +-
 .../searchResearchResults.component.ts        |  4 +-
 .../simple/searchDataproviders.component.ts   |  2 +-
 .../simple/searchProjects.component.ts        |  4 +-
 .../simple/searchResearchResults.component.ts |  4 +-
 src/assets/monitor-custom.css                 | 37 +++++++++++++------
 src/assets/theme-assets/dashboard-custom.css  | 10 +++++
 11 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index b7c81f7..ef18aa4 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -46,7 +46,8 @@
   <dashboard-sidebar *ngIf="stakeholder && isFrontPage" [items]="sideBarItems"
                      [activeItem]="activeTopic?activeTopic.alias:null" [showHeader]=true
                      headerName="Monitor"
-                     [searchLink]="(properties.showContent)?stakeholder.alias+'/search/':null"
+                     [searchLink]="(properties.showContent)?properties.searchLinkToResults:null"
+                     [searchParams]="createSearchParameters()"
                      [headerUrl]="properties.baseLink"
   ></dashboard-sidebar>
   <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" headerName="Monitor"
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 339721d..30e7a31 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -220,4 +220,18 @@ export class AppComponent implements OnInit, OnDestroy {
       return false;
     }
   }
+
+  createSearchParameters(){
+    if(!this.stakeholder){
+      return {};
+    }
+    if(this.stakeholder.type == "funder"){
+      return { "relfunder":encodeURIComponent("\"" + this.stakeholder.index_id + "||"+this.stakeholder.index_name + "||"+this.stakeholder.index_shortName + "\"" )};
+    }else if(this.stakeholder.type == "ri"){
+      // https://beta.explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&resultbestaccessright=%22Open%20Access%22&community=%22mes%7C%7CEuropean%20Marine%20Science%22&qf=true
+      return { "community":encodeURIComponent("\"" + this.stakeholder.index_id + "||"+this.stakeholder.index_name + "\"" )};
+    }else if(this.stakeholder.type == "organization"){
+      return { "relorganizationid":encodeURIComponent("\"" + this.stakeholder.index_id + "\"" )};
+    }
+  }
 }
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 1169cf1..aba87e0 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -30,7 +30,7 @@
         </ul>
         <div *ngIf="filterApplied">
           <span>Filters: </span>
-          <span *ngIf="periodFilter.selectedFromAndToValues.length > 0" class="filter">
+          <span *ngIf="periodFilter.selectedFromAndToValues.length > 0" class="selectedFilterLabel">
           <a (click)="clearPeriodFilter()"> <i
             class=" material-icons"></i>
           </a>  {{periodFilter.selectedFromAndToValues}}</span>
@@ -173,7 +173,7 @@
     <div class="uk-padding">
       <div class="uk-h4 ">Filters</div>
       <div *ngIf="periodFilter.selectedFromAndToValues.length > 0">
-        <span  class="filter" title="Remove {{periodFilter.selectedFromAndToValues}}">
+        <span  class="selectedFilterLabel" title="Remove {{periodFilter.selectedFromAndToValues}}">
           <a (click)="clearPeriodFilter()"> <i
             class=" material-icons"></i>
           </a>  {{periodFilter.selectedFromAndToValues}}</span>
diff --git a/src/app/search/searchPages/advanced/searchDataproviders.component.ts b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
index 6754445..0bbe11c 100644
--- a/src/app/search/searchPages/advanced/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-dataproviders *ngIf="initialized" [simpleView]="false"
-                            openaireLink="https://beta.explore.openaire.eu/search/find/dataproviders"
                             [customFilter]=customFilter [hasPrefix]="false"
                             [includeOnlyResultsAndFilter]="false">
       </search-dataproviders>
@@ -34,6 +33,7 @@ export class MonitorAdvancedSearchDataprovidersComponent {
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
diff --git a/src/app/search/searchPages/advanced/searchProjects.component.ts b/src/app/search/searchPages/advanced/searchProjects.component.ts
index 303885d..d50c960 100644
--- a/src/app/search/searchPages/advanced/searchProjects.component.ts
+++ b/src/app/search/searchPages/advanced/searchProjects.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-projects *ngIf="initialized" [simpleView]="false"
-                       openaireLink="https://beta.explore.openaire.eu/search/find/projects"
                        [customFilter]=customFilter [hasPrefix]="false"
                        [includeOnlyResultsAndFilter]="false">
       </search-projects>
@@ -33,9 +32,11 @@ export class MonitorAdvancedSearchProjectsComponent {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Funder", "funderid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
index b37dea4..c728e9b 100644
--- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
-                               openaireLink="https://beta.explore.openaire.eu/search/find/publications"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
                                [showAdvancedSearchLink]="true"></search-research-results>
@@ -32,11 +31,14 @@ export class MonitorAdvancedSearchResearchResultsComponent {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
               this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
+              this.customFilter.isHiddenFilter = false;
             }
             this.initialized = true;
           }
diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts
index 4f29bf6..d8eb5c3 100644
--- a/src/app/search/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-dataproviders *ngIf="initialized"
-                            openaireLink="https://beta.explore.openaire.eu/search/find/dataproviders"
                             [customFilter]=customFilter [hasPrefix]="false"
                             [includeOnlyResultsAndFilter]="false">
       </search-dataproviders>
@@ -34,6 +33,7 @@ export class MonitorSearchDataprovidersComponent {
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
diff --git a/src/app/search/searchPages/simple/searchProjects.component.ts b/src/app/search/searchPages/simple/searchProjects.component.ts
index 7fe08f2..ddb3b5b 100644
--- a/src/app/search/searchPages/simple/searchProjects.component.ts
+++ b/src/app/search/searchPages/simple/searchProjects.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-projects *ngIf="initialized"
-                       openaireLink="https://beta.explore.openaire.eu/search/find/projects"
                        [customFilter]=customFilter [hasPrefix]="false"
                        [includeOnlyResultsAndFilter]="false">
       </search-projects>
@@ -33,13 +32,16 @@ export class MonitorSearchProjectsComponent {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Funder", "funderid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "ri") {
               this.navigateToError();
             }
             this.initialized = true;
+
           }
         });
       } else {
diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts
index db966ba..4a5eee3 100644
--- a/src/app/search/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts
@@ -8,7 +8,6 @@ import {StakeholderService} from "../../../openaireLibrary/monitor/services/stak
   template: `
     <div id="page_content">
       <search-research-results *ngIf="initialized" resultType="result"
-                               openaireLink="https://beta.explore.openaire.eu/search/find/publications"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
                                [showAdvancedSearchLink]="true"></search-research-results>
@@ -32,11 +31,14 @@ export class MonitorSearchResearchResultsComponent {
             if (stakeholder.type === "funder") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
+              this.customFilter.isHiddenFilter = false;
             } else if (stakeholder.type === "organization") {
               let value = stakeholder.index_id;
               this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
+              this.customFilter.isHiddenFilter = true;
             } else if (stakeholder.type === "ri") {
               this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
+              this.customFilter.isHiddenFilter = false;
             }
             this.initialized = true;
           }
diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css
index 6cd658e..c0173b5 100644
--- a/src/assets/monitor-custom.css
+++ b/src/assets/monitor-custom.css
@@ -84,7 +84,7 @@
 {
     background-color: var(--portal-main-color)  !important;
 }
-.stakeholderPage #sidebar_main .menu_section > ul > li.current_section .menu_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover  .menu_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a > .menu_icon .material-icons,
+.stakeholderPage #sidebar_main .menu_section > ul > li.current_section .menu_title,.stakeholderPage #sidebar_main .menu_section > ul > li.current_section .menu_mini_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover  .menu_title,  .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover  .menu_mini_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a > .menu_icon .material-icons,
 .stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a > .menu_icon svg *
 /*, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover > a > .menu_icon svg **/
 /*.stakeholderPage #sidebar_main .menu_section > ul > li:hover > a > .menu_icon .material-icons*/
@@ -143,16 +143,6 @@ bottom a:not(.license), bottom a > :not(svg) {
     margin-right: -30% !important;
 }
 
-.filter{
-    background: var(--portal-main-color);
-    color: white;
-    padding: 8px;
-    border-radius: 25px;
-}
-.filter, .filter .material-icons{
-    color: white;
-}
-
 .ng5-slider .ng5-slider-pointer, .ng5-slider .ng5-slider-selection {
     background-color: var(--portal-main-color) !important;
 }
@@ -180,3 +170,28 @@ bottom a:not(.license), bottom a > :not(svg) {
 .uk-subnav.uk-subnav-divider.recentyears {
     padding-left: 0 !important;
 }
+
+/*add miniTitle*/
+.sidebar_mini #sidebar_main .menu_section > ul > li > a .menu_icon{
+    height:35px !important;
+}
+/* #sidebar_main .menu_section > ul > li > a .menu_icon{*/
+/*    height:35px !important;*/
+/*}*/
+#sidebar_main .menu_section > ul > li > a {
+    height:inherit !important;
+}
+
+.stakeholderPage #sidebar_main .menu_section > ul > li .menu_mini_title {
+    font-size: 9px !important;
+    line-height: 12px;
+    padding-bottom: 5px;
+    padding-left: 5px;
+    padding-right: 5px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.stakeholderPage:not(.sidebar_mini) #sidebar_main .menu_section > ul > li .menu_mini_title{
+    display: none;
+}
diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css
index 40ce4f9..b78660c 100644
--- a/src/assets/theme-assets/dashboard-custom.css
+++ b/src/assets/theme-assets/dashboard-custom.css
@@ -557,3 +557,13 @@ body.dashboard {
 .dashboard [class*="uk-icon-"][class*="uk-button-"]:not(.uk-button-default) {
   color: #fff;
 }
+
+.selectedFilterLabel{
+  background: var(--portal-main-color) !important;
+  color: white !important;
+  padding: 6px 10px !important;
+  border-radius: 25px !important;
+}
+.selectedFilterLabel, .selectedFilterLabel .material-icons{
+  color: white;
+}