MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/openaire-library into new-theme

This commit is contained in:
Konstantinos Triantafyllou 2022-09-06 17:07:19 +03:00
parent 3c6fe34f29 66fecd2f41
commit 523305d79b
8 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
landingPages/landing-utils/fundedBy.component.ts
View File

@ -1,6 +1,7 @@
import {Component, EventEmitter, Input, Output} from '@angular/core';
import {Project} from "../../utils/result-preview/result-preview";
import {properties} from "../../../../environments/environment";
import {HelperFunctions} from '../../utils/HelperFunctions.class';
@Component({
selector: 'fundedBy',
@ -60,7 +61,7 @@ import {properties} from "../../../../environments/environment";
<div *ngIf="item.provenanceAction || item.validated" class="uk-text-meta">
<span *ngIf="item.validated">Validated by funder</span>
<span *ngIf="item.provenanceAction && item.validated"> | </span>
<span *ngIf="item.provenanceAction">{{item.provenanceAction}}</span>
<span *ngIf="item.provenanceAction">{{getVocabularyLabel(item.provenanceAction, provenanceActionVocabulary)}}</span>
</div>
</div>
</div>
@ -78,6 +79,7 @@ export class FundedByComponent {
public threshold: number = 4;
public url = properties.searchLinkToProject.split('?')[0];
public title: string = "Funded by";
@Input() provenanceActionVocabulary = null;
public viewAllClick() {
if(this.fundedByProjects.length <= this.threshold*2) {
@ -93,4 +95,8 @@ export class FundedByComponent {
this.viewAll = false;
this.viewAllClicked.emit("");
}
public getVocabularyLabel(value: any, vocabulary: any) {
return HelperFunctions.getVocabularyLabel(value, vocabulary);
}
}

8
landingPages/landing-utils/parsingFunctions.class.ts
View File

@ -32,8 +32,7 @@ export class ParsingFunctions {
public ngOnDestroy() {
}
public parseFundingByProjects(fundedByProjects: Project[], relation: any,
provenanceActionVocabulary: any): Project[] {
public parseFundingByProjects(fundedByProjects: Project[], relation: any): Project[] {
if (fundedByProjects == undefined) {
fundedByProjects = [];
}
@ -52,10 +51,7 @@ export class ParsingFunctions {
if(relation.validated && relation.validated.date) {
fundedByProject['validated'] = true;
}
if (provenanceActionVocabulary != null && relation.provenanceaction in provenanceActionVocabulary) {
fundedByProject['provenanceAction'] = provenanceActionVocabulary[relation.provenanceaction];
}
fundedByProject['provenanceAction'] = relation.provenanceaction;
} else {
fundedByProject['id'] = "";
fundedByProject['acronym'] = "";

5
landingPages/result/resultLanding.component.html
View File

@ -479,7 +479,7 @@
</div>
<!-- Funded By -->
<div *ngIf="resultLandingInfo.fundedByProjects && resultLandingInfo.fundedByProjects.length > 0 && (!viewAll || viewAll=='fundedBy')">
<fundedBy [fundedByProjects]="resultLandingInfo.fundedByProjects" (viewAllClicked)="viewAll=$event"></fundedBy>
<fundedBy [fundedByProjects]="resultLandingInfo.fundedByProjects" [provenanceActionVocabulary]="provenanceActionVocabulary" (viewAllClicked)="viewAll=$event"></fundedBy>
</div>
<!-- Communities -->
<div *ngIf="resultLandingInfo.contexts && resultLandingInfo.contexts.length > 0 && !noCommunities && (!viewAll || viewAll=='relatedTo')">
@ -567,7 +567,8 @@
<ul class="uk-list uk-list-divider uk-margin">
<li *ngFor="let item of researchResults.slice((relatedPage-1)*pageSize, relatedPage*pageSize)">
<result-preview [modal]="relationModal" [properties]="properties"
[result]="getResultPreview(item)"
[result]="getResultPreview(item)" [provenanceActionVocabulary]="provenanceActionVocabulary"
[relationsVocabulary]="relationsVocabulary"
[isCard]="false"></result-preview>
</li>
</ul>

51
landingPages/result/resultLanding.component.ts
View File

@ -125,6 +125,9 @@ export class ResultLandingComponent {
public relatedClassSelected: string = "";
public filteredRelatedResults: RelationResult[];
public provenanceActionVocabulary = null;
public relationsVocabulary = null;
public offset: number;
public stickyHeader: boolean = false;
public graph_offset: number = 0;
@ -358,28 +361,32 @@ export class ResultLandingComponent {
this.showLoading = true;
if (typeof document !== 'undefined') {
let observables: Array<Observable<any>> = [];
observables.push(this._vocabulariesService.getProvenanceActionVocabulary(this.properties));
observables.push(this._vocabulariesService.getSubjectsVocabulary(this.properties));
observables.push(this._vocabulariesService.getRelationsVocabulary(this.properties));
// observables.push(this.indexInfoService.getLastIndexDate(properties));
// observables.push(this.indexInfoService.getLastOrcidUpdateDate(properties));
this.subscriptions.push(forkJoin(observables)
.subscribe(
// this.subscriptions.push(forkJoin(observables).subscribe(
// this.subscriptions.push(this._vocabulariesService.getProvenanceActionVocabulary(this.properties).subscribe(
vocabularies => {
this.getResultLandingInfo(vocabularies[0], vocabularies[1], vocabularies[2]);
}, err => {
this.getResultLandingInfo(null, null);
this.handleError("Error getting provenance action vocabulary for " + this.type, err);
this.subscriptions.push(this._vocabulariesService.getProvenanceActionVocabulary(this.properties).subscribe(
data => {
this.provenanceActionVocabulary = data;
}, error => {
this.handleError("Error getting provenance action vocabulary for " + this.type, error);
}
));
} else {
this.getResultLandingInfo(null, null);
this.subscriptions.push(this._vocabulariesService.getSubjectsVocabulary(this.properties).subscribe(
data => {
this.getResultLandingInfo(data);
}, error => {
this.getResultLandingInfo(null);
this.handleError("Error getting subjects vocabulary for " + this.type, error);
}
));
this.subscriptions.push(this._vocabulariesService.getRelationsVocabulary(this.properties).subscribe(
data => {
this.relationsVocabulary = data;
}, error => {
this.handleError("Error getting relations vocabulary for " + this.type, error);
}
));
}
else {
this.getResultLandingInfo(null);
}
}
private setActiveTab() {
@ -424,14 +431,14 @@ export class ResultLandingComponent {
// return numberOfTabs;
// }
private getResultLandingInfo(provenanceActionVocabulary: any, subjectsVocabulary?: any, relationsVocabulary?: any) {
private getResultLandingInfo(subjectsVocabulary?: any) {
if(this.resultFromInput && this.resultLandingInfo){
this.showLoading = false;
return;
}
this.resultLandingInfo = null;
this.hasAltMetrics = false;
this.subscriptions.push(this._resultLandingService.getResultLandingInfo(this.id, this.identifier, this.type, provenanceActionVocabulary, subjectsVocabulary, relationsVocabulary, this.properties).subscribe(
this.subscriptions.push(this._resultLandingService.getResultLandingInfo(this.id, this.identifier, this.type, subjectsVocabulary, this.properties).subscribe(
data => {
this.resultLandingInfo = data;
this.id = this.resultLandingInfo.objIdentifier;
@ -490,7 +497,7 @@ export class ResultLandingComponent {
if(this.resultLandingInfo.relatedClassFilters.size > 1) {
for (let relClass of this.resultLandingInfo.relatedClassFilters) {
this.relatedClassFilters.push({"label": relClass, "value": relClass});
this.relatedClassFilters.push({"label": HelperFunctions.getVocabularyLabel(relClass, this.relationsVocabulary), "value": relClass});
}
} else {
this.relatedClassFilters.pop();

18
landingPages/result/resultLanding.service.ts
View File

@ -57,7 +57,7 @@ export class ResultLandingService {
}
getResultLandingInfo (id: string, identifier: Identifier, type: string,
provenanceActionVocabulary: any, subjectsVocabulary: any, relationsVocabulary: any,
subjectsVocabulary: any,
properties: EnvProperties): any {
let url: string = this.buildResultLandingInfoUrl(id, identifier, type);
@ -99,7 +99,7 @@ export class ResultLandingService {
res[0], // 14
res[2], // 15
]))
.pipe(map(res => this.parseResultLandingInfo(res, provenanceActionVocabulary, subjectsVocabulary, relationsVocabulary, properties)));
.pipe(map(res => this.parseResultLandingInfo(res, subjectsVocabulary, properties)));
}
// getProvenanceActionVocabulary (properties: EnvProperties): any {
@ -125,7 +125,7 @@ export class ResultLandingService {
return throwError(error || 'Server error');
}
parseResultLandingInfo (data: any, provenanceActionVocabulary: any, subjectsVocabulary: any, relationsVocabulary: any, properties: EnvProperties): any {
parseResultLandingInfo (data: any, subjectsVocabulary: any, properties: EnvProperties): any {
this.resultLandingInfo = new ResultLandingInfo();
// res
@ -184,23 +184,15 @@ export class ResultLandingService {
relation = Array.isArray(data[2]) ? data[2][i] : data[2];
if(relation.hasOwnProperty("to")) {
if(relation['to'].class && relation['to'].class.toLowerCase() == "isproducedby") {
this.resultLandingInfo.fundedByProjects = this.parsingFunctions.parseFundingByProjects(this.resultLandingInfo.fundedByProjects, relation, provenanceActionVocabulary);
this.resultLandingInfo.fundedByProjects = this.parsingFunctions.parseFundingByProjects(this.resultLandingInfo.fundedByProjects, relation);
}
if(relation['to'].scheme && relation['to'].scheme == "dnet:result_result_relations") {
let relationName: string = relation.to.class;
if(relation.to.class) {
if(relationsVocabulary != null && relation.to.class in relationsVocabulary) {
relationName = relationsVocabulary[relation.to.class];
}
}
if(!this.resultLandingInfo.relatedClassFilters.has(relationName)) {
this.resultLandingInfo.relatedClassFilters.add(relationName);
}
let provenanceAction: string = "";
if(provenanceActionVocabulary != null && relation.provenanceaction in provenanceActionVocabulary) {
provenanceAction = provenanceActionVocabulary[relation.provenanceaction];
}
let provenanceAction: string = relation.provenanceaction;
this.resultLandingInfo.relatedResults = this.parsingFunctions.parseResults(this.resultLandingInfo.relatedResults, relation, provenanceAction, relationName);
} else if(relation['to'].class && relation['to'].class.toLowerCase() == "hasauthorinstitution") {

2
orcid/orcid-work.component.ts
View File

@ -438,7 +438,7 @@ export class OrcidWorkComponent {
}
private getResultLandingInfo(action: string) {
this.subscriptions.push(this.resultLandingService.getResultLandingInfo(this.resultId, null, this.type, null, null, null, properties).subscribe(
this.subscriptions.push(this.resultLandingService.getResultLandingInfo(this.resultId, null, this.type, null, properties).subscribe(
resultLandingInfo => {
this.resultLandingInfo = resultLandingInfo;
if (this.resultLandingInfo && this.resultLandingInfo.identifiers) {

7
utils/HelperFunctions.class.ts
View File

@ -72,6 +72,13 @@ export class HelperFunctions {
return Object.keys(value).map(key => value[key]);
}
public static getVocabularyLabel(value: any, vocabulary: any) {
if(vocabulary && value in vocabulary) {
return vocabulary[value];
}
return value;
}
public static sortSDGs(sgd1: string, sdg2: string): number {
let splitA: string[] = sgd1.split(".");
let numA: number;

7
utils/result-preview/result-preview.component.ts
View File

@ -7,6 +7,7 @@ import {properties} from "../../../../environments/environment";
import {Session} from "../../login/utils/helper.class";
import {Identifier, StringUtils} from "../string-utils.class";
import {OpenaireEntities} from "../properties/searchFields";
import {HelperFunctions} from "../HelperFunctions.class";
@Component({
selector: 'result-preview',
@ -33,6 +34,8 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
@Input() showOrcid: boolean = true;
@Input() showEnermaps: boolean = false;
@Input() deposit: boolean = false;
@Input() provenanceActionVocabulary = null;
@Input() relationsVocabulary = null;
ngOnInit(): void {
if(this.hasLink) {
@ -120,10 +123,10 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
this.beforeTitle.push(this.result.startYear.toString() + ' - ' + this.result.endYear.toString());
}
if(this.result.provenanceAction) {
this.beforeTitle.push(this.result.provenanceAction);
this.beforeTitle.push(HelperFunctions.getVocabularyLabel(this.result.provenanceAction, this.provenanceActionVocabulary));
}
if(this.result.relationName) {
this.beforeTitle.push(this.result.relationName);
this.beforeTitle.push(HelperFunctions.getVocabularyLabel(this.result.relationName, this.relationsVocabulary));
}
// if(this.result.percentage) {
// this.beforeTitle.push((this.result.relation ? this.result.relation+": " : "") + this.result.percentage.toString() + "%");