From 6692eb8ffefb2d4d0ce2d3331f6742bfd4136c54 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 10 Jan 2024 15:20:22 +0100 Subject: [PATCH] [DURACOM-191] change routing for search-page --- src/app/app-routing.module.ts | 4 +-- src/app/search-page/search-page-routes.ts | 24 +++++++++++++++ .../search-page/search-page-routing.module.ts | 30 ------------------- 3 files changed, 26 insertions(+), 32 deletions(-) create mode 100644 src/app/search-page/search-page-routes.ts delete mode 100644 src/app/search-page/search-page-routing.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fd54f097fc..275afaeb85 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -140,8 +140,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'search', - loadChildren: () => import('./search-page/search-page-routing.module') - .then((m) => m.SearchPageRoutingModule), + loadChildren: () => import('./search-page/search-page-routes') + .then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/search-page/search-page-routes.ts b/src/app/search-page/search-page-routes.ts new file mode 100644 index 0000000000..c7ade3ac46 --- /dev/null +++ b/src/app/search-page/search-page-routes.ts @@ -0,0 +1,24 @@ +import { Route } from '@angular/router'; + +import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; +import { ThemedSearchPageComponent } from './themed-search-page.component'; +import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component'; + +export const ROUTES: Route[] = [{ + path: '', + resolve: {breadcrumb: I18nBreadcrumbResolver}, data: {title: 'search.title', breadcrumbKey: 'search'}, + providers: [ + I18nBreadcrumbResolver, + I18nBreadcrumbsService + ], + children: [ + {path: '', component: ThemedSearchPageComponent}, + { + path: ':configuration', + component: ThemedConfigurationSearchPageComponent, + canActivate: [ConfigurationSearchPageGuard] + } + ] +}]; diff --git a/src/app/search-page/search-page-routing.module.ts b/src/app/search-page/search-page-routing.module.ts deleted file mode 100644 index 9e39ad1bc9..0000000000 --- a/src/app/search-page/search-page-routing.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; -import { SearchPageModule } from './search-page.module'; -import { ThemedSearchPageComponent } from './themed-search-page.component'; -import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component'; - -@NgModule({ - imports: [ - SearchPageModule, - RouterModule.forChild([{ - path: '', - resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' }, - children: [ - { path: '', component: ThemedSearchPageComponent }, - { path: ':configuration', component: ThemedConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard] } - ] - }] - ) - ], - providers: [ - I18nBreadcrumbResolver, - I18nBreadcrumbsService - ] -}) -export class SearchPageRoutingModule { -}