From 67976299de7ab657ccbdb60b7f4efde2e112d63f Mon Sep 17 00:00:00 2001
From: Nona Luypaert <nona.luypaert@atmire.com>
Date: Fri, 12 May 2023 08:12:04 +0200
Subject: [PATCH] 101623: Fixes for rendersBrowseBy,
 BrowseResponseParsingService, BrowseByRoutingModule

---
 src/app/browse-by/browse-by-routing.module.ts              | 7 -------
 .../browse-by/browse-by-switcher/browse-by-decorator.ts    | 2 +-
 .../browse-by-switcher/browse-by-switcher.component.ts     | 2 +-
 .../themed-browse-by-taxonomy-page.component.ts            | 4 +++-
 src/app/core/data/browse-response-parsing.service.ts       | 4 +++-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index b555390225..5d3697f391 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -14,13 +14,6 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         path: '',
         resolve: { breadcrumb: BrowseByDSOBreadcrumbResolver },
         children: [
-          {
-            path: 'srsc',
-            component: ThemedBrowseByTaxonomyPageComponent,
-            canActivate: [BrowseByGuard],
-            resolve: { breadcrumb: I18nBreadcrumbResolver },
-            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata.srsc' }
-          },
           {
             path: ':id',
             component: ThemedBrowseBySwitcherComponent,
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
index ceb4c6a6c6..b59a46cae1 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
@@ -26,7 +26,7 @@ const map = new Map();
  * @param browseByType  The type of page
  * @param theme The optional theme for the component
  */
-export function rendersBrowseBy(browseByType: BrowseByDataType, theme = DEFAULT_THEME) {
+export function rendersBrowseBy(browseByType: string, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
     if (hasNoValue(map.get(browseByType))) {
       map.set(browseByType, new Map());
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index 3cfc735135..e4746129dc 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -31,7 +31,7 @@ export class BrowseBySwitcherComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByComponent = this.route.data.pipe(
-      map((data: { browseDefinition: FlatBrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.dataType, this.themeService.getThemeName()))
+      map((data: { browseDefinition: FlatBrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.getRenderType(), this.themeService.getThemeName()))
     );
   }
 
diff --git a/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts b/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts
index 9e491aeaac..212044b853 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy-page/themed-browse-by-taxonomy-page.component.ts
@@ -1,15 +1,17 @@
 import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { BrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page.component';
 
 @Component({
   selector: 'ds-themed-browse-by-taxonomy-page',
-  templateUrl: './browse-by-taxonomy-page.component.html',
+  templateUrl: '../../shared/theme-support/themed.component.html',
   styleUrls: []
 })
 /**
  * Themed wrapper for BrowseByTaxonomyPageComponent
  */
+@rendersBrowseBy('hierarchy')
 export class ThemedBrowseByTaxonomyPageComponent extends ThemedComponent<BrowseByTaxonomyPageComponent>{
 
   protected getComponentName(): string {
diff --git a/src/app/core/data/browse-response-parsing.service.ts b/src/app/core/data/browse-response-parsing.service.ts
index aecba9cb50..9aa508ccf0 100644
--- a/src/app/core/data/browse-response-parsing.service.ts
+++ b/src/app/core/data/browse-response-parsing.service.ts
@@ -10,7 +10,9 @@ import { DSOResponseParsingService } from './dso-response-parsing.service';
 /**
  * A ResponseParsingService used to parse RawRestResponse coming from the REST API to a BrowseDefinition object
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root',
+  })
 export class BrowseResponseParsingService extends DSOResponseParsingService {
   protected objectCache: ObjectCacheService;
   protected toCache: boolean;