From 10cad849a9d5995820bbb90e2ce8d81a2d8ff9a2 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 25 Sep 2023 11:36:05 +0300 Subject: [PATCH 01/32] Initial commit for plugins functionality: Manage Plugin Templates --- src/app/pages/admin-tools/portal-admin-tools-routing.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts b/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts index b92f457..5bb9ac8 100644 --- a/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts +++ b/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts @@ -5,7 +5,8 @@ import {RouterModule} from "@angular/router"; imports: [RouterModule.forChild([ {path: '', loadChildren: () => import('./admin-tools-routing.module').then(m => m.AdminToolsRoutingModule)}, {path: 'portals', loadChildren: () => import('../../openaireLibrary/dashboard/portal/portals.module').then(m => m.PortalsModule)}, - {path: 'classes', loadChildren: () => import('../../openaireLibrary/dashboard/divId/divIds.module').then(m => m.DivIdsModule)} + {path: 'classes', loadChildren: () => import('../../openaireLibrary/dashboard/divId/divIds.module').then(m => m.DivIdsModule)}, + {path: 'templates', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/templates/pluginTemplates.module').then(m => m.PluginTemplatesModule)} ])] }) export class PortalAdminToolsRoutingModule { -- 2.17.1 From 703b1638031cc254a31f71aa3f4fc6a5e6a5e75b Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 2 Oct 2023 12:30:13 +0300 Subject: [PATCH 02/32] route for plugins --- src/app/pages/admin-tools/admin-tools-routing.module.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/pages/admin-tools/admin-tools-routing.module.ts b/src/app/pages/admin-tools/admin-tools-routing.module.ts index a835137..be30332 100644 --- a/src/app/pages/admin-tools/admin-tools-routing.module.ts +++ b/src/app/pages/admin-tools/admin-tools-routing.module.ts @@ -29,6 +29,11 @@ import {RouterModule} from '@angular/router'; loadChildren: () => import('../../openaireLibrary/dashboard/helpTexts/page-help-content-form.module').then(m => m.PageHelpContentFormModule), pathMatch: 'full' }, + { + path: 'plugins', + loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule), + pathMatch: 'full' + }, { path: 'pages', loadChildren: () => import('../../openaireLibrary/dashboard/page/pages.module').then(m => m.PagesModule), -- 2.17.1 From 47201b9dffee3bb2f6cd6ae047f625e37900b6ac Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 9 Oct 2023 13:55:30 +0300 Subject: [PATCH 03/32] commit libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5e4aaab..8b9c8ec 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 +Subproject commit 8b9c8ec6651df176f23de383a91c7db448f76a4f diff --git a/src/assets/common-assets b/src/assets/common-assets index d18e0a7..031329d 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f +Subproject commit 031329d5ca890663a0911e3dac5649eb5c00c601 -- 2.17.1 From 9a49371a39080037af97447dd871c1005d0cd6d7 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 17 Oct 2023 09:20:16 +0300 Subject: [PATCH 04/32] manage plugins of a template --- src/app/pages/admin-tools/portal-admin-tools-routing.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts b/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts index 5bb9ac8..58ef5e8 100644 --- a/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts +++ b/src/app/pages/admin-tools/portal-admin-tools-routing.module.ts @@ -6,7 +6,8 @@ import {RouterModule} from "@angular/router"; {path: '', loadChildren: () => import('./admin-tools-routing.module').then(m => m.AdminToolsRoutingModule)}, {path: 'portals', loadChildren: () => import('../../openaireLibrary/dashboard/portal/portals.module').then(m => m.PortalsModule)}, {path: 'classes', loadChildren: () => import('../../openaireLibrary/dashboard/divId/divIds.module').then(m => m.DivIdsModule)}, - {path: 'templates', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/templates/pluginTemplates.module').then(m => m.PluginTemplatesModule)} + {path: 'templates', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/templates/pluginTemplates.module').then(m => m.PluginTemplatesModule)}, + {path: 'templates/plugins', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule)}, ])] }) export class PortalAdminToolsRoutingModule { -- 2.17.1 From 044d5da78a3ef79e4f76464965a03a8a81e43b4b Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 19 Jan 2024 11:03:57 +0200 Subject: [PATCH 05/32] [plugins-functionality | WIP] : update admn tools API --- src/environments/environment.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4e9ff41..2b8c4dd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -13,6 +13,7 @@ let props: EnvProperties = { useCache: false, connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200', domain:'https://beta.admin.connect.openaire.eu', + adminToolsAPIURL: 'http://scoobydoo.di.uoa.gr:8880/uoa-admin-tools/', }; -- 2.17.1 From 49e8e56e9277cc3345ea13dd18df781baff5fbe1 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 2 Feb 2024 09:33:01 +0200 Subject: [PATCH 06/32] [plugin-functionalities | WIP] : update plugin forms, add reording, filtering by position, create multiple templates per position, etc --- 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 d0b4fa7..a260ed1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit d0b4fa7750a8dde3cfa6b5b81c18302380e10c35 +Subproject commit a260ed17bd28e0cff2ab1504aea7937ebc211ca8 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index df6a052..52eca9a 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6 +Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9 -- 2.17.1 From 2a27c1caf7ad7dc118738429e9c54088b8fd7d45 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 28 Feb 2024 14:46:29 +0200 Subject: [PATCH 07/32] [plugins-functionality | WIP] content providers: update methods, add options to select for deposit and add deposition message --- .../communityContentProviders.module.ts | 3 +- .../manage-content-providers.component.ts | 44 ++++++++++++++++++- .../remove-content-providers.component.html | 18 ++++++++ .../remove-content-providers.component.ts | 4 ++ .../manageContentProviders.service.ts | 6 +-- 5 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/app/pages/content-providers/communityContentProviders.module.ts b/src/app/pages/content-providers/communityContentProviders.module.ts index 4a0708e..843d787 100644 --- a/src/app/pages/content-providers/communityContentProviders.module.ts +++ b/src/app/pages/content-providers/communityContentProviders.module.ts @@ -28,6 +28,7 @@ import {AddContentProvidersComponent} from "./add-content-providers.component"; import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service"; import {SearchDataprovidersService} from "../../openaireLibrary/services/searchDataproviders.service"; import {CriteriaModule} from "./criteria/criteria.module"; +import {MatSlideToggleModule} from "@angular/material/slide-toggle"; @NgModule({ imports: [ @@ -48,7 +49,7 @@ import {CriteriaModule} from "./criteria/criteria.module"; path: '', component: ManageContentProvidersComponent } ]), - NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule + NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule, MatSlideToggleModule ], declarations: [ ManageContentProvidersComponent, diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index f211f4f..df641dc 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -23,6 +23,7 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [communityContentProviders]="communityContentProviders" [loading]="showLoadingInRemove" [community]="community" (editCriteria)="openCriteria($event)" + (editDepositInfo)="openDeposit($event)" (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> @@ -44,6 +45,17 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte + +
+
+
+ + + +
+ ` }) @@ -53,6 +65,7 @@ export class ManageContentProvidersComponent implements OnInit { @ViewChild('criteria') criteria: CriteriaComponent; @ViewChild('addContentProvidersModal', { static: true }) addContentProvidersModal: FullScreenModalComponent; @ViewChild('filtersModal', { static: true }) filtersModal: FullScreenModalComponent; + @ViewChild('depositModal', { static: true }) depositModal: FullScreenModalComponent; private subscriptions: any[] = []; public showLoadingInRemove: boolean = true; public body: string = "Send from page"; @@ -60,6 +73,8 @@ export class ManageContentProvidersComponent implements OnInit { public openaireEntities = OpenaireEntities; public community: CommunityInfo; public dataProvider: ContentProvider; + message = ""; + deposit= false; constructor(private title: Title, private cdr: ChangeDetectorRef, @@ -103,7 +118,17 @@ export class ManageContentProvidersComponent implements OnInit { this.filtersModal.open(); this.cdr.detectChanges(); } - + public openDeposit(contentProvider: ContentProvider) { + this.dataProvider = contentProvider; + this.deposit = this.dataProvider.deposit; + this.message = this.dataProvider.message; + this.depositModal.title = 'Deposit info'; + this.depositModal.okButtonText = "Save"; + this.depositModal.back = true; + this.depositModal.okButton = true; + this.depositModal.open(); + this.cdr.detectChanges(); + } public saveCriteria() { let callback = (selectionCriteria): void => { this.dataProvider.selectioncriteria = selectionCriteria; @@ -128,4 +153,21 @@ export class ManageContentProvidersComponent implements OnInit { this.removeContentProvidersComponent.applyFilters(); } } + + saveDepositInfo(){ + this.dataProvider.deposit = this.deposit; + this.dataProvider.message = this.message; + console.log(this.message) + this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { + this.removeContentProvidersComponent.getCommunityContentProviders(); + NotificationHandler.rise('Deposit info have been successfully updated'); + }, error => { + this.criteria.handeError('An error has been occurred. Try again later!', error); + }); + } + + depositReset(){ + this.message = this.dataProvider.message; + this.deposit = this.dataProvider.deposit; + } } diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html index 6156177..d57f687 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -54,6 +54,8 @@ [no title available] +
Deposit
+
{{item.message}}
Filters
@@ -64,6 +66,22 @@
+
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 068add6..252f1f6 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -49,6 +49,7 @@ export class RemoveContentProvidersComponent implements OnInit { public keyword: string = ''; @Output() addContentProviders: EventEmitter = new EventEmitter(); @Output() editCriteria: EventEmitter = new EventEmitter(); + @Output() editDepositInfo: EventEmitter = new EventEmitter(); constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, @@ -183,4 +184,7 @@ export class RemoveContentProvidersComponent implements OnInit { openCriteria(contentProvider: ContentProvider) { this.editCriteria.emit(contentProvider); } + openDeposit(contentProvider: ContentProvider) { + this.editDepositInfo.emit(contentProvider); + } } diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 0f4eacd..9f1d752 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -11,18 +11,18 @@ 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?contentproviderId=' +id; + let url = properties.communityAPI + pid + '/datasources?dsId=' +id; return this.http.request('delete', url, {body: id, headers: headers}); } addContentProvider(properties: EnvProperties, pid: string, contentProvider: any): Observable { - let url = properties.communityAPI + pid + '/contentproviders'; + let url = properties.communityAPI + pid + '/datasources'; let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid); return this.http.post(url, communityContentProvider); } saveContentProvider(properties: EnvProperties, contentProvider: ContentProvider): Observable { - let url = properties.communityAPI + contentProvider.communityId + '/contentproviders'; + let url = properties.communityAPI + contentProvider.communityId + '/datasources'; return this.http.post(url, contentProvider); } -- 2.17.1 From ed512f6f05ca2fbd15037578ebaa7c337f09a029 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 11 Mar 2024 13:29:29 +0200 Subject: [PATCH 08/32] [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( -- 2.17.1 From b12ce55b205f65b963ec25763e5da4686282ac63 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 11 Mar 2024 14:08:51 +0200 Subject: [PATCH 09/32] [plugins-functionality | DONE | FIX] initialize properly view for master zenodo community --- .../manage-zenodo-communities.component.html | 1 - .../zenodo-communities.component.ts | 70 ++++++++----------- 2 files changed, 28 insertions(+), 43 deletions(-) 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 1f14450..5bf8d9d 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html @@ -22,7 +22,6 @@
- {{selectedCommunities.length}} {{previewCommunities.length}}
diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 8a3de95..7486032 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -42,7 +42,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { zenodoSearchUtils: SearchUtilsClass = new SearchUtilsClass(); public errorCodes: ErrorCodes = new ErrorCodes(); subscriptions = []; - @ViewChild('fsModal', { static: true }) fullscreen: FullScreenModalComponent; + @ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent; @ViewChild(ManageZenodoCommunitiesComponent) manage: ManageZenodoCommunitiesComponent; public showLoadingInRemove: boolean = true; @@ -50,7 +50,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title, private _communityService: CommunityService) { } - + ngOnInit() { this.zenodoSearchUtils.status = this.errorCodes.LOADING; this.properties = properties; @@ -61,41 +61,22 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { 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( - result => { - this.masterZenodoCommunity = result; - this.selectedCommunities.unshift(this.masterZenodoCommunity); - }, - error => { - const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo(); - emptyCommunity.id = this.masterZenodoCommunityId; - emptyCommunity.title = this.masterZenodoCommunityId; - this.masterZenodoCommunity = emptyCommunity; - } - )); - } - this.zenodoSearchUtils.status = this.errorCodes.LOADING; - this.zenodoSearchUtils.status = this.errorCodes.LOADING; - // 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]); - } - // }, - // error => { - // console.log('list of zenodo communities couldn\'t be loaded'); - // this.zenodoSearchUtils.status = this.errorCodes.DONE; - // } - // ); + this.zenodoSearchUtils.status = this.errorCodes.LOADING; + + this.selectedCommunityIds = this.community.otherZenodoCommunities; + if(this.masterZenodoCommunityId){ + this.selectedCommunityIds.unshift(this.masterZenodoCommunityId) + } + 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]); + } + }) ); @@ -103,7 +84,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.fullscreen.okButtonText = "Done"; this.fullscreen.okButton = true; } - + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscription) { @@ -111,18 +92,23 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } }); } - + getZenodoCommunityById(zenodoid) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - zenodoid).subscribe( + zenodoid).subscribe( result => { - this.selectedCommunities.push(result); + if(zenodoid == this.masterZenodoCommunityId){ + this.masterZenodoCommunity = result; + result.master = true; + this.selectedCommunities.unshift(result); + }else { + this.selectedCommunities.push(result); + } this.zenodocommunitiesloadedCount++; if (this.zenodocommunitiesloadedCount >= this.selectedCommunityIds.length) { this.zenodoSearchUtils.status = this.errorCodes.DONE; } - - + }, error => { const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo(); -- 2.17.1 From 7a43b29617895015b822f982259449380161efde Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 15 Mar 2024 15:56:54 +0200 Subject: [PATCH 10/32] [plugins-functionality | WIP] more updates and fixes --- src/app/pages/admin-tools/admin-tools-routing.module.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/pages/admin-tools/admin-tools-routing.module.ts b/src/app/pages/admin-tools/admin-tools-routing.module.ts index be30332..a71b58f 100644 --- a/src/app/pages/admin-tools/admin-tools-routing.module.ts +++ b/src/app/pages/admin-tools/admin-tools-routing.module.ts @@ -32,7 +32,12 @@ import {RouterModule} from '@angular/router'; { path: 'plugins', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule), - pathMatch: 'full' + pathMatch: 'full', data: {hasInternalSidebar: true, hasHeader: false} + }, + { + path: 'plugin-edit', + loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins-form/pluginsForm.module').then(m => m.PluginsFormModule), + pathMatch: 'full', data: {hasInternalSidebar: true, hasHeader: false} }, { path: 'pages', -- 2.17.1 From 75b43286237623e29a4d192272a8223e5683fb7e Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 15 Mar 2024 15:58:15 +0200 Subject: [PATCH 11/32] [plugins-functionality | DONE | CHANGED] give option to for content, deposit or both, use a common form to edit the options + the criteria --- .../add-content-providers.component.html | 11 +++- .../add-content-providers.component.ts | 6 +- .../manage-content-providers.component.ts | 57 +++++++------------ .../remove-content-providers.component.html | 31 ++++------ .../remove-content-providers.component.ts | 7 +-- .../manageContentProviders.service.ts | 8 ++- 6 files changed, 52 insertions(+), 68 deletions(-) diff --git a/src/app/pages/content-providers/add-content-providers.component.html b/src/app/pages/content-providers/add-content-providers.component.html index 5c064b6..fa96943 100644 --- a/src/app/pages/content-providers/add-content-providers.component.html +++ b/src/app/pages/content-providers/add-content-providers.component.html @@ -36,12 +36,21 @@
diff --git a/src/app/pages/content-providers/add-content-providers.component.ts b/src/app/pages/content-providers/add-content-providers.component.ts index 32f8584..b4a3f11 100644 --- a/src/app/pages/content-providers/add-content-providers.component.ts +++ b/src/app/pages/content-providers/add-content-providers.component.ts @@ -102,8 +102,8 @@ export class AddContentProvidersComponent implements OnInit { "
" } - public addContentProvider(contentProvider: SearchResult) { - this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider).subscribe( + public addContentProvider(contentProvider: SearchResult, content = true, deposit =false) { + this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider, content, deposit).subscribe( data => { this.communityContentProviders.push(data); this._clearCacheService.purgeBrowserCache(this.openAIREEntities.DATASOURCE+" added", this.community.communityId); @@ -120,7 +120,7 @@ export class AddContentProvidersComponent implements OnInit { public removeContentProvider(contentProvider) { let communityContentProvider = this.getCommunityContentProvider(contentProvider); - let contentProviderId: string = communityContentProvider['id']; + let contentProviderId: string = communityContentProvider['openaireId']; this.subscriptions.push(this.manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, contentProviderId).subscribe( data => { let index = this.communityContentProviders.indexOf(communityContentProvider); diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index df641dc..63c6cdf 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -23,7 +23,7 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [communityContentProviders]="communityContentProviders" [loading]="showLoadingInRemove" [community]="community" (editCriteria)="openCriteria($event)" - (editDepositInfo)="openDeposit($event)" + (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> @@ -31,10 +31,18 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [community]="community" (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> -
- + +
+ + +
+
+
No Filters for {{dataProvider.officialname}} yet
@@ -45,17 +53,6 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
- -
-
-
- - - -
- ` }) @@ -75,6 +72,7 @@ export class ManageContentProvidersComponent implements OnInit { public dataProvider: ContentProvider; message = ""; deposit= false; + enabled = false; constructor(private title: Title, private cdr: ChangeDetectorRef, @@ -111,27 +109,22 @@ export class ManageContentProvidersComponent implements OnInit { public openCriteria(contentProvider: ContentProvider) { this.dataProvider = contentProvider; - this.filtersModal.title = 'Filters'; + this.deposit = this.dataProvider.deposit; + this.message = this.dataProvider.message; + this.enabled = this.dataProvider.enabled; + this.filtersModal.title = 'Edit datasource Options'; this.filtersModal.okButtonText = "Save"; this.filtersModal.back = true; this.filtersModal.okButton = true; this.filtersModal.open(); this.cdr.detectChanges(); } - public openDeposit(contentProvider: ContentProvider) { - this.dataProvider = contentProvider; - this.deposit = this.dataProvider.deposit; - this.message = this.dataProvider.message; - this.depositModal.title = 'Deposit info'; - this.depositModal.okButtonText = "Save"; - this.depositModal.back = true; - this.depositModal.okButton = true; - this.depositModal.open(); - this.cdr.detectChanges(); - } public saveCriteria() { let callback = (selectionCriteria): void => { this.dataProvider.selectioncriteria = selectionCriteria; + this.dataProvider.deposit = this.deposit; + this.dataProvider.message = this.message; + this.dataProvider.enabled = this.enabled; this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.criteria.reset(); this.removeContentProvidersComponent.getCommunityContentProviders(); @@ -154,20 +147,10 @@ export class ManageContentProvidersComponent implements OnInit { } } - saveDepositInfo(){ - this.dataProvider.deposit = this.deposit; - this.dataProvider.message = this.message; - console.log(this.message) - this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { - this.removeContentProvidersComponent.getCommunityContentProviders(); - NotificationHandler.rise('Deposit info have been successfully updated'); - }, error => { - this.criteria.handeError('An error has been occurred. Try again later!', error); - }); - } depositReset(){ this.message = this.dataProvider.message; this.deposit = this.dataProvider.deposit; + this.enabled = this.dataProvider.enabled; } } diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html index d57f687..355793b 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -54,8 +54,11 @@ [no title available] -
Deposit
-
{{item.message}}
+
Content source
+
Suggested for deposit
+
+ Deposit info: + {{item.message}}
Filters
@@ -67,33 +70,23 @@
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 252f1f6..e71b328 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -49,8 +49,7 @@ export class RemoveContentProvidersComponent implements OnInit { public keyword: string = ''; @Output() addContentProviders: EventEmitter = new EventEmitter(); @Output() editCriteria: EventEmitter = new EventEmitter(); - @Output() editDepositInfo: EventEmitter = new EventEmitter(); - + constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService, @@ -184,7 +183,5 @@ export class RemoveContentProvidersComponent implements OnInit { openCriteria(contentProvider: ContentProvider) { this.editCriteria.emit(contentProvider); } - openDeposit(contentProvider: ContentProvider) { - this.editDepositInfo.emit(contentProvider); - } + } diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 9f1d752..e938653 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -15,9 +15,9 @@ export class ManageCommunityContentProvidersService { return this.http.request('delete', url, {body: id, headers: headers}); } - addContentProvider(properties: EnvProperties, pid: string, contentProvider: any): Observable { + addContentProvider(properties: EnvProperties, pid: string, contentProvider: any, content:boolean, deposit:boolean): Observable { let url = properties.communityAPI + pid + '/datasources'; - let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid); + let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid, content, deposit); return this.http.post(url, communityContentProvider); } @@ -26,12 +26,14 @@ export class ManageCommunityContentProvidersService { return this.http.post(url, contentProvider); } - convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string): ContentProvider { + convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string, content:boolean, deposit:boolean): ContentProvider { let communityContentProvider: ContentProvider = new ContentProvider(); communityContentProvider.communityId = community; communityContentProvider.officialname = contentProvider.title.name; communityContentProvider.name = contentProvider.englishname; communityContentProvider.openaireId = contentProvider.id; + communityContentProvider.enabled = content; + communityContentProvider.deposit = deposit; return communityContentProvider; } -- 2.17.1 From b6e803b56e3b96abc16ff10a542c327e2952cd46 Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 28 Mar 2024 12:37:00 +0200 Subject: [PATCH 12/32] [plugins-functionality | WIP ] updates and fixes after initial beta release --- .../edit-community/edit-community.component.ts | 2 +- .../manage-content-providers.component.ts | 15 +++++++++------ .../remove-content-providers.component.html | 2 +- 3 files changed, 11 insertions(+), 8 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 89c1116..c60421e 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 @@ -35,7 +35,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach removeButtons: 'Save,NewPage,DocProps,Preview,Print,' + 'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' + 'CreateDiv,Flash,PageBreak,' + - 'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language', + 'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock', extraPlugins: 'divarea'}">
diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index 63c6cdf..97f75bc 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -32,16 +32,17 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> + [okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)">
- +
- +
+ [value]="message" (valueChange)="message=$event; depositInfoChanged = true;">
+
Content filters
@@ -73,7 +74,7 @@ export class ManageContentProvidersComponent implements OnInit { message = ""; deposit= false; enabled = false; - + depositInfoChanged =false; constructor(private title: Title, private cdr: ChangeDetectorRef, private communityService: CommunityService, @@ -112,10 +113,12 @@ export class ManageContentProvidersComponent implements OnInit { this.deposit = this.dataProvider.deposit; this.message = this.dataProvider.message; this.enabled = this.dataProvider.enabled; - this.filtersModal.title = 'Edit datasource Options'; + this.depositInfoChanged = false; + this.filtersModal.title = 'Edit datasource options'; this.filtersModal.okButtonText = "Save"; this.filtersModal.back = true; this.filtersModal.okButton = true; + this.filtersModal.open(); this.cdr.detectChanges(); } diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html index 355793b..13e869f 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -59,7 +59,7 @@
Deposit info: {{item.message}}
-
+
Filters
-- 2.17.1 From 6f323f811148351f78dd4144d1aab1167abb7773 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 1 Apr 2024 11:44:57 +0300 Subject: [PATCH 13/32] [plugins-functionality | DONE CHANGED ] Criteria: add experimental feature label --- src/app/pages/content-providers/criteria-utils.ts | 4 +++- .../pages/content-providers/criteria/criteria.component.html | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index c8eee7d..9689203 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -37,7 +37,9 @@ export class CriteriaUtils { } 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; + let expFeature = field =='Publisher' || field == 'Publication Year'? `experimental feature`:'' + return field + " " + verb + " " + value + expFeature; }).join(" and ")); return text.join("
"); } diff --git a/src/app/pages/content-providers/criteria/criteria.component.html b/src/app/pages/content-providers/criteria/criteria.component.html index 74469a3..3109d97 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.html +++ b/src/app/pages/content-providers/criteria/criteria.component.html @@ -32,6 +32,8 @@
+ experimental feature
+ experimental feature
-- 2.17.1 From 1114ce4e36335be7ca2c7c1902b6b07329ec9190 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 1 Apr 2024 11:46:25 +0300 Subject: [PATCH 14/32] [plugins-functionality | DONE CHANGED ] Edit community info - html editor: remove buttons with css style for text --- .../profile/edit-community/edit-community.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c60421e..ec73a3c 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 @@ -35,7 +35,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach removeButtons: 'Save,NewPage,DocProps,Preview,Print,' + 'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' + 'CreateDiv,Flash,PageBreak,' + - 'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock', + 'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock,FontSize,TextColor,BGColor', extraPlugins: 'divarea'}">
-- 2.17.1 From 5f8d9f32f611ab00ad164b08fd011b606203d0ae Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 1 Apr 2024 13:15:52 +0300 Subject: [PATCH 15/32] [plugins-functionality | WIP ] Plugins change background when preview in admin --- src/app/pages/customization/customization.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 3c3624b..53dce20 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -208,12 +208,12 @@ [light]="false"> - + [communityId]="communityId">
- Hero section + Custom section
Fonts @@ -231,7 +231,7 @@ [checked]="draftCustomizationOptions.backgrounds.form.fontsDarkMode" (change)="draftCustomizationOptions.backgrounds.form.fontsDarkMode=!draftCustomizationOptions.backgrounds.form.fontsDarkMode;" [attr.uk-tooltip]="'title:
' + - (draftCustomizationOptions.backgrounds.form.fontsDarkMode?'Change to light color mode if the hero section background is dark':'Change to dark mode if the hero section background is light')+'
'" + (draftCustomizationOptions.backgrounds.form.fontsDarkMode?'Change to light color mode if the custom section background is dark':'Change to dark mode if the custom section background is light')+'
'" > -- 2.17.1 From ce1b87aaa37ba12f343ef31e4141f5d5cb00ce60 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 3 Apr 2024 10:26:29 +0300 Subject: [PATCH 16/32] [plugins-functionality | DONE | CHANGED ] Change the way the cache is cleared --- .../edit-community.component.ts | 6 +-- .../connect-admin-customization.component.ts | 45 ++++++++++++++++--- .../remove-content-providers.component.ts | 1 + .../pages/projects/add-projects.component.ts | 1 + .../projects/remove-projects.component.ts | 2 +- .../subjects-edit-form.component.ts | 1 + 6 files changed, 44 insertions(+), 12 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 ec73a3c..dbfea03 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 @@ -237,8 +237,7 @@ export class EditCommunityComponent { this.removePhoto(); this.subscriptions.push(this.communityService.updateCommunity( this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => { - this._clearCacheService.clearCache("Community saved"); - this._clearCacheService.purgeBrowserCache("Community saved", this.community.communityId); + this._clearCacheService.clearCacheInRoute("Community saved",this.community.communityId,"/"); this.communityService.getCommunity(this.community.communityId, true).subscribe(community => { NotificationHandler.rise(community.shortTitle + ' has been successfully created'); callback(community); @@ -251,8 +250,7 @@ export class EditCommunityComponent { })); } else { this.subscriptions.push(this.communityService.updateCommunity(this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => { - this._clearCacheService.clearCache("Community updated"); - this._clearCacheService.purgeBrowserCache("Community updated", this.community.communityId); + this._clearCacheService.clearCacheInRoute("Community saved",this.community.communityId,"/"); this.communityService.getCommunity(this.community.communityId, true).subscribe(community => { NotificationHandler.rise(community.shortTitle + ' has been successfully saved'); callback(community); diff --git a/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts b/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts index df51cff..3ed1213 100644 --- a/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts +++ b/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts @@ -16,14 +16,28 @@ declare var UIkit;
-
-
Use only after connect deployment. And only if there are css updates!
- Press the following button to update the timestamp in the saved layouts and recreate the css files. +
+
+
Use only after connect deployment. And only if there are css updates!
+ Press the following button to update the timestamp in the saved layouts and recreate the css files. +
+ +
- - +
+
Purge ICM cache for all communities
- + +
+
+
+
Reload cache requests either per community or for all communities
+
+
+ + +
+
@@ -45,6 +59,7 @@ export class ConnectAdminCustomizationComponent implements OnInit { cssCreated: number = 0; totalLayouts: number = 0; community; + route; properties = properties; constructor( private customizationService: CustomizationService, private _clearCacheService: ClearCacheService, @@ -133,4 +148,20 @@ export class ConnectAdminCustomizationComponent implements OnInit { })); } } + + forceReloadCache() { + if (this.community) { + this._clearCacheService.clearCacheInRoute("Clear cache", this.community, this.route ? this.route : "/") + } else { + this.savingChanges = true; + this.subscriptions.push(this.communitiesService.getCommunities(this.properties, this.properties.communityAPI + 'communities').subscribe( + communities => { + communities.forEach(community => { + this._clearCacheService.clearCacheInRoute("Clear cache for "+ community.communityId, community.communityId, this.route ? this.route : "/") + }); + this.savingChanges = false; + } + )); + } + } } 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 e71b328..9fe6cae 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -87,6 +87,7 @@ export class RemoveContentProvidersComponent implements OnInit { let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); this.communityContentProviders.splice(index, 1); this.applyFilters(); + this._clearCacheService.clearCacheInRoute(this.openAIREEntities.DATASOURCE+" removed", this.community.communityId) this._clearCacheService.purgeBrowserCache(this.openAIREEntities.DATASOURCE+" removed", this.community.communityId); this.handleSuccess(this.openAIREEntities.DATASOURCE + ' successfully removed!') this.communityContentProvidersChanged.emit({ diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index 7bf8162..d2c9c54 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -123,6 +123,7 @@ export class AddProjectsComponent implements OnInit { this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe( data => { // this.communityProjects.push(data); + this._clearCacheService.clearCacheInRoute(this.openaireEntities.PROJECT+" added", this.community.communityId); this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" added", this.community.communityId); UIkit.notification(this.openaireEntities.PROJECT+' successfully added!', { diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index c930aef..b25cdea 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -131,7 +131,7 @@ 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 => { - + this._clearCacheService.clearCacheInRoute(this.openaireEntiites.PROJECT+" removed", this.community.communityId); this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId); NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null); diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts index aa852a0..415d749 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts @@ -344,6 +344,7 @@ export class SubjectsEditFormComponent implements OnInit { } }); this._communityService.updateSubjects(this.community.subjects, this.community.fos, this.community.sdg); + this._clearCacheService.clearCacheInRoute("Subjects " + message, this.communityId); this._clearCacheService.purgeBrowserCache("Subjects " + message, this.communityId); NotificationHandler.rise('Subjects successfully ' + message + '!') this.loading = false; -- 2.17.1 From 99e8f727b0b248346427e6bc0c7ffb8dc7e4d70f Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 3 Apr 2024 10:27:15 +0300 Subject: [PATCH 17/32] [plugins-functionality | WIP ] add properties for stats --- src/environments/environment.beta.ts | 4 ++-- src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index a4f0b30..5aec082 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -5,8 +5,8 @@ let props: EnvProperties = { isDashboard: true, enablePiwikTrack: false, useCache: false, - domain:'https://beta.admin.connect.openaire.eu' - + domain:'https://beta.admin.connect.openaire.eu', + monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/" }; export let properties: EnvProperties = { diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index aaa4c1f..a326b5b 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -7,6 +7,7 @@ let props: EnvProperties = { enablePiwikTrack: false, useCache: false, domain:'https://admin.connect.openaire.eu', + monitorStatsFrameUrl:"https://services.openaire.eu/stats-tool/" }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2b8c4dd..2c5579f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,7 +14,10 @@ let props: EnvProperties = { connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200', domain:'https://beta.admin.connect.openaire.eu', adminToolsAPIURL: 'http://scoobydoo.di.uoa.gr:8880/uoa-admin-tools/', + utilsService: "http://scoobydoo.di.uoa.gr:8000", + monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/", + // disableFrameLoad : true }; export let properties: EnvProperties = { -- 2.17.1 From 30def2150b236635009f98461fd505e9ad170515 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 9 Apr 2024 13:03:27 +0300 Subject: [PATCH 18/32] [plugins-functionality | DONE | CHANGED ] Criteria utils: rename description label to abstract --- 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 9689203..6637eb5 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -7,7 +7,7 @@ export class CriteriaUtils { {value: 'title', label: 'Title'}, {value: 'orcid', label: 'Author\'s ORCID'}, {value: 'contributor', label: 'Contributor'}, - {value: 'description', label: 'Description'}, + {value: 'description', label: 'Abstract'}, {value: 'subject', label: 'Subject'}, {value: 'fos', label: 'Field of Science'}, {value: 'sdg', label: 'SDG'}, -- 2.17.1 From ba0bfeb3568495794cfe91b7e6ed7bbc655029d1 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 22 Apr 2024 10:45:50 +0300 Subject: [PATCH 19/32] [plugins-functionality | DONE | FIXED ] Criteria utils: allow short (3 criteria) or full version (for advanced criteria page) --- .../pages/advanced-criteria/advanced-criteria.component.ts | 2 +- src/app/pages/content-providers/criteria-utils.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/advanced-criteria/advanced-criteria.component.ts b/src/app/pages/advanced-criteria/advanced-criteria.component.ts index 01366f6..e7dd57c 100644 --- a/src/app/pages/advanced-criteria/advanced-criteria.component.ts +++ b/src/app/pages/advanced-criteria/advanced-criteria.component.ts @@ -36,7 +36,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
Criteria
-
+
No criteria yet
diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index 6637eb5..e069da3 100644 --- a/src/app/pages/content-providers/criteria-utils.ts +++ b/src/app/pages/content-providers/criteria-utils.ts @@ -28,8 +28,8 @@ export class CriteriaUtils { {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 => { + public getFiltersAsText(criteria: Criteria[], shortVersion=true): string { + let text = criteria.slice(0, shortVersion?3:criteria.length).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => { let field = this.fields.find(field => field.value === constraint.field)?.label; let matchCase = false; if (!constraint.verb.includes('_caseinsensitive')) { -- 2.17.1 From c7ce678915b026c6713f582683f917824f00f70b Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 25 Apr 2024 14:30:46 +0300 Subject: [PATCH 20/32] [plugins-functionality | DONE | FIXED ] add content providers: fix upper/lower case --- .../content-providers/add-content-providers.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/content-providers/add-content-providers.component.html b/src/app/pages/content-providers/add-content-providers.component.html index fa96943..a9f23a9 100644 --- a/src/app/pages/content-providers/add-content-providers.component.html +++ b/src/app/pages/content-providers/add-content-providers.component.html @@ -45,9 +45,9 @@ -- 2.17.1 From 488ac615d4ddb33c51fa0e8fb73343ba94e6b49b Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 14 May 2024 14:49:59 +0300 Subject: [PATCH 21/32] [plugins-functionality | DONE | ADDED ] add display title and shortitle and use them instead of title/ short title --- .../edit-community.component.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 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 dbfea03..a488aaa 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 @@ -20,11 +20,19 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
+ placeholder="Index name of the community.">
+ placeholder="Index short name of the community.">
+
+
+
+
+
+
Description of the community
@@ -153,6 +161,8 @@ export class EditCommunityComponent { communityId: this.fb.control(this.community.communityId), name: this.fb.control(this.community.title, Validators.required), shortName: this.fb.control(this.community.shortTitle, Validators.required), + displayName: this.fb.control(this.community.title, Validators.required), + displayShortName: 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), @@ -182,6 +192,7 @@ export class EditCommunityComponent { if (!this.isAdmin) { setTimeout(() => { this.communityFb.get('shortName').disable(); + this.communityFb.get('name').disable(); }, 0); } } @@ -190,9 +201,9 @@ export class EditCommunityComponent { } public get isAdmin() { - return Session.isPortalAdministrator(this.user); + return Session.isPortalAdministrator(this.user) || Session.isCommunityCurator(this.user); } - + public get disabled(): boolean { return (this.communityFb && this.communityFb.invalid) || (this.communityFb && this.communityFb.pristine && !this.isNew && !this.file) || -- 2.17.1 From 37f8c737203516d78ec2451633d861a4f0fccdab Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 16 May 2024 15:00:09 +0300 Subject: [PATCH 22/32] [plugins-functionality | DONE | CHANGED ] allow add/remove main zenodo community --- .../add-zenodo-communities.component.html | 25 ++- .../add-zenodo-communities.component.ts | 75 ++++--- .../manage-zenodo-communities.component.ts | 162 --------------- ...html => zenodo-communities.component.html} | 29 ++- .../zenodo-communities.component.ts | 191 +++++++++++++++--- .../zenodo-communities.module.ts | 3 +- 6 files changed, 258 insertions(+), 227 deletions(-) delete mode 100644 src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts rename src/app/pages/zenodo-communities/{manage-zenodo-communities.component.html => zenodo-communities.component.html} (73%) diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html index 140d89d..2e8dc8f 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html @@ -22,7 +22,7 @@
-
+
@@ -34,7 +34,17 @@
-
@@ -56,4 +75,4 @@
-
\ No newline at end of file +
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 129b9dd..7e1ff08 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts @@ -11,6 +11,7 @@ import {Subject, Subscription} from 'rxjs'; import {debounceTime, distinctUntilChanged} from 'rxjs/operators'; import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; +import {CommunityService} from "../../openaireLibrary/connect/community/community.service"; declare var UIkit; @@ -141,7 +142,8 @@ export class AddZenodoCommunitiesComponent implements OnInit { pos: 'bottom-right' }); this.zenodoCommunitiesChanged.emit({ - value: this.selectedCommunities, + communities: this.selectedCommunities, + main:this.masterCommunity }); }, err => { @@ -150,30 +152,36 @@ export class AddZenodoCommunitiesComponent implements OnInit { } )); } - - public removeCommunity(comm) { + public updateMasterCommunity(community, add=true) { + this.subscriptions.push(this._manageZenodoCommunitiesService.updateMasterZCommunity(this.properties ,this.community.communityId,community?community.id:"").subscribe( + data => { + let comm = Object.assign({}, this.masterCommunity) + this.masterCommunity = community; + if(!add){ + this.afterRemoveActions(comm) + }else { + UIkit.notification('Community successfully added', { + status: 'success', + timeout: 6000, + pos: 'bottom-right' + }); + this.zenodoCommunitiesChanged.emit({ + communities: this.selectedCommunities, + main: this.masterCommunity + }); + } + }, + err => { + this.handleError('An error has been occurred. Try again later!'); + console.log(err.status); + } + )); + } + public removeCommunity(comm, master:boolean = false) { var openaireId = this.getOpenaireId(comm); this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, openaireId,).subscribe( data => { - var pos = -1; - for (var i = 0; i < this.selectedCommunities.length; i++) { - if (this.selectedCommunities[i].id == comm.id) { - pos = i; - break; - } - } - if (pos != -1) { - this.selectedCommunities.splice(pos, 1); - } - - UIkit.notification('Community successfully removed!', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - this.zenodoCommunitiesChanged.emit({ - value: this.selectedCommunities, - }); + this.afterRemoveActions(comm); }, err => { this.handleError('An error has been occurred. Try again later!'); @@ -181,7 +189,28 @@ export class AddZenodoCommunitiesComponent implements OnInit { } )); } - + afterRemoveActions(comm){ + var pos = -1; + for (var i = 0; i < this.selectedCommunities.length; i++) { + if (this.selectedCommunities[i].id == comm.id) { + pos = i; + break; + } + } + if (pos != -1) { + this.selectedCommunities.splice(pos, 1); + } + + UIkit.notification('Community successfully removed!', { + status: 'success', + timeout: 6000, + pos: 'bottom-right' + }); + this.zenodoCommunitiesChanged.emit({ + communities: this.selectedCommunities, + main:this.masterCommunity + }); + } public inThelist(community: any, list): any { for (let com of list) { if (com.id == community.id) { diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts deleted file mode 100644 index ee68bf6..0000000 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { - ChangeDetectorRef, - Component, - EventEmitter, - Input, - OnDestroy, - OnInit, - Output, SimpleChanges, - ViewChild, - ViewEncapsulation -} from '@angular/core'; -import {UntypedFormBuilder, UntypedFormControl} from '@angular/forms'; -import {ActivatedRoute, Router} from '@angular/router'; -import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; -import {properties} from "../../../environments/environment"; -import {ErrorCodes} from '../../openaireLibrary/utils/properties/errorCodes'; -import {SearchUtilsClass} from '../../openaireLibrary/searchPages/searchUtils/searchUtils.class'; -import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service'; -import {SearchInputComponent} from '../../openaireLibrary/sharedComponents/search-input/search-input.component'; -import {Subscription} from 'rxjs'; -import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; -import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; -import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; - -@Component({ - selector: 'manage-zenodo-communities', - templateUrl: './manage-zenodo-communities.component.html' -}) -export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { - properties: EnvProperties = properties; - @Input() community: CommunityInfo = null; - @Input() public loading: boolean = true; - @Input() searchUtils: SearchUtilsClass = null; - errorCodes: ErrorCodes; - public rowsOnPage = 10; - @Input() masterCommunity; - @Input() selectedCommunities; - previewCommunities = []; - @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity; - selectedToDelete = null; - @Output() addZenodoCommunity: EventEmitter = new EventEmitter(); - @Output() zenodoCommunitiesChanged = new EventEmitter(); - page = 1; - size = 10; - @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent; - public filterForm: UntypedFormControl; - private subscriptions: any[] = []; - - constructor(private route: ActivatedRoute, - private _router: Router, - public _fb: UntypedFormBuilder, - private cdr: ChangeDetectorRef, - private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) { - this.errorCodes = new ErrorCodes(); - } - - ngOnInit() { - this.init(); - } - - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscription) { - subscription.unsubscribe(); - } - }); - } - - private init() { - console.log(this.selectedCommunities.length) - this.filterForm = this._fb.control(''); - this.filterPreviewCommunities(""); - this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => { - this.page = 1; - this.filterPreviewCommunities(value); - })); - 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(); - } - - public confirmedDeleteCommunity(data: any) { - 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++) { - if (this.selectedCommunities[i].id == this.selectedToDelete.id) { - pos = i; - break; - } - } - if (pos != -1) { - this.selectedCommunities.splice(pos, 1); - this.searchUtils.totalResults = this.selectedCommunities.length; - } - this.searchUtils.totalResults = this.selectedCommunities.length; - this.filterPreviewCommunities(this.filterForm.value); - NotificationHandler.rise('Community has been successfully removed!') - this.zenodoCommunitiesChanged.emit({ - value: this.selectedCommunities, - }); - }, - err => { - this.handleError('An error has been occurred. Try again later!'); - console.log(err.status); - } - )); - } - - public removeCommunity(comm) { - this.selectedToDelete = comm; - this.alertModalDeleteCommunity.cancelButton = true; - this.alertModalDeleteCommunity.okButton = true; - this.alertModalDeleteCommunity.alertTitle = "Remove zenodo community"; - let title = ""; - if (comm.title) { - title = comm.title; - } - - this.alertModalDeleteCommunity.message = "Zenodo community"; - if (title) { - this.alertModalDeleteCommunity.message += " '" + title + "' "; - } - this.alertModalDeleteCommunity.message += "will be removed from your community. Are you sure?"; - this.alertModalDeleteCommunity.okButtonText = "Yes"; - this.alertModalDeleteCommunity.open(); - } - - - totalPages(): number { - let totalPages: any = this.searchUtils.totalResults / (this.rowsOnPage); - if (!(Number.isInteger(totalPages))) { - totalPages = (parseInt(totalPages, 10) + 1); - } - return totalPages; - } - - public updatePage($event) { - HelperFunctions.scroll(); - this.page = $event.value; - } - - addNew() { - this.addZenodoCommunity.emit(); - } - - handleError(message: string) { - NotificationHandler.rise(message, 'danger'); - } -} diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html b/src/app/pages/zenodo-communities/zenodo-communities.component.html similarity index 73% rename from src/app/pages/zenodo-communities/manage-zenodo-communities.component.html rename to src/app/pages/zenodo-communities/zenodo-communities.component.html index 5bf8d9d..6cb14cc 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.html @@ -1,4 +1,4 @@ -
+
@@ -6,7 +6,7 @@ placeholder="Search Zenodo Community" [disabled]="searchUtils.status === errorCodes.LOADING" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1">
-
-
-
-
-
-
+ + + @@ -87,7 +94,7 @@ - diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 9b6c8e0..2e1d830 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -57,6 +57,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { size = 10; @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent; public filterForm: UntypedFormControl; + deleteMaster = false; constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title, private _communityService: CommunityService, @@ -68,32 +69,27 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { ngOnInit() { this.searchUtils.status = this.errorCodes.LOADING; this.properties = properties; - - this.subscriptions.push(this._communityService.getCommunityAsObservable().subscribe( - community => { - this.community = community; - this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Zenodo Communities'); - this.masterZenodoCommunityId = this.community.zenodoCommunity; - this.selectedCommunities = []; - - this.searchUtils.status = this.errorCodes.LOADING; - - this.selectedCommunityIds = this.community.otherZenodoCommunities; - if(this.masterZenodoCommunityId){ - this.selectedCommunityIds.unshift(this.masterZenodoCommunityId) - } - this.searchUtils.totalResults = this.selectedCommunityIds.length; - if (this.selectedCommunityIds.length === 0) { - this.searchUtils.status = this.errorCodes.NONE; - } - for (let i = 0; i < this.selectedCommunityIds.length; i++) { - this.getZenodoCommunityById( - this.selectedCommunityIds[i]); - } - this.init(); - }) - ); - + this.subscriptions.push(this.route.params.subscribe(params => { + //use this method to ensure that get the lattest version of the community and the updated information for the list of zenodo communities + this.subscriptions.push(this._communityService.getCommunity(params['community'],true).subscribe( + community => { + this.community = community; + this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Zenodo Communities'); + this.masterZenodoCommunityId = this.community.zenodoCommunity; + this.selectedCommunities = []; + this.searchUtils.status = this.errorCodes.LOADING; + this.selectedCommunityIds = this.community.otherZenodoCommunities; + this.searchUtils.totalResults = this.selectedCommunityIds.length; + if (this.selectedCommunityIds.length === 0) { + this.searchUtils.status = this.errorCodes.NONE; + } + for (let i = 0; i < this.selectedCommunityIds.length; i++) { + this.getZenodoCommunityById(this.selectedCommunityIds[i]); + } + this.init(); + }) + ); + })); this.fullscreen.title = "Search and Add Zenodo Communities"; this.fullscreen.okButtonText = "Done"; this.fullscreen.okButton = true; @@ -162,7 +158,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.filterPreviewCommunities(this.searchUtils.keyword); } private init() { - console.log(this.selectedCommunities.length) this.filterForm = this._fb.control(''); this.filterPreviewCommunities(""); this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => { @@ -171,7 +166,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { })); this.searchUtils.keyword = ""; this.searchUtils.totalResults = this.selectedCommunities.length; - console.log(this.selectedCommunities.length, this.previewCommunities.length) } public filterPreviewCommunities(value: string) { @@ -185,30 +179,45 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } public confirmedDeleteCommunity(data: any) { - this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe( - data => { - this.afterRemoveActions(); - } - )); + if(this.deleteMaster){ + this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, this.selectedToDelete.id, true).subscribe( + data => { + this.afterRemoveActions(); + } + )); + }else { + this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe( + data => { + this.afterRemoveActions(); + } + )); + } } afterRemoveActions(){ - var pos = -1; - for (var i = 0; i < this.selectedCommunities.length; i++) { - if (this.selectedCommunities[i].id == this.selectedToDelete.id) { - pos = i; - break; + if(this.deleteMaster){ + this.masterCommunity = null; + this.masterZenodoCommunityId = null + NotificationHandler.rise('Community has been removed from master!') + }else { + var pos = -1; + for (var i = 0; i < this.selectedCommunities.length; i++) { + if (this.selectedCommunities[i].id == this.selectedToDelete.id) { + pos = i; + break; + } + } + if (pos != -1) { + this.selectedCommunities.splice(pos, 1); + this.selectedCommunityIds.splice(pos,1) + this.searchUtils.totalResults = this.selectedCommunities.length; } - } - if (pos != -1) { - this.selectedCommunities.splice(pos, 1); this.searchUtils.totalResults = this.selectedCommunities.length; + this.filterPreviewCommunities(this.filterForm.value); + NotificationHandler.rise('Community has been successfully removed!') } - this.searchUtils.totalResults = this.selectedCommunities.length; - this.filterPreviewCommunities(this.filterForm.value); - NotificationHandler.rise('Community has been successfully removed!') - } public removeCommunity(comm) { + this.deleteMaster = false; this.selectedToDelete = comm; this.alertModalDeleteCommunity.cancelButton = true; this.alertModalDeleteCommunity.okButton = true; @@ -227,6 +236,26 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.alertModalDeleteCommunity.open(); } + public removeFromMasterCommunity(comm) { + this.deleteMaster = true; + this.selectedToDelete = comm; + this.alertModalDeleteCommunity.cancelButton = true; + this.alertModalDeleteCommunity.okButton = true; + this.alertModalDeleteCommunity.alertTitle = "Remove master zenodo community"; + let title = ""; + if (comm.title) { + title = comm.title; + } + + this.alertModalDeleteCommunity.message = "Zenodo community"; + if (title) { + this.alertModalDeleteCommunity.message += " '" + title + "' "; + } + this.alertModalDeleteCommunity.message += "will be removed as master from your community, but will remain in the list of the related communities. Do you want to proceed?"; + this.alertModalDeleteCommunity.okButtonText = "Yes"; + this.alertModalDeleteCommunity.open(); + } + totalPages(): number { let totalPages: any = this.searchUtils.totalResults / (this.rowsOnPage); @@ -248,19 +277,11 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { handleError(message: string) { NotificationHandler.rise(message, 'danger'); } - public updateMasterCommunity() { - this.subscriptions.push(this._manageZenodoCommunitiesService.updateMasterZCommunity(this.properties ,this.community.communityId,"").subscribe( + public addAsMasterCommunity(community) { + this.subscriptions.push(this._manageZenodoCommunitiesService.addZenodoCommunity(this.properties ,this.community.communityId,community.id, true).subscribe( data => { - this.selectedToDelete = this.masterCommunity; - this.masterCommunity = null; - this.masterZenodoCommunityId = null - this.afterRemoveActions(); - /* UIkit.notification('Community successfully ' + (community?'added!':'removed!'), { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - });*/ - + this.masterCommunity = community; + this.masterZenodoCommunityId = community.id }, err => { this.handleError('An error has been occurred. Try again later!'); @@ -268,4 +289,5 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } )); } + } diff --git a/src/app/pages/zenodo-communities/zenodo-communities.module.ts b/src/app/pages/zenodo-communities/zenodo-communities.module.ts index 10effa3..0dd1db1 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.module.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.module.ts @@ -17,11 +17,12 @@ import {PageContentModule} from '../../openaireLibrary/dashboard/sharedComponent import {FullScreenModalModule} from '../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module'; import {HTMLToStringPipeModule} from '../../openaireLibrary/utils/pipes/HTMLToStringPipe.module'; import {PagingModule} from "../../openaireLibrary/utils/paging.module"; +import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule, - AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule + AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule, ValidateEnabledPageModule ], declarations: [ ZenodoCommunitiesComponent, AddZenodoCommunitiesComponent, PreviewZenodoCommunityComponent diff --git a/src/app/services/manageZenodoCommunities.service.ts b/src/app/services/manageZenodoCommunities.service.ts index 441cddf..0ad555d 100644 --- a/src/app/services/manageZenodoCommunities.service.ts +++ b/src/app/services/manageZenodoCommunities.service.ts @@ -5,42 +5,25 @@ import{EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; @Injectable() export class ManageZenodoCommunitiesService { constructor(private http: HttpClient ) {} - - removeZCommunity (properties: EnvProperties, pid: string,id: string):any { - //let headers = new Headers({'Content-Type': 'application/json', 'accept': 'application/json'}); - //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?zenodocommunity="+id; - - //return this.http.delete(url, options); - return this.http.request('delete', url, { headers: headers}) - } - - addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) { - //let headers = new Headers({'Content-Type': 'application/json'}); - //let options = new RequestOptions({headers: headers}); - - let headers = new HttpHeaders({'Content-Type': 'application/json'}); - - let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid; - - return this.http.post(url, headers); - //.map(res => res.json()) - } - - - updateMasterZCommunity(properties:EnvProperties, pid: string,zenodoid: string) { + removeZenodoCommunity(properties:EnvProperties, pid: string,zenodoid: string, main:boolean = false) { const options = { headers: new HttpHeaders({ 'Content-Type': 'application/json', }) }; - let url = properties.communityAPI+pid; + let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid + "&main=" + main; + return this.http.delete(url, options); + } + addZenodoCommunity(properties:EnvProperties, pid: string,zenodoid: string, main:boolean = false) { - return this.http.post(url, {mainZenodoCommunity:zenodoid}, options); - //.map(res => res.json()) + const options = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + }) + }; + let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid + "&main=" + main; + return this.http.post(url, options); } } -- 2.17.1 From 4a4d02d872941fe0a66b92b9a6c0900fe5974372 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 11 Jun 2024 12:19:53 +0300 Subject: [PATCH 30/32] [plugins-functionality | DONE | FIXED ] initialize properly display names in the form --- .../profile/edit-community/edit-community.component.ts | 4 ++-- 1 file changed, 2 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 a488aaa..36eb7ad 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 @@ -161,8 +161,8 @@ export class EditCommunityComponent { communityId: this.fb.control(this.community.communityId), name: this.fb.control(this.community.title, Validators.required), shortName: this.fb.control(this.community.shortTitle, Validators.required), - displayName: this.fb.control(this.community.title, Validators.required), - displayShortName: this.fb.control(this.community.shortTitle, Validators.required), + displayName: this.fb.control(this.community.displayTitle, Validators.required), + displayShortName: this.fb.control(this.community.displayShortTitle, Validators.required), description: this.fb.control(this.community.description), status: this.fb.control(this.community.status), claim: this.fb.control(this.community.claim), -- 2.17.1 From f03273f40ca50e2296c7d65256b96d5e3bafd249 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 11 Jun 2024 14:10:48 +0300 Subject: [PATCH 31/32] [plugins-functionality | DONE | Changed ] fix loading when as content source is unselected --- .../content-providers/manage-content-providers.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index 50dcae4..88fab9d 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -35,6 +35,7 @@ import {UntypedFormBuilder} from "@angular/forms";
+
{{dataProvider.officialname}}
@@ -45,7 +46,7 @@ import {UntypedFormBuilder} from "@angular/forms";
-
+
Content filters
@@ -153,6 +154,7 @@ export class ManageContentProvidersComponent implements OnInit { this.dataProvider.deposit = this.deposit; this.dataProvider.message = this.message; this.dataProvider.enabled = this.enabled; + console.log(this.dataProvider) this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.criteria.reset(); this.removeContentProvidersComponent.getCommunityContentProviders(); @@ -164,6 +166,7 @@ export class ManageContentProvidersComponent implements OnInit { }); } this.removeContentProvidersComponent.loading = true; + console.log() this.criteria.save(callback); } -- 2.17.1 From a59f96cdad81153c10b42ee075d3f835f6a2de59 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 11 Jun 2024 14:11:30 +0300 Subject: [PATCH 32/32] [plugins-functionality | DONE | Changed ] rename master to main --- .../zenodo-communities/add-zenodo-communities.component.html | 2 +- .../zenodo-communities/zenodo-communities.component.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html index 54e675f..5774580 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html @@ -38,7 +38,7 @@ - Remove as master + Remove as Main
diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.html b/src/app/pages/zenodo-communities/zenodo-communities.component.html index 6172b92..b39478f 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.html @@ -61,7 +61,7 @@ - Remove as master + Remove as Main
@@ -70,7 +70,7 @@ - Add as master + Add as Main
-- 2.17.1