From 35d91a5fc63272cc0709064ba81ca5675185ae61 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Fri, 20 May 2022 15:20:50 +0300
Subject: [PATCH] [Aggregator & Library | new-theme]: Fixes in search forms and
 logo | Removed animation in card results | Added service landing links for
 incompatible datasources in eosc portal. 1. home.component.html:    a.
 Removed uk-margin-large-top from search form and logo.    b. Removed
 uk-height-medium from  search form and logo.    c. Move searchImage on top of
 search form (uk-width-1-1) for small screens. 2.
 searchMyOrcidResults.component.html: Removed animation with uk-scrollspy. 3.
 searchAll.component.html: Move searchImage on top of search form
 (uk-width-1-1) for small screens. 4. newSearchPage.component.html:    a.
 Removed animation with uk-scrollspy.    b. For simple search, move
 searchImage on top of search form (uk-width-1-1) for small screens.    c. For
 advanced search, searchImage is on top of search form for any screen size. 5.
 result-preview.component.html & result-preview.component.ts: For eosc
 portalType, added in incompatible datasources link to the service landing
 page. 6. aggregators.ts:    a. In #searchImage commented custom margin-left. 
   b. In #searchForm commented custom padding and width.    c. Exclude also
 .uk-button-link from custom css for buttons with parent .search_box_bg or
 #searchForm.

---
 orcid/my-orcid-links/searchMyOrcidResults.component.html | 2 +-
 searchPages/find/searchAll.component.html                | 2 +-
 searchPages/searchUtils/newSearchPage.component.html     | 4 ++--
 utils/result-preview/result-preview.component.html       | 4 ++--
 utils/result-preview/result-preview.component.ts         | 9 +++++++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.html b/orcid/my-orcid-links/searchMyOrcidResults.component.html
index c7848ea2..d6c362c3 100644
--- a/orcid/my-orcid-links/searchMyOrcidResults.component.html
+++ b/orcid/my-orcid-links/searchMyOrcidResults.component.html
@@ -5,7 +5,7 @@
                   [totalResults]="totalResults">
   </no-load-paging>
 
-  <ul class="uk-list search-results uk-margin-remove-top" uk-scrollspy="cls: uk-animation-fade; target: .uk-card; delay: 100">
+  <ul class="uk-list search-results uk-margin-remove-top">
     <errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages>
 
     <li *ngFor="let result of previewResults">
diff --git a/searchPages/find/searchAll.component.html b/searchPages/find/searchAll.component.html
index 23651c47..02273962 100644
--- a/searchPages/find/searchAll.component.html
+++ b/searchPages/find/searchAll.component.html
@@ -9,7 +9,7 @@
       <div class="uk-position-relative">
         <div class="uk-container uk-container-large uk-section uk-section-small uk-margin-bottom" id="searchForm">
           <div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid>
-            <div id="searchImage"></div>
+            <div class="uk-width-1-1 uk-width-auto@m"><div id="searchImage"></div></div>
             <advanced-search-form
               entityType="all"
               (queryChange)="keywordChanged($event)"
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index 4f095631..20de2eac 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -130,7 +130,7 @@
       <div class="uk-position-relative">
         <div class="uk-container uk-container-small uk-section uk-section-small uk-margin-bottom" id="searchForm">
           <div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid>
-            <div id="searchImage"></div>
+            <div [class]="'uk-width-1-1'+(simpleView?' uk-width-auto@m' : '')"><div id="searchImage"></div></div>
             <advanced-search-form class="uk-width-expand uk-padding uk-padding-remove-vertical"
                 [entityType]="entityType"
                 [fieldIds]="fieldIds"
@@ -293,7 +293,7 @@
               </div>
               <div
                   *ngIf="(searchUtils.page <= pagingLimit) || (searchUtils.totalResults <= searchUtils.size*pagingLimit)"
-                  class="uk-margin"  uk-scrollspy="cls: uk-animation-fade; target: .uk-card; delay: 100">
+                  class="uk-margin">
                 <search-result *ngIf="( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'"
                               [results]="results"
                               [status]=searchUtils.status
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index f2e971e8..369dd9b2 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -38,7 +38,7 @@
 					<!-- Title -->
 					<div>
 						<h2 class="uk-margin-remove uk-text-break uk-inline-block uk-h6">
-							<a *ngIf="!externalUrl && result.id && !(result.resultType == 'dataprovider' && result.compatibilityUNKNOWN) "
+							<a *ngIf="!externalUrl && result.id && !(result.resultType == 'dataprovider' && result.compatibilityUNKNOWN && properties.adminToolsPortalType != 'eosc') "
 								(click)="onClick()" [queryParams]="createParam()"
 								[routerLink]="url" class="uk-link uk-link-heading uk-width-expand">
 								<div *ngIf="(result.title) || result.acronym">
@@ -69,7 +69,7 @@
 								</span>
 							</a>
 
-							<div *ngIf="!result.id ||  (result.resultType == 'dataprovider' && result.compatibilityUNKNOWN)"
+							<div *ngIf="!result.id ||  (result.resultType == 'dataprovider' && result.compatibilityUNKNOWN && properties.adminToolsPortalType != 'eosc')"
 									class="uk-width-expand">
 								<div *ngIf="(result.title) || result.acronym">
 						<span *ngIf="result.acronym">
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 2c77611b..d820992e 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -58,8 +58,13 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
         this.urlParam = "organizationId";
         this.url = properties.searchLinkToOrganization.split('?')[0];
       } else if (this.result.resultType == "dataprovider") {
-        this.urlParam = "datasourceId";
-        this.url = properties.searchLinkToDataProvider.split('?')[0];
+        if(this.result.compatibilityUNKNOWN && properties.adminToolsPortalType == "eosc") {
+          this.urlParam = "serviceId";
+          this.url = properties.searchLinkToService.split('?')[0];
+        } else {
+          this.urlParam = "datasourceId";
+          this.url = properties.searchLinkToDataProvider.split('?')[0];
+        }
       } else if (this.result.resultType == "service") {
         this.urlParam = "serviceId";
         this.url = properties.searchLinkToService.split('?')[0];