[Monitor Dashboard | Trunk]: Remove dashboard from development. Add canActivateChild on monitor guard.

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

package.json

@@ -18,7 +18,7 @@
     "build": "ng build",
     "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production",
     "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:beta",
-    "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:development",
+    "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true && ng run ng-universal-demo:server:development",
     "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
     "build:ssr": "npm run build:client-and-server-bundles  && npm run webpack:server",
     "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",

src/app/admin-stakeholder/admin-stakeholder-routing.module.ts

@@ -1,7 +1,5 @@
 import {NgModule} from "@angular/core";
 import {RouterModule} from "@angular/router";
-import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectRIGuard.guard";
-import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
 
 @NgModule({
   imports: [RouterModule.forChild([

src/app/admin-tools/admin-tools-routing.module.ts

@@ -9,7 +9,7 @@ import {RouterModule} from '@angular/router';
         loadChildren: '../openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
         pathMatch: 'full'
       },
-      {
+     /* {
         path: 'classContents',
         loadChildren: '../openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule'
       },
@@ -57,7 +57,7 @@ import {RouterModule} from '@angular/router';
         path: 'pageContents/edit',
         loadChildren: '../openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
         pathMatch: 'full'
-      }
+      }*/
     ])
   ]
 })

src/app/app-routing.module.ts

@@ -6,6 +6,8 @@ import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/env
 
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
 import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
+import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
+import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
 
 const routes: Routes = [
   {
@@ -26,23 +28,25 @@ const routes: Routes = [
   {
     path: 'admin',
     loadChildren: './manageStakeholders/manageStakeholders.module#ManageStakeholdersModule',
-    data: {hasAdminMenu: true}
+    data: {hasAdminMenu: true},
+    canActivateChild: [LoginGuard]
   },
   {
     path: 'admin/admin-tools',
     loadChildren: './admin-tools/portal-admin-tools-routing.module#PortalAdminToolsRoutingModule',
-    canActivate: [AdminLoginGuard],
+    canActivateChild: [AdminLoginGuard],
     data: {hasAdminMenu: true}
   },
   {
     path: 'admin/monitor/admin-tools',
     loadChildren: './admin-tools/admin-tools-routing.module#AdminToolsRoutingModule',
-    canActivate: [AdminLoginGuard],
+    canActivateChild: [AdminLoginGuard],
     data: {hasAdminMenu: true, portal: 'monitor'}
   },
   {
     path: 'admin/:stakeholder',
     loadChildren: './admin-stakeholder/admin-stakeholder-routing.module#AdminStakeholderRoutingModule',
+    canActivateChild: [AdminDashboardGuard]
   },
   {path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
   {

src/app/app.module.ts

@@ -14,7 +14,6 @@ import {ErrorModule} from './openaireLibrary/error/error.module';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
 
 import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
-import {UserMiniModule} from "./openaireLibrary/login/userMiniModule.module";
 import {SideBarModule} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module";
 import {SharedModule} from "./openaireLibrary/shared/shared.module";
 import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@@ -25,6 +24,7 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int
 import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
 import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard";
 import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
+import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
 
 @NgModule({
   
@@ -46,7 +46,7 @@ import {AdminDashboardGuard} from "./utils/adminDashboard.guard";
   declarations: [AppComponent, OpenaireErrorPageComponent],
   exports: [AppComponent],
   providers: [
-    EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard,
+    EnvironmentSpecificResolver, AdminLoginGuard, AdminDashboardGuard, LoginGuard,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpInterceptorService,

src/app/general/general-routing.module.ts

@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {GeneralComponent} from "./general.component";
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 
 @NgModule({
   imports: [
@@ -10,7 +9,6 @@ import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
       {
         path: '',
         component: GeneralComponent,
-        canActivate: [AdminDashboardGuard],
         canDeactivate: [PreviousRouteRecorder],
         data: {hasSidebar: true}
       }

src/app/general/general.module.ts

@@ -8,7 +8,6 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
 import {ReactiveFormsModule} from "@angular/forms";
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 import {EditStakeholderModule} from "./edit-stakeholder/edit-stakeholder.module";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
 
@@ -26,7 +25,7 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p
     PageContentModule
   ],
   providers: [
-    AdminDashboardGuard, PreviousRouteRecorder,
+    PreviousRouteRecorder,
   ],
   exports: [GeneralComponent]
 })

src/app/manageStakeholders/manageStakeholders-routing.module.ts

@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {ManageStakeholdersComponent} from "./manageStakeholders.component";
-import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
 
 @NgModule({
   imports: [
@@ -10,7 +9,6 @@ import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
       {
         path: '',
         component: ManageStakeholdersComponent,
-        canActivate: [LoginGuard],
         canDeactivate: [PreviousRouteRecorder],
         data: {hasSidebar: true}
       }

src/app/manageStakeholders/manageStakeholders.module.ts

@@ -12,7 +12,6 @@ import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholde
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
 import {add, bullet, earth, group, lock, search} from "../openaireLibrary/utils/icons/icons";
-import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
 
 @NgModule({
@@ -30,7 +29,7 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p
     PageContentModule
   ],
   providers: [
-    LoginGuard, PreviousRouteRecorder,
+    PreviousRouteRecorder,
   ],
   exports: [ManageStakeholdersComponent]
 })

src/app/topic/topic-routing.module.ts

@@ -3,7 +3,6 @@ import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {TopicComponent} from "./topic.component";
 import {CanExitGuard} from "../openaireLibrary/utils/can-exit.guard";
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 
 @NgModule({
   imports: [
@@ -11,7 +10,6 @@ import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
       {
         path: '',
         component: TopicComponent,
-        canActivate: [AdminDashboardGuard],
         canDeactivate: [PreviousRouteRecorder, CanExitGuard]
       }
     ])

src/app/topic/topic.module.ts

@@ -12,7 +12,6 @@ import {IndicatorsComponent} from "./indicators.component";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
 import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
 import {ClickModule} from "../openaireLibrary/utils/click/click.module";
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
 import {
   preview,
@@ -28,17 +27,18 @@ import {
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
+import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/notify-form.module";
 
 @NgModule({
   imports: [
     CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
-    ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule
+    ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule
   ],
   declarations: [
     TopicComponent, IndicatorsComponent
   ],
   providers: [
-    AdminDashboardGuard, PreviousRouteRecorder,
+    PreviousRouteRecorder,
     PiwikService
   ],
   exports: [

src/app/users/users-routing.module.ts

@@ -1,7 +1,6 @@
 import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 import {UsersComponent} from "./users.component";
 
 @NgModule({
@@ -10,7 +9,6 @@ import {UsersComponent} from "./users.component";
       {
         path: '',
         component: UsersComponent,
-        canActivate: [AdminDashboardGuard],
         canDeactivate: [PreviousRouteRecorder]
       }
     ])

src/app/users/users.module.ts

@@ -2,7 +2,6 @@ import {NgModule} from "@angular/core";
 import {UsersComponent} from "./users.component";
 import {CommonModule} from "@angular/common";
 import {UsersRoutingModule} from "./users-routing.module";
-import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
 import {RoleUsersModule} from "../openaireLibrary/dashboard/users/role-users/role-users.module";
@@ -11,7 +10,7 @@ import {RouterModule} from "@angular/router";
 @NgModule({
   imports: [CommonModule, UsersRoutingModule, LoadingModule, PageContentModule, RoleUsersModule, RouterModule],
   declarations: [UsersComponent],
-  exports: [UsersComponent],
-  providers: [AdminDashboardGuard]
+  exports: [UsersComponent]
 })
-export class UsersModule {}
+export class UsersModule {
+}

src/app/utils/adminDashboard.guard.ts

@@ -1,5 +1,12 @@
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  CanActivateChild,
+  Router,
+  RouterStateSnapshot,
+  UrlTree
+} from '@angular/router';
 import {Observable} from 'rxjs/Observable';
 
 import {map, take, tap} from "rxjs/operators";
@@ -11,7 +18,7 @@ import {zip} from "rxjs";
 
 
 @Injectable()
-export class AdminDashboardGuard implements CanActivate {
+export class AdminDashboardGuard implements CanActivate, CanActivateChild {
 
   constructor(private router: Router,
               private stakeholderService: StakeholderService,
@@ -41,4 +48,8 @@ export class AdminDashboardGuard implements CanActivate {
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
     return this.check(state.url, route.params.stakeholder);
   }
+  
+  canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    return this.check(state.url, childRoute.params.stakeholder);
+  }
 }

src/environments/environment.ts

@@ -73,7 +73,7 @@ export let properties: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  baseLink: "/dashboard",
+  baseLink: "/",
   domain: "http://mpagasas.di.uoa.gr:4600",
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",