From f139b3205bad1088684e5a43c39631160f99c075 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 3 Dec 2020 16:05:59 +0000 Subject: [PATCH] [Admin | Trunk]: Remove managers page git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@60029 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 7 - src/app/app.routing.ts | 5 - .../pages/managers/managers-routing.module.ts | 14 -- .../pages/managers/managers.component.html | 53 ------- src/app/pages/managers/managers.component.ts | 140 ------------------ src/app/pages/managers/managers.module.ts | 17 --- 6 files changed, 236 deletions(-) delete mode 100644 src/app/pages/managers/managers-routing.module.ts delete mode 100644 src/app/pages/managers/managers.component.html delete mode 100644 src/app/pages/managers/managers.component.ts delete mode 100644 src/app/pages/managers/managers.module.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ddda4b5..0ce62da 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -389,13 +389,6 @@ export class AppComponent implements OnInit { '', false, [], [], null), items: [] }); - if(this.properties.environment === "development") { - users.items.push({ - rootItem: new MenuItem('managers', 'Managers', '/managers', - '/managers', false, [], [], {communityId: this.communityId}), - items: [] - }); - } users.items.push({ rootItem: new MenuItem('subscribers', 'Subscribers', '/manage-subscribers', '/manage-subscribers', false, [], [], {communityId: this.communityId}), diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index af538d5..0c09942 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -48,11 +48,6 @@ const appRoutes: Routes = [ loadChildren: './pages/community/community-edit-form/community-edit-form.module#CommunityEditFormModule', resolve: { envSpecific: EnvironmentSpecificResolver } }, - { - path: 'managers', - loadChildren: './pages/managers/managers.module#ManagersModule', - resolve: { envSpecific: EnvironmentSpecificResolver } - }, { path: 'manage-zenodo-communities', loadChildren: './pages/zenodo-communities/zenodo-communities.module#ZenodoCommunitiesModule', diff --git a/src/app/pages/managers/managers-routing.module.ts b/src/app/pages/managers/managers-routing.module.ts deleted file mode 100644 index 5d39377..0000000 --- a/src/app/pages/managers/managers-routing.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommunity.guard'; -import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard'; -import {ManagersComponent} from './managers.component'; - -@NgModule({ - imports:[RouterModule.forChild([ - {path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: ManagersComponent} - ])] -}) -export class ManagersRoutingModule { - -} diff --git a/src/app/pages/managers/managers.component.html b/src/app/pages/managers/managers.component.html deleted file mode 100644 index ccb0cfd..0000000 --- a/src/app/pages/managers/managers.component.html +++ /dev/null @@ -1,53 +0,0 @@ -
-
- -
- {{error}} -
-
-
-
-
Managers
-
- -
- -
-
- - - - - - - - - - - - - -
EmailAction
- {{(showManagers)?item.email:item}} - - -
-
-
-
-
- -
- Email: - -
- - - diff --git a/src/app/pages/managers/managers.component.ts b/src/app/pages/managers/managers.component.ts deleted file mode 100644 index d522f47..0000000 --- a/src/app/pages/managers/managers.component.ts +++ /dev/null @@ -1,140 +0,0 @@ -import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; -import {UserRegistryService} from '../../openaireLibrary/services/user-registry.service'; -import {Subscription} from 'rxjs/Rx'; -import {ActivatedRoute} from '@angular/router'; -import {AlertModal} from '../../openaireLibrary/utils/modal/alert'; -import {FormBuilder, FormControl, Validators} from '@angular/forms'; -import {CommunityService} from '../../openaireLibrary/connect/community/community.service'; -import {properties} from '../../../environments/environment'; - -@Component({ - selector: 'managers', - templateUrl: 'managers.component.html' -}) -export class ManagersComponent implements OnInit, OnDestroy { - - public managers: any[]; - public pending: any[]; - public communityId: string; - public showManagers: boolean = true; - public subs: any[] = []; - public loadManagers: boolean = true; - public loadPending: boolean = true; - public error: string; - public selectedUser: string = null; - public invited: FormControl; - public communityName: string; - @ViewChild('inviteManagerModal') inviteManagerModal: AlertModal; - @ViewChild('deleteManagerModal') deleteManagerModal: AlertModal; - @ViewChild('deletePendingModal') deletePendingModal: AlertModal; - - constructor(private userRegistryService: UserRegistryService, - private communityService: CommunityService, - private fb: FormBuilder, - private route: ActivatedRoute) { - } - - ngOnInit() { - this.subs.push(this.route.queryParams.subscribe(params => { - if (params && params['communityId']) { - this.communityId = params['communityId']; - this.subs.push(this.communityService.getCommunity(properties, properties.communityAPI + this.communityId).subscribe(community => { - this.communityName = community.title; - })); - this.subs.push(this.userRegistryService.getManagersEmail('community', this.communityId).subscribe(managers => { - this.managers = managers; - this.loadManagers = false; - }, error => { - this.managers = []; - this.error = error.error.response; - this.loadManagers = false; - })); - this.subs.push(this.userRegistryService.getPendingManagers('community', this.communityId).subscribe(pending => { - this.pending = pending; - this.loadPending = false; - }, error => { - this.managers = []; - this.error = error.error.response; - this.loadManagers = false; - })); - } - })); - } - - ngOnDestroy() { - this.subs.forEach(sub => { - if (sub instanceof Subscription) { - sub.unsubscribe(); - } - }); - } - - openDeleteModal(item: any) { - if(this.showManagers) { - this.selectedUser = item.email; - this.deleteManagerModal.alertTitle = 'Delete ' + item.email + ' from managers'; - this.deleteManagerModal.open(); - } else { - this.selectedUser = item; - this.deletePendingModal.alertTitle = 'Delete ' + item + ' from managers'; - this.deletePendingModal.open(); - } - } - - openInviteModal() { - this.inviteManagerModal.alertTitle = 'Invite user to be manager'; - this.inviteManagerModal.okButtonLeft = false; - this.invited = this.fb.control('', [Validators.required, Validators.email]); - this.inviteManagerModal.open(); - } - - deleteManager() { - this.loadManagers = true; - this.userRegistryService.removeManager('community', this.communityId, this.selectedUser).subscribe(() => { - this.managers = this.managers.filter(manager => manager.email != this.selectedUser); - this.loadManagers = false; - this.error = null; - },error => { - this.error = error.error.response; - this.loadManagers = false; - }); - } - - deletePendingManager() { - this.loadPending = true; - this.userRegistryService.cancelManagerInvitation('community', this.communityId, this.selectedUser).subscribe(() => { - this.pending = this.pending.filter(manager => manager != this.selectedUser); - this.error = null; - this.loadPending = false; - },error => { - this.error = error.error.response; - this.loadPending = false; - }); - } - - inviteManager() { - this.loadManagers = true; - let details = { - name: this.communityName, - link: this.getURL() - } - this.userRegistryService.inviteManager('community', this.communityId, this.invited.value, details).subscribe(invitation => { - this.error = null; - if(!this.pending.includes(this.invited.value)) { - this.pending.push(this.invited.value); - } - this.loadManagers = false; - },error => { - this.error = error.error.response; - this.loadManagers = false; - }) - } - - private getURL(): string { - if(properties.environment != "production") { - return 'https://beta.' + this.communityId + ".openaire.eu/verify/"; - } else { - return 'https://' + this.communityId + ".openaire.eu/verify/"; - } - } -} diff --git a/src/app/pages/managers/managers.module.ts b/src/app/pages/managers/managers.module.ts deleted file mode 100644 index 3ae0b07..0000000 --- a/src/app/pages/managers/managers.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {ManagersRoutingModule} from './managers-routing.module'; -import {ManagersComponent} from './managers.component'; -import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommunity.guard'; -import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard'; -import {EmailService} from '../../openaireLibrary/utils/email/email.service'; -import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; -import {ReactiveFormsModule} from '@angular/forms'; - -@NgModule({ - imports: [CommonModule, ManagersRoutingModule, AlertModalModule, ReactiveFormsModule], - declarations: [ManagersComponent], - exports: [ManagersComponent], - providers: [IsCommunity, ConnectAdminLoginGuard, EmailService] -}) -export class ManagersModule {}