From 41d7c82f36e46bf918d2110860d44abc5a934889 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Wed, 23 Oct 2024 17:34:37 +0200
Subject: [PATCH] [DSC-1864] Fix issue after merge

---
 src/app/core/data/bitstream-data.service.ts                 | 2 +-
 .../abstract-browse-elements.component.ts                   | 6 ++++++
 .../default-browse-elements.component.html                  | 2 +-
 .../dynamic-scrollable-dropdown.component.ts                | 6 +++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 26854560275..b32f35e6422 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -176,7 +176,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
       searchParams.push(new RequestParam('sequenceId', sequenceId));
     }
     if (hasValue(filename)) {
-      searchParams.push(new RequestParam('filename', encodeURIComponent(filename)));
+      searchParams.push(new RequestParam('filename', filename));
     }
 
     const hrefObs = this.getSearchByHref(
diff --git a/src/app/shared/browse-most-elements/abstract-browse-elements.component.ts b/src/app/shared/browse-most-elements/abstract-browse-elements.component.ts
index 1e8a67800ce..6bd9f6f63aa 100644
--- a/src/app/shared/browse-most-elements/abstract-browse-elements.component.ts
+++ b/src/app/shared/browse-most-elements/abstract-browse-elements.component.ts
@@ -20,6 +20,7 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
 import { BehaviorSubject, Observable, mergeMap } from 'rxjs';
 import { Item } from '../../core/shared/item.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { TopSection } from '../../core/layout/models/section.model';
 
 @Component({
   template: ''
@@ -63,6 +64,11 @@ export abstract class AbstractBrowseElementsComponent implements OnInit, OnChang
    */
   @Input() showThumbnails = this.appConfig.browseBy.showThumbnails;
 
+  /**
+   * TopSection object
+   */
+  @Input() topSection: TopSection;
+
   public collectionElementLinkTypeEnum = CollectionElementLinkType;
 
   paginatedSearchOptions$: BehaviorSubject<PaginatedSearchOptions>;
diff --git a/src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html b/src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
index a8cc94b33bc..a5549e48afc 100644
--- a/src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
+++ b/src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
@@ -1,7 +1,7 @@
 <div class="m-2">
   <ng-container *ngIf="(searchResults$ | async) as searchResults">
       <ul *ngIf="searchResults?.hasSucceeded" class="list-unstyled">
-          <li *ngFor="let object of searchResults?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="true && !last">
+          <li *ngFor="let object of searchResults?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="!last">
               <ds-listable-object-component-loader [context]="context"
                                                    [index]="i"
                                                    [listID]="paginatedSearchOptions.configuration"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 625c5fb5f7a..13dde18f46c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -74,7 +74,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   filterTextChanged: Subject<string> = new Subject<string>();
 
   /**
-   * The subscribtion to be utilized on destroy to remove filterTextChange subscription
+   * The subscription to be utilized on destroy to remove filterTextChange subscription
    */
   subSearch: Subscription;
 
@@ -200,7 +200,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
     this.inputText += keyName;
     // When a new key is added, we need to reset the page info
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.retrieveEntries(null, false);
+    this.retrieveEntries(this.inputText, false);
   }
 
   removeKeyFromInput() {
@@ -209,7 +209,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
       if (this.inputText === '') {
         this.inputText = null;
       }
-      this.retrieveEntries(null, false);
+      this.retrieveEntries(this.inputText, false);
     }
   }