From 662b514ab5154358c730164aec4101687ad3f1ed Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 14 Jul 2023 11:43:27 +0300 Subject: [PATCH 01/11] apply initial changes base odn new community API --- src/app/openaireLibrary | 2 +- .../affiliations/affiliations.component.ts | 4 ++- .../remove-content-providers.component.ts | 3 +- .../projects/remove-projects.component.ts | 4 +-- .../manage-zenodo-communities.component.ts | 2 +- .../zenodo-communities.component.ts | 29 +++++++++---------- .../manageContentProviders.service.ts | 2 +- src/app/services/manageProjects.service.ts | 4 +-- .../manageZenodoCommunities.service.ts | 12 +++----- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 11 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 8d8eda4..3ee4129 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 8d8eda416b4873c50f689db54444f135396db56d +Subproject commit 3ee4129c7e76cc7f4c8dcfcf27c135ce873f8f0d diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts index 8cba66c..2fd937e 100644 --- a/src/app/pages/affiliations/affiliations.component.ts +++ b/src/app/pages/affiliations/affiliations.component.ts @@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy { deleteAffiliationOpen(index: number) { this.index = index; let affiliation: Affiliation = this.affiliations[index]; + console.log(index, affiliation) this.removeAffiliationModal.alertTitle = 'Delete Organization'; this.removeAffiliationModal.message = 'Do you want to remove ' + affiliation.name + ' from Organizations?'; @@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy { removeAffiliation() { this.loading = true; - this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations', + console.log(this.index, this.affiliations[this.index].id) + this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name, this.affiliations[this.index].id).subscribe((deleteOK) => { this.affiliations.splice(this.index, 1); if (this.currentPage.length === 0) { diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts index 8fce21e..068add6 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit { } public confirmedDeleteContentProvider() { - this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( + console.log(this.selectedCommunityContentProvider) + this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe( () => { let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); this.communityContentProviders.splice(index, 1); diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index b48f89b..5723030 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -133,7 +133,7 @@ export class RemoveProjectsComponent implements OnInit { } public confirmedDeleteProject(data: any) { - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.id).subscribe( + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { let index = this.communityProjects.indexOf(this.selectedCommunityProject); this.communityProjects.splice(index, 1); @@ -189,7 +189,7 @@ export class RemoveProjectsComponent implements OnInit { this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe( data => { - this.communityProjects = data; + this.communityProjects = data.content; this.previewCommunityProjects = this.communityProjects; this.sort(); diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts index c7c8a82..205e18c 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts @@ -88,7 +88,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { } public confirmedDeleteCommunity(data: any) { - this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.openaireId).subscribe( + this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe( data => { var pos = -1; for (var i = 0; i < this.selectedCommunities.length; i++) { diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index da2d348..4c1cbc9 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -65,8 +65,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.masterZenodoCommunityId = this.community.zenodoCommunity; if (this.masterZenodoCommunityId) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + this.masterZenodoCommunityId, - null).subscribe( + this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe( result => { this.masterZenodoCommunity = result; this.selectedCommunities.unshift(this.masterZenodoCommunity); @@ -81,25 +80,24 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } this.zenodoSearchUtils.status = this.errorCodes.LOADING; this.zenodoSearchUtils.status = this.errorCodes.LOADING; - this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe( - result => { - this.selectedCommunityIds = result; + // this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe( + // result => { + this.selectedCommunityIds = this.community.otherZenodoCommunities; this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length; if (this.selectedCommunityIds.length === 0) { this.zenodoSearchUtils.status = this.errorCodes.NONE; } for (let i = 0; i < this.selectedCommunityIds.length; i++) { this.getZenodoCommunityById( - this.selectedCommunityIds[i]['zenodoid'], - this.selectedCommunityIds[i]['id']); + this.selectedCommunityIds[i]); } - }, - error => { - console.log('list of zenodo communities couldn\'t be loaded'); - this.zenodoSearchUtils.status = this.errorCodes.DONE; - } - ); + // }, + // error => { + // console.log('list of zenodo communities couldn\'t be loaded'); + // this.zenodoSearchUtils.status = this.errorCodes.DONE; + // } + // ); }) ); @@ -116,9 +114,9 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { }); } - getZenodoCommunityById(zenodoid, openaireId) { + getZenodoCommunityById(zenodoid) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + zenodoid, openaireId).subscribe( + this.properties.zenodoCommunities + zenodoid).subscribe( result => { this.selectedCommunities.push(result); this.zenodocommunitiesloadedCount++; @@ -131,7 +129,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { error => { const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo(); emptyCommunity.id = zenodoid; - emptyCommunity.openaireId = openaireId; emptyCommunity.title = zenodoid; this.selectedCommunities.push(emptyCommunity); this.zenodocommunitiesloadedCount++; diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 7be4c2f..0f4eacd 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -11,7 +11,7 @@ export class ManageCommunityContentProvidersService { removeContentProvider(properties: EnvProperties, pid: string, id: string): any { let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI + pid + '/contentproviders'; + let url = properties.communityAPI + pid + '/contentproviders?contentproviderId=' +id; return this.http.request('delete', url, {body: id, headers: headers}); } diff --git a/src/app/services/manageProjects.service.ts b/src/app/services/manageProjects.service.ts index 6f99db7..ba5f146 100644 --- a/src/app/services/manageProjects.service.ts +++ b/src/app/services/manageProjects.service.ts @@ -12,9 +12,9 @@ export class ManageCommunityProjectsService { let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI+pid+"/projects"; + let url = properties.communityAPI+pid+"/projects?projectId="+id; //return this.http.delete(url, options) - return this.http.request('delete', url, { body: id, headers: headers}) + return this.http.request('delete', url, { headers: headers}) } addProject(properties:EnvProperties, pid: string, project: any) { diff --git a/src/app/services/manageZenodoCommunities.service.ts b/src/app/services/manageZenodoCommunities.service.ts index 0cdd3a0..8a07c69 100644 --- a/src/app/services/manageZenodoCommunities.service.ts +++ b/src/app/services/manageZenodoCommunities.service.ts @@ -11,10 +11,10 @@ export class ManageZenodoCommunitiesService { //let options = new RequestOptions({headers: headers, body: id}); let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI + pid + "/zenodocommunities"; + let url = properties.communityAPI + pid + "/zenodocommunities?zenodocommunity="+id; //return this.http.delete(url, options); - return this.http.request('delete', url, { body: id, headers: headers}) + return this.http.request('delete', url, { headers: headers}) } addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) { @@ -23,13 +23,9 @@ export class ManageZenodoCommunitiesService { let headers = new HttpHeaders({'Content-Type': 'application/json'}); - let url = properties.communityAPI+pid+"/zenodocommunities"; - var zCommunity: any = { - "communityId": pid, + let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid; - "zenodoid": zenodoid - }; - return this.http.post(url, JSON.stringify(zCommunity), {headers: headers}); + return this.http.post(url, headers); //.map(res => res.json()) } diff --git a/src/assets/common-assets b/src/assets/common-assets index 39cb4e5..2fd5784 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10 +Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 1e06310..2fffe0f 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848 +Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 From d9b0365a1d42dd94599cb4d7c497adf4cfd1e3be Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 14 Jul 2023 15:00:01 +0300 Subject: [PATCH 02/11] clean up imports for deleted SearchZenodoCommunitiesService --- .../pages/zenodo-communities/zenodo-communities.component.ts | 5 +---- .../pages/zenodo-communities/zenodo-communities.module.ts | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 4c1cbc9..717c259 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -3,8 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; import {ZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service'; -import {SearchZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service'; - import {CommunityService} from '../../openaireLibrary/connect/community/community.service'; import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo'; import {ZenodoCommunityInfo} from '../../openaireLibrary/connect/zenodoCommunities/zenodoCommunityInfo'; @@ -50,8 +48,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title, - private _communityService: CommunityService, - private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService) { + private _communityService: CommunityService) { } ngOnInit() { diff --git a/src/app/pages/zenodo-communities/zenodo-communities.module.ts b/src/app/pages/zenodo-communities/zenodo-communities.module.ts index 59f1ed6..ebfdd50 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.module.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.module.ts @@ -5,7 +5,6 @@ import {RouterModule} from '@angular/router'; import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component'; import {AddZenodoCommunitiesComponent} from './add-zenodo-communities.component'; import {ZenodoCommunitiesComponent} from './zenodo-communities.component'; -import {SearchZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module'; import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service'; import {ZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; @@ -22,7 +21,7 @@ import {PagingModule} from "../../openaireLibrary/utils/paging.module"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, + CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule, AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule ], declarations: [ From f63cd1ec600f0a0ce38a3eed89d2a8b9472749f0 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 19 Jul 2023 14:26:16 +0300 Subject: [PATCH 03/11] add fields claim and membership in edit form --- .../edit-community.component.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) 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 24c0046..69265fc 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 @@ -82,6 +82,16 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach placeholder="Visibility status for your community's profile." [options]="statuses" type="select"> +
+
+
+
+
+
`, @@ -91,9 +101,23 @@ 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: 'Hidden', value: 'hidden'} ] + public claimOptions: Option[] = [ + {label: 'Anyone can claim', value: 'all'}, + {label: 'Managers only', value: 'managersOnly'}, + {label: 'membersOnly', value: 'membersOnly'} + ] + public membershipOptions: Option[] = [ + {label: 'Anyone can join', value: 'open'}, + {label: 'By invitation', value: 'byInvitation'} + ] public community: CommunityInfo; public isNew: boolean; public properties: EnvProperties = properties @@ -133,6 +157,8 @@ export class EditCommunityComponent { shortName: this.fb.control(this.community.shortTitle, Validators.required), description: this.fb.control(this.community.description), status: this.fb.control(this.community.status), + claim: this.fb.control(this.community.claim), + membership: this.fb.control(this.community.membership), managers: this.fb.control(this.community.managers), isUpload: this.fb.control(this.community.isUpload), logoUrl: this.fb.control(this.community.logoUrl) From 7568c668b71919ba6f7e4161f4714924e97c94ea Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 13 Sep 2023 12:13:06 +0300 Subject: [PATCH 04/11] hide membership in edit form until the functionality is ready --- .../profile/edit-community/edit-community.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 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 69265fc..d44ae48 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 @@ -87,11 +87,12 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach placeholder="Who can create links for your community" [options]="claimOptions" type="select"> -
+ +
`, From 4dbf21ba482a2869ee2b81912de567a3428dcb43 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 13 Sep 2023 14:38:28 +0300 Subject: [PATCH 05/11] update remove method on the screen you search and add projects and communities --- src/app/pages/projects/add-projects.component.ts | 3 +-- .../zenodo-communities/add-zenodo-communities.component.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index c286636..1f0de79 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -141,8 +141,7 @@ export class AddProjectsComponent implements OnInit { public removeProject(project: any) { let communityProject = this.getCommunityProject(project); - let projectId: string = communityProject['id']; - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, projectId).subscribe( + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, communityProject['openaireId']).subscribe( data => { let index = this.communityProjects.indexOf(communityProject); this.communityProjects.splice(index, 1); diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts index b0cfaf6..129b9dd 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts @@ -194,7 +194,7 @@ export class AddZenodoCommunitiesComponent implements OnInit { public getOpenaireId(community: any): string { for (let com of this.selectedCommunities) { if (com.id == community.id) { - return com.openaireId; + return com.id; } } return null; From 7bcab9023123a12400ae167bac5fbe6c094e6818 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 19 Sep 2023 15:59:37 +0300 Subject: [PATCH 06/11] update manage projects page to use paging and search through new communities API --- .../projects/add-projects.component.html | 6 +- .../pages/projects/add-projects.component.ts | 47 ++++++----- .../projects/manage-projects.component.ts | 12 +-- .../projects/remove-projects.component.html | 23 +++--- .../projects/remove-projects.component.ts | 80 ++++++++++--------- 5 files changed, 90 insertions(+), 78 deletions(-) diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html index e9e6060..c4858e7 100644 --- a/src/app/pages/projects/add-projects.component.html +++ b/src/app/pages/projects/add-projects.component.html @@ -94,12 +94,12 @@
+ [externalUrl]="projectUrl" [hasLink]="false">
-
+ -
+
diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index 1f0de79..7bf8162 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; import {Filter, Value} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class"; import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service"; +import {SearchCommunityProjectsService} from "../../openaireLibrary/connect/projects/searchProjects.service"; declare var UIkit; @@ -38,7 +39,7 @@ export class AddProjectsComponent implements OnInit { public errorCodes: ErrorCodes; public openaireSearchUtils: SearchUtilsClass = new SearchUtilsClass(); @Output() communityProjectsChanged = new EventEmitter(); - @Input() communityProjects = []; + // @Input() communityProjects = []; public openaireProjects = []; public queryParameters: string = ""; @@ -58,7 +59,7 @@ export class AddProjectsComponent implements OnInit { constructor(private route: ActivatedRoute, private _router: Router, private _searchProjectsService: SearchProjectsService, private _manageCommunityProjectsService: ManageCommunityProjectsService, - private _clearCacheService: ClearCacheService, + private _clearCacheService: ClearCacheService, private _searchCommunityProjectsService: SearchCommunityProjectsService, private _fb: UntypedFormBuilder) { this.errorCodes = new ErrorCodes(); this.openaireSearchUtils.status = this.errorCodes.LOADING; @@ -121,15 +122,17 @@ export class AddProjectsComponent implements OnInit { public addProject(project: SearchResult) { this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe( data => { - this.communityProjects.push(data); + // this.communityProjects.push(data); this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" added", this.community.communityId); + UIkit.notification(this.openaireEntities.PROJECT+' successfully added!', { status: 'success', timeout: 6000, pos: 'bottom-right' }); + project["isPart"] = true; this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: project, }); }, err => { @@ -140,19 +143,20 @@ export class AddProjectsComponent implements OnInit { } public removeProject(project: any) { - let communityProject = this.getCommunityProject(project); - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, communityProject['openaireId']).subscribe( + // let communityProject = this.getCommunityProject(project); + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, project['id']).subscribe( data => { - let index = this.communityProjects.indexOf(communityProject); - this.communityProjects.splice(index, 1); + // let index = this.communityProjects.indexOf(communityProject); + // this.communityProjects.splice(index, 1); this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" removed", this.community.communityId); UIkit.notification(this.openaireEntities.PROJECT+' successfully removed!', { status: 'success', timeout: 6000, pos: 'bottom-right' }); + project["isPart"] = false; this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: project, }); }, err => { @@ -162,16 +166,19 @@ export class AddProjectsComponent implements OnInit { )); } - public getCommunityProject(project: any): string { - let index: number = 0; - for (let communityProject of this.communityProjects) { - if (communityProject.openaireId == project.id || - (project.code == communityProject.grantId && project.funderShortname == communityProject.funder)) { - return communityProject; + public getCommunityProject(project: any) { + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, 1, this.resultsPerPage, project.id, null).subscribe( + data => { + if(data.totalElements > 0){ + project["isPart"] = true; + } + }, + err => { + console.error(err); + //TODO check erros (service not available, bad request) + } - index++; - } - return ""; + )); } getFunders() { @@ -216,7 +223,9 @@ export class AddProjectsComponent implements OnInit { data => { this.openaireSearchUtils.totalResults = data[0]; this.openaireProjects = data[1]; - + for(let project of this.openaireProjects){ + this.getCommunityProject(project); + } this.openaireSearchUtils.status = this.errorCodes.DONE; if (this.openaireSearchUtils.totalResults == 0) { this.openaireSearchUtils.status = this.errorCodes.NONE; diff --git a/src/app/pages/projects/manage-projects.component.ts b/src/app/pages/projects/manage-projects.component.ts index 5264caf..1615f1b 100644 --- a/src/app/pages/projects/manage-projects.component.ts +++ b/src/app/pages/projects/manage-projects.component.ts @@ -16,12 +16,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit @Component({ selector: 'manage-projects', template: ` - + - ` @@ -71,12 +70,13 @@ export class ManageProjectsComponent implements OnInit { } public communityProjectsChanged($event) { - this.communityProjects = $event.value; + /* this.communityProjects = $event.value; this.showLoadingInRemove = false; if (this.fullscreen.isOpen) { this.removeProjectsComponent.applyFilters(); this.removeProjectsComponent.createFunderFilter(); - } + }*/ + this.removeProjectsComponent.getCommunityProjects(); } } diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index c5633e9..fc4a4b8 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -24,11 +24,11 @@
- +
-
+ +
- + [totalResults]="communitySearchUtils.totalResults" customClasses="uk-flex-right">
@@ -67,18 +67,17 @@
-
No {{openaireEntiites.PROJECTS | lowercase}} - for {{community.shortTitle}} + for {{community.shortTitle}} found
-
+
@@ -124,7 +123,7 @@
diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index 5723030..90d7536 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service"; +import {debounceTime, distinctUntilChanged} from "rxjs/operators"; @Component({ selector: 'remove-projects', @@ -35,7 +36,7 @@ export class RemoveProjectsComponent implements OnInit { public projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0]; @Output() communityProjectsChanged = new EventEmitter(); - @Input() public communityProjects = []; + // @Input() public communityProjects = []; public previewCommunityProjects = []; public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass(); public errorCodes: ErrorCodes; @@ -87,21 +88,24 @@ export class RemoveProjectsComponent implements OnInit { sort: this._fb.control(this.sortOptions[0].value) }); - this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => { - this.searchText = new RegExp(value, 'i'); + this.subscriptions.push(this.filterForm.get('keyword').valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => { this.page = 1; - this.applyFilters(); - })); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,null ); + })); +/* this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => { this.page = 1; - this.applyFilters(); - })); + this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); + + }));*/ +/* this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => { this.page = 1; this.sort(); })); +*/ this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { if (community) { @@ -111,7 +115,7 @@ export class RemoveProjectsComponent implements OnInit { + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0]; this.keyword = ''; - this._getCommunityProjects(); + this._getCommunityProjects(1,this.keyword, null); } })); } @@ -135,16 +139,18 @@ export class RemoveProjectsComponent implements OnInit { public confirmedDeleteProject(data: any) { this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { - let index = this.communityProjects.indexOf(this.selectedCommunityProject); - this.communityProjects.splice(index, 1); - this.applyFilters(); + // let index = this.communityProjects.indexOf(this.selectedCommunityProject); + // this.communityProjects.splice(index, 1); + // this.applyFilters(); this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId); NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); - this.communityProjectsChanged.emit({ - value: this.communityProjects, - }); - this.communitySearchUtils.totalResults--; - this.communitySearchUtils.page = 1; + // this.communityProjectsChanged.emit({ + // value: this.communityProjects, + // }); + // this.communitySearchUtils.totalResults--; + // this.communitySearchUtils.page = 1; + this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null); + }, err => { this.handleError('An error has been occurred. Try again later!'); @@ -179,29 +185,21 @@ export class RemoveProjectsComponent implements OnInit { this.alertModalDeleteCommunity.okButtonText = "Yes"; this.alertModalDeleteCommunity.open(); } - - public _getCommunityProjects() { + public getCommunityProjects() { + this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null ); + } + public _getCommunityProjects(page, keyword, funder) { this.communitySearchUtils.status = this.errorCodes.LOADING; - this.communityProjects = []; - this.communitySearchUtils.totalResults = 0; - this.communitySearchUtils.page = 1; - this.communitySearchUtils.keyword = ""; - - this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe( + this.communitySearchUtils.page = page; + this.communitySearchUtils.keyword = keyword; + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder).subscribe( data => { - this.communityProjects = data.content; - this.previewCommunityProjects = this.communityProjects; - this.sort(); - - this.communitySearchUtils.totalResults = data.length; + this.previewCommunityProjects = data.content; + this.communitySearchUtils.totalResults = data.totalElements; this.communitySearchUtils.status = this.errorCodes.DONE; - this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: this.communitySearchUtils.totalResults }); - - this.createFunderFilter(); - this.loading = false; }, err => { @@ -225,18 +223,19 @@ export class RemoveProjectsComponent implements OnInit { let funders: Set = new Set(); this.allOptions = []; let i; - for (i = 0; i < this.communityProjects.length; i++) { + /* for (i = 0; i < this.communityProjects.length; i++) { let funder = this.communityProjects[i].funder; if (funder && !funders.has(funder)) { funders.add(funder); this.allOptions.push({label: funder, value: {id: funder, label: funder}}); } - } + }*/ } public updatePage($event) { HelperFunctions.scroll(); this.page = $event.value; + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, null); } addNew() { @@ -244,7 +243,7 @@ export class RemoveProjectsComponent implements OnInit { } public applyFilters() { - this.previewCommunityProjects = this.communityProjects.filter(project => { + /*this.previewCommunityProjects = this.communityProjects.filter(project => { return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); }); // check paging here!!! @@ -252,8 +251,10 @@ export class RemoveProjectsComponent implements OnInit { this.page = 1; } - this.sort(); + this.sort();*/ + this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); } +/* public filterCommunityProjectByKeyword(project): boolean { return this.searchText.toString() === '' @@ -271,7 +272,9 @@ export class RemoveProjectsComponent implements OnInit { } return false; } +*/ +/* private sort() { let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; @@ -299,6 +302,7 @@ export class RemoveProjectsComponent implements OnInit { return 0; }); } +*/ public onSearchClose() { this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; From ab85ca7e3c6f56d36b17c30b226eda11f3b331f3 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 2 Oct 2023 14:07:15 +0300 Subject: [PATCH 07/11] Commit library changes --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3ee4129..3cf65ef 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3ee4129c7e76cc7f4c8dcfcf27c135ce873f8f0d +Subproject commit 3cf65ef134ac8f65396f7d3293ec08b888021f97 diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..d18e0a7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2fffe0f..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From 205db8bf108441b5fb8fe032c57a38d7209ccc86 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 3 Oct 2023 10:13:04 +0300 Subject: [PATCH 08/11] limit the requests for add projetcs --- src/app/pages/projects/manage-projects.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/projects/manage-projects.component.ts b/src/app/pages/projects/manage-projects.component.ts index 1615f1b..8ed0d01 100644 --- a/src/app/pages/projects/manage-projects.component.ts +++ b/src/app/pages/projects/manage-projects.component.ts @@ -20,7 +20,7 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit [loading]="showLoadingInRemove" [community]="community"> - ` @@ -35,6 +35,7 @@ export class ManageProjectsComponent implements OnInit { public body: string = "Send from page"; public properties: EnvProperties = properties; public community: CommunityInfo = null; + modalIsOpen = false; constructor(private element: ElementRef, private title: Title, @@ -67,6 +68,7 @@ export class ManageProjectsComponent implements OnInit { this.fullscreen.back = true; this.fullscreen.okButton = true; this.fullscreen.open(); + this.modalIsOpen = true; } public communityProjectsChanged($event) { From b54fa1eaf921e5089c36534cb74f70357f383e3b Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 4 Oct 2023 12:17:26 +0300 Subject: [PATCH 09/11] update labels for claimOptions field --- .../profile/edit-community/edit-community.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 d44ae48..d418d0b 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 @@ -111,9 +111,10 @@ export class EditCommunityComponent { {label: 'Hidden', value: 'hidden'} ] public claimOptions: Option[] = [ - {label: 'Anyone can claim', value: 'all'}, - {label: 'Managers only', value: 'managersOnly'}, - {label: 'membersOnly', value: 'membersOnly'} + {label: 'Logged in users', value: 'all'}, + {label: 'Members only', value: 'membersOnly'}, + {label: 'Managers only', value: 'managersOnly'} + ] public membershipOptions: Option[] = [ {label: 'Anyone can join', value: 'open'}, From 0b703bceeca4e0802186ae08c66094860c8f7b37 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 4 Oct 2023 16:04:42 +0300 Subject: [PATCH 10/11] Community projects: add filtering and sorting --- .../projects/remove-projects.component.html | 19 +-- .../projects/remove-projects.component.ts | 146 ++++-------------- 2 files changed, 42 insertions(+), 123 deletions(-) diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index fc4a4b8..59af0c5 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -28,31 +28,32 @@ [totalResults]="communitySearchUtils.totalResults">
- - +
{ this.page = 1; - this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,null ); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,(this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null), + this.filterForm.get("sort").value.sort ); })); -/* - this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => { - this.page = 1; - this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); - - }));*/ -/* - this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => { this.page = 1; - this.sort(); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null, this.filterForm.get("sort").value.sort ); })); -*/ this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { if (community) { @@ -115,6 +102,7 @@ export class RemoveProjectsComponent implements OnInit { + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0]; this.keyword = ''; + this._getCommunityFunders(); this._getCommunityProjects(1,this.keyword, null); } })); @@ -139,16 +127,9 @@ export class RemoveProjectsComponent implements OnInit { public confirmedDeleteProject(data: any) { this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { - // let index = this.communityProjects.indexOf(this.selectedCommunityProject); - // this.communityProjects.splice(index, 1); - // this.applyFilters(); + this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId); NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); - // this.communityProjectsChanged.emit({ - // value: this.communityProjects, - // }); - // this.communitySearchUtils.totalResults--; - // this.communitySearchUtils.page = 1; this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null); }, @@ -188,11 +169,11 @@ export class RemoveProjectsComponent implements OnInit { public getCommunityProjects() { this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null ); } - public _getCommunityProjects(page, keyword, funder) { + public _getCommunityProjects(page, keyword, funder, orderBy = "name" ) { this.communitySearchUtils.status = this.errorCodes.LOADING; this.communitySearchUtils.page = page; this.communitySearchUtils.keyword = keyword; - this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder).subscribe( + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder, orderBy).subscribe( data => { this.previewCommunityProjects = data.content; this.communitySearchUtils.totalResults = data.totalElements; @@ -213,23 +194,21 @@ export class RemoveProjectsComponent implements OnInit { } else { this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE; } - this.loading = false; } )); } - - public createFunderFilter(): void { - let funders: Set = new Set(); - this.allOptions = []; - let i; - /* for (i = 0; i < this.communityProjects.length; i++) { - let funder = this.communityProjects[i].funder; - if (funder && !funders.has(funder)) { - funders.add(funder); - this.allOptions.push({label: funder, value: {id: funder, label: funder}}); + public _getCommunityFunders() { + this.subscriptions.push(this._searchCommunityProjectsService.getProjectFunders(this.properties, this.community.communityId).subscribe( + data => { + for (let funder of data) { + this.allFunderOptions.push({label: funder, value: {id: funder, label: funder}}); + } + this.previewFunderOptions =[...this.allFunderOptions]; + }, + err => { } - }*/ + )); } public updatePage($event) { @@ -242,67 +221,6 @@ export class RemoveProjectsComponent implements OnInit { this.addProjects.emit(); } - public applyFilters() { - /*this.previewCommunityProjects = this.communityProjects.filter(project => { - return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); - }); - // check paging here!!! - if (this.previewCommunityProjects.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) { - this.page = 1; - } - - this.sort();*/ - this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); - } -/* - - public filterCommunityProjectByKeyword(project): boolean { - return this.searchText.toString() === '' - || ((project.name + " " + project.acronym + " " + project.grantId + " " + project.funder)).match(this.searchText) != null; - } - - public filterCommunityProjectByFunder(project): boolean { - if (this.fundersCtrl.getRawValue().length == 0) { - return true; - } - for (let funder of this.fundersCtrl.getRawValue()) { - if (project.funder.toLowerCase().indexOf(funder.label.toLowerCase()) != -1) { - return true; - } - } - return false; - } -*/ - -/* - private sort() { - let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; - - this.previewCommunityProjects.sort((left, right): number => { - if (sortOption.sort == "title") { - if ((left.name + left.acronym) > (right.name + right.acronym)) { - return sortOption.descending ? -1 : 1; - } else if ((left.name + left.acronym) < (right.name + right.acronym)) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "grant") { - if (left.grantId > right.grantId) { - return sortOption.descending ? -1 : 1; - } else if (left.grantId < right.grantId) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "funder") { - if (left.funder > right.funder) { - return sortOption.descending ? -1 : 1; - } else if (left.funder < right.funder) { - return sortOption.descending ? 1 : -1; - } - } - - return 0; - }); - } -*/ public onSearchClose() { this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; @@ -317,23 +235,23 @@ export class RemoveProjectsComponent implements OnInit { NotificationHandler.rise(message, 'danger'); } - select(value: string, event, dropdownFilter: DropdownFilterComponent) { + select(option, event, dropdownFilter: DropdownFilterComponent) { + console.log(option) if(event.target instanceof HTMLInputElement) { dropdownFilter.closeDropdown(); - if(event.target.checked && !this.selectedFunders.find(entity => value === entity)) { - this.selectedFunders.push(value); - this.fundersCtrl.setControl(this.fundersCtrl.value.length, this._fb.control(value)); + if(event.target.checked) { + this.filterForm.get("funder").setValue(option.value); + this._getCommunityProjects(1, this.filterForm.get('keyword').value, this.filterForm.get('funder').value.id ); + this.previewFunderOptions =[option]; } else if(!event.target.checked) { - let index = this.selectedFunders.indexOf(value); - if(index !== -1) { - this.selectedFunders.splice(index, 1); - this.fundersCtrl.removeAt(index); - } + this.filterForm.get("funder").setValue(null); + this._getCommunityProjects(1, this.filterForm.get('keyword').value,null); + this.previewFunderOptions =[...this.allFunderOptions]; } } } isSelected(value: string) { - return this.filterForm && this.filterForm.get('funder').value.find(funder => funder === value) + return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value; } } From 0ef15e01cf4acce4f1783bf89f8020683dd48568 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 6 Oct 2023 21:00:30 +0300 Subject: [PATCH 11/11] commit libraries --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3cf65ef..5e4aaab 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3cf65ef134ac8f65396f7d3293ec08b888021f97 +Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2df4b37..ac458b5 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a +Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae