From cff29539fbf58b7afbe9943e61c845950f06b5d1 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 24 Dec 2021 11:41:23 +0100
Subject: [PATCH] [CST-4633] fix issue with view mode list

---
 .../search-sidebar/search-sidebar.component.ts       |  3 ++-
 src/app/shared/search/search.component.html          |  2 ++
 src/app/shared/search/search.component.ts            | 12 ++++++++++--
 .../view-mode-switch/view-mode-switch.component.ts   |  6 +++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index 1b22144565..39207bdbd6 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -4,6 +4,7 @@ import { SearchConfigurationOption } from '../search-switch-configuration/search
 import { Observable } from 'rxjs';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
 
 /**
  * This component renders a simple item page.
@@ -50,7 +51,7 @@ export class SearchSidebarComponent {
   /**
    * The list of available view mode options
    */
-  @Input() viewModeList;
+  @Input() viewModeList: ViewMode[];
 
   /**
    * Whether to show the view mode switch
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index 02f59b2163..e445b0669c 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -47,6 +47,7 @@
                        [sortOptionsList]="(sortOptionsList$ | async)"
                        [currentSortOption]="(currentSortOptions$ | async)"
                        [inPlaceSearch]="inPlaceSearch"
+                       [viewModeList]="viewModeList"
                        (changeConfiguration)="changeContext($event.context)"></ds-search-sidebar>
     <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
                        [configurationList]="configurationList"
@@ -56,6 +57,7 @@
                        [searchOptions]="(searchOptions$ | async)"
                        [sortOptionsList]="(sortOptionsList$ | async)"
                        [currentSortOption]="(currentSortOptions$ | async)"
+                       [viewModeList]="viewModeList"
                        (toggleSidebar)="closeSidebar()"
                        (changeConfiguration)="changeContext($event.context)">
     </ds-search-sidebar>
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 04bb5a2a7b..f739242357 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -96,6 +96,11 @@ export class SearchComponent implements OnInit {
    */
   @Input() showSidebar = true;
 
+  /**
+   * List of available view mode
+   */
+  @Input() useUniquePageId: false;
+
   /**
    * List of available view mode
    */
@@ -178,8 +183,11 @@ export class SearchComponent implements OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
-    // Create an unique pagination id related to the instance of the SearchComponent
-    this.paginationId = uniqueId(this.paginationId);
+    if (this.useUniquePageId) {
+      // Create an unique pagination id related to the instance of the SearchComponent
+      this.paginationId = uniqueId(this.paginationId);
+    }
+
     this.searchConfigService.setPaginationId(this.paginationId);
 
     if (hasValue(this.fixedFilterQuery)) {
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index 4feb8927c2..146cb042f3 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -17,13 +17,17 @@ import { Router } from '@angular/router';
   templateUrl: './view-mode-switch.component.html'
 })
 export class ViewModeSwitchComponent implements OnInit, OnDestroy {
-  @Input() viewModeList: ViewMode[];
 
   /**
    * True when the search component should show results on the current page
    */
   @Input() inPlaceSearch;
 
+  /**
+   * List of available view mode
+   */
+  @Input() viewModeList: ViewMode[];
+
   /**
    * The current view mode
    */