From 157917ab0ed9eccc56f05279bbdcdb21a068882a Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 24 Jul 2023 22:38:31 +0300
Subject: [PATCH] validator-custom.less: Updated colors specifically for
 "validator", instead of "provide" | oaipmh-analysis.component: Added field
 "public guidelinesLabelToPrefix: Map<string, string>" to build correctly the
 record urls in warning/error modals.

---
 .../oaipmh-analysis.component.html            | 33 ++++++++++++++-----
 .../oaipmh-analysis.component.ts              |  7 ++++
 src/assets/validator-custom.less              | 14 +++++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.html b/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.html
index e9b9aa1..789fe6a 100644
--- a/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.html
+++ b/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.html
@@ -19,13 +19,13 @@
         <div *ngIf="ruleResult.rule_description" class="uk-text-small uk-text-meta">{{ruleResult.rule_description}}</div>
       </td>
       <td class="uk-text-center uk-text-normal">
-<!--        <span>F</span>-->
+<!--        <span uk-tooltip="Findable">F</span>-->
 <!--        <span>, </span>-->
-<!--        <span>A</span>-->
+<!--        <span uk-tooltip="Accessible">A</span>-->
 <!--        <span>, </span>-->
-<!--        <span uk-tooltip="Interoperability">I</span>-->
+<!--        <span uk-tooltip="Interoperable">I</span>-->
 <!--        <span>, </span>-->
-<!--        <span>R</span>-->
+<!--        <span uk-tooltip="Reusable">R</span>-->
         -
       </td>
 <!--      <td class="uk-text-center">{{(ruleResult.rule_weight != undefined && ruleResult.rule_weight != null) ? ruleResult.rule_weight : '-'}}</td>-->
@@ -34,7 +34,10 @@
         <div class="uk-text-xsmall">{{ruleResult.passed_records | number}}/{{jobResult.numberOfRecords | number}}</div>
         <div class="uk-text-center">
           <progress class="analysis-progress uk-progress uk-margin-remove-bottom" [value]="ruleResult.passed_records*100/jobResult.numberOfRecords" max="100"></progress>
-          <div class="uk-text-center uk-text-xsmall uk-text-primary" style="position:relative; top: -19px;">{{ruleResult.passed_records*100/jobResult.numberOfRecords}}%</div>
+          <div class="uk-text-center uk-text-xsmall uk-text-bolder uk-text-primary"
+               style="position:relative; top: -18px; mix-blend-mode: color-burn">
+            {{ruleResult.passed_records*100/jobResult.numberOfRecords}}%
+          </div>
         </div>
       </td>
       <td class="uk-text-center">
@@ -133,7 +136,9 @@
                       <div class="uk-accordion-content">
                         <hr>
                         <div *ngFor="let record of message.records" class="uk-margin-medium-left">
-                          <a [href]="record" target="_blank" class="uk-margin-left">{{record}}</a>
+<!--                          {Base OAI-PMH url}?verb=GetRecord&metadataPrefix={the metadata prefix for each rule*}&identifier={oai identifier, which you have}-->
+<!--                          *-->
+                          <a [href]="jobResult.baseUrl + '?verb=GetRecord&metadataPrefix=' + guidelinesLabelToPrefix.get(jobResult.guidelines) + '&identifier=' + record" target="_blank" class="uk-margin-left">{{record}}</a>
                         </div>
                       </div>
                     </li>
@@ -158,15 +163,25 @@
                         <div class="uk-flex uk-flex-top">
                           <icon class="uk-text-danger" [flex]="true" name="cancel" ratio="2"></icon>
                           <div class="uk-margin-left">
-                            <div class="uk-text-danger uk-text-default">{{message.description}}</div>
-                            <div class="uk-text-normal uk-text-small uk-margin-small-top">{{message.records.length | number}} Records</div>
+                            <div class="uk-text-danger uk-text-default">{{message.records.length | number}} Records - {{message.description}}</div>
+                            <div class="uk-text-normal uk-text-xsmall uk-margin-small-top uk-flex">
+                              <div class="uk-text-italic uk-text-meta">Try:</div>
+                              <div class="uk-margin-small-left">
+                                <div class="uk-text-truncate">
+                                  1. Lorem ipsum
+                                </div>
+                                <div class="uk-text-truncate">
+                                  2. Lorem ipsum
+                                </div>
+                              </div>
+                            </div>
                           </div>
                         </div>
                       </a>
                       <div class="uk-accordion-content">
                         <hr>
                         <div *ngFor="let record of message.records" class="uk-margin-medium-left">
-                          <a [href]="record" target="_blank" class="uk-margin-left">{{record}}</a>
+                          <a [href]="jobResult.baseUrl + '?verb=GetRecord&metadataPrefix=' + guidelinesLabelToPrefix.get(jobResult.guidelines) + '&identifier=' + record" target="_blank" class="uk-margin-left">{{record}}</a>
                         </div>
                       </div>
                     </li>
diff --git a/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.ts b/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.ts
index 04f8aa5..d7c82c8 100644
--- a/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.ts
+++ b/src/app/pages/oaipmh-validator/validation-analysis/oaipmh-analysis.component.ts
@@ -46,6 +46,13 @@ export class OaipmhAnalysisComponent implements OnInit {
 
   subscriptions = [];
 
+  public guidelinesLabelToPrefix: Map<string, string> = new Map([
+    ['OpenAIRE Guidelines for Literature Repositories Profile v4', 'oai_openaire'],
+    ['OpenAIRE Guidelines for Literature Repositories Profile v3', 'oai_dc'],
+    ['OpenAIRE Guidelines for Data Archives Profile v2', 'oai_datacite'],
+    ['OpenAIRE FAIR Guidelines for Data Repositories Profile', 'oai_datacite']
+  ]);
+
   constructor(private route: ActivatedRoute, private validator: OaipmhValidatorService) {
   }
 
diff --git a/src/assets/validator-custom.less b/src/assets/validator-custom.less
index 45919a4..3550cc0 100644
--- a/src/assets/validator-custom.less
+++ b/src/assets/validator-custom.less
@@ -1,9 +1,13 @@
-@aggregator-primary-background: #1F84C1;
-@aggregator-secondary-background: #5ABDF9;
-@global-primary-gradient: linear-gradient(101deg, @aggregator-primary-background 0%, @aggregator-secondary-background 100%);
+//@validator-primary-background: #1F84C1;
+//@validator-secondary-background: #5ABDF9;
+//@global-primary-gradient: linear-gradient(101deg, @validator-primary-background 0%, @validator-secondary-background 100%);
 
-@progress-height: 20px;
-@progress-bar-background: @global-muted-color;
+@validator-secondary-background: #3BCECC;
+@global-primary-gradient: linear-gradient(101deg, @global-primary-background 0%, @validator-secondary-background 100%);
+@global-secondary-background: @validator-secondary-background;
+
+@progress-bar-background: @global-secondary-background;
+//@progress-bar-background: @global-muted-color;
 
 //.sidebar_main_swipe #sidebar_main #sidebar_content {
 //  width: 280px;