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

Merge remote-tracking branch 'origin/master' into angular-12

This commit is contained in:
Konstantina Galouni 2022-09-30 15:25:03 +03:00
parent 29d55b50cc a246608368
commit e0a7362f87
8 changed files with 90 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache-interceptor.service.ts
View File

@ -23,12 +23,12 @@ export class CacheInterceptorService implements HttpInterceptor {
"/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&type=results&page=0&size=0", "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&type=results&page=0&size=0",
"/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0", "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0",
"/resources2/?format=json&refine=true&fields=funder&fields=projectstartyear&fields=projectendyear&fields=projectoamandatepublications&&type=projects&page=0&size=0", "/resources2/?format=json&refine=true&fields=funder&fields=projectstartyear&fields=projectendyear&fields=projectoamandatepublications&&type=projects&page=0&size=0",
"/resources2/?format=json&refine=true&fields=datasourcetypeuiname&fields=datasourceodlanguages&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=country&fields=collectedfromname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0", "/resources2/?format=json&refine=true&fields=eoscdatasourcetype&fields=datasourceodlanguages&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=country&fields=collectedfromname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0",
"/resources2/?format=json&query= ( (reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*) ) &refine=true&fields=country&&type=organizations&page=0&size=0", "/resources2/?format=json&query= ( (reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*) ) &refine=true&fields=country&&type=organizations&page=0&size=0",
"/projects/?format=json&refine=true&page=1&size=0&fields=funder", "/projects/?format=json&refine=true&page=1&size=0&fields=funder",
"/resources/?format=json&query=( oaftype exact datasource and (datasourcetypeuiname exact \"Journal archive\" or datasourcetypeuiname exact \"Repository\"))&refine=true&fields=datasourcetypename&fields=country&fields=datasourceodsubjects&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0", "/resources/?format=json&query=( oaftype exact datasource and (eoscdatasourcetype exact \"Journal Archive\" or eoscdatasourcetype exact \"Repository\"))&refine=true&fields=datasourcetypename&fields=country&fields=datasourceodsubjects&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0",
"/search/v2/api/datasources/count?format=json", "/search/v2/api/publications/count?format=json", "/search/v2/api/datasets/count?format=json", "/search/v2/api/software/count?format=json", "/search/v2/api/other/count?format=json", "/search/v2/api/datasources/count?format=json", "/search/v2/api/publications/count?format=json", "/search/v2/api/datasets/count?format=json", "/search/v2/api/software/count?format=json", "/search/v2/api/other/count?format=json",
"relresulttype%3Dpublication" "relresulttype%3Dpublication"

6
landingPages/dataProvider/dataProvider.component.html
View File

@ -114,9 +114,9 @@
<ng-container *ngIf="dataProviderInfo.compatibility.name">{{dataProviderInfo.compatibility.name}}</ng-container> <ng-container *ngIf="dataProviderInfo.compatibility.name">{{dataProviderInfo.compatibility.name}}</ng-container>
</a> </a>
<span *ngIf="!dataProviderInfo.compatibility.id"> <span *ngIf="!dataProviderInfo.compatibility.id">
<ng-container *ngIf="dataProviderInfo.compatibility.info != 'not available'">{{dataProviderInfo.compatibility.info}}</ng-container> <ng-container *ngIf="dataProviderInfo.compatibility.info.toLowerCase() != 'not yet registered'">{{dataProviderInfo.compatibility.info}}</ng-container>
<ng-container *ngIf="dataProviderInfo.compatibility.info == 'not available'"> <ng-container *ngIf="dataProviderInfo.compatibility.info.toLowerCase() == 'not yet registered'">
Not yet registered <span *ngIf="properties.adminToolsPortalType == 'eosc'">in OpenAIRE</span> {{dataProviderInfo.compatibility.info}} <span *ngIf="properties.adminToolsPortalType == 'eosc'">in OpenAIRE</span>
</ng-container> </ng-container>
</span> </span>
<span *ngIf="dataProviderInfo.compatibility.name && !dataProviderInfo.compatibility.id"> <span *ngIf="dataProviderInfo.compatibility.name && !dataProviderInfo.compatibility.id">

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

@ -518,8 +518,8 @@ export class ParsingFunctions {
} }
// publication & dataset landing : for subjects and otherSubjects and classifiedSubjects // publication & dataset landing : for subjects and otherSubjects and classifiedSubjects
parseAllSubjects(_subjects: any, vocabulary: any): [string[], Map<string, string[]>, Map<string, string[]>, string[], string[], any[]] { parseAllSubjects(_subjects: any, vocabulary: any): [string[], Map<string, string[]>, Map<string, string[]>, string[], string[], ] {
let eoscSubjectsFound = []; // let eoscSubjectsFound = [];
let subjects: string[]; let subjects: string[];
let otherSubjects: Map<string, string[]>; let otherSubjects: Map<string, string[]>;
let classifiedSubjects: Map<string, string[]>; let classifiedSubjects: Map<string, string[]>;
@ -536,19 +536,19 @@ export class ParsingFunctions {
if (subject.classid != "") { if (subject.classid != "") {
if (subject.classid == "keyword") { if (subject.classid == "keyword") {
let content: string = subject.content+""; let content: string = subject.content+"";
let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content); // let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content);
let found: boolean = checkAndAddEoscSubjectResp["found"]; // let found: boolean = checkAndAddEoscSubjectResp["found"];
if(found) { // if(found) {
setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"]; // setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"];
eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"]; // eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"];
} else { // } else {
if (subjects == undefined) { if (subjects == undefined) {
subjects = new Array<string>(); subjects = new Array<string>();
}
subjects.push(content);
} }
subjects.push(content);
// }
} else if (!vocabulary || vocabulary[subject.classid] || subject.classid === "SDG" || subject.classid === "FOS") { } else if (!vocabulary || vocabulary[subject.classid] || subject.classid === "SDG" || subject.classid === "FOS") {
// if (subject.inferred && subject.inferred == true) { // if (subject.inferred && subject.inferred == true) {
if(subject.classid === "SDG") { if(subject.classid === "SDG") {
if (sdg == undefined) { if (sdg == undefined) {
sdg = new Array<string>(); sdg = new Array<string>();
@ -564,37 +564,37 @@ export class ParsingFunctions {
classifiedSubjects = new Map<string, string[]>(); classifiedSubjects = new Map<string, string[]>();
} }
let content: string = subject.content+""; let content: string = subject.content+"";
let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content); // let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content);
let found: boolean = checkAndAddEoscSubjectResp["found"]; // let found: boolean = checkAndAddEoscSubjectResp["found"];
if(found) { // if(found) {
setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"]; // setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"];
eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"]; // eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"];
} else { // } else {
if (!classifiedSubjects.has(subject.classname)) { if (!classifiedSubjects.has(subject.classname)) {
classifiedSubjects.set(subject.classname, new Array<string>()); classifiedSubjects.set(subject.classname, new Array<string>());
} }
classifiedSubjects.get(subject.classname).push(content); classifiedSubjects.get(subject.classname).push(content);
} // }
} }
} else { } else {
let content: string = subject.content+""; let content: string = subject.content+"";
let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content); // let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content);
let found: boolean = checkAndAddEoscSubjectResp["found"]; // let found: boolean = checkAndAddEoscSubjectResp["found"];
if(found) { // if(found) {
setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"]; // setOfEoscSubjects = checkAndAddEoscSubjectResp["setOfEoscSubject"];
eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"]; // eoscSubjectsFound = checkAndAddEoscSubjectResp["eoscSubjectsFound"];
} else { // } else {
let classname: string = subject.classname + ""; let classname: string = subject.classname + "";
if (subjects == undefined) { if (subjects == undefined) {
subjects = new Array<string>(); subjects = new Array<string>();
}
subjects.push(content);
} }
subjects.push(content);
// }
} }
} }
} }
return [subjects, otherSubjects, classifiedSubjects, fos, sdg, eoscSubjectsFound]; return [subjects, otherSubjects, classifiedSubjects, fos, sdg];
} }
checkAndAddEoscSubject(setOfEoscSubjects: Set<string>, eoscSubjectsFound, subject, content) { checkAndAddEoscSubject(setOfEoscSubjects: Set<string>, eoscSubjectsFound, subject, content) {

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

@ -336,7 +336,7 @@ export class ResultLandingService {
// res['result']['metadata']['oaf:entity']['oaf:result']['subject'] // res['result']['metadata']['oaf:entity']['oaf:result']['subject']
if(data[8] != null) { if(data[8] != null) {
let subjectResults: [string[], Map<string, string[]>, Map<string, string[]>, string[], string[], any[]] = this.parsingFunctions.parseAllSubjects(data[8], subjectsVocabulary); let subjectResults: [string[], Map<string, string[]>, Map<string, string[]>, string[], string[]] = this.parsingFunctions.parseAllSubjects(data[8], subjectsVocabulary);
this.resultLandingInfo.subjects = subjectResults[0]; this.resultLandingInfo.subjects = subjectResults[0];
this.resultLandingInfo.otherSubjects = subjectResults[1]; this.resultLandingInfo.otherSubjects = subjectResults[1];
this.resultLandingInfo.classifiedSubjects = subjectResults[2]; this.resultLandingInfo.classifiedSubjects = subjectResults[2];
@ -351,9 +351,9 @@ export class ResultLandingService {
}) })
} }
if(!this.resultLandingInfo.eoscSubjects) { // if(!this.resultLandingInfo.eoscSubjects) {
this.resultLandingInfo.eoscSubjects = subjectResults[5]; // this.resultLandingInfo.eoscSubjects = subjectResults[5];
} // }
} }
this.resultLandingInfo.hostedBy_collectedFrom = this.parsingFunctions.addPublisherToHostedBy_collectedFrom( this.resultLandingInfo.hostedBy_collectedFrom = this.parsingFunctions.addPublisherToHostedBy_collectedFrom(

10
searchPages/searchUtils/datasourcesHelper.class.ts
View File

@ -22,7 +22,7 @@ export class DatasourcesHelperClass {
public static getTitle(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services") { public static getTitle(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services") {
if (type == "registries") { if (type == "registries") {
return "Entity Registries" return "Research Entity Registries"
} else if (type == "journals") { } else if (type == "journals") {
return "Journals" return "Journals"
} else if (type == "compatible") { } else if (type == "compatible") {
@ -48,15 +48,15 @@ export class DatasourcesHelperClass {
} }
public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string { public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible" | "deposit" | "services"): string {
if (type == "registries") { if (type == "registries") {
return 'datasourcetypeuiname exact "Registry"'; return 'eoscdatasourcetype exact "Research Entity Registry"';
} else if (type == "journals") { } else if (type == "journals") {
// return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) '; // return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) ';
return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and datasourcetypeuiname exact "Journal archive" '; return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and eoscdatasourcetype exact "Journal Archive" ';
} else if (type == "compatible") { } else if (type == "compatible") {
return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiname exact "Repository" '; return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and eoscdatasourcetype exact "Repository" ';
}else if (type == "deposit") { }else if (type == "deposit") {
return ' oaftype exact datasource and (datasourcetypeuiname exact "Journal archive" or datasourcetypeuiname exact "Repository")'; return ' oaftype exact datasource and (eoscdatasourcetype exact "Journal Archive" or eoscdatasourcetype exact "Repository")';
} else { } else {
return ""; return "";
} }

21
searchPages/searchUtils/searchFilter.component.ts
View File

@ -62,16 +62,16 @@ export class SearchFilterComponent implements OnInit, OnChanges {
this.queryParams = Object.assign({}, params); this.queryParams = Object.assign({}, params);
this.paramPosition = SearchFields.getParameterOrder(this.filter.filterId, this.getEntries(params)); this.paramPosition = SearchFields.getParameterOrder(this.filter.filterId, this.getEntries(params));
}); });
this.filter.values = this.filter.values.filter(value => !value.name.toLowerCase().includes('unknown') && !value.name.toLowerCase().includes('not available')); // this.filter.values = this.filter.values.filter(value => !value.name.toLowerCase().includes('unknown') && !value.name.toLowerCase().includes('not available'));
this.sort(); // this.sort();
if (this.filter.filterType == "radio") { // if (this.filter.filterType == "radio") {
this.filter.radioValue = ""; // this.filter.radioValue = "";
this.filter.values.forEach(value => { // this.filter.values.forEach(value => {
if (value.selected) { // if (value.selected) {
this.filter.radioValue = value.id // this.filter.radioValue = value.id
} // }
}); // });
} // }
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
@ -85,6 +85,7 @@ export class SearchFilterComponent implements OnInit, OnChanges {
} }
}); });
} }
this.sort();
} }
} }

32
utils/properties/searchFields.ts
View File

@ -422,7 +422,7 @@ export class SearchFields {
//DATAPROVIDERS //DATAPROVIDERS
// add Collected From Filter "collectedfromname" // add Collected From Filter "collectedfromname"
public DATASOURCE_REFINE_FIELDS: string[] = ["datasourcetypeuiname", "datasourceodlanguages", "datasourceodcontenttypes", public DATASOURCE_REFINE_FIELDS: string[] = ["eoscdatasourcetype", "datasourceodlanguages", "datasourceodcontenttypes",
"datasourcecompatibilityname", "country", "collectedfromname","datasourcethematic", "datasourcecompatibilityname", "country", "collectedfromname","datasourcethematic",
"datasourcejurisdiction"]; "datasourcejurisdiction"];
public DATASOURCE_ADVANCED_FIELDS: string[] = ["q", "datasourceofficialname", public DATASOURCE_ADVANCED_FIELDS: string[] = ["q", "datasourceofficialname",
@ -471,6 +471,14 @@ export class SearchFields {
equalityOperator: " exact ", equalityOperator: " exact ",
filterType: "radio" filterType: "radio"
}, },
["eoscdatasourcetype"]: {
name: "Type",
type: "refine",
param: "type",
operator: "tp",
equalityOperator: " exact ",
filterType: "radio"
},
["datasourcetypename"]: { ["datasourcetypename"]: {
name: "Type", name: "Type",
type: "vocabulary", type: "vocabulary",
@ -567,7 +575,7 @@ export class SearchFields {
{"name": "relorganizationshortname", "equalityOperator": "="}, {"name": "relorganizationshortname", "equalityOperator": "="},
{"name": "datasourceofficialname", "equalityOperator": "="}, {"name": "datasourceofficialname", "equalityOperator": "="},
{"name": "datasourceenglishname", "equalityOperator": "="}, {"name": "datasourceenglishname", "equalityOperator": "="},
{"name": "datasourcetypeuiname", "equalityOperator": " exact "}, {"name": "eoscdatasourcetype", "equalityOperator": " exact "},
{"name": "country", "equalityOperator": " exact "}, {"name": "country", "equalityOperator": " exact "},
{"name": "datasourcesubject", "equalityOperator": " all "} {"name": "datasourcesubject", "equalityOperator": " all "}
]; ];
@ -582,6 +590,14 @@ export class SearchFields {
equalityOperator: " exact ", equalityOperator: " exact ",
filterType: "radio" filterType: "radio"
}, },
["eoscdatasourcetype"]: {
name: "Repository type",
type: "refine",
param: "type",
operator: "tp",
equalityOperator: " exact ",
filterType: "radio"
},
["country"]: { ["country"]: {
name: "Countries", name: "Countries",
type: "vocabulary", type: "vocabulary",
@ -701,11 +717,11 @@ export class SearchFields {
} }
getResultAdvancedFields() { getResultAdvancedFields() {
if(properties.environment == "production") { // if(properties.environment == "production") {
this.RESULT_ADVANCED_FIELDS = this.RESULT_ADVANCED_FIELDS.filter((value, index, array) => { // this.RESULT_ADVANCED_FIELDS = this.RESULT_ADVANCED_FIELDS.filter((value, index, array) => {
return value != "eoscifguidelines"; // return value != "eoscifguidelines";
}) // })
} // }
return this.RESULT_ADVANCED_FIELDS; return this.RESULT_ADVANCED_FIELDS;
} }
@ -806,7 +822,7 @@ export class SearchFields {
if (fieldId == "relfunder" || fieldId == "relfundinglevel0_id" || fieldId == "relfundinglevel1_id" || fieldId == "relfundinglevel2_id" if (fieldId == "relfunder" || fieldId == "relfundinglevel0_id" || fieldId == "relfundinglevel1_id" || fieldId == "relfundinglevel2_id"
|| fieldId == "relproject" || fieldId == "community" || fieldId == "projectendyear-range-projectstartyear") { || fieldId == "relproject" || fieldId == "community" || fieldId == "projectendyear-range-projectstartyear") {
return "and"; return "and";
} else if (fieldId == "instancetypename" || fieldId == "datasourcetypeuiname" } else if (fieldId == "instancetypename" || fieldId == "eoscdatasourcetype"
|| fieldId == "resultlanguagename" || fieldId == "datasourceodlanguages" || fieldId == "resultlanguagename" || fieldId == "datasourceodlanguages"
|| fieldId == "datasourcecompatibilityname" || fieldId == "country" || fieldId == "datasourceodcontenttypes" || fieldId == "datasourcecompatibilityname" || fieldId == "country" || fieldId == "datasourceodcontenttypes"
|| fieldId == "resulthostingdatasource" || fieldId == "collectedfrom") { || fieldId == "resulthostingdatasource" || fieldId == "collectedfrom") {

6
utils/result-preview/result-preview.component.html
View File

@ -129,15 +129,15 @@
<!-- Special Clause 39--> <!-- Special Clause 39-->
<!-- </span>{{' '}}--> <!-- </span>{{' '}}-->
<span <span
*ngIf="result.compatibility && result.compatibility != '' && result.compatibility != 'not available'" *ngIf="result.compatibility && result.compatibility != '' && result.compatibility.toLowerCase() != 'not yet registered'"
class="uk-label" title="Compatibility"> class="uk-label" title="Compatibility">
{{result.compatibility}} {{result.compatibility}}
</span>{{' '}} </span>{{' '}}
<span <span
*ngIf="result.compatibility != undefined && result.compatibility != '' && result.compatibility == 'not available' *ngIf="result.compatibility != undefined && result.compatibility != '' && result.compatibility.toLowerCase() == 'not yet registered'
&& result.resultType != 'service'" && result.resultType != 'service'"
class="uk-label" [class.uk-label-danger]="deposit" title="OpenAIRE Compatibility"> class="uk-label" [class.uk-label-danger]="deposit" title="OpenAIRE Compatibility">
Not yet registered <span *ngIf="properties.adminToolsPortalType == 'eosc'">in OpenAIRE</span> {{result.compatibility}} <span *ngIf="properties.adminToolsPortalType == 'eosc'">in OpenAIRE</span>
</span>{{' '}} </span>{{' '}}
</div> </div>
</div> </div>