From dcaac9e68faad6cc74f3c71ae74c3fbd48e6e54e Mon Sep 17 00:00:00 2001
From: Andrea Barbasso <´andrea.barbasso@4science.com´>
Date: Wed, 10 Jan 2024 15:49:56 +0100
Subject: [PATCH] [DURACOM-191] change routing for browse-by-page

---
 src/app/app-routing.module.ts                 |  4 +--
 src/app/browse-by/browse-by-page-routes.ts    | 28 +++++++++++++++
 src/app/browse-by/browse-by-page.module.ts    |  5 ---
 src/app/browse-by/browse-by-routing.module.ts | 36 -------------------
 .../browse-by/shared-browse-by.module.ts      |  2 --
 5 files changed, 30 insertions(+), 45 deletions(-)
 create mode 100644 src/app/browse-by/browse-by-page-routes.ts
 delete mode 100644 src/app/browse-by/browse-by-routing.module.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 275afaeb85..73c68ef9d8 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -146,8 +146,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
           },
           {
             path: 'browse',
-            loadChildren: () => import('./browse-by/browse-by-page.module')
-              .then((m) => m.BrowseByPageModule),
+            loadChildren: () => import('./browse-by/browse-by-page-routes')
+              .then((m) => m.ROUTES),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
           {
diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts
new file mode 100644
index 0000000000..5147a81fef
--- /dev/null
+++ b/src/app/browse-by/browse-by-page-routes.ts
@@ -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' }
+      }
+    ]
+  }];
diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index 78ee741d76..6c122aae9d 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { BrowseByRoutingModule } from './browse-by-routing.module';
 import { ItemDataService } from '../core/data/item-data.service';
 import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
@@ -8,15 +7,11 @@ import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.modul
 @NgModule({
   imports: [
     SharedBrowseByModule,
-    BrowseByRoutingModule,
   ],
   providers: [
     ItemDataService,
     BrowseService,
     BrowseByGuard,
-  ],
-  declarations: [
-
   ]
 })
 export class BrowseByPageModule {
diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
deleted file mode 100644
index bb67dc65ae..0000000000
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ /dev/null
@@ -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 {
-
-}
diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
index 91dd6e3284..ce06322b7e 100644
--- a/src/app/shared/browse-by/shared-browse-by.module.ts
+++ b/src/app/shared/browse-by/shared-browse-by.module.ts
@@ -3,7 +3,6 @@ import { BrowseByComponent } from './browse-by.component';
 import { ThemedBrowseByComponent } from './themed-browse-by.component';
 import { CommonModule } from '@angular/common';
 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';
 
 const DECLARATIONS = [
@@ -14,7 +13,6 @@ const DECLARATIONS = [
 @NgModule({
     imports: [
         ResultsBackButtonModule,
-        BrowseByRoutingModule,
         AccessControlRoutingModule,
         CommonModule,
         ...DECLARATIONS,