From a2d66c6e34c5773c5106a54633a113ced9cc72dc Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 10 Jan 2024 10:04:47 +0100 Subject: [PATCH] [DURACOM-191] change routing for community-list-page can't delete module - for now - since it has providers in it --- src/app/app-routing.module.ts | 8 ++--- ...uting.module.ts => lookup-by-id-routes.ts} | 29 +++++++------------ src/app/lookup-by-id/lookup-by-id.module.ts | 2 -- 3 files changed, 15 insertions(+), 24 deletions(-) rename src/app/lookup-by-id/{lookup-by-id-routing.module.ts => lookup-by-id-routes.ts} (64%) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6ff1a3ff63..c4d5717acd 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -74,14 +74,14 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'id', - loadChildren: () => import('./lookup-by-id/lookup-by-id.module') - .then((m) => m.LookupIdModule), + loadChildren: () => import('./lookup-by-id/lookup-by-id-routes') + .then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { path: 'handle', - loadChildren: () => import('./lookup-by-id/lookup-by-id.module') - .then((m) => m.LookupIdModule), + loadChildren: () => import('./lookup-by-id/lookup-by-id-routes') + .then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/lookup-by-id/lookup-by-id-routing.module.ts b/src/app/lookup-by-id/lookup-by-id-routes.ts similarity index 64% rename from src/app/lookup-by-id/lookup-by-id-routing.module.ts rename to src/app/lookup-by-id/lookup-by-id-routes.ts index 52a7c8a358..c1c4db867f 100644 --- a/src/app/lookup-by-id/lookup-by-id-routing.module.ts +++ b/src/app/lookup-by-id/lookup-by-id-routes.ts @@ -1,26 +1,19 @@ import { LookupGuard } from './lookup-guard'; -import { NgModule } from '@angular/core'; -import { RouterModule, UrlSegment } from '@angular/router'; +import { Route, UrlSegment } from '@angular/router'; import { isNotEmpty } from '../shared/empty.util'; import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component'; -@NgModule({ - imports: [ - RouterModule.forChild([ - { - matcher: urlMatcher, - canActivate: [LookupGuard], - component: ThemedObjectNotFoundComponent } - ]) - ], - providers: [ - LookupGuard - ] -}) +export const ROUTES: Route[] = [ + { + matcher: urlMatcher, + providers: [ + LookupGuard + ], + canActivate: [LookupGuard], + component: ThemedObjectNotFoundComponent + } +]; -export class LookupRoutingModule { - -} export function urlMatcher(url) { // The expected path is :idType/:id diff --git a/src/app/lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts index 2ea0258ae6..157a346168 100644 --- a/src/app/lookup-by-id/lookup-by-id.module.ts +++ b/src/app/lookup-by-id/lookup-by-id.module.ts @@ -1,13 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { LookupRoutingModule } from './lookup-by-id-routing.module'; import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component'; import { DsoRedirectService } from '../core/data/dso-redirect.service'; import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component'; @NgModule({ imports: [ - LookupRoutingModule, CommonModule, ObjectNotFoundComponent, ThemedObjectNotFoundComponent