From 56a877461d4bb0bb0b1d98f520e4a485828388bc Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Wed, 13 Apr 2022 13:22:22 +0300
Subject: [PATCH] tweak for print.css and add click-outside-or-escape directive
 for indicators' description overlay

---
 src/app/monitor/monitor.component.html |  6 +++---
 src/app/monitor/monitor.component.ts   | 12 +++++++++---
 src/app/openaireLibrary                |  2 +-
 src/assets/common-assets               |  2 +-
 src/assets/openaire-theme              |  2 +-
 src/assets/print.css                   |  5 ++++-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index e2a7fc4..c4eefec 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -182,7 +182,7 @@
                     <div *ngIf="indicator.description || indicator.additionalDescription"
 											class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom">
 											<a class="uk-display-inline-block uk-text-uppercase uk-button-text"
-												(click)="toggleDescriptionOverlay(j)">
+												(click)="toggleDescriptionOverlay($event, j)">
 												<span class="uk-flex uk-flex-middle">
 													<icon name="analytics" type="outlined" [flex]="true"></icon>
 													<span class="uk-margin-small-left">Description</span>
@@ -191,9 +191,9 @@
                     </div>
 										<div *ngIf="showDescriptionOverlay[j] && (indicator.description || indicator.additionalDescription)"
 											class="custom-description-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
-											<div class="inner uk-padding-small">
+											<div class="inner uk-padding-small" click-outside-or-esc (clickOutside)="closeDescriptionOverlay($event, j)">
 												<div class="uk-flex uk-flex-right">
-													<a class="uk-display-inline-block uk-link-reset" (click)="toggleDescriptionOverlay(j)">
+													<a class="uk-display-inline-block uk-link-reset" (click)="toggleDescriptionOverlay($event, j)">
 														<icon name="close" ratio="1"></icon>
 													</a>
 												</div>
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index e620bdb..f0a19fb 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -31,7 +31,7 @@ import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class";
 import {properties} from "../../environments/environment";
 import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
 import {ConfigurationService} from "../openaireLibrary/utils/configuration/configuration.service";
-import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
+import {ClickEvent} from '../openaireLibrary/utils/click/click-outside-or-esc.directive';
 
 declare var UIkit;
 
@@ -570,8 +570,14 @@ export class MonitorComponent implements OnInit, OnDestroy {
     this.userManagementService.login();
   }
 
-	toggleDescriptionOverlay(j) {
-		console.log(j);
+	toggleDescriptionOverlay(event, j) {
+		event.stopPropagation();
 		this.showDescriptionOverlay[j] = !this.showDescriptionOverlay[j];
 	}
+
+	closeDescriptionOverlay(event: ClickEvent,j) {
+		if(event.clicked && this.showDescriptionOverlay[j]) {
+			this.showDescriptionOverlay[j] = false;
+		}
+	}
 }
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index d0dc3bd..e6b2f41 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit d0dc3bd5e86b2864cf0019c041526d2632eb982c
+Subproject commit e6b2f41c8c858f860ed4bf48d7a31e5a04d7a088
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 84332ef..fbbae04 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 84332ef82b15998e0d24f64f1ff1de97616cd735
+Subproject commit fbbae0418315e06d6ce5a0d193fd08c8ea617b6b
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 79aafa3..b441da3 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 79aafa3b70d8c0b21582fdb1b5dabbc7e6a825a2
+Subproject commit b441da3afde53c70df14cbdfc1230de41a034bb1
diff --git a/src/assets/print.css b/src/assets/print.css
index ab42c8f..c8dd326 100644
--- a/src/assets/print.css
+++ b/src/assets/print.css
@@ -18,7 +18,7 @@
 		padding: 0 !important;
 		margin: 0 !important;
 		position: relative !important;
-		height: 0px !important;
+		height: 0 !important;
 	}
 	#page_content,
 	.uk-navbar-center {
@@ -32,4 +32,7 @@
 	.uk-hidden {
 		display:unset !important;
 	}
+	.uk-card .uk-button-text {
+		display: none !important;
+	}
 }
\ No newline at end of file