diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e2ef98d930..9d0c81136e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -208,7 +208,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: REQUEST_COPY_MODULE_PATH, - loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule), + loadChildren: () => import('./request-copy/request-copy-routes').then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/request-copy/request-copy-routes.ts b/src/app/request-copy/request-copy-routes.ts new file mode 100644 index 0000000000..23b387ebd9 --- /dev/null +++ b/src/app/request-copy/request-copy-routes.ts @@ -0,0 +1,33 @@ +import { Route } from '@angular/router'; +import { RequestCopyResolver } from './request-copy.resolver'; +import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; +import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths'; +import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component'; +import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component'; + +export const ROUTES: Route[] = [ + { + path: ':token', + providers: [ + RequestCopyResolver, + GrantDenyRequestCopyComponent + ], + resolve: { + request: RequestCopyResolver + }, + children: [ + { + path: '', + component: GrantDenyRequestCopyComponent, + }, + { + path: REQUEST_COPY_DENY_PATH, + component: ThemedDenyRequestCopyComponent, + }, + { + path: REQUEST_COPY_GRANT_PATH, + component: ThemedGrantRequestCopyComponent, + }, + ] + } +]; diff --git a/src/app/request-copy/request-copy-routing.module.ts b/src/app/request-copy/request-copy-routing.module.ts deleted file mode 100644 index 4138fc42a6..0000000000 --- a/src/app/request-copy/request-copy-routing.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { RequestCopyResolver } from './request-copy.resolver'; -import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; -import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths'; -import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component'; -import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: ':token', - resolve: { - request: RequestCopyResolver - }, - children: [ - { - path: '', - component: GrantDenyRequestCopyComponent, - }, - { - path: REQUEST_COPY_DENY_PATH, - component: ThemedDenyRequestCopyComponent, - }, - { - path: REQUEST_COPY_GRANT_PATH, - component: ThemedGrantRequestCopyComponent, - }, - ] - } - ]) - ], - providers: [ - RequestCopyResolver, - GrantDenyRequestCopyComponent - ] -}) -export class RequestCopyRoutingModule { -} diff --git a/src/app/request-copy/request-copy.module.ts b/src/app/request-copy/request-copy.module.ts deleted file mode 100644 index 28b23fdb56..0000000000 --- a/src/app/request-copy/request-copy.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; -import { RequestCopyRoutingModule } from './request-copy-routing.module'; -import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component'; -import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component'; -import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component'; -import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component'; -import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component'; -import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component'; - -@NgModule({ - imports: [ - CommonModule, - RequestCopyRoutingModule, - GrantDenyRequestCopyComponent, - DenyRequestCopyComponent, - ThemedDenyRequestCopyComponent, - EmailRequestCopyComponent, - ThemedEmailRequestCopyComponent, - GrantRequestCopyComponent, - ThemedGrantRequestCopyComponent - ], - exports: [ - ThemedEmailRequestCopyComponent, - ], - providers: [] -}) - -/** - * Module related to components used to grant or deny an item request - */ -export class RequestCopyModule { - -} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index c651264166..60d7604a46 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -167,7 +167,6 @@ import { import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component'; import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; import { FormModule } from '../../app/shared/form/form.module'; -import { RequestCopyModule } from 'src/app/request-copy/request-copy.module'; import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component'; import { BrowseByComponent } from './app/shared/browse-by/browse-by.component'; import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component'; @@ -301,7 +300,6 @@ const DECLARATIONS = [ SystemWideAlertModule, NgxGalleryModule, FormModule, - RequestCopyModule, ...DECLARATIONS ], exports: [