From 7827d230882931276812ff949b2e76e7b109c82c Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Wed, 8 Nov 2023 09:40:25 +0200 Subject: [PATCH 1/5] [develop | DONE | ADDED] add two new fields in datasources selection criteria & advanced criteria --- src/app/openaireLibrary | 2 +- src/app/pages/content-providers/criteria-utils.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 06a2ae1..3aff9ee 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 06a2ae16ee5576fec34cc1afad614eff45dc715d +Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index 2e6a3b4..9e337c2 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -10,7 +10,9 @@ export class CriteriaUtils { {value: 'description', label: 'Description'}, {value: 'subject', label: 'Subject'}, {value: 'fos', label: 'Field of Science'}, - {value: 'sdg', label: 'SDG'} + {value: 'sdg', label: 'SDG'}, + {value: 'publisher', label: 'Publisher'}, + {value: 'publicationyear', label: 'Publication Year'} ] public readonly verbs: Option[] = [ From f23f75e2d8b4a657ab8e3630e8dd10596204f410 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 21 Nov 2023 12:59:46 +0200 Subject: [PATCH 2/5] [develop | DONE | UPDATED] Community form: remove old visibility statuses --- .../edit-community/edit-community.component.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index 0134f16..89c1116 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -100,13 +100,10 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach export class EditCommunityComponent { public communityFb: UntypedFormGroup; public statuses: Option[] = [ - {label: 'Visible', value: 'all'}, - {label: 'Visible [Public*]', value: 'PUBLIC'}, - {label: 'Visible to managers', value: 'manager'}, - {label: 'Visible to managers [Restricted*]', value: 'RESTRICTED'}, -/* - {label: 'Hidden [Private*]', value: 'PRIVATE'}, -*/ + // {label: 'Visible', value: 'all'}, + {label: 'Visible', value: 'PUBLIC'}, + // {label: 'Visible to managers', value: 'manager'}, + {label: 'Visible to managers', value: 'RESTRICTED'}, {label: 'Hidden', value: 'hidden'} ] public claimOptions: Option[] = [ From 100338230426edcda7c739ac5e0d9d10b1cd9366 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 19 Jan 2024 11:08:08 +0200 Subject: [PATCH 3/5] [develop | DONE | REMOVED] : criteria-utils: comment out publicationyear option until integer value operators are available --- src/app/pages/content-providers/criteria-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index 9e337c2..a9c4f55 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -12,7 +12,7 @@ export class CriteriaUtils { {value: 'fos', label: 'Field of Science'}, {value: 'sdg', label: 'SDG'}, {value: 'publisher', label: 'Publisher'}, - {value: 'publicationyear', label: 'Publication Year'} + /*{value: 'publicationyear', label: 'Publication Year'}*/ ] public readonly verbs: Option[] = [ From f2e2edd1f2912698939d4b506fcff20fe44be484 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 14 Feb 2024 10:47:03 +0200 Subject: [PATCH 4/5] [develop | DONE | FIXED ] community status checks --- .../pages/manage-communities/manage-communities.component.ts | 2 +- .../pages/users/users-managers/users-managers.component.ts | 2 +- .../users/users-subscribers/users-subscribers.component.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/manage-communities/manage-communities.component.ts b/src/app/pages/manage-communities/manage-communities.component.ts index fc7f9d7..3ecec1a 100644 --- a/src/app/pages/manage-communities/manage-communities.component.ts +++ b/src/app/pages/manage-communities/manage-communities.component.ts @@ -83,7 +83,7 @@ type Tab = 'all' | 'communities' | 'ris';
- +
diff --git a/src/app/pages/users/users-managers/users-managers.component.ts b/src/app/pages/users/users-managers/users-managers.component.ts index ecb8256..1beddb8 100644 --- a/src/app/pages/users/users-managers/users-managers.component.ts +++ b/src/app/pages/users/users-managers/users-managers.component.ts @@ -42,7 +42,7 @@ export class UsersManagersComponent implements OnInit { this.link = this.getURL(this.community.communityId); this.message = 'A manager has the right to access the administration part of Research Community Dashboard, ' + 'where he is able to customize and manage the content, invite other users as managers or members.'; - if(community.status === "hidden") { + if(community.isPrivate()) { this.inviteDisableMessage = "Community's status is Hidden and invitation to manage the Research community dashboard is disabled. Update the community status to enable invitations." } this.loading = false; diff --git a/src/app/pages/users/users-subscribers/users-subscribers.component.ts b/src/app/pages/users/users-subscribers/users-subscribers.component.ts index 02063ec..7e06b9d 100644 --- a/src/app/pages/users/users-subscribers/users-subscribers.component.ts +++ b/src/app/pages/users/users-subscribers/users-subscribers.component.ts @@ -46,8 +46,8 @@ export class UsersSubscribersComponent implements OnInit { this.link = this.getURL(this.community.communityId); this.message = 'A member can access the community dashboard and link research results with projects, ' + 'communities and other research projects.'; - if(community.status !== "all") { - this.inviteDisableMessage = "Community's status is " + (community.status === 'manager'?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the community status to enable invitations." + if(!community.isPublic()) { + this.inviteDisableMessage = "Community's status is " + (community.isRestricted()?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the community status to enable invitations." } this.loading = false; } From c1e306cff055293495326359e6a6021bee6babbc Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 14 Feb 2024 11:27:00 +0200 Subject: [PATCH 5/5] [develop | DONE | ADDED ] add again publicationyear in criteria fields, add different list of verbs for numeric values --- src/app/pages/content-providers/criteria-utils.ts | 11 ++++++++--- .../criteria/criteria.component.html | 12 +++++++++--- .../content-providers/criteria/criteria.component.ts | 10 ++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index a9c4f55..c8eee7d 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -12,9 +12,9 @@ export class CriteriaUtils { {value: 'fos', label: 'Field of Science'}, {value: 'sdg', label: 'SDG'}, {value: 'publisher', label: 'Publisher'}, - /*{value: 'publicationyear', label: 'Publication Year'}*/ + {value: 'publicationyear', label: 'Publication Year'} ] - + public readonly numericFields: string[] = ['publicationyear']; public readonly verbs: Option[] = [ {value: 'contains', label: 'contains'}, {value: 'equals', label: 'equals'}, @@ -22,6 +22,11 @@ export class CriteriaUtils { {value: 'not_equals', label: 'not equals'}, {value: 'starts_with', label: 'starts with'} ] + public readonly verbsForNumbers: Option[] = [ + {value: 'equals', label: 'equals'}, + {value: 'lesser_than', label: 'lesser than'}, + {value: 'greater_than', label: 'greater than'} + ] public getFiltersAsText(criteria: Criteria[]): string { let text = criteria.slice(0, 3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => { @@ -30,7 +35,7 @@ export class CriteriaUtils { if (!constraint.verb.includes('_caseinsensitive')) { matchCase = true; } - let verb = this.verbs.find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label; + let verb = [...this.verbs,...this.verbsForNumbers].find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label; let value = '"' + constraint.value + '"' + (matchCase ? " (Match case)" : ""); return field + " " + verb + " " + value; }).join(" and ")); diff --git a/src/app/pages/content-providers/criteria/criteria.component.html b/src/app/pages/content-providers/criteria/criteria.component.html index 8b84635..74469a3 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.html +++ b/src/app/pages/content-providers/criteria/criteria.component.html @@ -40,13 +40,17 @@
+ [options]="criteriaUtils.fields" [formInput]="constraint.get('field')" (valueChange)="resetFieldWhenValueChange(constraint)">
-
+
+ +
@@ -69,8 +73,10 @@
-
+