Merged in dspace-cris-2023_02_x-DSC-1562 (pull request DSpace#1415)

Use SearchManager for search components in order to optimize the follow-up requests to embedded objects

Author: atarix83

src/app/lucky-search/lucky-search.service.spec.ts

@@ -1,13 +1,14 @@
 import { TestBed } from '@angular/core/testing';
 import { LuckySearchService } from './lucky-search.service';
-import {SearchService} from '../core/shared/search/search.service';
-import {SearchServiceStub} from '../shared/testing/search-service.stub';
+import { SearchManager } from '../core/browse/search-manager';
+import { SearchServiceStub } from '../shared/testing/search-service.stub';
+
 describe('LuckySearchService', () => {
   let service: LuckySearchService;
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
-        {provide: SearchService,  useValue: new SearchServiceStub('/search')},
+        {provide: SearchManager,  useValue: new SearchServiceStub('/search')},
       ],
     });
     service = TestBed.inject(LuckySearchService);

src/app/lucky-search/lucky-search.service.ts

@@ -5,14 +5,14 @@ import { PaginatedList } from '../core/data/paginated-list.model';
 import { SearchResult } from '../shared/search/models/search-result.model';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
-import { SearchService } from '../core/shared/search/search.service';
+import { SearchManager } from '../core/browse/search-manager';
 
 @Injectable({
   providedIn: 'root'
 })
 export class LuckySearchService {
 
-  constructor(private searchService: SearchService) {
+  constructor(private searchService: SearchManager) {
   }
 
   /**

src/app/shared/browse-most-elements/browse-most-elements.component.spec.ts

@@ -1,8 +1,10 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { BrowseMostElementsComponent } from './browse-most-elements.component';
-import { SearchService } from '../../core/shared/search/search.service';
+
 import { of } from 'rxjs';
+
+import { BrowseMostElementsComponent } from './browse-most-elements.component';
+import { SearchManager } from '../../core/browse/search-manager';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
@@ -68,7 +70,7 @@ describe('BrowseMostElementsComponent', () => {
       declarations: [BrowseMostElementsComponent],
       providers: [
         { provide: APP_CONFIG, useValue: mockConfig },
-        { provide: SearchService, useValue: mockSearchService },
+        { provide: SearchManager, useValue: mockSearchService },
         { provide: ChangeDetectorRef, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA], // Ignore unknown Angular elements

src/app/shared/browse-most-elements/browse-most-elements.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, Inject, Input, OnInit, PLATFORM_ID } from '@angular/core';
 import { isPlatformServer } from '@angular/common';
 
-import { SearchService } from '../../core/shared/search/search.service';
+import { SearchManager } from '../../core/browse/search-manager';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SearchResult } from '../search/models/search-result.model';
@@ -39,7 +39,7 @@ export class BrowseMostElementsComponent implements OnInit {
   constructor(
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(PLATFORM_ID) private platformId: Object,
-    private searchService: SearchService,
+    private searchService: SearchManager,
     private cdr: ChangeDetectorRef) {
 
   }

src/app/shared/explore/section-component/counters-section/counters-section.component.spec.ts

@@ -1,9 +1,9 @@
-import { SearchService } from '../../../../core/shared/search/search.service';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { CountersSectionComponent } from './counters-section.component';
 import { NativeWindowService } from '../../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { SearchManager } from '../../../../core/browse/search-manager';
 
 xdescribe('CountersSectionComponent', () => {
   let component: CountersSectionComponent;
@@ -13,7 +13,7 @@ xdescribe('CountersSectionComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ CountersSectionComponent ],
       providers: [
-        { provide: SearchService, useValue: {} },
+        { provide: SearchManager, useValue: {} },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
       ]
     })

src/app/shared/explore/section-component/counters-section/counters-section.component.ts

@@ -9,7 +9,7 @@ import { SearchObjects } from '../../../search/models/search-objects.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { SectionComponent } from '../../../../core/layout/models/section.model';
-import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchManager } from '../../../../core/browse/search-manager';
 import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { InternalLinkService } from 'src/app/core/services/internal-link.service';
@@ -40,7 +40,7 @@ export class CountersSectionComponent implements OnInit {
 
   constructor(
               public internalLinkService: InternalLinkService,
-              private searchService: SearchService,
+              private searchService: SearchManager,
               private uuidService: UUIDService,
               @Inject(PLATFORM_ID) private platformId: Object,
   ) {

src/app/shared/explore/section-component/multi-column-top-section/multi-column-top-section.component.ts

@@ -11,7 +11,7 @@ import { SearchObjects } from '../../../search/models/search-objects.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
-import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchManager } from '../../../../core/browse/search-manager';
 import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
 import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
 import { Item } from '../../../../core/shared/item.model';
@@ -30,7 +30,7 @@ export class MultiColumnTopSectionComponent implements OnInit {
 
   topObjects: Observable<DSpaceObject[]>;
 
-  constructor(private searchService: SearchService) {
+  constructor(private searchService: SearchManager) {
 
   }