Merged in task/dspace-cris-2023_02_x/DSC-1747_AB (pull request DSpace…

…#1797) [DSC-1747] restore thumbnails in search pages Approved-by: Giuseppe Digilio
uniba-ub · Jun 11, 2024 · 1b19d0f · 1b19d0f
2 parents 5360535 + 6bd188c
commit 1b19d0f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
@@ -9,6 +9,7 @@ import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { Router } from '@angular/router';
 import { SearchManager } from '../core/browse/search-manager';
+import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -35,7 +36,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               @Inject(PLATFORM_ID) public platformId: any,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               protected routeService: RouteService,
-              protected router: Router) {
-    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router);
+              protected router: Router,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,) {
+    super(service, searchManager, sidebarService, windowService, searchConfigService, platformId, routeService, router, appConfig);
   }
 }
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
@@ -34,6 +34,8 @@ import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
 import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 
 let comp: SearchComponent;
 let fixture: ComponentFixture<SearchComponent>;
@@ -239,6 +241,10 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       {
         provide: SEARCH_CONFIG_SERVICE,
         useValue: searchConfigurationServiceStub
+      },
+      {
+        provide: APP_CONFIG,
+        useValue: environment
       }
     ],
     schemas: [NO_ERRORS_SCHEMA]

diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
@@ -51,6 +51,7 @@ import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routi
 import { SearchManager } from '../../core/browse/search-manager';
 import { AlertType } from '../alert/alert-type';
 import { isPlatformServer } from '@angular/common';
+import { APP_CONFIG } from '../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search',
@@ -187,7 +188,7 @@ export class SearchComponent implements OnInit, OnDestroy {
   /**
    * Whether to show the thumbnail preview
    */
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   /**
    * Whether to show the view mode switch
@@ -368,7 +369,8 @@ export class SearchComponent implements OnInit, OnDestroy {
     @Inject(PLATFORM_ID) public platformId: any,
     @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
     protected routeService: RouteService,
-    protected router: Router,) {
+    protected router: Router,
+    @Inject(APP_CONFIG) protected appConfig: any,){
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -385,6 +387,8 @@ export class SearchComponent implements OnInit, OnDestroy {
       return;
     }
 
+    this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);

diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
@@ -68,7 +68,7 @@ export class ThemedSearchComponent extends ThemedComponent<SearchComponent> {
 
   @Input() showSidebar: boolean;
 
-  @Input() showThumbnails;
+  @Input() showThumbnails: boolean;
 
   @Input() showViewModes: boolean;