133535: resolve merge conflicts

Author: Wout-atmire

src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts

@@ -42,7 +42,7 @@ export class SearchFacetFilterWrapperComponent extends AbstractComponentLoaderCo
   /**
    * Should scroll to the pagination component after updating the route instead of the top of the page
    */
-  @Input() retainScrollPosition = false;
+  @Input() retainScrollPosition: boolean;
 
   /**
    * The current scope
@@ -51,7 +51,6 @@ export class SearchFacetFilterWrapperComponent extends AbstractComponentLoaderCo
 
   protected inputNamesDependentForComponent: (keyof this & string)[] = [
     'filterConfig',
-    'retainScrollPosition',
   ];
 
   protected inputNames: (keyof this & string)[] = [

src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts

@@ -19,7 +19,6 @@ import {
 } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
@@ -111,7 +110,6 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetFilterComponent, {
@@ -125,6 +123,7 @@ describe('SearchFacetFilterComponent', () => {
     comp.filterConfig = mockFilterConfig;
     comp.inPlaceSearch = false;
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     spyOn(searchService, 'getFacetValuesFor').and.returnValue(createSuccessfulRemoteDataObject$(values));
     fixture.detectChanges();
   });

src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts

@@ -28,7 +28,6 @@ import { RemoteDataBuildService } from '../../../../../core/cache/builders/remot
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
@@ -93,7 +92,6 @@ describe('SearchHierarchyFilterComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
         { provide: RouteService, useValue: routeServiceStub },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
@@ -105,6 +103,7 @@ describe('SearchHierarchyFilterComponent', () => {
     comp.inPlaceSearch = false;
     comp.filterConfig = Object.assign(new SearchFilterConfig(), { name: testSearchFilter });
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     fixture.detectChanges();
     showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
   }

src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts

@@ -18,7 +18,6 @@ import {
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
@@ -116,7 +115,6 @@ describe('SearchRangeFilterComponent', () => {
         { provide: RemoteDataBuildService, useValue: { aggregate: () => of({}) } },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: RETAIN_SCROLL_POSITION, useValue: new BehaviorSubject<boolean>(false) },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).overrideComponent(SearchRangeFilterComponent, {
@@ -134,6 +132,7 @@ describe('SearchRangeFilterComponent', () => {
     comp.filterConfig = mockFilterConfig;
     comp.inPlaceSearch = false;
     comp.refreshFilters = new BehaviorSubject<boolean>(false);
+    comp.retainScrollPosition = true;
     spyOn(searchService, 'getFacetValuesFor').and.returnValue(mockValues);
     fixture.detectChanges();
   });

src/app/shared/search/search-labels/search-label-loader/search-label-loader.component.ts

@@ -29,7 +29,6 @@ export class SearchLabelLoaderComponent extends AbstractComponentLoaderComponent
 
   protected inputNamesDependentForComponent: (keyof this & string)[] = [
     'appliedFilter',
-    'retainScrollPosition',
   ];
 
   protected inputNames: (keyof this & string)[] = [