mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
[DURACOM-191] change routing for browse-by-page
This commit is contained in:
@@ -146,8 +146,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'browse',
|
path: 'browse',
|
||||||
loadChildren: () => import('./browse-by/browse-by-page.module')
|
loadChildren: () => import('./browse-by/browse-by-page-routes')
|
||||||
.then((m) => m.BrowseByPageModule),
|
.then((m) => m.ROUTES),
|
||||||
canActivate: [EndUserAgreementCurrentUserGuard]
|
canActivate: [EndUserAgreementCurrentUserGuard]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
28
src/app/browse-by/browse-by-page-routes.ts
Normal file
28
src/app/browse-by/browse-by-page-routes.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { Route } from '@angular/router';
|
||||||
|
import { BrowseByGuard } from './browse-by-guard';
|
||||||
|
import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
|
||||||
|
import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
|
||||||
|
import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
|
||||||
|
import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
|
||||||
|
|
||||||
|
export const ROUTES: Route[] = [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
resolve: {
|
||||||
|
breadcrumb: BrowseByDSOBreadcrumbResolver,
|
||||||
|
menu: DSOEditMenuResolver
|
||||||
|
},
|
||||||
|
providers: [
|
||||||
|
BrowseByI18nBreadcrumbResolver,
|
||||||
|
BrowseByDSOBreadcrumbResolver
|
||||||
|
],
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: ':id',
|
||||||
|
component: ThemedBrowseBySwitcherComponent,
|
||||||
|
canActivate: [BrowseByGuard],
|
||||||
|
resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
|
||||||
|
data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}];
|
@@ -1,5 +1,4 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { BrowseByRoutingModule } from './browse-by-routing.module';
|
|
||||||
import { ItemDataService } from '../core/data/item-data.service';
|
import { ItemDataService } from '../core/data/item-data.service';
|
||||||
import { BrowseService } from '../core/browse/browse.service';
|
import { BrowseService } from '../core/browse/browse.service';
|
||||||
import { BrowseByGuard } from './browse-by-guard';
|
import { BrowseByGuard } from './browse-by-guard';
|
||||||
@@ -8,15 +7,11 @@ import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.modul
|
|||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
SharedBrowseByModule,
|
SharedBrowseByModule,
|
||||||
BrowseByRoutingModule,
|
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
ItemDataService,
|
ItemDataService,
|
||||||
BrowseService,
|
BrowseService,
|
||||||
BrowseByGuard,
|
BrowseByGuard,
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
|
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class BrowseByPageModule {
|
export class BrowseByPageModule {
|
||||||
|
@@ -1,36 +0,0 @@
|
|||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { BrowseByGuard } from './browse-by-guard';
|
|
||||||
import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
|
|
||||||
import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
|
|
||||||
import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
|
|
||||||
import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
resolve: {
|
|
||||||
breadcrumb: BrowseByDSOBreadcrumbResolver,
|
|
||||||
menu: DSOEditMenuResolver
|
|
||||||
},
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
path: ':id',
|
|
||||||
component: ThemedBrowseBySwitcherComponent,
|
|
||||||
canActivate: [BrowseByGuard],
|
|
||||||
resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
|
|
||||||
data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}])
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
BrowseByI18nBreadcrumbResolver,
|
|
||||||
BrowseByDSOBreadcrumbResolver
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class BrowseByRoutingModule {
|
|
||||||
|
|
||||||
}
|
|
@@ -3,7 +3,6 @@ import { BrowseByComponent } from './browse-by.component';
|
|||||||
import { ThemedBrowseByComponent } from './themed-browse-by.component';
|
import { ThemedBrowseByComponent } from './themed-browse-by.component';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
|
import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
|
||||||
import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
|
|
||||||
import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
|
import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
|
||||||
|
|
||||||
const DECLARATIONS = [
|
const DECLARATIONS = [
|
||||||
@@ -14,7 +13,6 @@ const DECLARATIONS = [
|
|||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
ResultsBackButtonModule,
|
ResultsBackButtonModule,
|
||||||
BrowseByRoutingModule,
|
|
||||||
AccessControlRoutingModule,
|
AccessControlRoutingModule,
|
||||||
CommonModule,
|
CommonModule,
|
||||||
...DECLARATIONS,
|
...DECLARATIONS,
|
||||||
|
Reference in New Issue
Block a user