diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3aff9ee..e5a9884 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 +Subproject commit e5a98845a76ffdaeeceaa7bd87f14fc427c7df29 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..fa8b075 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,16 @@ 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', data: {hasInternalSidebar: false, hasHeader: false} + }, + { + path: 'plugins/edit', + loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins-form/pluginsForm.module').then(m => m.PluginsFormModule), + pathMatch: 'full', data: {hasInternalSidebar: true, hasHeader: false} + }, { path: 'pages', loadChildren: () => import('../../openaireLibrary/dashboard/page/pages.module').then(m => m.PagesModule), 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..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 @@ -5,7 +5,9 @@ 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)}, + {path: 'templates/plugins', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule)}, ])] }) export class PortalAdminToolsRoutingModule { 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/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html index ccfdef9..4570444 100644 --- a/src/app/pages/affiliations/affiliations.component.html +++ b/src/app/pages/affiliations/affiliations.component.html @@ -2,10 +2,6 @@
- +
- - +
+
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/add-content-providers.component.html b/src/app/pages/content-providers/add-content-providers.component.html index 5c064b6..a9f23a9 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 @@
- + Add +
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/communityContentProviders.module.ts b/src/app/pages/content-providers/communityContentProviders.module.ts index 4a0708e..2de48bb 100644 --- a/src/app/pages/content-providers/communityContentProviders.module.ts +++ b/src/app/pages/content-providers/communityContentProviders.module.ts @@ -28,6 +28,9 @@ 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"; +import {CKEditorModule} from "ng2-ckeditor"; +import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module"; @NgModule({ imports: [ @@ -48,7 +51,7 @@ import {CriteriaModule} from "./criteria/criteria.module"; path: '', component: ManageContentProvidersComponent } ]), - NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule + NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule, MatSlideToggleModule, CKEditorModule, ReactiveFormsModule, ValidateEnabledPageModule ], declarations: [ ManageContentProvidersComponent, diff --git a/src/app/pages/content-providers/criteria-utils.ts b/src/app/pages/content-providers/criteria-utils.ts index c8eee7d..e069da3 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'}, @@ -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')) { @@ -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..21e26fd 100644 --- a/src/app/pages/content-providers/criteria/criteria.component.html +++ b/src/app/pages/content-providers/criteria/criteria.component.html @@ -1,4 +1,4 @@ -
+
@@ -32,6 +32,8 @@
+ experimental feature
+ experimental feature
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..88fab9d 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, OnInit, SimpleChanges, ViewChild} from '@angular/core'; import {RemoveContentProvidersComponent} from './remove-content-providers.component'; import {Title} from '@angular/platform-browser'; import { @@ -15,6 +15,7 @@ import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFie import {CriteriaComponent} from "./criteria/criteria.component"; import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service"; +import {UntypedFormBuilder} from "@angular/forms"; @Component({ selector: 'manage-content-providers', @@ -23,6 +24,7 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [communityContentProviders]="communityContentProviders" [loading]="showLoadingInRemove" [community]="community" (editCriteria)="openCriteria($event)" + (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> @@ -30,10 +32,23 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [community]="community" (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> - +
- {{dataProvider.officialname}}
+
+
+ + +
+
+ + +
+
+
+
Content filters
+
No Filters for {{dataProvider.officialname}} yet
@@ -42,6 +57,24 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
+
+
+ + +
Type a message or instruction for researchers about deposition in this datasource
+ + +
` @@ -53,6 +86,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,11 +94,16 @@ export class ManageContentProvidersComponent implements OnInit { public openaireEntities = OpenaireEntities; public community: CommunityInfo; public dataProvider: ContentProvider; - + message = ""; + deposit= false; + enabled = false; + depositInfoChanged =false; + messageForm = this.fb.control(""); constructor(private title: Title, private cdr: ChangeDetectorRef, private communityService: CommunityService, - private manageCommunityContentProvidersService: ManageCommunityContentProvidersService) { + private manageCommunityContentProvidersService: ManageCommunityContentProvidersService, + private fb: UntypedFormBuilder) { } ngOnInit() { @@ -96,17 +135,26 @@ 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.messageForm = this.fb.control(this.message); + 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(); } - 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; + console.log(this.dataProvider) this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.criteria.reset(); this.removeContentProvidersComponent.getCommunityContentProviders(); @@ -118,6 +166,7 @@ export class ManageContentProvidersComponent implements OnInit { }); } this.removeContentProvidersComponent.loading = true; + console.log() this.criteria.save(callback); } @@ -128,4 +177,17 @@ export class ManageContentProvidersComponent implements OnInit { this.removeContentProvidersComponent.applyFilters(); } } + + + depositReset(){ + this.message = this.dataProvider.message; + this.messageForm.setValue(this.message); + this.deposit = this.dataProvider.deposit; + this.enabled = this.dataProvider.enabled; + } + + messageChanged(){ + this.message = this.messageForm.value; + this.depositInfoChanged = true; + } } 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..04dc383 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -22,6 +22,8 @@
+ +
No {{openAIREEntities.DATASOURCES}} @@ -54,7 +56,13 @@ [no title available] -
+
Content source
+
Suggested for deposit
+
+
Deposit info:
+
+
+
Filters
@@ -64,18 +72,24 @@
+
+
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..9fe6cae 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -49,7 +49,7 @@ export class RemoveContentProvidersComponent implements OnInit { public keyword: string = ''; @Output() addContentProviders: EventEmitter = new EventEmitter(); @Output() editCriteria: EventEmitter = new EventEmitter(); - + constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService, @@ -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({ @@ -183,4 +184,5 @@ export class RemoveContentProvidersComponent implements OnInit { openCriteria(contentProvider: ContentProvider) { this.editCriteria.emit(contentProvider); } + } 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')+'
'" > 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/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/communityProjects.module.ts b/src/app/pages/projects/communityProjects.module.ts index feb9438..1aee98a 100644 --- a/src/app/pages/projects/communityProjects.module.ts +++ b/src/app/pages/projects/communityProjects.module.ts @@ -24,6 +24,7 @@ import {ResultPreviewModule} from "../../openaireLibrary/utils/result-preview/re import {ErrorMessagesModule} from "../../openaireLibrary/utils/errorMessages.module"; import {DropdownFilterModule} from "../../openaireLibrary/utils/dropdown-filter/dropdown-filter.module"; import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/searchFilter.module"; +import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module"; @NgModule({ imports: [ @@ -44,7 +45,7 @@ import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/ path: '', component: ManageProjectsComponent } ]), - NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, DropdownFilterModule, SearchFilterModule + NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, DropdownFilterModule, SearchFilterModule, ValidateEnabledPageModule ], declarations: [ ManageProjectsComponent, diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index ce7d1ab..2c28e11 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -67,6 +67,7 @@
+
{ - + 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.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html index 07ba4cb..e144c85 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html @@ -21,6 +21,7 @@
+
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; diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts index 088a3d2..edbb502 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts @@ -18,12 +18,13 @@ import {FullScreenModalModule} from 'src/app/openaireLibrary/utils/modal/full-sc import {PagingModule} from "../../../openaireLibrary/utils/paging.module"; import {SdgSelectionModule} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.module'; import {FosSelectionModule} from '../../../openaireLibrary/fos/fos-selection/fos-selection.module'; +import {ValidateEnabledPageModule} from "../../../utils/validateEnabledPage.module"; @NgModule({ imports: [ SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule, PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule, - SearchInputModule, FullScreenModalModule, PagingModule, SdgSelectionModule, FosSelectionModule + SearchInputModule, FullScreenModalModule, PagingModule, SdgSelectionModule, FosSelectionModule, ValidateEnabledPageModule ], declarations: [ SubjectsEditFormComponent 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..5774580 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html @@ -22,9 +22,27 @@
-
+
-
@@ -56,4 +76,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..b29675e 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,8 @@ 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"; +import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; declare var UIkit; @@ -39,7 +41,8 @@ export class AddZenodoCommunitiesComponent implements OnInit { private _router: Router, public _fb: UntypedFormBuilder, private _zenodoCommunitieService: ZenodoCommunitiesService, - private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) { + private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService, + private _communityService: CommunityService) { this.errorCodes = new ErrorCodes(); this.zenodoCommunitySearchUtils.status = this.errorCodes.LOADING; @@ -130,18 +133,26 @@ export class AddZenodoCommunitiesComponent implements OnInit { } - public addCommunity(community) { - this.subscriptions.push(this._manageZenodoCommunitiesService.addZCommunity(this.properties, this.community.communityId, community.id).subscribe( + public addCommunity(community, master:boolean = false) { + if(master && this.getPosition(community) == -1 ){ + this.addCommunity(community, false); + } + this.subscriptions.push(this._manageZenodoCommunitiesService.addZenodoCommunity(this.properties, this.community.communityId, community.id, master).subscribe( data => { - community["openaireId"] = data.id; - this.selectedCommunities.push(community); - UIkit.notification('Community successfully added!', { + // this._communityService.setCommunity(this._communityService.parseCommunity(data)); + if(master){ + this.masterCommunity = community; + }else { + this.selectedCommunities.push(community); + } + UIkit.notification('Community successfully added' + (master?" as master!":"!"), { status: 'success', timeout: 6000, pos: 'bottom-right' }); this.zenodoCommunitiesChanged.emit({ - value: this.selectedCommunities, + communities: this.selectedCommunities, + main:this.masterCommunity }); }, err => { @@ -150,30 +161,12 @@ export class AddZenodoCommunitiesComponent implements OnInit { } )); } - - public removeCommunity(comm) { - 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, - }); + public removeCommunity(comm, master:boolean = false) { + var openaireId = this.getOpenaireId(comm); + this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, openaireId, master).subscribe( + data => { + this.afterRemoveActions(comm, master); }, err => { this.handleError('An error has been occurred. Try again later!'); @@ -181,7 +174,32 @@ export class AddZenodoCommunitiesComponent implements OnInit { } )); } - + getPosition(comm){ + var pos = -1; + for (var i = 0; i < this.selectedCommunities.length; i++) { + if (this.selectedCommunities[i].id == comm.id) { + pos = i; + break; + } + } + return pos; + } + afterRemoveActions(comm, master:boolean = false){ + if(master){ + this.masterCommunity = null; + NotificationHandler.rise('Community has been removed from master!') + }else { + var pos = this.getPosition(comm) + if (pos != -1) { + this.selectedCommunities.splice(pos, 1); + } + } + NotificationHandler.rise('Community has been removed!') + 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 205e18c..0000000 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { - ChangeDetectorRef, - Component, - EventEmitter, - Input, - OnDestroy, - OnInit, - Output, - 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 = null; - @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() { - 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; - } - - public filterPreviewCommunities(value: string) { - this.previewCommunities = this.selectedCommunities.filter(community => { - return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1 - }); - if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) { - this.page = 1; - } - 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/preview-z-community.component.ts b/src/app/pages/zenodo-communities/preview-z-community.component.ts index eade205..235650b 100644 --- a/src/app/pages/zenodo-communities/preview-z-community.component.ts +++ b/src/app/pages/zenodo-communities/preview-z-community.component.ts @@ -8,7 +8,7 @@ import {Component, Input} from '@angular/core'; {{item.title}} + alt="">
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 65% 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..b39478f 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">
-
+
@@ -36,16 +37,16 @@ [page]="page" [pageSize]="size" [totalResults]="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 54080c3..2e1d830 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -1,4 +1,14 @@ -import {Component, ElementRef, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import { + ChangeDetectorRef, + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + ViewChild +} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; @@ -12,97 +22,79 @@ import {Title} from '@angular/platform-browser'; import {properties} from '../../../environments/environment'; import {Subscription} from 'rxjs'; import {FullScreenModalComponent} from '../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component'; -import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component'; +import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; +import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; +import {SearchInputComponent} from "../../openaireLibrary/sharedComponents/search-input/search-input.component"; +import {UntypedFormBuilder, UntypedFormControl} from "@angular/forms"; +import {ManageZenodoCommunitiesService} from "../../services/manageZenodoCommunities.service"; @Component({ selector: 'zenodo-communities', - template: ` - - - - - ` + templateUrl: 'zenodo-communities.component.html' }) export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { public community: CommunityInfo = null; public toggle = false; public pageTitle = 'Manage zenodo communities'; masterZenodoCommunityId = null; - masterZenodoCommunity = null; + masterCommunity = null; public properties: EnvProperties = null; selectedCommunityIds = null; - selectedCommunities = []; + selectedCommunities = null; zenodocommunitiesloadedCount = 0; - zenodoSearchUtils: SearchUtilsClass = new SearchUtilsClass(); public errorCodes: ErrorCodes = new ErrorCodes(); subscriptions = []; - @ViewChild('fsModal', { static: true }) fullscreen: FullScreenModalComponent; - @ViewChild(ManageZenodoCommunitiesComponent) manage: ManageZenodoCommunitiesComponent; + @ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent; public showLoadingInRemove: boolean = true; - + @Input() public loading: boolean = true; + @Input() searchUtils: SearchUtilsClass = new SearchUtilsClass(); + public rowsOnPage = 10; + previewCommunities = []; + @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity; + selectedToDelete = null; + @Output() addZenodoCommunity: EventEmitter = new EventEmitter(); + page = 1; + 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) { + private _communityService: CommunityService, + public _fb: UntypedFormBuilder, + private cdr: ChangeDetectorRef, + private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) { } - - ngOnInit() { - this.zenodoSearchUtils.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; - 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 => { + ngOnInit() { + this.searchUtils.status = this.errorCodes.LOADING; + this.properties = properties; + 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.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length; + this.searchUtils.totalResults = this.selectedCommunityIds.length; if (this.selectedCommunityIds.length === 0) { - this.zenodoSearchUtils.status = this.errorCodes.NONE; + this.searchUtils.status = this.errorCodes.NONE; } for (let i = 0; i < this.selectedCommunityIds.length; i++) { - this.getZenodoCommunityById( - this.selectedCommunityIds[i]); + this.getZenodoCommunityById(this.selectedCommunityIds[i]); } - - // }, - // error => { - // console.log('list of zenodo communities couldn\'t be loaded'); - // this.zenodoSearchUtils.status = this.errorCodes.DONE; - // } - // ); - }) - ); - + this.init(); + }) + ); + })); this.fullscreen.title = "Search and Add Zenodo Communities"; this.fullscreen.okButtonText = "Done"; this.fullscreen.okButton = true; } - + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscription) { @@ -110,18 +102,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.masterCommunity = 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; + this.searchUtils.status = this.errorCodes.DONE; } - - + }, error => { const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo(); @@ -130,7 +127,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.selectedCommunities.push(emptyCommunity); this.zenodocommunitiesloadedCount++; if (this.zenodocommunitiesloadedCount >= this.selectedCommunityIds.length) { - this.zenodoSearchUtils.status = this.errorCodes.DONE; + this.searchUtils.status = this.errorCodes.DONE; } console.log('Zenodo community\'' + zenodoid + '\' couldn\'t be loaded'); } @@ -147,11 +144,150 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } public zenodoCommunitiesChanged($event) { - this.selectedCommunities = $event.value; + this.selectedCommunities = $event.communities; + this.masterCommunity = $event.main; + if(!this.masterZenodoCommunityId && $event.main){ + this.selectedCommunityIds.unshift($event.main.id) + this.selectedCommunities.unshift($event.main); + } + this.masterZenodoCommunityId = $event.main?$event.main.id:null; this.showLoadingInRemove = false; - if (this.fullscreen.isOpen) { - this.manage.filterPreviewCommunities(this.manage.filterForm.value); + this.filterPreviewCommunities(this.filterForm.value); + } + this.filterPreviewCommunities(this.searchUtils.keyword); + } + private init() { + 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; + } + + public filterPreviewCommunities(value: string) { + this.previewCommunities = this.selectedCommunities.filter(community => { + return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1 + }); + if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) { + this.page = 1; + } + this.cdr.detectChanges(); + } + + public confirmedDeleteCommunity(data: any) { + 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(){ + 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; + } + 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; + 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(); + } + + 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); + 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'); + } + public addAsMasterCommunity(community) { + this.subscriptions.push(this._manageZenodoCommunitiesService.addZenodoCommunity(this.properties ,this.community.communityId,community.id, true).subscribe( + data => { + this.masterCommunity = community; + this.masterZenodoCommunityId = community.id + }, + err => { + this.handleError('An error has been occurred. Try again later!'); + console.log(err.status); + } + )); + } + } diff --git a/src/app/pages/zenodo-communities/zenodo-communities.module.ts b/src/app/pages/zenodo-communities/zenodo-communities.module.ts index ebfdd50..0dd1db1 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.module.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.module.ts @@ -2,7 +2,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; -import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component'; import {AddZenodoCommunitiesComponent} from './add-zenodo-communities.component'; import {ZenodoCommunitiesComponent} from './zenodo-communities.component'; import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service'; @@ -18,14 +17,15 @@ 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: [ - ManageZenodoCommunitiesComponent, ZenodoCommunitiesComponent, AddZenodoCommunitiesComponent, PreviewZenodoCommunityComponent + ZenodoCommunitiesComponent, AddZenodoCommunitiesComponent, PreviewZenodoCommunityComponent ], providers: [ ManageZenodoCommunitiesService diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 0f4eacd..e938653 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -11,27 +11,29 @@ 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 communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid); + addContentProvider(properties: EnvProperties, pid: string, contentProvider: any, content:boolean, deposit:boolean): Observable { + let url = properties.communityAPI + pid + '/datasources'; + let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid, content, deposit); 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); } - 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; } diff --git a/src/app/services/manageZenodoCommunities.service.ts b/src/app/services/manageZenodoCommunities.service.ts index 8a07c69..0ad555d 100644 --- a/src/app/services/manageZenodoCommunities.service.ts +++ b/src/app/services/manageZenodoCommunities.service.ts @@ -5,31 +5,25 @@ import{EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; @Injectable() export class ManageZenodoCommunitiesService { constructor(private http: HttpClient ) {} + removeZenodoCommunity(properties:EnvProperties, pid: string,zenodoid: string, main:boolean = false) { - 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}); + const options = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + }) + }; + 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) { - 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}) + 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); } - 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()) - } - - - - } diff --git a/src/app/utils/validateEnabledPage.component.ts b/src/app/utils/validateEnabledPage.component.ts new file mode 100644 index 0000000..d7b3b75 --- /dev/null +++ b/src/app/utils/validateEnabledPage.component.ts @@ -0,0 +1,93 @@ +import {Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core"; +import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; +import {UntypedFormBuilder} from "@angular/forms"; +import {CommunityInfo} from "../openaireLibrary/connect/community/communityInfo"; +import {Page} from "../openaireLibrary/utils/entities/adminTool/page"; +import {AlertModal} from "../openaireLibrary/utils/modal/alert"; +import {ActivatedRoute, Router} from "@angular/router"; +import {Title} from "@angular/platform-browser"; +import {CommunityService} from "../openaireLibrary/connect/community/community.service"; +import {AffiliationService} from "../openaireLibrary/connect/affiliations/affiliation.service"; +import {HelpContentService} from "../services/help-content.service"; +import {ClearCacheService} from "../openaireLibrary/services/clear-cache.service"; +import {Subscription} from "rxjs"; +import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; +import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; +import {properties} from "src/environments/environment"; + +@Component({ + selector: 'validate-page-enabled', + template: ` +
+ {{page.name}} page is not enabled. Manage pages here or + enable it now +
+ ` +}) +export class ValidateEnabledPageComponent implements OnInit, OnDestroy { + @Input() pageRoute:string; + public properties: EnvProperties = properties; + + + public community: CommunityInfo; + public page: Page; + loading; + private subs: any[] = []; + @ViewChild('affiliationModal') affiliationModal: AlertModal; + @ViewChild('removeAffiliationModal') removeAffiliationModal: AlertModal; + + constructor(private route: ActivatedRoute, + private router: Router, + private title: Title, + private fb: UntypedFormBuilder, + private communityService: CommunityService, + private helpContentService: HelpContentService, + private _clearCacheService: ClearCacheService) { + } + + + ngOnInit() { + this.subs.push(this.communityService.getCommunityAsObservable().subscribe( community => { + this.community = community; + this.getPageStatus(); + })); + } + + ngOnDestroy() { + this.subs.forEach(sub => { + if (sub instanceof Subscription) { + sub.unsubscribe(); + } + }) + } + + public get pageEnabled(): boolean { + return !this.page || this.page.isEnabled; + } + + + public updatePage(event) { + HelperFunctions.scroll(); + this.page = event.value; + } + + + private getPageStatus() { + this.helpContentService.getCommunityPagesByRoute(this.community.communityId, this.pageRoute, this.properties.adminToolsAPIURL).subscribe((page) => { + this.page = page; + }) + } + + + enablePage() { + this.loading = true; + this.helpContentService.togglePages(this.community.communityId, [this.page._id], true, this.properties.adminToolsAPIURL).subscribe(() => { + this.page.isEnabled = true; + this._clearCacheService.purgeBrowserCache("Page enabled", this.community.communityId); + NotificationHandler.rise(this.page.name + ' has been enabled successfully'); + this.loading = false; + }, error => { + }); + } +} diff --git a/src/app/utils/validateEnabledPage.module.ts b/src/app/utils/validateEnabledPage.module.ts new file mode 100644 index 0000000..93a84a7 --- /dev/null +++ b/src/app/utils/validateEnabledPage.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {RouterModule} from "@angular/router"; +import {ValidateEnabledPageComponent} from "./validateEnabledPage.component"; +import {AdminToolServiceModule} from "../openaireLibrary/services/adminToolService.module"; +import {HelpContentService} from "../services/help-content.service"; + +@NgModule({ + declarations: [ValidateEnabledPageComponent], + imports: [ + CommonModule, RouterModule, AdminToolServiceModule + ], + exports:[ValidateEnabledPageComponent], + providers:[HelpContentService] +}) +export class ValidateEnabledPageModule { +} diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bb1e61..ee22e97 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5e8c1ad..52eca9a 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 +Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9 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 4e9ff41..2c5579f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -13,7 +13,11 @@ 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/', + utilsService: "http://scoobydoo.di.uoa.gr:8000", + monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/", + // disableFrameLoad : true }; export let properties: EnvProperties = {