From ed512f6f05ca2fbd15037578ebaa7c337f09a029 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 11 Mar 2024 13:29:29 +0200 Subject: [PATCH] [plugins-functionality | WIP] add graph info --- src/app/openaireLibrary | 2 +- .../customization/customization.component.ts | 5 ----- .../manage-communities.component.ts | 2 +- .../manage-zenodo-communities.component.html | 1 + .../manage-zenodo-communities.component.ts | 16 ++++++++++------ .../zenodo-communities.component.ts | 3 ++- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a260ed1..e2b34b1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a260ed17bd28e0cff2ab1504aea7937ebc211ca8 +Subproject commit e2b34b13ee3cf7e360e02fe85f79cea99954e78f diff --git a/src/app/pages/customization/customization.component.ts b/src/app/pages/customization/customization.component.ts index bf6a124..c903cf7 100644 --- a/src/app/pages/customization/customization.component.ts +++ b/src/app/pages/customization/customization.component.ts @@ -164,11 +164,6 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" }, return JSON.stringify(object1) != JSON.stringify(object2); } saveLayout() { - if (!Session.isLoggedIn()) { - this._router.navigate(['/user-info'], { - queryParams: {'errorCode': LoginErrorCodes.NOT_VALID, 'redirectUrl': this._router.url} - }); - } this.publishedLayout.layoutOptions = this.copyObject(this.draftCustomizationOptions); this.publishedCustomizationOptions = this.copyObject(this.publishedLayout.layoutOptions) this.publishedLayout.date = new Date(); 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/zenodo-communities/manage-zenodo-communities.component.html b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html index 5bf8d9d..1f14450 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html @@ -22,6 +22,7 @@
+ {{selectedCommunities.length}} {{previewCommunities.length}}
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 205e18c..ee68bf6 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts @@ -5,7 +5,7 @@ import { Input, OnDestroy, OnInit, - Output, + Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core'; @@ -33,8 +33,8 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { @Input() searchUtils: SearchUtilsClass = null; errorCodes: ErrorCodes; public rowsOnPage = 10; - @Input() masterCommunity = null; - @Input() selectedCommunities = []; + @Input() masterCommunity; + @Input() selectedCommunities; previewCommunities = []; @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity; selectedToDelete = null; @@ -53,12 +53,12 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) { this.errorCodes = new ErrorCodes(); } - + ngOnInit() { this.init(); } - - ngOnDestroy() { + + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscription) { subscription.unsubscribe(); @@ -67,6 +67,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { } private init() { + console.log(this.selectedCommunities.length) this.filterForm = this._fb.control(''); this.filterPreviewCommunities(""); this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => { @@ -75,15 +76,18 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { })); this.searchUtils.keyword = ""; this.searchUtils.totalResults = this.selectedCommunities.length; + console.log(this.selectedCommunities.length, this.previewCommunities.length) } public filterPreviewCommunities(value: string) { this.previewCommunities = this.selectedCommunities.filter(community => { return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1 }); + console.log("filter", this.previewCommunities.length) if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) { this.page = 1; } + console.log("filter - slice", this.previewCommunities.length) this.cdr.detectChanges(); } diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 54080c3..8a3de95 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -37,7 +37,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { masterZenodoCommunity = null; public properties: EnvProperties = null; selectedCommunityIds = null; - selectedCommunities = []; + selectedCommunities = null; zenodocommunitiesloadedCount = 0; zenodoSearchUtils: SearchUtilsClass = new SearchUtilsClass(); public errorCodes: ErrorCodes = new ErrorCodes(); @@ -60,6 +60,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.community = community; this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Zenodo Communities'); this.masterZenodoCommunityId = this.community.zenodoCommunity; + this.selectedCommunities = []; if (this.masterZenodoCommunityId) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, this.masterZenodoCommunityId).subscribe(