forked from hazza/dspace-angular
[DSC-287] optimize code and add typedoc
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
|||||||
FORBIDDEN_PATH,
|
FORBIDDEN_PATH,
|
||||||
FORGOT_PASSWORD_PATH,
|
FORGOT_PASSWORD_PATH,
|
||||||
INFO_MODULE_PATH,
|
INFO_MODULE_PATH,
|
||||||
|
INTERNAL_SERVER_ERROR,
|
||||||
LEGACY_BITSTREAM_MODULE_PATH,
|
LEGACY_BITSTREAM_MODULE_PATH,
|
||||||
PROFILE_MODULE_PATH,
|
PROFILE_MODULE_PATH,
|
||||||
REGISTER_PATH,
|
REGISTER_PATH,
|
||||||
@@ -33,7 +34,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
|||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forRoot([
|
RouterModule.forRoot([
|
||||||
{ path: '500', component: ThemedPageInternalServerErrorComponent },
|
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
|
||||||
{
|
{
|
||||||
path: '', canActivate: [ServerCheckGuard, AuthBlockingGuard],
|
path: '', canActivate: [ServerCheckGuard, AuthBlockingGuard],
|
||||||
children: [
|
children: [
|
||||||
@@ -144,14 +145,12 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
|||||||
{
|
{
|
||||||
path: 'login',
|
path: 'login',
|
||||||
loadChildren: () => import('./login-page/login-page.module')
|
loadChildren: () => import('./login-page/login-page.module')
|
||||||
.then((m) => m.LoginPageModule),
|
.then((m) => m.LoginPageModule)
|
||||||
canActivate: [ServerCheckGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'logout',
|
path: 'logout',
|
||||||
loadChildren: () => import('./logout-page/logout-page.module')
|
loadChildren: () => import('./logout-page/logout-page.module')
|
||||||
.then((m) => m.LogoutPageModule),
|
.then((m) => m.LogoutPageModule)
|
||||||
canActivate: [ServerCheckGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'submit',
|
path: 'submit',
|
||||||
@@ -191,8 +190,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: INFO_MODULE_PATH,
|
path: INFO_MODULE_PATH,
|
||||||
loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
|
loadChildren: () => import('./info/info.module').then((m) => m.InfoModule)
|
||||||
canActivate: [ServerCheckGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: REQUEST_COPY_MODULE_PATH,
|
path: REQUEST_COPY_MODULE_PATH,
|
||||||
@@ -206,15 +204,13 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
|||||||
{
|
{
|
||||||
path: 'statistics',
|
path: 'statistics',
|
||||||
loadChildren: () => import('./statistics-page/statistics-page-routing.module')
|
loadChildren: () => import('./statistics-page/statistics-page-routing.module')
|
||||||
.then((m) => m.StatisticsPageRoutingModule),
|
.then((m) => m.StatisticsPageRoutingModule)
|
||||||
canActivate: [ServerCheckGuard]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ACCESS_CONTROL_MODULE_PATH,
|
path: ACCESS_CONTROL_MODULE_PATH,
|
||||||
loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
|
loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
|
||||||
canActivate: [GroupAdministratorGuard],
|
canActivate: [GroupAdministratorGuard],
|
||||||
},
|
},
|
||||||
|
|
||||||
{ path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
|
{ path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@@ -12,10 +12,17 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
|
|||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
|
/**
|
||||||
|
* A guard that checks if root api endpoint is reachable.
|
||||||
|
* If not redirect to 500 error page
|
||||||
|
*/
|
||||||
export class ServerCheckGuard implements CanActivate {
|
export class ServerCheckGuard implements CanActivate {
|
||||||
constructor(private router: Router, private rootDataService: RootDataService) {
|
constructor(private router: Router, private rootDataService: RootDataService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True when root api endpoint is reachable.
|
||||||
|
*/
|
||||||
canActivate(
|
canActivate(
|
||||||
route: ActivatedRouteSnapshot,
|
route: ActivatedRouteSnapshot,
|
||||||
state: RouterStateSnapshot): Observable<boolean> {
|
state: RouterStateSnapshot): Observable<boolean> {
|
||||||
|
Reference in New Issue
Block a user