diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0deb1088c1..89f0e68d30 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -180,8 +180,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'workspaceitems', - loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module') - .then((m) => m.WorkspaceitemsEditPageModule), + loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page-routes') + .then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts new file mode 100644 index 0000000000..7ef4288b52 --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routes.ts @@ -0,0 +1,66 @@ +import { Route } from '@angular/router'; + +import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; +import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; +import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver'; +import { WorkspaceItemPageResolver } from './workspace-item-page.resolver'; +import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; +import { + ThemedWorkspaceItemsDeletePageComponent +} from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; + +export const ROUTES: Route[] = [ + { + path: '', + providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver], + redirectTo: '/home', pathMatch: 'full' + }, + { + path: ':id', + providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver], + resolve: {wsi: WorkspaceItemPageResolver}, + children: [ + { + canActivate: [AuthenticatedGuard], + path: 'edit', + component: ThemedSubmissionEditComponent, + resolve: { + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'submission.edit.title', breadcrumbKey: 'submission.edit'} + }, + { + canActivate: [AuthenticatedGuard], + path: 'view', + component: ThemedFullItemPageComponent, + resolve: { + dso: ItemFromWorkspaceResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view'} + }, + { + canActivate: [AuthenticatedGuard], + path: 'delete', + component: WorkspaceItemsDeletePageComponent, + resolve: { + dso: ItemFromWorkspaceResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete'} + }, + { + canActivate: [AuthenticatedGuard], + path: 'delete', + component: ThemedWorkspaceItemsDeletePageComponent, + resolve: { + dso: ItemFromWorkspaceResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete'} + }, + ] + } +]; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts deleted file mode 100644 index 61393d9f64..0000000000 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component'; -import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver'; -import { WorkspaceItemPageResolver } from './workspace-item-page.resolver'; -import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; -import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', redirectTo: '/home', pathMatch: 'full' }, - { - path: ':id', - resolve: { wsi: WorkspaceItemPageResolver }, - children: [ - { - canActivate: [AuthenticatedGuard], - path: 'edit', - component: ThemedSubmissionEditComponent, - resolve: { - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' } - }, - { - canActivate: [AuthenticatedGuard], - path: 'view', - component: ThemedFullItemPageComponent, - resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' } - }, - { - canActivate: [AuthenticatedGuard], - path: 'delete', - component: WorkspaceItemsDeletePageComponent, - resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' } - }, - { - canActivate: [AuthenticatedGuard], - path: 'delete', - component: ThemedWorkspaceItemsDeletePageComponent, - resolve: { - dso: ItemFromWorkspaceResolver, - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' } - }, - ] - } - ]) - ], - providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver] -}) -/** - * This module defines the default component to load when navigating to the workspaceitems edit page path - */ -export class WorkspaceitemsEditPageRoutingModule { } diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts deleted file mode 100644 index a44a32b06c..0000000000 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module'; -import { SubmissionModule } from '../submission/submission.module'; -import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; -import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; - -@NgModule({ - imports: [ - WorkspaceitemsEditPageRoutingModule, - CommonModule, - SubmissionModule, - WorkspaceItemsDeletePageComponent, - ThemedWorkspaceItemsDeletePageComponent - ] -}) -/** - * This module handles all modules that need to access the workspaceitems edit page. - */ -export class WorkspaceitemsEditPageModule { - -}