/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 55406

Added by Konstantinos Triantafyllou about 5 years ago

[Trunk|Admin]: 1. Build sideBar menu in app.component. 2. Add AdminLoginGuard to /classes route

     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 {DivIdsComponent} from './divIds.component';
     import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
     @NgModule({
         imports: [
             RouterModule.forChild([
                 { path: '', canActivate: [IsCommunity, ConnectAdminLoginGuard], component: DivIdsComponent}
                 { path: '', canActivate: [AdminLoginGuard], component: DivIdsComponent}
             ])
+        ]
     })

     import { NgModule } from '@angular/core';
     import {RouterModule} from '@angular/router';
     import {CommonModule} from '@angular/common';
     import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommunity.guard';
     import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard';
     import {FormsModule, ReactiveFormsModule} from '@angular/forms';
     import {FABModule} from '../../utils/fabModule.module';
     import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
     import {DivIdsComponent} from './divIds.component';
     import {DivIdFormComponent} from './divId-form.component';
     import {DivIdsRoutingModule} from './divIds-routing.module';
     import {AdminLoginGuard} from "../../openaireLibrary/login/adminLoginGuard.guard";
     @NgModule({
         imports: [
-...
             AlertModalModule, ReactiveFormsModule, DivIdsRoutingModule
         ],
         declarations: [DivIdsComponent, DivIdFormComponent],
         providers: [IsCommunity, ConnectAdminLoginGuard],
         providers: [AdminLoginGuard],
         exports: [DivIdsComponent]
     })
     export class DivIdsModule { }

     <navbar *ngIf= "properties"   portal="connect-admin" logoPath="assets/imgs/" [onlyTop]=false [userMenu]=true  [homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [(logInUrl)]=logInUrl [(logOutUrl)]=logOutUrl [(community)]=community class="adminMenu"></navbar>
     <div  id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom">
       <div class="uk-grid" uk-height-viewport="expand: true">
         <div *ngIf="communityId && communityId!=''" id="sidebar" class="uk-width-1-5 uk-light sidebar uk-margin-top uk-margin-left">
         <!--<div *ngIf="communityId && communityId!=''" id="sidebar" class="uk-width-1-5 uk-light sidebar uk-margin-top uk-margin-left">
           <ul class="uk-nav uk-nav-default sidebar">
             <li class="uk-nav-header uk-parent">
-...
         </div>
         </div>-->
       <sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-margin-top uk-margin-left"></sidebar>
       <div class="uk-width-expand uk-container uk-margin-large-top uk-margin-medium-bottom">
       <!-- <div class="uk-width-expand"> -->
         <router-outlet></router-outlet>
       </div>
     <!--
       <feedback *ngIf= "properties" portalName="Admin" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback>
     -->
       </div>
     </div>
     <!--cookie-law *ngIf= "isClient" position="bottom">

      * Created by stefania on 3/21/16.
      */
     import { Component } from '@angular/core';
     import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
     import {Component, ViewChild} from '@angular/core';
     import {MenuItem, RootMenuItem, SideMenuItem} from './openaireLibrary/sharedComponents/menu';
     import {ActivatedRoute} from '@angular/router';
     import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
     import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
     import {CommunitiesService} from "./openaireLibrary/connect/communities/communities.service";
     import { EnvProperties} from './openaireLibrary/utils/properties/env-properties';
     import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
     import {Session} from './openaireLibrary/login/utils/helper.class';
     import {root} from "rxjs/util/root";
     import {SideBarComponent} from "./openaireLibrary/sharedComponents/sidebar/sideBar.component";
     declare var UIkit: any;
-...
     export class AppComponent {
       title = 'Metadata Registry Service';
       //isClient:boolean = false;
       userMenuItems: MenuItem[] = [];
       menuItems: RootMenuItem [] = [];
       sideMenuItems: SideMenuItem[] = [];
       logInUrl = null;
       logOutUrl = null;
       community: { id: string, name: string, logoUrl: string } = null;
       communityId = "";
       communityType = null;
       properties: EnvProperties = null;
       isPortalAdministrator: boolean = false;
       showSidebar: boolean;
        userMenuItems:MenuItem[] =  [];
       constructor(private  route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private _communitiesService: CommunitiesService) {
        menuItems:RootMenuItem [] = [];
+      }
     logInUrl = null;
     logOutUrl = null;
     community: {id:string, name:string, logoUrl:string} = null;
     communityId="";
     communityType=null;
     properties:EnvProperties = null;
     isPortalAdministrator:boolean = false;
     constructor(  private  route: ActivatedRoute, private propertiesService:EnvironmentSpecificService, private _communitiesService:CommunitiesService) {
       ngOnInit() {
         this.propertiesService.loadEnvironment()
           .then(es => {
             this.propertiesService.setEnvProperties(es);
             this.properties = this.propertiesService.envSpecific;
             this.logInUrl = this.properties.loginUrl;
             this.logOutUrl = this.properties.logoutUrl;
             this.showSidebar = false;
             if (Session.getUser()) {
               localStorage.setItem('user_id', Session.getUser().id);
               localStorage.setItem('mining_backend_address', this.properties.miningBackendURL);
               localStorage.setItem('isCommunityManager', Session.isCommunityCurator() + "");
+    }
               this.isPortalAdministrator = Session.isPortalAdministrator();
               /*this.isPortalAdministrator = true;*/
+            }
             this.route.queryParams.subscribe(data => {
               this.communityId = ((data['communityId']) ? data['communityId'] : "");
               this.communityType = null;
               this.menuItems = [];
               this.userMenuItems = [];
               this._communitiesService.getCommunities(this.properties, this.properties.communityAPI + "communities").subscribe(
                 communities => {
                   //  this.community = community;
                   this.userMenuItems = [];
                   let countCommunities = 0;
                   let index_managerOfCommunity = null;
                   for (let i = 0; i < communities.length; i++) {
                     let com = communities[i];
                     if (Session.isPortalAdministrator() || Session.isCommunityCurator()) {
                       this.userMenuItems.push(new MenuItem("manage" + com.communityId, "Manage " + ((com.shortTitle) ? com.shortTitle : com.title), "", "/dashboard", false, [], [], {communityId: com.communityId}));
                     } else {
                       for (var manager of com.managers) {
                         if (manager == Session.getUserEmail()) {
                           countCommunities++;
                           index_managerOfCommunity = i;
                           this.userMenuItems.push(new MenuItem("manage" + com.communityId, "Manage " + ((com.shortTitle) ? com.shortTitle : com.title), "", "/dashboard", false, [], [], {communityId: com.communityId}));
                           break;
+                        }
+                      }
+                    }
                     if (com.communityId == this.communityId) {
                       this.community = {
                         id: com.communityId,
                         name: (com.shortTitle) ? com.shortTitle : com.title,
                         logoUrl: com.logoUrl
                       };
                       this.communityType = com.type;
                       this.menuItems = [
+                        {
                           rootItem: new MenuItem("dashboard", "Overview", "/dashboard", "/dashboard", false, [], null, {communityId: com.communityId}),
                           items: []
+                        }
                       ];
                     } else if (countCommunities == 1 && index_managerOfCommunity != null) {
                       this.community = {
                         id: communities[index_managerOfCommunity].communityId,
                         name: (communities[index_managerOfCommunity].shortTitle) ? communities[index_managerOfCommunity].shortTitle : com.title,
                         logoUrl: communities[index_managerOfCommunity].logoUrl
                       };
                       this.menuItems = [
+                        {
                           rootItem: new MenuItem("dashboard", "Overview", "/dashboard", "/dashboard", false, [], null, {communityId: communities[index_managerOfCommunity].communityId}),
                           items: []
+                        }
                       ];
+                    }
+                  }
                   if (!this.communityId || this.communityId == '') {
                     this.community = null;
+                  }
                   if (this.communityId) {
                     this.userMenuItems.push(new MenuItem("manage-user-notifications", "Manage notification settings", "", "/manage-user-notifications", false, [], [], {communityId: this.communityId}));
+                  }
                   this.buildSideBar();
                 },
                 error => {
                   if ((this.communityId && this.communityId != "") || window.location.pathname == "/") {
                     UIkit.notification({
                       message: '<strong>System error retrieving communities.<strong>',
                       status: 'warning',
                       timeout: 3000,
                       pos: 'top-center'
                     })
+                  }
+                }
               );
             });
           });
        ngOnInit() {
          this.propertiesService.loadEnvironment()
                  .then(es => {
                      this.propertiesService.setEnvProperties(es);
                      this.properties = this.propertiesService.envSpecific;
                      this.logInUrl = this.properties.loginUrl;
                      this.logOutUrl = this.properties.logoutUrl;
                      if( Session.getUser()){
                        localStorage.setItem('user_id', Session.getUser().id);
                        localStorage.setItem('mining_backend_address', this.properties.miningBackendURL);
                        localStorage.setItem('isCommunityManager', Session.isCommunityCurator()+"");
                        this.isPortalAdministrator = Session.isPortalAdministrator();
+                     }
                      this.route.queryParams.subscribe(data => {
                        this.communityId = ((data['communityId'])?data['communityId']:"");
                        this.communityType = null;
                        this.menuItems = [];
                        this.userMenuItems = [];
                        this._communitiesService.getCommunities(this.properties, this.properties.communityAPI+"communities").subscribe (
                          communities => {
                               //  this.community = community;
                                this.userMenuItems =[];
                                var countCommunities = 0;
                                var index_managerOfCommunity = null;
                                 for(var i = 0;i <communities.length; i++){
                                   var com = communities[i];
                                   if(Session.isPortalAdministrator() || Session.isCommunityCurator()){
                                     this.userMenuItems.push(new MenuItem("manage"+com.communityId,"Manage "+((com.shortTitle)?com.shortTitle:com.title),"","/dashboard",false,[],[],{communityId: com.communityId}));
                                   }else{
                                     for(var manager of com.managers){
                                         if(manager== Session.getUserEmail()){
                                           countCommunities++;
                                           index_managerOfCommunity = i;
                                            this.userMenuItems.push(new MenuItem("manage"+com.communityId,"Manage "+((com.shortTitle)?com.shortTitle:com.title),"","/dashboard",false,[],[],{communityId: com.communityId}));
                                            break;
+                                        }
+                                    }
+                                  }
                                   if(com.communityId == this.communityId){
                                     this.community = {id: com.communityId, name: (com.shortTitle)?com.shortTitle:com.title, logoUrl:com.logoUrl};
                                     this.communityType = com.type;
                                     this.menuItems= [
                                       {rootItem: new MenuItem("dashboard","Overview","/dashboard","/dashboard",false,[],null,{communityId:com.communityId}),
                                       items: []
+                                      }
                                   ];
                                 }else if(countCommunities == 1 &&index_managerOfCommunity!=null ){
                                   this.community = {id: communities[index_managerOfCommunity].communityId, name: (communities[index_managerOfCommunity].shortTitle)?communities[index_managerOfCommunity].shortTitle:com.title, logoUrl:communities[index_managerOfCommunity].logoUrl};
                                   this.menuItems= [
                                     {rootItem: new MenuItem("dashboard","Overview","/dashboard","/dashboard",false,[],null,{communityId:communities[index_managerOfCommunity].communityId}),
                                     items: []
+                                    }
                                   ];
+                                }
+                               }
                                if(this.communityId){
                                   this.userMenuItems.push(new MenuItem("manage-user-notifications","Manage notification settings","","/manage-user-notifications",false,[],[],{communityId: this.communityId}));
+                               }
+      }
                          },
                          error => {
                            if( ( this.communityId && this.communityId != "") || window.location.pathname == "/"){
                              UIkit.notification({
                                  message : '<strong>System error retrieving communities.<strong>',
                                  status  : 'warning',
                                  timeout : 3000,
                                  pos     : 'top-center'
                               })
+                           }
+                         }
                        );
                       });
                   });
       private buildSideBar() {
         this.sideMenuItems = [];
         if ((!this.communityId || this.communityId == '') && this.isPortalAdministrator) {
           let adminTools: SideMenuItem = {
             rootItem: new MenuItem('adminTools', 'Admin Tools', '',
               '', false, [], [], null),
             items: [],
             ukIcon: 'desktop'
           };
           adminTools.items.push({
               rootItem: new MenuItem('communities', 'Communities', '/communities',
                 '/communities', false, [], [], null),
               items: []
+            }
           );
           adminTools.items.push({
               rootItem: new MenuItem('classes', 'Classes', '/classes',
                 '/classes', false, [], [], null),
               items: []
+            }
           );
           this.sideMenuItems.push(adminTools);
         } else if (this.communityId && this.communityId != '') {
           this.sideMenuItems.push({
             rootItem: new MenuItem('overview', 'Overview', '/dashboard',
               '/dashboard', false, [], [], {communityId: this.communityId}),
             items: [],
             ukIcon: 'home'
           });
           if (this.isPortalAdministrator) {
             let adminTools: SideMenuItem = {
               rootItem: new MenuItem('adminTools', 'Admin Tools', '/communities',
                 '/communities', false, [], [], null),
               items: [],
               ukIcon: 'desktop'
             };
             this.sideMenuItems.push(adminTools);
+          }
           if (this.communityId != 'openaire') {
             let community: SideMenuItem = {
               rootItem: new MenuItem('community', 'Community', '',
                 '', false, [], [], null),
               items: [],
               ukIcon: 'album'
+            }
             community.items.push({
               rootItem: new MenuItem('communityProfile', 'Community Profile', '/community-edit-form',
                 '/community-edit-form', false, [], [], {communityId: this.communityId}),
               items: []
             })
             /*community.items.push({
               rootItem: new MenuItem('communityLayout', 'Community Layout', '/community-layout',
                 '/community-layout', false, [], [], {communityId: this.communityId}),
               items: []
             })*/
             this.sideMenuItems.push(community);
             let communityContent: SideMenuItem = {
               rootItem: new MenuItem('communityContent', 'Community Content', '',
                 '', false, [], [], null),
               items: [],
               ukIcon: 'list'
+            }
             communityContent.items.push({
                 rootItem: new MenuItem('projects', 'Projects', '/manage-projects',
                   '/manage-projects', false, [], [], {communityId: this.communityId}),
                 items: []
+              }
+            )
             communityContent.items.push({
               rootItem: new MenuItem('contentProviders', 'Content providers', '/manage-content-providers',
                 '/manage-content-providers', false, [], [], {communityId: this.communityId}),
               items: []
             })
             if (this.communityType && this.communityType != 'ri') {
               communityContent.items.push({
                 rootItem: new MenuItem('subjects', 'Subjects', '/manage-subjects',
                   '/manage-subjects', false, [], [], {communityId: this.communityId}),
                 items: []
               })
+            }
             communityContent.items.push({
               rootItem: new MenuItem('zenodoCommunities', 'Zenodo communities', '/manage-zenodo-communities',
                 '/manage-zenodo-communities', false, [], [], {communityId: this.communityId}),
               items: []
             })
             this.sideMenuItems.push(communityContent);
+          }
           let entities: SideMenuItem = {
             rootItem: new MenuItem('entitiesPages', 'Entities & pages', '',
               '', false, [], [], null),
             items: [],
             ukIcon: 'world'
+          }
           entities.items.push({
             rootItem: new MenuItem('entities', 'Activate Entities', '/entities',
               '/entities', false, [], [], {communityId: this.communityId}),
             items: []
           })
           let pages: MenuItem[] = [];
           pages.push(new MenuItem('search', 'Search', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'search'}));
           pages.push(new MenuItem('link', 'Link', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'link'}));
           pages.push(new MenuItem('share', 'Share', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'share'}));
           pages.push(new MenuItem('landing', 'Landing', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'landing'}));
           pages.push(new MenuItem('html', 'HTML', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'html'}));
           pages.push(new MenuItem('other', 'Other', '/pages',
             '/pages', false, [], [], {communityId: this.communityId, type: 'other'}));
           entities.items.push({
             rootItem: new MenuItem('pages', 'Pages', '/pages',
               '/pages', false, [], [], {communityId: this.communityId}),
             items: pages
           })
           this.sideMenuItems.push(entities);
           let help: SideMenuItem = {
             rootItem: new MenuItem('help', 'Help Texts', '',
               '', false, [], [], null),
             items: [],
             ukIcon: 'file-edit'
+          }
           help.items.push({
             rootItem: new MenuItem('pages', 'Page Help Texts', '/pageContents',
               '/pageContents', false, [], [], {communityId: this.communityId}),
             items: []
           })
           help.items.push({
             rootItem: new MenuItem('classes', 'Class Help Texts', '/classContents',
               '/classContents', false, [], [], {communityId: this.communityId}),
             items: []
           })
           this.sideMenuItems.push(help);
           if (this.communityId != 'openaire') {
             let stats: SideMenuItem = {
               rootItem: new MenuItem('stats', 'Statistics & Charts', '/stats',
                 '/stats', false, [], [], {communityId: this.communityId}),
               items: [],
               ukIcon: 'image'
+            }
             this.sideMenuItems.push(stats);
             let claims: SideMenuItem = {
               rootItem: new MenuItem('claims', 'Links', '/claims',
                 '/claims', false, [], [], {communityId: this.communityId}),
               items: [],
               ukIcon: 'link'
+            }
             this.sideMenuItems.push(claims);
             if (this.communityType && this.communityType == 'ri') {
               let mining: SideMenuItem = {
                 rootItem: new MenuItem('mining', 'Text Mining Rules', '/mining/manage-profiles',
                   '/mining/manage-profiles', false, [], [], {communityId: this.communityId}),
                 items: [],
                 ukIcon: 'settings'
+              }
               this.sideMenuItems.push(mining);
+            }
             let users: SideMenuItem = {
               rootItem: new MenuItem('users', 'Users', '',
                 '', false, [], [], null),
               items: [],
               ukIcon: 'user'
+            }
             users.items.push({
               rootItem: new MenuItem('subscribers', 'Subscribers', '/manage-subscribers',
                 '/manage-subscribers', false, [], [], {communityId: this.communityId}),
               items: []
             })
             users.items.push({
               rootItem: new MenuItem('invite', 'Invite to Subscribe', 'https://beta.' + this.communityId + '.openaire.eu/invite',
                 '', false, [], [], null),
               items: []
             })
             users.items.push({
               rootItem: new MenuItem('notifications', 'Notification settings', '/manage-user-notifications',
                 '/manage-user-notifications', false, [], [], {communityId: this.communityId}),
               items: []
             })
             this.sideMenuItems.push(users);
+          }
+        }
         if (this.sideMenuItems.length > 0) {
           this.showSidebar = true;
+        }
+      }
+    }

     import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
     import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
     import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
     import { ConnectAdminLoginGuard} from './openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard';
     import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
     import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
-...
     import {SubscribeService} from './openaireLibrary/utils/subscribe/subscribe.service';
     import { FAQService } from './services/faq.service';
     import {ConnectRIGuard} from './openaireLibrary/connect/communityGuard/connectRIGuard.guard';
     import {SideBarModule} from "./openaireLibrary/sharedComponents/sidebar/sideBar.module";
     @NgModule({
         imports: [
-...
             ModalModule.forRoot(),
             FormsModule,
             ReactiveFormsModule,
             BottomModule, FeedbackModule, NavigationBarModule, CookieLawModule,
             BottomModule, NavigationBarModule, CookieLawModule,
             ErrorModule,
             AlertModalModule, SafeHtmlPipeModule, FABModule,
             InteractiveMiningModule
             InteractiveMiningModule,
             SideBarModule
         ],
         declarations: [
             AppComponent,

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 55406

Added by Konstantinos Triantafyllou about 5 years ago