From f935e81959f8f71b0057ecd6c116db444cd97846 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 28 Nov 2022 14:37:37 +0200 Subject: [PATCH] [Library | EOSC Explore]: Updated styles | Updated link to Marketplace for EOSC::RO-crate | Bug fix in description of results versions | Removed timeout from reports.service.ts. 1. home.component.html: Added blue banner, white logo, aligned search form to the center and updated fonts according the new EOSC Marketplace. 2. parsingFunctions.class.ts: Updated link to Marketplace for eosc subject EOSC::RO-crate. 3. resultLanding.component.html: Updated how links to Compatible EOSC Services are displayed. 4. searchAll.component.html: Updated paddings and margins in search form of Search all page. 5. navigationBar.component.html: Set burger menu icon to light color if dark background. 6. advancedSearchDataProviders.component.ts & advancedSearchOrganizations.component.ts & advancedSearchProjects.component.ts & advancedSearchServices.component.ts & searchResearchResults.component.ts & searchDataproviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts & searchServices.component.ts & search.component.ts: Set in searchForm, dark=true. 7. aggregators.ts: In eoscInfo, updated logoUrl and removed customCss of AggregatorInfo. 8. app.component.ts: Set header.darkBg: true. 9. Added eosc-custom.less file. 10. styles.less: import eosc-custom less file, instead of portal-custom.css. 11. deletedByInference.service.ts & result-preview.ts: [Bug fix] Parse description of versions properly. 12. reports.service.ts: Copy fix from angular-14 branch - do not timeout to 10000. --- .../landing-utils/parsingFunctions.class.ts | 2 +- .../deletedByInference.service.ts | 2 +- .../result/resultLanding.component.html | 33 +++++++------------ searchPages/find/searchAll.component.html | 4 +-- .../searchUtils/newSearchPage.component.html | 6 ++-- services/reports.service.ts | 12 ++----- sharedComponents/navigationBar.component.html | 6 ++-- utils/result-preview/result-preview.ts | 2 +- 8 files changed, 25 insertions(+), 42 deletions(-) diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index dd3ed6f2..5b423b10 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -10,7 +10,7 @@ import {StringUtils} from "../../utils/string-utils.class"; export class ParsingFunctions { public eoscSubjects = [ {label: 'EOSC::Jupyter Notebook', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'marketplace.eosc-portal.eu/services?tag=EOSC%3A%3AJupyter+Notebook', value: 'Jupyter Notebook'}, - {label: 'EOSC::RO-crate', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'marketplace.eosc-portal.eu/services?tag=EOSC%3A%3ARO-crate', value: 'RO-crate'}, + {label: 'EOSC::RO-crate', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'marketplace.eosc-portal.eu/datasources/eosc.psnc.6f0470e3bb9203ec3a7553f3a72a7a1f?q=ROHub', value: 'RO-crate'}, {label: 'EOSC::Galaxy Workflow', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'marketplace.eosc-portal.eu/services?tag=EOSC%3A%3AGalaxy+Workflow', value: 'Galaxy Workflow'}, {label: 'EOSC::Twitter Data', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'marketplace.eosc-portal.eu/services?tag=EOSC%3A%3ATwitter+Data', value: 'Twitter Data'} ] diff --git a/landingPages/result/deletedByInference/deletedByInference.service.ts b/landingPages/result/deletedByInference/deletedByInference.service.ts index a9b7e616..41d6e312 100644 --- a/landingPages/result/deletedByInference/deletedByInference.service.ts +++ b/landingPages/result/deletedByInference/deletedByInference.service.ts @@ -49,7 +49,7 @@ export class DeletedByInferenceService { result.dateofacceptance = data.dateofacceptance; result.embargoEndDate = data.embargoenddate; - result.description = this.parsingFunctions.parseDescription(data.description); + result.description = this.parsingFunctions.parseDescription(data.description, true); if(data['bestaccessright'] && data['bestaccessright'].hasOwnProperty("classname")) { result.accessMode = data['bestaccessright'].classname; diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index cedd2c18..580c9262 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -448,32 +448,23 @@
- -
0 && properties.adminToolsPortalType == 'eosc' && (!viewAll || viewAll=='egiNotebook')"> - +
+ Compatible EOSC Services +
+ +
eosc_logo - Check compatible EOSC services - -
- -
- - eosc_logo - Check compatible EOSC services - -
- +
+
+ {{subject.value}} +
+
+
diff --git a/searchPages/find/searchAll.component.html b/searchPages/find/searchAll.component.html index 0f378b3b..51873f56 100644 --- a/searchPages/find/searchAll.component.html +++ b/searchPages/find/searchAll.component.html @@ -1,4 +1,4 @@ -
+
@@ -9,7 +9,7 @@
-
+ [class.uk-margin-top]="stickyForm"> -
-
+
+
diff --git a/services/reports.service.ts b/services/reports.service.ts index 4fbf20da..092512e4 100644 --- a/services/reports.service.ts +++ b/services/reports.service.ts @@ -13,19 +13,11 @@ export class ReportsService { //On the service: downloadCSVFile(url: string){ - //var headers = new Headers(); - //headers.append('responseType', 'arraybuffer'); - return this.http.get(url, {responseType: 'text'}) - .pipe( - timeout(10000), - map(res => new Blob([res], { type: 'text/csv' }))); + return this.http.get(url, {responseType: 'text'}).pipe(map(res => new Blob([res], { type: 'text/csv' }))); } + getCSVResponse(url: string){ - //var headers = new Headers(); - //headers.append('responseType', 'arraybuffer'); return this.http.get(url, {responseType: 'text'}) - .pipe(timeout(10000)); - //.pipe(map(res => res)); } /** diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index adab204f..ba78d7ff 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -1,5 +1,5 @@
-
+