diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 356bb0aafc..fd54f097fc 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -134,8 +134,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'mydspace', - loadChildren: () => import('./my-dspace-page/my-dspace-page.module') - .then((m) => m.MyDSpacePageModule), + loadChildren: () => import('./my-dspace-page/my-dspace-page-routes') + .then((m) => m.ROUTES), canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/my-dspace-page/my-dspace-page-routes.ts b/src/app/my-dspace-page/my-dspace-page-routes.ts new file mode 100644 index 0000000000..5bc58b2a6f --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-page-routes.ts @@ -0,0 +1,18 @@ +import { MyDSpaceGuard } from './my-dspace.guard'; +import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { Route } from '@angular/router'; + +export const ROUTES: Route[] = [ + { + path: '', + component: ThemedMyDSpacePageComponent, + resolve: { + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'mydspace.title', breadcrumbKey: 'mydspace'}, + canActivate: [ + MyDSpaceGuard + ] + } +]; diff --git a/src/app/my-dspace-page/my-dspace-page-routing.module.ts b/src/app/my-dspace-page/my-dspace-page-routing.module.ts deleted file mode 100644 index 6894194344..0000000000 --- a/src/app/my-dspace-page/my-dspace-page-routing.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { MyDSpaceGuard } from './my-dspace.guard'; -import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ThemedMyDSpacePageComponent, - resolve: { - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'mydspace.title', breadcrumbKey: 'mydspace' }, - canActivate: [ - MyDSpaceGuard - ] - } - ]) - ] -}) -/** - * This module defines the default component to load when navigating to the mydspace page path. - */ -export class MyDspacePageRoutingModule { -} diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts index f3cece7c17..178e6186db 100644 --- a/src/app/my-dspace-page/my-dspace-page.module.ts +++ b/src/app/my-dspace-page/my-dspace-page.module.ts @@ -1,8 +1,5 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; - - -import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module'; import { MyDSpacePageComponent } from './my-dspace-page.component'; import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component'; import { MyDSpaceGuard } from './my-dspace.guard'; @@ -31,7 +28,6 @@ const DECLARATIONS = [ imports: [ CommonModule, SearchModule, - MyDspacePageRoutingModule, UploadModule, ...DECLARATIONS ],