From 296358935954c71466369aa72d4c9703296516e4 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 8 May 2023 16:41:42 +0300
Subject: [PATCH] [Library | explore-redesign]: availableOn.component.ts &
 resultLanding.component & result-preview.component: [Bug fix] Added method
 "getAccessLabel()" to create label from accessRight.

---
 landingPages/landing-utils/availableOn.component.ts | 11 +++++++++--
 landingPages/result/resultLanding.component.html    |  2 +-
 landingPages/result/resultLanding.component.ts      |  7 +++++++
 utils/result-preview/result-preview.component.html  |  2 +-
 utils/result-preview/result-preview.component.ts    |  7 +++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts
index 186e5ace..abcea652 100644
--- a/landingPages/landing-utils/availableOn.component.ts
+++ b/landingPages/landing-utils/availableOn.component.ts
@@ -13,7 +13,7 @@ declare var UIkit;
 			<div class="uk-flex uk-flex-middle">
 				<ng-container *ngIf="availableOn[0].downloadUrl">
 					<span [class]="'uk-margin-xsmall-right ' + (availableOn[0].accessRightIcon == 'open_access' ? 'open-access' : 'closed-access')"
-							uk-tooltip [title]="(availableOn[0].accessRight ? availableOn[0].accessRight : 'Not available') + ' access'">
+							uk-tooltip [title]="getAccessLabel(availableOn[0].accessRight)">
 						<icon [name]="availableOn[0].accessRightIcon" [flex]="true" [ratio]="(isMobile && usedBy == 'landing') ? 1 : 0.8"></icon>
 					</span>
           <ng-container *ngIf="!(isMobile && usedBy == 'landing')">
@@ -52,7 +52,7 @@ declare var UIkit;
       <div *ngFor="let instance of availableOn let i=index" class="download-drop-item uk-flex uk-flex-top">
         <span
           [class]="'uk-margin-small-right ' + (instance.accessRightIcon == 'open_access' ? 'open-access' : 'closed-access')"
-          uk-tooltip [title]="(instance.accessRight ? instance.accessRight : 'Not available') + ' access'">
+          uk-tooltip [title]="getAccessLabel(instance.accessRight)">
           <icon [name]="instance.accessRightIcon" [flex]="true"></icon>
         </span>
         <div class="uk-width-expand uk-padding-small uk-padding-remove-left uk-padding-remove-vertical">
@@ -130,4 +130,11 @@ export class AvailableOnComponent {
     this.availableListFsModal.okButton = false;
     this.availableListFsModal.open();
   }
+
+  public getAccessLabel(accessRight) : string {
+    if(accessRight) {
+      return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access"));
+    }
+    return "Not available access";
+  }
 }
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index cb7e2e7b..07f1535b 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -490,7 +490,7 @@
         class="uk-margin-small-bottom uk-flex uk-flex-middle"
         [ngClass]="(resultLandingInfo.hostedBy_collectedFrom[0].accessRightIcon == 'open_access' ? 'open-access' : 'closed-access')">
         <icon [name]="resultLandingInfo.hostedBy_collectedFrom[0].accessRightIcon" [flex]="true" [ratio]="1"></icon>
-        <span class="uk-margin-xsmall-left uk-text-small uk-text-uppercase uk-text-bolder">{{(resultLandingInfo.hostedBy_collectedFrom[0].accessRight ? resultLandingInfo.hostedBy_collectedFrom[0].accessRight : 'Not available') + ' access'}}</span>
+        <span class="uk-margin-xsmall-left uk-text-small uk-text-uppercase uk-text-bolder">{{getAccessLabel(resultLandingInfo.hostedBy_collectedFrom[0].accessRight)}}</span>
       </div>
       <landing-header [properties]="properties" [title]="resultLandingInfo.title"
                       [subTitle]="resultLandingInfo.subtitle"
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index 815cd238..9af21a0d 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -1097,4 +1097,11 @@ export class ResultLandingComponent {
   public isNumber(value): boolean {
     return typeof value === 'number';
   }
+
+  public getAccessLabel(accessRight) : string {
+    if(accessRight) {
+      return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access"));
+    }
+    return "Not available access";
+  }
 }
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index b2cbfc0e..278a7301 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -69,7 +69,7 @@
               <div *ngIf="result.hostedBy_collectedFrom && result.hostedBy_collectedFrom.length > 0" class="uk-hidden@m uk-width-auto">
                 <div class="uk-margin-small-bottom uk-flex uk-flex-middle"
                      [ngClass]="(result.hostedBy_collectedFrom[0].accessRightIcon == 'open_access' ? 'open-access' : 'closed-access')"
-                     uk-tooltip [title]="(result.hostedBy_collectedFrom[0].accessRight ? result.hostedBy_collectedFrom[0].accessRight : 'Not available') + ' access'">
+                     uk-tooltip [title]="getAccessLabel(result.hostedBy_collectedFrom[0].accessRight)">
                   <icon [name]="result.hostedBy_collectedFrom[0].accessRightIcon" [flex]="true" [ratio]="1.2"></icon>
                 </div>
               </div>
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index d6a88335..6e253824 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -219,4 +219,11 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     let formatted = NumberUtils.roundNumber(+num);
     return formatted.number + formatted.size;
   }
+
+  public getAccessLabel(accessRight) : string {
+    if(accessRight) {
+      return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access"));
+    }
+    return "Not available access";
+  }
 }