From 9fb155d95fbeb74112a77e09bf808cc52d7f12d7 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 24 May 2024 10:08:57 +0300 Subject: [PATCH 01/20] [develop | DONE | FIXED ] Claims: remove unused import --- claims/claim-utils/claimProjectSearchForm.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/claims/claim-utils/claimProjectSearchForm.component.ts b/claims/claim-utils/claimProjectSearchForm.component.ts index 61624e0e..d4a22ccf 100644 --- a/claims/claim-utils/claimProjectSearchForm.component.ts +++ b/claims/claim-utils/claimProjectSearchForm.component.ts @@ -11,7 +11,6 @@ import {OpenaireEntities, SearchFields} from "../../utils/properties/searchField import {NewSearchPageComponent} from "../../searchPages/searchUtils/newSearchPage.component"; import {Subscriber} from "rxjs"; import { properties } from 'src/environments/environment'; -import {error} from "protractor"; declare var UIkit:any; From 9722024643b4458e44d8700a16359c290d6b39d2 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 27 May 2024 11:20:24 +0300 Subject: [PATCH 02/20] [develop | DONE | FIXED]: relatedDatasourcesTab.component.ts: Show "top 100" message only if results are more than 90 & [BUG FIX] Use "collectedFromName" input and not a predefined static data source name. --- landingPages/dataProvider/relatedDatasourcesTab.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/landingPages/dataProvider/relatedDatasourcesTab.component.ts index c8b1b25d..8c7662ad 100644 --- a/landingPages/dataProvider/relatedDatasourcesTab.component.ts +++ b/landingPages/dataProvider/relatedDatasourcesTab.component.ts @@ -17,8 +17,8 @@ import {OpenaireEntities} from "../../utils/properties/searchFields";
-
- *Only top 100 {{openaireEntities.DATASOURCES}} that host {{openaireEntities.RESULTS}} which are also available via the Federated Research Data Repository are shown. +
+ *Only top 100 {{openaireEntities.DATASOURCES}} that host {{openaireEntities.RESULTS}} which are also available via {{collectedFromName}} are shown.
Date: Tue, 28 May 2024 12:09:21 +0300 Subject: [PATCH 03/20] [develop | DONE | CHANGED ] Claim funding: allow search for projects with no funder selected, exclde unidentified, give more space to form --- .../claimProjectSearchForm.component.html | 12 ++++++------ .../claimProjectSearchForm.component.ts | 19 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/claims/claim-utils/claimProjectSearchForm.component.html b/claims/claim-utils/claimProjectSearchForm.component.html index 8bd0fe4a..cf4806ef 100644 --- a/claims/claim-utils/claimProjectSearchForm.component.html +++ b/claims/claim-utils/claimProjectSearchForm.component.html @@ -1,11 +1,11 @@ -
+
+ [options]="showOptions.selectOptions" class="uk-width-medium@xl uk-width-auto">
-
+
@@ -14,7 +14,7 @@
-
Select funder to proceed +
Select funder or search for projects to proceed
@@ -65,7 +65,7 @@
-
{{selectedFunder.name}} has no projects. Proceed to next step.
+
No projects for funder {{selectedFunder.name}}.
{ + let option = {value : null, label: "No funder selected"}; + this.funderOptions.push(option); for(let v of data[2][0].values){ let option = {value : v, label: v.name}; this.funderOptions.push(option); @@ -107,7 +109,7 @@ export class ClaimProjectsSearchFormComponent { this.prevFilters = this.filters; //searchProjects (params: string, refineParams:string, page: number, size: number, refineFields:string[] , properties:EnvProperties ):any { - this.sub = this._projectService.advancedSearchProjects(this.createOpenaireQueryParams(), page, size, this.properties, null, [], this.createOpenaireRefineQuery()).subscribe( + this.sub = this._projectService.advancedSearchProjects(this.createOpenaireQueryParams(), page, size, this.properties, this.createOpenaireRefineQuery(), [], null).subscribe( // this.sub = this._projectService.searchProjects(this.createOpenaireQueryParams(),(page==1)? this.refineFieldsQuery:null, page, size, (page==1)?this.refineFields:[], this.properties).subscribe( data => { if (data != null) { @@ -150,7 +152,7 @@ export class ClaimProjectsSearchFormComponent { const entity: ClaimEntity = new ClaimEntity(); entity.project = new ClaimProject(); entity.project.funderId = item.funderId; - entity.project.funderShortname = item.funderShortname?item.funderShortname:(entity.project.funderId.split("::")[1]); + entity.project.funderShortname = item.funderShortname?item.funderShortname:(entity.project.funderId?entity.project.funderId.split("::")[1]:""); entity.project.funderName = item.funderName; entity.id = item.id; entity.project.url = (item.code !="unidentified") ? properties.searchLinkToProject + entity.id : null; @@ -186,12 +188,6 @@ export class ClaimProjectsSearchFormComponent { } createOpenaireRefineQuery(): string { - /*if(this.startYear.length > 0 ){ - query+='&fq=projectstartyear exact \"'+this.startYear+'\"' - } - if(this.endYear.length > 0 ){ - query+='&fq=projectendyear exact \"'+this.endYear+'\"' - }*/ let allFqs = ""; for (let filter of this.filters) { if (filter.countSelectedValues > 0) { @@ -209,8 +205,11 @@ export class ClaimProjectsSearchFormComponent { } } } - if(this.isNoProjectFunder){ - allFqs += "&fq=" + StringUtils.URIEncode( "funder exact " + (StringUtils.quote(this.selectedFunder.id))); ; + if(this.selectedFunder){ + allFqs += "&fq=" + StringUtils.URIEncode( "funder exact " + (StringUtils.quote(this.selectedFunder.id))); + } + if(!this.isNoProjectFunder || !this.selectedFunder){ + allFqs += '&fq=(projectcode<>"unidentified")' } for (let i = 0; i < this.rangeFilters.length; i++) { let filter = this.rangeFilters[i]; From 1ac4365e054f97190a851d2a5e4b64d66198f3e3 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 28 May 2024 12:21:37 +0300 Subject: [PATCH 04/20] [develop | DONE]: Add Role Utils with naming variables for roles --- .../role-users/role-users.component.html | 20 +++++++++---------- .../users/role-users/role-users.component.ts | 13 ++++++------ .../result/resultLanding.component.ts | 3 ++- login/utils/helper.class.ts | 13 ++++++++++++ monitor-admin/utils/indicator-utils.ts | 11 +--------- .../role-verification.component.ts | 11 +++++----- utils/email/composer.ts | 18 ++++++++--------- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/dashboard/users/role-users/role-users.component.html b/dashboard/users/role-users/role-users.component.html index 88befe57..e4a39cc3 100644 --- a/dashboard/users/role-users/role-users.component.html +++ b/dashboard/users/role-users/role-users.component.html @@ -8,16 +8,16 @@
+ [searchControl]="filterForm.get('active')" [expandable]="true" [placeholder]="'Search ' + roleUtils.roles[role] + 's'" searchInputClass="outer">
@@ -27,7 +27,7 @@ [attr.uk-tooltip]="inviteDisableMessage" [class.uk-disabled]="loadPending || loadPending" [disabled]="loadActive || loadPending || !!inviteDisableMessage" (click)="openInviteModal()"> - Invite {{stakeholderUtils.roles[role]}} + Invite {{roleUtils.roles[role]}}