From fd6d470b3f04729dd32c42a85891eed8ebf54e74 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 7 May 2024 14:49:52 +0200
Subject: [PATCH] 111731: Fixed scope not correctly resetting to no scope when
 clicking on "Search all of DSpace" in the search scope selector

---
 src/app/shared/search/search.component.spec.ts | 1 +
 src/app/shared/search/search.component.ts      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 8c7b5b06ff..eb280bd887 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -294,6 +294,7 @@ describe('SearchComponent', () => {
 
     const expectedSearchOptions = Object.assign(paginatedSearchOptions$.value, {
       configuration: 'default',
+      scope: '',
       sort: sortOptionsList[0],
     });
     expect(comp.currentConfiguration$).toBeObservable(cold('b', {
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 3ec8a0a66e..fefbeb4461 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -356,7 +356,7 @@ export class SearchComponent implements OnDestroy, OnInit {
     }
 
     this.currentScope$ = this.routeService.getQueryParameterValue('scope').pipe(
-      map((routeValue: string) => hasValue(routeValue) ? routeValue : this.scope),
+      map((routeValue: string) => hasValue(routeValue) ? routeValue : this.scope ?? ''),
     );
 
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();