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

@@ -51,12 +51,14 @@ export class SearchFacetFilterWrapperComponent extends AbstractComponentLoaderCo
 
   protected inputNamesDependentForComponent: (keyof this & string)[] = [
     'filterConfig',
+    'retainScrollPosition',
   ];
 
   protected inputNames: (keyof this & string)[] = [
     'filterConfig',
     'inPlaceSearch',
     'refreshFilters',
+    'retainScrollPosition',
     'scope',
   ];
 

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

@@ -32,10 +32,7 @@ import {
 } from 'rxjs/operators';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import {
-  PaginationService,
-  RETAIN_SCROLL_POSITION,
-} from '../../../../../core/pagination/pagination.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -93,6 +90,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   @Input() scope: string;
 
+  /**
+   * Should scroll to the pagination component after updating the route instead of the top of the page
+   */
+  @Input() retainScrollPosition = false;
+
   /**
    * Emits an array of pages with values found for this facet
    */
@@ -155,7 +157,6 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               protected rdbs: RemoteDataBuildService,
               protected router: Router,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
   }
 

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

@@ -35,10 +35,7 @@ import {
 } from '../../../../../../config/app-config.interface';
 import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import {
-  PaginationService,
-  RETAIN_SCROLL_POSITION,
-} from '../../../../../core/pagination/pagination.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -88,7 +85,6 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
               protected vocabularyService: VocabularyService,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
     super(
       searchService,
@@ -97,7 +93,6 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
       rdbs,
       router,
       searchConfigService,
-      retainScrollPosition,
     );
   }
 

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

@@ -23,10 +23,7 @@ import {
 import { yearFromString } from 'src/app/shared/date.util';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import {
-  PaginationService,
-  RETAIN_SCROLL_POSITION,
-} from '../../../../../core/pagination/pagination.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { RouteService } from '../../../../../core/services/route.service';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -120,7 +117,6 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
               private translateService: TranslateService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
               @Inject(PLATFORM_ID) private platformId: any,
-              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
     super(
       searchService,
@@ -129,7 +125,6 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
       rdbs,
       router,
       searchConfigService,
-      retainScrollPosition,
     );
   }
 

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

@@ -23,15 +23,19 @@ export class SearchLabelLoaderComponent extends AbstractComponentLoaderComponent
 
   @Input() inPlaceSearch: boolean;
 
+  @Input() retainScrollPosition: boolean;
+
   @Input() appliedFilter: AppliedFilter;
 
   protected inputNamesDependentForComponent: (keyof this & string)[] = [
     'appliedFilter',
+    'retainScrollPosition',
   ];
 
   protected inputNames: (keyof this & string)[] = [
     'inPlaceSearch',
     'appliedFilter',
+    'retainScrollPosition',
   ];
 
   public getComponent(): GenericConstructor<Component> {