[Admin | Trunk]: Add managers page, the only thing is missing is to send email

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@59316 d315682c-612b-4755-9ff5-7f18f6832af3

package.json

@@ -30,7 +30,7 @@
     "@types/node": "^6.0.101",
     "angular-datatables": "^4.4.1",
     "citation-js": "^0.3.4",
-    "ckeditor4-angular": "^1.2.2",
+    "ng2-ckeditor": "1.1.9",
     "clipboard": "^1.5.16",
     "core-js": "2.6.8",
     "datatables.net": "^1.10.19",

src/app/app.component.ts

@@ -363,6 +363,13 @@ 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}),

src/app/app.routing.ts

@@ -48,6 +48,11 @@ 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',

src/app/pages/divhelpcontent/div-help-content-form.module.ts

@@ -5,7 +5,7 @@ import {FABModule} from '../../utils/fabModule.module';
 import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
 import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
 import {DivContentFormComponent} from './div-help-content-form.component';
-import {CKEditorModule} from 'ckeditor4-angular';
+import {CKEditorModule} from 'ng2-ckeditor';
 
 @NgModule({
     imports: [

src/app/pages/helpcontent/page-help-content-form.component.html

@@ -39,7 +39,6 @@
           }',
             disallowedContent:'script; *[on*]'}" -->
             <ckeditor
-                    [readOnly]="false"
                     debounce="500"
                     formControlName="content"
                     [config]="{ extraAllowedContent: '* [uk-*](*) ; span', disallowedContent: 'script; *[on*]', removeButtons: 'Save,NewPage,DocProps,Preview,Print',

src/app/pages/helpcontent/page-help-content-form.module.ts

@@ -4,7 +4,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {FABModule} from '../../utils/fabModule.module';
 import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
 import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
-import {CKEditorModule} from 'ckeditor4-angular';
+import {CKEditorModule} from 'ng2-ckeditor';
 import {PageContentFormComponent} from './page-help-content-form.component';
 
 @NgModule({

src/app/pages/htmlpagecontent/edit-html-page-content.module.ts

@@ -13,7 +13,7 @@ import {EditHtmlPageContentComponent} from './edit-htmlpage-content.component';
 import {HtmlPageContentService} from './html-page-content.service';
 import {EditHtmlPageContentRoutingModule} from './edit-html-page-content-routing.module';
 import {CommonModule} from '@angular/common';
-import {CKEditorModule} from 'ckeditor4-angular';
+import {CKEditorModule} from 'ng2-ckeditor';
 
 @NgModule({
     imports: [

src/app/pages/managers/managers-routing.module.ts

@@ -0,0 +1,14 @@
+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 {
+
+}

src/app/pages/managers/managers.component.html

@@ -0,0 +1,53 @@
+<div class="uk-card uk-card-default uk-card-body">
+  <div *ngIf="error"  class="uk-alert uk-alert-danger uk-flex uk-flex-top">
+    <span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
+    <div>
+        {{error}}
+    </div>
+  </div>
+  <div *ngIf="loadManagers || loadPending" class="loading-gif"></div>
+  <div *ngIf="!loadManagers && !loadPending">
+    <div class="uk-text-large uk-text-bold uk-text-center uk-margin-medium-bottom">Managers</div>
+    <div class="uk-flex uk-flex-right">
+      <button class="uk-button uk-button-primary" (click)="openInviteModal()">Invite a Manager</button>
+    </div>
+    <ul uk-tab class="uk-tab links">
+      <li *ngIf="managers" [class.uk-active]="showManagers" (click)="showManagers = true">
+        <a>Managers <span class="uk-badge space">{{managers.length | number}}</span></a>
+      </li>
+      <li *ngIf="pending" [class.uk-active]="!showManagers" (click)="showManagers = false">
+        <a>Pending Managers <span class="uk-badge space">{{pending.length | number}}</span></a>
+      </li>
+    </ul>
+    <div class="custom-dataTable-content">
+      <div class="uk-overflow-container">
+        <table class="uk-table uk-table-striped divider-table" id="dpTable">
+          <thead>
+          <tr>
+            <th class="uk-text-center">Email</th>
+            <th class="uk-text-center">Action</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr class="uk-table-middle" *ngFor="let item of (showManagers)?managers:pending">
+            <td class="uk-text-center uk-width-1-2">
+              {{(showManagers)?item.email:item}}
+            </td>
+            <td class="uk-text-center uk-width-1-2">
+              <a (click)="openDeleteModal(item)" class="uk-icon-button remove uk-button-danger" uk-icon="icon: close; ratio: 1" title="Remove"></a>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+<modal-alert #inviteManagerModal (alertOutput)="inviteManager()" [okDisabled]="invited && invited.invalid">
+  <div *ngIf="invited" class="uk-padding uk-text-center">
+    <span class="uk-text-bold">Email: </span>
+    <input class="uk-input space uk-width-medium" [class.uk-form-danger]="invited.invalid" [formControl]="invited">
+  </div>
+</modal-alert>
+<modal-alert #deleteManagerModal (alertOutput)="deleteManager()"></modal-alert>
+<modal-alert #deletePendingModal (alertOutput)="deletePendingManager()"></modal-alert>

src/app/pages/managers/managers.component.ts

@@ -0,0 +1,121 @@
+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';
+
+@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;
+  @ViewChild('inviteManagerModal') inviteManagerModal: AlertModal;
+  @ViewChild('deleteManagerModal') deleteManagerModal: AlertModal;
+  @ViewChild('deletePendingModal') deletePendingModal: AlertModal;
+
+  constructor(private userRegistryService: UserRegistryService,
+              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.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.removeManagerRole('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.cancelInvitation('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;
+    this.userRegistryService.invite('community', this.communityId, this.invited.value).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;
+    })
+  }
+}

src/app/pages/managers/managers.module.ts

@@ -0,0 +1,17 @@
+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 {}

src/environments/environment.beta.ts

@@ -36,8 +36,9 @@ export let properties: EnvProperties = {
   utilsService: "https://demo.openaire.eu/utils-service",
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
   piwikBaseUrl: " https://analytics.openaire.eu/piwik.php?idsite=6",
-  loginUrl: "https://beta.services.openaire.eu/admin-user-management/openid_connect_login",
+  loginUrl: "https://beta.services.openaire.eu/connect-user-management/openid_connect_login",
   userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
+  registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
   logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
   cookieDomain: ".openaire.eu",
   feedbackmail: "feedback@openaire.eu",

src/environments/environment.prod.ts

@@ -38,11 +38,10 @@ export let properties: EnvProperties = {
   vocabulariesAPI:"https://services.openaire.eu/provision/mvc/vocabularies/",
 
   piwikBaseUrl:" https://analytics.openaire.eu/piwik.php?idsite=6",
-  loginUrl:"https://services.openaire.eu/admin-user-management/openid_connect_login",
+  loginUrl: "https://services.openaire.eu/connect-user-management/openid_connect_login",
-
   userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-
+  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
-  logoutUrl:"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
+  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
 
   cookieDomain:".openaire.eu",
 

src/environments/environment.ts

@@ -43,10 +43,10 @@ export let properties: EnvProperties = {
   vocabulariesAPI: 'https://beta.services.openaire.eu/provision/mvc/vocabularies/',
 
   piwikBaseUrl: ' https://analytics.openaire.eu/piwik.php?idsite=6',
-  loginUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login',
+  loginUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login',
-
+  userInfoUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
-  userInfoUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
+  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  logoutUrl: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
+  logoutUrl: 'https://openaire-dev.aai-dev.grnet.gr/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
 
   cookieDomain: '.di.uoa.gr',
 

src/index.html

@@ -29,6 +29,7 @@
 
   <script src="assets/common-assets/common/uikit.min.js?v=2"></script>
   <script src="assets/common-assets/common/uikit-icons.min.js?v=2"></script>
+  <script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script>
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>