[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.
This commit is contained in:
parent
4734c7b821
commit
f935e81959
|
|
@ -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'}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -448,32 +448,23 @@
|
|||
<ng-template #right_column>
|
||||
<div class="uk-margin-medium-top uk-list uk-list-large uk-padding uk-padding-remove-vertical" [class.uk-list-divider]="!viewAll">
|
||||
<!-- EOSC Services-->
|
||||
<!-- 1 link -->
|
||||
<div *ngIf="resultLandingInfo.eoscSubjects?.length == 1 && properties.adminToolsPortalType == 'eosc'
|
||||
<div *ngIf="resultLandingInfo.eoscSubjects?.length > 0 && properties.adminToolsPortalType == 'eosc'
|
||||
&& (!viewAll || viewAll=='egiNotebook')">
|
||||
<a class="uk-link-text uk-text-bold custom-external"
|
||||
target="_blank" [href]="resultLandingInfo.eoscSubjects[0].link">
|
||||
<div class="uk-flex uk-flex-between uk-flex-middle uk-margin-small-bottom">
|
||||
<span class="uk-text-light-grey uk-text-nowrap uk-margin-small-right">Compatible EOSC Services</span>
|
||||
</div>
|
||||
|
||||
<div class="uk-margin-small-bottom uk-flex">
|
||||
<img src="assets/common-assets/eosc-logo.png"
|
||||
loading="lazy" alt="eosc_logo" style="width:27px; height:27px">
|
||||
<span class="uk-margin-small-left uk-text-uppercase"><u>Check compatible EOSC services</u></span>
|
||||
</a>
|
||||
</div>
|
||||
<!-- more than 1 links -->
|
||||
<div *ngIf="resultLandingInfo.eoscSubjects?.length > 1 && properties.adminToolsPortalType == 'eosc'
|
||||
&& (!viewAll || viewAll=='egiNotebook')">
|
||||
<a class="uk-link-text uk-text-bold">
|
||||
<img src="assets/common-assets/eosc-logo.png"
|
||||
loading="lazy" alt="eosc_logo" style="width:27px; height:27px">
|
||||
<span class="uk-margin-small-left uk-text-uppercase"><u>Check compatible EOSC services</u></span>
|
||||
</a>
|
||||
<div class="uk-dropdown" uk-dropdown="pos: bottom-right; offset: 10; delay-hide: 0; mode:click">
|
||||
<ul class="uk-nav uk-dropdown-nav">
|
||||
<li *ngFor="let item of resultLandingInfo.eoscSubjects">
|
||||
<a [href]="item.link" target="_blank" class="custom-external">{{item.value}}</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="uk-margin-small-left uk-flex uk-flex-column uk-flex-center">
|
||||
<div *ngFor="let subject of resultLandingInfo.eoscSubjects; let i=index" class="uk-text-truncate">
|
||||
<a [href]="subject.link" target="_blank" class="custom-external">{{subject.value}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="resultLandingInfo.sdg && resultLandingInfo.sdg.length > 0 && (!viewAll || viewAll=='sdg')">
|
||||
<sdg [subjects]="resultLandingInfo.sdg" (viewAllClicked)="viewAll=$event" (feedbackClicked)="feedbackClicked('Sustainable Development Goals (SDGs)')"></sdg>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="uk-background-norepeat uk-background-bottom-center uk-padding-remove-bottom uk-section uk-section-small" [ngClass]="searchForm.class">
|
||||
<div class="uk-background-norepeat uk-background-bottom-center uk-padding-remove-bottom" [ngClass]="searchForm.class">
|
||||
<div class="uk-width-1-1">
|
||||
<div *ngIf="breadcrumbs.length > 0" class="uk-container uk-container-large" [class.uk-light]="searchForm.dark">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal uk-padding-remove-bottom">
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<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 class="uk-width-1-1 uk-width-auto@m"><div id="searchImage"></div></div>
|
||||
<advanced-search-form class="uk-width-expand uk-padding uk-padding-remove-vertical"
|
||||
<advanced-search-form class="uk-width-expand uk-padding-remove-vertical"
|
||||
entityType="all"
|
||||
(queryChange)="keywordChanged($event)"
|
||||
[isDisabled]="disableForms"
|
||||
|
|
|
|||
|
|
@ -157,13 +157,13 @@
|
|||
<schema2jsonld *ngIf="url" [URL]="url" type="search" [name]=pageTitleWithFilters
|
||||
[searchAction]=false [description]="metaDescription"></schema2jsonld>
|
||||
<div id="tm-main" [class.uk-margin-medium-top]="!includeOnlyResultsAndFilter && properties.adminToolsPortalType != 'eosc'"
|
||||
[class.uk-margin-top]="stickyForm || properties.adminToolsPortalType == 'eosc'">
|
||||
[class.uk-margin-top]="stickyForm">
|
||||
<ng-template #loading>
|
||||
<loading [ngClass]="'uk-height-medium uk-display-block uk-margin-xlarge-top'"></loading>
|
||||
</ng-template>
|
||||
<ng-template [ngIf]="searchUtils.refineStatus != errorCodes.LOADING || existingFiltersWithValues !== 0" [ngIfElse]="loading">
|
||||
<div class="uk-container uk-container-large">
|
||||
<div>
|
||||
<div class="uk-container uk-container-large search-results-container">
|
||||
<div [class.uk-margin-top]="properties.adminToolsPortalType == 'eosc'" >
|
||||
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
|
||||
[texts]="pageContents['top']"></helper>
|
||||
<div *ngIf="resultTypes" class="uk-flex uk-flex-center uk-padding-small uk-padding-remove-vertical uk-background-muted uk-border-rounded">
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div *ngIf="showMenu && activeHeader">
|
||||
<div class="uk-hidden@l">
|
||||
<div id="main-menu-small" class="uk-hidden@l">
|
||||
<nav class="uk-navbar-container uk-navbar" uk-navbar="delay-hide: 400">
|
||||
<div
|
||||
*ngIf="(properties.environment =='beta' || properties.environment =='development') && showLogo && activeHeader.badge">
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
[src]="'assets/common-assets/'+(properties.environment =='beta'?'beta_flag.svg':'prototype_flag.svg')"
|
||||
alt="BETA" style="height: 60px; width: 60px;">
|
||||
</div>
|
||||
<div *ngIf="!onlyTop || userMenu" class="uk-navbar-left">
|
||||
<div *ngIf="!onlyTop || userMenu" class="uk-navbar-left" [class.uk-light]='activeHeader.darkBg'>
|
||||
<a *ngIf="!offCanvasFlip" class="uk-navbar-toggle" href="#tm-mobile" uk-toggle="" style="z-index:1000;">
|
||||
<div uk-navbar-toggle-icon="" class="uk-navbar-toggle-icon uk-icon custom-navbar-toggle-icon"></div>
|
||||
<span class="visually-hidden">toggle menu</span>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<div class="uk-navbar-center">
|
||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: true}"></ng-container>
|
||||
</div>
|
||||
<div *ngIf="!onlyTop || userMenu" class="uk-navbar-right">
|
||||
<div *ngIf="!onlyTop || userMenu" class="uk-navbar-right" [class.uk-light]='activeHeader.darkBg'>
|
||||
<a *ngIf="offCanvasFlip" class="uk-navbar-toggle" href="#tm-mobile" uk-toggle="">
|
||||
<div uk-navbar-toggle-icon="" class="uk-navbar-toggle-icon uk-icon custom-navbar-toggle-icon"></div>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ export class ResultPreview {
|
|||
resultPreview.accessMode = result.accessMode;
|
||||
resultPreview.countries = result.countries;
|
||||
resultPreview.projects = result.fundedByProjects;
|
||||
resultPreview.description = result.description.length > 0 ? result.description[0] : "";
|
||||
resultPreview.description = result.description;//.length > 0 ? result.description[0] : "";
|
||||
if(result.dateofacceptance) {
|
||||
resultPreview.year = new Date(result.dateofacceptance).getFullYear().toString();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue