From ad1a3e6172a05c82cb1b75f6a2da3bf00fe47588 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Tue, 5 Mar 2024 08:46:03 +0100 Subject: [PATCH] [DURACOM-191] fix routing module --- src/app/app-routing.module.ts | 4 +-- .../suggestions-page-routes.ts | 26 ++++++++++++++ .../suggestions-page-routing.module.ts | 36 ------------------- .../suggestions-page.module.ts | 3 -- 4 files changed, 28 insertions(+), 41 deletions(-) create mode 100644 src/app/suggestions-page/suggestions-page-routes.ts delete mode 100644 src/app/suggestions-page/suggestions-page-routing.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 69b43424b0..e58c6ad15e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -236,8 +236,8 @@ import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths'; }, { path: SUGGESTION_MODULE_PATH, - loadChildren: () => import('./suggestions-page/suggestions-page.module') - .then((m) => m.SuggestionsPageModule), + loadChildren: () => import('./suggestions-page/suggestions-page-routes') + .then((m) => m.ROUTES), canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/suggestions-page/suggestions-page-routes.ts b/src/app/suggestions-page/suggestions-page-routes.ts new file mode 100644 index 0000000000..e7c20a3d62 --- /dev/null +++ b/src/app/suggestions-page/suggestions-page-routes.ts @@ -0,0 +1,26 @@ +import { SuggestionsPageResolver } from './suggestions-page.resolver'; +import { SuggestionsPageComponent } from './suggestions-page.component'; +import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; +import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; + +export const ROUTES = [ + { + path: ':targetId', + resolve: { + suggestionTargets: SuggestionsPageResolver, + breadcrumb: PublicationClaimBreadcrumbResolver//I18nBreadcrumbResolver + }, + data: { + title: 'admin.notifications.publicationclaim.page.title', + breadcrumbKey: 'admin.notifications.publicationclaim', + showBreadcrumbsFluid: false + }, + providers: [ + SuggestionsPageResolver, + PublicationClaimBreadcrumbResolver + ], + canActivate: [AuthenticatedGuard], + runGuardsAndResolvers: 'always', + component: SuggestionsPageComponent, + }, +]; diff --git a/src/app/suggestions-page/suggestions-page-routing.module.ts b/src/app/suggestions-page/suggestions-page-routing.module.ts deleted file mode 100644 index f7d4ecf955..0000000000 --- a/src/app/suggestions-page/suggestions-page-routing.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { SuggestionsPageResolver } from './suggestions-page.resolver'; -import { SuggestionsPageComponent } from './suggestions-page.component'; -import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: ':targetId', - resolve: { - suggestionTargets: SuggestionsPageResolver, - breadcrumb: PublicationClaimBreadcrumbResolver//I18nBreadcrumbResolver - }, - data: { - title: 'admin.notifications.publicationclaim.page.title', - breadcrumbKey: 'admin.notifications.publicationclaim', - showBreadcrumbsFluid: false - }, - canActivate: [AuthenticatedGuard], - runGuardsAndResolvers: 'always', - component: SuggestionsPageComponent, - }, - ]) - ], - providers: [ - SuggestionsPageResolver, - PublicationClaimBreadcrumbResolver - ] -}) -export class SuggestionsPageRoutingModule { - -} diff --git a/src/app/suggestions-page/suggestions-page.module.ts b/src/app/suggestions-page/suggestions-page.module.ts index 0f5c322b1b..12ab4c1dbe 100644 --- a/src/app/suggestions-page/suggestions-page.module.ts +++ b/src/app/suggestions-page/suggestions-page.module.ts @@ -1,7 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; - -import { SuggestionsPageRoutingModule } from './suggestions-page-routing.module'; import { NotificationsModule } from '../notifications/notifications.module'; import { SuggestionsDataService } from '../core/notifications/suggestions-data.service'; import { SuggestionsService } from '../notifications/suggestions.service'; @@ -10,7 +8,6 @@ import { TranslateModule } from '@ngx-translate/core'; @NgModule({ imports: [ CommonModule, - SuggestionsPageRoutingModule, NotificationsModule, TranslateModule ],